Jan/WLED_MM_Infinity
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

NetDebug fix and small changes

Browse Source 
AudioReactive: show ☾ specific
IR: cleanup
json.cpp: bugfix: NetDebug not in presets
wled.cpp and wled_server.cpp: show servername in DEBUG INFO
This commit is contained in:
Ewoud
2023-03-22 16:31:07 +01:00
parent 78f55bce70
commit d452da2642
6 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
wled00/ir.cpp
View File

@@ -611,7 +611,7 @@ void decodeIR9(uint32_t code)
lastValidCode = code;
}
//WLEDMM
//WLEDMM and Athom
void decodeIR24MC(uint32_t code)
{
bool isSolid = strip.getMainSegment().mode==0;
@@ -620,8 +620,8 @@ void decodeIR24MC(uint32_t code)
case IR24_MC_OFF : if (bri > 0) briLast = bri; bri = 0; break;
case IR24_MC_AUTO : changeEffect(FX_MODE_FADE); break;
case IR24_MC_ON : bri = briLast; break;
case IR24_MC_MODES : changeEffect(relativeChange(effectCurrent, 1, 0, strip.getModeCount() -1)); break;
case IR24_MC_MODE : changeEffect(relativeChange(effectCurrent, -1, 0, strip.getModeCount() -1)); break;
case IR24_MC_MODES : changeEffect(relativeChange(effectCurrent, 1, 0, strip.getModeCount() -1)); break; //WLEDMM: sound and non sound modes
case IR24_MC_MODE : changeEffect(relativeChange(effectCurrent, -1, 0, strip.getModeCount() -1)); break; //WLEDMM: sound and non sound modes
case IR24_MC_BRIGHTER : incBrightness(); break;
case IR24_MC_DARKER : decBrightness(); break;
case IR24_MC_QUICK : changeEffectSpeed( 16); break;
@@ -629,15 +629,16 @@ void decodeIR24MC(uint32_t code)
case IR24_MC_RED : changeColor(COLOR_RED); break;
case IR24_MC_GREEN : changeColor(COLOR_GREEN); break;
case IR24_MC_BLUE : changeColor(COLOR_BLUE); break;
case IR24_MC_R1 : isSolid?changeColor(COLOR_YELLOW):presetFallback(1, strip.isMatrix?FX_MODE_2DAKEMI:FX_MODE_PIXELS, effectPalette); break;
case IR24_MC_G1 : isSolid?changeColor(COLOR_DoderBlue):presetFallback(2, strip.isMatrix?FX_MODE_2DWAVERLY:FX_MODE_GRAVIMETER, effectPalette); break;
case IR24_MC_B1 : isSolid?changeColor(COLOR_Indigo):presetFallback(3, strip.isMatrix?FX_MODE_2DWAVERLY:FX_MODE_JUGGLES, effectPalette); break;
case IR24_MC_R2 : isSolid?changeColor(COLOR_Magenta):presetFallback(4, strip.isMatrix?FX_MODE_2DGAMEOFLIFE:FX_MODE_PIXELWAVE, effectPalette); break;
case IR24_MC_G2 : isSolid?changeColor(COLOR_DarkBlue):presetFallback(5, strip.isMatrix?FX_MODE_BOUNCINGBALLS:FX_MODE_FREQPIXELS, effectPalette); break;
case IR24_MC_B2 : isSolid?changeColor(COLOR_Lime):presetFallback(6, strip.isMatrix?FX_MODE_2DDISTORTIONWAVES:FX_MODE_NOISEMOVE, effectPalette); break;
case IR24_MC_R3 : isSolid?changeColor(COLOR_Orange):presetFallback(7, strip.isMatrix?FX_MODE_2DLISSAJOUS:FX_MODE_BLURZ, effectPalette); break;
case IR24_MC_G3 : isSolid?changeColor(COLOR_WHITE):presetFallback(8, strip.isMatrix?FX_MODE_2DJULIA:FX_MODE_NOISEMETER, effectPalette); break;
case IR24_MC_B3 : isSolid?changeEffect(FX_MODE_RAINBOW_CYCLE):presetFallback(9, strip.isMatrix?FX_MODE_2DSWIRL:FX_MODE_PUDDLES, effectPalette); break;
//WLEDMM: change to presets (with fallbacks - not working !!) if mode is not solid
case IR24_MC_R1 : isSolid?changeColor(COLOR_YELLOW):presetFallback(1,strip.isMatrix?FX_MODE_2DAKEMI:FX_MODE_PIXELS,effectPalette); break;
case IR24_MC_G1 : isSolid?changeColor(COLOR_DoderBlue):presetFallback(2,strip.isMatrix?FX_MODE_2DWAVERLY:FX_MODE_GRAVIMETER,effectPalette); break;
case IR24_MC_B1 : isSolid?changeColor(COLOR_Indigo):presetFallback(3,strip.isMatrix?FX_MODE_2DWAVERLY:FX_MODE_JUGGLES,effectPalette); break;
case IR24_MC_R2 : isSolid?changeColor(COLOR_Magenta):presetFallback(4,strip.isMatrix?FX_MODE_2DGAMEOFLIFE:FX_MODE_PIXELWAVE,effectPalette); break;
case IR24_MC_G2 : isSolid?changeColor(COLOR_DarkBlue):presetFallback(5,strip.isMatrix?FX_MODE_BOUNCINGBALLS:FX_MODE_FREQPIXELS,effectPalette); break;
case IR24_MC_B2 : isSolid?changeColor(COLOR_Lime):presetFallback(6,strip.isMatrix?FX_MODE_2DDISTORTIONWAVES:FX_MODE_NOISEMOVE,effectPalette); break;
case IR24_MC_R3 : isSolid?changeColor(COLOR_Orange):presetFallback(7,strip.isMatrix?FX_MODE_2DLISSAJOUS:FX_MODE_BLURZ,effectPalette); break;
case IR24_MC_G3 : isSolid?changeColor(COLOR_WHITE):presetFallback(8,strip.isMatrix?FX_MODE_2DJULIA:FX_MODE_NOISEMETER,effectPalette); break;
case IR24_MC_B3 : isSolid?changeEffect(FX_MODE_RAINBOW_CYCLE):presetFallback(9,strip.isMatrix?FX_MODE_2DSWIRL:FX_MODE_PUDDLES,effectPalette); break;
case IR24_MC_MUSIC1 : changeEffectIntensity(16); break; //WLEDMM: was sound modes but does not work in 0.14
case IR24_MC_LOCK : changeEffect(FX_MODE_STATIC); break;
case IR24_MC_MUSIC2 : changeEffectIntensity(-16); break; //WLEDMM: was sound modes but does not work in 0.14