Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-16 21:05:35 +03:00
Code Issues Wiki Activity

Update led config so it's possible to show which LEDs show the arm

Browse source 
state.  Mutually exclusive with leds that show MODE.

Use blue to indicate armed, green for disarmed.

Leds not configured for ARM_STATE or MODE will be off by default.

The example combines corner LEDs with ARM_STATE and INDICATOR.  This
results in the corner leds showing arm state and then being overridden
with an indicator color as needed.
This commit is contained in:
Dominic Clifton 2014-07-02 23:50:39 +01:00
parent 3ce33f0455
commit 21c8fdc69b
1 changed files with 23 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

52
src/main/io/ledstrip.c
View file

@ -50,6 +50,7 @@ const rgbColor24bpp_t red = { LED_RED };
const rgbColor24bpp_t orange = { LED_ORANGE }; const rgbColor24bpp_t orange = { LED_ORANGE };
const rgbColor24bpp_t white = { LED_WHITE }; const rgbColor24bpp_t white = { LED_WHITE };
const rgbColor24bpp_t green = { LED_GREEN }; const rgbColor24bpp_t green = { LED_GREEN };
const rgbColor24bpp_t blue = { LED_BLUE };
/* /*
* 0..5 - rear right cluster, 0..2 rear 3..5 right * 0..5 - rear right cluster, 0..2 rear 3..5 right
@ -69,7 +70,8 @@ typedef enum {
LED_DIRECTION_DOWN = (1 << 5), LED_DIRECTION_DOWN = (1 << 5),
LED_FUNCTION_INDICATOR = (1 << 6), LED_FUNCTION_INDICATOR = (1 << 6),
LED_FUNCTION_BATTERY = (1 << 7), LED_FUNCTION_BATTERY = (1 << 7),
LED_FUNCTION_MODE = (1 << 8) LED_FUNCTION_MODE = (1 << 8),
LED_FUNCTION_ARM_STATE = (1 << 9)
} ledFlag_e; } ledFlag_e;
#define LED_X_BIT_OFFSET 4 #define LED_X_BIT_OFFSET 4
@ -93,15 +95,15 @@ static uint8_t ledGridHeight;
static const ledConfig_t ledConfigs[WS2811_LED_STRIP_LENGTH] = { static const ledConfig_t ledConfigs[WS2811_LED_STRIP_LENGTH] = {
{ LED_XY( 9, 9), LED_DIRECTION_SOUTH | LED_FUNCTION_MODE | LED_FUNCTION_BATTERY }, { LED_XY( 9, 9), LED_DIRECTION_SOUTH | LED_FUNCTION_MODE | LED_FUNCTION_BATTERY },
{ LED_XY(10, 10), LED_DIRECTION_SOUTH | LED_FUNCTION_MODE | LED_FUNCTION_BATTERY }, { LED_XY(10, 10), LED_DIRECTION_SOUTH | LED_FUNCTION_MODE | LED_FUNCTION_BATTERY },
{ LED_XY(11, 11), LED_DIRECTION_SOUTH | LED_FUNCTION_INDICATOR }, { LED_XY(11, 11), LED_DIRECTION_SOUTH | LED_FUNCTION_INDICATOR | LED_FUNCTION_ARM_STATE },
{ LED_XY(11, 11), LED_DIRECTION_EAST | LED_FUNCTION_INDICATOR }, { LED_XY(11, 11), LED_DIRECTION_EAST | LED_FUNCTION_INDICATOR | LED_FUNCTION_ARM_STATE },
{ LED_XY(10, 10), LED_DIRECTION_EAST | LED_FUNCTION_MODE }, { LED_XY(10, 10), LED_DIRECTION_EAST | LED_FUNCTION_MODE },
{ LED_XY( 9, 9), LED_DIRECTION_EAST | LED_FUNCTION_MODE }, { LED_XY( 9, 9), LED_DIRECTION_EAST | LED_FUNCTION_MODE },
{ LED_XY(10, 5), LED_DIRECTION_SOUTH | LED_FUNCTION_MODE }, { LED_XY(10, 5), LED_DIRECTION_SOUTH | LED_FUNCTION_MODE },
{ LED_XY(11, 4), LED_DIRECTION_SOUTH | LED_FUNCTION_MODE }, { LED_XY(11, 4), LED_DIRECTION_SOUTH | LED_FUNCTION_MODE },
{ LED_XY(12, 3), LED_DIRECTION_SOUTH | LED_FUNCTION_INDICATOR }, { LED_XY(12, 3), LED_DIRECTION_SOUTH | LED_FUNCTION_INDICATOR | LED_FUNCTION_ARM_STATE },
{ LED_XY(12, 2), LED_DIRECTION_NORTH | LED_FUNCTION_INDICATOR }, { LED_XY(12, 2), LED_DIRECTION_NORTH | LED_FUNCTION_INDICATOR | LED_FUNCTION_ARM_STATE },
{ LED_XY(11, 1), LED_DIRECTION_NORTH | LED_FUNCTION_MODE }, { LED_XY(11, 1), LED_DIRECTION_NORTH | LED_FUNCTION_MODE },
{ LED_XY(10, 0), LED_DIRECTION_NORTH | LED_FUNCTION_MODE }, { LED_XY(10, 0), LED_DIRECTION_NORTH | LED_FUNCTION_MODE },
@ -112,15 +114,15 @@ static const ledConfig_t ledConfigs[WS2811_LED_STRIP_LENGTH] = {
{ LED_XY( 2, 0), LED_DIRECTION_NORTH | LED_FUNCTION_MODE }, { LED_XY( 2, 0), LED_DIRECTION_NORTH | LED_FUNCTION_MODE },
{ LED_XY( 1, 1), LED_DIRECTION_NORTH | LED_FUNCTION_MODE }, { LED_XY( 1, 1), LED_DIRECTION_NORTH | LED_FUNCTION_MODE },
{ LED_XY( 0, 2), LED_DIRECTION_NORTH | LED_FUNCTION_INDICATOR }, { LED_XY( 0, 2), LED_DIRECTION_NORTH | LED_FUNCTION_INDICATOR | LED_FUNCTION_ARM_STATE },
{ LED_XY( 0, 3), LED_DIRECTION_WEST | LED_FUNCTION_INDICATOR }, { LED_XY( 0, 3), LED_DIRECTION_WEST | LED_FUNCTION_INDICATOR | LED_FUNCTION_ARM_STATE },
{ LED_XY( 1, 4), LED_DIRECTION_WEST | LED_FUNCTION_MODE }, { LED_XY( 1, 4), LED_DIRECTION_WEST | LED_FUNCTION_MODE },
{ LED_XY( 2, 5), LED_DIRECTION_WEST | LED_FUNCTION_MODE }, { LED_XY( 2, 5), LED_DIRECTION_WEST | LED_FUNCTION_MODE },
{ LED_XY( 2, 9), LED_DIRECTION_WEST | LED_FUNCTION_MODE }, { LED_XY( 2, 9), LED_DIRECTION_WEST | LED_FUNCTION_MODE },
{ LED_XY( 1, 10), LED_DIRECTION_WEST | LED_FUNCTION_MODE }, { LED_XY( 1, 10), LED_DIRECTION_WEST | LED_FUNCTION_MODE },
{ LED_XY( 0, 11), LED_DIRECTION_WEST | LED_FUNCTION_INDICATOR }, { LED_XY( 0, 11), LED_DIRECTION_WEST | LED_FUNCTION_INDICATOR | LED_FUNCTION_ARM_STATE },
{ LED_XY( 0, 11), LED_DIRECTION_SOUTH | LED_FUNCTION_INDICATOR }, { LED_XY( 0, 11), LED_DIRECTION_SOUTH | LED_FUNCTION_INDICATOR | LED_FUNCTION_ARM_STATE },
{ LED_XY( 1, 10), LED_DIRECTION_SOUTH | LED_FUNCTION_MODE | LED_FUNCTION_BATTERY }, { LED_XY( 1, 10), LED_DIRECTION_SOUTH | LED_FUNCTION_MODE | LED_FUNCTION_BATTERY },
{ LED_XY( 2, 9), LED_DIRECTION_SOUTH | LED_FUNCTION_MODE | LED_FUNCTION_BATTERY } { LED_XY( 2, 9), LED_DIRECTION_SOUTH | LED_FUNCTION_MODE | LED_FUNCTION_BATTERY }
}; };
@ -256,16 +258,6 @@ void applyQuadrantColor(const uint8_t ledIndex, const ledConfig_t *ledConfig, co
} }
return; return;
} }
}
void applyModeColor(uint8_t ledIndex, const ledConfig_t *ledConfig, const modeColors_t *modeColors)
{
if (!(ledConfig->flags & LED_FUNCTION_MODE)) {
return;
}
applyDirectionalModeColor(ledIndex, ledConfig, modeColors);
} }
void applyLedModeLayer(void) void applyLedModeLayer(void)
@ -280,26 +272,28 @@ void applyLedModeLayer(void)
setLedColor(ledIndex, &black); setLedColor(ledIndex, &black);
if (!(ledConfig->flags & LED_FUNCTION_MODE)) { if (!(ledConfig->flags & LED_FUNCTION_MODE)) {
if (!f.ARMED) { if (ledConfig->flags & LED_FUNCTION_ARM_STATE) {
setLedColor(ledIndex, &green); if (!f.ARMED) {
continue; setLedColor(ledIndex, &green);
} else { } else {
setLedColor(ledIndex, &black); setLedColor(ledIndex, &blue);
}
} }
continue;
} }
applyModeColor(ledIndex, ledConfig, &orientationModeColors); applyDirectionalModeColor(ledIndex, ledConfig, &orientationModeColors);
if (f.HEADFREE_MODE) { if (f.HEADFREE_MODE) {
applyModeColor(ledIndex, ledConfig, &headfreeModeColors); applyDirectionalModeColor(ledIndex, ledConfig, &headfreeModeColors);
#ifdef MAG #ifdef MAG
} else if (f.MAG_MODE) { } else if (f.MAG_MODE) {
applyModeColor(ledIndex, ledConfig, &magModeColors); applyDirectionalModeColor(ledIndex, ledConfig, &magModeColors);
#endif #endif
} else if (f.HORIZON_MODE) { } else if (f.HORIZON_MODE) {
applyModeColor(ledIndex, ledConfig, &horizonModeColors); applyDirectionalModeColor(ledIndex, ledConfig, &horizonModeColors);
} else if (f.ANGLE_MODE) { } else if (f.ANGLE_MODE) {
applyModeColor(ledIndex, ledConfig, &angleModeColors); applyDirectionalModeColor(ledIndex, ledConfig, &angleModeColors);
} }
} }
} }