summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/reference/boards.rst1
-rw-r--r--hw/bsp/stm32h5/boards/stm32h503nucleo/board.h2
-rw-r--r--hw/bsp/stm32h5/boards/stm32h533nucleo/board.h12
-rw-r--r--hw/bsp/stm32h5/boards/stm32h563nucleo/board.h10
-rw-r--r--hw/bsp/stm32h5/boards/stm32h573i_dk/board.h18
-rw-r--r--hw/bsp/stm32h5/family.c6
-rwxr-xr-xtools/get_deps.py2
7 files changed, 31 insertions, 20 deletions
diff --git a/docs/reference/boards.rst b/docs/reference/boards.rst
index 8a83496a4..8acad3c45 100644
--- a/docs/reference/boards.rst
+++ b/docs/reference/boards.rst
@@ -296,6 +296,7 @@ b_g474e_dpow1 STM32 B-G474E-DPOW1 Discovery kit stm32g4 https://www.s
stm32g474nucleo STM32 G474 Nucleo stm32g4 https://www.st.com/en/evaluation-tools/nucleo-g474re.html
stm32g491nucleo STM32 G491 Nucleo stm32g4 https://www.st.com/en/evaluation-tools/nucleo-g491re.html
stm32h503nucleo STM32 H503 Nucleo stm32h5 https://www.st.com/en/evaluation-tools/nucleo-h503rb.html
+stm32h533nucleo STM32 H533 Nucleo stm32h5 https://www.st.com/en/evaluation-tools/nucleo-h533re.html
stm32h563nucleo STM32 H563 Nucleo stm32h5 https://www.st.com/en/evaluation-tools/nucleo-h563zi.html
stm32h573i_dk STM32 H573i Discovery stm32h5 https://www.st.com/en/evaluation-tools/stm32h573i-dk.html
daisyseed Daisy Seed stm32h7 https://electro-smith.com/products/daisy-seed
diff --git a/hw/bsp/stm32h5/boards/stm32h503nucleo/board.h b/hw/bsp/stm32h5/boards/stm32h503nucleo/board.h
index 9dd2b0466..79ae4aebf 100644
--- a/hw/bsp/stm32h5/boards/stm32h503nucleo/board.h
+++ b/hw/bsp/stm32h5/boards/stm32h503nucleo/board.h
@@ -37,6 +37,8 @@
extern "C" {
#endif
+#define UART_ID 3
+
#define PINID_LED 0
#define PINID_BUTTON 1
#define PINID_UART_TX 2
diff --git a/hw/bsp/stm32h5/boards/stm32h533nucleo/board.h b/hw/bsp/stm32h5/boards/stm32h533nucleo/board.h
index bf4f0cfb9..13d757327 100644
--- a/hw/bsp/stm32h5/boards/stm32h533nucleo/board.h
+++ b/hw/bsp/stm32h5/boards/stm32h533nucleo/board.h
@@ -38,6 +38,8 @@
extern "C" {
#endif
+#define UART_ID 2
+
#define PINID_LED 0
#define PINID_BUTTON 1
#define PINID_UART_TX 2
@@ -46,22 +48,22 @@ extern "C" {
static board_pindef_t board_pindef[] = {
{ // LED
.port = GPIOA,
- .pin_init = { .Pin = GPIO_PIN_5, .Mode = GPIO_MODE_OUTPUT_PP, .Pull = GPIO_PULLUP, .Speed = GPIO_SPEED_FREQ_HIGH, .Alternate = 0 },
- .active_state = 0
+ .pin_init = { .Pin = GPIO_PIN_5, .Mode = GPIO_MODE_OUTPUT_PP, .Pull = GPIO_NOPULL, .Speed = GPIO_SPEED_FREQ_HIGH, .Alternate = 0 },
+ .active_state = 1
},
{ // Button
.port = GPIOC,
- .pin_init = { .Pin = GPIO_PIN_13, .Mode = GPIO_MODE_INPUT, .Pull = GPIO_PULLUP, .Speed = GPIO_SPEED_FREQ_HIGH, .Alternate = 0 },
+ .pin_init = { .Pin = GPIO_PIN_13, .Mode = GPIO_MODE_INPUT, .Pull = GPIO_PULLDOWN, .Speed = GPIO_SPEED_FREQ_HIGH, .Alternate = 0 },
.active_state = 1
},
{ // UART TX
.port = GPIOA,
- .pin_init = { .Pin = GPIO_PIN_2, .Mode = GPIO_MODE_AF_PP, .Pull = GPIO_PULLUP, .Speed = GPIO_SPEED_FREQ_HIGH, .Alternate = GPIO_AF7_USART3 },
+ .pin_init = { .Pin = GPIO_PIN_2, .Mode = GPIO_MODE_AF_PP, .Pull = GPIO_PULLUP, .Speed = GPIO_SPEED_FREQ_HIGH, .Alternate = GPIO_AF7_USART2 },
.active_state = 0
},
{ // UART RX
.port = GPIOA,
- .pin_init = { .Pin = GPIO_PIN_3, .Mode = GPIO_MODE_AF_PP, .Pull = GPIO_PULLUP, .Speed = GPIO_SPEED_FREQ_HIGH, .Alternate = GPIO_AF7_USART3 },
+ .pin_init = { .Pin = GPIO_PIN_3, .Mode = GPIO_MODE_AF_PP, .Pull = GPIO_PULLUP, .Speed = GPIO_SPEED_FREQ_HIGH, .Alternate = GPIO_AF7_USART2 },
.active_state = 0
},
};
diff --git a/hw/bsp/stm32h5/boards/stm32h563nucleo/board.h b/hw/bsp/stm32h5/boards/stm32h563nucleo/board.h
index 20c91f606..18c13017a 100644
--- a/hw/bsp/stm32h5/boards/stm32h563nucleo/board.h
+++ b/hw/bsp/stm32h5/boards/stm32h563nucleo/board.h
@@ -37,6 +37,8 @@
extern "C" {
#endif
+#define UART_ID 3
+
#define PINID_LED 0
#define PINID_BUTTON 1
#define PINID_UART_TX 2
@@ -54,13 +56,13 @@ static board_pindef_t board_pindef[] = {
.active_state = 0
},
{ // UART TX
- .port = GPIOA,
- .pin_init = { .Pin = GPIO_PIN_9, .Mode = GPIO_MODE_AF_PP, .Pull = GPIO_PULLUP, .Speed = GPIO_SPEED_FREQ_HIGH, .Alternate = GPIO_AF7_USART1 },
+ .port = GPIOD,
+ .pin_init = { .Pin = GPIO_PIN_8, .Mode = GPIO_MODE_AF_PP, .Pull = GPIO_PULLUP, .Speed = GPIO_SPEED_FREQ_HIGH, .Alternate = GPIO_AF7_USART3 },
.active_state = 0
},
{ // UART RX
- .port = GPIOA,
- .pin_init = { .Pin = GPIO_PIN_10, .Mode = GPIO_MODE_AF_PP, .Pull = GPIO_PULLUP, .Speed = GPIO_SPEED_FREQ_HIGH, .Alternate = GPIO_AF7_USART1 },
+ .port = GPIOD,
+ .pin_init = { .Pin = GPIO_PIN_9, .Mode = GPIO_MODE_AF_PP, .Pull = GPIO_PULLUP, .Speed = GPIO_SPEED_FREQ_HIGH, .Alternate = GPIO_AF7_USART3 },
.active_state = 0
},
};
diff --git a/hw/bsp/stm32h5/boards/stm32h573i_dk/board.h b/hw/bsp/stm32h5/boards/stm32h573i_dk/board.h
index e9c406486..ce4ef3358 100644
--- a/hw/bsp/stm32h5/boards/stm32h573i_dk/board.h
+++ b/hw/bsp/stm32h5/boards/stm32h573i_dk/board.h
@@ -43,14 +43,16 @@ extern "C" {
#define OTG_FS_VBUS_SENSE 1
#define OTG_HS_VBUS_SENSE 0
-#define PINID_LED 0
-#define PINID_BUTTON 1
-#define PINID_UART_TX 2
-#define PINID_UART_RX 3
-#define PINID_TCPP0203_EN 4
-#define PINID_I2C_SCL 5
-#define PINID_I2C_SDA 6
-#define PINID_TCPP0203_INT 7
+#define UART_ID 1
+
+#define PINID_LED 0
+#define PINID_BUTTON 1
+#define PINID_UART_TX 2
+#define PINID_UART_RX 3
+#define PINID_TCPP0203_EN 4
+#define PINID_I2C_SCL 5
+#define PINID_I2C_SDA 6
+#define PINID_TCPP0203_INT 7
static board_pindef_t board_pindef[] = {
{ // LED
diff --git a/hw/bsp/stm32h5/family.c b/hw/bsp/stm32h5/family.c
index f52f94f32..867171734 100644
--- a/hw/bsp/stm32h5/family.c
+++ b/hw/bsp/stm32h5/family.c
@@ -91,8 +91,10 @@ static UART_HandleTypeDef UartHandle = {
.Parity = UART_PARITY_NONE,
.HwFlowCtl = UART_HWCONTROL_NONE,
.Mode = UART_MODE_TX_RX,
- .OverSampling = UART_OVERSAMPLING_16,
- .AdvancedInit.AdvFeatureInit = UART_ADVFEATURE_NO_INIT
+ .OverSampling = UART_OVERSAMPLING_16
+ },
+ .AdvancedInit = {
+ .AdvFeatureInit = UART_ADVFEATURE_NO_INIT
}
};
#endif
diff --git a/tools/get_deps.py b/tools/get_deps.py
index ebbf9b871..9d745ee26 100755
--- a/tools/get_deps.py
+++ b/tools/get_deps.py
@@ -134,7 +134,7 @@ deps_optional = {
'57ea11f70ebf1850e1048989d665c9070f0bb863',
'stm32h7rs'],
'hw/mcu/st/cmsis_device_h5': ['https://github.com/STMicroelectronics/cmsis_device_h5.git',
- '5273b8f134ba65f5b8174c4141b711b5c0d295b2',
+ '884b8dc78e41cbfca008363342b17f4a9e8641f7',
'stm32h5'],
'hw/mcu/st/cmsis_device_l0': ['https://github.com/STMicroelectronics/cmsis_device_l0.git',
'7b7ae8cd71437331e1d7824f157d00c7bb4a5044',