From ebe2fba0d6d65d51e3dd4cd4debdd9bc4ceec85f Mon Sep 17 00:00:00 2001 From: Andrey Gusakov Date: Tue, 30 May 2023 01:27:08 +0300 Subject: [PATCH] AT-START-F435 demo: fix pinmuxes --- .../STM32/RT-AT32F435-ARTERY144/cfg/mcuconf.h | 4 +- demos/STM32/RT-AT32F435-ARTERY144/main.c | 6 +-- os/hal/boards/AT_START_F435/board.h | 42 +++++++++---------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/demos/STM32/RT-AT32F435-ARTERY144/cfg/mcuconf.h b/demos/STM32/RT-AT32F435-ARTERY144/cfg/mcuconf.h index 9d83cd586..527e71328 100644 --- a/demos/STM32/RT-AT32F435-ARTERY144/cfg/mcuconf.h +++ b/demos/STM32/RT-AT32F435-ARTERY144/cfg/mcuconf.h @@ -264,9 +264,9 @@ /* * SERIAL driver system settings. */ -#define STM32_SERIAL_USE_USART1 FALSE +#define STM32_SERIAL_USE_USART1 TRUE #define STM32_SERIAL_USE_USART2 FALSE -#define STM32_SERIAL_USE_USART3 TRUE +#define STM32_SERIAL_USE_USART3 FALSE #define STM32_SERIAL_USE_UART4 FALSE #define STM32_SERIAL_USE_UART5 FALSE #define STM32_SERIAL_USE_USART6 FALSE diff --git a/demos/STM32/RT-AT32F435-ARTERY144/main.c b/demos/STM32/RT-AT32F435-ARTERY144/main.c index df6cf4d0f..38af6bf32 100644 --- a/demos/STM32/RT-AT32F435-ARTERY144/main.c +++ b/demos/STM32/RT-AT32F435-ARTERY144/main.c @@ -62,7 +62,7 @@ int main(void) { /* * Activates the serial driver 3 using the driver default configuration. */ - sdStart(&SD3, NULL); + sdStart(&SD1, NULL); /* * Creates the example thread. @@ -75,8 +75,8 @@ int main(void) { */ while (true) { if (palReadLine(LINE_BUTTON)) { - test_execute((BaseSequentialStream *)&SD3, &rt_test_suite); - test_execute((BaseSequentialStream *)&SD3, &oslib_test_suite); + test_execute((BaseSequentialStream *)&SD1, &rt_test_suite); + test_execute((BaseSequentialStream *)&SD1, &oslib_test_suite); } chThdSleepMilliseconds(500); } diff --git a/os/hal/boards/AT_START_F435/board.h b/os/hal/boards/AT_START_F435/board.h index 0bd135ff6..2aefd4325 100644 --- a/os/hal/boards/AT_START_F435/board.h +++ b/os/hal/boards/AT_START_F435/board.h @@ -66,7 +66,7 @@ * IO pins assignments. */ /* TODO: */ -#define GPIOA_ZIO_D32 0U +#define GPIOA_BUTTON 0U #define GPIOA_TIM2_CH1 0U #define GPIOA_RMII_REF_CLK 1U #define GPIOA_RMII_MDIO 2U @@ -83,8 +83,8 @@ #define GPIOA_ZIO_D71 7U #define GPIOA_RMII_RX_DV 7U #define GPIOA_USB_SOF 8U -#define GPIOA_USB_VBUS 9U -#define GPIOA_USB_ID 10U +#define GPIOA_USART1_TX 9U +#define GPIOA_USART1_RX 10U #define GPIOA_USB_DM 11U #define GPIOA_USB_DP 12U #define GPIOA_SWDIO 13U @@ -391,7 +391,7 @@ * PA14 - SWCLK (alternate 0). * PA15 - ZIO_D20 I2S3_WS (input pullup). */ -#define VAL_GPIOA_MODER (PIN_MODE_INPUT(GPIOA_ZIO_D32) | \ +#define VAL_GPIOA_MODER (PIN_MODE_INPUT(GPIOA_BUTTON) | \ PIN_MODE_ALTERNATE(GPIOA_RMII_REF_CLK) |\ PIN_MODE_ALTERNATE(GPIOA_RMII_MDIO) | \ PIN_MODE_INPUT(GPIOA_ARD_A0) | \ @@ -400,14 +400,14 @@ PIN_MODE_INPUT(GPIOA_ARD_D12) | \ PIN_MODE_ALTERNATE(GPIOA_ARD_D11) | \ PIN_MODE_ALTERNATE(GPIOA_USB_SOF) | \ - PIN_MODE_ANALOG(GPIOA_USB_VBUS) | \ - PIN_MODE_ALTERNATE(GPIOA_USB_ID) | \ + PIN_MODE_ANALOG(GPIOA_USART1_TX) | \ + PIN_MODE_ALTERNATE(GPIOA_USART1_RX) | \ PIN_MODE_ALTERNATE(GPIOA_USB_DM) | \ PIN_MODE_ALTERNATE(GPIOA_USB_DP) | \ PIN_MODE_ALTERNATE(GPIOA_SWDIO) | \ PIN_MODE_ALTERNATE(GPIOA_SWCLK) | \ PIN_MODE_INPUT(GPIOA_ZIO_D20)) -#define VAL_GPIOA_OTYPER (PIN_OTYPE_PUSHPULL(GPIOA_ZIO_D32) | \ +#define VAL_GPIOA_OTYPER (PIN_OTYPE_PUSHPULL(GPIOA_BUTTON) | \ PIN_OTYPE_PUSHPULL(GPIOA_RMII_REF_CLK) |\ PIN_OTYPE_PUSHPULL(GPIOA_RMII_MDIO) | \ PIN_OTYPE_PUSHPULL(GPIOA_ARD_A0) | \ @@ -416,14 +416,14 @@ PIN_OTYPE_PUSHPULL(GPIOA_ARD_D12) | \ PIN_OTYPE_PUSHPULL(GPIOA_ARD_D11) | \ PIN_OTYPE_PUSHPULL(GPIOA_USB_SOF) | \ - PIN_OTYPE_PUSHPULL(GPIOA_USB_VBUS) | \ - PIN_OTYPE_PUSHPULL(GPIOA_USB_ID) | \ + PIN_OTYPE_PUSHPULL(GPIOA_USART1_TX) | \ + PIN_OTYPE_PUSHPULL(GPIOA_USART1_RX) | \ PIN_OTYPE_PUSHPULL(GPIOA_USB_DM) | \ PIN_OTYPE_PUSHPULL(GPIOA_USB_DP) | \ PIN_OTYPE_PUSHPULL(GPIOA_SWDIO) | \ PIN_OTYPE_PUSHPULL(GPIOA_SWCLK) | \ PIN_OTYPE_PUSHPULL(GPIOA_ZIO_D20)) -#define VAL_GPIOA_OSPEEDR (PIN_OSPEED_HIGH(GPIOA_ZIO_D32) | \ +#define VAL_GPIOA_OSPEEDR (PIN_OSPEED_HIGH(GPIOA_BUTTON) | \ PIN_OSPEED_HIGH(GPIOA_RMII_REF_CLK) | \ PIN_OSPEED_HIGH(GPIOA_RMII_MDIO) | \ PIN_OSPEED_HIGH(GPIOA_ARD_A0) | \ @@ -432,14 +432,14 @@ PIN_OSPEED_HIGH(GPIOA_ARD_D12) | \ PIN_OSPEED_HIGH(GPIOA_ARD_D11) | \ PIN_OSPEED_HIGH(GPIOA_USB_SOF) | \ - PIN_OSPEED_HIGH(GPIOA_USB_VBUS) | \ - PIN_OSPEED_HIGH(GPIOA_USB_ID) | \ + PIN_OSPEED_HIGH(GPIOA_USART1_TX) | \ + PIN_OSPEED_HIGH(GPIOA_USART1_RX) | \ PIN_OSPEED_HIGH(GPIOA_USB_DM) | \ PIN_OSPEED_HIGH(GPIOA_USB_DP) | \ PIN_OSPEED_HIGH(GPIOA_SWDIO) | \ PIN_OSPEED_HIGH(GPIOA_SWCLK) | \ PIN_OSPEED_HIGH(GPIOA_ZIO_D20)) -#define VAL_GPIOA_PUPDR (PIN_PUPDR_PULLUP(GPIOA_ZIO_D32) | \ +#define VAL_GPIOA_PUPDR (PIN_PUPDR_FLOATING(GPIOA_BUTTON) | \ PIN_PUPDR_FLOATING(GPIOA_RMII_REF_CLK) |\ PIN_PUPDR_PULLUP(GPIOA_RMII_MDIO) | \ PIN_PUPDR_PULLUP(GPIOA_ARD_A0) | \ @@ -448,14 +448,14 @@ PIN_PUPDR_PULLUP(GPIOA_ARD_D12) | \ PIN_PUPDR_PULLUP(GPIOA_ARD_D11) | \ PIN_PUPDR_FLOATING(GPIOA_USB_SOF) | \ - PIN_PUPDR_FLOATING(GPIOA_USB_VBUS) | \ - PIN_PUPDR_FLOATING(GPIOA_USB_ID) | \ + PIN_PUPDR_FLOATING(GPIOA_USART1_TX) | \ + PIN_PUPDR_FLOATING(GPIOA_USART1_RX) | \ PIN_PUPDR_FLOATING(GPIOA_USB_DM) | \ PIN_PUPDR_FLOATING(GPIOA_USB_DP) | \ PIN_PUPDR_FLOATING(GPIOA_SWDIO) | \ PIN_PUPDR_FLOATING(GPIOA_SWCLK) | \ PIN_PUPDR_PULLUP(GPIOA_ZIO_D20)) -#define VAL_GPIOA_ODR (PIN_ODR_HIGH(GPIOA_ZIO_D32) | \ +#define VAL_GPIOA_ODR (PIN_ODR_HIGH(GPIOA_BUTTON) | \ PIN_ODR_HIGH(GPIOA_RMII_REF_CLK) | \ PIN_ODR_HIGH(GPIOA_RMII_MDIO) | \ PIN_ODR_HIGH(GPIOA_ARD_A0) | \ @@ -464,14 +464,14 @@ PIN_ODR_HIGH(GPIOA_ARD_D12) | \ PIN_ODR_HIGH(GPIOA_ARD_D11) | \ PIN_ODR_HIGH(GPIOA_USB_SOF) | \ - PIN_ODR_HIGH(GPIOA_USB_VBUS) | \ - PIN_ODR_HIGH(GPIOA_USB_ID) | \ + PIN_ODR_HIGH(GPIOA_USART1_TX) | \ + PIN_ODR_HIGH(GPIOA_USART1_RX) | \ PIN_ODR_HIGH(GPIOA_USB_DM) | \ PIN_ODR_HIGH(GPIOA_USB_DP) | \ PIN_ODR_HIGH(GPIOA_SWDIO) | \ PIN_ODR_HIGH(GPIOA_SWCLK) | \ PIN_ODR_HIGH(GPIOA_ZIO_D20)) -#define VAL_GPIOA_AFRL (PIN_AFIO_AF(GPIOA_ZIO_D32, 0U) | \ +#define VAL_GPIOA_AFRL (PIN_AFIO_AF(GPIOA_BUTTON, 0U) | \ PIN_AFIO_AF(GPIOA_RMII_REF_CLK, 11U) | \ PIN_AFIO_AF(GPIOA_RMII_MDIO, 11U) | \ PIN_AFIO_AF(GPIOA_ARD_A0, 0U) | \ @@ -480,8 +480,8 @@ PIN_AFIO_AF(GPIOA_ARD_D12, 0U) | \ PIN_AFIO_AF(GPIOA_ARD_D11, 11U)) #define VAL_GPIOA_AFRH (PIN_AFIO_AF(GPIOA_USB_SOF, 10U) | \ - PIN_AFIO_AF(GPIOA_USB_VBUS, 0U) | \ - PIN_AFIO_AF(GPIOA_USB_ID, 10U) | \ + PIN_AFIO_AF(GPIOA_USART1_TX, 7U) | \ + PIN_AFIO_AF(GPIOA_USART1_RX, 7U) | \ PIN_AFIO_AF(GPIOA_USB_DM, 10U) | \ PIN_AFIO_AF(GPIOA_USB_DP, 10U) | \ PIN_AFIO_AF(GPIOA_SWDIO, 0U) | \