From f74a45a33e1f733bd7747db6209dc8a13814d974 Mon Sep 17 00:00:00 2001 From: Blaz Kristan Date: Fri, 5 Mar 2021 23:05:09 +0100 Subject: [PATCH] Sunris/sunset detection. --- wled00/cfg.cpp | 4 + wled00/data/index.js | 2 +- wled00/data/settings_time.htm | 3 +- wled00/fcn_declare.h | 1 + wled00/html_settings.h | 4 +- wled00/html_ui.h | 1587 +++++++++++++++++---------------- wled00/json.cpp | 1 + wled00/ntp.cpp | 54 ++ wled00/set.cpp | 2 + wled00/wled.h | 6 +- wled00/xml.cpp | 4 + 11 files changed, 872 insertions(+), 796 deletions(-) diff --git a/wled00/cfg.cpp b/wled00/cfg.cpp index ed546642f..5bcf9ac17 100644 --- a/wled00/cfg.cpp +++ b/wled00/cfg.cpp @@ -305,6 +305,8 @@ void deserializeConfig() { CJSON(currentTimezone, if_ntp[F("tz")]); CJSON(utcOffsetSecs, if_ntp[F("offset")]); CJSON(useAMPM, if_ntp[F("ampm")]); + CJSON(longitude, if_ntp[F("ln")]); + CJSON(latitude, if_ntp[F("lt")]); JsonObject ol = doc[F("ol")]; CJSON(overlayDefault ,ol[F("clock")]); // 0 @@ -620,6 +622,8 @@ void serializeConfig() { if_ntp[F("tz")] = currentTimezone; if_ntp[F("offset")] = utcOffsetSecs; if_ntp[F("ampm")] = useAMPM; + if_ntp[F("ln")] = longitude; + if_ntp[F("lt")] = latitude; JsonObject ol = doc.createNestedObject("ol"); ol[F("clock")] = overlayDefault; diff --git a/wled00/data/index.js b/wled00/data/index.js index fd5ce4119..1e4e7d34a 100644 --- a/wled00/data/index.js +++ b/wled00/data/index.js @@ -589,7 +589,7 @@ function populateInfo(i) ${urows} ${inforow("Build",i.vid)} ${inforow("Signal strength",i.wifi.signal +"% ("+ i.wifi.rssi, " dBm)")} -${inforow("Uptime",getRuntimeStr(i.uptime))} +${inforow("Uptime",getRuntimeStr(i.uptime)," "+(i.isday?"":"")+"")} ${inforow("Free heap",heap," kB")} ${inforow("Estimated current",pwru)} ${inforow("Average FPS",i.leds.fps)} diff --git a/wled00/data/settings_time.htm b/wled00/data/settings_time.htm index d0544af10..08281526f 100644 --- a/wled00/data/settings_time.htm +++ b/wled00/data/settings_time.htm @@ -113,7 +113,8 @@
UTC offset: seconds (max. 18 hours)
- Current local time is unknown. + Current local time is unknown.
+ Longitude: Latitude:

Clock

Clock Overlay:
UTC offset: seconds (max. 18 hours)
Current local time is unknown.

Clock

Clock Overlay: Latitude:

Clock

Clock Overlay: