Skip to content

Commit 91e758f

Browse files
committed
Fixed JSON IR remote not working with codes greater than 0xFFFFFF (fixes wled#2135)
1 parent 441416b commit 91e758f

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
### Builds after release 0.12.0
44

5+
#### Build 2108180
6+
7+
- Fixed JSON IR remote not working with codes greater than 0xFFFFFF (fixes #2135)
8+
- Fixed transition 0 edge case
9+
510
#### Build 2108170
611

712
- Added application level pong websockets reply (#2139)

wled00/ir.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,11 @@ void decodeIR(uint32_t code)
161161
}
162162
lastValidCode = 0; irTimesRepeated = 0;
163163
if (decodeIRCustom(code)) return;
164-
if (code > 0xFFFFFF) return; //invalid code
164+
if (irEnabled == 8) { // any remote configurable with ir.json file
165+
decodeIRJson(code);
166+
return;
167+
}
168+
if (code > 0xFFFFFF) return; //invalid code
165169
switch (irEnabled) {
166170
case 1:
167171
if (code > 0xF80000) {
@@ -178,7 +182,7 @@ void decodeIR(uint32_t code)
178182
// "VOL +" controls effect, "VOL -" controls colour/palette, "MUTE"
179183
// sets bright plain white
180184
case 7: decodeIR9(code); break;
181-
case 8: decodeIRJson(code); break; // any remote configurable with ir.json file
185+
//case 8: return; // ir.json file, handled above switch statement
182186
default: return;
183187
}
184188

wled00/wled.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99

1010
// version code in format yymmddb (b = daily build)
11-
#define VERSION 2108170
11+
#define VERSION 2108180
1212

1313
//uncomment this if you have a "my_config.h" file you'd like to use
1414
//#define WLED_USE_MY_CONFIG

0 commit comments

Comments
 (0)