Improved STM32 Nucleo64 board files

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9410 35acf78f-673a-0410-8e92-d51de3d6d3f4

1 files changed, 55 insertions, 41 deletions

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: