Sternenlabor/WLED
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Blaz Kristan
2021-08-19 21:57:04 +02:00
parent 6a52a1dc63 3eb1fe0eb2
commit 4e28e2cb59
21 changed files with 1029 additions and 1019 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wled00/ir.cpp
View File

@@ -164,8 +164,12 @@ void decodeIR(uint32_t code)
return;
}
lastValidCode = 0; irTimesRepeated = 0;
// if (decodeIRCustom(code)) return;
if (code > 0xFFFFFF) return; //invalid code
//if (decodeIRCustom(code)) return;
if (irEnabled == 8) { // any remote configurable with ir.json file
decodeIRJson(code);
return;
}
if (code > 0xFFFFFF) return; //invalid code
switch (irEnabled) {
case 1:
if (code > 0xF80000) {
@@ -182,7 +186,7 @@ void decodeIR(uint32_t code)
// "VOL +" controls effect, "VOL -" controls colour/palette, "MUTE"
// sets bright plain white
case 7: decodeIR9(code); break;
case 8: decodeIRJson(code); break; // any remote configurable with ir.json file
//case 8: return; // ir.json file, handled above switch statement
default: return;
}