From fcff1cdf92665810825680bcd573ce5235c65fa1 Mon Sep 17 00:00:00 2001 From: rusefi Date: Wed, 6 Feb 2019 18:05:32 -0500 Subject: [PATCH] F7 for Chibi18 --- firmware/config/boards/NUCLEO_F767/board.c | 145 +++++++++++++++++- firmware/config/boards/NUCLEO_F767/board.h | 29 +++- .../NUCLEO_F767/board_configuration.cpp | 2 +- 3 files changed, 159 insertions(+), 17 deletions(-) diff --git a/firmware/config/boards/NUCLEO_F767/board.c b/firmware/config/boards/NUCLEO_F767/board.c index 95523fb2b5..aece76d464 100644 --- a/firmware/config/boards/NUCLEO_F767/board.c +++ b/firmware/config/boards/NUCLEO_F767/board.c @@ -1,5 +1,5 @@ /* - ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio + ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,14 +20,76 @@ */ #include "hal.h" +#include "stm32_gpio.h" + +/*===========================================================================*/ +/* Driver local definitions. */ +/*===========================================================================*/ + +/*===========================================================================*/ +/* Driver exported variables. */ +/*===========================================================================*/ + +/*===========================================================================*/ +/* Driver local variables and types. */ +/*===========================================================================*/ -#if HAL_USE_PAL || defined(__DOXYGEN__) /** - * @brief PAL setup. - * @details Digital I/O ports static configuration as defined in @p board.h. - * This variable is used by the HAL when initializing the PAL driver. + * @brief Type of STM32 GPIO port setup. */ -const PALConfig pal_default_config = { +typedef struct { + uint32_t moder; + uint32_t otyper; + uint32_t ospeedr; + uint32_t pupdr; + uint32_t odr; + uint32_t afrl; + uint32_t afrh; +} gpio_setup_t; + +/** + * @brief Type of STM32 GPIO initialization data. + */ +typedef struct { +#if STM32_HAS_GPIOA || defined(__DOXYGEN__) + gpio_setup_t PAData; +#endif +#if STM32_HAS_GPIOB || defined(__DOXYGEN__) + gpio_setup_t PBData; +#endif +#if STM32_HAS_GPIOC || defined(__DOXYGEN__) + gpio_setup_t PCData; +#endif +#if STM32_HAS_GPIOD || defined(__DOXYGEN__) + gpio_setup_t PDData; +#endif +#if STM32_HAS_GPIOE || defined(__DOXYGEN__) + gpio_setup_t PEData; +#endif +#if STM32_HAS_GPIOF || defined(__DOXYGEN__) + gpio_setup_t PFData; +#endif +#if STM32_HAS_GPIOG || defined(__DOXYGEN__) + gpio_setup_t PGData; +#endif +#if STM32_HAS_GPIOH || defined(__DOXYGEN__) + gpio_setup_t PHData; +#endif +#if STM32_HAS_GPIOI || defined(__DOXYGEN__) + gpio_setup_t PIData; +#endif +#if STM32_HAS_GPIOJ || defined(__DOXYGEN__) + gpio_setup_t PJData; +#endif +#if STM32_HAS_GPIOK || defined(__DOXYGEN__) + gpio_setup_t PKData; +#endif +} gpio_config_t; + +/** + * @brief STM32 GPIO static initialization data. + */ +static const gpio_config_t gpio_default_config = { #if STM32_HAS_GPIOA {VAL_GPIOA_MODER, VAL_GPIOA_OTYPER, VAL_GPIOA_OSPEEDR, VAL_GPIOA_PUPDR, VAL_GPIOA_ODR, VAL_GPIOA_AFRL, VAL_GPIOA_AFRH}, @@ -73,15 +135,81 @@ const PALConfig pal_default_config = { VAL_GPIOK_ODR, VAL_GPIOK_AFRL, VAL_GPIOK_AFRH} #endif }; + +/*===========================================================================*/ +/* Driver local functions. */ +/*===========================================================================*/ + +static void gpio_init(stm32_gpio_t *gpiop, const gpio_setup_t *config) { + + gpiop->OTYPER = config->otyper; + gpiop->OSPEEDR = config->ospeedr; + gpiop->PUPDR = config->pupdr; + gpiop->ODR = config->odr; + gpiop->AFRL = config->afrl; + gpiop->AFRH = config->afrh; + gpiop->MODER = config->moder; +} + +static void stm32_gpio_init(void) { + + /* Enabling GPIO-related clocks, the mask comes from the + registry header file.*/ + rccResetAHB1(STM32_GPIO_EN_MASK); + rccEnableAHB1(STM32_GPIO_EN_MASK, true); + + /* Initializing all the defined GPIO ports.*/ +#if STM32_HAS_GPIOA + gpio_init(GPIOA, &gpio_default_config.PAData); #endif +#if STM32_HAS_GPIOB + gpio_init(GPIOB, &gpio_default_config.PBData); +#endif +#if STM32_HAS_GPIOC + gpio_init(GPIOC, &gpio_default_config.PCData); +#endif +#if STM32_HAS_GPIOD + gpio_init(GPIOD, &gpio_default_config.PDData); +#endif +#if STM32_HAS_GPIOE + gpio_init(GPIOE, &gpio_default_config.PEData); +#endif +#if STM32_HAS_GPIOF + gpio_init(GPIOF, &gpio_default_config.PFData); +#endif +#if STM32_HAS_GPIOG + gpio_init(GPIOG, &gpio_default_config.PGData); +#endif +#if STM32_HAS_GPIOH + gpio_init(GPIOH, &gpio_default_config.PHData); +#endif +#if STM32_HAS_GPIOI + gpio_init(GPIOI, &gpio_default_config.PIData); +#endif +#if STM32_HAS_GPIOJ + gpio_init(GPIOJ, &gpio_default_config.PJData); +#endif +#if STM32_HAS_GPIOK + gpio_init(GPIOK, &gpio_default_config.PKData); +#endif +} + +/*===========================================================================*/ +/* Driver interrupt handlers. */ +/*===========================================================================*/ + +/*===========================================================================*/ +/* Driver exported functions. */ +/*===========================================================================*/ /** * @brief Early initialization code. - * @details This initialization must be performed just after stack setup - * and before any other initialization. + * @details GPIO ports and system clocks are initialized before everything + * else. */ void __early_init(void) { + stm32_gpio_init(); stm32_clock_init(); } @@ -134,4 +262,5 @@ bool mmc_lld_is_write_protected(MMCDriver *mmcp) { * @todo Add your board-specific code, if any. */ void boardInit(void) { + } diff --git a/firmware/config/boards/NUCLEO_F767/board.h b/firmware/config/boards/NUCLEO_F767/board.h index 9f3b7fdb6f..1b5766a38f 100644 --- a/firmware/config/boards/NUCLEO_F767/board.h +++ b/firmware/config/boards/NUCLEO_F767/board.h @@ -1,5 +1,5 @@ /* - ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio + ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,6 +22,10 @@ #ifndef BOARD_H #define BOARD_H +/*===========================================================================*/ +/* Driver constants. */ +/*===========================================================================*/ + /* * Setup for STMicroelectronics STM32 Nucleo144-F767ZI board. */ @@ -361,7 +365,6 @@ #define LINE_SWCLK PAL_LINE(GPIOA, 14U) #define LINE_ZIO_D20 PAL_LINE(GPIOA, 15U) #define LINE_I2S3_WS PAL_LINE(GPIOA, 15U) - #define LINE_ZIO_D33 PAL_LINE(GPIOB, 0U) #define LINE_TIM3_CH3 PAL_LINE(GPIOB, 0U) #define LINE_LED1 PAL_LINE(GPIOB, 0U) @@ -394,7 +397,6 @@ #define LINE_LED3 PAL_LINE(GPIOB, 14U) #define LINE_ZIO_D17 PAL_LINE(GPIOB, 15U) #define LINE_I2S2_SD PAL_LINE(GPIOB, 15U) - #define LINE_ARD_A1 PAL_LINE(GPIOC, 0U) #define LINE_ADC123_IN10 PAL_LINE(GPIOC, 0U) #define LINE_RMII_MDC PAL_LINE(GPIOC, 1U) @@ -421,7 +423,6 @@ #define LINE_BUTTON PAL_LINE(GPIOC, 13U) #define LINE_OSC32_IN PAL_LINE(GPIOC, 14U) #define LINE_OSC32_OUT PAL_LINE(GPIOC, 15U) - #define LINE_ZIO_D67 PAL_LINE(GPIOD, 0U) #define LINE_CAN1_RX PAL_LINE(GPIOD, 0U) #define LINE_ZIO_D66 PAL_LINE(GPIOD, 1U) @@ -452,7 +453,6 @@ #define LINE_SPI1_NSS PAL_LINE(GPIOD, 14U) #define LINE_ARD_D9 PAL_LINE(GPIOD, 15U) #define LINE_TIM4_CH4 PAL_LINE(GPIOD, 15U) - #define LINE_ZIO_D34 PAL_LINE(GPIOE, 0U) #define LINE_TIM4_ETR PAL_LINE(GPIOE, 0U) #define LINE_ZIO_D31 PAL_LINE(GPIOE, 2U) @@ -483,7 +483,6 @@ #define LINE_ZIO_D38 PAL_LINE(GPIOE, 14U) #define LINE_ZIO_D37 PAL_LINE(GPIOE, 15U) #define LINE_TIM1_BKIN1 PAL_LINE(GPIOE, 15U) - #define LINE_ZIO_D68 PAL_LINE(GPIOF, 0U) #define LINE_I2C2_SDA PAL_LINE(GPIOF, 0U) #define LINE_ZIO_D69 PAL_LINE(GPIOF, 1U) @@ -508,7 +507,6 @@ #define LINE_ARD_D7 PAL_LINE(GPIOF, 13U) #define LINE_ARD_D4 PAL_LINE(GPIOF, 14U) #define LINE_ARD_D2 PAL_LINE(GPIOF, 15U) - #define LINE_ZIO_D65 PAL_LINE(GPIOG, 0U) #define LINE_ZIO_D64 PAL_LINE(GPIOG, 1U) #define LINE_ZIO_D49 PAL_LINE(GPIOG, 2U) @@ -521,12 +519,24 @@ #define LINE_RMII_TXD0 PAL_LINE(GPIOG, 13U) #define LINE_ARD_D1 PAL_LINE(GPIOG, 14U) #define LINE_USART6_TX PAL_LINE(GPIOG, 14U) - #define LINE_OSC_IN PAL_LINE(GPIOH, 0U) #define LINE_OSC_OUT PAL_LINE(GPIOH, 1U) +/*===========================================================================*/ +/* Driver pre-compile time settings. */ +/*===========================================================================*/ +/*===========================================================================*/ +/* Derived constants and error checks. */ +/*===========================================================================*/ +/*===========================================================================*/ +/* Driver data structures and types. */ +/*===========================================================================*/ + +/*===========================================================================*/ +/* Driver macros. */ +/*===========================================================================*/ /* * I/O ports initial setup, this configuration is established soon after reset @@ -1837,6 +1847,9 @@ PIN_AFIO_AF(GPIOK_PIN14, 0U) | \ PIN_AFIO_AF(GPIOK_PIN15, 0U)) +/*===========================================================================*/ +/* External declarations. */ +/*===========================================================================*/ #if !defined(_FROM_ASM_) #ifdef __cplusplus diff --git a/firmware/config/boards/NUCLEO_F767/board_configuration.cpp b/firmware/config/boards/NUCLEO_F767/board_configuration.cpp index 7c0f43c16a..a67cc38bc6 100644 --- a/firmware/config/boards/NUCLEO_F767/board_configuration.cpp +++ b/firmware/config/boards/NUCLEO_F767/board_configuration.cpp @@ -53,7 +53,7 @@ void setBoardConfigurationOverrides(void) { engineConfiguration->adcVcc = ADC_VCC; #endif engineConfiguration->baroSensor.hwChannel = EFI_ADC_NONE; - engineConfiguration->pedalPositionAdcChannel = EFI_ADC_NONE; + engineConfiguration->throttlePedalPositionAdcChannel = EFI_ADC_NONE; // not used engineConfiguration->dizzySparkOutputPin = GPIO_UNASSIGNED;