From 6b1d20acde2ee95e01938dc7ae845a4cb8898e56 Mon Sep 17 00:00:00 2001 From: MangaValk Date: Tue, 3 Nov 2026 00:04:15 +0100 Subject: [PATCH] Let SignalRGB keep the clock awake at night New "Wake at night" setting (prmExt.wledWakeAtNight, web UI only): while WLED frames arrive, the night schedule is ignored and the clock runs as by day. Night mode returns as soon as the frames time out. The manual night toggle, radar and HA Tubes switch still win. The field uses the former padding byte of prmExt; MAGIC_VALUE_EXT is now 0x5702 and 0x5701 settings are migrated, so existing SignalRGB settings are kept. Co-Authored-By: Claude Opus 5.5 --- CLAUDE.md | 10 ++++-- .../ESP32_UniClock2/ESP32_UniClock2.ino | 19 +++++++++-- .../ESP32_UniClock2/data/index.html.gz | Bin 12462 -> 12506 bytes firmware/uniclock/ESP32_UniClock2/wled.ino | 32 ++++++++++++------ firmware/uniclock/web/index.html | 3 +- 5 files changed, 48 insertions(+), 16 deletions(-) diff --git a/CLAUDE.md b/CLAUDE.md index f639bda..40a903b 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -103,9 +103,13 @@ GPIO0 to GND, tap RST to GND, then release GPIO0. 6. Done (2026-10-25): SignalRGB via WLED emulation (`wled.ino`, `USE_WLED_REALTIME`, `WLED_MAX_FPS` 30: no flicker, no loop stalls). SignalRGB's WLED plugin only sends as many LEDs as the channel's component has (needs 4). LED order checked: SignalRGB LED 0 = left tube, `tubePixels` {0,1,2,3} is right. Settings `wledEnable` / - `wledDarkWithTubes` / `wledUseBrightness` live in `prmExt`, stored in EEPROM after `prm` with - their own magic value: never add fields to `prm` (a `MAGIC_VALUE` bump factory-resets the - clock, WiFi included). HA switch "SignalRGB". + `wledDarkWithTubes` / `wledUseBrightness` / `wledWakeAtNight` live in `prmExt`, stored in EEPROM + after `prm` with their own magic value: never add fields to `prm` (a `MAGIC_VALUE` bump + factory-resets the clock, WiFi included). `prmExt` 0x5702 added `wledWakeAtNight` in the old + padding byte and migrates 0x5701; it has no padding left, so the next field needs a real + migration. HA switch "SignalRGB". + `wledWakeAtNight` ("Wake at night", web UI only): while frames arrive, `evalShutoffTime()` keeps + day mode during the night schedule; the manual night toggle, radar and HA Tubes switch still win. 7. Done (2026-10-29, on the clock): new web UI. Source `firmware/uniclock/web/index.html` (one file, no jQuery, controls generated from the `PAGES` table), gzipped by `web/gzip_web.py` to `data/index.html.gz` (12 KB, was 147 KB), served by one `serveStatic` with `no-cache`. diff --git a/firmware/uniclock/ESP32_UniClock2/ESP32_UniClock2.ino b/firmware/uniclock/ESP32_UniClock2/ESP32_UniClock2.ino index 52b3910..5951e5c 100644 --- a/firmware/uniclock/ESP32_UniClock2/ESP32_UniClock2.ino +++ b/firmware/uniclock/ESP32_UniClock2/ESP32_UniClock2.ino @@ -446,13 +446,18 @@ struct { // Adding them to `prm` would change its layout, and the MAGIC_VALUE check would then factory-reset // the clock (WiFi settings included). If the magic value doesn't match (first boot after the update), // loadEEPROM() sets these defaults and leaves `prm` alone. -#define MAGIC_VALUE_EXT 0x5701 +// 0x5701 had no wledWakeAtNight; it sat in what was the padding byte, so the other fields kept their place and +// loadEEPROM() takes them over. +#define MAGIC_VALUE_EXT 0x5702 +#define MAGIC_VALUE_EXT_5701 0x5701 struct { boolean wledEnable = false; //SignalRGB/WLED realtime control of the backlight (wled.ino) boolean wledDarkWithTubes = true; //WLED frames stay dark while the tubes/backlight are off boolean wledUseBrightness = true; //WLED frames are scaled by the RGB brightness (and auto dim) + boolean wledWakeAtNight = false; //while WLED frames arrive, the night schedule is ignored (evalShutoffTime()) uint16_t magic = MAGIC_VALUE_EXT; } prmExt; +static_assert(offsetof(decltype(prmExt), magic) == 4, "prmExt layout changed: MAGIC_VALUE_EXT_5701 migration no longer fits"); #define EEPROM_SIZE (sizeof(prm) + sizeof(prmExt)) //no extra reserved space for future growth: a change to either struct needs its own magic value bumped @@ -1415,6 +1420,10 @@ void handleConfigChanged(AsyncWebServerRequest *request) { else if (key == "wledUseBrightness") { prmExt.wledUseBrightness = (value == "true"); } + else if (key == "wledWakeAtNight") { + prmExt.wledWakeAtNight = (value == "true"); + evalShutoffTime(); //takes effect now, not at the next second + } #endif else if (key == "wifiSsid") { value.toCharArray(prm.wifiSsid,sizeof(prm.wifiSsid)); @@ -1653,6 +1662,7 @@ if (useTemp > 1) doc["wledEnable"] = prmExt.wledEnable; doc["wledDarkWithTubes"] = prmExt.wledDarkWithTubes; doc["wledUseBrightness"] = prmExt.wledUseBrightness; + doc["wledWakeAtNight"] = prmExt.wledWakeAtNight; #endif doc["wifiMode"] = prm.wifiMode; doc["wifiSsid"] = prm.wifiSsid; @@ -2126,6 +2136,10 @@ void loadEEPROM() { EEPROM.get(EEPROM_addr, prm); DPRINT(" version:"); DPRINTLN(prm.magic); EEPROM.get(EEPROM_addr + sizeof(prm), prmExt); + if (prmExt.magic == MAGIC_VALUE_EXT_5701) { //older layout: keep its settings, the new one starts off + prmExt.wledWakeAtNight = false; + prmExt.magic = MAGIC_VALUE_EXT; + } if (prmExt.magic != MAGIC_VALUE_EXT) resetPrmExt(); } @@ -2134,6 +2148,7 @@ void resetPrmExt() { prmExt.wledEnable = false; prmExt.wledDarkWithTubes = true; prmExt.wledUseBrightness = true; + prmExt.wledWakeAtNight = false; prmExt.magic = MAGIC_VALUE_EXT; } @@ -2931,7 +2946,7 @@ void evalShutoffTime(void) { // Determine whether tubes should be turned to NI static bool prevShutoffState = true; if ( (((mn_off < mn_on) && (mn >= mn_off) && (mn < mn_on))) || // Nighttime ((mn_off > mn_on) && ((mn >= mn_off) || (mn < mn_on)))) { - if (!manualOverride) displayON = false; + if (!manualOverride) displayON = wledWakesNight(); //SignalRGB frames can keep day mode (wled.ino) if (prevShutoffState == true) manualOverride = false; prevShutoffState = false; } diff --git a/firmware/uniclock/ESP32_UniClock2/data/index.html.gz b/firmware/uniclock/ESP32_UniClock2/data/index.html.gz index 757339452cece8560ac905005d3214d894248a41..0eca9e5f7130dd051359e6db69042233c2d8e661 100644 GIT binary patch literal 12506 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 s|J8DC@{GM|kA3M+fre)Aa@+ip-pg(Mi;~;$ wledTimeout)) { + wledLive = false; //doAnimationMakuna() takes over again + DPRINTLN("WLED: realtime frames stopped"); + } + } + if (wledLive != wasLive) { + wasLive = wledLive; + if (prmExt.wledWakeAtNight) evalShutoffTime(); //wake or sleep now, not at the next second + } if (!wledLive) return; - if ((millis() - wledLastPacket) > wledTimeout) { - wledLive = false; //doAnimationMakuna() takes over again - DPRINTLN("WLED: realtime frames stopped"); - return; - } if (alarmON || EEPROMsaving) return; //the alarm flash wins if ((millis() - lastShow) < (1000ul / WLED_MAX_FPS)) return; lastShow = millis(); @@ -267,5 +278,6 @@ void wledRoutes() { #else void wledSetup() {} void wledHandle() {} + boolean wledWakesNight() { return false; } void wledRoutes() {} #endif diff --git a/firmware/uniclock/web/index.html b/firmware/uniclock/web/index.html index dde255c..d3c2ecb 100644 --- a/firmware/uniclock/web/index.html +++ b/firmware/uniclock/web/index.html @@ -130,7 +130,7 @@ const SAMPLE = { enableAutoShutoff: true, dayTime: "07:00", nightTime: "22:30", dayBright: 72, nightBright: 10, manualOverride: false, animMode: 6, alarmEnable: false, alarmTime: "06:30", alarmPeriod: 15, enableRadar: false, radarTimeout: 5, rgbEffect: 1, rgbBrightness: 120, rgbFixColor: 30, rgbSpeed: 50, rgbDir: false, rgbMinBrightness: 8, - wledEnable: true, wledDarkWithTubes: true, wledUseBrightness: true, + wledEnable: true, wledDarkWithTubes: true, wledUseBrightness: true, wledWakeAtNight: false, wifiMode: true, wifiSsid: "dlink-iot", wifiPsw: "", wifiPswSet: true, ApSsid: "UNICLOCK", ApPsw: "", ApPswSet: false, NtpServer: "pool.ntp.org", firmware: "", mqttBrokerAddr: "10.1.1.175", mqttBrokerUser: "mqtt", mqttBrokerPsw: "", mqttBrokerPswSet: true, mqttEnable: true, mqttBrokerRefresh: 30, dateMode: 0, dateRepeatMin: 3, tempRepeatMin: 1, @@ -281,6 +281,7 @@ const PAGES = [ { t: "sw", k: "wledEnable", l: "SignalRGB control", h: "The clock shows up in SignalRGB as a WLED device" }, { t: "sw", k: "wledDarkWithTubes", l: "Off with the tubes", h: "LEDs stay dark while the tubes are off" }, { t: "sw", k: "wledUseBrightness", l: "Use backlight brightness", h: "Off: colours exactly as SignalRGB sends them" }, + { t: "sw", k: "wledWakeAtNight", l: "Wake at night", h: "Tubes and LEDs stay on at night while SignalRGB sends colours", show: () => cfg.enableAutoShutoff }, { t: "info", k: "wledLive", l: "Receiving colours", f: v => v ? "yes" : "no" }] } ] }, { id: "network", l: "Network", cards: [