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

Move colors from ram to master config. Initialise colors only when

Browse source 
config is reset to defaults.
This commit is contained in:
Dominic Clifton 2014-09-18 22:53:12 +01:00
parent 79ea1ac088
commit 545980c14a
9 changed files with 26 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -54,6 +54,8 @@ static failsafe_t* failsafe;
#error "Led strip length must match driver"
#endif
static hsvColor_t *colors;
//#define USE_LED_ANIMATION
// H S V
@ -89,10 +91,6 @@ const hsvColor_t hsv_deepPink = LED_DEEP_PINK;
#define LED_DIRECTION_COUNT 6
#define CONFIGURABLE_COLOR_COUNT 16
hsvColor_t colors[CONFIGURABLE_COLOR_COUNT];
const hsvColor_t * const defaultColors[] = {
&hsv_black,
&hsv_white,
@ -110,8 +108,6 @@ const hsvColor_t * const defaultColors[] = {
&hsv_deepPink
};
typedef enum {
COLOR_BLACK = 0,
COLOR_WHITE,
@ -760,12 +756,11 @@ void updateLedStrip(void)
ws2811UpdateStrip();
}
void applyDefaultColors()
void applyDefaultColors(hsvColor_t *colors, uint8_t colorCount)
{
hsvColor_t *colorConfig = colors;
memset(colorConfig, 0, CONFIGURABLE_COLOR_COUNT * sizeof(colorConfig));
for (uint8_t colorIndex = 0; colorIndex < CONFIGURABLE_COLOR_COUNT && colorIndex < (sizeof(defaultColors) / sizeof(defaultColors[0])); colorIndex++) {
*colorConfig++ = *defaultColors[colorIndex];
memset(colors, 0, colorCount * sizeof(colors));
for (uint8_t colorIndex = 0; colorIndex < colorCount && colorIndex < (sizeof(defaultColors) / sizeof(defaultColors[0])); colorIndex++) {
*colors++ = *defaultColors[colorIndex];
}
}
@ -777,13 +772,12 @@ void applyDefaultLedStripConfig(ledConfig_t *ledConfigs)
reevalulateLedConfig();
}
void ledStripInit(ledConfig_t *ledConfigsToUse, failsafe_t* failsafeToUse)
void ledStripInit(ledConfig_t *ledConfigsToUse, hsvColor_t *colorsToUse, failsafe_t* failsafeToUse)
{
ledConfigs = ledConfigsToUse;
colors = colorsToUse;
failsafe = failsafeToUse;
applyDefaultColors();
reevalulateLedConfig();
ledStripInitialised = true;
}