diff --git a/src/main/io/ledstrip.c b/src/main/io/ledstrip.c index b707a2a01..03c4c5d1e 100644 --- a/src/main/io/ledstrip.c +++ b/src/main/io/ledstrip.c @@ -238,85 +238,6 @@ static const specialColorIndexes_t defaultSpecialColors[] = { static int scaledThrottle; - - - -/* -#ifdef USE_LED_RING_DEFAULT_CONFIG -const ledConfig_t defaultLedStripConfig[] = { - { CALCULATE_LED_XY( 2, 2), 3, LED_FUNCTION_THRUST_RING}, - { CALCULATE_LED_XY( 2, 1), 3, LED_FUNCTION_THRUST_RING}, - { CALCULATE_LED_XY( 2, 0), 3, LED_FUNCTION_THRUST_RING}, - { CALCULATE_LED_XY( 1, 0), 3, LED_FUNCTION_THRUST_RING}, - { CALCULATE_LED_XY( 0, 0), 3, LED_FUNCTION_THRUST_RING}, - { CALCULATE_LED_XY( 0, 1), 3, LED_FUNCTION_THRUST_RING}, - { CALCULATE_LED_XY( 0, 2), 3, LED_FUNCTION_THRUST_RING}, - { CALCULATE_LED_XY( 1, 2), 3, LED_FUNCTION_THRUST_RING}, - { CALCULATE_LED_XY( 1, 1), 3, LED_FUNCTION_THRUST_RING}, - { CALCULATE_LED_XY( 1, 1), 3, LED_FUNCTION_THRUST_RING}, - { CALCULATE_LED_XY( 1, 1), 3, LED_FUNCTION_THRUST_RING}, - { CALCULATE_LED_XY( 1, 1), 3, LED_FUNCTION_THRUST_RING}, -}; -#elif defined(USE_COLIBTI_RACE_LED_DEFAULT_CONFIG) -const ledConfig_t defaultLedStripConfig[] = { - { CALCULATE_LED_XY( 0, 0), 6, LED_DIRECTION_WEST | LED_FUNCTION_WARNING | LED_FUNCTION_COLOR }, - { CALCULATE_LED_XY( 0, 1), 6, LED_DIRECTION_WEST | LED_FUNCTION_WARNING | LED_FUNCTION_COLOR }, - { CALCULATE_LED_XY( 0, 8), 6, LED_DIRECTION_WEST | LED_FUNCTION_WARNING | LED_FUNCTION_COLOR }, - { CALCULATE_LED_XY( 7, 15), 6, LED_FUNCTION_COLOR }, - { CALCULATE_LED_XY( 8, 15), 6, LED_FUNCTION_COLOR }, - { CALCULATE_LED_XY( 7, 14), 6, LED_FUNCTION_COLOR }, - { CALCULATE_LED_XY( 8, 14), 6, LED_FUNCTION_COLOR }, - { CALCULATE_LED_XY( 15, 8), 6, LED_DIRECTION_EAST | LED_FUNCTION_WARNING | LED_FUNCTION_COLOR }, - { CALCULATE_LED_XY( 15, 1), 6, LED_DIRECTION_EAST | LED_FUNCTION_WARNING | LED_FUNCTION_COLOR }, - { CALCULATE_LED_XY( 15, 0), 6, LED_DIRECTION_EAST | LED_FUNCTION_WARNING | LED_FUNCTION_COLOR }, -}; -#else -const ledConfig_t defaultLedStripConfig[] = { - { CALCULATE_LED_XY(15, 15), 0, LED_DIRECTION_SOUTH | LED_DIRECTION_EAST | LED_FUNCTION_INDICATOR | LED_FUNCTION_ARM_STATE }, - - { CALCULATE_LED_XY(15, 8), 0, LED_DIRECTION_EAST | LED_FUNCTION_FLIGHT_MODE | LED_FUNCTION_WARNING }, - { CALCULATE_LED_XY(15, 7), 0, LED_DIRECTION_EAST | LED_FUNCTION_FLIGHT_MODE | LED_FUNCTION_WARNING }, - - { CALCULATE_LED_XY(15, 0), 0, LED_DIRECTION_NORTH | LED_DIRECTION_EAST | LED_FUNCTION_INDICATOR | LED_FUNCTION_ARM_STATE }, - - { CALCULATE_LED_XY( 8, 0), 0, LED_DIRECTION_NORTH | LED_FUNCTION_FLIGHT_MODE }, - { CALCULATE_LED_XY( 7, 0), 0, LED_DIRECTION_NORTH | LED_FUNCTION_FLIGHT_MODE }, - - { CALCULATE_LED_XY( 0, 0), 0, LED_DIRECTION_NORTH | LED_DIRECTION_WEST | LED_FUNCTION_INDICATOR | LED_FUNCTION_ARM_STATE }, - - { CALCULATE_LED_XY( 0, 7), 0, LED_DIRECTION_WEST | LED_FUNCTION_FLIGHT_MODE | LED_FUNCTION_WARNING }, - { CALCULATE_LED_XY( 0, 8), 0, LED_DIRECTION_WEST | LED_FUNCTION_FLIGHT_MODE | LED_FUNCTION_WARNING }, - - { CALCULATE_LED_XY( 0, 15), 0, LED_DIRECTION_SOUTH | LED_DIRECTION_WEST | LED_FUNCTION_INDICATOR | LED_FUNCTION_ARM_STATE }, - - { CALCULATE_LED_XY( 7, 15), 0, LED_DIRECTION_SOUTH | LED_FUNCTION_FLIGHT_MODE | LED_FUNCTION_WARNING }, - { CALCULATE_LED_XY( 8, 15), 0, LED_DIRECTION_SOUTH | LED_FUNCTION_FLIGHT_MODE | LED_FUNCTION_WARNING }, - - { CALCULATE_LED_XY( 7, 7), 0, LED_DIRECTION_UP | LED_FUNCTION_FLIGHT_MODE | LED_FUNCTION_WARNING }, - { CALCULATE_LED_XY( 8, 7), 0, LED_DIRECTION_UP | LED_FUNCTION_FLIGHT_MODE | LED_FUNCTION_WARNING }, - { CALCULATE_LED_XY( 7, 8), 0, LED_DIRECTION_DOWN | LED_FUNCTION_FLIGHT_MODE | LED_FUNCTION_WARNING }, - { CALCULATE_LED_XY( 8, 8), 0, LED_DIRECTION_DOWN | LED_FUNCTION_FLIGHT_MODE | LED_FUNCTION_WARNING }, - - { CALCULATE_LED_XY( 8, 9), 3, LED_FUNCTION_THRUST_RING}, - { CALCULATE_LED_XY( 9, 10), 3, LED_FUNCTION_THRUST_RING}, - { CALCULATE_LED_XY(10, 11), 3, LED_FUNCTION_THRUST_RING}, - { CALCULATE_LED_XY(10, 12), 3, LED_FUNCTION_THRUST_RING}, - { CALCULATE_LED_XY( 9, 13), 3, LED_FUNCTION_THRUST_RING}, - { CALCULATE_LED_XY( 8, 14), 3, LED_FUNCTION_THRUST_RING}, - { CALCULATE_LED_XY( 7, 14), 3, LED_FUNCTION_THRUST_RING}, - { CALCULATE_LED_XY( 6, 13), 3, LED_FUNCTION_THRUST_RING}, - { CALCULATE_LED_XY( 5, 12), 3, LED_FUNCTION_THRUST_RING}, - { CALCULATE_LED_XY( 5, 11), 3, LED_FUNCTION_THRUST_RING}, - { CALCULATE_LED_XY( 6, 10), 3, LED_FUNCTION_THRUST_RING}, - { CALCULATE_LED_XY( 7, 9), 3, LED_FUNCTION_THRUST_RING}, - -}; -#endif -*/ - - - - static void updateLedRingCounts(void); STATIC_UNIT_TESTED void determineLedStripDimensions(void) diff --git a/src/main/target/COLIBRI_RACE/target.h b/src/main/target/COLIBRI_RACE/target.h index d4db45a6d..a68d7a71d 100755 --- a/src/main/target/COLIBRI_RACE/target.h +++ b/src/main/target/COLIBRI_RACE/target.h @@ -113,7 +113,6 @@ #define EXTERNAL1_ADC_PIN PC3 #define LED_STRIP -#define USE_COLIBTI_RACE_LED_DEFAULT_CONFIG #define WS2811_PIN PA6 // TIM16_CH1 #define WS2811_TIMER TIM16 diff --git a/src/main/target/MOTOLAB/target.h b/src/main/target/MOTOLAB/target.h index fe465da9c..beb5431c7 100644 --- a/src/main/target/MOTOLAB/target.h +++ b/src/main/target/MOTOLAB/target.h @@ -21,6 +21,7 @@ #define USE_CLI #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_DEFAULT +#define TARGET_CONFIG #define LED0 PB5 // Blue LEDs - PB5 //#define LED1 PB9 // Green LEDs - PB9