diff --git a/demos/STM32/RT-STM32H743I-NUCLEO144/debug/RT-STM32H743I-NUCLEO144 (OpenOCD, Flash and Run).launch b/demos/STM32/RT-STM32H743I-NUCLEO144/debug/RT-STM32H743I-NUCLEO144 (OpenOCD, Flash and Run).launch index 798eef66e..fa9261ad2 100644 --- a/demos/STM32/RT-STM32H743I-NUCLEO144/debug/RT-STM32H743I-NUCLEO144 (OpenOCD, Flash and Run).launch +++ b/demos/STM32/RT-STM32H743I-NUCLEO144/debug/RT-STM32H743I-NUCLEO144 (OpenOCD, Flash and Run).launch @@ -33,7 +33,7 @@ - + diff --git a/demos/STM32/RT-STM32H743I-NUCLEO144/main.c b/demos/STM32/RT-STM32H743I-NUCLEO144/main.c index c070cd9a9..13849bd2b 100644 --- a/demos/STM32/RT-STM32H743I-NUCLEO144/main.c +++ b/demos/STM32/RT-STM32H743I-NUCLEO144/main.c @@ -29,9 +29,9 @@ static THD_FUNCTION(Thread1, arg) { (void)arg; chRegSetThreadName("blinker"); while (true) { - palSetLine(LINE_ARD_D13); + palSetLine(LINE_ZIO_D33); chThdSleepMilliseconds(500); - palClearLine(LINE_ARD_D13); + palClearLine(LINE_ZIO_D33); chThdSleepMilliseconds(500); } } @@ -51,12 +51,6 @@ int main(void) { halInit(); chSysInit(); - /* - * ARD_D13 is programmed as output (board LED). - */ - palClearLine(LINE_ARD_D13); - palSetLineMode(LINE_ARD_D13, PAL_MODE_OUTPUT_PUSHPULL); - /* * Activates the serial driver 1 using the driver default configuration. */ diff --git a/demos/STM32/RT-STM32H743I-NUCLEO144/mcuconf.h b/demos/STM32/RT-STM32H743I-NUCLEO144/mcuconf.h index 39359e7c6..d317d47f6 100644 --- a/demos/STM32/RT-STM32H743I-NUCLEO144/mcuconf.h +++ b/demos/STM32/RT-STM32H743I-NUCLEO144/mcuconf.h @@ -102,10 +102,6 @@ #define STM32_PLL3_DIVP_VALUE 2 #define STM32_PLL3_DIVQ_VALUE 8 #define STM32_PLL3_DIVR_VALUE 8 -#define STM32_MCO1SEL STM32_MCO1SEL_HSI_CK -#define STM32_MCO1PRE_VALUE 4 -#define STM32_MCO2SEL STM32_MCO2SEL_SYS_CK -#define STM32_MCO2PRE_VALUE 4 /* * Core clocks dynamic settings (can be changed at runtime). @@ -124,6 +120,10 @@ * Peripherals clocks static settings. * Reading STM32 Reference Manual is required. */ +#define STM32_MCO1SEL STM32_MCO1SEL_HSI_CK +#define STM32_MCO1PRE_VALUE 4 +#define STM32_MCO2SEL STM32_MCO2SEL_SYS_CK +#define STM32_MCO2PRE_VALUE 4 #define STM32_CKPERSEL STM32_CKPERSEL_HSE_CK #define STM32_SDMMCSEL STM32_SDMMCSEL_PLL1_Q_CK #define STM32_QSPISEL STM32_QSPISEL_HCLK diff --git a/os/hal/boards/ST_NUCLEO144_H743ZI/board.c b/os/hal/boards/ST_NUCLEO144_H743ZI/board.c index 5ee0873d7..7173084e8 100644 --- a/os/hal/boards/ST_NUCLEO144_H743ZI/board.c +++ b/os/hal/boards/ST_NUCLEO144_H743ZI/board.c @@ -155,8 +155,8 @@ static void stm32_gpio_init(void) { /* Enabling GPIO-related clocks, the mask comes from the registry header file.*/ - rccResetAHB1(STM32_GPIO_EN_MASK); - rccEnableAHB1(STM32_GPIO_EN_MASK, true); + rccResetAHB4(STM32_GPIO_EN_MASK); + rccEnableAHB4(STM32_GPIO_EN_MASK, true); /* Initializing all the defined GPIO ports.*/ #if STM32_HAS_GPIOA diff --git a/os/hal/ports/STM32/LLD/GPIOv2/stm32_gpio.h b/os/hal/ports/STM32/LLD/GPIOv2/stm32_gpio.h index acc5324e3..5dec0825d 100644 --- a/os/hal/ports/STM32/LLD/GPIOv2/stm32_gpio.h +++ b/os/hal/ports/STM32/LLD/GPIOv2/stm32_gpio.h @@ -96,7 +96,6 @@ typedef struct { volatile uint32_t LOCKR; volatile uint32_t AFRL; volatile uint32_t AFRH; - volatile uint32_t BRR; } stm32_gpio_t; /*===========================================================================*/ diff --git a/os/hal/ports/STM32/STM32H7xx/hal_lld.h b/os/hal/ports/STM32/STM32H7xx/hal_lld.h index 9f9818f18..639269b05 100644 --- a/os/hal/ports/STM32/STM32H7xx/hal_lld.h +++ b/os/hal/ports/STM32/STM32H7xx/hal_lld.h @@ -1607,8 +1607,7 @@ /** * @brief PLL2 DIVP field. */ -#if ((STM32_PLL2_DIVP_VALUE >= 2) && (STM32_PLL2_DIVP_VALUE <= 128) && \ - ((STM32_PLL2_DIVP_VALUE & 1U) == 0U)) || \ +#if ((STM32_PLL2_DIVP_VALUE >= 2) && (STM32_PLL2_DIVP_VALUE <= 128)) || \ defined(__DOXYGEN__) #define STM32_PLL2_DIVP ((STM32_PLL2_DIVP_VALUE - 1U) << 9U) #else @@ -1618,8 +1617,7 @@ /** * @brief PLL3 DIVP field. */ -#if ((STM32_PLL3_DIVP_VALUE >= 2) && (STM32_PLL3_DIVP_VALUE <= 128) && \ - ((STM32_PLL3_DIVP_VALUE & 1U) == 0U)) || \ +#if ((STM32_PLL3_DIVP_VALUE >= 2) && (STM32_PLL3_DIVP_VALUE <= 128)) || \ defined(__DOXYGEN__) #define STM32_PLL3_DIVP ((STM32_PLL3_DIVP_VALUE - 1U) << 9U) #else