From 308295f6486273638fe535bf93cba69cb484657a Mon Sep 17 00:00:00 2001 From: Simone Guscetti Date: Mon, 15 May 2017 08:19:30 +0200 Subject: [PATCH] fmu-v5: fix compiling errors --- src/drivers/boards/px4fmu-v5/px4fmu_init.c | 8 ++++---- src/drivers/boards/px4fmu-v5/px4fmu_led.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/drivers/boards/px4fmu-v5/px4fmu_init.c b/src/drivers/boards/px4fmu-v5/px4fmu_init.c index 8f8a3b096e..13b206e69d 100644 --- a/src/drivers/boards/px4fmu-v5/px4fmu_init.c +++ b/src/drivers/boards/px4fmu-v5/px4fmu_init.c @@ -175,9 +175,9 @@ __EXPORT void board_peripheral_reset(int ms) stm32_gpiowrite(GPIO_PERIPH_5V_EN, 0); stm32_gpiowrite(GPIO_VDD_3V3_SENSORS_EN, 0); - bool last = stm32_gpioread(GPIO_SPEKTRUM_POWER_EN); + bool last = stm32_gpioread(GPIO_VDD_3V3_SPEKTRUM_POWER_EN); /* Keep Spektum on to discharge rail*/ - stm32_gpiowrite(GPIO_SPEKTRUM_POWER_EN, 1); + stm32_gpiowrite(GPIO_VDD_3V3_SPEKTRUM_POWER_EN, 1); /* wait for the peripheral rail to reach GND */ usleep(ms * 1000); @@ -186,7 +186,7 @@ __EXPORT void board_peripheral_reset(int ms) /* re-enable power */ /* switch the peripheral rail back on */ - stm32_gpiowrite(GPIO_SPEKTRUM_POWER_EN, last); + stm32_gpiowrite(GPIO_VDD_3V3_SPEKTRUM_POWER_EN, last); stm32_gpiowrite(GPIO_VDD_3V3_SENSORS_EN, 1); stm32_gpiowrite(GPIO_PERIPH_5V_EN, 1); @@ -252,7 +252,7 @@ stm32_boardinitialize(void) stm32_configgpio(GPIO_VDD_3V3V_SD_CARD_EN); stm32_configgpio(GPIO_VDD_5V_RC_EN); stm32_configgpio(GPIO_VDD_5V_WIFI_EN); - stm32_configgpio(GPIO_SPEKTRUM_POWER_EN); + stm32_configgpio(GPIO_VDD_3V3_SPEKTRUM_POWER_EN); stm32_configgpio(GPIO_nSAFETY_SWITCH_LED_OUT); stm32_configgpio(GPIO_SAFETY_SWITCH_IN); diff --git a/src/drivers/boards/px4fmu-v5/px4fmu_led.c b/src/drivers/boards/px4fmu-v5/px4fmu_led.c index de50953e63..c377851d90 100644 --- a/src/drivers/boards/px4fmu-v5/px4fmu_led.c +++ b/src/drivers/boards/px4fmu-v5/px4fmu_led.c @@ -72,7 +72,7 @@ static uint32_t g_ledmap[] = { GPIO_nLED_GREEN, // Indexed by BOARD_LED_GREEN GPIO_nLED_BLUE, // Indexed by BOARD_LED_BLUE GPIO_nLED_RED, // Indexed by BOARD_LED_RED - GPIO_LED_SAFETY, // Indexed by LED_SAFETY by xlatpx4 + GPIO_nSAFETY_SWITCH_LED_OUT, // Indexed by LED_SAFETY by xlatpx4 }; #else @@ -81,7 +81,7 @@ static uint32_t g_ledmap[] = { static uint32_t g_ledmap[] = { GPIO_nLED_BLUE, // Indexed by LED_BLUE GPIO_nLED_RED, // Indexed by LED_RED, LED_AMBER - GPIO_LED_SAFETY, // Indexed by LED_SAFETY + GPIO_nSAFETY_SWITCH_LED_OUT, // Indexed by LED_SAFETY GPIO_nLED_GREEN, // Indexed by LED_GREEN };