From 4e7ead1ee38f94d3341a7f049cd088f3328d9070 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Sun, 29 Nov 2020 14:15:06 +0000 Subject: [PATCH] git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@13941 27425a3e-05d8-49a3-a47f-9c15f0e5edd8 --- demos/STM32/RT-STM32WB55RG-NUCLEO/main.c | 18 +++++++++--------- os/hal/boards/ST_NUCLEO_WB55RG/board.h | 12 ++++++++++++ 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/demos/STM32/RT-STM32WB55RG-NUCLEO/main.c b/demos/STM32/RT-STM32WB55RG-NUCLEO/main.c index 313a21e21..5a13eb953 100644 --- a/demos/STM32/RT-STM32WB55RG-NUCLEO/main.c +++ b/demos/STM32/RT-STM32WB55RG-NUCLEO/main.c @@ -30,19 +30,19 @@ static THD_FUNCTION(Thread1, arg) { chRegSetThreadName("blinker"); - palClearLine(LINE_LD1); - palClearLine(LINE_LD2); - palClearLine(LINE_LD3); + palClearLine(LINE_LED_BLUE); + palClearLine(LINE_LED_GREEN); + palClearLine(LINE_LED_RED); while (true) { - palToggleLine(LINE_LD1); + palToggleLine(LINE_LED_BLUE); - if (PAL_LOW == palReadLine(LINE_B2)) { - palToggleLine(LINE_LD2); + if (PAL_LOW == palReadLine(LINE_BUTTON_2)) { + palToggleLine(LINE_LED_GREEN); } - if (PAL_LOW == palReadLine(LINE_B3)) { - palToggleLine(LINE_LD3); + if (PAL_LOW == palReadLine(LINE_BUTTON_3)) { + palToggleLine(LINE_LED_RED); } chThdSleepMilliseconds(500); @@ -80,7 +80,7 @@ int main(void) { * sleeping in a loop and check the SW1 button state. */ while (true) { - if (PAL_LOW == palReadLine(LINE_B1)) { + if (PAL_LOW == palReadLine(LINE_BUTTON_1)) { test_execute((BaseSequentialStream *)&SD1, &rt_test_suite); test_execute((BaseSequentialStream *)&SD1, &oslib_test_suite); } diff --git a/os/hal/boards/ST_NUCLEO_WB55RG/board.h b/os/hal/boards/ST_NUCLEO_WB55RG/board.h index 355345633..c75e89ad4 100644 --- a/os/hal/boards/ST_NUCLEO_WB55RG/board.h +++ b/os/hal/boards/ST_NUCLEO_WB55RG/board.h @@ -108,14 +108,17 @@ #define GPIOB_PIN0 0U #define GPIOB_LD2 0U +#define GPIOB_LED_GREEN 0U #define GPIOB_PIN1 1U #define GPIOB_LD3 1U +#define GPIOB_LED_RED 1U #define GPIOB_PIN2 2U #define GPIOB_PIN3 3U #define GPIOB_JTDO_SWO 3U #define GPIOB_PIN4 4U #define GPIOB_PIN5 5U #define GPIOB_LD1 5U +#define GPIOB_LED_BLUE 5U #define GPIOB_PIN6 6U #define GPIOB_USART1_TX 6U #define GPIOB_PIN7 7U @@ -142,6 +145,7 @@ #define GPIOC_ARD_A4 3U #define GPIOC_PIN4 4U #define GPIOC_B1 4U +#define GPIOC_BUTTON_1 4U #define GPIOC_PIN5 5U #define GPIOC_PIN6 6U #define GPIOC_ARD_D2 6U @@ -161,8 +165,10 @@ #define GPIOD_PIN0 0U #define GPIOD_B2 0U +#define GPIOD_BUTTON_2 0U #define GPIOD_PIN1 1U #define GPIOD_B3 1U +#define GPIOD_BUTTON_3 1U #define GPIOD_PIN2 2U #define GPIOD_PIN3 3U #define GPIOD_PIN4 4U @@ -255,18 +261,24 @@ #define LINE_JTCK_SWCLK PAL_LINE(GPIOA, GPIOA_PIN14) #define LINE_LD2 PAL_LINE(GPIOB, GPIOB_PIN0) +#define LINE_LED_GREEN PAL_LINE(GPIOB, GPIOB_PIN0) #define LINE_LD3 PAL_LINE(GPIOB, GPIOB_PIN1) +#define LINE_LED_RED PAL_LINE(GPIOB, GPIOB_PIN1) #define LINE_JTDO_SWO PAL_LINE(GPIOB, GPIOB_PIN3) #define LINE_LD1 PAL_LINE(GPIOB, GPIOB_PIN5) +#define LINE_LED_BLUE PAL_LINE(GPIOB, GPIOB_PIN5) #define LINE_STLINK_RX PAL_LINE(GPIOB, GPIOB_PIN6) #define LINE_STLINK_TX PAL_LINE(GPIOB, GPIOB_PIN7) #define LINE_B1 PAL_LINE(GPIOC, GPIOC_PIN4) +#define LINE_BUTTON_1 PAL_LINE(GPIOC, GPIOC_PIN4) #define LINE_OSC32_IN PAL_LINE(GPIOC, GPIOC_PIN14) #define LINE_OSC32_OUT PAL_LINE(GPIOC, GPIOC_PIN15) #define LINE_B2 PAL_LINE(GPIOD, GPIOD_PIN0) +#define LINE_BUTTON_2 PAL_LINE(GPIOD, GPIOD_PIN0) #define LINE_B3 PAL_LINE(GPIOD, GPIOD_PIN1) +#define LINE_BUTTON_3 PAL_LINE(GPIOD, GPIOD_PIN1) /*===========================================================================*/ /* Driver pre-compile time settings. */