diff --git a/wled00/cfg.cpp b/wled00/cfg.cpp index 4955eec14..6c33dfd1a 100644 --- a/wled00/cfg.cpp +++ b/wled00/cfg.cpp @@ -306,6 +306,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 @@ -334,7 +336,8 @@ void deserializeConfig() { JsonArray timers = tm[F("ins")]; uint8_t it = 0; for (JsonObject timer : timers) { - if (it > 7) break; + if (it > 9) break; + if (it<8 && timer[F("hour")]==255) it=8; // hour==255 -> sunrise/sunset CJSON(timerHours[it], timer[F("hour")]); CJSON(timerMinutes[it], timer[F("min")]); CJSON(timerMacro[it], timer[F("macro")]); @@ -617,6 +620,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; @@ -638,8 +643,8 @@ void serializeConfig() { JsonArray timers_ins = timers.createNestedArray("ins"); - for (byte i = 0; i < 8; i++) { - if (timerMacro[i] == 0 && timerHours[i] == 0 && timerMinutes[i] == 0) continue; + for (byte i = 0; i < 10; i++) { + if (timerMacro[i] == 0 && timerHours[i] == 0 && timerMinutes[i] == 0) continue; // sunrise/sunset get saved always (timerHours=255) JsonObject timers_ins0 = timers_ins.createNestedObject(); timers_ins0["en"] = (timerWeekday[i] & 0x01); timers_ins0[F("hour")] = timerHours[i]; diff --git a/wled00/data/settings_time.htm b/wled00/data/settings_time.htm index 9924530f3..f8a0d9f11 100644 --- a/wled00/data/settings_time.htm +++ b/wled00/data/settings_time.htm @@ -49,19 +49,23 @@ ih+="