From bef24b906e89fca996306cf44e80ee7b3ad35976 Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Mon, 13 Mar 2017 07:26:36 -1000 Subject: [PATCH] Removed v4pro cloned v4 inappropriate definitions (#6808) * Remove remove safty swtich LED from FMU control * Differentiate GPIO_BTN_SAFETY_FMU from GPIO_BTN_SAFETY --- src/drivers/boards/px4fmu-v4pro/board_config.h | 3 +-- src/drivers/boards/px4fmu-v4pro/px4fmu_init.c | 2 +- src/drivers/boards/px4fmu-v4pro/px4fmu_led.c | 16 ++++++++++++---- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/drivers/boards/px4fmu-v4pro/board_config.h b/src/drivers/boards/px4fmu-v4pro/board_config.h index 6585d438f9..0e647d6f11 100644 --- a/src/drivers/boards/px4fmu-v4pro/board_config.h +++ b/src/drivers/boards/px4fmu-v4pro/board_config.h @@ -297,8 +297,7 @@ __BEGIN_DECLS #define GPIO_PWM_IN GPIO_TIM4_CH2IN_2 #define GPIO_RSSI_IN (GPIO_INPUT|GPIO_PULLUP|GPIO_PORTC|GPIO_PIN1) -#define GPIO_LED_SAFETY (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_SET|GPIO_PORTC|GPIO_PIN3) -#define GPIO_BTN_SAFETY (GPIO_INPUT|GPIO_PULLUP|GPIO_PORTC|GPIO_PIN4) +#define GPIO_BTN_SAFETY_FMU (GPIO_INPUT|GPIO_PULLUP|GPIO_PORTC|GPIO_PIN4) #define GPIO_SBUS_INV (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_SET|GPIO_PORTC|GPIO_PIN13) #define INVERT_RC_INPUT(_s) px4_arch_gpiowrite(GPIO_SBUS_INV, _s) diff --git a/src/drivers/boards/px4fmu-v4pro/px4fmu_init.c b/src/drivers/boards/px4fmu-v4pro/px4fmu_init.c index 1a0c09c8b7..184234e836 100644 --- a/src/drivers/boards/px4fmu-v4pro/px4fmu_init.c +++ b/src/drivers/boards/px4fmu-v4pro/px4fmu_init.c @@ -194,7 +194,7 @@ stm32_boardinitialize(void) // stm32_configgpio(GPIO_SPEKTRUM_PWR_EN); stm32_configgpio(GPIO_8266_PD); stm32_configgpio(GPIO_8266_RST); - stm32_configgpio(GPIO_BTN_SAFETY); + stm32_configgpio(GPIO_BTN_SAFETY_FMU); #ifdef GPIO_RC_OUT stm32_configgpio(GPIO_RC_OUT); /* Serial RC output pin */ diff --git a/src/drivers/boards/px4fmu-v4pro/px4fmu_led.c b/src/drivers/boards/px4fmu-v4pro/px4fmu_led.c index ddb34e8a56..d962ea7f64 100644 --- a/src/drivers/boards/px4fmu-v4pro/px4fmu_led.c +++ b/src/drivers/boards/px4fmu-v4pro/px4fmu_led.c @@ -65,7 +65,7 @@ __END_DECLS static uint32_t g_ledmap[] = { GPIO_LED_BLUE, // Indexed by LED_BLUE GPIO_LED_RED, // Indexed by LED_RED, LED_AMBER - GPIO_LED_SAFETY, // Indexed by LED_SAFETY + 0, // Indexed by LED_SAFETY GPIO_LED_GREEN, // Indexed by LED_GREEN }; @@ -73,20 +73,28 @@ __EXPORT void led_init(void) { /* Configure LED GPIOs for output */ for (size_t l = 0; l < (sizeof(g_ledmap) / sizeof(g_ledmap[0])); l++) { - stm32_configgpio(g_ledmap[l]); + if (g_ledmap[l] != 0) { + stm32_configgpio(g_ledmap[l]); + } } } static void phy_set_led(int led, bool state) { /* Pull Down to switch on */ - stm32_gpiowrite(g_ledmap[led], !state); + if (g_ledmap[led] != 0) { + stm32_gpiowrite(g_ledmap[led], !state); + } } static bool phy_get_led(int led) { - return !stm32_gpioread(g_ledmap[led]); + if (g_ledmap[led] != 0) { + return !stm32_gpioread(g_ledmap[led]); + } + + return 0; } __EXPORT void led_on(int led)