aboutsummaryrefslogtreecommitdiffstats
path: root/os/hal/boards/ST_NUCLEO64_F446RE
diff options
context:
space:
mode:
Diffstat (limited to 'os/hal/boards/ST_NUCLEO64_F446RE')
-rw-r--r--os/hal/boards/ST_NUCLEO64_F446RE/board.h56
-rw-r--r--os/hal/boards/ST_NUCLEO64_F446RE/cfg/board.chcfg40
2 files changed, 46 insertions, 50 deletions
diff --git a/os/hal/boards/ST_NUCLEO64_F446RE/board.h b/os/hal/boards/ST_NUCLEO64_F446RE/board.h
index 629204f49..dca5c8fae 100644
--- a/os/hal/boards/ST_NUCLEO64_F446RE/board.h
+++ b/os/hal/boards/ST_NUCLEO64_F446RE/board.h
@@ -89,9 +89,7 @@
#define GPIOB_ARD_D10 6U
#define GPIOB_PIN7 7U
#define GPIOB_ARD_D15 8U
-#define GPIOB_I2C1_SCL 8U
#define GPIOB_ARD_D14 9U
-#define GPIOB_I2C1_SDA 9U
#define GPIOB_ARD_D6 10U
#define GPIOB_PIN11 11U
#define GPIOB_PIN12 12U
@@ -253,9 +251,7 @@
#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_I2C1_SCL PAL_LINE(GPIOB, 8U)
#define LINE_ARD_D14 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)
@@ -300,11 +296,11 @@
/*
* GPIOA setup:
*
- * PA0 - ARD_A0 ADC123_IN0 (analog).
- * PA1 - ARD_A1 ADC123_IN0 (analog).
+ * PA0 - ARD_A0 ADC123_IN0 (input pullup).
+ * PA1 - ARD_A1 ADC123_IN0 (input pullup).
* PA2 - ARD_D1 USART2_TX (alternate 7).
* PA3 - ARD_D0 USART2_RX (alternate 7).
- * PA4 - ARD_A2 ADC12_IN4 (analog).
+ * PA4 - ARD_A2 ADC12_IN4 (input pullup).
* PA5 - LED_GREEN ARD_D13 (output pushpull high).
* PA6 - ARD_D12 (input pullup).
* PA7 - ARD_D11 (input pullup).
@@ -317,11 +313,11 @@
* PA14 - SWCLK (alternate 0).
* PA15 - PIN15 (input pullup).
*/
-#define VAL_GPIOA_MODER (PIN_MODE_ANALOG(GPIOA_ARD_A0) | \
- PIN_MODE_ANALOG(GPIOA_ARD_A1) | \
+#define VAL_GPIOA_MODER (PIN_MODE_INPUT(GPIOA_ARD_A0) | \
+ PIN_MODE_INPUT(GPIOA_ARD_A1) | \
PIN_MODE_ALTERNATE(GPIOA_ARD_D1) | \
PIN_MODE_ALTERNATE(GPIOA_ARD_D0) | \
- PIN_MODE_ANALOG(GPIOA_ARD_A2) | \
+ PIN_MODE_INPUT(GPIOA_ARD_A2) | \
PIN_MODE_OUTPUT(GPIOA_LED_GREEN) | \
PIN_MODE_INPUT(GPIOA_ARD_D12) | \
PIN_MODE_INPUT(GPIOA_ARD_D11) | \
@@ -365,11 +361,11 @@
PIN_OSPEED_HIGH(GPIOA_SWDIO) | \
PIN_OSPEED_HIGH(GPIOA_SWCLK) | \
PIN_OSPEED_HIGH(GPIOA_PIN15))
-#define VAL_GPIOA_PUPDR (PIN_PUPDR_FLOATING(GPIOA_ARD_A0) | \
- PIN_PUPDR_FLOATING(GPIOA_ARD_A1) | \
+#define VAL_GPIOA_PUPDR (PIN_PUPDR_PULLUP(GPIOA_ARD_A0) | \
+ PIN_PUPDR_PULLUP(GPIOA_ARD_A1) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_D1) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_D0) | \
- PIN_PUPDR_FLOATING(GPIOA_ARD_A2) | \
+ PIN_PUPDR_PULLUP(GPIOA_ARD_A2) | \
PIN_PUPDR_FLOATING(GPIOA_LED_GREEN) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_D12) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_D11) | \
@@ -417,7 +413,7 @@
/*
* GPIOB setup:
*
- * PB0 - ARD_A3 ADC12_IN8 (analog).
+ * PB0 - ARD_A3 ADC12_IN8 (input pullup).
* PB1 - PIN1 (input pullup).
* PB2 - PIN2 (input pullup).
* PB3 - SWO ARD_D3 (alternate 0).
@@ -425,8 +421,8 @@
* PB5 - ARD_D4 (input pullup).
* PB6 - ARD_D10 (input pullup).
* PB7 - PIN7 (input pullup).
- * PB8 - ARD_D15 I2C1_SCL (alternate 4).
- * PB9 - ARD_D14 I2C1_SDA (alternate 4).
+ * PB8 - ARD_D15 (input pullup).
+ * PB9 - ARD_D14 (input pullup).
* PB10 - ARD_D6 (input pullup).
* PB11 - PIN11 (input pullup).
* PB12 - PIN12 (input pullup).
@@ -434,7 +430,7 @@
* PB14 - PIN14 (input pullup).
* PB15 - PIN15 (input pullup).
*/
-#define VAL_GPIOB_MODER (PIN_MODE_ANALOG(GPIOB_ARD_A3) | \
+#define VAL_GPIOB_MODER (PIN_MODE_INPUT(GPIOB_ARD_A3) | \
PIN_MODE_INPUT(GPIOB_PIN1) | \
PIN_MODE_INPUT(GPIOB_PIN2) | \
PIN_MODE_ALTERNATE(GPIOB_SWO) | \
@@ -442,8 +438,8 @@
PIN_MODE_INPUT(GPIOB_ARD_D4) | \
PIN_MODE_INPUT(GPIOB_ARD_D10) | \
PIN_MODE_INPUT(GPIOB_PIN7) | \
- PIN_MODE_ALTERNATE(GPIOB_ARD_D15) | \
- PIN_MODE_ALTERNATE(GPIOB_ARD_D14) | \
+ PIN_MODE_INPUT(GPIOB_ARD_D15) | \
+ PIN_MODE_INPUT(GPIOB_ARD_D14) | \
PIN_MODE_INPUT(GPIOB_ARD_D6) | \
PIN_MODE_INPUT(GPIOB_PIN11) | \
PIN_MODE_INPUT(GPIOB_PIN12) | \
@@ -482,7 +478,7 @@
PIN_OSPEED_HIGH(GPIOB_PIN13) | \
PIN_OSPEED_HIGH(GPIOB_PIN14) | \
PIN_OSPEED_HIGH(GPIOB_PIN15))
-#define VAL_GPIOB_PUPDR (PIN_PUPDR_FLOATING(GPIOB_ARD_A3) | \
+#define VAL_GPIOB_PUPDR (PIN_PUPDR_PULLUP(GPIOB_ARD_A3) | \
PIN_PUPDR_PULLUP(GPIOB_PIN1) | \
PIN_PUPDR_PULLUP(GPIOB_PIN2) | \
PIN_PUPDR_PULLUP(GPIOB_SWO) | \
@@ -490,8 +486,8 @@
PIN_PUPDR_PULLUP(GPIOB_ARD_D4) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D10) | \
PIN_PUPDR_PULLUP(GPIOB_PIN7) | \
- PIN_PUPDR_FLOATING(GPIOB_ARD_D15) | \
- PIN_PUPDR_FLOATING(GPIOB_ARD_D14) | \
+ PIN_PUPDR_PULLUP(GPIOB_ARD_D15) | \
+ PIN_PUPDR_PULLUP(GPIOB_ARD_D14) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D6) | \
PIN_PUPDR_PULLUP(GPIOB_PIN11) | \
PIN_PUPDR_PULLUP(GPIOB_PIN12) | \
@@ -522,8 +518,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, 4) | \
- PIN_AFIO_AF(GPIOB_ARD_D14, 4) | \
+#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 0) | \
+ PIN_AFIO_AF(GPIOB_ARD_D14, 0) | \
PIN_AFIO_AF(GPIOB_ARD_D6, 0) | \
PIN_AFIO_AF(GPIOB_PIN11, 0) | \
PIN_AFIO_AF(GPIOB_PIN12, 0) | \
@@ -534,8 +530,8 @@
/*
* GPIOC setup:
*
- * PC0 - ARD_A5 ADC123_IN10 (analog).
- * PC1 - ARD_A4 ADC123_IN11 (analog).
+ * PC0 - ARD_A5 ADC123_IN10 (input pullup).
+ * PC1 - ARD_A4 ADC123_IN11 (input pullup).
* PC2 - PIN2 (input pullup).
* PC3 - PIN3 (input pullup).
* PC4 - PIN4 (input pullup).
@@ -551,8 +547,8 @@
* 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) | \
+#define VAL_GPIOC_MODER (PIN_MODE_INPUT(GPIOC_ARD_A5) | \
+ PIN_MODE_INPUT(GPIOC_ARD_A4) | \
PIN_MODE_INPUT(GPIOC_PIN2) | \
PIN_MODE_INPUT(GPIOC_PIN3) | \
PIN_MODE_INPUT(GPIOC_PIN4) | \
@@ -599,8 +595,8 @@
PIN_OSPEED_HIGH(GPIOC_BUTTON) | \
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) | \
+#define VAL_GPIOC_PUPDR (PIN_PUPDR_PULLUP(GPIOC_ARD_A5) | \
+ PIN_PUPDR_PULLUP(GPIOC_ARD_A4) | \
PIN_PUPDR_PULLUP(GPIOC_PIN2) | \
PIN_PUPDR_PULLUP(GPIOC_PIN3) | \
PIN_PUPDR_PULLUP(GPIOC_PIN4) | \
diff --git a/os/hal/boards/ST_NUCLEO64_F446RE/cfg/board.chcfg b/os/hal/boards/ST_NUCLEO64_F446RE/cfg/board.chcfg
index f2d385096..5a91c9c15 100644
--- a/os/hal/boards/ST_NUCLEO64_F446RE/cfg/board.chcfg
+++ b/os/hal/boards/ST_NUCLEO64_F446RE/cfg/board.chcfg
@@ -25,16 +25,16 @@
Type="PushPull"
Level="High"
Speed="Maximum"
- Resistor="Floating"
- Mode="Analog"
+ Resistor="PullUp"
+ Mode="Input"
Alternate="0" />
<pin1
ID="ARD_A1 ADC123_IN0"
Type="PushPull"
Level="High"
Speed="Maximum"
- Resistor="Floating"
- Mode="Analog"
+ Resistor="PullUp"
+ Mode="Input"
Alternate="0" />
<pin2
ID="ARD_D1 USART2_TX"
@@ -57,8 +57,8 @@
Type="PushPull"
Level="High"
Speed="Maximum"
- Resistor="Floating"
- Mode="Analog"
+ Resistor="PullUp"
+ Mode="Input"
Alternate="0" />
<pin5
ID="LED_GREEN ARD_D13"
@@ -155,8 +155,8 @@
Type="PushPull"
Level="High"
Speed="Maximum"
- Resistor="Floating"
- Mode="Analog"
+ Resistor="PullUp"
+ Mode="Input"
Alternate="0" />
<pin1
ID=""
@@ -215,21 +215,21 @@
Mode="Input"
Alternate="0" />
<pin8
- ID="ARD_D15 I2C1_SCL"
+ ID="ARD_D15"
Type="PushPull"
Level="High"
Speed="Maximum"
- Resistor="Floating"
- Mode="Alternate"
- Alternate="4" />
+ Resistor="PullUp"
+ Mode="Input"
+ Alternate="0" />
<pin9
- ID="ARD_D14 I2C1_SDA"
+ ID="ARD_D14"
Type="PushPull"
Level="High"
Speed="Maximum"
- Resistor="Floating"
- Mode="Alternate"
- Alternate="4" />
+ Resistor="PullUp"
+ Mode="Input"
+ Alternate="0" />
<pin10
ID="ARD_D6"
Type="PushPull"
@@ -285,16 +285,16 @@
Type="PushPull"
Level="High"
Speed="Maximum"
- Resistor="Floating"
- Mode="Analog"
+ Resistor="PullUp"
+ Mode="Input"
Alternate="0" />
<pin1
ID="ARD_A4 ADC123_IN11"
Type="PushPull"
Level="High"
Speed="Maximum"
- Resistor="Floating"
- Mode="Analog"
+ Resistor="PullUp"
+ Mode="Input"
Alternate="0" />
<pin2
ID=""
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 22:28:17 +0000