Fixed JSON IR remote not working with codes greater than 0xFFFFFF (fixes #2135)

This commit is contained in:
cschwinne 2021-08-18 02:10:40 +02:00
parent 441416b241
commit 91e758f66f
3 changed files with 12 additions and 3 deletions

View File

@ -2,6 +2,11 @@
### Builds after release 0.12.0 ### Builds after release 0.12.0
#### Build 2108180
- Fixed JSON IR remote not working with codes greater than 0xFFFFFF (fixes #2135)
- Fixed transition 0 edge case
#### Build 2108170 #### Build 2108170
- Added application level pong websockets reply (#2139) - Added application level pong websockets reply (#2139)

View File

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

View File

@ -8,7 +8,7 @@
*/ */
// version code in format yymmddb (b = daily build) // version code in format yymmddb (b = daily build)
#define VERSION 2108170 #define VERSION 2108180
//uncomment this if you have a "my_config.h" file you'd like to use //uncomment this if you have a "my_config.h" file you'd like to use
//#define WLED_USE_MY_CONFIG //#define WLED_USE_MY_CONFIG