Skip to content

Commit adbeb4a

Browse files
committed
Add live property to state, allowing toggling of realtime (not incl. in state resp.) ( wled#1308 )
1 parent b25e22b commit adbeb4a

File tree

4 files changed

+39
-16
lines changed

4 files changed

+39
-16
lines changed

CHANGELOG.md

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

33
### WLED version 0.11.0
44

5+
#### Build 2011260
6+
7+
- Add `live` property to state, allowing toggling of realtime (not incl. in state resp.)
8+
- PIO environment changes
9+
510
#### Build 2011230
611

712
- Version bump to 0.11.0 "Mirai"

platformio.ini

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
default_envs = travis_esp8266, travis_esp32
1313

1414
# Release binaries
15-
; default_envs = nodemcuv2, esp01_1m_full, esp32dev, custom_WS2801, custom_APA102, custom_LEDPIN_16, custom_LEDPIN_4, custom_LEDPIN_3, custom32_LEDPIN_16
15+
; default_envs = nodemcuv2, esp01_1m_full, esp32dev, custom_WS2801, custom_APA102, custom_LEDPIN_16, custom_LEDPIN_4, custom_LEDPIN_3, custom32_LEDPIN_16, custom32_APA102
1616

1717
# Single binaries (uncomment your board)
1818
; default_envs = nodemcuv2
@@ -150,7 +150,9 @@ build_flags =
150150
; NONOSDK22x_190703 = 2.2.2-dev(38a443e)
151151
-DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703
152152
; lwIP 2 - Higher Bandwidth no Features
153-
-DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH
153+
; -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH
154+
; lwIP 1.4 - Higher Bandwidth (Aircoookie has)
155+
-DPIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH
154156
; VTABLES in Flash
155157
-DVTABLES_IN_FLASH
156158
; restrict to minimal mime-types
@@ -304,25 +306,25 @@ lib_ignore =
304306
board = esp8285
305307
platform = ${common.platform_wled_default}
306308
platform_packages = ${common.platform_packages}
307-
board_build.ldscript = ${common.ldscript_1m0m}
309+
board_build.ldscript = ${common.ldscript_1m128k}
308310
build_unflags = ${common.build_unflags}
309-
build_flags = ${common.build_flags_esp8266} -D WLED_DISABLE_HUESYNC -D WLED_USE_ANALOG_LEDS
311+
build_flags = ${common.build_flags_esp8266} -D WLED_DISABLE_OTA -D WLED_USE_ANALOG_LEDS
310312

311313
[env:esp8285_4CH_H801]
312314
board = esp8285
313315
platform = ${common.platform_wled_default}
314316
platform_packages = ${common.platform_packages}
315-
board_build.ldscript = ${common.ldscript_1m0m}
317+
board_build.ldscript = ${common.ldscript_1m128k}
316318
build_unflags = ${common.build_unflags}
317-
build_flags = ${common.build_flags_esp8266} -D WLED_DISABLE_HUESYNC -D WLED_USE_ANALOG_LEDS -D WLED_USE_H801
319+
build_flags = ${common.build_flags_esp8266} -D WLED_DISABLE_OTA -D WLED_USE_ANALOG_LEDS -D WLED_USE_H801
318320

319321
[env:esp8285_5CH_H801]
320322
board = esp8285
321323
platform = ${common.platform_wled_default}
322324
platform_packages = ${common.platform_packages}
323-
board_build.ldscript = ${common.ldscript_1m0m}
325+
board_build.ldscript = ${common.ldscript_1m128k}
324326
build_unflags = ${common.build_unflags}
325-
build_flags = ${common.build_flags_esp8266} -D WLED_DISABLE_HUESYNC -D WLED_USE_ANALOG_LEDS -D WLED_USE_H801 -D WLED_ENABLE_5CH_LEDS
327+
build_flags = ${common.build_flags_esp8266} -D WLED_DISABLE_OTA -D WLED_USE_ANALOG_LEDS -D WLED_USE_H801 -D WLED_ENABLE_5CH_LEDS
326328

327329
[env:d1_mini_5CH_Shojo_PCB]
328330
board = d1_mini
@@ -410,6 +412,15 @@ lib_ignore =
410412
ESPAsyncTCP
411413
ESPAsyncUDP
412414

415+
[env:custom32_APA102]
416+
board = esp32dev
417+
418+
build_unflags = ${common.build_unflags}
419+
build_flags = ${common.build_flags_esp32} -D USE_APA102
420+
lib_ignore =
421+
ESPAsyncTCP
422+
ESPAsyncUDP
423+
413424
[env:custom32_TOUCHPIN_T0]
414425
board = esp32dev
415426
@@ -443,7 +454,7 @@ platform = [email protected]
443454
[env:sp501e]
444455
board = esp_wroom_02
445456
platform = ${common.platform_wled_default}
446-
board_build.ldscript = ${common.ldscript_2m1m}
457+
board_build.ldscript = ${common.ldscript_2m512k}
447458
build_flags = ${common.build_flags_esp8266} -D LEDPIN=3 -D BTNPIN=1
448459

449460
# ------------------------------------------------------------------------------
@@ -470,46 +481,46 @@ build_flags = ${common.build_flags_esp32} ${common.debug_flags} ${common.build_f
470481
board = esp_wroom_02
471482
platform = ${common.platform_wled_default}
472483
platform_packages = ${common.platform_packages}
473-
board_build.ldscript = ${common.ldscript_2m1m}
484+
board_build.ldscript = ${common.ldscript_2m512k}
474485
build_unflags = ${common.build_unflags}
475486
build_flags = ${common.build_flags_esp8266} -D LEDPIN=3
476487

477488
[env:codm-controller-0.4-WS2801]
478489
board = esp_wroom_02
479490
platform = ${common.platform_wled_default}
480491
platform_packages = ${common.platform_packages}
481-
board_build.ldscript = ${common.ldscript_2m1m}
492+
board_build.ldscript = ${common.ldscript_2m512k}
482493
build_unflags = ${common.build_unflags}
483494
build_flags = ${common.build_flags_esp8266} -D USE_WS2801 -D CLKPIN=13 -D DATAPIN=3
484495

485496
[env:codm-controller-0.4-APA102]
486497
board = esp_wroom_02
487498
platform = ${common.platform_wled_default}
488499
platform_packages = ${common.platform_packages}
489-
board_build.ldscript = ${common.ldscript_2m1m}
500+
board_build.ldscript = ${common.ldscript_2m512k}
490501
build_unflags = ${common.build_unflags}
491502
build_flags = ${common.build_flags_esp8266} -D USE_APA102 -D CLKPIN=13 -D DATAPIN=3
492503

493504
[env:codm-controller-0.5]
494505
board = esp_wroom_02
495506
platform = ${common.platform_wled_default}
496507
platform_packages = ${common.platform_packages}
497-
board_build.ldscript = ${common.ldscript_2m1m}
508+
board_build.ldscript = ${common.ldscript_2m512k}
498509
build_unflags = ${common.build_unflags}
499510
build_flags = ${common.build_flags_esp8266}
500511

501512
[env:codm-controller-0.5-WS2801]
502513
board = esp_wroom_02
503514
platform = ${common.platform_wled_default}
504515
platform_packages = ${common.platform_packages}
505-
board_build.ldscript = ${common.ldscript_2m1m}
516+
board_build.ldscript = ${common.ldscript_2m512k}
506517
build_unflags = ${common.build_unflags}
507518
build_flags = ${common.build_flags_esp8266} -D USE_WS2801 #-D CLKPIN=0 -D DATAPIN=2
508519

509520
[env:codm-controller-0.5-APA102]
510521
board = esp_wroom_02
511522
platform = ${common.platform_wled_default}
512523
platform_packages = ${common.platform_packages}
513-
board_build.ldscript = ${common.ldscript_2m1m}
524+
board_build.ldscript = ${common.ldscript_2m512k}
514525
build_unflags = ${common.build_unflags}
515526
build_flags = ${common.build_flags_esp8266} -D USE_APA102 #-D CLKPIN=0 -D DATAPIN=2

wled00/json.cpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,12 @@ bool deserializeState(JsonObject root)
208208
realtimeOverride = root[F("lor")] | realtimeOverride;
209209
if (realtimeOverride > 2) realtimeOverride = REALTIME_OVERRIDE_ALWAYS;
210210

211+
if (root.containsKey("live")) {
212+
bool lv = root["live"];
213+
if (lv) realtimeLock(65000); //enter realtime without timeout
214+
else realtimeTimeout = 0; //cancel realtime mode immediately
215+
}
216+
211217
byte prevMain = strip.getMainSegmentId();
212218
strip.mainSegment = root[F("mainseg")] | prevMain;
213219
if (strip.getMainSegmentId() != prevMain) setValuesFromMainSeg();
@@ -423,7 +429,7 @@ void serializeInfo(JsonObject root)
423429

424430
root[F("name")] = serverDescription;
425431
root[F("udpport")] = udpPort;
426-
root[F("live")] = (bool)realtimeMode;
432+
root["live"] = (bool)realtimeMode;
427433

428434
switch (realtimeMode) {
429435
case REALTIME_MODE_INACTIVE: root["lm"] = ""; break;

wled00/udp.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ void realtimeLock(uint32_t timeoutMs, byte md)
8686
realtimeMode = md;
8787

8888
if (arlsForceMaxBri && !realtimeOverride) strip.setBrightness(scaledBri(255));
89+
if (md == REALTIME_MODE_GENERIC) strip.show();
8990
}
9091

9192

0 commit comments

Comments
 (0)