From eaa2cf7d994f2de29cce2471e1e51763fd55e092 Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Fri, 9 Dec 2016 16:21:12 -0800 Subject: [PATCH] aerofc: fix LED names There are no blue/red LEDs and these names just causes confusion with the "always-on LEDs". --- nuttx-configs/aerofc-v1/include/board.h | 6 +----- src/drivers/boards/aerofc-v1/aerofc_led.c | 16 ++++++++-------- src/drivers/boards/aerofc-v1/board_config.h | 12 +++--------- 3 files changed, 12 insertions(+), 22 deletions(-) diff --git a/nuttx-configs/aerofc-v1/include/board.h b/nuttx-configs/aerofc-v1/include/board.h index bb5b77340e..dcb4cabdb9 100644 --- a/nuttx-configs/aerofc-v1/include/board.h +++ b/nuttx-configs/aerofc-v1/include/board.h @@ -161,11 +161,7 @@ * way. The following definitions are used to access individual LEDs. */ -/* LED index values for use with stm32_setled() - * - * PC4 BLUE_LED D4 Blue LED cathode - * PC5 RED_LED D5 Red LED cathode -*/ +/* LED index values for use with stm32_setled() */ #define BOARD_LED1 0 #define BOARD_LED2 1 #define BOARD_NLEDS 2 diff --git a/src/drivers/boards/aerofc-v1/aerofc_led.c b/src/drivers/boards/aerofc-v1/aerofc_led.c index b09d04216c..53aab0a396 100644 --- a/src/drivers/boards/aerofc-v1/aerofc_led.c +++ b/src/drivers/boards/aerofc-v1/aerofc_led.c @@ -65,20 +65,20 @@ __EXPORT void led_init(void) { /* Configure LED1-2 GPIOs for output */ - stm32_configgpio(GPIO_BLUE_LED); - stm32_configgpio(GPIO_RED_LED); + stm32_configgpio(GPIO_LED1); + stm32_configgpio(GPIO_LED2); } __EXPORT void led_on(int led) { if (led == 0) { /* Pull down to switch on */ - stm32_gpiowrite(GPIO_BLUE_LED, false); + stm32_gpiowrite(GPIO_LED1, false); } if (led == 1) { /* Pull down to switch on */ - stm32_gpiowrite(GPIO_RED_LED, false); + stm32_gpiowrite(GPIO_LED2, false); } } @@ -86,22 +86,22 @@ __EXPORT void led_off(int led) { if (led == 0) { /* Pull up to switch off */ - stm32_gpiowrite(GPIO_BLUE_LED, true); + stm32_gpiowrite(GPIO_LED1, true); } if (led == 1) { /* Pull up to switch off */ - stm32_gpiowrite(GPIO_RED_LED, true); + stm32_gpiowrite(GPIO_LED2, true); } } __EXPORT void led_toggle(int led) { if (led == 0) { - stm32_gpiowrite(GPIO_BLUE_LED, !stm32_gpioread(GPIO_BLUE_LED)); + stm32_gpiowrite(GPIO_LED1, !stm32_gpioread(GPIO_LED1)); } if (led == 1) { - stm32_gpiowrite(GPIO_RED_LED, !stm32_gpioread(GPIO_RED_LED)); + stm32_gpiowrite(GPIO_LED2, !stm32_gpioread(GPIO_LED2)); } } diff --git a/src/drivers/boards/aerofc-v1/board_config.h b/src/drivers/boards/aerofc-v1/board_config.h index 3f47284cec..675363f78a 100644 --- a/src/drivers/boards/aerofc-v1/board_config.h +++ b/src/drivers/boards/aerofc-v1/board_config.h @@ -61,15 +61,9 @@ #define UDID_START 0x1FFF7A10 /* PX4FMU GPIOs ***********************************************************************************/ -/* LEDs - * - * PC4 BLUE_LED D4 Blue LED cathode - * PC5 RED_LED D5 Red LED cathode -*/ -#define GPIO_LED1 (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTE|GPIO_PIN12) -#define GPIO_LED2 (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTE|GPIO_PIN10) -#define GPIO_BLUE_LED GPIO_LED1 -#define GPIO_RED_LED GPIO_LED2 +/* LEDs */ +#define GPIO_LED1 (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTE|GPIO_PIN12) +#define GPIO_LED2 (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTE|GPIO_PIN10) #define GPIO_SENSORS_POWER (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|GPIO_OUTPUT_SET|GPIO_PORTD|GPIO_PIN13)