feedc0de/FastLED-idf
1
0
Fork 0
forked from bbulkow/FastLED-idf
Code Pull Requests Activity

Make a few little things easier to read

Browse Source
This commit is contained in:
Brian Bulkowski
2020-09-21 14:28:40 -07:00
parent 89a419b1c9
commit ad1bb2a9f3
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
components/WS2812FX-idf/FX_fcn.cpp
View File

@@ -307,12 +307,14 @@ uint8_t WS2812FX::getPaletteCount()
bool WS2812FX::setEffectConfig(uint8_t m, uint8_t s, uint8_t in, uint8_t p) { bool WS2812FX::setEffectConfig(uint8_t m, uint8_t s, uint8_t in, uint8_t p) {
uint8_t mainSeg = getMainSegmentId(); uint8_t mainSeg = getMainSegmentId();
Segment& seg = _segments[getMainSegmentId()]; Segment& seg = _segments[getMainSegmentId()];
uint8_t modePrev = seg.mode, speedPrev = seg.speed, intensityPrev = seg.intensity, palettePrev = seg.palette; uint8_t modePrev = seg.mode, speedPrev = seg.speed, intensityPrev = seg.intensity, palettePrev = seg.palette;
bool applied = false; bool applied = false;
// compile defined as true in FX.h
if (applyToAllSelected) if (applyToAllSelected)
{ {
for (uint8_t i = 0; i < MAX_NUM_SEGMENTS; i++) for (uint8_t i = 0; i < MAX_NUM_SEGMENTS; i++)
@@ -328,14 +330,21 @@ bool WS2812FX::setEffectConfig(uint8_t m, uint8_t s, uint8_t in, uint8_t p) {
} }
} }
if (!applyToAllSelected || !applied) { // compiler is claiming this could never be true. Not suer why so leaving the warning
if ( (!applyToAllSelected) || (!applied) ) {
seg.speed = s; seg.speed = s;
seg.intensity = in; seg.intensity = in;
seg.palette = p; seg.palette = p;
setMode(mainSegment, m); setMode(mainSegment, m);
} }
if (seg.mode != modePrev || seg.speed != speedPrev || seg.intensity != intensityPrev || seg.palette != palettePrev) return true; // anything changed?
if (seg.mode != modePrev ||
seg.speed != speedPrev ||
seg.intensity != intensityPrev ||
seg.palette != palettePrev)
return true;
return false; return false;
} }
@@ -720,7 +729,7 @@ CRGB WS2812FX::col_to_crgb(uint32_t color)
void WS2812FX::load_gradient_palette(uint8_t index) void WS2812FX::load_gradient_palette(uint8_t index)
{ {
uint8_t i = ArduinoConstrain(index, 0, GRADIENT_PALETTE_COUNT -1); uint8_t i = index > (GRADIENT_PALETTE_COUNT - 1) ? index : (GRADIENT_PALETTE_COUNT - 1);
uint8_t tcp[72]; //support gradient palettes with up to 18 entries uint8_t tcp[72]; //support gradient palettes with up to 18 entries
memcpy(tcp, &(gGradientPalettes[i]), 72); memcpy(tcp, &(gGradientPalettes[i]), 72);
targetPalette.loadDynamicGradientPalette(tcp); targetPalette.loadDynamicGradientPalette(tcp);