From e1e2af64f7096fecc1ca9cee407d1e23bd99b52e Mon Sep 17 00:00:00 2001 From: Rocco Marco Guglielmi Date: Wed, 4 May 2016 13:42:03 +0000 Subject: Improved STM32 Nucleo64 board files git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9410 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/boards/ST_NUCLEO64_F030R8/board.h | 96 ++++++++++------- os/hal/boards/ST_NUCLEO64_F030R8/cfg/board.chcfg | 40 +++---- os/hal/boards/ST_NUCLEO64_F070RB/board.h | 130 +++++++++++++---------- os/hal/boards/ST_NUCLEO64_F070RB/cfg/board.chcfg | 48 ++++----- os/hal/boards/ST_NUCLEO64_F072RB/board.h | 130 +++++++++++++---------- os/hal/boards/ST_NUCLEO64_F072RB/cfg/board.chcfg | 48 ++++----- os/hal/boards/ST_NUCLEO64_F091RC/board.h | 130 +++++++++++++---------- os/hal/boards/ST_NUCLEO64_F091RC/cfg/board.chcfg | 48 ++++----- os/hal/boards/ST_NUCLEO64_F103RB/board.h | 34 ++++-- os/hal/boards/ST_NUCLEO64_F302R8/board.h | 130 +++++++++++++---------- os/hal/boards/ST_NUCLEO64_F302R8/cfg/board.chcfg | 48 ++++----- os/hal/boards/ST_NUCLEO64_F303RE/board.h | 130 +++++++++++++---------- os/hal/boards/ST_NUCLEO64_F303RE/cfg/board.chcfg | 48 ++++----- os/hal/boards/ST_NUCLEO64_F334R8/cfg/board.chcfg | 48 ++++----- os/hal/boards/ST_NUCLEO64_F401RE/board.h | 96 ++++++++++------- os/hal/boards/ST_NUCLEO64_F401RE/cfg/board.chcfg | 40 +++---- os/hal/boards/ST_NUCLEO64_F410RB/board.h | 96 ++++++++++------- os/hal/boards/ST_NUCLEO64_F410RB/cfg/board.chcfg | 40 +++---- os/hal/boards/ST_NUCLEO64_F411RE/board.h | 96 ++++++++++------- os/hal/boards/ST_NUCLEO64_F411RE/cfg/board.chcfg | 40 +++---- os/hal/boards/ST_NUCLEO64_F446RE/board.h | 96 ++++++++++------- os/hal/boards/ST_NUCLEO64_F446RE/cfg/board.chcfg | 40 +++---- os/hal/boards/ST_NUCLEO64_L053R8/board.h | 96 ++++++++++------- os/hal/boards/ST_NUCLEO64_L053R8/cfg/board.chcfg | 40 +++---- os/hal/boards/ST_NUCLEO64_L073RZ/board.h | 94 +++++++++------- os/hal/boards/ST_NUCLEO64_L073RZ/cfg/board.chcfg | 40 +++---- os/hal/boards/ST_NUCLEO64_L152RE/board.h | 92 +++++++++------- os/hal/boards/ST_NUCLEO64_L152RE/cfg/board.chcfg | 36 +++---- os/hal/boards/ST_NUCLEO64_L476RG/board.h | 119 ++++++++++++--------- os/hal/boards/ST_NUCLEO64_L476RG/cfg/board.chcfg | 36 +++---- 30 files changed, 1213 insertions(+), 992 deletions(-) (limited to 'os') diff --git a/os/hal/boards/ST_NUCLEO64_F030R8/board.h b/os/hal/boards/ST_NUCLEO64_F030R8/board.h index 0e33b89af..d5b648045 100644 --- a/os/hal/boards/ST_NUCLEO64_F030R8/board.h +++ b/os/hal/boards/ST_NUCLEO64_F030R8/board.h @@ -18,7 +18,7 @@ #define _BOARD_H_ /* - * Setup for STMicroelectronics NUCLEO64-F030R8 board. + * Setup for STMicroelectronics STM32 Nucleo64-F030R8 board. */ /* @@ -52,12 +52,15 @@ * IO pins assignments. */ #define GPIOA_ARD_A0 0U +#define GPIOA_ADC1_IN0 0U #define GPIOA_ARD_A1 1U +#define GPIOA_ADC1_IN1 1U #define GPIOA_ARD_D1 2U -#define GPIOA_USART_TX 2U +#define GPIOA_USART2_TX 2U #define GPIOA_ARD_D0 3U -#define GPIOA_USART_RX 3U +#define GPIOA_USART2_RX 3U #define GPIOA_ARD_A2 4U +#define GPIOA_ADC1_IN4 4U #define GPIOA_LED_GREEN 5U #define GPIOA_ARD_D13 5U #define GPIOA_ARD_D12 6U @@ -72,6 +75,7 @@ #define GPIOA_PIN15 15U #define GPIOB_ARD_A3 0U +#define GPIOB_ADC1_IN8 0U #define GPIOB_PIN1 1U #define GPIOB_PIN2 2U #define GPIOB_SWO 3U @@ -81,9 +85,9 @@ #define GPIOB_ARD_D10 6U #define GPIOB_PIN7 7U #define GPIOB_ARD_D15 8U -#define GPIOB_ARD_A5_ALT 8U +#define GPIOB_I2C1_SCL 8U #define GPIOB_ARD_D14 9U -#define GPIOB_ARD_A4_ALT 9U +#define GPIOB_I2C1_SDA 9U #define GPIOB_ARD_D6 10U #define GPIOB_PIN11 11U #define GPIOB_PIN12 12U @@ -92,7 +96,9 @@ #define GPIOB_PIN15 15U #define GPIOC_ARD_A5 0U +#define GPIOC_ADC1_IN11 0U #define GPIOC_ARD_A4 1U +#define GPIOC_ADC1_IN10 1U #define GPIOC_PIN2 2U #define GPIOC_PIN3 3U #define GPIOC_PIN4 4U @@ -105,8 +111,8 @@ #define GPIOC_PIN11 11U #define GPIOC_PIN12 12U #define GPIOC_BUTTON 13U -#define GPIOC_PIN14 14U -#define GPIOC_PIN15 15U +#define GPIOC_OSC32_IN 14U +#define GPIOC_OSC32_OUT 15U #define GPIOD_PIN0 0U #define GPIOD_PIN1 1U @@ -146,12 +152,15 @@ * IO lines assignments. */ #define LINE_ARD_A0 PAL_LINE(GPIOA, 0U) +#define LINE_ADC1_IN0 PAL_LINE(GPIOA, 0U) #define LINE_ARD_A1 PAL_LINE(GPIOA, 1U) +#define LINE_ADC1_IN1 PAL_LINE(GPIOA, 1U) #define LINE_ARD_D1 PAL_LINE(GPIOA, 2U) -#define LINE_USART_TX PAL_LINE(GPIOA, 2U) +#define LINE_USART2_TX PAL_LINE(GPIOA, 2U) #define LINE_ARD_D0 PAL_LINE(GPIOA, 3U) -#define LINE_USART_RX PAL_LINE(GPIOA, 3U) +#define LINE_USART2_RX PAL_LINE(GPIOA, 3U) #define LINE_ARD_A2 PAL_LINE(GPIOA, 4U) +#define LINE_ADC1_IN4 PAL_LINE(GPIOA, 4U) #define LINE_LED_GREEN PAL_LINE(GPIOA, 5U) #define LINE_ARD_D13 PAL_LINE(GPIOA, 5U) #define LINE_ARD_D12 PAL_LINE(GPIOA, 6U) @@ -163,21 +172,26 @@ #define LINE_SWCLK PAL_LINE(GPIOA, 14U) #define LINE_ARD_A3 PAL_LINE(GPIOB, 0U) +#define LINE_ADC1_IN8 PAL_LINE(GPIOB, 0U) #define LINE_SWO PAL_LINE(GPIOB, 3U) #define LINE_ARD_D3 PAL_LINE(GPIOB, 3U) #define LINE_ARD_D5 PAL_LINE(GPIOB, 4U) #define LINE_ARD_D4 PAL_LINE(GPIOB, 5U) #define LINE_ARD_D10 PAL_LINE(GPIOB, 6U) #define LINE_ARD_D15 PAL_LINE(GPIOB, 8U) -#define LINE_ARD_A5_ALT PAL_LINE(GPIOB, 8U) +#define LINE_I2C1_SCL PAL_LINE(GPIOB, 8U) #define LINE_ARD_D14 PAL_LINE(GPIOB, 9U) -#define LINE_ARD_A4_ALT PAL_LINE(GPIOB, 9U) +#define LINE_I2C1_SDA PAL_LINE(GPIOB, 9U) #define LINE_ARD_D6 PAL_LINE(GPIOB, 10U) #define LINE_ARD_A5 PAL_LINE(GPIOC, 0U) +#define LINE_ADC1_IN11 PAL_LINE(GPIOC, 0U) #define LINE_ARD_A4 PAL_LINE(GPIOC, 1U) +#define LINE_ADC1_IN10 PAL_LINE(GPIOC, 1U) #define LINE_ARD_D9 PAL_LINE(GPIOC, 7U) #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_OSC_IN PAL_LINE(GPIOF, 0U) @@ -208,11 +222,11 @@ /* * GPIOA setup: * - * PA0 - ARD_A0 (analog). - * PA1 - ARD_A1 (analog). - * PA2 - ARD_D1 USART_TX (alternate 1). - * PA3 - ARD_D0 USART_RX (alternate 1). - * PA4 - ARD_A2 (analog). + * PA0 - ARD_A0 ADC1_IN0 (analog). + * PA1 - ARD_A1 ADC1_IN1 (analog). + * PA2 - ARD_D1 USART2_TX (alternate 1). + * PA3 - ARD_D0 USART2_RX (alternate 1). + * PA4 - ARD_A2 ADC1_IN4 (analog). * PA5 - LED_GREEN ARD_D13 (output pushpull high). * PA6 - ARD_D12 (input pullup). * PA7 - ARD_D11 (input pullup). @@ -325,7 +339,7 @@ /* * GPIOB setup: * - * PB0 - ARD_A3 (analog). + * PB0 - ARD_A3 ADC1_IN8 (analog). * PB1 - PIN1 (input pullup). * PB2 - PIN2 (input pullup). * PB3 - SWO ARD_D3 (alternate 0). @@ -333,8 +347,8 @@ * PB5 - ARD_D4 (input pullup). * PB6 - ARD_D10 (input pullup). * PB7 - PIN7 (input pullup). - * PB8 - ARD_D15 ARD_A5_ALT (input pullup). - * PB9 - ARD_D14 ARD_A4_ALT (input pullup). + * PB8 - ARD_D15 I2C1_SCL (alternate 1). + * PB9 - ARD_D14 I2C1_SDA (alternate 1). * PB10 - ARD_D6 (input pullup). * PB11 - PIN11 (input pullup). * PB12 - PIN12 (input pullup). @@ -350,8 +364,8 @@ PIN_MODE_INPUT(GPIOB_ARD_D4) | \ PIN_MODE_INPUT(GPIOB_ARD_D10) | \ PIN_MODE_INPUT(GPIOB_PIN7) | \ - PIN_MODE_INPUT(GPIOB_ARD_D15) | \ - PIN_MODE_INPUT(GPIOB_ARD_D14) | \ + PIN_MODE_ALTERNATE(GPIOB_ARD_D15) | \ + PIN_MODE_ALTERNATE(GPIOB_ARD_D14) | \ PIN_MODE_INPUT(GPIOB_ARD_D6) | \ PIN_MODE_INPUT(GPIOB_PIN11) | \ PIN_MODE_INPUT(GPIOB_PIN12) | \ @@ -398,8 +412,8 @@ PIN_PUPDR_PULLUP(GPIOB_ARD_D4) | \ PIN_PUPDR_PULLUP(GPIOB_ARD_D10) | \ PIN_PUPDR_PULLUP(GPIOB_PIN7) | \ - PIN_PUPDR_PULLUP(GPIOB_ARD_D15) | \ - PIN_PUPDR_PULLUP(GPIOB_ARD_D14) | \ + PIN_PUPDR_FLOATING(GPIOB_ARD_D15) | \ + PIN_PUPDR_FLOATING(GPIOB_ARD_D14) | \ PIN_PUPDR_PULLUP(GPIOB_ARD_D6) | \ PIN_PUPDR_PULLUP(GPIOB_PIN11) | \ PIN_PUPDR_PULLUP(GPIOB_PIN12) | \ @@ -430,8 +444,8 @@ PIN_AFIO_AF(GPIOB_ARD_D4, 0) | \ PIN_AFIO_AF(GPIOB_ARD_D10, 0) | \ PIN_AFIO_AF(GPIOB_PIN7, 0)) -#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 0) | \ - PIN_AFIO_AF(GPIOB_ARD_D14, 0) | \ +#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 1) | \ + PIN_AFIO_AF(GPIOB_ARD_D14, 1) | \ PIN_AFIO_AF(GPIOB_ARD_D6, 0) | \ PIN_AFIO_AF(GPIOB_PIN11, 0) | \ PIN_AFIO_AF(GPIOB_PIN12, 0) | \ @@ -442,8 +456,8 @@ /* * GPIOC setup: * - * PC0 - ARD_A5 (analog). - * PC1 - ARD_A4 (analog). + * PC0 - ARD_A5 ADC1_IN11 (analog). + * PC1 - ARD_A4 ADC1_IN10 (analog). * PC2 - PIN2 (input pullup). * PC3 - PIN3 (input pullup). * PC4 - PIN4 (input pullup). @@ -456,8 +470,8 @@ * PC11 - PIN11 (input pullup). * PC12 - PIN12 (input pullup). * PC13 - BUTTON (input floating). - * PC14 - PIN14 (input pullup). - * PC15 - PIN15 (input pullup). + * PC14 - OSC32_IN (input floating). + * PC15 - OSC32_OUT (input floating). */ #define VAL_GPIOC_MODER (PIN_MODE_ANALOG(GPIOC_ARD_A5) | \ PIN_MODE_ANALOG(GPIOC_ARD_A4) | \ @@ -473,8 +487,8 @@ PIN_MODE_INPUT(GPIOC_PIN11) | \ PIN_MODE_INPUT(GPIOC_PIN12) | \ PIN_MODE_INPUT(GPIOC_BUTTON) | \ - PIN_MODE_INPUT(GPIOC_PIN14) | \ - PIN_MODE_INPUT(GPIOC_PIN15)) + PIN_MODE_INPUT(GPIOC_OSC32_IN) | \ + PIN_MODE_INPUT(GPIOC_OSC32_OUT)) #define VAL_GPIOC_OTYPER (PIN_OTYPE_PUSHPULL(GPIOC_ARD_A5) | \ PIN_OTYPE_PUSHPULL(GPIOC_ARD_A4) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN2) | \ @@ -489,8 +503,8 @@ PIN_OTYPE_PUSHPULL(GPIOC_PIN11) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN12) | \ PIN_OTYPE_PUSHPULL(GPIOC_BUTTON) | \ - PIN_OTYPE_PUSHPULL(GPIOC_PIN14) | \ - PIN_OTYPE_PUSHPULL(GPIOC_PIN15)) + PIN_OTYPE_PUSHPULL(GPIOC_OSC32_IN) | \ + PIN_OTYPE_PUSHPULL(GPIOC_OSC32_OUT)) #define VAL_GPIOC_OSPEEDR (PIN_OSPEED_HIGH(GPIOC_ARD_A5) | \ PIN_OSPEED_HIGH(GPIOC_ARD_A4) | \ PIN_OSPEED_HIGH(GPIOC_PIN2) | \ @@ -505,8 +519,8 @@ PIN_OSPEED_HIGH(GPIOC_PIN11) | \ PIN_OSPEED_HIGH(GPIOC_PIN12) | \ PIN_OSPEED_HIGH(GPIOC_BUTTON) | \ - PIN_OSPEED_HIGH(GPIOC_PIN14) | \ - PIN_OSPEED_HIGH(GPIOC_PIN15)) + PIN_OSPEED_HIGH(GPIOC_OSC32_IN) | \ + PIN_OSPEED_HIGH(GPIOC_OSC32_OUT)) #define VAL_GPIOC_PUPDR (PIN_PUPDR_FLOATING(GPIOC_ARD_A5) | \ PIN_PUPDR_FLOATING(GPIOC_ARD_A4) | \ PIN_PUPDR_PULLUP(GPIOC_PIN2) | \ @@ -521,8 +535,8 @@ PIN_PUPDR_PULLUP(GPIOC_PIN11) | \ PIN_PUPDR_PULLUP(GPIOC_PIN12) | \ PIN_PUPDR_FLOATING(GPIOC_BUTTON) | \ - PIN_PUPDR_PULLUP(GPIOC_PIN14) | \ - PIN_PUPDR_PULLUP(GPIOC_PIN15)) + PIN_PUPDR_FLOATING(GPIOC_OSC32_IN) | \ + PIN_PUPDR_FLOATING(GPIOC_OSC32_OUT)) #define VAL_GPIOC_ODR (PIN_ODR_HIGH(GPIOC_ARD_A5) | \ PIN_ODR_HIGH(GPIOC_ARD_A4) | \ PIN_ODR_HIGH(GPIOC_PIN2) | \ @@ -537,8 +551,8 @@ PIN_ODR_HIGH(GPIOC_PIN11) | \ PIN_ODR_HIGH(GPIOC_PIN12) | \ PIN_ODR_HIGH(GPIOC_BUTTON) | \ - PIN_ODR_HIGH(GPIOC_PIN14) | \ - PIN_ODR_HIGH(GPIOC_PIN15)) + PIN_ODR_HIGH(GPIOC_OSC32_IN) | \ + PIN_ODR_HIGH(GPIOC_OSC32_OUT)) #define VAL_GPIOC_AFRL (PIN_AFIO_AF(GPIOC_ARD_A5, 0) | \ PIN_AFIO_AF(GPIOC_ARD_A4, 0) | \ PIN_AFIO_AF(GPIOC_PIN2, 0) | \ @@ -553,8 +567,8 @@ PIN_AFIO_AF(GPIOC_PIN11, 0) | \ PIN_AFIO_AF(GPIOC_PIN12, 0) | \ PIN_AFIO_AF(GPIOC_BUTTON, 0) | \ - PIN_AFIO_AF(GPIOC_PIN14, 0) | \ - PIN_AFIO_AF(GPIOC_PIN15, 0)) + PIN_AFIO_AF(GPIOC_OSC32_IN, 0) | \ + PIN_AFIO_AF(GPIOC_OSC32_OUT, 0)) /* * GPIOD setup: diff --git a/os/hal/boards/ST_NUCLEO64_F030R8/cfg/board.chcfg b/os/hal/boards/ST_NUCLEO64_F030R8/cfg/board.chcfg index b949a7293..d193299ac 100644 --- a/os/hal/boards/ST_NUCLEO64_F030R8/cfg/board.chcfg +++ b/os/hal/boards/ST_NUCLEO64_F030R8/cfg/board.chcfg @@ -17,7 +17,7 @@ + Resistor="Floating" + Mode="Alternate" + Alternate="1" /> + Resistor="Floating" + Mode="Alternate" + Alternate="1" /> diff --git a/os/hal/boards/ST_NUCLEO64_F070RB/board.h b/os/hal/boards/ST_NUCLEO64_F070RB/board.h index 47a0839b2..9c28befd1 100644 --- a/os/hal/boards/ST_NUCLEO64_F070RB/board.h +++ b/os/hal/boards/ST_NUCLEO64_F070RB/board.h @@ -18,7 +18,7 @@ #define _BOARD_H_ /* - * Setup for STMicroelectronics NUCLEO64-F070RB board. + * Setup for STMicroelectronics STM32 Nucleo64-F070RB board. */ /* @@ -52,12 +52,15 @@ * IO pins assignments. */ #define GPIOA_ARD_A0 0U +#define GPIOA_ADC1_IN0 0U #define GPIOA_ARD_A1 1U +#define GPIOA_ADC1_IN1 1U #define GPIOA_ARD_D1 2U -#define GPIOA_USART_TX 2U +#define GPIOA_USART2_TX 2U #define GPIOA_ARD_D0 3U -#define GPIOA_USART_RX 3U +#define GPIOA_USART2_RX 3U #define GPIOA_ARD_A2 4U +#define GPIOA_ADC1_IN4 4U #define GPIOA_LED_GREEN 5U #define GPIOA_ARD_D12 6U #define GPIOA_ARD_D11 7U @@ -71,6 +74,7 @@ #define GPIOA_PIN15 15U #define GPIOB_ARD_A3 0U +#define GPIOB_ADC1_IN8 0U #define GPIOB_PIN1 1U #define GPIOB_PIN2 2U #define GPIOB_SWO 3U @@ -80,9 +84,9 @@ #define GPIOB_ARD_D10 6U #define GPIOB_PIN7 7U #define GPIOB_ARD_D15 8U -#define GPIOB_ARD_A5_ALT 8U +#define GPIOB_I2C1_SCL 8U #define GPIOB_ARD_D14 9U -#define GPIOB_ARD_A4_ALT 9U +#define GPIOB_I2C1_SDA 9U #define GPIOB_ARD_D6 10U #define GPIOB_PIN11 11U #define GPIOB_PIN12 12U @@ -91,7 +95,9 @@ #define GPIOB_PIN15 15U #define GPIOC_ARD_A5 0U +#define GPIOC_ADC1_IN11 0U #define GPIOC_ARD_A4 1U +#define GPIOC_ADC1_IN10 1U #define GPIOC_PIN2 2U #define GPIOC_PIN3 3U #define GPIOC_PIN4 4U @@ -104,8 +110,8 @@ #define GPIOC_PIN11 11U #define GPIOC_PIN12 12U #define GPIOC_BUTTON 13U -#define GPIOC_PIN14 14U -#define GPIOC_PIN15 15U +#define GPIOC_OSC32_IN 14U +#define GPIOC_OSC32_OUT 15U #define GPIOD_PIN0 0U #define GPIOD_PIN1 1U @@ -141,8 +147,8 @@ #define GPIOE_PIN14 14U #define GPIOE_PIN15 15U -#define GPIOF_PIN0 0U -#define GPIOF_PIN1 1U +#define GPIOF_OSC_IN 0U +#define GPIOF_OSC_OUT 1U #define GPIOF_PIN2 2U #define GPIOF_PIN3 3U #define GPIOF_PIN4 4U @@ -162,12 +168,15 @@ * IO lines assignments. */ #define LINE_ARD_A0 PAL_LINE(GPIOA, 0U) +#define LINE_ADC1_IN0 PAL_LINE(GPIOA, 0U) #define LINE_ARD_A1 PAL_LINE(GPIOA, 1U) +#define LINE_ADC1_IN1 PAL_LINE(GPIOA, 1U) #define LINE_ARD_D1 PAL_LINE(GPIOA, 2U) -#define LINE_USART_TX PAL_LINE(GPIOA, 2U) +#define LINE_USART2_TX PAL_LINE(GPIOA, 2U) #define LINE_ARD_D0 PAL_LINE(GPIOA, 3U) -#define LINE_USART_RX PAL_LINE(GPIOA, 3U) +#define LINE_USART2_RX PAL_LINE(GPIOA, 3U) #define LINE_ARD_A2 PAL_LINE(GPIOA, 4U) +#define LINE_ADC1_IN4 PAL_LINE(GPIOA, 4U) #define LINE_LED_GREEN PAL_LINE(GPIOA, 5U) #define LINE_ARD_D12 PAL_LINE(GPIOA, 6U) #define LINE_ARD_D11 PAL_LINE(GPIOA, 7U) @@ -178,24 +187,31 @@ #define LINE_SWCLK PAL_LINE(GPIOA, 14U) #define LINE_ARD_A3 PAL_LINE(GPIOB, 0U) +#define LINE_ADC1_IN8 PAL_LINE(GPIOB, 0U) #define LINE_SWO PAL_LINE(GPIOB, 3U) #define LINE_ARD_D3 PAL_LINE(GPIOB, 3U) #define LINE_ARD_D5 PAL_LINE(GPIOB, 4U) #define LINE_ARD_D4 PAL_LINE(GPIOB, 5U) #define LINE_ARD_D10 PAL_LINE(GPIOB, 6U) #define LINE_ARD_D15 PAL_LINE(GPIOB, 8U) -#define LINE_ARD_A5_ALT PAL_LINE(GPIOB, 8U) +#define LINE_I2C1_SCL PAL_LINE(GPIOB, 8U) #define LINE_ARD_D14 PAL_LINE(GPIOB, 9U) -#define LINE_ARD_A4_ALT PAL_LINE(GPIOB, 9U) +#define LINE_I2C1_SDA PAL_LINE(GPIOB, 9U) #define LINE_ARD_D6 PAL_LINE(GPIOB, 10U) #define LINE_ARD_A5 PAL_LINE(GPIOC, 0U) +#define LINE_ADC1_IN11 PAL_LINE(GPIOC, 0U) #define LINE_ARD_A4 PAL_LINE(GPIOC, 1U) +#define LINE_ADC1_IN10 PAL_LINE(GPIOC, 1U) #define LINE_ARD_D9 PAL_LINE(GPIOC, 7U) #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_OSC_IN PAL_LINE(GPIOF, 0U) +#define LINE_OSC_OUT PAL_LINE(GPIOF, 1U) /* * I/O ports initial setup, this configuration is established soon after reset @@ -222,11 +238,11 @@ /* * GPIOA setup: * - * PA0 - ARD_A0 (analog). - * PA1 - ARD_A1 (analog). - * PA2 - ARD_D1 USART_TX (alternate 1). - * PA3 - ARD_D0 USART_RX (alternate 1). - * PA4 - ARD_A2 (analog). + * PA0 - ARD_A0 ADC1_IN0 (analog). + * PA1 - ARD_A1 ADC1_IN1 (analog). + * PA2 - ARD_D1 USART2_TX (alternate 1). + * PA3 - ARD_D0 USART2_RX (alternate 1). + * PA4 - ARD_A2 ADC1_IN4 (analog). * PA5 - LED_GREEN (output pushpull high). * PA6 - ARD_D12 (input pullup). * PA7 - ARD_D11 (input pullup). @@ -339,7 +355,7 @@ /* * GPIOB setup: * - * PB0 - ARD_A3 (analog). + * PB0 - ARD_A3 ADC1_IN8 (analog). * PB1 - PIN1 (input pullup). * PB2 - PIN2 (input pullup). * PB3 - SWO ARD_D3 (alternate 0). @@ -347,8 +363,8 @@ * PB5 - ARD_D4 (input pullup). * PB6 - ARD_D10 (input pullup). * PB7 - PIN7 (input pullup). - * PB8 - ARD_D15 ARD_A5_ALT (input pullup). - * PB9 - ARD_D14 ARD_A4_ALT (input pullup). + * PB8 - ARD_D15 I2C1_SCL (alternate 1). + * PB9 - ARD_D14 I2C1_SDA (alternate 1). * PB10 - ARD_D6 (input pullup). * PB11 - PIN11 (input pullup). * PB12 - PIN12 (input pullup). @@ -364,8 +380,8 @@ PIN_MODE_INPUT(GPIOB_ARD_D4) | \ PIN_MODE_INPUT(GPIOB_ARD_D10) | \ PIN_MODE_INPUT(GPIOB_PIN7) | \ - PIN_MODE_INPUT(GPIOB_ARD_D15) | \ - PIN_MODE_INPUT(GPIOB_ARD_D14) | \ + PIN_MODE_ALTERNATE(GPIOB_ARD_D15) | \ + PIN_MODE_ALTERNATE(GPIOB_ARD_D14) | \ PIN_MODE_INPUT(GPIOB_ARD_D6) | \ PIN_MODE_INPUT(GPIOB_PIN11) | \ PIN_MODE_INPUT(GPIOB_PIN12) | \ @@ -412,8 +428,8 @@ PIN_PUPDR_PULLUP(GPIOB_ARD_D4) | \ PIN_PUPDR_PULLUP(GPIOB_ARD_D10) | \ PIN_PUPDR_PULLUP(GPIOB_PIN7) | \ - PIN_PUPDR_PULLUP(GPIOB_ARD_D15) | \ - PIN_PUPDR_PULLUP(GPIOB_ARD_D14) | \ + PIN_PUPDR_FLOATING(GPIOB_ARD_D15) | \ + PIN_PUPDR_FLOATING(GPIOB_ARD_D14) | \ PIN_PUPDR_PULLUP(GPIOB_ARD_D6) | \ PIN_PUPDR_PULLUP(GPIOB_PIN11) | \ PIN_PUPDR_PULLUP(GPIOB_PIN12) | \ @@ -444,8 +460,8 @@ PIN_AFIO_AF(GPIOB_ARD_D4, 0) | \ PIN_AFIO_AF(GPIOB_ARD_D10, 0) | \ PIN_AFIO_AF(GPIOB_PIN7, 0)) -#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 0) | \ - PIN_AFIO_AF(GPIOB_ARD_D14, 0) | \ +#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 1) | \ + PIN_AFIO_AF(GPIOB_ARD_D14, 1) | \ PIN_AFIO_AF(GPIOB_ARD_D6, 0) | \ PIN_AFIO_AF(GPIOB_PIN11, 0) | \ PIN_AFIO_AF(GPIOB_PIN12, 0) | \ @@ -456,8 +472,8 @@ /* * GPIOC setup: * - * PC0 - ARD_A5 (analog). - * PC1 - ARD_A4 (analog). + * PC0 - ARD_A5 ADC1_IN11 (analog). + * PC1 - ARD_A4 ADC1_IN10 (analog). * PC2 - PIN2 (input pullup). * PC3 - PIN3 (input pullup). * PC4 - PIN4 (input pullup). @@ -470,8 +486,8 @@ * PC11 - PIN11 (input pullup). * PC12 - PIN12 (input pullup). * PC13 - BUTTON (input floating). - * PC14 - PIN14 (input pullup). - * PC15 - PIN15 (input pullup). + * PC14 - OSC32_IN (input floating). + * PC15 - OSC32_OUT (input floating). */ #define VAL_GPIOC_MODER (PIN_MODE_ANALOG(GPIOC_ARD_A5) | \ PIN_MODE_ANALOG(GPIOC_ARD_A4) | \ @@ -487,8 +503,8 @@ PIN_MODE_INPUT(GPIOC_PIN11) | \ PIN_MODE_INPUT(GPIOC_PIN12) | \ PIN_MODE_INPUT(GPIOC_BUTTON) | \ - PIN_MODE_INPUT(GPIOC_PIN14) | \ - PIN_MODE_INPUT(GPIOC_PIN15)) + PIN_MODE_INPUT(GPIOC_OSC32_IN) | \ + PIN_MODE_INPUT(GPIOC_OSC32_OUT)) #define VAL_GPIOC_OTYPER (PIN_OTYPE_PUSHPULL(GPIOC_ARD_A5) | \ PIN_OTYPE_PUSHPULL(GPIOC_ARD_A4) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN2) | \ @@ -503,8 +519,8 @@ PIN_OTYPE_PUSHPULL(GPIOC_PIN11) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN12) | \ PIN_OTYPE_PUSHPULL(GPIOC_BUTTON) | \ - PIN_OTYPE_PUSHPULL(GPIOC_PIN14) | \ - PIN_OTYPE_PUSHPULL(GPIOC_PIN15)) + PIN_OTYPE_PUSHPULL(GPIOC_OSC32_IN) | \ + PIN_OTYPE_PUSHPULL(GPIOC_OSC32_OUT)) #define VAL_GPIOC_OSPEEDR (PIN_OSPEED_HIGH(GPIOC_ARD_A5) | \ PIN_OSPEED_HIGH(GPIOC_ARD_A4) | \ PIN_OSPEED_HIGH(GPIOC_PIN2) | \ @@ -519,8 +535,8 @@ PIN_OSPEED_HIGH(GPIOC_PIN11) | \ PIN_OSPEED_HIGH(GPIOC_PIN12) | \ PIN_OSPEED_HIGH(GPIOC_BUTTON) | \ - PIN_OSPEED_HIGH(GPIOC_PIN14) | \ - PIN_OSPEED_HIGH(GPIOC_PIN15)) + PIN_OSPEED_HIGH(GPIOC_OSC32_IN) | \ + PIN_OSPEED_HIGH(GPIOC_OSC32_OUT)) #define VAL_GPIOC_PUPDR (PIN_PUPDR_FLOATING(GPIOC_ARD_A5) | \ PIN_PUPDR_FLOATING(GPIOC_ARD_A4) | \ PIN_PUPDR_PULLUP(GPIOC_PIN2) | \ @@ -535,8 +551,8 @@ PIN_PUPDR_PULLUP(GPIOC_PIN11) | \ PIN_PUPDR_PULLUP(GPIOC_PIN12) | \ PIN_PUPDR_FLOATING(GPIOC_BUTTON) | \ - PIN_PUPDR_PULLUP(GPIOC_PIN14) | \ - PIN_PUPDR_PULLUP(GPIOC_PIN15)) + PIN_PUPDR_FLOATING(GPIOC_OSC32_IN) | \ + PIN_PUPDR_FLOATING(GPIOC_OSC32_OUT)) #define VAL_GPIOC_ODR (PIN_ODR_HIGH(GPIOC_ARD_A5) | \ PIN_ODR_HIGH(GPIOC_ARD_A4) | \ PIN_ODR_HIGH(GPIOC_PIN2) | \ @@ -551,8 +567,8 @@ PIN_ODR_HIGH(GPIOC_PIN11) | \ PIN_ODR_HIGH(GPIOC_PIN12) | \ PIN_ODR_HIGH(GPIOC_BUTTON) | \ - PIN_ODR_HIGH(GPIOC_PIN14) | \ - PIN_ODR_HIGH(GPIOC_PIN15)) + PIN_ODR_HIGH(GPIOC_OSC32_IN) | \ + PIN_ODR_HIGH(GPIOC_OSC32_OUT)) #define VAL_GPIOC_AFRL (PIN_AFIO_AF(GPIOC_ARD_A5, 0) | \ PIN_AFIO_AF(GPIOC_ARD_A4, 0) | \ PIN_AFIO_AF(GPIOC_PIN2, 0) | \ @@ -567,8 +583,8 @@ PIN_AFIO_AF(GPIOC_PIN11, 0) | \ PIN_AFIO_AF(GPIOC_PIN12, 0) | \ PIN_AFIO_AF(GPIOC_BUTTON, 0) | \ - PIN_AFIO_AF(GPIOC_PIN14, 0) | \ - PIN_AFIO_AF(GPIOC_PIN15, 0)) + PIN_AFIO_AF(GPIOC_OSC32_IN, 0) | \ + PIN_AFIO_AF(GPIOC_OSC32_OUT, 0)) /* * GPIOD setup: @@ -807,8 +823,8 @@ /* * GPIOF setup: * - * PF0 - PIN0 (input pullup). - * PF1 - PIN1 (input pullup). + * PF0 - OSC_IN (input floating). + * PF1 - OSC_OUT (input floating). * PF2 - PIN2 (input pullup). * PF3 - PIN3 (input pullup). * PF4 - PIN4 (input pullup). @@ -824,8 +840,8 @@ * PF14 - PIN14 (input pullup). * PF15 - PIN15 (input pullup). */ -#define VAL_GPIOF_MODER (PIN_MODE_INPUT(GPIOF_PIN0) | \ - PIN_MODE_INPUT(GPIOF_PIN1) | \ +#define VAL_GPIOF_MODER (PIN_MODE_INPUT(GPIOF_OSC_IN) | \ + PIN_MODE_INPUT(GPIOF_OSC_OUT) | \ PIN_MODE_INPUT(GPIOF_PIN2) | \ PIN_MODE_INPUT(GPIOF_PIN3) | \ PIN_MODE_INPUT(GPIOF_PIN4) | \ @@ -840,8 +856,8 @@ PIN_MODE_INPUT(GPIOF_PIN13) | \ PIN_MODE_INPUT(GPIOF_PIN14) | \ PIN_MODE_INPUT(GPIOF_PIN15)) -#define VAL_GPIOF_OTYPER (PIN_OTYPE_PUSHPULL(GPIOF_PIN0) | \ - PIN_OTYPE_PUSHPULL(GPIOF_PIN1) | \ +#define VAL_GPIOF_OTYPER (PIN_OTYPE_PUSHPULL(GPIOF_OSC_IN) | \ + PIN_OTYPE_PUSHPULL(GPIOF_OSC_OUT) | \ PIN_OTYPE_PUSHPULL(GPIOF_PIN2) | \ PIN_OTYPE_PUSHPULL(GPIOF_PIN3) | \ PIN_OTYPE_PUSHPULL(GPIOF_PIN4) | \ @@ -856,8 +872,8 @@ PIN_OTYPE_PUSHPULL(GPIOF_PIN13) | \ PIN_OTYPE_PUSHPULL(GPIOF_PIN14) | \ PIN_OTYPE_PUSHPULL(GPIOF_PIN15)) -#define VAL_GPIOF_OSPEEDR (PIN_OSPEED_HIGH(GPIOF_PIN0) | \ - PIN_OSPEED_HIGH(GPIOF_PIN1) | \ +#define VAL_GPIOF_OSPEEDR (PIN_OSPEED_HIGH(GPIOF_OSC_IN) | \ + PIN_OSPEED_HIGH(GPIOF_OSC_OUT) | \ PIN_OSPEED_HIGH(GPIOF_PIN2) | \ PIN_OSPEED_HIGH(GPIOF_PIN3) | \ PIN_OSPEED_HIGH(GPIOF_PIN4) | \ @@ -872,8 +888,8 @@ PIN_OSPEED_HIGH(GPIOF_PIN13) | \ PIN_OSPEED_HIGH(GPIOF_PIN14) | \ PIN_OSPEED_HIGH(GPIOF_PIN15)) -#define VAL_GPIOF_PUPDR (PIN_PUPDR_PULLUP(GPIOF_PIN0) | \ - PIN_PUPDR_PULLUP(GPIOF_PIN1) | \ +#define VAL_GPIOF_PUPDR (PIN_PUPDR_FLOATING(GPIOF_OSC_IN) | \ + PIN_PUPDR_FLOATING(GPIOF_OSC_OUT) | \ PIN_PUPDR_PULLUP(GPIOF_PIN2) | \ PIN_PUPDR_PULLUP(GPIOF_PIN3) | \ PIN_PUPDR_PULLUP(GPIOF_PIN4) | \ @@ -888,8 +904,8 @@ PIN_PUPDR_PULLUP(GPIOF_PIN13) | \ PIN_PUPDR_PULLUP(GPIOF_PIN14) | \ PIN_PUPDR_PULLUP(GPIOF_PIN15)) -#define VAL_GPIOF_ODR (PIN_ODR_HIGH(GPIOF_PIN0) | \ - PIN_ODR_HIGH(GPIOF_PIN1) | \ +#define VAL_GPIOF_ODR (PIN_ODR_HIGH(GPIOF_OSC_IN) | \ + PIN_ODR_HIGH(GPIOF_OSC_OUT) | \ PIN_ODR_HIGH(GPIOF_PIN2) | \ PIN_ODR_HIGH(GPIOF_PIN3) | \ PIN_ODR_HIGH(GPIOF_PIN4) | \ @@ -904,8 +920,8 @@ PIN_ODR_HIGH(GPIOF_PIN13) | \ PIN_ODR_HIGH(GPIOF_PIN14) | \ PIN_ODR_HIGH(GPIOF_PIN15)) -#define VAL_GPIOF_AFRL (PIN_AFIO_AF(GPIOF_PIN0, 0) | \ - PIN_AFIO_AF(GPIOF_PIN1, 0) | \ +#define VAL_GPIOF_AFRL (PIN_AFIO_AF(GPIOF_OSC_IN, 0) | \ + PIN_AFIO_AF(GPIOF_OSC_OUT, 0) | \ PIN_AFIO_AF(GPIOF_PIN2, 0) | \ PIN_AFIO_AF(GPIOF_PIN3, 0) | \ PIN_AFIO_AF(GPIOF_PIN4, 0) | \ diff --git a/os/hal/boards/ST_NUCLEO64_F070RB/cfg/board.chcfg b/os/hal/boards/ST_NUCLEO64_F070RB/cfg/board.chcfg index 342a606f0..64f0e598e 100644 --- a/os/hal/boards/ST_NUCLEO64_F070RB/cfg/board.chcfg +++ b/os/hal/boards/ST_NUCLEO64_F070RB/cfg/board.chcfg @@ -17,7 +17,7 @@ + Resistor="Floating" + Mode="Alternate" + Alternate="1" /> + Resistor="Floating" + Mode="Alternate" + Alternate="1" /> @@ -667,19 +667,19 @@ + Resistor="Floating" + Mode="Alternate" + Alternate="1" /> + Resistor="Floating" + Mode="Alternate" + Alternate="1" /> @@ -667,19 +667,19 @@ + Resistor="Floating" + Mode="Alternate" + Alternate="1" /> + Resistor="Floating" + Mode="Alternate" + Alternate="1" /> @@ -667,19 +667,19 @@ + Resistor="Floating" + Mode="Alternate" + Alternate="4" /> + Resistor="Floating" + Mode="Alternate" + Alternate="4" /> @@ -667,19 +667,19 @@ + Resistor="Floating" + Mode="Alternate" + Alternate="4" /> + Resistor="Floating" + Mode="Alternate" + Alternate="4" /> @@ -667,19 +667,19 @@ + Resistor="Floating" + Mode="Alternate" + Alternate="4" /> + Resistor="Floating" + Mode="Alternate" + Alternate="4" /> @@ -667,19 +667,19 @@ + Resistor="Floating" + Mode="Alternate" + Alternate="4" /> + Resistor="Floating" + Mode="Alternate" + Alternate="4" /> diff --git a/os/hal/boards/ST_NUCLEO64_F410RB/board.h b/os/hal/boards/ST_NUCLEO64_F410RB/board.h index c8d800fa0..7d9c98a9e 100644 --- a/os/hal/boards/ST_NUCLEO64_F410RB/board.h +++ b/os/hal/boards/ST_NUCLEO64_F410RB/board.h @@ -18,7 +18,7 @@ #define _BOARD_H_ /* - * Setup for STMicroelectronics NUCLEO64-F410RB board. + * Setup for STMicroelectronics STM32 Nucleo64-F410RB board. */ /* @@ -56,12 +56,15 @@ * IO pins assignments. */ #define GPIOA_ARD_A0 0U +#define GPIOA_ADC1_IN0 0U #define GPIOA_ARD_A1 1U +#define GPIOA_ADC1_IN1 1U #define GPIOA_ARD_D1 2U -#define GPIOA_USART_TX 2U +#define GPIOA_USART2_TX 2U #define GPIOA_ARD_D0 3U -#define GPIOA_USART_RX 3U +#define GPIOA_USART2_RX 3U #define GPIOA_ARD_A2 4U +#define GPIOA_ADC1_IN4 4U #define GPIOA_LED_GREEN 5U #define GPIOA_ARD_D13 5U #define GPIOA_ARD_D12 6U @@ -76,6 +79,7 @@ #define GPIOA_PIN15 15U #define GPIOB_ARD_A3 0U +#define GPIOB_ADC1_IN8 0U #define GPIOB_PIN1 1U #define GPIOB_PIN2 2U #define GPIOB_SWO 3U @@ -85,9 +89,9 @@ #define GPIOB_ARD_D10 6U #define GPIOB_PIN7 7U #define GPIOB_ARD_D15 8U -#define GPIOB_ARD_A5_ALT 8U +#define GPIOB_I2C1_SCL 8U #define GPIOB_ARD_D14 9U -#define GPIOB_ARD_A4_ALT 9U +#define GPIOB_I2C1_SDA 9U #define GPIOB_ARD_D6 10U #define GPIOB_PIN11 11U #define GPIOB_PIN12 12U @@ -96,7 +100,9 @@ #define GPIOB_PIN15 15U #define GPIOC_ARD_A5 0U +#define GPIOC_ADC1_IN10 0U #define GPIOC_ARD_A4 1U +#define GPIOC_ADC1_IN11 1U #define GPIOC_PIN2 2U #define GPIOC_PIN3 3U #define GPIOC_PIN4 4U @@ -109,8 +115,8 @@ #define GPIOC_PIN11 11U #define GPIOC_PIN12 12U #define GPIOC_BUTTON 13U -#define GPIOC_PIN14 14U -#define GPIOC_PIN15 15U +#define GPIOC_OSC32_IN 14U +#define GPIOC_OSC32_OUT 15U #define GPIOD_PIN0 0U #define GPIOD_PIN1 1U @@ -218,12 +224,15 @@ * IO lines assignments. */ #define LINE_ARD_A0 PAL_LINE(GPIOA, 0U) +#define LINE_ADC1_IN0 PAL_LINE(GPIOA, 0U) #define LINE_ARD_A1 PAL_LINE(GPIOA, 1U) +#define LINE_ADC1_IN1 PAL_LINE(GPIOA, 1U) #define LINE_ARD_D1 PAL_LINE(GPIOA, 2U) -#define LINE_USART_TX PAL_LINE(GPIOA, 2U) +#define LINE_USART2_TX PAL_LINE(GPIOA, 2U) #define LINE_ARD_D0 PAL_LINE(GPIOA, 3U) -#define LINE_USART_RX PAL_LINE(GPIOA, 3U) +#define LINE_USART2_RX PAL_LINE(GPIOA, 3U) #define LINE_ARD_A2 PAL_LINE(GPIOA, 4U) +#define LINE_ADC1_IN4 PAL_LINE(GPIOA, 4U) #define LINE_LED_GREEN PAL_LINE(GPIOA, 5U) #define LINE_ARD_D13 PAL_LINE(GPIOA, 5U) #define LINE_ARD_D12 PAL_LINE(GPIOA, 6U) @@ -237,21 +246,26 @@ #define LINE_SWCLK PAL_LINE(GPIOA, 14U) #define LINE_ARD_A3 PAL_LINE(GPIOB, 0U) +#define LINE_ADC1_IN8 PAL_LINE(GPIOB, 0U) #define LINE_SWO PAL_LINE(GPIOB, 3U) #define LINE_ARD_D3 PAL_LINE(GPIOB, 3U) #define LINE_ARD_D5 PAL_LINE(GPIOB, 4U) #define LINE_ARD_D4 PAL_LINE(GPIOB, 5U) #define LINE_ARD_D10 PAL_LINE(GPIOB, 6U) #define LINE_ARD_D15 PAL_LINE(GPIOB, 8U) -#define LINE_ARD_A5_ALT PAL_LINE(GPIOB, 8U) +#define LINE_I2C1_SCL PAL_LINE(GPIOB, 8U) #define LINE_ARD_D14 PAL_LINE(GPIOB, 9U) -#define LINE_ARD_A4_ALT PAL_LINE(GPIOB, 9U) +#define LINE_I2C1_SDA PAL_LINE(GPIOB, 9U) #define LINE_ARD_D6 PAL_LINE(GPIOB, 10U) #define LINE_ARD_A5 PAL_LINE(GPIOC, 0U) +#define LINE_ADC1_IN10 PAL_LINE(GPIOC, 0U) #define LINE_ARD_A4 PAL_LINE(GPIOC, 1U) +#define LINE_ADC1_IN11 PAL_LINE(GPIOC, 1U) #define LINE_ARD_D9 PAL_LINE(GPIOC, 7U) #define LINE_BUTTON PAL_LINE(GPIOC, 13U) +#define LINE_OSC32_IN PAL_LINE(GPIOC, 14U) +#define LINE_OSC32_OUT PAL_LINE(GPIOC, 15U) @@ -286,11 +300,11 @@ /* * GPIOA setup: * - * PA0 - ARD_A0 (analog). - * PA1 - ARD_A1 (analog). - * PA2 - ARD_D1 USART_TX (alternate 7). - * PA3 - ARD_D0 USART_RX (alternate 7). - * PA4 - ARD_A2 (analog). + * PA0 - ARD_A0 ADC1_IN0 (analog). + * PA1 - ARD_A1 ADC1_IN1 (analog). + * PA2 - ARD_D1 USART2_TX (alternate 7). + * PA3 - ARD_D0 USART2_RX (alternate 7). + * PA4 - ARD_A2 ADC1_IN4 (analog). * PA5 - LED_GREEN ARD_D13 (output pushpull high). * PA6 - ARD_D12 (input pullup). * PA7 - ARD_D11 (input pullup). @@ -403,7 +417,7 @@ /* * GPIOB setup: * - * PB0 - ARD_A3 (analog). + * PB0 - ARD_A3 ADC1_IN8 (analog). * PB1 - PIN1 (input pullup). * PB2 - PIN2 (input pullup). * PB3 - SWO ARD_D3 (alternate 0). @@ -411,8 +425,8 @@ * PB5 - ARD_D4 (input pullup). * PB6 - ARD_D10 (input pullup). * PB7 - PIN7 (input pullup). - * PB8 - ARD_D15 ARD_A5_ALT (input pullup). - * PB9 - ARD_D14 ARD_A4_ALT (input pullup). + * PB8 - ARD_D15 I2C1_SCL (alternate 4). + * PB9 - ARD_D14 I2C1_SDA (alternate 4). * PB10 - ARD_D6 (input pullup). * PB11 - PIN11 (input pullup). * PB12 - PIN12 (input pullup). @@ -428,8 +442,8 @@ PIN_MODE_INPUT(GPIOB_ARD_D4) | \ PIN_MODE_INPUT(GPIOB_ARD_D10) | \ PIN_MODE_INPUT(GPIOB_PIN7) | \ - PIN_MODE_INPUT(GPIOB_ARD_D15) | \ - PIN_MODE_INPUT(GPIOB_ARD_D14) | \ + PIN_MODE_ALTERNATE(GPIOB_ARD_D15) | \ + PIN_MODE_ALTERNATE(GPIOB_ARD_D14) | \ PIN_MODE_INPUT(GPIOB_ARD_D6) | \ PIN_MODE_INPUT(GPIOB_PIN11) | \ PIN_MODE_INPUT(GPIOB_PIN12) | \ @@ -476,8 +490,8 @@ PIN_PUPDR_PULLUP(GPIOB_ARD_D4) | \ PIN_PUPDR_PULLUP(GPIOB_ARD_D10) | \ PIN_PUPDR_PULLUP(GPIOB_PIN7) | \ - PIN_PUPDR_PULLUP(GPIOB_ARD_D15) | \ - PIN_PUPDR_PULLUP(GPIOB_ARD_D14) | \ + PIN_PUPDR_FLOATING(GPIOB_ARD_D15) | \ + PIN_PUPDR_FLOATING(GPIOB_ARD_D14) | \ PIN_PUPDR_PULLUP(GPIOB_ARD_D6) | \ PIN_PUPDR_PULLUP(GPIOB_PIN11) | \ PIN_PUPDR_PULLUP(GPIOB_PIN12) | \ @@ -508,8 +522,8 @@ PIN_AFIO_AF(GPIOB_ARD_D4, 0) | \ PIN_AFIO_AF(GPIOB_ARD_D10, 0) | \ PIN_AFIO_AF(GPIOB_PIN7, 0)) -#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 0) | \ - PIN_AFIO_AF(GPIOB_ARD_D14, 0) | \ +#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 4) | \ + PIN_AFIO_AF(GPIOB_ARD_D14, 4) | \ PIN_AFIO_AF(GPIOB_ARD_D6, 0) | \ PIN_AFIO_AF(GPIOB_PIN11, 0) | \ PIN_AFIO_AF(GPIOB_PIN12, 0) | \ @@ -520,8 +534,8 @@ /* * GPIOC setup: * - * PC0 - ARD_A5 (analog). - * PC1 - ARD_A4 (analog). + * PC0 - ARD_A5 ADC1_IN10 (analog). + * PC1 - ARD_A4 ADC1_IN11 (analog). * PC2 - PIN2 (input pullup). * PC3 - PIN3 (input pullup). * PC4 - PIN4 (input pullup). @@ -534,8 +548,8 @@ * PC11 - PIN11 (input pullup). * PC12 - PIN12 (input pullup). * PC13 - BUTTON (input floating). - * PC14 - PIN14 (input pullup). - * PC15 - PIN15 (input pullup). + * PC14 - OSC32_IN (input floating). + * PC15 - OSC32_OUT (input floating). */ #define VAL_GPIOC_MODER (PIN_MODE_ANALOG(GPIOC_ARD_A5) | \ PIN_MODE_ANALOG(GPIOC_ARD_A4) | \ @@ -551,8 +565,8 @@ PIN_MODE_INPUT(GPIOC_PIN11) | \ PIN_MODE_INPUT(GPIOC_PIN12) | \ PIN_MODE_INPUT(GPIOC_BUTTON) | \ - PIN_MODE_INPUT(GPIOC_PIN14) | \ - PIN_MODE_INPUT(GPIOC_PIN15)) + PIN_MODE_INPUT(GPIOC_OSC32_IN) | \ + PIN_MODE_INPUT(GPIOC_OSC32_OUT)) #define VAL_GPIOC_OTYPER (PIN_OTYPE_PUSHPULL(GPIOC_ARD_A5) | \ PIN_OTYPE_PUSHPULL(GPIOC_ARD_A4) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN2) | \ @@ -567,8 +581,8 @@ PIN_OTYPE_PUSHPULL(GPIOC_PIN11) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN12) | \ PIN_OTYPE_PUSHPULL(GPIOC_BUTTON) | \ - PIN_OTYPE_PUSHPULL(GPIOC_PIN14) | \ - PIN_OTYPE_PUSHPULL(GPIOC_PIN15)) + PIN_OTYPE_PUSHPULL(GPIOC_OSC32_IN) | \ + PIN_OTYPE_PUSHPULL(GPIOC_OSC32_OUT)) #define VAL_GPIOC_OSPEEDR (PIN_OSPEED_HIGH(GPIOC_ARD_A5) | \ PIN_OSPEED_HIGH(GPIOC_ARD_A4) | \ PIN_OSPEED_HIGH(GPIOC_PIN2) | \ @@ -583,8 +597,8 @@ PIN_OSPEED_HIGH(GPIOC_PIN11) | \ PIN_OSPEED_HIGH(GPIOC_PIN12) | \ PIN_OSPEED_HIGH(GPIOC_BUTTON) | \ - PIN_OSPEED_HIGH(GPIOC_PIN14) | \ - PIN_OSPEED_HIGH(GPIOC_PIN15)) + PIN_OSPEED_HIGH(GPIOC_OSC32_IN) | \ + PIN_OSPEED_HIGH(GPIOC_OSC32_OUT)) #define VAL_GPIOC_PUPDR (PIN_PUPDR_FLOATING(GPIOC_ARD_A5) | \ PIN_PUPDR_FLOATING(GPIOC_ARD_A4) | \ PIN_PUPDR_PULLUP(GPIOC_PIN2) | \ @@ -599,8 +613,8 @@ PIN_PUPDR_PULLUP(GPIOC_PIN11) | \ PIN_PUPDR_PULLUP(GPIOC_PIN12) | \ PIN_PUPDR_FLOATING(GPIOC_BUTTON) | \ - PIN_PUPDR_PULLUP(GPIOC_PIN14) | \ - PIN_PUPDR_PULLUP(GPIOC_PIN15)) + PIN_PUPDR_FLOATING(GPIOC_OSC32_IN) | \ + PIN_PUPDR_FLOATING(GPIOC_OSC32_OUT)) #define VAL_GPIOC_ODR (PIN_ODR_HIGH(GPIOC_ARD_A5) | \ PIN_ODR_HIGH(GPIOC_ARD_A4) | \ PIN_ODR_HIGH(GPIOC_PIN2) | \ @@ -615,8 +629,8 @@ PIN_ODR_HIGH(GPIOC_PIN11) | \ PIN_ODR_HIGH(GPIOC_PIN12) | \ PIN_ODR_HIGH(GPIOC_BUTTON) | \ - PIN_ODR_HIGH(GPIOC_PIN14) | \ - PIN_ODR_HIGH(GPIOC_PIN15)) + PIN_ODR_HIGH(GPIOC_OSC32_IN) | \ + PIN_ODR_HIGH(GPIOC_OSC32_OUT)) #define VAL_GPIOC_AFRL (PIN_AFIO_AF(GPIOC_ARD_A5, 0) | \ PIN_AFIO_AF(GPIOC_ARD_A4, 0) | \ PIN_AFIO_AF(GPIOC_PIN2, 0) | \ @@ -631,8 +645,8 @@ PIN_AFIO_AF(GPIOC_PIN11, 0) | \ PIN_AFIO_AF(GPIOC_PIN12, 0) | \ PIN_AFIO_AF(GPIOC_BUTTON, 0) | \ - PIN_AFIO_AF(GPIOC_PIN14, 0) | \ - PIN_AFIO_AF(GPIOC_PIN15, 0)) + PIN_AFIO_AF(GPIOC_OSC32_IN, 0) | \ + PIN_AFIO_AF(GPIOC_OSC32_OUT, 0)) /* * GPIOD setup: diff --git a/os/hal/boards/ST_NUCLEO64_F410RB/cfg/board.chcfg b/os/hal/boards/ST_NUCLEO64_F410RB/cfg/board.chcfg index 7e8701aed..bc762d078 100644 --- a/os/hal/boards/ST_NUCLEO64_F410RB/cfg/board.chcfg +++ b/os/hal/boards/ST_NUCLEO64_F410RB/cfg/board.chcfg @@ -21,7 +21,7 @@ + Resistor="Floating" + Mode="Alternate" + Alternate="4" /> + Resistor="Floating" + Mode="Alternate" + Alternate="4" /> diff --git a/os/hal/boards/ST_NUCLEO64_F411RE/board.h b/os/hal/boards/ST_NUCLEO64_F411RE/board.h index 9c609b67c..638b906e9 100644 --- a/os/hal/boards/ST_NUCLEO64_F411RE/board.h +++ b/os/hal/boards/ST_NUCLEO64_F411RE/board.h @@ -18,7 +18,7 @@ #define _BOARD_H_ /* - * Setup for STMicroelectronics NUCLEO64-F411RE board. + * Setup for STMicroelectronics STM32 Nucleo64-F411RE board. */ /* @@ -56,12 +56,15 @@ * IO pins assignments. */ #define GPIOA_ARD_A0 0U +#define GPIOA_ADC1_IN0 0U #define GPIOA_ARD_A1 1U +#define GPIOA_ADC1_IN1 1U #define GPIOA_ARD_D1 2U -#define GPIOA_USART_TX 2U +#define GPIOA_USART2_TX 2U #define GPIOA_ARD_D0 3U -#define GPIOA_USART_RX 3U +#define GPIOA_USART2_RX 3U #define GPIOA_ARD_A2 4U +#define GPIOA_ADC1_IN4 4U #define GPIOA_LED_GREEN 5U #define GPIOA_ARD_D13 5U #define GPIOA_ARD_D12 6U @@ -76,6 +79,7 @@ #define GPIOA_PIN15 15U #define GPIOB_ARD_A3 0U +#define GPIOB_ADC1_IN8 0U #define GPIOB_PIN1 1U #define GPIOB_PIN2 2U #define GPIOB_SWO 3U @@ -85,9 +89,9 @@ #define GPIOB_ARD_D10 6U #define GPIOB_PIN7 7U #define GPIOB_ARD_D15 8U -#define GPIOB_ARD_A5_ALT 8U +#define GPIOB_I2C1_SCL 8U #define GPIOB_ARD_D14 9U -#define GPIOB_ARD_A4_ALT 9U +#define GPIOB_I2C1_SDA 9U #define GPIOB_ARD_D6 10U #define GPIOB_PIN11 11U #define GPIOB_PIN12 12U @@ -96,7 +100,9 @@ #define GPIOB_PIN15 15U #define GPIOC_ARD_A5 0U +#define GPIOC_ADC1_IN10 0U #define GPIOC_ARD_A4 1U +#define GPIOC_ADC1_IN11 1U #define GPIOC_PIN2 2U #define GPIOC_PIN3 3U #define GPIOC_PIN4 4U @@ -109,8 +115,8 @@ #define GPIOC_PIN11 11U #define GPIOC_PIN12 12U #define GPIOC_BUTTON 13U -#define GPIOC_PIN14 14U -#define GPIOC_PIN15 15U +#define GPIOC_OSC32_IN 14U +#define GPIOC_OSC32_OUT 15U #define GPIOD_PIN0 0U #define GPIOD_PIN1 1U @@ -218,12 +224,15 @@ * IO lines assignments. */ #define LINE_ARD_A0 PAL_LINE(GPIOA, 0U) +#define LINE_ADC1_IN0 PAL_LINE(GPIOA, 0U) #define LINE_ARD_A1 PAL_LINE(GPIOA, 1U) +#define LINE_ADC1_IN1 PAL_LINE(GPIOA, 1U) #define LINE_ARD_D1 PAL_LINE(GPIOA, 2U) -#define LINE_USART_TX PAL_LINE(GPIOA, 2U) +#define LINE_USART2_TX PAL_LINE(GPIOA, 2U) #define LINE_ARD_D0 PAL_LINE(GPIOA, 3U) -#define LINE_USART_RX PAL_LINE(GPIOA, 3U) +#define LINE_USART2_RX PAL_LINE(GPIOA, 3U) #define LINE_ARD_A2 PAL_LINE(GPIOA, 4U) +#define LINE_ADC1_IN4 PAL_LINE(GPIOA, 4U) #define LINE_LED_GREEN PAL_LINE(GPIOA, 5U) #define LINE_ARD_D13 PAL_LINE(GPIOA, 5U) #define LINE_ARD_D12 PAL_LINE(GPIOA, 6U) @@ -237,21 +246,26 @@ #define LINE_SWCLK PAL_LINE(GPIOA, 14U) #define LINE_ARD_A3 PAL_LINE(GPIOB, 0U) +#define LINE_ADC1_IN8 PAL_LINE(GPIOB, 0U) #define LINE_SWO PAL_LINE(GPIOB, 3U) #define LINE_ARD_D3 PAL_LINE(GPIOB, 3U) #define LINE_ARD_D5 PAL_LINE(GPIOB, 4U) #define LINE_ARD_D4 PAL_LINE(GPIOB, 5U) #define LINE_ARD_D10 PAL_LINE(GPIOB, 6U) #define LINE_ARD_D15 PAL_LINE(GPIOB, 8U) -#define LINE_ARD_A5_ALT PAL_LINE(GPIOB, 8U) +#define LINE_I2C1_SCL PAL_LINE(GPIOB, 8U) #define LINE_ARD_D14 PAL_LINE(GPIOB, 9U) -#define LINE_ARD_A4_ALT PAL_LINE(GPIOB, 9U) +#define LINE_I2C1_SDA PAL_LINE(GPIOB, 9U) #define LINE_ARD_D6 PAL_LINE(GPIOB, 10U) #define LINE_ARD_A5 PAL_LINE(GPIOC, 0U) +#define LINE_ADC1_IN10 PAL_LINE(GPIOC, 0U) #define LINE_ARD_A4 PAL_LINE(GPIOC, 1U) +#define LINE_ADC1_IN11 PAL_LINE(GPIOC, 1U) #define LINE_ARD_D9 PAL_LINE(GPIOC, 7U) #define LINE_BUTTON PAL_LINE(GPIOC, 13U) +#define LINE_OSC32_IN PAL_LINE(GPIOC, 14U) +#define LINE_OSC32_OUT PAL_LINE(GPIOC, 15U) @@ -286,11 +300,11 @@ /* * GPIOA setup: * - * PA0 - ARD_A0 (analog). - * PA1 - ARD_A1 (analog). - * PA2 - ARD_D1 USART_TX (alternate 7). - * PA3 - ARD_D0 USART_RX (alternate 7). - * PA4 - ARD_A2 (analog). + * PA0 - ARD_A0 ADC1_IN0 (analog). + * PA1 - ARD_A1 ADC1_IN1 (analog). + * PA2 - ARD_D1 USART2_TX (alternate 7). + * PA3 - ARD_D0 USART2_RX (alternate 7). + * PA4 - ARD_A2 ADC1_IN4 (analog). * PA5 - LED_GREEN ARD_D13 (output pushpull high). * PA6 - ARD_D12 (input pullup). * PA7 - ARD_D11 (input pullup). @@ -403,7 +417,7 @@ /* * GPIOB setup: * - * PB0 - ARD_A3 (analog). + * PB0 - ARD_A3 ADC1_IN8 (analog). * PB1 - PIN1 (input pullup). * PB2 - PIN2 (input pullup). * PB3 - SWO ARD_D3 (alternate 0). @@ -411,8 +425,8 @@ * PB5 - ARD_D4 (input pullup). * PB6 - ARD_D10 (input pullup). * PB7 - PIN7 (input pullup). - * PB8 - ARD_D15 ARD_A5_ALT (input pullup). - * PB9 - ARD_D14 ARD_A4_ALT (input pullup). + * PB8 - ARD_D15 I2C1_SCL (alternate 4). + * PB9 - ARD_D14 I2C1_SDA (alternate 4). * PB10 - ARD_D6 (input pullup). * PB11 - PIN11 (input pullup). * PB12 - PIN12 (input pullup). @@ -428,8 +442,8 @@ PIN_MODE_INPUT(GPIOB_ARD_D4) | \ PIN_MODE_INPUT(GPIOB_ARD_D10) | \ PIN_MODE_INPUT(GPIOB_PIN7) | \ - PIN_MODE_INPUT(GPIOB_ARD_D15) | \ - PIN_MODE_INPUT(GPIOB_ARD_D14) | \ + PIN_MODE_ALTERNATE(GPIOB_ARD_D15) | \ + PIN_MODE_ALTERNATE(GPIOB_ARD_D14) | \ PIN_MODE_INPUT(GPIOB_ARD_D6) | \ PIN_MODE_INPUT(GPIOB_PIN11) | \ PIN_MODE_INPUT(GPIOB_PIN12) | \ @@ -476,8 +490,8 @@ PIN_PUPDR_PULLUP(GPIOB_ARD_D4) | \ PIN_PUPDR_PULLUP(GPIOB_ARD_D10) | \ PIN_PUPDR_PULLUP(GPIOB_PIN7) | \ - PIN_PUPDR_PULLUP(GPIOB_ARD_D15) | \ - PIN_PUPDR_PULLUP(GPIOB_ARD_D14) | \ + PIN_PUPDR_FLOATING(GPIOB_ARD_D15) | \ + PIN_PUPDR_FLOATING(GPIOB_ARD_D14) | \ PIN_PUPDR_PULLUP(GPIOB_ARD_D6) | \ PIN_PUPDR_PULLUP(GPIOB_PIN11) | \ PIN_PUPDR_PULLUP(GPIOB_PIN12) | \ @@ -508,8 +522,8 @@ PIN_AFIO_AF(GPIOB_ARD_D4, 0) | \ PIN_AFIO_AF(GPIOB_ARD_D10, 0) | \ PIN_AFIO_AF(GPIOB_PIN7, 0)) -#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 0) | \ - PIN_AFIO_AF(GPIOB_ARD_D14, 0) | \ +#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 4) | \ + PIN_AFIO_AF(GPIOB_ARD_D14, 4) | \ PIN_AFIO_AF(GPIOB_ARD_D6, 0) | \ PIN_AFIO_AF(GPIOB_PIN11, 0) | \ PIN_AFIO_AF(GPIOB_PIN12, 0) | \ @@ -520,8 +534,8 @@ /* * GPIOC setup: * - * PC0 - ARD_A5 (analog). - * PC1 - ARD_A4 (analog). + * PC0 - ARD_A5 ADC1_IN10 (analog). + * PC1 - ARD_A4 ADC1_IN11 (analog). * PC2 - PIN2 (input pullup). * PC3 - PIN3 (input pullup). * PC4 - PIN4 (input pullup). @@ -534,8 +548,8 @@ * PC11 - PIN11 (input pullup). * PC12 - PIN12 (input pullup). * PC13 - BUTTON (input floating). - * PC14 - PIN14 (input pullup). - * PC15 - PIN15 (input pullup). + * PC14 - OSC32_IN (input floating). + * PC15 - OSC32_OUT (input floating). */ #define VAL_GPIOC_MODER (PIN_MODE_ANALOG(GPIOC_ARD_A5) | \ PIN_MODE_ANALOG(GPIOC_ARD_A4) | \ @@ -551,8 +565,8 @@ PIN_MODE_INPUT(GPIOC_PIN11) | \ PIN_MODE_INPUT(GPIOC_PIN12) | \ PIN_MODE_INPUT(GPIOC_BUTTON) | \ - PIN_MODE_INPUT(GPIOC_PIN14) | \ - PIN_MODE_INPUT(GPIOC_PIN15)) + PIN_MODE_INPUT(GPIOC_OSC32_IN) | \ + PIN_MODE_INPUT(GPIOC_OSC32_OUT)) #define VAL_GPIOC_OTYPER (PIN_OTYPE_PUSHPULL(GPIOC_ARD_A5) | \ PIN_OTYPE_PUSHPULL(GPIOC_ARD_A4) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN2) | \ @@ -567,8 +581,8 @@ PIN_OTYPE_PUSHPULL(GPIOC_PIN11) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN12) | \ PIN_OTYPE_PUSHPULL(GPIOC_BUTTON) | \ - PIN_OTYPE_PUSHPULL(GPIOC_PIN14) | \ - PIN_OTYPE_PUSHPULL(GPIOC_PIN15)) + PIN_OTYPE_PUSHPULL(GPIOC_OSC32_IN) | \ + PIN_OTYPE_PUSHPULL(GPIOC_OSC32_OUT)) #define VAL_GPIOC_OSPEEDR (PIN_OSPEED_HIGH(GPIOC_ARD_A5) | \ PIN_OSPEED_HIGH(GPIOC_ARD_A4) | \ PIN_OSPEED_HIGH(GPIOC_PIN2) | \ @@ -583,8 +597,8 @@ PIN_OSPEED_HIGH(GPIOC_PIN11) | \ PIN_OSPEED_HIGH(GPIOC_PIN12) | \ PIN_OSPEED_HIGH(GPIOC_BUTTON) | \ - PIN_OSPEED_HIGH(GPIOC_PIN14) | \ - PIN_OSPEED_HIGH(GPIOC_PIN15)) + PIN_OSPEED_HIGH(GPIOC_OSC32_IN) | \ + PIN_OSPEED_HIGH(GPIOC_OSC32_OUT)) #define VAL_GPIOC_PUPDR (PIN_PUPDR_FLOATING(GPIOC_ARD_A5) | \ PIN_PUPDR_FLOATING(GPIOC_ARD_A4) | \ PIN_PUPDR_PULLUP(GPIOC_PIN2) | \ @@ -599,8 +613,8 @@ PIN_PUPDR_PULLUP(GPIOC_PIN11) | \ PIN_PUPDR_PULLUP(GPIOC_PIN12) | \ PIN_PUPDR_FLOATING(GPIOC_BUTTON) | \ - PIN_PUPDR_PULLUP(GPIOC_PIN14) | \ - PIN_PUPDR_PULLUP(GPIOC_PIN15)) + PIN_PUPDR_FLOATING(GPIOC_OSC32_IN) | \ + PIN_PUPDR_FLOATING(GPIOC_OSC32_OUT)) #define VAL_GPIOC_ODR (PIN_ODR_HIGH(GPIOC_ARD_A5) | \ PIN_ODR_HIGH(GPIOC_ARD_A4) | \ PIN_ODR_HIGH(GPIOC_PIN2) | \ @@ -615,8 +629,8 @@ PIN_ODR_HIGH(GPIOC_PIN11) | \ PIN_ODR_HIGH(GPIOC_PIN12) | \ PIN_ODR_HIGH(GPIOC_BUTTON) | \ - PIN_ODR_HIGH(GPIOC_PIN14) | \ - PIN_ODR_HIGH(GPIOC_PIN15)) + PIN_ODR_HIGH(GPIOC_OSC32_IN) | \ + PIN_ODR_HIGH(GPIOC_OSC32_OUT)) #define VAL_GPIOC_AFRL (PIN_AFIO_AF(GPIOC_ARD_A5, 0) | \ PIN_AFIO_AF(GPIOC_ARD_A4, 0) | \ PIN_AFIO_AF(GPIOC_PIN2, 0) | \ @@ -631,8 +645,8 @@ PIN_AFIO_AF(GPIOC_PIN11, 0) | \ PIN_AFIO_AF(GPIOC_PIN12, 0) | \ PIN_AFIO_AF(GPIOC_BUTTON, 0) | \ - PIN_AFIO_AF(GPIOC_PIN14, 0) | \ - PIN_AFIO_AF(GPIOC_PIN15, 0)) + PIN_AFIO_AF(GPIOC_OSC32_IN, 0) | \ + PIN_AFIO_AF(GPIOC_OSC32_OUT, 0)) /* * GPIOD setup: diff --git a/os/hal/boards/ST_NUCLEO64_F411RE/cfg/board.chcfg b/os/hal/boards/ST_NUCLEO64_F411RE/cfg/board.chcfg index 83ecc0e8d..eb4abe3a2 100644 --- a/os/hal/boards/ST_NUCLEO64_F411RE/cfg/board.chcfg +++ b/os/hal/boards/ST_NUCLEO64_F411RE/cfg/board.chcfg @@ -21,7 +21,7 @@ + Resistor="Floating" + Mode="Alternate" + Alternate="4" /> + Resistor="Floating" + Mode="Alternate" + Alternate="4" /> diff --git a/os/hal/boards/ST_NUCLEO64_F446RE/board.h b/os/hal/boards/ST_NUCLEO64_F446RE/board.h index e6483b951..629204f49 100644 --- a/os/hal/boards/ST_NUCLEO64_F446RE/board.h +++ b/os/hal/boards/ST_NUCLEO64_F446RE/board.h @@ -18,7 +18,7 @@ #define _BOARD_H_ /* - * Setup for STMicroelectronics NUCLEO64-F446RE board. + * Setup for STMicroelectronics STM32 Nucleo64-F446RE board. */ /* @@ -56,12 +56,15 @@ * IO pins assignments. */ #define GPIOA_ARD_A0 0U +#define GPIOA_ADC123_IN0 0U #define GPIOA_ARD_A1 1U +#define GPIOA_ADC123_IN0 1U #define GPIOA_ARD_D1 2U -#define GPIOA_USART_TX 2U +#define GPIOA_USART2_TX 2U #define GPIOA_ARD_D0 3U -#define GPIOA_USART_RX 3U +#define GPIOA_USART2_RX 3U #define GPIOA_ARD_A2 4U +#define GPIOA_ADC12_IN4 4U #define GPIOA_LED_GREEN 5U #define GPIOA_ARD_D13 5U #define GPIOA_ARD_D12 6U @@ -76,6 +79,7 @@ #define GPIOA_PIN15 15U #define GPIOB_ARD_A3 0U +#define GPIOB_ADC12_IN8 0U #define GPIOB_PIN1 1U #define GPIOB_PIN2 2U #define GPIOB_SWO 3U @@ -85,9 +89,9 @@ #define GPIOB_ARD_D10 6U #define GPIOB_PIN7 7U #define GPIOB_ARD_D15 8U -#define GPIOB_ARD_A5_ALT 8U +#define GPIOB_I2C1_SCL 8U #define GPIOB_ARD_D14 9U -#define GPIOB_ARD_A4_ALT 9U +#define GPIOB_I2C1_SDA 9U #define GPIOB_ARD_D6 10U #define GPIOB_PIN11 11U #define GPIOB_PIN12 12U @@ -96,7 +100,9 @@ #define GPIOB_PIN15 15U #define GPIOC_ARD_A5 0U +#define GPIOC_ADC123_IN10 0U #define GPIOC_ARD_A4 1U +#define GPIOC_ADC123_IN11 1U #define GPIOC_PIN2 2U #define GPIOC_PIN3 3U #define GPIOC_PIN4 4U @@ -109,8 +115,8 @@ #define GPIOC_PIN11 11U #define GPIOC_PIN12 12U #define GPIOC_BUTTON 13U -#define GPIOC_PIN14 14U -#define GPIOC_PIN15 15U +#define GPIOC_OSC32_IN 14U +#define GPIOC_OSC32_OUT 15U #define GPIOD_PIN0 0U #define GPIOD_PIN1 1U @@ -218,12 +224,15 @@ * IO lines assignments. */ #define LINE_ARD_A0 PAL_LINE(GPIOA, 0U) +#define LINE_ADC123_IN0 PAL_LINE(GPIOA, 0U) #define LINE_ARD_A1 PAL_LINE(GPIOA, 1U) +#define LINE_ADC123_IN0 PAL_LINE(GPIOA, 1U) #define LINE_ARD_D1 PAL_LINE(GPIOA, 2U) -#define LINE_USART_TX PAL_LINE(GPIOA, 2U) +#define LINE_USART2_TX PAL_LINE(GPIOA, 2U) #define LINE_ARD_D0 PAL_LINE(GPIOA, 3U) -#define LINE_USART_RX PAL_LINE(GPIOA, 3U) +#define LINE_USART2_RX PAL_LINE(GPIOA, 3U) #define LINE_ARD_A2 PAL_LINE(GPIOA, 4U) +#define LINE_ADC12_IN4 PAL_LINE(GPIOA, 4U) #define LINE_LED_GREEN PAL_LINE(GPIOA, 5U) #define LINE_ARD_D13 PAL_LINE(GPIOA, 5U) #define LINE_ARD_D12 PAL_LINE(GPIOA, 6U) @@ -237,21 +246,26 @@ #define LINE_SWCLK PAL_LINE(GPIOA, 14U) #define LINE_ARD_A3 PAL_LINE(GPIOB, 0U) +#define LINE_ADC12_IN8 PAL_LINE(GPIOB, 0U) #define LINE_SWO PAL_LINE(GPIOB, 3U) #define LINE_ARD_D3 PAL_LINE(GPIOB, 3U) #define LINE_ARD_D5 PAL_LINE(GPIOB, 4U) #define LINE_ARD_D4 PAL_LINE(GPIOB, 5U) #define LINE_ARD_D10 PAL_LINE(GPIOB, 6U) #define LINE_ARD_D15 PAL_LINE(GPIOB, 8U) -#define LINE_ARD_A5_ALT PAL_LINE(GPIOB, 8U) +#define LINE_I2C1_SCL PAL_LINE(GPIOB, 8U) #define LINE_ARD_D14 PAL_LINE(GPIOB, 9U) -#define LINE_ARD_A4_ALT PAL_LINE(GPIOB, 9U) +#define LINE_I2C1_SDA PAL_LINE(GPIOB, 9U) #define LINE_ARD_D6 PAL_LINE(GPIOB, 10U) #define LINE_ARD_A5 PAL_LINE(GPIOC, 0U) +#define LINE_ADC123_IN10 PAL_LINE(GPIOC, 0U) #define LINE_ARD_A4 PAL_LINE(GPIOC, 1U) +#define LINE_ADC123_IN11 PAL_LINE(GPIOC, 1U) #define LINE_ARD_D9 PAL_LINE(GPIOC, 7U) #define LINE_BUTTON PAL_LINE(GPIOC, 13U) +#define LINE_OSC32_IN PAL_LINE(GPIOC, 14U) +#define LINE_OSC32_OUT PAL_LINE(GPIOC, 15U) @@ -286,11 +300,11 @@ /* * GPIOA setup: * - * PA0 - ARD_A0 (analog). - * PA1 - ARD_A1 (analog). - * PA2 - ARD_D1 USART_TX (alternate 7). - * PA3 - ARD_D0 USART_RX (alternate 7). - * PA4 - ARD_A2 (analog). + * PA0 - ARD_A0 ADC123_IN0 (analog). + * PA1 - ARD_A1 ADC123_IN0 (analog). + * PA2 - ARD_D1 USART2_TX (alternate 7). + * PA3 - ARD_D0 USART2_RX (alternate 7). + * PA4 - ARD_A2 ADC12_IN4 (analog). * PA5 - LED_GREEN ARD_D13 (output pushpull high). * PA6 - ARD_D12 (input pullup). * PA7 - ARD_D11 (input pullup). @@ -403,7 +417,7 @@ /* * GPIOB setup: * - * PB0 - ARD_A3 (analog). + * PB0 - ARD_A3 ADC12_IN8 (analog). * PB1 - PIN1 (input pullup). * PB2 - PIN2 (input pullup). * PB3 - SWO ARD_D3 (alternate 0). @@ -411,8 +425,8 @@ * PB5 - ARD_D4 (input pullup). * PB6 - ARD_D10 (input pullup). * PB7 - PIN7 (input pullup). - * PB8 - ARD_D15 ARD_A5_ALT (input pullup). - * PB9 - ARD_D14 ARD_A4_ALT (input pullup). + * PB8 - ARD_D15 I2C1_SCL (alternate 4). + * PB9 - ARD_D14 I2C1_SDA (alternate 4). * PB10 - ARD_D6 (input pullup). * PB11 - PIN11 (input pullup). * PB12 - PIN12 (input pullup). @@ -428,8 +442,8 @@ PIN_MODE_INPUT(GPIOB_ARD_D4) | \ PIN_MODE_INPUT(GPIOB_ARD_D10) | \ PIN_MODE_INPUT(GPIOB_PIN7) | \ - PIN_MODE_INPUT(GPIOB_ARD_D15) | \ - PIN_MODE_INPUT(GPIOB_ARD_D14) | \ + PIN_MODE_ALTERNATE(GPIOB_ARD_D15) | \ + PIN_MODE_ALTERNATE(GPIOB_ARD_D14) | \ PIN_MODE_INPUT(GPIOB_ARD_D6) | \ PIN_MODE_INPUT(GPIOB_PIN11) | \ PIN_MODE_INPUT(GPIOB_PIN12) | \ @@ -476,8 +490,8 @@ PIN_PUPDR_PULLUP(GPIOB_ARD_D4) | \ PIN_PUPDR_PULLUP(GPIOB_ARD_D10) | \ PIN_PUPDR_PULLUP(GPIOB_PIN7) | \ - PIN_PUPDR_PULLUP(GPIOB_ARD_D15) | \ - PIN_PUPDR_PULLUP(GPIOB_ARD_D14) | \ + PIN_PUPDR_FLOATING(GPIOB_ARD_D15) | \ + PIN_PUPDR_FLOATING(GPIOB_ARD_D14) | \ PIN_PUPDR_PULLUP(GPIOB_ARD_D6) | \ PIN_PUPDR_PULLUP(GPIOB_PIN11) | \ PIN_PUPDR_PULLUP(GPIOB_PIN12) | \ @@ -508,8 +522,8 @@ PIN_AFIO_AF(GPIOB_ARD_D4, 0) | \ PIN_AFIO_AF(GPIOB_ARD_D10, 0) | \ PIN_AFIO_AF(GPIOB_PIN7, 0)) -#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 0) | \ - PIN_AFIO_AF(GPIOB_ARD_D14, 0) | \ +#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 4) | \ + PIN_AFIO_AF(GPIOB_ARD_D14, 4) | \ PIN_AFIO_AF(GPIOB_ARD_D6, 0) | \ PIN_AFIO_AF(GPIOB_PIN11, 0) | \ PIN_AFIO_AF(GPIOB_PIN12, 0) | \ @@ -520,8 +534,8 @@ /* * GPIOC setup: * - * PC0 - ARD_A5 (analog). - * PC1 - ARD_A4 (analog). + * PC0 - ARD_A5 ADC123_IN10 (analog). + * PC1 - ARD_A4 ADC123_IN11 (analog). * PC2 - PIN2 (input pullup). * PC3 - PIN3 (input pullup). * PC4 - PIN4 (input pullup). @@ -534,8 +548,8 @@ * PC11 - PIN11 (input pullup). * PC12 - PIN12 (input pullup). * PC13 - BUTTON (input floating). - * PC14 - PIN14 (input pullup). - * PC15 - PIN15 (input pullup). + * PC14 - OSC32_IN (input floating). + * PC15 - OSC32_OUT (input floating). */ #define VAL_GPIOC_MODER (PIN_MODE_ANALOG(GPIOC_ARD_A5) | \ PIN_MODE_ANALOG(GPIOC_ARD_A4) | \ @@ -551,8 +565,8 @@ PIN_MODE_INPUT(GPIOC_PIN11) | \ PIN_MODE_INPUT(GPIOC_PIN12) | \ PIN_MODE_INPUT(GPIOC_BUTTON) | \ - PIN_MODE_INPUT(GPIOC_PIN14) | \ - PIN_MODE_INPUT(GPIOC_PIN15)) + PIN_MODE_INPUT(GPIOC_OSC32_IN) | \ + PIN_MODE_INPUT(GPIOC_OSC32_OUT)) #define VAL_GPIOC_OTYPER (PIN_OTYPE_PUSHPULL(GPIOC_ARD_A5) | \ PIN_OTYPE_PUSHPULL(GPIOC_ARD_A4) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN2) | \ @@ -567,8 +581,8 @@ PIN_OTYPE_PUSHPULL(GPIOC_PIN11) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN12) | \ PIN_OTYPE_PUSHPULL(GPIOC_BUTTON) | \ - PIN_OTYPE_PUSHPULL(GPIOC_PIN14) | \ - PIN_OTYPE_PUSHPULL(GPIOC_PIN15)) + PIN_OTYPE_PUSHPULL(GPIOC_OSC32_IN) | \ + PIN_OTYPE_PUSHPULL(GPIOC_OSC32_OUT)) #define VAL_GPIOC_OSPEEDR (PIN_OSPEED_HIGH(GPIOC_ARD_A5) | \ PIN_OSPEED_HIGH(GPIOC_ARD_A4) | \ PIN_OSPEED_HIGH(GPIOC_PIN2) | \ @@ -583,8 +597,8 @@ PIN_OSPEED_HIGH(GPIOC_PIN11) | \ PIN_OSPEED_HIGH(GPIOC_PIN12) | \ PIN_OSPEED_HIGH(GPIOC_BUTTON) | \ - PIN_OSPEED_HIGH(GPIOC_PIN14) | \ - PIN_OSPEED_HIGH(GPIOC_PIN15)) + PIN_OSPEED_HIGH(GPIOC_OSC32_IN) | \ + PIN_OSPEED_HIGH(GPIOC_OSC32_OUT)) #define VAL_GPIOC_PUPDR (PIN_PUPDR_FLOATING(GPIOC_ARD_A5) | \ PIN_PUPDR_FLOATING(GPIOC_ARD_A4) | \ PIN_PUPDR_PULLUP(GPIOC_PIN2) | \ @@ -599,8 +613,8 @@ PIN_PUPDR_PULLUP(GPIOC_PIN11) | \ PIN_PUPDR_PULLUP(GPIOC_PIN12) | \ PIN_PUPDR_FLOATING(GPIOC_BUTTON) | \ - PIN_PUPDR_PULLUP(GPIOC_PIN14) | \ - PIN_PUPDR_PULLUP(GPIOC_PIN15)) + PIN_PUPDR_FLOATING(GPIOC_OSC32_IN) | \ + PIN_PUPDR_FLOATING(GPIOC_OSC32_OUT)) #define VAL_GPIOC_ODR (PIN_ODR_HIGH(GPIOC_ARD_A5) | \ PIN_ODR_HIGH(GPIOC_ARD_A4) | \ PIN_ODR_HIGH(GPIOC_PIN2) | \ @@ -615,8 +629,8 @@ PIN_ODR_HIGH(GPIOC_PIN11) | \ PIN_ODR_HIGH(GPIOC_PIN12) | \ PIN_ODR_HIGH(GPIOC_BUTTON) | \ - PIN_ODR_HIGH(GPIOC_PIN14) | \ - PIN_ODR_HIGH(GPIOC_PIN15)) + PIN_ODR_HIGH(GPIOC_OSC32_IN) | \ + PIN_ODR_HIGH(GPIOC_OSC32_OUT)) #define VAL_GPIOC_AFRL (PIN_AFIO_AF(GPIOC_ARD_A5, 0) | \ PIN_AFIO_AF(GPIOC_ARD_A4, 0) | \ PIN_AFIO_AF(GPIOC_PIN2, 0) | \ @@ -631,8 +645,8 @@ PIN_AFIO_AF(GPIOC_PIN11, 0) | \ PIN_AFIO_AF(GPIOC_PIN12, 0) | \ PIN_AFIO_AF(GPIOC_BUTTON, 0) | \ - PIN_AFIO_AF(GPIOC_PIN14, 0) | \ - PIN_AFIO_AF(GPIOC_PIN15, 0)) + PIN_AFIO_AF(GPIOC_OSC32_IN, 0) | \ + PIN_AFIO_AF(GPIOC_OSC32_OUT, 0)) /* * GPIOD setup: diff --git a/os/hal/boards/ST_NUCLEO64_F446RE/cfg/board.chcfg b/os/hal/boards/ST_NUCLEO64_F446RE/cfg/board.chcfg index 18e082680..f2d385096 100644 --- a/os/hal/boards/ST_NUCLEO64_F446RE/cfg/board.chcfg +++ b/os/hal/boards/ST_NUCLEO64_F446RE/cfg/board.chcfg @@ -21,7 +21,7 @@ + Resistor="Floating" + Mode="Alternate" + Alternate="4" /> + Resistor="Floating" + Mode="Alternate" + Alternate="4" /> diff --git a/os/hal/boards/ST_NUCLEO64_L053R8/board.h b/os/hal/boards/ST_NUCLEO64_L053R8/board.h index 846ce48f4..3b67109b1 100644 --- a/os/hal/boards/ST_NUCLEO64_L053R8/board.h +++ b/os/hal/boards/ST_NUCLEO64_L053R8/board.h @@ -18,7 +18,7 @@ #define _BOARD_H_ /* - * Setup for STMicroelectronics NUCLEO64-L053R8 board. + * Setup for STMicroelectronics STM32 Nucleo64-L053R8 board. */ /* @@ -51,12 +51,15 @@ * IO pins assignments. */ #define GPIOA_ARD_A0 0U +#define GPIOA_ACD1_IN0 0U #define GPIOA_ARD_A1 1U +#define GPIOA_ACD1_IN1 1U #define GPIOA_ARD_D1 2U -#define GPIOA_USART_TX 2U +#define GPIOA_USART2_TX 2U #define GPIOA_ARD_D0 3U -#define GPIOA_USART_RX 3U +#define GPIOA_USART2_RX 3U #define GPIOA_ARD_A2 4U +#define GPIOA_ACD1_IN4 4U #define GPIOA_LED_GREEN 5U #define GPIOA_ARD_D13 5U #define GPIOA_ARD_D12 6U @@ -71,6 +74,7 @@ #define GPIOA_PIN15 15U #define GPIOB_ARD_A3 0U +#define GPIOB_ACD1_IN8 0U #define GPIOB_PIN1 1U #define GPIOB_PIN2 2U #define GPIOB_SWO 3U @@ -80,9 +84,9 @@ #define GPIOB_ARD_D10 6U #define GPIOB_PIN7 7U #define GPIOB_ARD_D15 8U -#define GPIOB_ARD_A5_ALT 8U +#define GPIOB_I2C1_SCL 8U #define GPIOB_ARD_D14 9U -#define GPIOB_ARD_A4_ALT 9U +#define GPIOB_I2C1_SDA 9U #define GPIOB_ARD_D6 10U #define GPIOB_PIN11 11U #define GPIOB_PIN12 12U @@ -91,7 +95,9 @@ #define GPIOB_PIN15 15U #define GPIOC_ARD_A5 0U +#define GPIOC_ACD1_IN10 0U #define GPIOC_ARD_A4 1U +#define GPIOC_ACD1_IN11 1U #define GPIOC_PIN2 2U #define GPIOC_PIN3 3U #define GPIOC_PIN4 4U @@ -104,8 +110,8 @@ #define GPIOC_PIN11 11U #define GPIOC_PIN12 12U #define GPIOC_BUTTON 13U -#define GPIOC_PIN14 14U -#define GPIOC_PIN15 15U +#define GPIOC_OSC32_IN 14U +#define GPIOC_OSC32_OUT 15U #define GPIOD_PIN0 0U #define GPIOD_PIN1 1U @@ -145,12 +151,15 @@ * IO lines assignments. */ #define LINE_ARD_A0 PAL_LINE(GPIOA, 0U) +#define LINE_ACD1_IN0 PAL_LINE(GPIOA, 0U) #define LINE_ARD_A1 PAL_LINE(GPIOA, 1U) +#define LINE_ACD1_IN1 PAL_LINE(GPIOA, 1U) #define LINE_ARD_D1 PAL_LINE(GPIOA, 2U) -#define LINE_USART_TX PAL_LINE(GPIOA, 2U) +#define LINE_USART2_TX PAL_LINE(GPIOA, 2U) #define LINE_ARD_D0 PAL_LINE(GPIOA, 3U) -#define LINE_USART_RX PAL_LINE(GPIOA, 3U) +#define LINE_USART2_RX PAL_LINE(GPIOA, 3U) #define LINE_ARD_A2 PAL_LINE(GPIOA, 4U) +#define LINE_ACD1_IN4 PAL_LINE(GPIOA, 4U) #define LINE_LED_GREEN PAL_LINE(GPIOA, 5U) #define LINE_ARD_D13 PAL_LINE(GPIOA, 5U) #define LINE_ARD_D12 PAL_LINE(GPIOA, 6U) @@ -162,21 +171,26 @@ #define LINE_SWCLK PAL_LINE(GPIOA, 14U) #define LINE_ARD_A3 PAL_LINE(GPIOB, 0U) +#define LINE_ACD1_IN8 PAL_LINE(GPIOB, 0U) #define LINE_SWO PAL_LINE(GPIOB, 3U) #define LINE_ARD_D3 PAL_LINE(GPIOB, 3U) #define LINE_ARD_D5 PAL_LINE(GPIOB, 4U) #define LINE_ARD_D4 PAL_LINE(GPIOB, 5U) #define LINE_ARD_D10 PAL_LINE(GPIOB, 6U) #define LINE_ARD_D15 PAL_LINE(GPIOB, 8U) -#define LINE_ARD_A5_ALT PAL_LINE(GPIOB, 8U) +#define LINE_I2C1_SCL PAL_LINE(GPIOB, 8U) #define LINE_ARD_D14 PAL_LINE(GPIOB, 9U) -#define LINE_ARD_A4_ALT PAL_LINE(GPIOB, 9U) +#define LINE_I2C1_SDA PAL_LINE(GPIOB, 9U) #define LINE_ARD_D6 PAL_LINE(GPIOB, 10U) #define LINE_ARD_A5 PAL_LINE(GPIOC, 0U) +#define LINE_ACD1_IN10 PAL_LINE(GPIOC, 0U) #define LINE_ARD_A4 PAL_LINE(GPIOC, 1U) +#define LINE_ACD1_IN11 PAL_LINE(GPIOC, 1U) #define LINE_ARD_D9 PAL_LINE(GPIOC, 7U) #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_OSC_IN PAL_LINE(GPIOH, 0U) @@ -207,11 +221,11 @@ /* * GPIOA setup: * - * PA0 - ARD_A0 (analog). - * PA1 - ARD_A1 (analog). - * PA2 - ARD_D1 USART_TX (alternate 4). - * PA3 - ARD_D0 USART_RX (alternate 4). - * PA4 - ARD_A2 (analog). + * PA0 - ARD_A0 ACD1_IN0 (analog). + * PA1 - ARD_A1 ACD1_IN1 (analog). + * PA2 - ARD_D1 USART2_TX (alternate 4). + * PA3 - ARD_D0 USART2_RX (alternate 4). + * PA4 - ARD_A2 ACD1_IN4 (analog). * PA5 - LED_GREEN ARD_D13 (output pushpull maximum). * PA6 - ARD_D12 (input pullup). * PA7 - ARD_D11 (input pullup). @@ -324,7 +338,7 @@ /* * GPIOB setup: * - * PB0 - ARD_A3 (analog). + * PB0 - ARD_A3 ACD1_IN8 (analog). * PB1 - PIN1 (input pullup). * PB2 - PIN2 (input pullup). * PB3 - SWO ARD_D3 (alternate 0). @@ -332,8 +346,8 @@ * PB5 - ARD_D4 (input pullup). * PB6 - ARD_D10 (input pullup). * PB7 - PIN7 (input pullup). - * PB8 - ARD_D15 ARD_A5_ALT (input pullup). - * PB9 - ARD_D14 ARD_A4_ALT (input pullup). + * PB8 - ARD_D15 I2C1_SCL (alternate 4). + * PB9 - ARD_D14 I2C1_SDA (alternate 4). * PB10 - ARD_D6 (input pullup). * PB11 - PIN11 (input pullup). * PB12 - PIN12 (input pullup). @@ -349,8 +363,8 @@ PIN_MODE_INPUT(GPIOB_ARD_D4) | \ PIN_MODE_INPUT(GPIOB_ARD_D10) | \ PIN_MODE_INPUT(GPIOB_PIN7) | \ - PIN_MODE_INPUT(GPIOB_ARD_D15) | \ - PIN_MODE_INPUT(GPIOB_ARD_D14) | \ + PIN_MODE_ALTERNATE(GPIOB_ARD_D15) | \ + PIN_MODE_ALTERNATE(GPIOB_ARD_D14) | \ PIN_MODE_INPUT(GPIOB_ARD_D6) | \ PIN_MODE_INPUT(GPIOB_PIN11) | \ PIN_MODE_INPUT(GPIOB_PIN12) | \ @@ -397,8 +411,8 @@ PIN_PUPDR_PULLUP(GPIOB_ARD_D4) | \ PIN_PUPDR_PULLUP(GPIOB_ARD_D10) | \ PIN_PUPDR_PULLUP(GPIOB_PIN7) | \ - PIN_PUPDR_PULLUP(GPIOB_ARD_D15) | \ - PIN_PUPDR_PULLUP(GPIOB_ARD_D14) | \ + PIN_PUPDR_FLOATING(GPIOB_ARD_D15) | \ + PIN_PUPDR_FLOATING(GPIOB_ARD_D14) | \ PIN_PUPDR_PULLUP(GPIOB_ARD_D6) | \ PIN_PUPDR_PULLUP(GPIOB_PIN11) | \ PIN_PUPDR_PULLUP(GPIOB_PIN12) | \ @@ -429,8 +443,8 @@ PIN_AFIO_AF(GPIOB_ARD_D4, 0) | \ PIN_AFIO_AF(GPIOB_ARD_D10, 0) | \ PIN_AFIO_AF(GPIOB_PIN7, 0)) -#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 0) | \ - PIN_AFIO_AF(GPIOB_ARD_D14, 0) | \ +#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 4) | \ + PIN_AFIO_AF(GPIOB_ARD_D14, 4) | \ PIN_AFIO_AF(GPIOB_ARD_D6, 0) | \ PIN_AFIO_AF(GPIOB_PIN11, 0) | \ PIN_AFIO_AF(GPIOB_PIN12, 0) | \ @@ -441,8 +455,8 @@ /* * GPIOC setup: * - * PC0 - ARD_A5 (analog). - * PC1 - ARD_A4 (analog). + * PC0 - ARD_A5 ACD1_IN10 (analog). + * PC1 - ARD_A4 ACD1_IN11 (analog). * PC2 - PIN2 (input pullup). * PC3 - PIN3 (input pullup). * PC4 - PIN4 (input pullup). @@ -455,8 +469,8 @@ * PC11 - PIN11 (input pullup). * PC12 - PIN12 (input pullup). * PC13 - BUTTON (input floating). - * PC14 - PIN14 (input pullup). - * PC15 - PIN15 (input pullup). + * PC14 - OSC32_IN (input floating). + * PC15 - OSC32_OUT (input floating). */ #define VAL_GPIOC_MODER (PIN_MODE_ANALOG(GPIOC_ARD_A5) | \ PIN_MODE_ANALOG(GPIOC_ARD_A4) | \ @@ -472,8 +486,8 @@ PIN_MODE_INPUT(GPIOC_PIN11) | \ PIN_MODE_INPUT(GPIOC_PIN12) | \ PIN_MODE_INPUT(GPIOC_BUTTON) | \ - PIN_MODE_INPUT(GPIOC_PIN14) | \ - PIN_MODE_INPUT(GPIOC_PIN15)) + PIN_MODE_INPUT(GPIOC_OSC32_IN) | \ + PIN_MODE_INPUT(GPIOC_OSC32_OUT)) #define VAL_GPIOC_OTYPER (PIN_OTYPE_PUSHPULL(GPIOC_ARD_A5) | \ PIN_OTYPE_PUSHPULL(GPIOC_ARD_A4) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN2) | \ @@ -488,8 +502,8 @@ PIN_OTYPE_PUSHPULL(GPIOC_PIN11) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN12) | \ PIN_OTYPE_PUSHPULL(GPIOC_BUTTON) | \ - PIN_OTYPE_PUSHPULL(GPIOC_PIN14) | \ - PIN_OTYPE_PUSHPULL(GPIOC_PIN15)) + PIN_OTYPE_PUSHPULL(GPIOC_OSC32_IN) | \ + PIN_OTYPE_PUSHPULL(GPIOC_OSC32_OUT)) #define VAL_GPIOC_OSPEEDR (PIN_OSPEED_HIGH(GPIOC_ARD_A5) | \ PIN_OSPEED_HIGH(GPIOC_ARD_A4) | \ PIN_OSPEED_HIGH(GPIOC_PIN2) | \ @@ -504,8 +518,8 @@ PIN_OSPEED_HIGH(GPIOC_PIN11) | \ PIN_OSPEED_HIGH(GPIOC_PIN12) | \ PIN_OSPEED_HIGH(GPIOC_BUTTON) | \ - PIN_OSPEED_HIGH(GPIOC_PIN14) | \ - PIN_OSPEED_HIGH(GPIOC_PIN15)) + PIN_OSPEED_HIGH(GPIOC_OSC32_IN) | \ + PIN_OSPEED_HIGH(GPIOC_OSC32_OUT)) #define VAL_GPIOC_PUPDR (PIN_PUPDR_FLOATING(GPIOC_ARD_A5) | \ PIN_PUPDR_FLOATING(GPIOC_ARD_A4) | \ PIN_PUPDR_PULLUP(GPIOC_PIN2) | \ @@ -520,8 +534,8 @@ PIN_PUPDR_PULLUP(GPIOC_PIN11) | \ PIN_PUPDR_PULLUP(GPIOC_PIN12) | \ PIN_PUPDR_FLOATING(GPIOC_BUTTON) | \ - PIN_PUPDR_PULLUP(GPIOC_PIN14) | \ - PIN_PUPDR_PULLUP(GPIOC_PIN15)) + PIN_PUPDR_FLOATING(GPIOC_OSC32_IN) | \ + PIN_PUPDR_FLOATING(GPIOC_OSC32_OUT)) #define VAL_GPIOC_ODR (PIN_ODR_HIGH(GPIOC_ARD_A5) | \ PIN_ODR_HIGH(GPIOC_ARD_A4) | \ PIN_ODR_HIGH(GPIOC_PIN2) | \ @@ -536,8 +550,8 @@ PIN_ODR_HIGH(GPIOC_PIN11) | \ PIN_ODR_HIGH(GPIOC_PIN12) | \ PIN_ODR_HIGH(GPIOC_BUTTON) | \ - PIN_ODR_HIGH(GPIOC_PIN14) | \ - PIN_ODR_HIGH(GPIOC_PIN15)) + PIN_ODR_HIGH(GPIOC_OSC32_IN) | \ + PIN_ODR_HIGH(GPIOC_OSC32_OUT)) #define VAL_GPIOC_AFRL (PIN_AFIO_AF(GPIOC_ARD_A5, 0) | \ PIN_AFIO_AF(GPIOC_ARD_A4, 0) | \ PIN_AFIO_AF(GPIOC_PIN2, 0) | \ @@ -552,8 +566,8 @@ PIN_AFIO_AF(GPIOC_PIN11, 0) | \ PIN_AFIO_AF(GPIOC_PIN12, 0) | \ PIN_AFIO_AF(GPIOC_BUTTON, 0) | \ - PIN_AFIO_AF(GPIOC_PIN14, 0) | \ - PIN_AFIO_AF(GPIOC_PIN15, 0)) + PIN_AFIO_AF(GPIOC_OSC32_IN, 0) | \ + PIN_AFIO_AF(GPIOC_OSC32_OUT, 0)) /* * GPIOD setup: diff --git a/os/hal/boards/ST_NUCLEO64_L053R8/cfg/board.chcfg b/os/hal/boards/ST_NUCLEO64_L053R8/cfg/board.chcfg index 118fe2633..ae4b74e04 100644 --- a/os/hal/boards/ST_NUCLEO64_L053R8/cfg/board.chcfg +++ b/os/hal/boards/ST_NUCLEO64_L053R8/cfg/board.chcfg @@ -17,7 +17,7 @@ + Resistor="Floating" + Mode="Alternate" + Alternate="4" /> + Resistor="Floating" + Mode="Alternate" + Alternate="4" /> diff --git a/os/hal/boards/ST_NUCLEO64_L073RZ/board.h b/os/hal/boards/ST_NUCLEO64_L073RZ/board.h index f6d67b844..0124a0e46 100644 --- a/os/hal/boards/ST_NUCLEO64_L073RZ/board.h +++ b/os/hal/boards/ST_NUCLEO64_L073RZ/board.h @@ -51,12 +51,15 @@ * IO pins assignments. */ #define GPIOA_ARD_A0 0U +#define GPIOA_ACD1_IN0 0U #define GPIOA_ARD_A1 1U +#define GPIOA_ACD1_IN1 1U #define GPIOA_ARD_D1 2U -#define GPIOA_USART_TX 2U +#define GPIOA_USART2_TX 2U #define GPIOA_ARD_D0 3U -#define GPIOA_USART_RX 3U +#define GPIOA_USART2_RX 3U #define GPIOA_ARD_A2 4U +#define GPIOA_ACD1_IN4 4U #define GPIOA_LED_GREEN 5U #define GPIOA_ARD_D13 5U #define GPIOA_ARD_D12 6U @@ -71,6 +74,7 @@ #define GPIOA_PIN15 15U #define GPIOB_ARD_A3 0U +#define GPIOB_ACD1_IN8 0U #define GPIOB_PIN1 1U #define GPIOB_PIN2 2U #define GPIOB_SWO 3U @@ -80,9 +84,9 @@ #define GPIOB_ARD_D10 6U #define GPIOB_PIN7 7U #define GPIOB_ARD_D15 8U -#define GPIOB_ARD_A5_ALT 8U +#define GPIOB_I2C1_SCL 8U #define GPIOB_ARD_D14 9U -#define GPIOB_ARD_A4_ALT 9U +#define GPIOB_I2C1_SDA 9U #define GPIOB_ARD_D6 10U #define GPIOB_PIN11 11U #define GPIOB_PIN12 12U @@ -91,7 +95,9 @@ #define GPIOB_PIN15 15U #define GPIOC_ARD_A5 0U +#define GPIOC_ACD1_IN10 0U #define GPIOC_ARD_A4 1U +#define GPIOC_ACD1_IN11 1U #define GPIOC_PIN2 2U #define GPIOC_PIN3 3U #define GPIOC_PIN4 4U @@ -104,8 +110,8 @@ #define GPIOC_PIN11 11U #define GPIOC_PIN12 12U #define GPIOC_BUTTON 13U -#define GPIOC_PIN14 14U -#define GPIOC_PIN15 15U +#define GPIOC_OSC32_IN 14U +#define GPIOC_OSC32_OUT 15U #define GPIOD_PIN0 0U #define GPIOD_PIN1 1U @@ -162,12 +168,15 @@ * IO lines assignments. */ #define LINE_ARD_A0 PAL_LINE(GPIOA, 0U) +#define LINE_ACD1_IN0 PAL_LINE(GPIOA, 0U) #define LINE_ARD_A1 PAL_LINE(GPIOA, 1U) +#define LINE_ACD1_IN1 PAL_LINE(GPIOA, 1U) #define LINE_ARD_D1 PAL_LINE(GPIOA, 2U) -#define LINE_USART_TX PAL_LINE(GPIOA, 2U) +#define LINE_USART2_TX PAL_LINE(GPIOA, 2U) #define LINE_ARD_D0 PAL_LINE(GPIOA, 3U) -#define LINE_USART_RX PAL_LINE(GPIOA, 3U) +#define LINE_USART2_RX PAL_LINE(GPIOA, 3U) #define LINE_ARD_A2 PAL_LINE(GPIOA, 4U) +#define LINE_ACD1_IN4 PAL_LINE(GPIOA, 4U) #define LINE_LED_GREEN PAL_LINE(GPIOA, 5U) #define LINE_ARD_D13 PAL_LINE(GPIOA, 5U) #define LINE_ARD_D12 PAL_LINE(GPIOA, 6U) @@ -179,21 +188,26 @@ #define LINE_SWCLK PAL_LINE(GPIOA, 14U) #define LINE_ARD_A3 PAL_LINE(GPIOB, 0U) +#define LINE_ACD1_IN8 PAL_LINE(GPIOB, 0U) #define LINE_SWO PAL_LINE(GPIOB, 3U) #define LINE_ARD_D3 PAL_LINE(GPIOB, 3U) #define LINE_ARD_D5 PAL_LINE(GPIOB, 4U) #define LINE_ARD_D4 PAL_LINE(GPIOB, 5U) #define LINE_ARD_D10 PAL_LINE(GPIOB, 6U) #define LINE_ARD_D15 PAL_LINE(GPIOB, 8U) -#define LINE_ARD_A5_ALT PAL_LINE(GPIOB, 8U) +#define LINE_I2C1_SCL PAL_LINE(GPIOB, 8U) #define LINE_ARD_D14 PAL_LINE(GPIOB, 9U) -#define LINE_ARD_A4_ALT PAL_LINE(GPIOB, 9U) +#define LINE_I2C1_SDA PAL_LINE(GPIOB, 9U) #define LINE_ARD_D6 PAL_LINE(GPIOB, 10U) #define LINE_ARD_A5 PAL_LINE(GPIOC, 0U) +#define LINE_ACD1_IN10 PAL_LINE(GPIOC, 0U) #define LINE_ARD_A4 PAL_LINE(GPIOC, 1U) +#define LINE_ACD1_IN11 PAL_LINE(GPIOC, 1U) #define LINE_ARD_D9 PAL_LINE(GPIOC, 7U) #define LINE_BUTTON PAL_LINE(GPIOC, 13U) +#define LINE_OSC32_IN PAL_LINE(GPIOC, 14U) +#define LINE_OSC32_OUT PAL_LINE(GPIOC, 15U) @@ -225,11 +239,11 @@ /* * GPIOA setup: * - * PA0 - ARD_A0 (analog). - * PA1 - ARD_A1 (analog). - * PA2 - ARD_D1 USART_TX (alternate 4). - * PA3 - ARD_D0 USART_RX (alternate 4). - * PA4 - ARD_A2 (analog). + * PA0 - ARD_A0 ACD1_IN0 (analog). + * PA1 - ARD_A1 ACD1_IN1 (analog). + * PA2 - ARD_D1 USART2_TX (alternate 4). + * PA3 - ARD_D0 USART2_RX (alternate 4). + * PA4 - ARD_A2 ACD1_IN4 (analog). * PA5 - LED_GREEN ARD_D13 (output pushpull maximum). * PA6 - ARD_D12 (input pullup). * PA7 - ARD_D11 (input pullup). @@ -342,7 +356,7 @@ /* * GPIOB setup: * - * PB0 - ARD_A3 (analog). + * PB0 - ARD_A3 ACD1_IN8 (analog). * PB1 - PIN1 (input pullup). * PB2 - PIN2 (input pullup). * PB3 - SWO ARD_D3 (alternate 0). @@ -350,8 +364,8 @@ * PB5 - ARD_D4 (input pullup). * PB6 - ARD_D10 (input pullup). * PB7 - PIN7 (input pullup). - * PB8 - ARD_D15 ARD_A5_ALT (input pullup). - * PB9 - ARD_D14 ARD_A4_ALT (input pullup). + * PB8 - ARD_D15 I2C1_SCL (alternate 4). + * PB9 - ARD_D14 I2C1_SDA (alternate 4). * PB10 - ARD_D6 (input pullup). * PB11 - PIN11 (input pullup). * PB12 - PIN12 (input pullup). @@ -367,8 +381,8 @@ PIN_MODE_INPUT(GPIOB_ARD_D4) | \ PIN_MODE_INPUT(GPIOB_ARD_D10) | \ PIN_MODE_INPUT(GPIOB_PIN7) | \ - PIN_MODE_INPUT(GPIOB_ARD_D15) | \ - PIN_MODE_INPUT(GPIOB_ARD_D14) | \ + PIN_MODE_ALTERNATE(GPIOB_ARD_D15) | \ + PIN_MODE_ALTERNATE(GPIOB_ARD_D14) | \ PIN_MODE_INPUT(GPIOB_ARD_D6) | \ PIN_MODE_INPUT(GPIOB_PIN11) | \ PIN_MODE_INPUT(GPIOB_PIN12) | \ @@ -415,8 +429,8 @@ PIN_PUPDR_PULLUP(GPIOB_ARD_D4) | \ PIN_PUPDR_PULLUP(GPIOB_ARD_D10) | \ PIN_PUPDR_PULLUP(GPIOB_PIN7) | \ - PIN_PUPDR_PULLUP(GPIOB_ARD_D15) | \ - PIN_PUPDR_PULLUP(GPIOB_ARD_D14) | \ + PIN_PUPDR_FLOATING(GPIOB_ARD_D15) | \ + PIN_PUPDR_FLOATING(GPIOB_ARD_D14) | \ PIN_PUPDR_PULLUP(GPIOB_ARD_D6) | \ PIN_PUPDR_PULLUP(GPIOB_PIN11) | \ PIN_PUPDR_PULLUP(GPIOB_PIN12) | \ @@ -447,8 +461,8 @@ PIN_AFIO_AF(GPIOB_ARD_D4, 0) | \ PIN_AFIO_AF(GPIOB_ARD_D10, 0) | \ PIN_AFIO_AF(GPIOB_PIN7, 0)) -#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 0) | \ - PIN_AFIO_AF(GPIOB_ARD_D14, 0) | \ +#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 4) | \ + PIN_AFIO_AF(GPIOB_ARD_D14, 4) | \ PIN_AFIO_AF(GPIOB_ARD_D6, 0) | \ PIN_AFIO_AF(GPIOB_PIN11, 0) | \ PIN_AFIO_AF(GPIOB_PIN12, 0) | \ @@ -459,8 +473,8 @@ /* * GPIOC setup: * - * PC0 - ARD_A5 (analog). - * PC1 - ARD_A4 (analog). + * PC0 - ARD_A5 ACD1_IN10 (analog). + * PC1 - ARD_A4 ACD1_IN11 (analog). * PC2 - PIN2 (input pullup). * PC3 - PIN3 (input pullup). * PC4 - PIN4 (input pullup). @@ -473,8 +487,8 @@ * PC11 - PIN11 (input pullup). * PC12 - PIN12 (input pullup). * PC13 - BUTTON (input floating). - * PC14 - PIN14 (input pullup). - * PC15 - PIN15 (input pullup). + * PC14 - OSC32_IN (input floating). + * PC15 - OSC32_OUT (input floating). */ #define VAL_GPIOC_MODER (PIN_MODE_ANALOG(GPIOC_ARD_A5) | \ PIN_MODE_ANALOG(GPIOC_ARD_A4) | \ @@ -490,8 +504,8 @@ PIN_MODE_INPUT(GPIOC_PIN11) | \ PIN_MODE_INPUT(GPIOC_PIN12) | \ PIN_MODE_INPUT(GPIOC_BUTTON) | \ - PIN_MODE_INPUT(GPIOC_PIN14) | \ - PIN_MODE_INPUT(GPIOC_PIN15)) + PIN_MODE_INPUT(GPIOC_OSC32_IN) | \ + PIN_MODE_INPUT(GPIOC_OSC32_OUT)) #define VAL_GPIOC_OTYPER (PIN_OTYPE_PUSHPULL(GPIOC_ARD_A5) | \ PIN_OTYPE_PUSHPULL(GPIOC_ARD_A4) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN2) | \ @@ -506,8 +520,8 @@ PIN_OTYPE_PUSHPULL(GPIOC_PIN11) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN12) | \ PIN_OTYPE_PUSHPULL(GPIOC_BUTTON) | \ - PIN_OTYPE_PUSHPULL(GPIOC_PIN14) | \ - PIN_OTYPE_PUSHPULL(GPIOC_PIN15)) + PIN_OTYPE_PUSHPULL(GPIOC_OSC32_IN) | \ + PIN_OTYPE_PUSHPULL(GPIOC_OSC32_OUT)) #define VAL_GPIOC_OSPEEDR (PIN_OSPEED_HIGH(GPIOC_ARD_A5) | \ PIN_OSPEED_HIGH(GPIOC_ARD_A4) | \ PIN_OSPEED_HIGH(GPIOC_PIN2) | \ @@ -522,8 +536,8 @@ PIN_OSPEED_HIGH(GPIOC_PIN11) | \ PIN_OSPEED_HIGH(GPIOC_PIN12) | \ PIN_OSPEED_HIGH(GPIOC_BUTTON) | \ - PIN_OSPEED_HIGH(GPIOC_PIN14) | \ - PIN_OSPEED_HIGH(GPIOC_PIN15)) + PIN_OSPEED_HIGH(GPIOC_OSC32_IN) | \ + PIN_OSPEED_HIGH(GPIOC_OSC32_OUT)) #define VAL_GPIOC_PUPDR (PIN_PUPDR_FLOATING(GPIOC_ARD_A5) | \ PIN_PUPDR_FLOATING(GPIOC_ARD_A4) | \ PIN_PUPDR_PULLUP(GPIOC_PIN2) | \ @@ -538,8 +552,8 @@ PIN_PUPDR_PULLUP(GPIOC_PIN11) | \ PIN_PUPDR_PULLUP(GPIOC_PIN12) | \ PIN_PUPDR_FLOATING(GPIOC_BUTTON) | \ - PIN_PUPDR_PULLUP(GPIOC_PIN14) | \ - PIN_PUPDR_PULLUP(GPIOC_PIN15)) + PIN_PUPDR_FLOATING(GPIOC_OSC32_IN) | \ + PIN_PUPDR_FLOATING(GPIOC_OSC32_OUT)) #define VAL_GPIOC_ODR (PIN_ODR_HIGH(GPIOC_ARD_A5) | \ PIN_ODR_HIGH(GPIOC_ARD_A4) | \ PIN_ODR_HIGH(GPIOC_PIN2) | \ @@ -554,8 +568,8 @@ PIN_ODR_HIGH(GPIOC_PIN11) | \ PIN_ODR_HIGH(GPIOC_PIN12) | \ PIN_ODR_HIGH(GPIOC_BUTTON) | \ - PIN_ODR_HIGH(GPIOC_PIN14) | \ - PIN_ODR_HIGH(GPIOC_PIN15)) + PIN_ODR_HIGH(GPIOC_OSC32_IN) | \ + PIN_ODR_HIGH(GPIOC_OSC32_OUT)) #define VAL_GPIOC_AFRL (PIN_AFIO_AF(GPIOC_ARD_A5, 0) | \ PIN_AFIO_AF(GPIOC_ARD_A4, 0) | \ PIN_AFIO_AF(GPIOC_PIN2, 0) | \ @@ -570,8 +584,8 @@ PIN_AFIO_AF(GPIOC_PIN11, 0) | \ PIN_AFIO_AF(GPIOC_PIN12, 0) | \ PIN_AFIO_AF(GPIOC_BUTTON, 0) | \ - PIN_AFIO_AF(GPIOC_PIN14, 0) | \ - PIN_AFIO_AF(GPIOC_PIN15, 0)) + PIN_AFIO_AF(GPIOC_OSC32_IN, 0) | \ + PIN_AFIO_AF(GPIOC_OSC32_OUT, 0)) /* * GPIOD setup: diff --git a/os/hal/boards/ST_NUCLEO64_L073RZ/cfg/board.chcfg b/os/hal/boards/ST_NUCLEO64_L073RZ/cfg/board.chcfg index f11de6420..66b9c11d3 100644 --- a/os/hal/boards/ST_NUCLEO64_L073RZ/cfg/board.chcfg +++ b/os/hal/boards/ST_NUCLEO64_L073RZ/cfg/board.chcfg @@ -17,7 +17,7 @@ + Resistor="Floating" + Mode="Alternate" + Alternate="4" /> + Resistor="Floating" + Mode="Alternate" + Alternate="4" /> diff --git a/os/hal/boards/ST_NUCLEO64_L152RE/board.h b/os/hal/boards/ST_NUCLEO64_L152RE/board.h index fb2108fe8..1ad3defdc 100644 --- a/os/hal/boards/ST_NUCLEO64_L152RE/board.h +++ b/os/hal/boards/ST_NUCLEO64_L152RE/board.h @@ -18,7 +18,7 @@ #define _BOARD_H_ /* - * Setup for STMicroelectronics NUCLEO64-L152RE board. + * Setup for STMicroelectronics STM32 Nucleo64-L152RE board. */ /* @@ -49,12 +49,15 @@ * IO pins assignments. */ #define GPIOA_ARD_A0 0U +#define GPIOA_ACD1_IN0 0U #define GPIOA_ARD_A1 1U +#define GPIOA_ACD1_IN1 1U #define GPIOA_ARD_D1 2U -#define GPIOA_USART_TX 2U +#define GPIOA_USART2_TX 2U #define GPIOA_ARD_D0 3U -#define GPIOA_USART_RX 3U +#define GPIOA_USART2_RX 3U #define GPIOA_ARD_A2 4U +#define GPIOA_ACD1_IN4 4U #define GPIOA_LED_GREEN 5U #define GPIOA_ARD_D13 5U #define GPIOA_ARD_D12 6U @@ -69,6 +72,7 @@ #define GPIOA_PIN15 15U #define GPIOB_ARD_A3 0U +#define GPIOB_ACD1_IN8 0U #define GPIOB_PIN1 1U #define GPIOB_PIN2 2U #define GPIOB_SWO 3U @@ -78,9 +82,9 @@ #define GPIOB_ARD_D10 6U #define GPIOB_PIN7 7U #define GPIOB_ARD_D15 8U -#define GPIOB_ARD_A5_ALT 8U +#define GPIOB_I2C1_SCL 8U #define GPIOB_ARD_D14 9U -#define GPIOB_ARD_A4_ALT 9U +#define GPIOB_I2C1_SDA 9U #define GPIOB_ARD_D6 10U #define GPIOB_PIN11 11U #define GPIOB_PIN12 12U @@ -89,7 +93,9 @@ #define GPIOB_PIN15 15U #define GPIOC_ARD_A5 0U +#define GPIOC_ACD1_IN10 0U #define GPIOC_ARD_A4 1U +#define GPIOC_ACD1_IN11 1U #define GPIOC_PIN2 2U #define GPIOC_PIN3 3U #define GPIOC_PIN4 4U @@ -102,8 +108,8 @@ #define GPIOC_PIN11 11U #define GPIOC_PIN12 12U #define GPIOC_BUTTON 13U -#define GPIOC_PIN14 14U -#define GPIOC_PIN15 15U +#define GPIOC_OSC32_IN 14U +#define GPIOC_OSC32_OUT 15U #define GPIOD_PIN0 0U #define GPIOD_PIN1 1U @@ -194,12 +200,15 @@ * IO lines assignments. */ #define LINE_ARD_A0 PAL_LINE(GPIOA, 0U) +#define LINE_ACD1_IN0 PAL_LINE(GPIOA, 0U) #define LINE_ARD_A1 PAL_LINE(GPIOA, 1U) +#define LINE_ACD1_IN1 PAL_LINE(GPIOA, 1U) #define LINE_ARD_D1 PAL_LINE(GPIOA, 2U) -#define LINE_USART_TX PAL_LINE(GPIOA, 2U) +#define LINE_USART2_TX PAL_LINE(GPIOA, 2U) #define LINE_ARD_D0 PAL_LINE(GPIOA, 3U) -#define LINE_USART_RX PAL_LINE(GPIOA, 3U) +#define LINE_USART2_RX PAL_LINE(GPIOA, 3U) #define LINE_ARD_A2 PAL_LINE(GPIOA, 4U) +#define LINE_ACD1_IN4 PAL_LINE(GPIOA, 4U) #define LINE_LED_GREEN PAL_LINE(GPIOA, 5U) #define LINE_ARD_D13 PAL_LINE(GPIOA, 5U) #define LINE_ARD_D12 PAL_LINE(GPIOA, 6U) @@ -211,21 +220,26 @@ #define LINE_SWCLK PAL_LINE(GPIOA, 14U) #define LINE_ARD_A3 PAL_LINE(GPIOB, 0U) +#define LINE_ACD1_IN8 PAL_LINE(GPIOB, 0U) #define LINE_SWO PAL_LINE(GPIOB, 3U) #define LINE_ARD_D3 PAL_LINE(GPIOB, 3U) #define LINE_ARD_D5 PAL_LINE(GPIOB, 4U) #define LINE_ARD_D4 PAL_LINE(GPIOB, 5U) #define LINE_ARD_D10 PAL_LINE(GPIOB, 6U) #define LINE_ARD_D15 PAL_LINE(GPIOB, 8U) -#define LINE_ARD_A5_ALT PAL_LINE(GPIOB, 8U) +#define LINE_I2C1_SCL PAL_LINE(GPIOB, 8U) #define LINE_ARD_D14 PAL_LINE(GPIOB, 9U) -#define LINE_ARD_A4_ALT PAL_LINE(GPIOB, 9U) +#define LINE_I2C1_SDA PAL_LINE(GPIOB, 9U) #define LINE_ARD_D6 PAL_LINE(GPIOB, 10U) #define LINE_ARD_A5 PAL_LINE(GPIOC, 0U) +#define LINE_ACD1_IN10 PAL_LINE(GPIOC, 0U) #define LINE_ARD_A4 PAL_LINE(GPIOC, 1U) +#define LINE_ACD1_IN11 PAL_LINE(GPIOC, 1U) #define LINE_ARD_D9 PAL_LINE(GPIOC, 7U) #define LINE_BUTTON PAL_LINE(GPIOC, 13U) +#define LINE_OSC32_IN PAL_LINE(GPIOC, 14U) +#define LINE_OSC32_OUT PAL_LINE(GPIOC, 15U) @@ -259,11 +273,11 @@ /* * GPIOA setup: * - * PA0 - ARD_A0 (analog). - * PA1 - ARD_A1 (analog). - * PA2 - ARD_D1 USART_TX (alternate 7). - * PA3 - ARD_D0 USART_RX (alternate 7). - * PA4 - ARD_A2 (analog). + * PA0 - ARD_A0 ACD1_IN0 (analog). + * PA1 - ARD_A1 ACD1_IN1 (analog). + * PA2 - ARD_D1 USART2_TX (alternate 7). + * PA3 - ARD_D0 USART2_RX (alternate 7). + * PA4 - ARD_A2 ACD1_IN4 (analog). * PA5 - LED_GREEN ARD_D13 (output pushpull high). * PA6 - ARD_D12 (input pullup). * PA7 - ARD_D11 (input pullup). @@ -376,7 +390,7 @@ /* * GPIOB setup: * - * PB0 - ARD_A3 (analog). + * PB0 - ARD_A3 ACD1_IN8 (analog). * PB1 - PIN1 (input pullup). * PB2 - PIN2 (input pullup). * PB3 - SWO ARD_D3 (alternate 0). @@ -384,8 +398,8 @@ * PB5 - ARD_D4 (input pullup). * PB6 - ARD_D10 (input pullup). * PB7 - PIN7 (input pullup). - * PB8 - ARD_D15 ARD_A5_ALT (input pullup). - * PB9 - ARD_D14 ARD_A4_ALT (input pullup). + * PB8 - ARD_D15 I2C1_SCL (alternate 0). + * PB9 - ARD_D14 I2C1_SDA (alternate 0). * PB10 - ARD_D6 (input pullup). * PB11 - PIN11 (input pullup). * PB12 - PIN12 (input pullup). @@ -401,8 +415,8 @@ PIN_MODE_INPUT(GPIOB_ARD_D4) | \ PIN_MODE_INPUT(GPIOB_ARD_D10) | \ PIN_MODE_INPUT(GPIOB_PIN7) | \ - PIN_MODE_INPUT(GPIOB_ARD_D15) | \ - PIN_MODE_INPUT(GPIOB_ARD_D14) | \ + PIN_MODE_ALTERNATE(GPIOB_ARD_D15) | \ + PIN_MODE_ALTERNATE(GPIOB_ARD_D14) | \ PIN_MODE_INPUT(GPIOB_ARD_D6) | \ PIN_MODE_INPUT(GPIOB_PIN11) | \ PIN_MODE_INPUT(GPIOB_PIN12) | \ @@ -449,8 +463,8 @@ PIN_PUPDR_PULLUP(GPIOB_ARD_D4) | \ PIN_PUPDR_PULLUP(GPIOB_ARD_D10) | \ PIN_PUPDR_PULLUP(GPIOB_PIN7) | \ - PIN_PUPDR_PULLUP(GPIOB_ARD_D15) | \ - PIN_PUPDR_PULLUP(GPIOB_ARD_D14) | \ + PIN_PUPDR_FLOATING(GPIOB_ARD_D15) | \ + PIN_PUPDR_FLOATING(GPIOB_ARD_D14) | \ PIN_PUPDR_PULLUP(GPIOB_ARD_D6) | \ PIN_PUPDR_PULLUP(GPIOB_PIN11) | \ PIN_PUPDR_PULLUP(GPIOB_PIN12) | \ @@ -493,8 +507,8 @@ /* * GPIOC setup: * - * PC0 - ARD_A5 (analog). - * PC1 - ARD_A4 (analog). + * PC0 - ARD_A5 ACD1_IN10 (analog). + * PC1 - ARD_A4 ACD1_IN11 (analog). * PC2 - PIN2 (input pullup). * PC3 - PIN3 (input pullup). * PC4 - PIN4 (input pullup). @@ -507,8 +521,8 @@ * PC11 - PIN11 (input pullup). * PC12 - PIN12 (input pullup). * PC13 - BUTTON (input floating). - * PC14 - PIN14 (input pullup). - * PC15 - PIN15 (input pullup). + * PC14 - OSC32_IN (input floating). + * PC15 - OSC32_OUT (input floating). */ #define VAL_GPIOC_MODER (PIN_MODE_ANALOG(GPIOC_ARD_A5) | \ PIN_MODE_ANALOG(GPIOC_ARD_A4) | \ @@ -524,8 +538,8 @@ PIN_MODE_INPUT(GPIOC_PIN11) | \ PIN_MODE_INPUT(GPIOC_PIN12) | \ PIN_MODE_INPUT(GPIOC_BUTTON) | \ - PIN_MODE_INPUT(GPIOC_PIN14) | \ - PIN_MODE_INPUT(GPIOC_PIN15)) + PIN_MODE_INPUT(GPIOC_OSC32_IN) | \ + PIN_MODE_INPUT(GPIOC_OSC32_OUT)) #define VAL_GPIOC_OTYPER (PIN_OTYPE_PUSHPULL(GPIOC_ARD_A5) | \ PIN_OTYPE_PUSHPULL(GPIOC_ARD_A4) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN2) | \ @@ -540,8 +554,8 @@ PIN_OTYPE_PUSHPULL(GPIOC_PIN11) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN12) | \ PIN_OTYPE_PUSHPULL(GPIOC_BUTTON) | \ - PIN_OTYPE_PUSHPULL(GPIOC_PIN14) | \ - PIN_OTYPE_PUSHPULL(GPIOC_PIN15)) + PIN_OTYPE_PUSHPULL(GPIOC_OSC32_IN) | \ + PIN_OTYPE_PUSHPULL(GPIOC_OSC32_OUT)) #define VAL_GPIOC_OSPEEDR (PIN_OSPEED_HIGH(GPIOC_ARD_A5) | \ PIN_OSPEED_HIGH(GPIOC_ARD_A4) | \ PIN_OSPEED_HIGH(GPIOC_PIN2) | \ @@ -556,8 +570,8 @@ PIN_OSPEED_HIGH(GPIOC_PIN11) | \ PIN_OSPEED_HIGH(GPIOC_PIN12) | \ PIN_OSPEED_HIGH(GPIOC_BUTTON) | \ - PIN_OSPEED_HIGH(GPIOC_PIN14) | \ - PIN_OSPEED_HIGH(GPIOC_PIN15)) + PIN_OSPEED_HIGH(GPIOC_OSC32_IN) | \ + PIN_OSPEED_HIGH(GPIOC_OSC32_OUT)) #define VAL_GPIOC_PUPDR (PIN_PUPDR_FLOATING(GPIOC_ARD_A5) | \ PIN_PUPDR_FLOATING(GPIOC_ARD_A4) | \ PIN_PUPDR_PULLUP(GPIOC_PIN2) | \ @@ -572,8 +586,8 @@ PIN_PUPDR_PULLUP(GPIOC_PIN11) | \ PIN_PUPDR_PULLUP(GPIOC_PIN12) | \ PIN_PUPDR_FLOATING(GPIOC_BUTTON) | \ - PIN_PUPDR_PULLUP(GPIOC_PIN14) | \ - PIN_PUPDR_PULLUP(GPIOC_PIN15)) + PIN_PUPDR_FLOATING(GPIOC_OSC32_IN) | \ + PIN_PUPDR_FLOATING(GPIOC_OSC32_OUT)) #define VAL_GPIOC_ODR (PIN_ODR_HIGH(GPIOC_ARD_A5) | \ PIN_ODR_HIGH(GPIOC_ARD_A4) | \ PIN_ODR_HIGH(GPIOC_PIN2) | \ @@ -588,8 +602,8 @@ PIN_ODR_HIGH(GPIOC_PIN11) | \ PIN_ODR_HIGH(GPIOC_PIN12) | \ PIN_ODR_HIGH(GPIOC_BUTTON) | \ - PIN_ODR_HIGH(GPIOC_PIN14) | \ - PIN_ODR_HIGH(GPIOC_PIN15)) + PIN_ODR_HIGH(GPIOC_OSC32_IN) | \ + PIN_ODR_HIGH(GPIOC_OSC32_OUT)) #define VAL_GPIOC_AFRL (PIN_AFIO_AF(GPIOC_ARD_A5, 0) | \ PIN_AFIO_AF(GPIOC_ARD_A4, 0) | \ PIN_AFIO_AF(GPIOC_PIN2, 0) | \ @@ -604,8 +618,8 @@ PIN_AFIO_AF(GPIOC_PIN11, 0) | \ PIN_AFIO_AF(GPIOC_PIN12, 0) | \ PIN_AFIO_AF(GPIOC_BUTTON, 0) | \ - PIN_AFIO_AF(GPIOC_PIN14, 0) | \ - PIN_AFIO_AF(GPIOC_PIN15, 0)) + PIN_AFIO_AF(GPIOC_OSC32_IN, 0) | \ + PIN_AFIO_AF(GPIOC_OSC32_OUT, 0)) /* * GPIOD setup: diff --git a/os/hal/boards/ST_NUCLEO64_L152RE/cfg/board.chcfg b/os/hal/boards/ST_NUCLEO64_L152RE/cfg/board.chcfg index 0790f5efb..fa8aef40e 100644 --- a/os/hal/boards/ST_NUCLEO64_L152RE/cfg/board.chcfg +++ b/os/hal/boards/ST_NUCLEO64_L152RE/cfg/board.chcfg @@ -21,7 +21,7 @@ diff --git a/os/hal/boards/ST_NUCLEO64_L476RG/board.h b/os/hal/boards/ST_NUCLEO64_L476RG/board.h index fb19935fd..c08c7e07b 100644 --- a/os/hal/boards/ST_NUCLEO64_L476RG/board.h +++ b/os/hal/boards/ST_NUCLEO64_L476RG/board.h @@ -18,7 +18,7 @@ #define _BOARD_H_ /* - * Setup for STMicroelectronics NUCLEO64-L476RG board. + * Setup for STMicroelectronics STM32 Nucleo64-L476RG board. */ /* @@ -57,12 +57,15 @@ * IO pins assignments. */ #define GPIOA_ARD_A0 0U +#define GPIOA_ACD12_IN5 0U #define GPIOA_ARD_A1 1U +#define GPIOA_ACD12_IN6 1U #define GPIOA_ARD_D1 2U -#define GPIOA_USART_TX 2U +#define GPIOA_USART2_TX 2U #define GPIOA_ARD_D0 3U -#define GPIOA_USART_RX 3U -#define GPIOA_PIN4 4U +#define GPIOA_USART2_RX 3U +#define GPIOA_ARD_A2 4U +#define GPIOA_ACD12_IN9 4U #define GPIOA_ARD_D13 5U #define GPIOA_LED_GREEN 5U #define GPIOA_ARD_D12 6U @@ -77,6 +80,7 @@ #define GPIOA_PIN15 15U #define GPIOB_ARD_A3 0U +#define GPIOB_ACD12_IN15 0U #define GPIOB_PIN1 1U #define GPIOB_PIN2 2U #define GPIOB_ARD_D3 3U @@ -86,9 +90,9 @@ #define GPIOB_ARD_D10 6U #define GPIOB_PIN7 7U #define GPIOB_ARD_D15 8U -#define GPIOB_ARD_A5_ALT 8U +#define GPIOB_I2C1_SCL 8U #define GPIOB_ARD_D14 9U -#define GPIOB_ARD_A4_ALT 9U +#define GPIOB_I2C1_SDA 9U #define GPIOB_ARD_D6 10U #define GPIOB_PIN11 11U #define GPIOB_PIN12 12U @@ -97,7 +101,9 @@ #define GPIOB_PIN15 15U #define GPIOC_ARD_A5 0U +#define GPIOC_ACD123_IN1 0U #define GPIOC_ARD_A4 1U +#define GPIOC_ACD123_IN2 1U #define GPIOC_PIN2 2U #define GPIOC_PIN3 3U #define GPIOC_PIN4 4U @@ -110,8 +116,8 @@ #define GPIOC_PIN11 11U #define GPIOC_PIN12 12U #define GPIOC_BUTTON 13U -#define GPIOC_PIN14 14U -#define GPIOC_PIN15 15U +#define GPIOC_OSC32_IN 14U +#define GPIOC_OSC32_OUT 15U #define GPIOD_PIN0 0U #define GPIOD_PIN1 1U @@ -202,11 +208,15 @@ * IO lines assignments. */ #define LINE_ARD_A0 PAL_LINE(GPIOA, 0U) +#define LINE_ACD12_IN5 PAL_LINE(GPIOA, 0U) #define LINE_ARD_A1 PAL_LINE(GPIOA, 1U) +#define LINE_ACD12_IN6 PAL_LINE(GPIOA, 1U) #define LINE_ARD_D1 PAL_LINE(GPIOA, 2U) -#define LINE_USART_TX PAL_LINE(GPIOA, 2U) +#define LINE_USART2_TX PAL_LINE(GPIOA, 2U) #define LINE_ARD_D0 PAL_LINE(GPIOA, 3U) -#define LINE_USART_RX PAL_LINE(GPIOA, 3U) +#define LINE_USART2_RX PAL_LINE(GPIOA, 3U) +#define LINE_ARD_A2 PAL_LINE(GPIOA, 4U) +#define LINE_ACD12_IN9 PAL_LINE(GPIOA, 4U) #define LINE_ARD_D13 PAL_LINE(GPIOA, 5U) #define LINE_LED_GREEN PAL_LINE(GPIOA, 5U) #define LINE_ARD_D12 PAL_LINE(GPIOA, 6U) @@ -217,20 +227,25 @@ #define LINE_SWDIO PAL_LINE(GPIOA, 13U) #define LINE_SWCLK PAL_LINE(GPIOA, 14U) #define LINE_ARD_A3 PAL_LINE(GPIOB, 0U) +#define LINE_ACD12_IN15 PAL_LINE(GPIOB, 0U) #define LINE_ARD_D3 PAL_LINE(GPIOB, 3U) #define LINE_SWO PAL_LINE(GPIOB, 3U) #define LINE_ARD_D5 PAL_LINE(GPIOB, 4U) #define LINE_ARD_D4 PAL_LINE(GPIOB, 5U) #define LINE_ARD_D10 PAL_LINE(GPIOB, 6U) #define LINE_ARD_D15 PAL_LINE(GPIOB, 8U) -#define LINE_ARD_A5_ALT PAL_LINE(GPIOB, 8U) +#define LINE_I2C1_SCL PAL_LINE(GPIOB, 8U) #define LINE_ARD_D14 PAL_LINE(GPIOB, 9U) -#define LINE_ARD_A4_ALT PAL_LINE(GPIOB, 9U) +#define LINE_I2C1_SDA PAL_LINE(GPIOB, 9U) #define LINE_ARD_D6 PAL_LINE(GPIOB, 10U) #define LINE_ARD_A5 PAL_LINE(GPIOC, 0U) +#define LINE_ACD123_IN1 PAL_LINE(GPIOC, 0U) #define LINE_ARD_A4 PAL_LINE(GPIOC, 1U) +#define LINE_ACD123_IN2 PAL_LINE(GPIOC, 1U) #define LINE_ARD_D9 PAL_LINE(GPIOC, 7U) #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_OSC_IN PAL_LINE(GPIOH, 0U) #define LINE_OSC_OUT PAL_LINE(GPIOH, 1U) @@ -263,11 +278,11 @@ /* * GPIOA setup: * - * PA0 - ARD_A0 (analog). - * PA1 - ARD_A1 (analog). - * PA2 - ARD_D1 USART_TX (alternate 7). - * PA3 - ARD_D0 USART_RX (alternate 7). - * PA4 - PIN4 (analog). + * PA0 - ARD_A0 ACD12_IN5 (analog). + * PA1 - ARD_A1 ACD12_IN6 (analog). + * PA2 - ARD_D1 USART2_TX (alternate 7). + * PA3 - ARD_D0 USART2_RX (alternate 7). + * PA4 - ARD_A2 ACD12_IN9 (analog). * PA5 - ARD_D13 LED_GREEN (output pushpull maximum). * PA6 - ARD_D12 (analog). * PA7 - ARD_D11 (analog). @@ -284,7 +299,7 @@ PIN_MODE_ANALOG(GPIOA_ARD_A1) | \ PIN_MODE_ALTERNATE(GPIOA_ARD_D1) | \ PIN_MODE_ALTERNATE(GPIOA_ARD_D0) | \ - PIN_MODE_ANALOG(GPIOA_PIN4) | \ + PIN_MODE_ANALOG(GPIOA_ARD_A2) | \ PIN_MODE_OUTPUT(GPIOA_ARD_D13) | \ PIN_MODE_ANALOG(GPIOA_ARD_D12) | \ PIN_MODE_ANALOG(GPIOA_ARD_D11) | \ @@ -300,7 +315,7 @@ PIN_OTYPE_PUSHPULL(GPIOA_ARD_A1) | \ PIN_OTYPE_PUSHPULL(GPIOA_ARD_D1) | \ PIN_OTYPE_PUSHPULL(GPIOA_ARD_D0) | \ - PIN_OTYPE_PUSHPULL(GPIOA_PIN4) | \ + PIN_OTYPE_PUSHPULL(GPIOA_ARD_A2) | \ PIN_OTYPE_PUSHPULL(GPIOA_ARD_D13) | \ PIN_OTYPE_PUSHPULL(GPIOA_ARD_D12) | \ PIN_OTYPE_PUSHPULL(GPIOA_ARD_D11) | \ @@ -316,7 +331,7 @@ PIN_OSPEED_HIGH(GPIOA_ARD_A1) | \ PIN_OSPEED_MEDIUM(GPIOA_ARD_D1) | \ PIN_OSPEED_MEDIUM(GPIOA_ARD_D0) | \ - PIN_OSPEED_HIGH(GPIOA_PIN4) | \ + PIN_OSPEED_HIGH(GPIOA_ARD_A2) | \ PIN_OSPEED_HIGH(GPIOA_ARD_D13) | \ PIN_OSPEED_HIGH(GPIOA_ARD_D12) | \ PIN_OSPEED_HIGH(GPIOA_ARD_D11) | \ @@ -332,7 +347,7 @@ PIN_PUPDR_FLOATING(GPIOA_ARD_A1) | \ PIN_PUPDR_FLOATING(GPIOA_ARD_D1) | \ PIN_PUPDR_FLOATING(GPIOA_ARD_D0) | \ - PIN_PUPDR_FLOATING(GPIOA_PIN4) | \ + PIN_PUPDR_FLOATING(GPIOA_ARD_A2) | \ PIN_PUPDR_FLOATING(GPIOA_ARD_D13) | \ PIN_PUPDR_FLOATING(GPIOA_ARD_D12) | \ PIN_PUPDR_FLOATING(GPIOA_ARD_D11) | \ @@ -348,7 +363,7 @@ PIN_ODR_HIGH(GPIOA_ARD_A1) | \ PIN_ODR_HIGH(GPIOA_ARD_D1) | \ PIN_ODR_HIGH(GPIOA_ARD_D0) | \ - PIN_ODR_HIGH(GPIOA_PIN4) | \ + PIN_ODR_HIGH(GPIOA_ARD_A2) | \ PIN_ODR_LOW(GPIOA_ARD_D13) | \ PIN_ODR_HIGH(GPIOA_ARD_D12) | \ PIN_ODR_HIGH(GPIOA_ARD_D11) | \ @@ -364,7 +379,7 @@ PIN_AFIO_AF(GPIOA_ARD_A1, 0) | \ PIN_AFIO_AF(GPIOA_ARD_D1, 7) | \ PIN_AFIO_AF(GPIOA_ARD_D0, 7) | \ - PIN_AFIO_AF(GPIOA_PIN4, 0) | \ + PIN_AFIO_AF(GPIOA_ARD_A2, 0) | \ PIN_AFIO_AF(GPIOA_ARD_D13, 0) | \ PIN_AFIO_AF(GPIOA_ARD_D12, 0) | \ PIN_AFIO_AF(GPIOA_ARD_D11, 0)) @@ -380,7 +395,7 @@ PIN_ASCR_ENABLED(GPIOA_ARD_A1) | \ PIN_ASCR_DISABLED(GPIOA_ARD_D1) | \ PIN_ASCR_DISABLED(GPIOA_ARD_D0) | \ - PIN_ASCR_ENABLED(GPIOA_PIN4) | \ + PIN_ASCR_ENABLED(GPIOA_ARD_A2) | \ PIN_ASCR_DISABLED(GPIOA_ARD_D13) | \ PIN_ASCR_DISABLED(GPIOA_ARD_D12) | \ PIN_ASCR_DISABLED(GPIOA_ARD_D11) | \ @@ -396,7 +411,7 @@ PIN_LOCKR_DISABLED(GPIOA_ARD_A1) | \ PIN_LOCKR_DISABLED(GPIOA_ARD_D1) | \ PIN_LOCKR_DISABLED(GPIOA_ARD_D0) | \ - PIN_LOCKR_DISABLED(GPIOA_PIN4) | \ + PIN_LOCKR_DISABLED(GPIOA_ARD_A2) | \ PIN_LOCKR_DISABLED(GPIOA_ARD_D13) | \ PIN_LOCKR_DISABLED(GPIOA_ARD_D12) | \ PIN_LOCKR_DISABLED(GPIOA_ARD_D11) | \ @@ -412,7 +427,7 @@ /* * GPIOB setup: * - * PB0 - ARD_A3 (analog). + * PB0 - ARD_A3 ACD12_IN15 (analog). * PB1 - PIN1 (analog). * PB2 - PIN2 (analog). * PB3 - ARD_D3 SWO (analog). @@ -420,8 +435,8 @@ * PB5 - ARD_D4 (analog). * PB6 - ARD_D10 (analog). * PB7 - PIN7 (analog). - * PB8 - ARD_D15 ARD_A5_ALT (analog). - * PB9 - ARD_D14 ARD_A4_ALT (analog). + * PB8 - ARD_D15 I2C1_SCL (alternate 4). + * PB9 - ARD_D14 I2C1_SDA (alternate 4). * PB10 - ARD_D6 (analog). * PB11 - PIN11 (analog). * PB12 - PIN12 (analog). @@ -437,8 +452,8 @@ PIN_MODE_ANALOG(GPIOB_ARD_D4) | \ PIN_MODE_ANALOG(GPIOB_ARD_D10) | \ PIN_MODE_ANALOG(GPIOB_PIN7) | \ - PIN_MODE_ANALOG(GPIOB_ARD_D15) | \ - PIN_MODE_ANALOG(GPIOB_ARD_D14) | \ + PIN_MODE_ALTERNATE(GPIOB_ARD_D15) | \ + PIN_MODE_ALTERNATE(GPIOB_ARD_D14) | \ PIN_MODE_ANALOG(GPIOB_ARD_D6) | \ PIN_MODE_ANALOG(GPIOB_PIN11) | \ PIN_MODE_ANALOG(GPIOB_PIN12) | \ @@ -517,8 +532,8 @@ PIN_AFIO_AF(GPIOB_ARD_D4, 0) | \ PIN_AFIO_AF(GPIOB_ARD_D10, 0) | \ PIN_AFIO_AF(GPIOB_PIN7, 0)) -#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 0) | \ - PIN_AFIO_AF(GPIOB_ARD_D14, 0) | \ +#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 4) | \ + PIN_AFIO_AF(GPIOB_ARD_D14, 4) | \ PIN_AFIO_AF(GPIOB_ARD_D6, 0) | \ PIN_AFIO_AF(GPIOB_PIN11, 0) | \ PIN_AFIO_AF(GPIOB_PIN12, 0) | \ @@ -561,8 +576,8 @@ /* * GPIOC setup: * - * PC0 - ARD_A5 (analog). - * PC1 - ARD_A4 (analog). + * PC0 - ARD_A5 ACD123_IN1 (analog). + * PC1 - ARD_A4 ACD123_IN2 (analog). * PC2 - PIN2 (analog). * PC3 - PIN3 (analog). * PC4 - PIN4 (analog). @@ -575,8 +590,8 @@ * PC11 - PIN11 (analog). * PC12 - PIN12 (analog). * PC13 - BUTTON (input floating). - * PC14 - PIN14 (analog). - * PC15 - PIN15 (analog). + * PC14 - OSC32_IN (input floating). + * PC15 - OSC32_OUT (input floating). */ #define VAL_GPIOC_MODER (PIN_MODE_ANALOG(GPIOC_ARD_A5) | \ PIN_MODE_ANALOG(GPIOC_ARD_A4) | \ @@ -592,8 +607,8 @@ PIN_MODE_ANALOG(GPIOC_PIN11) | \ PIN_MODE_ANALOG(GPIOC_PIN12) | \ PIN_MODE_INPUT(GPIOC_BUTTON) | \ - PIN_MODE_ANALOG(GPIOC_PIN14) | \ - PIN_MODE_ANALOG(GPIOC_PIN15)) + PIN_MODE_INPUT(GPIOC_OSC32_IN) | \ + PIN_MODE_INPUT(GPIOC_OSC32_OUT)) #define VAL_GPIOC_OTYPER (PIN_OTYPE_PUSHPULL(GPIOC_ARD_A5) | \ PIN_OTYPE_PUSHPULL(GPIOC_ARD_A4) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN2) | \ @@ -608,8 +623,8 @@ PIN_OTYPE_PUSHPULL(GPIOC_PIN11) | \ PIN_OTYPE_PUSHPULL(GPIOC_PIN12) | \ PIN_OTYPE_PUSHPULL(GPIOC_BUTTON) | \ - PIN_OTYPE_PUSHPULL(GPIOC_PIN14) | \ - PIN_OTYPE_PUSHPULL(GPIOC_PIN15)) + PIN_OTYPE_PUSHPULL(GPIOC_OSC32_IN) | \ + PIN_OTYPE_PUSHPULL(GPIOC_OSC32_OUT)) #define VAL_GPIOC_OSPEEDR (PIN_OSPEED_HIGH(GPIOC_ARD_A5) | \ PIN_OSPEED_HIGH(GPIOC_ARD_A4) | \ PIN_OSPEED_HIGH(GPIOC_PIN2) | \ @@ -624,8 +639,8 @@ PIN_OSPEED_HIGH(GPIOC_PIN11) | \ PIN_OSPEED_HIGH(GPIOC_PIN12) | \ PIN_OSPEED_HIGH(GPIOC_BUTTON) | \ - PIN_OSPEED_HIGH(GPIOC_PIN14) | \ - PIN_OSPEED_HIGH(GPIOC_PIN15)) + PIN_OSPEED_HIGH(GPIOC_OSC32_IN) | \ + PIN_OSPEED_HIGH(GPIOC_OSC32_OUT)) #define VAL_GPIOC_PUPDR (PIN_PUPDR_FLOATING(GPIOC_ARD_A5) | \ PIN_PUPDR_FLOATING(GPIOC_ARD_A4) | \ PIN_PUPDR_FLOATING(GPIOC_PIN2) | \ @@ -640,8 +655,8 @@ PIN_PUPDR_FLOATING(GPIOC_PIN11) | \ PIN_PUPDR_FLOATING(GPIOC_PIN12) | \ PIN_PUPDR_FLOATING(GPIOC_BUTTON) | \ - PIN_PUPDR_FLOATING(GPIOC_PIN14) | \ - PIN_PUPDR_FLOATING(GPIOC_PIN15)) + PIN_PUPDR_FLOATING(GPIOC_OSC32_IN) | \ + PIN_PUPDR_FLOATING(GPIOC_OSC32_OUT)) #define VAL_GPIOC_ODR (PIN_ODR_HIGH(GPIOC_ARD_A5) | \ PIN_ODR_HIGH(GPIOC_ARD_A4) | \ PIN_ODR_HIGH(GPIOC_PIN2) | \ @@ -656,8 +671,8 @@ PIN_ODR_HIGH(GPIOC_PIN11) | \ PIN_ODR_HIGH(GPIOC_PIN12) | \ PIN_ODR_HIGH(GPIOC_BUTTON) | \ - PIN_ODR_HIGH(GPIOC_PIN14) | \ - PIN_ODR_HIGH(GPIOC_PIN15)) + PIN_ODR_HIGH(GPIOC_OSC32_IN) | \ + PIN_ODR_HIGH(GPIOC_OSC32_OUT)) #define VAL_GPIOC_AFRL (PIN_AFIO_AF(GPIOC_ARD_A5, 0) | \ PIN_AFIO_AF(GPIOC_ARD_A4, 0) | \ PIN_AFIO_AF(GPIOC_PIN2, 0) | \ @@ -672,8 +687,8 @@ PIN_AFIO_AF(GPIOC_PIN11, 0) | \ PIN_AFIO_AF(GPIOC_PIN12, 0) | \ PIN_AFIO_AF(GPIOC_BUTTON, 0) | \ - PIN_AFIO_AF(GPIOC_PIN14, 0) | \ - PIN_AFIO_AF(GPIOC_PIN15, 0)) + PIN_AFIO_AF(GPIOC_OSC32_IN, 0) | \ + PIN_AFIO_AF(GPIOC_OSC32_OUT, 0)) #define VAL_GPIOC_ASCR (PIN_ASCR_ENABLED(GPIOC_ARD_A5) | \ PIN_ASCR_ENABLED(GPIOC_ARD_A4) | \ PIN_ASCR_DISABLED(GPIOC_PIN2) | \ @@ -688,8 +703,8 @@ PIN_ASCR_DISABLED(GPIOC_PIN11) | \ PIN_ASCR_DISABLED(GPIOC_PIN12) | \ PIN_ASCR_DISABLED(GPIOC_BUTTON) | \ - PIN_ASCR_DISABLED(GPIOC_PIN14) | \ - PIN_ASCR_DISABLED(GPIOC_PIN15)) + PIN_ASCR_DISABLED(GPIOC_OSC32_IN) | \ + PIN_ASCR_DISABLED(GPIOC_OSC32_OUT)) #define VAL_GPIOC_LOCKR (PIN_LOCKR_DISABLED(GPIOC_ARD_A5) | \ PIN_LOCKR_DISABLED(GPIOC_ARD_A4) | \ PIN_LOCKR_DISABLED(GPIOC_PIN2) | \ @@ -704,8 +719,8 @@ PIN_LOCKR_DISABLED(GPIOC_PIN11) | \ PIN_LOCKR_DISABLED(GPIOC_PIN12) | \ PIN_LOCKR_DISABLED(GPIOC_BUTTON) | \ - PIN_LOCKR_DISABLED(GPIOC_PIN14) | \ - PIN_LOCKR_DISABLED(GPIOC_PIN15)) + PIN_LOCKR_DISABLED(GPIOC_OSC32_IN) | \ + PIN_LOCKR_DISABLED(GPIOC_OSC32_OUT)) /* * GPIOD setup: diff --git a/os/hal/boards/ST_NUCLEO64_L476RG/cfg/board.chcfg b/os/hal/boards/ST_NUCLEO64_L476RG/cfg/board.chcfg index 27d86a042..75cd276ab 100644 --- a/os/hal/boards/ST_NUCLEO64_L476RG/cfg/board.chcfg +++ b/os/hal/boards/ST_NUCLEO64_L476RG/cfg/board.chcfg @@ -22,7 +22,7 @@ -- cgit v1.2.3