Browse Source

AP_Notify: Catch bad board LED combos

master
Michael du Breuil 6 years ago committed by Francisco Ferreira
parent
commit
e41b2de5ea
  1. 14
      libraries/AP_Notify/AP_BoardLED.cpp
  2. 9
      libraries/AP_Notify/AP_BoardLED2.cpp

14
libraries/AP_Notify/AP_BoardLED.cpp

@ -16,18 +16,12 @@
#include "AP_Notify.h" #include "AP_Notify.h"
#if (defined(HAL_GPIO_A_LED_PIN) || defined(HAL_GPIO_B_LED_PIN) || \ #if (defined(HAL_GPIO_A_LED_PIN) && defined(HAL_GPIO_B_LED_PIN) && \
defined(HAL_GPIO_C_LED_PIN)) defined(HAL_GPIO_C_LED_PIN))
#ifndef HAL_GPIO_A_LED_PIN static_assert((HAL_GPIO_A_LED_PIN != HAL_GPIO_B_LED_PIN) &&
#define HAL_GPIO_A_LED_PIN -1 (HAL_GPIO_A_LED_PIN != HAL_GPIO_C_LED_PIN) &&
#endif (HAL_GPIO_B_LED_PIN != HAL_GPIO_C_LED_PIN), "Duplicate LED assignments detected");
#ifndef HAL_GPIO_B_LED_PIN
#define HAL_GPIO_B_LED_PIN -1
#endif
#ifndef HAL_GPIO_C_LED_PIN
#define HAL_GPIO_C_LED_PIN -1
#endif
extern const AP_HAL::HAL& hal; extern const AP_HAL::HAL& hal;

9
libraries/AP_Notify/AP_BoardLED2.cpp

@ -19,14 +19,9 @@
// show all status on only 2 leds // show all status on only 2 leds
#if defined(HAL_GPIO_A_LED_PIN) || defined(HAL_GPIO_B_LED_PIN) #if defined(HAL_GPIO_A_LED_PIN) && defined(HAL_GPIO_B_LED_PIN)
#ifndef HAL_GPIO_A_LED_PIN static_assert((HAL_GPIO_A_LED_PIN != HAL_GPIO_B_LED_PIN), "Duplicate LED assignments detected");
#define HAL_GPIO_A_LED_PIN -1
#endif
#ifndef HAL_GPIO_B_LED_PIN
#define HAL_GPIO_B_LED_PIN -1
#endif
extern const AP_HAL::HAL& hal; extern const AP_HAL::HAL& hal;

Loading…
Cancel
Save