From 3f6c7c7be2d2620724f7c72b6be4993acbdedeb0 Mon Sep 17 00:00:00 2001 From: "Frederic.Pillon" Date: Thu, 29 Jun 2017 08:06:13 +0200 Subject: [PATCH 01/16] Fix compiler warning: comparison of unsigned expression Fix #44 cores/arduino/stm32/PinNamesTypes.h:132:44: warning: comparison of unsigned expression >= 0 is always true [-Wtype-limits] #define STM_VALID_PINNAME(X) ((STM_PORT(X) >= FirstPort) && (STM_PORT(X) <= LastPort)) Signed-off-by: Frederic.Pillon --- cores/arduino/stm32/PinNamesTypes.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cores/arduino/stm32/PinNamesTypes.h b/cores/arduino/stm32/PinNamesTypes.h index 1014d67f85..2116390e80 100644 --- a/cores/arduino/stm32/PinNamesTypes.h +++ b/cores/arduino/stm32/PinNamesTypes.h @@ -129,7 +129,10 @@ typedef enum { #define STM_PORT(X) (((uint32_t)(X) >> 4) & 0xF) #define STM_PIN(X) ((uint32_t)(X) & 0xF) // Check PinName is valid: FirstPort <= PortName <= LastPort -#define STM_VALID_PINNAME(X) ((STM_PORT(X) >= FirstPort) && (STM_PORT(X) <= LastPort)) +// As FirstPort is equal to 0 and STM_PORT cast as an unsigned +// (STM_PORT(X) >= FirstPort) is always true +//#define STM_VALID_PINNAME(X) ((STM_PORT(X) >= FirstPort) && (STM_PORT(X) <= LastPort)) +#define STM_VALID_PINNAME(X) (STM_PORT(X) <= LastPort) #define STM_GPIO_PIN(X) ((uint16_t)(1< Date: Thu, 29 Jun 2017 08:15:25 +0200 Subject: [PATCH 02/16] Fix compiler warning: "UNUSED" redefined Fix #44 cores/arduino/syscalls_stm32.c:45:0: warning: "UNUSED" redefined #define UNUSED(x) x ## _UNUSED __attribute__((__unused__)) Signed-off-by: Frederic.Pillon --- cores/arduino/syscalls_stm32.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cores/arduino/syscalls_stm32.c b/cores/arduino/syscalls_stm32.c index 960d95b7f0..92dac01614 100644 --- a/cores/arduino/syscalls_stm32.c +++ b/cores/arduino/syscalls_stm32.c @@ -41,6 +41,9 @@ // Helper macro to mark unused parameters and prevent compiler warnings. // Appends _UNUSED to the variable name to prevent accidentally using them. +#ifdef UNUSED +#undef UNUSED +#endif #ifdef __GNUC__ #define UNUSED(x) x ## _UNUSED __attribute__((__unused__)) #else From a7ffd7b176397f3b11b19e67a80029b495580c99 Mon Sep 17 00:00:00 2001 From: "Frederic.Pillon" Date: Thu, 29 Jun 2017 08:17:37 +0200 Subject: [PATCH 03/16] Fix compiler warning: comparison between pointer and integer Fix #44 cores/arduino/WInterrupts.c:30:12: warning: comparison between pointer and integer if (port == NC) Signed-off-by: Frederic.Pillon --- cores/arduino/WInterrupts.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cores/arduino/WInterrupts.c b/cores/arduino/WInterrupts.c index a0b5a7c6dc..1a24ababde 100644 --- a/cores/arduino/WInterrupts.c +++ b/cores/arduino/WInterrupts.c @@ -27,7 +27,7 @@ void attachInterrupt(uint32_t pin, void (*callback)(void), uint32_t mode) uint32_t it_mode; PinName p = digitalPinToPinName(pin); GPIO_TypeDef* port = set_GPIO_Port_Clock(STM_PORT(p)); - if (port == NC) + if (!port) return; switch(mode) { @@ -53,7 +53,7 @@ void detachInterrupt(uint32_t pin) { PinName p = digitalPinToPinName(pin); GPIO_TypeDef* port = get_GPIO_Port(STM_PORT(p)); - if (port == NC) + if (!port) return; stm32_interrupt_disable(port, STM_GPIO_PIN(p)); } From 21066cedfde9a2457120100ce1b29613d7c4c6e2 Mon Sep 17 00:00:00 2001 From: "Frederic.Pillon" Date: Thu, 29 Jun 2017 08:36:57 +0200 Subject: [PATCH 04/16] Fix compiler warning: implicit declaration of function Fix #44 cores/arduino/wiring_digital.c:37:8: warning: implicit declaration of function 'is_pin_configured' [-Wimplicit-function-declaration] if(is_pin_configured(p, g_anOutputPinConfigured)) { Signed-off-by: Frederic.Pillon --- cores/arduino/wiring_analog.c | 1 + cores/arduino/wiring_digital.c | 1 + 2 files changed, 2 insertions(+) diff --git a/cores/arduino/wiring_analog.c b/cores/arduino/wiring_analog.c index 604e36ca4e..0230adbf00 100644 --- a/cores/arduino/wiring_analog.c +++ b/cores/arduino/wiring_analog.c @@ -17,6 +17,7 @@ */ #include "Arduino.h" +#include "PinConfigured.h" #ifdef __cplusplus extern "C" { diff --git a/cores/arduino/wiring_digital.c b/cores/arduino/wiring_digital.c index 02cc6582b7..886fcbba1f 100644 --- a/cores/arduino/wiring_digital.c +++ b/cores/arduino/wiring_digital.c @@ -17,6 +17,7 @@ */ #include "Arduino.h" +#include "PinConfigured.h" #ifdef __cplusplus extern "C" { From b69648658fdecaff1808bbcdaa56ab031dbf4b2c Mon Sep 17 00:00:00 2001 From: "Frederic.Pillon" Date: Thu, 29 Jun 2017 08:38:54 +0200 Subject: [PATCH 05/16] Fix compiler warning: 'uwTimclock' may be used uninitialized Fix #44 cores/arduino/stm32/timer.c:733:19: warning: 'uwTimclock' may be used uninitialized in this function [-Wmaybe-uninitialized] uwTimclock*=2; Signed-off-by: Frederic.Pillon --- cores/arduino/stm32/timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cores/arduino/stm32/timer.c b/cores/arduino/stm32/timer.c index 85fd55c332..7c737c37fd 100644 --- a/cores/arduino/stm32/timer.c +++ b/cores/arduino/stm32/timer.c @@ -672,7 +672,7 @@ uint32_t getTimerClkFreq(TIM_TypeDef* tim) { RCC_ClkInitTypeDef clkconfig = {}; uint32_t pFLatency = 0U; - uint32_t uwTimclock, uwAPBxPrescaler = 0U; + uint32_t uwTimclock = 0U, uwAPBxPrescaler = 0U; /* Get clock configuration */ HAL_RCC_GetClockConfig(&clkconfig, &pFLatency); From 4f8a1b21658d920f7d20b752e0b8fe686d2369db Mon Sep 17 00:00:00 2001 From: "Frederic.Pillon" Date: Thu, 29 Jun 2017 08:41:41 +0200 Subject: [PATCH 06/16] Fix compiler warning: control reaches end of non-void function Fix #44 cores/arduino/wiring_digital.c:90:1: warning: control reaches end of non-void function [-Wreturn-type] } Signed-off-by: Frederic.Pillon --- cores/arduino/wiring_digital.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cores/arduino/wiring_digital.c b/cores/arduino/wiring_digital.c index 886fcbba1f..6619299d2b 100644 --- a/cores/arduino/wiring_digital.c +++ b/cores/arduino/wiring_digital.c @@ -86,8 +86,8 @@ int digitalRead( uint32_t ulPin ) if(is_pin_configured(p, g_digPinConfigured)) { level = digital_io_read(get_GPIO_Port(STM_PORT(p)), STM_GPIO_PIN(p)); } - return (level)? HIGH : LOW; } + return (level)? HIGH : LOW; } #ifdef __cplusplus From bc20b9e7fa9b7fad7f8ebe065e4a4aff3da7d06a Mon Sep 17 00:00:00 2001 From: "Frederic.Pillon" Date: Thu, 29 Jun 2017 08:43:32 +0200 Subject: [PATCH 07/16] Fix typo Clean comment Signed-off-by: Frederic.Pillon --- cores/arduino/stm32/digital_io.c | 67 +------------------------------- 1 file changed, 1 insertion(+), 66 deletions(-) diff --git a/cores/arduino/stm32/digital_io.c b/cores/arduino/stm32/digital_io.c index 9a788ddd10..3436121ac4 100644 --- a/cores/arduino/stm32/digital_io.c +++ b/cores/arduino/stm32/digital_io.c @@ -35,17 +35,6 @@ * ****************************************************************************** */ -/** @addtogroup CMSIS - * @{ - */ - -/** @addtogroup stm32f4xx_system - * @{ - */ - -/** @addtogroup STM32F4xx_System_Private_Includes - * @{ - */ #include "digital_io.h" #include "stm32_def.h" #include "hw_config.h" @@ -53,49 +42,6 @@ #ifdef __cplusplus extern "C" { #endif -/** - * @} - */ - -/** @addtogroup STM32F4xx_System_Private_TypesDefinitions - * @{ - */ - -/** - * @} - */ - -/** @addtogroup STM32F4xx_System_Private_Defines - * @{ - */ -/** - * @} - */ - -/** @addtogroup STM32F4xx_System_Private_Macros - * @{ - */ - -/** - * @} - */ - -/** @addtogroup STM32F4xx_System_Private_Variables - * @{ - */ - -/** - * @} - */ - -/** @addtogroup STM32F4xx_System_Private_FunctionPrototypes - * @{ - */ - -/** - * @} - */ - /** * @brief This function initialize the IO @@ -108,7 +54,7 @@ void digital_io_init(PinName pin, uint32_t mode, uint32_t pull) { GPIO_InitTypeDef GPIO_InitStructure; - GPIO_TypeDef *port = set_GPIO_Port_Clock(STM_PORT(pin));; + GPIO_TypeDef *port = set_GPIO_Port_Clock(STM_PORT(pin)); GPIO_InitStructure.Pin = STM_GPIO_PIN(pin); GPIO_InitStructure.Speed = GPIO_SPEED_FREQ_HIGH; GPIO_InitStructure.Mode = mode; @@ -144,17 +90,6 @@ uint32_t digital_io_read(GPIO_TypeDef *port, uint32_t pin) return (uint32_t)HAL_GPIO_ReadPin(port, pin); } -/** - * @} - */ - -/** - * @} - */ - -/** - * @} - */ #ifdef __cplusplus } #endif From 44f6cf2ba0ee409ee2b8c7523a54b6af83c1c0a4 Mon Sep 17 00:00:00 2001 From: "Frederic.Pillon" Date: Thu, 29 Jun 2017 10:47:46 +0200 Subject: [PATCH 08/16] Fix compiler warning: unused parameter [-Wunused-parameter] Fix #44 Signed-off-by: Frederic.Pillon --- cores/arduino/stm32/analog.c | 3 +++ cores/arduino/stm32/interrupt.c | 1 + cores/arduino/stm32/uart_emul.c | 4 +++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/cores/arduino/stm32/analog.c b/cores/arduino/stm32/analog.c index 75e5ba1dff..17cfdae28f 100644 --- a/cores/arduino/stm32/analog.c +++ b/cores/arduino/stm32/analog.c @@ -255,6 +255,8 @@ void HAL_DAC_MspInit(DAC_HandleTypeDef *hdac) { GPIO_InitTypeDef GPIO_InitStruct; GPIO_TypeDef *port; + UNUSED(hdac); + /*##-1- Enable peripherals and GPIO Clocks #################################*/ /* Enable GPIO clock ****************************************/ port = set_GPIO_Port_Clock(STM_PORT(g_current_pin)); @@ -338,6 +340,7 @@ void dac_write_value(PinName pin, uint32_t value, uint8_t do_init) */ void HAL_DAC_MspDeInit(DAC_HandleTypeDef* hdac) { + UNUSED(hdac); /* DAC Periph clock disable */ #ifdef __HAL_RCC_DAC1_CLK_DISABLE __HAL_RCC_DAC1_CLK_DISABLE(); diff --git a/cores/arduino/stm32/interrupt.c b/cores/arduino/stm32/interrupt.c index b46b7c539c..3bcc62039d 100644 --- a/cores/arduino/stm32/interrupt.c +++ b/cores/arduino/stm32/interrupt.c @@ -206,6 +206,7 @@ void stm32_interrupt_enable(GPIO_TypeDef *port, uint16_t pin, void (*callback)(v */ void stm32_interrupt_disable(GPIO_TypeDef *port, uint16_t pin) { + UNUSED(port); uint8_t id = get_pin_id(pin); gpio_irq_conf[id].callback = NULL; diff --git a/cores/arduino/stm32/uart_emul.c b/cores/arduino/stm32/uart_emul.c index 74234d7529..47e2ab0fd9 100644 --- a/cores/arduino/stm32/uart_emul.c +++ b/cores/arduino/stm32/uart_emul.c @@ -131,7 +131,7 @@ uint8_t g_rx_data[1]; /** @addtogroup STM32F4xx_System_Private_FunctionPrototypes * @{ */ -static void uart_emul_timer_irq(stimer_t *obj) {g_uartEmul_config[UART1_EMUL_E].uart_rx_irqHandle();} +static void uart_emul_timer_irq(stimer_t *obj) {UNUSED(obj); g_uartEmul_config[UART1_EMUL_E].uart_rx_irqHandle();} /** * @} @@ -152,6 +152,7 @@ void HAL_UART_Emul_MspInit(UART_Emul_HandleTypeDef *huart) GPIO_InitTypeDef GPIO_InitStruct; GPIO_TypeDef *port_rx; GPIO_TypeDef *port_tx; + UNUSED(huart); // Enable GPIO clock port_rx = set_GPIO_Port_Clock(STM_PORT(g_uartEmul_config[UART1_EMUL_E].pin_rx)); @@ -189,6 +190,7 @@ void HAL_UART_Emul_MspDeInit(UART_Emul_HandleTypeDef *huart) { GPIO_TypeDef *port_rx = get_GPIO_Port(STM_PORT(g_uartEmul_config[UART1_EMUL_E].pin_rx)); GPIO_TypeDef *port_tx = get_GPIO_Port(STM_PORT(g_uartEmul_config[UART1_EMUL_E].pin_tx)); + UNUSED(huart); __UART_EMUL_CLK_DISABLE(); From c8c6e43af25d464fcd4355d81a845d330c61c9c4 Mon Sep 17 00:00:00 2001 From: "Frederic.Pillon" Date: Thu, 29 Jun 2017 10:49:59 +0200 Subject: [PATCH 09/16] dtostrf: use width argument Fix #44 Handle minimum field width of the output string width is signed value, negative for left adjustment. Range -128,127 Signed-off-by: Frederic.Pillon --- cores/arduino/avr/dtostrf.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/cores/arduino/avr/dtostrf.c b/cores/arduino/avr/dtostrf.c index 1012ecd34a..7b0a2fee50 100644 --- a/cores/arduino/avr/dtostrf.c +++ b/cores/arduino/avr/dtostrf.c @@ -19,6 +19,8 @@ */ #include +#include +#include char *dtostrf (double val, signed char width, unsigned char prec, char *sout) { //Commented code is the original version @@ -59,5 +61,31 @@ char *dtostrf (double val, signed char width, unsigned char prec, char *sout) { sprintf(sout, "%ld.%ld", int_part, dec_part); + // Handle minimum field width of the output string + // width is signed value, negative for left adjustment. + // Range -128,127 + char fmt[129] = ""; + unsigned int w = width; + if (width < 0) { + negative = 1; + w = -width; + } else { + negative = 0; + } + + if(strlen(sout) < w) { + memset(fmt, ' ', 128); + fmt[w-strlen(sout)] = '\0'; + if(negative == 0) { + char *tmp = strdup(sout); + strcpy(sout,fmt); + strcat(sout, tmp); + free(tmp); + } else { + // left adjustment + strcat(sout, fmt); + } + } + return sout; } From bc76435fddb275267e47863cb417d714a60dcfc9 Mon Sep 17 00:00:00 2001 From: "Frederic.Pillon" Date: Thu, 29 Jun 2017 10:57:08 +0200 Subject: [PATCH 10/16] Fix compiler warning: differ in signedness Fix #44 syscalls_stm32.c:118:20: warning: pointer targets in passing argument 1 of 'uart_debug_write' differ in signedness [-Wpointer-sign] uart_debug_write(ptr, len); Signed-off-by: Frederic.Pillon --- cores/arduino/syscalls_stm32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cores/arduino/syscalls_stm32.c b/cores/arduino/syscalls_stm32.c index 92dac01614..582947dd91 100644 --- a/cores/arduino/syscalls_stm32.c +++ b/cores/arduino/syscalls_stm32.c @@ -115,7 +115,7 @@ extern int _read(UNUSED(int file), UNUSED(char *ptr), UNUSED(int len) ) extern int _write( UNUSED(int file), char *ptr, int len ) { - uart_debug_write(ptr, len); + uart_debug_write((uint8_t *)ptr, len); return len ; } From 06d8d46000b3df09cac4309c46822e3de68acfac Mon Sep 17 00:00:00 2001 From: "Frederic.Pillon" Date: Thu, 29 Jun 2017 11:01:28 +0200 Subject: [PATCH 11/16] Fix compiler warning: 'return' with a value Fix #44 cores/arduino/stm32/analog.c:723:40: warning: 'return' with a value, in function returning void if (timHandle.Instance == NC) return 0; Signed-off-by: Frederic.Pillon --- cores/arduino/stm32/analog.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cores/arduino/stm32/analog.c b/cores/arduino/stm32/analog.c index 17cfdae28f..f5d1ed1914 100644 --- a/cores/arduino/stm32/analog.c +++ b/cores/arduino/stm32/analog.c @@ -720,7 +720,7 @@ void pwm_start(PinName pin, uint32_t clock_freq, /* Compute the prescaler value to have TIM counter clock equal to clock_freq Hz */ timHandle.Instance = pinmap_peripheral(pin, PinMap_PWM); - if (timHandle.Instance == NC) return 0; + if (timHandle.Instance == NC) return; timHandle.Init.Prescaler = (uint32_t)(getTimerClkFreq(timHandle.Instance) / clock_freq) - 1; timHandle.Init.Period = period -1; timHandle.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1; @@ -781,9 +781,9 @@ void pwm_stop(PinName pin) uint32_t timChannel; timHandle.Instance = pinmap_peripheral(pin, PinMap_PWM); - if (timHandle.Instance == NC) return 0; + if (timHandle.Instance == NC) return; timChannel = get_pwm_channel(pin); - if (!IS_TIM_CHANNELS(timChannel)) return 0; + if (!IS_TIM_CHANNELS(timChannel)) return; #ifndef STM32L0xx if (STM_PIN_INVERTED(pinmap_function(pin, PinMap_PWM))) { From c62250cf69897ee024c8e25f391838fdc8feab58 Mon Sep 17 00:00:00 2001 From: "Frederic.Pillon" Date: Thu, 29 Jun 2017 11:16:56 +0200 Subject: [PATCH 12/16] Fix compiler warning: assignment makes pointer from integer without a cast Fix #44 cores/arduino/stm32/PortNames.c:38:22: warning: assignment makes pointer from integer without a cast [-Wint-conversion] gpioPort = GPIOA_BASE; Signed-off-by: Frederic.Pillon --- cores/arduino/stm32/PortNames.c | 44 ++++++++++++++++----------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/cores/arduino/stm32/PortNames.c b/cores/arduino/stm32/PortNames.c index 8b810b2cb4..2cdd52219c 100644 --- a/cores/arduino/stm32/PortNames.c +++ b/cores/arduino/stm32/PortNames.c @@ -35,54 +35,54 @@ GPIO_TypeDef *get_GPIO_Port(uint32_t port_idx) { GPIO_TypeDef* gpioPort = 0; switch (port_idx) { case PortA: - gpioPort = GPIOA_BASE; + gpioPort = (GPIO_TypeDef *)GPIOA_BASE; break; case PortB: - gpioPort = GPIOB_BASE; + gpioPort = (GPIO_TypeDef *)GPIOB_BASE; break; #if defined GPIOC_BASE case PortC: - gpioPort = GPIOC_BASE; + gpioPort = (GPIO_TypeDef *)GPIOC_BASE; break; #endif #if defined GPIOD_BASE case PortD: - gpioPort = GPIOD_BASE; + gpioPort = (GPIO_TypeDef *)GPIOD_BASE; break; #endif #if defined GPIOE_BASE case PortE: - gpioPort = GPIOE_BASE; + gpioPort = (GPIO_TypeDef *)GPIOE_BASE; break; #endif #if defined GPIOF_BASE case PortF: - gpioPort = GPIOF_BASE; + gpioPort = (GPIO_TypeDef *)GPIOF_BASE; break; #endif #if defined GPIOG_BASE case PortG: - gpioPort = GPIOG_BASE; + gpioPort = (GPIO_TypeDef *)GPIOG_BASE; break; #endif #if defined GPIOH_BASE case PortH: - gpioPort = GPIOH_BASE; + gpioPort = (GPIO_TypeDef *)GPIOH_BASE; break; #endif #if defined GPIOI_BASE case PortI: - gpioPort = GPIOI_BASE; + gpioPort = (GPIO_TypeDef *)GPIOI_BASE; break; #endif #if defined GPIOJ_BASE case PortJ: - gpioPort = GPIOJ_BASE; + gpioPort = (GPIO_TypeDef *)GPIOJ_BASE; break; #endif #if defined GPIOK_BASE case PortK: - gpioPort = GPIOK_BASE; + gpioPort = (GPIO_TypeDef *)GPIOK_BASE; break; #endif default: @@ -99,64 +99,64 @@ GPIO_TypeDef *set_GPIO_Port_Clock(uint32_t port_idx) { GPIO_TypeDef* gpioPort = 0; switch (port_idx) { case PortA: - gpioPort = GPIOA_BASE; + gpioPort = (GPIO_TypeDef *)GPIOA_BASE; __HAL_RCC_GPIOA_CLK_ENABLE(); break; case PortB: - gpioPort = GPIOB_BASE; + gpioPort = (GPIO_TypeDef *)GPIOB_BASE; __HAL_RCC_GPIOB_CLK_ENABLE(); break; #if defined GPIOC_BASE case PortC: - gpioPort = GPIOC_BASE; + gpioPort = (GPIO_TypeDef *)GPIOC_BASE; __HAL_RCC_GPIOC_CLK_ENABLE(); break; #endif #if defined GPIOD_BASE case PortD: - gpioPort = GPIOD_BASE; + gpioPort = (GPIO_TypeDef *)GPIOD_BASE; __HAL_RCC_GPIOD_CLK_ENABLE(); break; #endif #if defined GPIOE_BASE case PortE: - gpioPort = GPIOE_BASE; + gpioPort = (GPIO_TypeDef *)GPIOE_BASE; __HAL_RCC_GPIOE_CLK_ENABLE(); break; #endif #if defined GPIOF_BASE case PortF: - gpioPort = GPIOF_BASE; + gpioPort = (GPIO_TypeDef *)GPIOF_BASE; __HAL_RCC_GPIOF_CLK_ENABLE(); break; #endif #if defined GPIOG_BASE case PortG: - gpioPort = GPIOG_BASE; + gpioPort = (GPIO_TypeDef *)GPIOG_BASE; __HAL_RCC_GPIOG_CLK_ENABLE(); break; #endif #if defined GPIOH_BASE case PortH: - gpioPort = GPIOH_BASE; + gpioPort = (GPIO_TypeDef *)GPIOH_BASE; __HAL_RCC_GPIOH_CLK_ENABLE(); break; #endif #if defined GPIOI_BASE case PortI: - gpioPort = GPIOI_BASE; + gpioPort = (GPIO_TypeDef *)GPIOI_BASE; __HAL_RCC_GPIOI_CLK_ENABLE(); break; #endif #if defined GPIOJ_BASE case PortJ: - gpioPort = GPIOJ_BASE; + gpioPort = (GPIO_TypeDef *)GPIOJ_BASE; __HAL_RCC_GPIOJ_CLK_ENABLE(); break; #endif #if defined GPIOK_BASE case PortK: - gpioPort = GPIOK_BASE; + gpioPort = (GPIO_TypeDef *)GPIOK_BASE; __HAL_RCC_GPIOK_CLK_ENABLE(); break; #endif From 2fbfed07eb07fc74844d580f03bb7d453d23e573 Mon Sep 17 00:00:00 2001 From: "Frederic.Pillon" Date: Thu, 29 Jun 2017 15:02:14 +0200 Subject: [PATCH 13/16] Fix compiler warning: initialization makes integer from pointer without a cast Fix #44 Using a uint32_t was a legacy from mbed pinmap feature. This allow to be compatible with high leve api common to all mbed target. There is not reason to keep it for Arduino. Peripheral(SPIx, DACx, TIMx,...) is a pointer so manage it as it is to avoid cast. system/Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f429xx.h:1245:29: warning: initialization makes integer from pointer without a cast [-Wint-conversion] #define ADC1 ((ADC_TypeDef *) ADC1_BASE) ^ /local/data/work/stm32/stm32duino/arduino-1.8.3/hardware/STM32/stm32/variants/NUCLEO_F429ZI/PeripheralPins.c:41:13: note: in expansion of macro 'ADC1' {PA0, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC1_IN0 - PA0/WKUP ^~~~ ... Signed-off-by: Frederic.Pillon --- cores/arduino/stm32/analog.c | 10 +++---- cores/arduino/stm32/pinmap.c | 39 ++++++++++++------------- cores/arduino/stm32/pinmap.h | 11 ++++--- cores/arduino/stm32/spi_com.c | 26 ++++++++--------- cores/arduino/stm32/twi.c | 8 ++--- cores/arduino/stm32/uart.c | 8 ++--- cores/arduino/stm32/uart_emul.c | 4 +-- variants/DISCO_F407VG/PeripheralPins.c | 30 +++++++++---------- variants/DISCO_F746NG/PeripheralPins.c | 30 +++++++++---------- variants/NUCLEO_F030R8/PeripheralPins.c | 24 +++++++-------- variants/NUCLEO_F091RC/PeripheralPins.c | 30 +++++++++---------- variants/NUCLEO_F303RE/PeripheralPins.c | 30 +++++++++---------- variants/NUCLEO_F429ZI/PeripheralPins.c | 30 +++++++++---------- variants/NUCLEO_L053R8/PeripheralPins.c | 28 +++++++++--------- variants/NUCLEO_L476RG/PeripheralPins.c | 30 +++++++++---------- 15 files changed, 170 insertions(+), 168 deletions(-) diff --git a/cores/arduino/stm32/analog.c b/cores/arduino/stm32/analog.c index f5d1ed1914..46d0b653bb 100644 --- a/cores/arduino/stm32/analog.c +++ b/cores/arduino/stm32/analog.c @@ -292,7 +292,7 @@ void dac_write_value(PinName pin, uint32_t value, uint8_t do_init) uint32_t dacChannel; DacHandle.Instance = pinmap_peripheral(pin, PinMap_DAC); - if (DacHandle.Instance == NC) return; + if (DacHandle.Instance == NP) return; dacChannel = get_dac_channel(pin); if (!IS_DAC_CHANNEL(dacChannel)) return; if(do_init == 1) { @@ -362,7 +362,7 @@ void dac_stop(PinName pin) uint32_t dacChannel; DacHandle.Instance = pinmap_peripheral(pin, PinMap_DAC); - if (DacHandle.Instance == NC) return; + if (DacHandle.Instance == NP) return; dacChannel = get_dac_channel(pin); if (!IS_DAC_CHANNEL(dacChannel)) return; @@ -553,7 +553,7 @@ uint16_t adc_read_value(PinName pin) AdcHandle.Instance = pinmap_peripheral(pin, PinMap_ADC); - if (AdcHandle.Instance == NC) return 0; + if (AdcHandle.Instance == NP) return 0; AdcHandle.Init.ClockPrescaler = ADC_CLOCK_DIV; /* Asynchronous clock mode, input ADC clock divided */ AdcHandle.Init.Resolution = ADC_RESOLUTION_12B; /* 12-bit resolution for converted data */ @@ -720,7 +720,7 @@ void pwm_start(PinName pin, uint32_t clock_freq, /* Compute the prescaler value to have TIM counter clock equal to clock_freq Hz */ timHandle.Instance = pinmap_peripheral(pin, PinMap_PWM); - if (timHandle.Instance == NC) return; + if (timHandle.Instance == NP) return; timHandle.Init.Prescaler = (uint32_t)(getTimerClkFreq(timHandle.Instance) / clock_freq) - 1; timHandle.Init.Period = period -1; timHandle.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1; @@ -781,7 +781,7 @@ void pwm_stop(PinName pin) uint32_t timChannel; timHandle.Instance = pinmap_peripheral(pin, PinMap_PWM); - if (timHandle.Instance == NC) return; + if (timHandle.Instance == NP) return; timChannel = get_pwm_channel(pin); if (!IS_TIM_CHANNELS(timChannel)) return; diff --git a/cores/arduino/stm32/pinmap.c b/cores/arduino/stm32/pinmap.c index 235a48a9f6..4a6402d713 100644 --- a/cores/arduino/stm32/pinmap.c +++ b/cores/arduino/stm32/pinmap.c @@ -17,23 +17,22 @@ #include "pinmap.h" -uint32_t pinmap_find_peripheral(PinName pin, const PinMap* map) { +void* pinmap_find_peripheral(PinName pin, const PinMap* map) { while (map->pin != NC) { if (map->pin == pin) return map->peripheral; map++; } - return (uint32_t)NC; + return NP; } -uint32_t pinmap_peripheral(PinName pin, const PinMap* map) { - uint32_t peripheral = (uint32_t)NC; +void* pinmap_peripheral(PinName pin, const PinMap* map) { + void* peripheral = NP; - if (pin == (PinName)NC) - return (uint32_t)NC; - peripheral = pinmap_find_peripheral(pin, map); - //if ((uint32_t)NC == peripheral) // no mapping available - // error("pinmap not found for peripheral"); + if (pin != (PinName)NC) { + peripheral = pinmap_find_peripheral(pin, map); + } + // else error("pinmap not found for peripheral"); return peripheral; } @@ -49,11 +48,10 @@ uint32_t pinmap_find_function(PinName pin, const PinMap* map) { uint32_t pinmap_function(PinName pin, const PinMap* map) { uint32_t function = (uint32_t)NC; - if (pin == (PinName)NC) - return (uint32_t)NC; - function = pinmap_find_function(pin, map); - //if ((uint32_t)NC == function) // no mapping available - // error("pinmap not found for function"); + if (pin != (PinName)NC) { + function = pinmap_find_function(pin, map); + } + // else error("pinmap not found for function"); return function; } @@ -68,18 +66,19 @@ bool pin_in_pinmap(PinName pin, const PinMap* map) { return false; } -uint32_t pinmap_merge(uint32_t a, uint32_t b) { - // both are the same (inc both NC) +// Merge peripherals +void* pinmap_merge_peripheral(void* a, void* b) { + // both are the same (inc both NP) if (a == b) return a; - // one (or both) is not connected - if (a == (uint32_t)NC) + // one (or both) is not set + if (a == NP) return b; - if (b == (uint32_t)NC) + if (b == NP) return a; // mis-match error case // error("pinmap mis-match"); - return (uint32_t)NC; + return NP; } diff --git a/cores/arduino/stm32/pinmap.h b/cores/arduino/stm32/pinmap.h index d19213246f..88af8afbc5 100644 --- a/cores/arduino/stm32/pinmap.h +++ b/cores/arduino/stm32/pinmap.h @@ -27,20 +27,23 @@ extern "C" { #endif +// No peripheral +#define NP 0U + typedef struct { PinName pin; - int peripheral; + void* peripheral; int function; } PinMap; bool pin_in_pinmap(PinName pin, const PinMap* map); void pin_function(PinName pin, int function); -uint32_t pinmap_peripheral(PinName pin, const PinMap* map); +void* pinmap_peripheral(PinName pin, const PinMap* map); uint32_t pinmap_function(PinName pin, const PinMap* map); -uint32_t pinmap_find_peripheral(PinName pin, const PinMap* map); +void* pinmap_find_peripheral(PinName pin, const PinMap* map); uint32_t pinmap_find_function(PinName pin, const PinMap* map); -uint32_t pinmap_merge(uint32_t a, uint32_t b); +void* pinmap_merge_peripheral(void* a, void* b); #ifdef __cplusplus } diff --git a/cores/arduino/stm32/spi_com.c b/cores/arduino/stm32/spi_com.c index a3b4875903..f91a3e6198 100644 --- a/cores/arduino/stm32/spi_com.c +++ b/cores/arduino/stm32/spi_com.c @@ -114,7 +114,7 @@ uint32_t spi_getClkFreqInst(SPI_TypeDef * spi_inst) /* SPIx source CLK is PCKL1 */ spi_freq = HAL_RCC_GetPCLK1Freq(); #else - if(spi_inst != (SPI_TypeDef *)NC) { + if(spi_inst != NP) { /* Get source clock depending on SPI instance */ switch ((uint32_t)spi_inst) { case (uint32_t)SPI1: @@ -153,13 +153,13 @@ uint32_t spi_getClkFreqInst(SPI_TypeDef * spi_inst) */ uint32_t spi_getClkFreq(spi_t *obj) { - uint32_t spi_inst = NC; + SPI_TypeDef *spi_inst = NP; uint32_t spi_freq = SystemCoreClock; if(obj != NULL) { spi_inst = pinmap_peripheral(obj->pin_sclk, PinMap_SPI_SCLK); - if(spi_inst != NC) { + if(spi_inst != NP) { spi_freq = spi_getClkFreqInst(spi_inst); } } @@ -185,23 +185,23 @@ void spi_init(spi_t *obj, uint32_t speed, spi_mode_e mode, uint8_t msb) uint32_t spi_freq = 0; // Determine the SPI to use - uint32_t spi_mosi = pinmap_peripheral(obj->pin_mosi, PinMap_SPI_MOSI); - uint32_t spi_miso = pinmap_peripheral(obj->pin_miso, PinMap_SPI_MISO); - uint32_t spi_sclk = pinmap_peripheral(obj->pin_sclk, PinMap_SPI_SCLK); - uint32_t spi_ssel = pinmap_peripheral(obj->pin_ssel, PinMap_SPI_SSEL); + SPI_TypeDef *spi_mosi = pinmap_peripheral(obj->pin_mosi, PinMap_SPI_MOSI); + SPI_TypeDef *spi_miso = pinmap_peripheral(obj->pin_miso, PinMap_SPI_MISO); + SPI_TypeDef *spi_sclk = pinmap_peripheral(obj->pin_sclk, PinMap_SPI_SCLK); + SPI_TypeDef *spi_ssel = pinmap_peripheral(obj->pin_ssel, PinMap_SPI_SSEL); - /* Pins MOSI/MISO/SCLK must not be NC. ssel can be NC. */ - if(spi_mosi == NC || spi_miso == NC || spi_sclk == NC) { + /* Pins MOSI/MISO/SCLK must not be NP. ssel can be NP. */ + if(spi_mosi == NP || spi_miso == NP || spi_sclk == NP) { return; } - uint32_t spi_data = pinmap_merge(spi_mosi, spi_miso); - uint32_t spi_cntl = pinmap_merge(spi_sclk, spi_ssel); + SPI_TypeDef *spi_data = pinmap_merge_peripheral(spi_mosi, spi_miso); + SPI_TypeDef *spi_cntl = pinmap_merge_peripheral(spi_sclk, spi_ssel); - obj->spi = (SPI_TypeDef *)pinmap_merge(spi_data, spi_cntl); + obj->spi = pinmap_merge_peripheral(spi_data, spi_cntl); // Are all pins connected to the same SPI instance? - if(obj->spi == (SPI_TypeDef *)NC) { + if(obj->spi == NP) { printf("ERROR: SPI pins mismatch\n"); return; } diff --git a/cores/arduino/stm32/twi.c b/cores/arduino/stm32/twi.c index 4f1bea026a..1412729c76 100644 --- a/cores/arduino/stm32/twi.c +++ b/cores/arduino/stm32/twi.c @@ -151,12 +151,12 @@ void i2c_custom_init(i2c_t *obj, i2c_timing_e timing, uint32_t addressingMode, u I2C_HandleTypeDef *handle = &(obj->handle); // Determine the I2C to use - uint32_t i2c_sda = pinmap_peripheral(obj->sda, PinMap_I2C_SDA); - uint32_t i2c_scl = pinmap_peripheral(obj->scl, PinMap_I2C_SCL); + I2C_TypeDef *i2c_sda = pinmap_peripheral(obj->sda, PinMap_I2C_SDA); + I2C_TypeDef *i2c_scl = pinmap_peripheral(obj->scl, PinMap_I2C_SCL); - obj->i2c = (I2C_TypeDef *)pinmap_merge(i2c_sda, i2c_scl); + obj->i2c = pinmap_merge_peripheral(i2c_sda, i2c_scl); - if(obj->i2c == (I2C_TypeDef *)NC) { + if(obj->i2c == NP) { printf("ERROR: I2C pins mismatch\n"); return; } diff --git a/cores/arduino/stm32/uart.c b/cores/arduino/stm32/uart.c index 9b431879c8..23eb64ffeb 100644 --- a/cores/arduino/stm32/uart.c +++ b/cores/arduino/stm32/uart.c @@ -128,13 +128,13 @@ void uart_init(serial_t *obj) GPIO_TypeDef *port; // Determine the UART to use (UART_1, UART_2, ...) - uint32_t uart_tx = (uint32_t)pinmap_peripheral(obj->pin_tx, PinMap_UART_TX); - uint32_t uart_rx = (uint32_t)pinmap_peripheral(obj->pin_rx, PinMap_UART_RX); + USART_TypeDef *uart_tx = pinmap_peripheral(obj->pin_tx, PinMap_UART_TX); + USART_TypeDef *uart_rx = pinmap_peripheral(obj->pin_rx, PinMap_UART_RX); // Get the peripheral name (UART_1, UART_2, ...) from the pin and assign it to the object - obj->uart = (USART_TypeDef *)pinmap_merge(uart_tx, uart_rx); + obj->uart = pinmap_merge_peripheral(uart_tx, uart_rx); - if(obj->uart == (USART_TypeDef *)NC) { + if(obj->uart == NP) { printf("ERROR: UART pins mismatch\n"); return; } diff --git a/cores/arduino/stm32/uart_emul.c b/cores/arduino/stm32/uart_emul.c index 47e2ab0fd9..cc392ebbba 100644 --- a/cores/arduino/stm32/uart_emul.c +++ b/cores/arduino/stm32/uart_emul.c @@ -390,10 +390,10 @@ void HAL_UART_Emul_RxCpltCallback(UART_Emul_HandleTypeDef *huart) if(g_uartEmul_config[UART1_EMUL_E].uart_rx_irqHandle != NULL) { if(uart_emul_available(UART1_EMUL_E) < (UART_RCV_SIZE / 2)) { - setTimerCounter(g_uartEmul_config[UART1_EMUL_E]._timer->timer, 0); + setTimerCounter((stimer_t *)g_uartEmul_config[UART1_EMUL_E]._timer->timer, 0); } else if(uart_emul_available(UART1_EMUL_E) < (UART_RCV_SIZE/4*3)) { - setTimerCounter(g_uartEmul_config[UART1_EMUL_E]._timer->timer, EMUL_TIMER_PERIOD - 1); + setTimerCounter((stimer_t *)g_uartEmul_config[UART1_EMUL_E]._timer->timer, EMUL_TIMER_PERIOD - 1); } else { g_uartEmul_config[UART1_EMUL_E].uart_rx_irqHandle(); diff --git a/variants/DISCO_F407VG/PeripheralPins.c b/variants/DISCO_F407VG/PeripheralPins.c index 9b765aef50..d86af5a397 100644 --- a/variants/DISCO_F407VG/PeripheralPins.c +++ b/variants/DISCO_F407VG/PeripheralPins.c @@ -78,7 +78,7 @@ const PinMap PinMap_ADC[] = { {PC4, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC2_IN14 {PC5, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC1_IN15 // {PC5, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC2_IN15 - {NC, NC, 0} + {NC, NP, 0} }; //*** DAC *** @@ -86,7 +86,7 @@ const PinMap PinMap_ADC[] = { const PinMap PinMap_DAC[] = { // {PA4, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // DAC_OUT1 - I2S3_WS {PA5, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // DAC_OUT2 - {NC, NC, 0} + {NC, NP, 0} }; //*** I2C *** @@ -96,7 +96,7 @@ const PinMap PinMap_I2C_SDA[] = { // {PB9, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)}, // Audio_SDA {PB11, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)}, {PC9, I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_I2C_SCL[] = { @@ -104,7 +104,7 @@ const PinMap PinMap_I2C_SCL[] = { // {PB6, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)}, // Audio_SCL {PB8, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)}, // {PB10, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)}, // Mic CLK - {NC, NC, 0} + {NC, NP, 0} }; //*** PWM *** @@ -178,7 +178,7 @@ const PinMap PinMap_PWM[] = { {PE12, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N {PE13, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3 {PE14, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)}, // TIM1_CH4 - {NC, NC, 0} + {NC, NP, 0} }; //*** SERIAL *** @@ -195,7 +195,7 @@ const PinMap PinMap_UART_TX[] = { // {PC12, UART5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)}, // I2S3_SD // {PD5, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)}, // USB {PD8, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_UART_RX[] = { @@ -210,7 +210,7 @@ const PinMap PinMap_UART_RX[] = { {PD2, UART5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)}, {PD6, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)}, {PD9, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_UART_RTS[] = { @@ -219,7 +219,7 @@ const PinMap PinMap_UART_RTS[] = { {PB14, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)}, // {PD4, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)}, // Audio_RST // {PD12, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)}, // LED4 Blue - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_UART_CTS[] = { @@ -228,7 +228,7 @@ const PinMap PinMap_UART_CTS[] = { {PB13, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)}, {PD3, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)}, {PD11, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)}, - {NC, NC, 0} + {NC, NP, 0} }; //*** SPI *** @@ -240,7 +240,7 @@ const PinMap PinMap_SPI_MOSI[] = { {PB15, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, {PC3, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, // {PC12, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)}, // I2S3_SD - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_SPI_MISO[] = { @@ -250,7 +250,7 @@ const PinMap PinMap_SPI_MISO[] = { {PB14, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, {PC2, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, // {PC11, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_SPI_SCLK[] = { @@ -261,7 +261,7 @@ const PinMap PinMap_SPI_SCLK[] = { {PB13, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, // {PC10, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)}, // I2S3_SCK - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_SPI_SSEL[] = { @@ -271,7 +271,7 @@ const PinMap PinMap_SPI_SSEL[] = { // {PA15, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)}, // {PB9, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, // Audio_SDA {PB12, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, - {NC, NC, 0} + {NC, NP, 0} }; //*** CAN *** @@ -282,7 +282,7 @@ const PinMap PinMap_CAN_RD[] = { {PB8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)}, {PB12, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)}, {PD0, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_CAN_TD[] = { @@ -291,5 +291,5 @@ const PinMap PinMap_CAN_TD[] = { // {PB9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)}, // Audio_SDA {PB13, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)}, {PD1, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)}, - {NC, NC, 0} + {NC, NP, 0} }; diff --git a/variants/DISCO_F746NG/PeripheralPins.c b/variants/DISCO_F746NG/PeripheralPins.c index b010eafc96..accc9713ee 100644 --- a/variants/DISCO_F746NG/PeripheralPins.c +++ b/variants/DISCO_F746NG/PeripheralPins.c @@ -87,7 +87,7 @@ const PinMap PinMap_ADC[] = { {PF8, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC3_IN6 - A3 {PF9, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC3_IN7 - A2 {PF10, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC3_IN8 - A1 - {NC, NC, 0} + {NC, NP, 0} }; //*** DAC *** @@ -95,7 +95,7 @@ const PinMap PinMap_ADC[] = { const PinMap PinMap_DAC[] = { {PA4, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // DAC_OUT1 {PA5, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // DAC_OUT2 - {NC, NC, 0} + {NC, NP, 0} }; //*** I2C *** @@ -111,7 +111,7 @@ const PinMap PinMap_I2C_SDA[] = { // {PH5, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)}, // {PH8, I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)}, // {PH12, I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C4)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_I2C_SCL[] = { @@ -125,7 +125,7 @@ const PinMap PinMap_I2C_SCL[] = { // {PH4, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)}, // {PH7, I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)}, // {PH11, I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C4)}, - {NC, NC, 0} + {NC, NP, 0} }; //*** PWM *** @@ -216,7 +216,7 @@ const PinMap PinMap_PWM[] = { // {PI5, TIM8, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 0)}, // TIM8_CH1 // {PI6, TIM8, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 0)}, // TIM8_CH2 // {PI7, TIM8, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 0)}, // TIM8_CH3 - {NC, NC, 0} + {NC, NP, 0} }; //*** SERIAL *** @@ -237,7 +237,7 @@ const PinMap PinMap_UART_TX[] = { // {PE8, UART7, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART7)}, {PF7, UART7, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART7)}, // A4 // {PG14, USART6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_UART_RX[] = { @@ -256,7 +256,7 @@ const PinMap PinMap_UART_RX[] = { // {PE7, UART7, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART7)}, {PF6, UART7, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART7)}, // A5 // {PG9, USART6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_UART_RTS[] = { @@ -272,7 +272,7 @@ const PinMap PinMap_UART_RTS[] = { {PF8, UART7, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART7)}, // A3 // {PG8, USART6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)}, // {PG12, USART6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_UART_CTS[] = { @@ -288,7 +288,7 @@ const PinMap PinMap_UART_CTS[] = { {PF9, UART7, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART7)}, // A2 // {PG13, USART6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)}, // {PG15, USART6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)}, - {NC, NC, 0} + {NC, NP, 0} }; //*** SPI *** @@ -309,7 +309,7 @@ const PinMap PinMap_SPI_MOSI[] = { // {PF11, SPI5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI5)}, // {PG14, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI6)}, {PI3, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, // D7 - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_SPI_MISO[] = { @@ -325,7 +325,7 @@ const PinMap PinMap_SPI_MISO[] = { // {PG12, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI6)}, // {PH7, SPI5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI5)}, {PI2, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, // D8 - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_SPI_SCLK[] = { @@ -343,7 +343,7 @@ const PinMap PinMap_SPI_SCLK[] = { // {PG13, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI6)}, {PH6, SPI5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI5)}, // D6 {PI1, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, // D13 - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_SPI_SSEL[] = { @@ -360,7 +360,7 @@ const PinMap PinMap_SPI_SSEL[] = { // {PG8, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI6)}, // {PH5, SPI5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI5)}, {PI0, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, // D10 - {NC, NC, 0} + {NC, NP, 0} }; //*** CAN *** @@ -372,7 +372,7 @@ const PinMap PinMap_CAN_RD[] = { // {PB12, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)}, // {PD0, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)}, // {PI9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_CAN_TD[] = { @@ -382,5 +382,5 @@ const PinMap PinMap_CAN_TD[] = { // {PB13, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)}, // {PD1, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)}, // {PH13, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)}, - {NC, NC, 0} + {NC, NP, 0} }; diff --git a/variants/NUCLEO_F030R8/PeripheralPins.c b/variants/NUCLEO_F030R8/PeripheralPins.c index 3a7feed478..9853805dc6 100644 --- a/variants/NUCLEO_F030R8/PeripheralPins.c +++ b/variants/NUCLEO_F030R8/PeripheralPins.c @@ -55,7 +55,7 @@ const PinMap PinMap_ADC[] = { {PC3, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC_IN13 {PC4, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC_IN14 {PC5, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC_IN15 - {NC, NC, 0} + {NC, NP, 0} }; //*** DAC *** @@ -67,14 +67,14 @@ const PinMap PinMap_I2C_SDA[] = { {PB7, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)}, {PB9, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)}, {PB11, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C2)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_I2C_SCL[] = { {PB6, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)}, {PB8, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)}, {PB10, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C2)}, - {NC, NC, 0} + {NC, NP, 0} }; //*** PWM *** @@ -114,7 +114,7 @@ const PinMap PinMap_PWM[] = { {PC7, TIM3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_MCO, 2, 0)}, // TIM3_CH2 {PC8, TIM3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM3, 3, 0)}, // TIM3_CH3 {PC9, TIM3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_MCO, 4, 0)}, // TIM3_CH4 - {NC, NC, 0} + {NC, NP, 0} }; //*** SERIAL *** @@ -124,7 +124,7 @@ const PinMap PinMap_UART_TX[] = { {PA9, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART1)}, {PA14, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART2)}, {PB6, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_USART1)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_UART_RX[] = { @@ -132,19 +132,19 @@ const PinMap PinMap_UART_RX[] = { {PA10, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART1)}, {PA15, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART2)}, {PB7, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_USART1)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_UART_RTS[] = { {PA1, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART2)}, {PA12, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART1)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_UART_CTS[] = { {PA0, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART2)}, {PA11, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART1)}, - {NC, NC, 0} + {NC, NP, 0} }; //*** SPI *** @@ -153,28 +153,28 @@ const PinMap PinMap_SPI_MOSI[] = { {PA7, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI1)}, {PB5, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI1)}, {PB15, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI2)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_SPI_MISO[] = { {PA6, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI1)}, {PB4, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI1)}, {PB14, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI2)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_SPI_SCLK[] = { // {PA5, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI1)}, // LED {PB3, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI1)}, {PB13, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI2)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_SPI_SSEL[] = { {PA4, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI1)}, {PA15, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI1)}, {PB12, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI2)}, - {NC, NC, 0} + {NC, NP, 0} }; //*** CAN *** diff --git a/variants/NUCLEO_F091RC/PeripheralPins.c b/variants/NUCLEO_F091RC/PeripheralPins.c index 85a665b336..a685353d51 100644 --- a/variants/NUCLEO_F091RC/PeripheralPins.c +++ b/variants/NUCLEO_F091RC/PeripheralPins.c @@ -55,7 +55,7 @@ const PinMap PinMap_ADC[] = { {PC3, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC_IN13 {PC4, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC_IN14 {PC5, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC_IN15 - {NC, NC, 0} + {NC, NP, 0} }; //*** DAC *** @@ -63,7 +63,7 @@ const PinMap PinMap_ADC[] = { const PinMap PinMap_DAC[] = { {PA4, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // DAC_OUT1 - A2 {PA5, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // DAC_OUT2 - D13 (LED1) - {NC, NC, 0} + {NC, NP, 0} }; //*** I2C *** @@ -76,7 +76,7 @@ const PinMap PinMap_I2C_SDA[] = { {PB11, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C2)}, {PB14, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF5_I2C2)}, // {PF0, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)}, // OSC_IN - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_I2C_SCL[] = { @@ -87,7 +87,7 @@ const PinMap PinMap_I2C_SCL[] = { {PB10, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C2)}, // D6 {PB13, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF5_I2C2)}, // {PF1, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)}, // OSC_OUT - {NC, NC, 0} + {NC, NP, 0} }; //*** PWM *** @@ -137,7 +137,7 @@ const PinMap PinMap_PWM[] = { {PC7, TIM3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_TIM3, 2, 0)}, // TIM3_CH2 - D9 {PC8, TIM3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_TIM3, 3, 0)}, // TIM3_CH3 {PC9, TIM3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_TIM3, 4, 0)}, // TIM3_CH4 - {NC, NC, 0} + {NC, NP, 0} }; //*** SERIAL *** @@ -160,7 +160,7 @@ const PinMap PinMap_UART_TX[] = { // {PC10, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART3)}, {PC10, USART4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_USART4)}, {PC12, USART5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_USART5)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_UART_RX[] = { @@ -181,7 +181,7 @@ const PinMap PinMap_UART_RX[] = { // {PC11, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART3)}, {PC11, USART4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_USART4)}, {PD2, USART5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_USART5)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_UART_RTS[] = { @@ -191,7 +191,7 @@ const PinMap PinMap_UART_RTS[] = { {PB1, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART3)}, {PB14, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART3)}, {PD2, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART3)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_UART_CTS[] = { @@ -200,7 +200,7 @@ const PinMap PinMap_UART_CTS[] = { {PA11, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART1)}, {PB7, USART4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART4)}, {PB13, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART3)}, - {NC, NC, 0} + {NC, NP, 0} }; //*** SPI *** @@ -210,7 +210,7 @@ const PinMap PinMap_SPI_MOSI[] = { {PB5, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI1)}, // D4 {PB15, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI2)}, {PC3, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_SPI2)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_SPI_MISO[] = { @@ -218,7 +218,7 @@ const PinMap PinMap_SPI_MISO[] = { {PB4, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI1)}, // D5 {PB14, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI2)}, {PC2, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_SPI2)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_SPI_SCLK[] = { @@ -226,7 +226,7 @@ const PinMap PinMap_SPI_SCLK[] = { {PB3, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI1)}, // D3 {PB10, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, // D6 {PB13, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI2)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_SPI_SSEL[] = { @@ -234,7 +234,7 @@ const PinMap PinMap_SPI_SSEL[] = { {PA15, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI1)}, {PB9, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, // D14 {PB12, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI2)}, - {NC, NC, 0} + {NC, NP, 0} }; //*** CAN *** @@ -242,11 +242,11 @@ const PinMap PinMap_SPI_SSEL[] = { const PinMap PinMap_CAN_RD[] = { {PA11, CAN, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)}, {PB8, CAN, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)}, // D15 - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_CAN_TD[] = { {PA12, CAN, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)}, {PB9, CAN, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)}, // D14 - {NC, NC, 0} + {NC, NP, 0} }; diff --git a/variants/NUCLEO_F303RE/PeripheralPins.c b/variants/NUCLEO_F303RE/PeripheralPins.c index 3cc63e50b5..87bba5f6cd 100644 --- a/variants/NUCLEO_F303RE/PeripheralPins.c +++ b/variants/NUCLEO_F303RE/PeripheralPins.c @@ -66,7 +66,7 @@ const PinMap PinMap_ADC[] = { // {PC3, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC2_IN9 {PC4, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC2_IN5 {PC5, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC2_IN11 - {NC, NC, 0} + {NC, NP, 0} }; //*** DAC *** @@ -74,7 +74,7 @@ const PinMap PinMap_ADC[] = { const PinMap PinMap_DAC[] = { {PA4, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // DAC1_OUT1 {PA5, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // DAC1_OUT2 - LED1 - {NC, NC, 0} + {NC, NP, 0} }; //*** I2C *** @@ -87,7 +87,7 @@ const PinMap PinMap_I2C_SDA[] = { {PB9, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)}, {PC9, I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF3_I2C3)}, {PF0, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_I2C_SCL[] = { @@ -97,7 +97,7 @@ const PinMap PinMap_I2C_SCL[] = { {PB6, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)}, {PB8, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)}, {PF1, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)}, - {NC, NC, 0} + {NC, NP, 0} }; //*** PWM *** @@ -185,7 +185,7 @@ const PinMap PinMap_PWM[] = { {PC12, TIM8, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM8, 3, 1)}, // TIM8_CH3N {PC13, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM1, 1, 1)}, // TIM1_CH1N {PF0, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM1, 3, 1)}, // TIM1_CH3N - {NC, NC, 0} + {NC, NP, 0} }; //*** SERIAL *** @@ -202,7 +202,7 @@ const PinMap PinMap_UART_TX[] = { {PC10, UART4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_UART4)}, // {PC10, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)}, {PC12, UART5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_UART5)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_UART_RX[] = { @@ -217,14 +217,14 @@ const PinMap PinMap_UART_RX[] = { {PC11, UART4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_UART4)}, // {PC11, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)}, {PD2, UART5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_UART5)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_UART_RTS[] = { {PA1, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)}, {PA12, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)}, {PB14, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_UART_CTS[] = { @@ -232,7 +232,7 @@ const PinMap PinMap_UART_CTS[] = { {PA11, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)}, {PA13, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)}, {PB13, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)}, - {NC, NC, 0} + {NC, NP, 0} }; //*** SPI *** @@ -244,7 +244,7 @@ const PinMap PinMap_SPI_MOSI[] = { {PB5, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)}, {PB15, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, {PC12, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_SPI_MISO[] = { @@ -254,7 +254,7 @@ const PinMap PinMap_SPI_MISO[] = { {PB4, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)}, {PB14, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, {PC11, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_SPI_SCLK[] = { @@ -264,7 +264,7 @@ const PinMap PinMap_SPI_SCLK[] = { {PB13, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, {PC10, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)}, {PF1, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_SPI_SSEL[] = { @@ -274,7 +274,7 @@ const PinMap PinMap_SPI_SSEL[] = { {PA15, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)}, {PB12, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, {PF0, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, - {NC, NC, 0} + {NC, NP, 0} }; //*** CAN *** @@ -282,11 +282,11 @@ const PinMap PinMap_SPI_SSEL[] = { const PinMap PinMap_CAN_RD[] = { {PA11, CAN, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)}, {PB8, CAN, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_CAN_TD[] = { {PA12, CAN, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)}, {PB9, CAN, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)}, - {NC, NC, 0} + {NC, NP, 0} }; diff --git a/variants/NUCLEO_F429ZI/PeripheralPins.c b/variants/NUCLEO_F429ZI/PeripheralPins.c index 15848a32be..808c5fb595 100644 --- a/variants/NUCLEO_F429ZI/PeripheralPins.c +++ b/variants/NUCLEO_F429ZI/PeripheralPins.c @@ -86,7 +86,7 @@ const PinMap PinMap_ADC[] = { {PF8, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC3_IN6 {PF9, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC3_IN7 {PF10, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC3_IN8 - A5 - {NC, NC, 0} + {NC, NP, 0} }; //*** DAC *** @@ -94,7 +94,7 @@ const PinMap PinMap_ADC[] = { const PinMap PinMap_DAC[] = { {PA4, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // DAC_OUT1 {PA5, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // DAC_OUT2 - D13 - {NC, NC, 0} + {NC, NP, 0} }; //*** I2C *** @@ -105,7 +105,7 @@ const PinMap PinMap_I2C_SDA[] = { {PB11, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)}, {PC9, I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)}, {PF0, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_I2C_SCL[] = { @@ -114,7 +114,7 @@ const PinMap PinMap_I2C_SCL[] = { {PB8, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)}, // D15 {PB10, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)}, {PF1, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)}, - {NC, NC, 0} + {NC, NP, 0} }; //*** PWM *** @@ -192,7 +192,7 @@ const PinMap PinMap_PWM[] = { {PF7, TIM11, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM11, 1, 0)}, // TIM11_CH1 {PF8, TIM13, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM13, 1, 0)}, // TIM13_CH1 {PF9, TIM14, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM14, 1, 0)}, // TIM14_CH1 - {NC, NC, 0} + {NC, NP, 0} }; //*** SERIAL *** @@ -213,7 +213,7 @@ const PinMap PinMap_UART_TX[] = { {PE8, UART7, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART7)}, {PF7, UART7, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART7)}, {PG14, USART6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_UART_RX[] = { @@ -232,7 +232,7 @@ const PinMap PinMap_UART_RX[] = { {PE7, UART7, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART7)}, {PF6, UART7, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART7)}, {PG9, USART6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)}, // - D0 - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_UART_RTS[] = { @@ -243,7 +243,7 @@ const PinMap PinMap_UART_RTS[] = { {PD12, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)}, {PG8, USART6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)}, {PG12, USART6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_UART_CTS[] = { @@ -254,7 +254,7 @@ const PinMap PinMap_UART_CTS[] = { {PD11, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)}, // {PG13, USART6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)}, // - ETH RXII TXD0 {PG15, USART6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)}, - {NC, NC, 0} + {NC, NP, 0} }; //*** SPI *** @@ -272,7 +272,7 @@ const PinMap PinMap_SPI_MOSI[] = { {PF9, SPI5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI5)}, {PF11, SPI5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI5)}, {PG14, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI6)}, // -D1 - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_SPI_MISO[] = { @@ -286,7 +286,7 @@ const PinMap PinMap_SPI_MISO[] = { {PE13, SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)}, // - D3 {PF8, SPI5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI5)}, {PG12, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI6)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_SPI_SCLK[] = { @@ -301,7 +301,7 @@ const PinMap PinMap_SPI_SCLK[] = { {PE12, SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)}, {PF7, SPI5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI5)}, // {PG13, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI6)}, // - ETH RXII TXD0 - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_SPI_SSEL[] = { @@ -315,7 +315,7 @@ const PinMap PinMap_SPI_SSEL[] = { {PE11, SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)}, // -D5 {PF6, SPI5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI5)}, {PG8, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI6)}, - {NC, NC, 0} + {NC, NP, 0} }; //*** CAN *** @@ -326,7 +326,7 @@ const PinMap PinMap_CAN_RD[] = { {PB8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)}, // - D15 {PB12, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)}, {PD0, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_CAN_TD[] = { @@ -335,5 +335,5 @@ const PinMap PinMap_CAN_TD[] = { {PB9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)}, // - D14 {PB13, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)}, // - ETH RMII TXD1 (when JP7 ON) {PD1, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)}, - {NC, NC, 0} + {NC, NP, 0} }; diff --git a/variants/NUCLEO_L053R8/PeripheralPins.c b/variants/NUCLEO_L053R8/PeripheralPins.c index 5985e4ed42..521a0aebf4 100644 --- a/variants/NUCLEO_L053R8/PeripheralPins.c +++ b/variants/NUCLEO_L053R8/PeripheralPins.c @@ -55,14 +55,14 @@ const PinMap PinMap_ADC[] = { {PC3, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC_IN13 {PC4, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC_IN14 {PC5, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC_IN15 - {NC, NC, 0} + {NC, NP, 0} }; //*** DAC *** const PinMap PinMap_DAC[] = { {PA4, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // DAC_OUT1 - {NC, NC, 0} + {NC, NP, 0} }; //*** I2C *** @@ -72,7 +72,7 @@ const PinMap PinMap_I2C_SDA[] = { {PB9, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)}, {PB11, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C2)}, {PB14, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF5_I2C2)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_I2C_SCL[] = { @@ -80,7 +80,7 @@ const PinMap PinMap_I2C_SCL[] = { {PB8, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)}, {PB10, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C2)}, {PB13, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF5_I2C2)}, - {NC, NC, 0} + {NC, NP, 0} }; //*** PWM *** @@ -105,7 +105,7 @@ const PinMap PinMap_PWM[] = { // {PB14, TIM21, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM21, 2, 0)}, // TIM21_CH2 {PC6, TIM22, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_TIM22, 1, 0)}, // TIM22_CH1 {PC7, TIM22, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_TIM22, 2, 0)}, // TIM22_CH2 - {NC, NC, 0} + {NC, NP, 0} }; //*** SERIAL *** @@ -118,7 +118,7 @@ const PinMap PinMap_UART_TX[] = { {PB10, LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_LPUART1)}, {PC4, LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_LPUART1)}, {PC10, LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_LPUART1)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_UART_RX[] = { @@ -129,7 +129,7 @@ const PinMap PinMap_UART_RX[] = { {PB11, LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_LPUART1)}, {PC5, LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_LPUART1)}, {PC11, LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_LPUART1)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_UART_RTS[] = { @@ -139,7 +139,7 @@ const PinMap PinMap_UART_RTS[] = { {PB12, LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_LPUART1)}, {PB14, LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_LPUART1)}, {PD2, LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_LPUART1)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_UART_CTS[] = { @@ -147,7 +147,7 @@ const PinMap PinMap_UART_CTS[] = { {PA6, LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_LPUART1)}, {PA11, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART1)}, {PB13, LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_LPUART1)}, - {NC, NC, 0} + {NC, NP, 0} }; //*** SPI *** @@ -158,7 +158,7 @@ const PinMap PinMap_SPI_MOSI[] = { {PB5, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI1)}, {PB15, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI2)}, {PC3, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_SPI2)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_SPI_MISO[] = { @@ -167,7 +167,7 @@ const PinMap PinMap_SPI_MISO[] = { {PB4, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI1)}, {PB14, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI2)}, {PC2, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_SPI2)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_SPI_SCLK[] = { @@ -175,7 +175,7 @@ const PinMap PinMap_SPI_SCLK[] = { {PB3, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI1)}, {PB10, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, {PB13, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI2)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_SPI_SSEL[] = { @@ -183,8 +183,8 @@ const PinMap PinMap_SPI_SSEL[] = { {PA15, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI1)}, {PB9, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, {PB12, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI2)}, - {NC, NC, 0} + {NC, NP, 0} }; //*** CAN *** -// NO CAN \ No newline at end of file +// NO CAN diff --git a/variants/NUCLEO_L476RG/PeripheralPins.c b/variants/NUCLEO_L476RG/PeripheralPins.c index 2baf59e970..411a438dad 100644 --- a/variants/NUCLEO_L476RG/PeripheralPins.c +++ b/variants/NUCLEO_L476RG/PeripheralPins.c @@ -75,7 +75,7 @@ const PinMap PinMap_ADC[] = { // {PC4, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC2_IN13 {PC5, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC1_IN14 // {PC5, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC2_IN14 - {NC, NC, 0} + {NC, NP, 0} }; //*** DAC *** @@ -83,7 +83,7 @@ const PinMap PinMap_ADC[] = { const PinMap PinMap_DAC[] = { {PA4, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // DAC1_OUT1 {PA5, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // DAC1_OUT2 - LED - {NC, NC, 0} + {NC, NP, 0} }; //*** I2C *** @@ -94,7 +94,7 @@ const PinMap PinMap_I2C_SDA[] = { {PB11, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)}, {PB14, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)}, {PC1, I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_I2C_SCL[] = { @@ -103,7 +103,7 @@ const PinMap PinMap_I2C_SCL[] = { {PB10, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)}, {PB13, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)}, {PC0, I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)}, - {NC, NC, 0} + {NC, NP, 0} }; //*** PWM *** @@ -168,7 +168,7 @@ const PinMap PinMap_PWM[] = { {PC8, TIM8, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 0)}, // TIM8_CH3 // {PC9, TIM3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4 {PC9, TIM8, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 4, 0)}, // TIM8_CH4 - {NC, NC, 0} + {NC, NP, 0} }; //*** SERIAL *** @@ -185,7 +185,7 @@ const PinMap PinMap_UART_TX[] = { {PC10, UART4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)}, // {PC10, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)}, {PC12, UART5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_UART_RX[] = { @@ -200,7 +200,7 @@ const PinMap PinMap_UART_RX[] = { {PC11, UART4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)}, // {PC11, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)}, {PD2, UART5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_UART_RTS[] = { @@ -213,7 +213,7 @@ const PinMap PinMap_UART_RTS[] = { // {PB12, LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)}, // {PB14, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)}, // {PD2, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_UART_CTS[] = { @@ -225,7 +225,7 @@ const PinMap PinMap_UART_CTS[] = { // {PB7, UART4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)}, // {PB13, LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)}, // {PB13, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)}, - {NC, NC, 0} + {NC, NP, 0} }; //*** SPI *** @@ -237,7 +237,7 @@ const PinMap PinMap_SPI_MOSI[] = { {PB15, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, {PC3, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, {PC12, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_SPI_MISO[] = { @@ -247,7 +247,7 @@ const PinMap PinMap_SPI_MISO[] = { {PB14, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, {PC2, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, {PC11, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_SPI_SCLK[] = { @@ -257,7 +257,7 @@ const PinMap PinMap_SPI_SCLK[] = { {PB10, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, {PB13, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, {PC10, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_SPI_SSEL[] = { @@ -267,7 +267,7 @@ const PinMap PinMap_SPI_SSEL[] = { // {PA15, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)}, {PB9, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, {PB12, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, - {NC, NC, 0} + {NC, NP, 0} }; //*** CAN *** @@ -275,11 +275,11 @@ const PinMap PinMap_SPI_SSEL[] = { const PinMap PinMap_CAN_RD[] = { {PA11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)}, {PB8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)}, - {NC, NC, 0} + {NC, NP, 0} }; const PinMap PinMap_CAN_TD[] = { {PA12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)}, {PB9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)}, - {NC, NC, 0} + {NC, NP, 0} }; From 70c2a85d1cc40798f597ebcc4296c040fc587bd8 Mon Sep 17 00:00:00 2001 From: "Frederic.Pillon" Date: Thu, 29 Jun 2017 15:23:35 +0200 Subject: [PATCH 14/16] Fix compiler warning in Wire library Fix #44 Signed-off-by: Frederic.Pillon --- libraries/Wire/Wire.cpp | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/libraries/Wire/Wire.cpp b/libraries/Wire/Wire.cpp index 7ce4176763..e14f1b6d33 100644 --- a/libraries/Wire/Wire.cpp +++ b/libraries/Wire/Wire.cpp @@ -107,22 +107,24 @@ void TwoWire::setClock(uint32_t frequency) uint8_t TwoWire::requestFrom(uint8_t address, uint8_t quantity, uint32_t iaddress, uint8_t isize, uint8_t sendStop) { + UNUSED(sendStop); if (master == true) { if (isize > 0) { - // send internal address; this mode allows sending a repeated start to access - // some devices' internal registers. This function is executed by the hardware - // TWI module on other processors (for example Due's TWI_IADR and TWI_MMR registers) + // send internal address; this mode allows sending a repeated start to access + // some devices' internal registers. This function is executed by the hardware + // TWI module on other processors (for example Due's TWI_IADR and TWI_MMR registers) - beginTransmission(address); + beginTransmission(address); - // the maximum size of internal address is 3 bytes - if (isize > 3){ - isize = 3; - } + // the maximum size of internal address is 3 bytes + if (isize > 3){ + isize = 3; + } - // write internal register address - most significant byte first - while (isize-- > 0) - write((uint8_t)(iaddress >> (isize*8))); + // write internal register address - most significant byte first + while (isize-- > 0) { + write((uint8_t)(iaddress >> (isize*8))); + } endTransmission(false); } @@ -196,6 +198,7 @@ void TwoWire::beginTransmission(int address) // uint8_t TwoWire::endTransmission(uint8_t sendStop) { + UNUSED(sendStop); int8_t ret = 4; if (master == true) { From 3b5cf9d418b7608953130b967ead9c45cb3bde17 Mon Sep 17 00:00:00 2001 From: "Frederic.Pillon" Date: Thu, 29 Jun 2017 15:30:44 +0200 Subject: [PATCH 15/16] Fix compiler warning in Firmata library Fix #44 Signed-off-by: Frederic.Pillon --- libraries/Firmata/Boards.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libraries/Firmata/Boards.h b/libraries/Firmata/Boards.h index 4b40cf842f..82e6c725cf 100644 --- a/libraries/Firmata/Boards.h +++ b/libraries/Firmata/Boards.h @@ -771,8 +771,7 @@ writePort(port, value, bitmask): Write an 8 bit port. #define TOTAL_PORTS MAX_NB_PORT #define VERSION_BLINK_PIN LED_BUILTIN // PIN_SERIALY_RX/TX defined in the variant.h -#define IS_PIN_DIGITAL(p) ((p != PIN_SERIAL_RX) && (p != PIN_SERIAL_TX) &&\ - (p >= 0) && (p < TOTAL_PINS)) +#define IS_PIN_DIGITAL(p) ((p != PIN_SERIAL_RX) && (p != PIN_SERIAL_TX) && (p < TOTAL_PINS)) #define IS_PIN_ANALOG(p) ((p) >= A0 && (p) < AEND) #define IS_PIN_PWM(p) digitalPinHasPWM(p) #define IS_PIN_SERVO(p) IS_PIN_DIGITAL(p) From b37099d163b751b12e337a8374ad7e7467b7f8ed Mon Sep 17 00:00:00 2001 From: "Frederic.Pillon" Date: Thu, 29 Jun 2017 17:02:42 +0200 Subject: [PATCH 16/16] Fix last compiler warning Fix #44 Signed-off-by: Frederic.Pillon --- cores/arduino/stm32/analog.c | 2 ++ cores/arduino/stm32/hal_uart_emul.h | 4 +-- cores/arduino/stm32/spi_com.c | 1 + cores/arduino/stm32/stm32_def.h | 4 +++ cores/arduino/stm32/uart.c | 48 ++++++++++++++--------------- 5 files changed, 33 insertions(+), 26 deletions(-) diff --git a/cores/arduino/stm32/analog.c b/cores/arduino/stm32/analog.c index 46d0b653bb..909f051b08 100644 --- a/cores/arduino/stm32/analog.c +++ b/cores/arduino/stm32/analog.c @@ -93,7 +93,9 @@ #error "ADC_CLOCK_DIV could not be defined" #endif +#ifndef ADC_REGULAR_RANK_1 #define ADC_REGULAR_RANK_1 1 +#endif /** * @} */ diff --git a/cores/arduino/stm32/hal_uart_emul.h b/cores/arduino/stm32/hal_uart_emul.h index 804633378c..f2f8bace41 100644 --- a/cores/arduino/stm32/hal_uart_emul.h +++ b/cores/arduino/stm32/hal_uart_emul.h @@ -369,7 +369,7 @@ typedef struct * @param None * @retval None */ -#define __UART_EMUL_CLK_ENABLE() __TIM1_CLK_ENABLE();\ +#define __UART_EMUL_CLK_ENABLE() __HAL_RCC_TIM1_CLK_ENABLE();\ __HAL_RCC_DMA2_CLK_ENABLE(); /** @brief Disable the clock for UART Emulation. @@ -377,7 +377,7 @@ typedef struct * @param None * @retval None */ -#define __UART_EMUL_CLK_DISABLE() __TIM1_CLK_DISABLE();\ +#define __UART_EMUL_CLK_DISABLE() __HAL_RCC_TIM1_CLK_DISABLE();\ __HAL_RCC_DMA2_CLK_DISABLE(); diff --git a/cores/arduino/stm32/spi_com.c b/cores/arduino/stm32/spi_com.c index f91a3e6198..292f807566 100644 --- a/cores/arduino/stm32/spi_com.c +++ b/cores/arduino/stm32/spi_com.c @@ -111,6 +111,7 @@ uint32_t spi_getClkFreqInst(SPI_TypeDef * spi_inst) uint32_t spi_freq = SystemCoreClock; #ifdef STM32F0xx + UNUSED(spi_inst); /* SPIx source CLK is PCKL1 */ spi_freq = HAL_RCC_GetPCLK1Freq(); #else diff --git a/cores/arduino/stm32/stm32_def.h b/cores/arduino/stm32/stm32_def.h index 9b4a33c620..a0a6b09a60 100644 --- a/cores/arduino/stm32/stm32_def.h +++ b/cores/arduino/stm32/stm32_def.h @@ -36,6 +36,10 @@ #include "stm32f4xx.h" #elif defined(STM32F7xx) #include "stm32f7xx.h" +// On other HAL series, stm32[fl]yxx.h include +// stm32[fl]yxx_hal.h which include stm32[fl]yxx_hal_conf.h +// For F7, stm32f7xx_hal.h replaced by stm32f7xx_hal_conf.h +#include "stm32f7xx_hal.h" #elif defined(STM32L0xx) #include "stm32l0xx.h" #elif defined(STM32L1xx) diff --git a/cores/arduino/stm32/uart.c b/cores/arduino/stm32/uart.c index 23eb64ffeb..03beb72094 100644 --- a/cores/arduino/stm32/uart.c +++ b/cores/arduino/stm32/uart.c @@ -254,55 +254,55 @@ void uart_deinit(serial_t *obj) // Reset UART and disable clock switch (obj->index) { case 0: - __USART1_FORCE_RESET(); - __USART1_RELEASE_RESET(); - __USART1_CLK_DISABLE(); + __HAL_RCC_USART1_FORCE_RESET(); + __HAL_RCC_USART1_RELEASE_RESET(); + __HAL_RCC_USART1_CLK_DISABLE(); break; case 1: - __USART2_FORCE_RESET(); - __USART2_RELEASE_RESET(); - __USART2_CLK_DISABLE(); + __HAL_RCC_USART2_FORCE_RESET(); + __HAL_RCC_USART2_RELEASE_RESET(); + __HAL_RCC_USART2_CLK_DISABLE(); break; #if defined(USART3_BASE) case 2: - __USART3_FORCE_RESET(); - __USART3_RELEASE_RESET(); - __USART3_CLK_DISABLE(); + __HAL_RCC_USART3_FORCE_RESET(); + __HAL_RCC_USART3_RELEASE_RESET(); + __HAL_RCC_USART3_CLK_DISABLE(); break; #endif #if defined(UART4_BASE) case 3: - __UART4_FORCE_RESET(); - __UART4_RELEASE_RESET(); - __UART4_CLK_DISABLE(); + __HAL_RCC_UART4_FORCE_RESET(); + __HAL_RCC_UART4_RELEASE_RESET(); + __HAL_RCC_UART4_CLK_DISABLE(); break; #endif #if defined(UART5_BASE) case 4: - __UART5_FORCE_RESET(); - __UART5_RELEASE_RESET(); - __UART5_CLK_DISABLE(); + __HAL_RCC_UART5_FORCE_RESET(); + __HAL_RCC_UART5_RELEASE_RESET(); + __HAL_RCC_UART5_CLK_DISABLE(); break; #endif #if defined(USART6_BASE) case 5: - __USART6_FORCE_RESET(); - __USART6_RELEASE_RESET(); - __USART6_CLK_DISABLE(); + __HAL_RCC_USART6_FORCE_RESET(); + __HAL_RCC_USART6_RELEASE_RESET(); + __HAL_RCC_USART6_CLK_DISABLE(); break; #endif #if defined(UART7_BASE) case 6: - __UART7_FORCE_RESET(); - __UART7_RELEASE_RESET(); - __UART7_CLK_DISABLE(); + __HAL_RCC_UART7_FORCE_RESET(); + __HAL_RCC_UART7_RELEASE_RESET(); + __HAL_RCC_UART7_CLK_DISABLE(); break; #endif #if defined(UART8_BASE) case 7: - __UART8_FORCE_RESET(); - __UART8_RELEASE_RESET(); - __UART8_CLK_DISABLE(); + __HAL_RCC_UART8_FORCE_RESET(); + __HAL_RCC_UART8_RELEASE_RESET(); + __HAL_RCC_UART8_CLK_DISABLE(); break; #endif }