lba.gitea/WLED
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Multiple changes:

Browse Source 
- added segment capabilities utility
- removed colorFromUinXX functions
- rewritten IR color handling (changeColor())
This commit is contained in:
Blaz Kristan 2022-02-10 13:24:51 +01:00
parent f6b44e03ac
commit a5b19bbc83
6 changed files with 244 additions and 257 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wled00/FX.h
View File

@ -356,6 +356,7 @@ class WS2812FX {
return d; return d;
} }
uint8_t capabilities();
} segment; } segment;
// segment runtime parameters // segment runtime parameters

31
wled00/FX_fcn.cpp
View File

@ -560,6 +560,37 @@ uint16_t WS2812FX::getLengthPhysical(void) {
return len; return len;
} }
uint8_t WS2812FX::Segment::capabilities() {
if (!isActive()) return 0;
uint8_t capabilities = 0;
uint8_t awm = Bus::getAutoWhiteMode();
bool whiteSlider = (awm == RGBW_MODE_DUAL || awm == RGBW_MODE_MANUAL_ONLY);
for (uint8_t b = 0; b < busses.getNumBusses(); b++) {
Bus *bus = busses.getBus(b);
if (bus == nullptr || bus->getLength()==0) break;
if (bus->getStart() >= stop) continue;
if (bus->getStart() + bus->getLength() <= start) continue;
uint8_t type = bus->getType();
if (!whiteSlider || (type != TYPE_ANALOG_1CH && (cctFromRgb || type != TYPE_ANALOG_2CH)))
{
capabilities |= 0x01; //segment supports RGB (full color)
}
if (bus->isRgbw()) capabilities |= 0x02; //segment supports white channel
if (whiteSlider) capabilities |= 0x08; //segment allows white channel adjustments
if (!cctFromRgb) {
switch (type) {
case TYPE_ANALOG_5CH:
case TYPE_ANALOG_2CH:
capabilities |= 0x04; //segment supports white CCT
}
}
if (correctWB && type != TYPE_ANALOG_1CH) capabilities |= 0x04; //white balance correction (uses CCT slider)
}
return capabilities;
}
bool WS2812FX::hasCCTBus(void) { bool WS2812FX::hasCCTBus(void) {
if (cctFromRgb && !correctWB) return false; if (cctFromRgb && !correctWB) return false;
for (uint8_t b = 0; b < busses.getNumBusses(); b++) { for (uint8_t b = 0; b < busses.getNumBusses(); b++) {

34
wled00/colors.cpp
View File

@ -4,40 +4,6 @@
* Color conversion methods * Color conversion methods
*/ */
void colorFromUint32(uint32_t in, bool secondary)
{
byte *_col = secondary ? colSec : col;
_col[0] = R(in);
_col[1] = G(in);
_col[2] = B(in);
_col[3] = W(in);
if (strip.applyToAllSelected) {
for (uint8_t i = 0; i < strip.getMaxSegments(); i++) {
WS2812FX::Segment& seg = strip.getSegment(i);
if (!seg.isActive() || !seg.isSelected()) continue;
seg.colors[secondary?1:0] = in;
}
}
colorChanged = true;
}
//load a color without affecting the white channel
void colorFromUint24(uint32_t in, bool secondary)
{
byte *_col = secondary ? colSec : col;
_col[0] = R(in);
_col[1] = G(in);
_col[2] = B(in);
if (strip.applyToAllSelected) {
for (uint8_t i = 0; i < strip.getMaxSegments(); i++) {
WS2812FX::Segment& seg = strip.getSegment(i);
if (!seg.isActive() || !seg.isSelected()) continue;
seg.colors[secondary?1:0] = in & 0xFFFFFF;
}
}
colorChanged = true;
}
//relatively change white brightness, minumum A=5 //relatively change white brightness, minumum A=5
void relativeChangeWhite(int8_t amount, byte lowerBoundary) void relativeChangeWhite(int8_t amount, byte lowerBoundary)
{ {

4
wled00/fcn_declare.h
View File

@ -58,8 +58,6 @@ bool getJsonValue(const JsonVariant& element, DestType& destination, const Defau
//colors.cpp //colors.cpp
void colorFromUint32(uint32_t in, bool secondary = false);
void colorFromUint24(uint32_t in, bool secondary = false);
inline uint32_t colorFromRgbw(byte* rgbw) { return uint32_t((byte(rgbw[3]) << 24) | (byte(rgbw[0]) << 16) | (byte(rgbw[1]) << 8) | (byte(rgbw[2]))); } inline uint32_t colorFromRgbw(byte* rgbw) { return uint32_t((byte(rgbw[3]) << 24) | (byte(rgbw[0]) << 16) | (byte(rgbw[1]) << 8) | (byte(rgbw[2]))); }
void relativeChangeWhite(int8_t amount, byte lowerBoundary = 0); void relativeChangeWhite(int8_t amount, byte lowerBoundary = 0);
void colorHStoRGB(uint16_t hue, byte sat, byte* rgb); //hue, sat to rgb void colorHStoRGB(uint16_t hue, byte sat, byte* rgb); //hue, sat to rgb
@ -109,8 +107,6 @@ void sendImprovRPCResponse(uint8_t commandId);
//bool decodeIRCustom(uint32_t code); //bool decodeIRCustom(uint32_t code);
void applyRepeatActions(); void applyRepeatActions();
byte relativeChange(byte property, int8_t amount, byte lowerBoundary = 0, byte higherBoundary = 0xFF); byte relativeChange(byte property, int8_t amount, byte lowerBoundary = 0, byte higherBoundary = 0xFF);
void changeEffectSpeed(int8_t amount);
void changeEffectIntensity(int8_t amount);
void decodeIR(uint32_t code); void decodeIR(uint32_t code);
void decodeIR24(uint32_t code); void decodeIR24(uint32_t code);
void decodeIR24OLD(uint32_t code); void decodeIR24OLD(uint32_t code);

384
wled00/ir.cpp
View File

@ -206,6 +206,44 @@ void changeEffectIntensity(int8_t amount)
lastRepeatableValue = amount; lastRepeatableValue = amount;
} }
void changeColor(uint32_t c, int16_t cct=-1)
{
if (strip.applyToAllSelected) {
// main segment may not be selected!
for (uint8_t i = 0; i < strip.getMaxSegments(); i++) {
WS2812FX::Segment& seg = strip.getSegment(i);
if (!seg.isActive() || !seg.isSelected()) continue;
byte capabilities = seg.capabilities();
uint32_t mask = 0;
bool isRGB = GET_BIT(capabilities, 0); // when RGBW_MODE_AUTO_ACCURATE this is always true
bool hasW = GET_BIT(capabilities, 1);
bool isCCT = GET_BIT(capabilities, 2);
if (isRGB) mask |= 0x00FFFFFF; // RGB
if (hasW) mask |= 0xFF000000; // white
if (hasW && (Bus::getAutoWhiteMode() == RGBW_MODE_AUTO_ACCURATE) && (c & 0xFF000000)) { // white channel & white specified
seg.setColor(0, c | 0xFFFFFF, i); // for accurate mode we fake white
} else if (c & mask) seg.setColor(0, c & mask, i); // only apply if not black
if (isCCT && cct >= 0) seg.setCCT(cct, i);
}
} else {
byte i = strip.getMainSegmentId();
WS2812FX::Segment& seg = strip.getSegment(i);
byte capabilities = seg.capabilities();
uint32_t mask = 0;
bool isRGB = GET_BIT(capabilities, 0);
bool hasW = GET_BIT(capabilities, 1);
bool isCCT = GET_BIT(capabilities, 2);
if (isRGB) mask |= 0x00FFFFFF; // RGB
if (hasW) mask |= 0xFF000000; // white
if (hasW && (Bus::getAutoWhiteMode() == RGBW_MODE_AUTO_ACCURATE) && (c & 0xFF000000)) { // white channel & white specified
seg.setColor(0, c | 0xFFFFFF, i); // for accurate mode we fake white
} else if (c & mask) seg.setColor(0, c & mask, i); // only apply if not black
if (isCCT && cct >= 0) seg.setCCT(cct, i);
}
setValuesFromMainSeg(); //make transitions graceful
colorChanged = true;
}
void decodeIR(uint32_t code) void decodeIR(uint32_t code)
{ {
if (code == 0xFFFFFFFF) //repeated code, continue brightness up/down if (code == 0xFFFFFFFF) //repeated code, continue brightness up/down
@ -281,30 +319,30 @@ void applyRepeatActions()
void decodeIR24(uint32_t code) void decodeIR24(uint32_t code)
{ {
switch (code) { switch (code) {
case IR24_BRIGHTER : incBrightness(); break; case IR24_BRIGHTER : incBrightness(); break;
case IR24_DARKER : decBrightness(); break; case IR24_DARKER : decBrightness(); break;
case IR24_OFF : if (bri > 0) briLast = bri; bri = 0; break; case IR24_OFF : if (bri > 0) briLast = bri; bri = 0; break;
case IR24_ON : bri = briLast; break; case IR24_ON : bri = briLast; break;
case IR24_RED : colorFromUint32(COLOR_RED); break; case IR24_RED : changeColor(COLOR_RED); break;
case IR24_REDDISH : colorFromUint32(COLOR_REDDISH); break; case IR24_REDDISH : changeColor(COLOR_REDDISH); break;
case IR24_ORANGE : colorFromUint32(COLOR_ORANGE); break; case IR24_ORANGE : changeColor(COLOR_ORANGE); break;
case IR24_YELLOWISH : colorFromUint32(COLOR_YELLOWISH); break; case IR24_YELLOWISH : changeColor(COLOR_YELLOWISH); break;
case IR24_YELLOW : colorFromUint32(COLOR_YELLOW); break; case IR24_YELLOW : changeColor(COLOR_YELLOW); break;
case IR24_GREEN : colorFromUint32(COLOR_GREEN); break; case IR24_GREEN : changeColor(COLOR_GREEN); break;
case IR24_GREENISH : colorFromUint32(COLOR_GREENISH); break; case IR24_GREENISH : changeColor(COLOR_GREENISH); break;
case IR24_TURQUOISE : colorFromUint32(COLOR_TURQUOISE); break; case IR24_TURQUOISE : changeColor(COLOR_TURQUOISE); break;
case IR24_CYAN : colorFromUint32(COLOR_CYAN); break; case IR24_CYAN : changeColor(COLOR_CYAN); break;
case IR24_AQUA : colorFromUint32(COLOR_AQUA); break; case IR24_AQUA : changeColor(COLOR_AQUA); break;
case IR24_BLUE : colorFromUint32(COLOR_BLUE); break; case IR24_BLUE : changeColor(COLOR_BLUE); break;
case IR24_DEEPBLUE : colorFromUint32(COLOR_DEEPBLUE); break; case IR24_DEEPBLUE : changeColor(COLOR_DEEPBLUE); break;
case IR24_PURPLE : colorFromUint32(COLOR_PURPLE); break; case IR24_PURPLE : changeColor(COLOR_PURPLE); break;
case IR24_MAGENTA : colorFromUint32(COLOR_MAGENTA); break; case IR24_MAGENTA : changeColor(COLOR_MAGENTA); break;
case IR24_PINK : colorFromUint32(COLOR_PINK); break; case IR24_PINK : changeColor(COLOR_PINK); break;
case IR24_WHITE : colorFromUint32(COLOR_WHITE); changeEffect(FX_MODE_STATIC); break; case IR24_WHITE : changeColor(COLOR_WHITE); changeEffect(FX_MODE_STATIC); break;
case IR24_FLASH : presetFallback(1, FX_MODE_COLORTWINKLE, effectPalette); break; case IR24_FLASH : presetFallback(1, FX_MODE_COLORTWINKLE, effectPalette); break;
case IR24_STROBE : presetFallback(2, FX_MODE_RAINBOW_CYCLE, effectPalette); break; case IR24_STROBE : presetFallback(2, FX_MODE_RAINBOW_CYCLE, effectPalette); break;
case IR24_FADE : presetFallback(3, FX_MODE_BREATH, effectPalette); break; case IR24_FADE : presetFallback(3, FX_MODE_BREATH, effectPalette); break;
case IR24_SMOOTH : presetFallback(4, FX_MODE_RAINBOW, effectPalette); break; case IR24_SMOOTH : presetFallback(4, FX_MODE_RAINBOW, effectPalette); break;
default: return; default: return;
} }
lastValidCode = code; lastValidCode = code;
@ -313,30 +351,30 @@ void decodeIR24(uint32_t code)
void decodeIR24OLD(uint32_t code) void decodeIR24OLD(uint32_t code)
{ {
switch (code) { switch (code) {
case IR24_OLD_BRIGHTER : incBrightness(); break; case IR24_OLD_BRIGHTER : incBrightness(); break;
case IR24_OLD_DARKER : decBrightness(); break; case IR24_OLD_DARKER : decBrightness(); break;
case IR24_OLD_OFF : if (bri > 0) briLast = bri; bri = 0; break; case IR24_OLD_OFF : if (bri > 0) briLast = bri; bri = 0; break;
case IR24_OLD_ON : bri = briLast; break; case IR24_OLD_ON : bri = briLast; break;
case IR24_OLD_RED : colorFromUint32(COLOR_RED); break; case IR24_OLD_RED : changeColor(COLOR_RED); break;
case IR24_OLD_REDDISH : colorFromUint32(COLOR_REDDISH); break; case IR24_OLD_REDDISH : changeColor(COLOR_REDDISH); break;
case IR24_OLD_ORANGE : colorFromUint32(COLOR_ORANGE); break; case IR24_OLD_ORANGE : changeColor(COLOR_ORANGE); break;
case IR24_OLD_YELLOWISH : colorFromUint32(COLOR_YELLOWISH); break; case IR24_OLD_YELLOWISH : changeColor(COLOR_YELLOWISH); break;
case IR24_OLD_YELLOW : colorFromUint32(COLOR_YELLOW); break; case IR24_OLD_YELLOW : changeColor(COLOR_YELLOW); break;
case IR24_OLD_GREEN : colorFromUint32(COLOR_GREEN); break; case IR24_OLD_GREEN : changeColor(COLOR_GREEN); break;
case IR24_OLD_GREENISH : colorFromUint32(COLOR_GREENISH); break; case IR24_OLD_GREENISH : changeColor(COLOR_GREENISH); break;
case IR24_OLD_TURQUOISE : colorFromUint32(COLOR_TURQUOISE); break; case IR24_OLD_TURQUOISE : changeColor(COLOR_TURQUOISE); break;
case IR24_OLD_CYAN : colorFromUint32(COLOR_CYAN); break; case IR24_OLD_CYAN : changeColor(COLOR_CYAN); break;
case IR24_OLD_AQUA : colorFromUint32(COLOR_AQUA); break; case IR24_OLD_AQUA : changeColor(COLOR_AQUA); break;
case IR24_OLD_BLUE : colorFromUint32(COLOR_BLUE); break; case IR24_OLD_BLUE : changeColor(COLOR_BLUE); break;
case IR24_OLD_DEEPBLUE : colorFromUint32(COLOR_DEEPBLUE); break; case IR24_OLD_DEEPBLUE : changeColor(COLOR_DEEPBLUE); break;
case IR24_OLD_PURPLE : colorFromUint32(COLOR_PURPLE); break; case IR24_OLD_PURPLE : changeColor(COLOR_PURPLE); break;
case IR24_OLD_MAGENTA : colorFromUint32(COLOR_MAGENTA); break; case IR24_OLD_MAGENTA : changeColor(COLOR_MAGENTA); break;
case IR24_OLD_PINK : colorFromUint32(COLOR_PINK); break; case IR24_OLD_PINK : changeColor(COLOR_PINK); break;
case IR24_OLD_WHITE : colorFromUint32(COLOR_WHITE); changeEffect(FX_MODE_STATIC); break; case IR24_OLD_WHITE : changeColor(COLOR_WHITE); changeEffect(FX_MODE_STATIC); break;
case IR24_OLD_FLASH : presetFallback(1, FX_MODE_COLORTWINKLE, 0); break; case IR24_OLD_FLASH : presetFallback(1, FX_MODE_COLORTWINKLE, 0); break;
case IR24_OLD_STROBE : presetFallback(2, FX_MODE_RAINBOW_CYCLE, 0); break; case IR24_OLD_STROBE : presetFallback(2, FX_MODE_RAINBOW_CYCLE, 0); break;
case IR24_OLD_FADE : presetFallback(3, FX_MODE_BREATH, 0); break; case IR24_OLD_FADE : presetFallback(3, FX_MODE_BREATH, 0); break;
case IR24_OLD_SMOOTH : presetFallback(4, FX_MODE_RAINBOW, 0); break; case IR24_OLD_SMOOTH : presetFallback(4, FX_MODE_RAINBOW, 0); break;
default: return; default: return;
} }
lastValidCode = code; lastValidCode = code;
@ -345,30 +383,30 @@ void decodeIR24OLD(uint32_t code)
void decodeIR24CT(uint32_t code) void decodeIR24CT(uint32_t code)
{ {
switch (code) { switch (code) {
case IR24_CT_BRIGHTER : incBrightness(); break; case IR24_CT_BRIGHTER : incBrightness(); break;
case IR24_CT_DARKER : decBrightness(); break; case IR24_CT_DARKER : decBrightness(); break;
case IR24_CT_OFF : if (bri > 0) briLast = bri; bri = 0; break; case IR24_CT_OFF : if (bri > 0) briLast = bri; bri = 0; break;
case IR24_CT_ON : bri = briLast; break; case IR24_CT_ON : bri = briLast; break;
case IR24_CT_RED : colorFromUint32(COLOR_RED); break; case IR24_CT_RED : changeColor(COLOR_RED); break;
case IR24_CT_REDDISH : colorFromUint32(COLOR_REDDISH); break; case IR24_CT_REDDISH : changeColor(COLOR_REDDISH); break;
case IR24_CT_ORANGE : colorFromUint32(COLOR_ORANGE); break; case IR24_CT_ORANGE : changeColor(COLOR_ORANGE); break;
case IR24_CT_YELLOWISH : colorFromUint32(COLOR_YELLOWISH); break; case IR24_CT_YELLOWISH : changeColor(COLOR_YELLOWISH); break;
case IR24_CT_YELLOW : colorFromUint32(COLOR_YELLOW); break; case IR24_CT_YELLOW : changeColor(COLOR_YELLOW); break;
case IR24_CT_GREEN : colorFromUint32(COLOR_GREEN); break; case IR24_CT_GREEN : changeColor(COLOR_GREEN); break;
case IR24_CT_GREENISH : colorFromUint32(COLOR_GREENISH); break; case IR24_CT_GREENISH : changeColor(COLOR_GREENISH); break;
case IR24_CT_TURQUOISE : colorFromUint32(COLOR_TURQUOISE); break; case IR24_CT_TURQUOISE : changeColor(COLOR_TURQUOISE); break;
case IR24_CT_CYAN : colorFromUint32(COLOR_CYAN); break; case IR24_CT_CYAN : changeColor(COLOR_CYAN); break;
case IR24_CT_AQUA : colorFromUint32(COLOR_AQUA); break; case IR24_CT_AQUA : changeColor(COLOR_AQUA); break;
case IR24_CT_BLUE : colorFromUint32(COLOR_BLUE); break; case IR24_CT_BLUE : changeColor(COLOR_BLUE); break;
case IR24_CT_DEEPBLUE : colorFromUint32(COLOR_DEEPBLUE); break; case IR24_CT_DEEPBLUE : changeColor(COLOR_DEEPBLUE); break;
case IR24_CT_PURPLE : colorFromUint32(COLOR_PURPLE); break; case IR24_CT_PURPLE : changeColor(COLOR_PURPLE); break;
case IR24_CT_MAGENTA : colorFromUint32(COLOR_MAGENTA); break; case IR24_CT_MAGENTA : changeColor(COLOR_MAGENTA); break;
case IR24_CT_PINK : colorFromUint32(COLOR_PINK); break; case IR24_CT_PINK : changeColor(COLOR_PINK); break;
case IR24_CT_COLDWHITE : colorFromUint32(COLOR2_COLDWHITE); changeEffect(FX_MODE_STATIC); break; case IR24_CT_COLDWHITE : changeColor(COLOR_COLDWHITE2, 255); changeEffect(FX_MODE_STATIC); break;
case IR24_CT_WARMWHITE : colorFromUint32(COLOR2_WARMWHITE); changeEffect(FX_MODE_STATIC); break; case IR24_CT_WARMWHITE : changeColor(COLOR_WARMWHITE2, 0); changeEffect(FX_MODE_STATIC); break;
case IR24_CT_CTPLUS : colorFromUint32(COLOR2_COLDWHITE2); changeEffect(FX_MODE_STATIC); break; case IR24_CT_CTPLUS : changeColor(COLOR_COLDWHITE, strip.getSegment(strip.getMainSegmentId()).cct+1); changeEffect(FX_MODE_STATIC); break;
case IR24_CT_CTMINUS : colorFromUint32(COLOR2_WARMWHITE2); changeEffect(FX_MODE_STATIC); break; case IR24_CT_CTMINUS : changeColor(COLOR_WARMWHITE, strip.getSegment(strip.getMainSegmentId()).cct-1); changeEffect(FX_MODE_STATIC); break;
case IR24_CT_MEMORY : colorFromUint32(COLOR2_NEUTRALWHITE); changeEffect(FX_MODE_STATIC); break; case IR24_CT_MEMORY : changeColor(COLOR_NEUTRALWHITE, 127); changeEffect(FX_MODE_STATIC); break;
default: return; default: return;
} }
lastValidCode = code; lastValidCode = code;
@ -381,46 +419,26 @@ void decodeIR40(uint32_t code)
case IR40_BMINUS : decBrightness(); break; case IR40_BMINUS : decBrightness(); break;
case IR40_OFF : if (bri > 0) briLast = bri; bri = 0; break; case IR40_OFF : if (bri > 0) briLast = bri; bri = 0; break;
case IR40_ON : bri = briLast; break; case IR40_ON : bri = briLast; break;
case IR40_RED : colorFromUint24(COLOR_RED); break; case IR40_RED : changeColor(COLOR_RED); break;
case IR40_REDDISH : colorFromUint24(COLOR_REDDISH); break; case IR40_REDDISH : changeColor(COLOR_REDDISH); break;
case IR40_ORANGE : colorFromUint24(COLOR_ORANGE); break; case IR40_ORANGE : changeColor(COLOR_ORANGE); break;
case IR40_YELLOWISH : colorFromUint24(COLOR_YELLOWISH); break; case IR40_YELLOWISH : changeColor(COLOR_YELLOWISH); break;
case IR40_YELLOW : colorFromUint24(COLOR_YELLOW); break; case IR40_YELLOW : changeColor(COLOR_YELLOW); break;
case IR40_GREEN : colorFromUint24(COLOR_GREEN); break; case IR40_GREEN : changeColor(COLOR_GREEN); break;
case IR40_GREENISH : colorFromUint24(COLOR_GREENISH); break; case IR40_GREENISH : changeColor(COLOR_GREENISH); break;
case IR40_TURQUOISE : colorFromUint24(COLOR_TURQUOISE); break; case IR40_TURQUOISE : changeColor(COLOR_TURQUOISE); break;
case IR40_CYAN : colorFromUint24(COLOR_CYAN); break; case IR40_CYAN : changeColor(COLOR_CYAN); break;
case IR40_AQUA : colorFromUint24(COLOR_AQUA); break; case IR40_AQUA : changeColor(COLOR_AQUA); break;
case IR40_BLUE : colorFromUint24(COLOR_BLUE); break; case IR40_BLUE : changeColor(COLOR_BLUE); break;
case IR40_DEEPBLUE : colorFromUint24(COLOR_DEEPBLUE); break; case IR40_DEEPBLUE : changeColor(COLOR_DEEPBLUE); break;
case IR40_PURPLE : colorFromUint24(COLOR_PURPLE); break; case IR40_PURPLE : changeColor(COLOR_PURPLE); break;
case IR40_MAGENTA : colorFromUint24(COLOR_MAGENTA); break; case IR40_MAGENTA : changeColor(COLOR_MAGENTA); break;
case IR40_PINK : colorFromUint24(COLOR_PINK); break; case IR40_PINK : changeColor(COLOR_PINK); break;
case IR40_WARMWHITE2 : case IR40_WARMWHITE2 : changeColor(COLOR_WARMWHITE2, 0); changeEffect(FX_MODE_STATIC); break;
if (strip.hasWhiteChannel()) colorFromUint32(COLOR2_WARMWHITE2); case IR40_WARMWHITE : changeColor(COLOR_WARMWHITE, 63); changeEffect(FX_MODE_STATIC); break;
else colorFromUint24(COLOR_WARMWHITE2); case IR40_WHITE : changeColor(COLOR_NEUTRALWHITE, 127); changeEffect(FX_MODE_STATIC); break;
changeEffect(FX_MODE_STATIC); case IR40_COLDWHITE : changeColor(COLOR_COLDWHITE, 191); changeEffect(FX_MODE_STATIC); break;
break; case IR40_COLDWHITE2 : changeColor(COLOR_COLDWHITE2, 255); changeEffect(FX_MODE_STATIC); break;
case IR40_WARMWHITE :
if (strip.hasWhiteChannel()) colorFromUint32(COLOR2_WARMWHITE);
else colorFromUint24(COLOR_WARMWHITE);
changeEffect(FX_MODE_STATIC);
break;
case IR40_WHITE :
if (strip.hasWhiteChannel()) colorFromUint32(COLOR2_NEUTRALWHITE);
else colorFromUint24(COLOR_NEUTRALWHITE);
changeEffect(FX_MODE_STATIC);
break;
case IR40_COLDWHITE :
if (strip.hasWhiteChannel()) colorFromUint32(COLOR2_COLDWHITE);
else colorFromUint24(COLOR_COLDWHITE);
changeEffect(FX_MODE_STATIC);
break;
case IR40_COLDWHITE2 :
if (strip.hasWhiteChannel()) colorFromUint32(COLOR2_COLDWHITE2);
else colorFromUint24(COLOR_COLDWHITE2);
changeEffect(FX_MODE_STATIC);
break;
case IR40_WPLUS : relativeChangeWhite(10); break; case IR40_WPLUS : relativeChangeWhite(10); break;
case IR40_WMINUS : relativeChangeWhite(-10, 5); break; case IR40_WMINUS : relativeChangeWhite(-10, 5); break;
case IR40_WOFF : whiteLast = col[3]; col[3] = 0; break; case IR40_WOFF : whiteLast = col[3]; col[3] = 0; break;
@ -445,51 +463,31 @@ void decodeIR40(uint32_t code)
void decodeIR44(uint32_t code) void decodeIR44(uint32_t code)
{ {
switch (code) { switch (code) {
case IR44_BPLUS : incBrightness(); break; case IR44_BPLUS : incBrightness(); break;
case IR44_BMINUS : decBrightness(); break; case IR44_BMINUS : decBrightness(); break;
case IR44_OFF : if (bri > 0) briLast = bri; bri = 0; break; case IR44_OFF : if (bri > 0) briLast = bri; bri = 0; break;
case IR44_ON : bri = briLast; break; case IR44_ON : bri = briLast; break;
case IR44_RED : colorFromUint24(COLOR_RED); break; case IR44_RED : changeColor(COLOR_RED); break;
case IR44_REDDISH : colorFromUint24(COLOR_REDDISH); break; case IR44_REDDISH : changeColor(COLOR_REDDISH); break;
case IR44_ORANGE : colorFromUint24(COLOR_ORANGE); break; case IR44_ORANGE : changeColor(COLOR_ORANGE); break;
case IR44_YELLOWISH : colorFromUint24(COLOR_YELLOWISH); break; case IR44_YELLOWISH : changeColor(COLOR_YELLOWISH); break;
case IR44_YELLOW : colorFromUint24(COLOR_YELLOW); break; case IR44_YELLOW : changeColor(COLOR_YELLOW); break;
case IR44_GREEN : colorFromUint24(COLOR_GREEN); break; case IR44_GREEN : changeColor(COLOR_GREEN); break;
case IR44_GREENISH : colorFromUint24(COLOR_GREENISH); break; case IR44_GREENISH : changeColor(COLOR_GREENISH); break;
case IR44_TURQUOISE : colorFromUint24(COLOR_TURQUOISE); break; case IR44_TURQUOISE : changeColor(COLOR_TURQUOISE); break;
case IR44_CYAN : colorFromUint24(COLOR_CYAN); break; case IR44_CYAN : changeColor(COLOR_CYAN); break;
case IR44_AQUA : colorFromUint24(COLOR_AQUA); break; case IR44_AQUA : changeColor(COLOR_AQUA); break;
case IR44_BLUE : colorFromUint24(COLOR_BLUE); break; case IR44_BLUE : changeColor(COLOR_BLUE); break;
case IR44_DEEPBLUE : colorFromUint24(COLOR_DEEPBLUE); break; case IR44_DEEPBLUE : changeColor(COLOR_DEEPBLUE); break;
case IR44_PURPLE : colorFromUint24(COLOR_PURPLE); break; case IR44_PURPLE : changeColor(COLOR_PURPLE); break;
case IR44_MAGENTA : colorFromUint24(COLOR_MAGENTA); break; case IR44_MAGENTA : changeColor(COLOR_MAGENTA); break;
case IR44_PINK : colorFromUint24(COLOR_PINK); break; case IR44_PINK : changeColor(COLOR_PINK); break;
case IR44_WHITE : case IR44_WHITE : changeColor(COLOR_NEUTRALWHITE, 127); changeEffect(FX_MODE_STATIC); break;
if (strip.hasWhiteChannel()) colorFromUint32(COLOR2_NEUTRALWHITE); case IR44_WARMWHITE2 : changeColor(COLOR_WARMWHITE2, 0); changeEffect(FX_MODE_STATIC); break;
else colorFromUint24(COLOR_NEUTRALWHITE); case IR44_WARMWHITE : changeColor(COLOR_WARMWHITE, 63); changeEffect(FX_MODE_STATIC); break;
changeEffect(FX_MODE_STATIC); case IR44_COLDWHITE : changeColor(COLOR_COLDWHITE, 191); changeEffect(FX_MODE_STATIC); break;
break; case IR44_COLDWHITE2 : changeColor(COLOR_COLDWHITE2, 255); changeEffect(FX_MODE_STATIC); break;
case IR44_WARMWHITE2 : case IR44_REDPLUS : changeEffect(relativeChange(effectCurrent, 1, 0, MODE_COUNT -1)); break;
if (strip.hasWhiteChannel()) colorFromUint32(COLOR2_WARMWHITE2);
else colorFromUint24(COLOR_WARMWHITE2);
changeEffect(FX_MODE_STATIC);
break;
case IR44_WARMWHITE :
if (strip.hasWhiteChannel()) colorFromUint32(COLOR2_WARMWHITE);
else colorFromUint24(COLOR_WARMWHITE);
changeEffect(FX_MODE_STATIC);
break;
case IR44_COLDWHITE :
if (strip.hasWhiteChannel()) colorFromUint32(COLOR2_COLDWHITE);
else colorFromUint24(COLOR_COLDWHITE);
changeEffect(FX_MODE_STATIC);
break;
case IR44_COLDWHITE2 :
if (strip.hasWhiteChannel()) colorFromUint32(COLOR2_COLDWHITE2);
else colorFromUint24(COLOR_COLDWHITE2);
changeEffect(FX_MODE_STATIC);
break;
case IR44_REDPLUS : changeEffect(relativeChange(effectCurrent, 1, 0, MODE_COUNT -1)); break;
case IR44_REDMINUS : changeEffect(relativeChange(effectCurrent, -1, 0, MODE_COUNT -1)); break; case IR44_REDMINUS : changeEffect(relativeChange(effectCurrent, -1, 0, MODE_COUNT -1)); break;
case IR44_GREENPLUS : changePalette(relativeChange(effectPalette, 1, 0, strip.getPaletteCount() -1)); break; case IR44_GREENPLUS : changePalette(relativeChange(effectPalette, 1, 0, strip.getPaletteCount() -1)); break;
case IR44_GREENMINUS : changePalette(relativeChange(effectPalette, -1, 0, strip.getPaletteCount() -1)); break; case IR44_GREENMINUS : changePalette(relativeChange(effectPalette, -1, 0, strip.getPaletteCount() -1)); break;
@ -517,27 +515,27 @@ void decodeIR44(uint32_t code)
void decodeIR21(uint32_t code) void decodeIR21(uint32_t code)
{ {
switch (code) { switch (code) {
case IR21_BRIGHTER: incBrightness(); break; case IR21_BRIGHTER: incBrightness(); break;
case IR21_DARKER: decBrightness(); break; case IR21_DARKER: decBrightness(); break;
case IR21_OFF: if (bri > 0) briLast = bri; bri = 0; break; case IR21_OFF: if (bri > 0) briLast = bri; bri = 0; break;
case IR21_ON: bri = briLast; break; case IR21_ON: bri = briLast; break;
case IR21_RED: colorFromUint32(COLOR_RED); break; case IR21_RED: changeColor(COLOR_RED); break;
case IR21_REDDISH: colorFromUint32(COLOR_REDDISH); break; case IR21_REDDISH: changeColor(COLOR_REDDISH); break;
case IR21_ORANGE: colorFromUint32(COLOR_ORANGE); break; case IR21_ORANGE: changeColor(COLOR_ORANGE); break;
case IR21_YELLOWISH: colorFromUint32(COLOR_YELLOWISH); break; case IR21_YELLOWISH: changeColor(COLOR_YELLOWISH); break;
case IR21_GREEN: colorFromUint32(COLOR_GREEN); break; case IR21_GREEN: changeColor(COLOR_GREEN); break;
case IR21_GREENISH: colorFromUint32(COLOR_GREENISH); break; case IR21_GREENISH: changeColor(COLOR_GREENISH); break;
case IR21_TURQUOISE: colorFromUint32(COLOR_TURQUOISE); break; case IR21_TURQUOISE: changeColor(COLOR_TURQUOISE); break;
case IR21_CYAN: colorFromUint32(COLOR_CYAN); break; case IR21_CYAN: changeColor(COLOR_CYAN); break;
case IR21_BLUE: colorFromUint32(COLOR_BLUE); break; case IR21_BLUE: changeColor(COLOR_BLUE); break;
case IR21_DEEPBLUE: colorFromUint32(COLOR_DEEPBLUE); break; case IR21_DEEPBLUE: changeColor(COLOR_DEEPBLUE); break;
case IR21_PURPLE: colorFromUint32(COLOR_PURPLE); break; case IR21_PURPLE: changeColor(COLOR_PURPLE); break;
case IR21_PINK: colorFromUint32(COLOR_PINK); break; case IR21_PINK: changeColor(COLOR_PINK); break;
case IR21_WHITE: colorFromUint32(COLOR_WHITE); changeEffect(FX_MODE_STATIC); break; case IR21_WHITE: changeColor(COLOR_WHITE); changeEffect(FX_MODE_STATIC); break;
case IR21_FLASH: presetFallback(1, FX_MODE_COLORTWINKLE, 0); break; case IR21_FLASH: presetFallback(1, FX_MODE_COLORTWINKLE, 0); break;
case IR21_STROBE: presetFallback(2, FX_MODE_RAINBOW_CYCLE, 0); break; case IR21_STROBE: presetFallback(2, FX_MODE_RAINBOW_CYCLE, 0); break;
case IR21_FADE: presetFallback(3, FX_MODE_BREATH, 0); break; case IR21_FADE: presetFallback(3, FX_MODE_BREATH, 0); break;
case IR21_SMOOTH: presetFallback(4, FX_MODE_RAINBOW, 0); break; case IR21_SMOOTH: presetFallback(4, FX_MODE_RAINBOW, 0); break;
default: return; default: return;
} }
lastValidCode = code; lastValidCode = code;
@ -552,25 +550,25 @@ void decodeIR6(uint32_t code)
case IR6_VOLUME_UP: changeEffect(relativeChange(effectCurrent, 1, 0, MODE_COUNT -1)); break; case IR6_VOLUME_UP: changeEffect(relativeChange(effectCurrent, 1, 0, MODE_COUNT -1)); break;
case IR6_VOLUME_DOWN: changePalette(relativeChange(effectPalette, 1, 0, strip.getPaletteCount() -1)); case IR6_VOLUME_DOWN: changePalette(relativeChange(effectPalette, 1, 0, strip.getPaletteCount() -1));
switch(lastIR6ColourIdx) { switch(lastIR6ColourIdx) {
case 0: colorFromUint32(COLOR_RED); break; case 0: changeColor(COLOR_RED); break;
case 1: colorFromUint32(COLOR_REDDISH); break; case 1: changeColor(COLOR_REDDISH); break;
case 2: colorFromUint32(COLOR_ORANGE); break; case 2: changeColor(COLOR_ORANGE); break;
case 3: colorFromUint32(COLOR_YELLOWISH); break; case 3: changeColor(COLOR_YELLOWISH); break;
case 4: colorFromUint32(COLOR_GREEN); break; case 4: changeColor(COLOR_GREEN); break;
case 5: colorFromUint32(COLOR_GREENISH); break; case 5: changeColor(COLOR_GREENISH); break;
case 6: colorFromUint32(COLOR_TURQUOISE); break; case 6: changeColor(COLOR_TURQUOISE); break;
case 7: colorFromUint32(COLOR_CYAN); break; case 7: changeColor(COLOR_CYAN); break;
case 8: colorFromUint32(COLOR_BLUE); break; case 8: changeColor(COLOR_BLUE); break;
case 9: colorFromUint32(COLOR_DEEPBLUE); break; case 9: changeColor(COLOR_DEEPBLUE); break;
case 10:colorFromUint32(COLOR_PURPLE); break; case 10:changeColor(COLOR_PURPLE); break;
case 11:colorFromUint32(COLOR_PINK); break; case 11:changeColor(COLOR_PINK); break;
case 12:colorFromUint32(COLOR_WHITE); break; case 12:changeColor(COLOR_WHITE); break;
default: break; default: break;
} }
lastIR6ColourIdx++; lastIR6ColourIdx++;
if(lastIR6ColourIdx > 12) lastIR6ColourIdx = 0; if(lastIR6ColourIdx > 12) lastIR6ColourIdx = 0;
break; break;
case IR6_MUTE: changeEffect(FX_MODE_STATIC); changePalette(0); colorFromUint32(COLOR_WHITE); bri=255; break; case IR6_MUTE: changeEffect(FX_MODE_STATIC); changePalette(0); changeColor(COLOR_WHITE); bri=255; break;
default: return; default: return;
} }
lastValidCode = code; lastValidCode = code;

47
wled00/ir_codes.h
View File

@ -212,32 +212,27 @@
#define IR21_FADE 0xFF02FD #define IR21_FADE 0xFF02FD
#define IR21_SMOOTH 0xFFC23D #define IR21_SMOOTH 0xFFC23D
#define COLOR_RED 0xFF0000 #define COLOR_RED 0xFF0000
#define COLOR_REDDISH 0xFF7800 #define COLOR_REDDISH 0xFF7800
#define COLOR_ORANGE 0xFFA000 #define COLOR_ORANGE 0xFFA000
#define COLOR_YELLOWISH 0xFFC800 #define COLOR_YELLOWISH 0xFFC800
#define COLOR_YELLOW 0xFFFF00 #define COLOR_YELLOW 0xFFFF00
#define COLOR_GREEN 0x00FF00 #define COLOR_GREEN 0x00FF00
#define COLOR_GREENISH 0x00FF78 #define COLOR_GREENISH 0x00FF78
#define COLOR_TURQUOISE 0x00FFA0 #define COLOR_TURQUOISE 0x00FFA0
#define COLOR_CYAN 0x00FFDC #define COLOR_CYAN 0x00FFDC
#define COLOR_AQUA 0x00C8FF #define COLOR_AQUA 0x00C8FF
#define COLOR_BLUE 0x00A0FF #define COLOR_BLUE 0x00A0FF
#define COLOR_DEEPBLUE 0x0000FF #define COLOR_DEEPBLUE 0x0000FF
#define COLOR_PURPLE 0xAA00FF #define COLOR_PURPLE 0xAA00FF
#define COLOR_MAGENTA 0xFF00DC #define COLOR_MAGENTA 0xFF00DC
#define COLOR_PINK 0xFF00A0 #define COLOR_PINK 0xFF00A0
#define COLOR_WHITE 0xFFFFDC #define COLOR_WHITE 0xFFFFFFFF
#define COLOR_WARMWHITE2 0xFFAA69 #define COLOR_WARMWHITE2 0xFFFFAA69
#define COLOR_WARMWHITE 0xFFBF8E #define COLOR_WARMWHITE 0xFFFFBF8E
#define COLOR_NEUTRALWHITE 0xFFD4B4 #define COLOR_NEUTRALWHITE 0xFFFFD4B4
#define COLOR_COLDWHITE 0xFFE9D9 #define COLOR_COLDWHITE 0xFFFFE9D9
#define COLOR_COLDWHITE2 0xFFFFFF #define COLOR_COLDWHITE2 0xFFFFFFFF
#define COLOR2_WARMWHITE2 0xFFFFAA69
#define COLOR2_WARMWHITE 0xFFFFBF8E
#define COLOR2_NEUTRALWHITE 0xFFFFD4B4
#define COLOR2_COLDWHITE 0xFFFFE9D9
#define COLOR2_COLDWHITE2 0xFFFFFFFF
#define ACTION_NONE 0 #define ACTION_NONE 0
#define ACTION_BRIGHT_UP 1 #define ACTION_BRIGHT_UP 1