diff --git a/boards/px4/fmu-v5/src/board_config.h b/boards/px4/fmu-v5/src/board_config.h index 399524148b..481c789113 100644 --- a/boards/px4/fmu-v5/src/board_config.h +++ b/boards/px4/fmu-v5/src/board_config.h @@ -70,12 +70,6 @@ /* Configuration ************************************************************************************/ -/* Un-comment to support some RC00 polarities inversions - * on test HW as well as R and G LEDs on UI LED are swapped - */ -//#define PX4_FMUV5_RC00 - -#define PX4_FMUV5_RC01 #define BOARD_HAS_LTC4417 #if defined(BOARD_HAS_LTC4417) @@ -403,11 +397,9 @@ #define LED_TIM3_CH4OUT /* PB1 T3C4 RED */ GPIO_TIM3_CH4OUT_1 #define BOARD_HAS_UI_LED_PWM 1 -#if defined(PX4_FMUV5_RC00) -# define BOARD_UI_LED_SWAP_RG 1 -#else -# define BOARD_UI_LED_PWM_DRIVE_ACTIVE_LOW 1 -#endif + +#define BOARD_UI_LED_PWM_DRIVE_ACTIVE_LOW 1 + #define UI_LED_TIM5_CH1OUT /* PH10 T5C1 RED */ GPIO_TIM5_CH1OUT_2 #define UI_LED_TIM5_CH2OUT /* PH11 T5C2 GREEN */ GPIO_TIM5_CH2OUT_2 #define UI_LED_TIM5_CH3OUT /* PH12 T5C3 BLUE */ GPIO_TIM5_CH3OUT_2 @@ -452,14 +444,7 @@ #define BOARD_NUMBER_BRICKS 2 #define GPIO_nVDD_USB_VALID GPIO_nPOWER_IN_C /* USB Is Chosen */ -#if defined(PX4_FMUV5_RC00) -# define GPIO_VDD_5V_PERIPH_EN /* PG4 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTG|GPIO_PIN4) -# define GPIO_xVDD_5V_PERIPH_EN GPIO_VDD_5V_PERIPH_EN -#endif -#if defined(PX4_FMUV5_RC01) -# define GPIO_nVDD_5V_PERIPH_EN /* PG4 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_SET|GPIO_PORTG|GPIO_PIN4) -# define GPIO_xVDD_5V_PERIPH_EN GPIO_nVDD_5V_PERIPH_EN -#endif +#define GPIO_nVDD_5V_PERIPH_EN /* PG4 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_SET|GPIO_PORTG|GPIO_PIN4) #define GPIO_nVDD_5V_PERIPH_OC /* PE15 */ (GPIO_INPUT |GPIO_PULLUP|GPIO_PORTE|GPIO_PIN15) #define GPIO_nVDD_5V_HIPOWER_EN /* PF12 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_SET|GPIO_PORTF|GPIO_PIN12) #define GPIO_nVDD_5V_HIPOWER_OC /* PG13 */ (GPIO_INPUT |GPIO_PULLUP|GPIO_PORTF|GPIO_PIN13) @@ -472,12 +457,7 @@ /* Define True logic Power Control in arch agnostic form */ -#if defined(PX4_FMUV5_RC00) -#define VDD_5V_PERIPH_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_5V_PERIPH_EN, (on_true)) -#endif -#if defined(PX4_FMUV5_RC01) #define VDD_5V_PERIPH_EN(on_true) px4_arch_gpiowrite(GPIO_nVDD_5V_PERIPH_EN, !(on_true)) -#endif #define VDD_5V_HIPOWER_EN(on_true) px4_arch_gpiowrite(GPIO_nVDD_5V_HIPOWER_EN, !(on_true)) #define VDD_3V3_SENSORS_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V3_SENSORS_EN, (on_true)) #define VDD_3V3_SPEKTRUM_POWER_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V3_SPEKTRUM_POWER_EN, (on_true)) @@ -670,7 +650,7 @@ GPIO_nPOWER_IN_A, \ GPIO_nPOWER_IN_B, \ GPIO_nPOWER_IN_C, \ - GPIO_xVDD_5V_PERIPH_EN, \ + GPIO_nVDD_5V_PERIPH_EN, \ GPIO_nVDD_5V_PERIPH_OC, \ GPIO_nVDD_5V_HIPOWER_EN, \ GPIO_nVDD_5V_HIPOWER_OC, \