scheduler: webui sun module, utc cannot be alone

xoseperez · May 16, 2024 · 8735f4d · 8735f4d
1 parent 44c4124
commit 8735f4d
Show file tree

Hide file tree

Showing 22 changed files with 13,155 additions and 13,033 deletions.
diff --git a/code/espurna/data/index.all.html.gz b/code/espurna/data/index.all.html.gz
diff --git a/code/espurna/data/index.curtain.html.gz b/code/espurna/data/index.curtain.html.gz
diff --git a/code/espurna/data/index.garland.html.gz b/code/espurna/data/index.garland.html.gz
diff --git a/code/espurna/data/index.light.html.gz b/code/espurna/data/index.light.html.gz
diff --git a/code/espurna/data/index.lightfox.html.gz b/code/espurna/data/index.lightfox.html.gz
diff --git a/code/espurna/data/index.rfbridge.html.gz b/code/espurna/data/index.rfbridge.html.gz
diff --git a/code/espurna/data/index.rfm69.html.gz b/code/espurna/data/index.rfm69.html.gz
diff --git a/code/espurna/data/index.sensor.html.gz b/code/espurna/data/index.sensor.html.gz
diff --git a/code/espurna/data/index.small.html.gz b/code/espurna/data/index.small.html.gz
diff --git a/code/espurna/data/index.thermostat.html.gz b/code/espurna/data/index.thermostat.html.gz
diff --git a/code/espurna/scheduler.cpp b/code/espurna/scheduler.cpp
@@ -601,6 +601,8 @@ void migrate(int version) {
 #if SCHEDULER_SUN_SUPPORT
 namespace sun {
 
+STRING_VIEW_INLINE(Module, "sun");
+
 void setup() {
  location.latitude = settings::latitude();
  location.longitude = settings::longitude();
@@ -953,6 +955,13 @@ bool onKey(StringView key, const JsonVariant&) {
 
 void onVisible(JsonObject& root) {
  wsPayloadModule(root, settings::Prefix);
+#if SCHEDULER_SUN_SUPPORT
+ wsPayloadModule(root, sun::Module);
+#endif
+
+ for (const auto& pair : settings::Settings) {
+ root[pair.key()] = pair.value();
+ }
 }
 
 void onConnected(JsonObject& root){

diff --git a/code/espurna/static/index.all.html.gz.h b/code/espurna/static/index.all.html.gz.h
diff --git a/code/espurna/static/index.curtain.html.gz.h b/code/espurna/static/index.curtain.html.gz.h
diff --git a/code/espurna/static/index.garland.html.gz.h b/code/espurna/static/index.garland.html.gz.h
diff --git a/code/espurna/static/index.light.html.gz.h b/code/espurna/static/index.light.html.gz.h
diff --git a/code/espurna/static/index.lightfox.html.gz.h b/code/espurna/static/index.lightfox.html.gz.h
diff --git a/code/espurna/static/index.rfbridge.html.gz.h b/code/espurna/static/index.rfbridge.html.gz.h
diff --git a/code/espurna/static/index.rfm69.html.gz.h b/code/espurna/static/index.rfm69.html.gz.h
diff --git a/code/espurna/static/index.sensor.html.gz.h b/code/espurna/static/index.sensor.html.gz.h
diff --git a/code/espurna/static/index.small.html.gz.h b/code/espurna/static/index.small.html.gz.h
diff --git a/code/espurna/static/index.thermostat.html.gz.h b/code/espurna/static/index.thermostat.html.gz.h
diff --git a/code/html/index.html b/code/html/index.html
@@ -971,14 +971,48 @@ <h2>Executes actions based on the current time.</h2>
  <p>At least one time string element must be specified</p>
  <ul>
  <li><samp>YEAR-MONTH-DAY</samp> or <samp>MONTH-DAY</samp></li>
- <li><samp>Weekday</samp> in English (abbreviated of full). Or, number in range <samp>1&ndash;7</samp>, starting from Monday (1) and ending in Sunday (7)</li>
+ <li><samp>Weekday</samp> in English (abbreviated of full), or number in range <samp>1&ndash;7</samp> (1 meaning Monday and 7 - Sunday)</li>
  <li><samp>HOUR:MINUTE</samp></li>
- <li><samp>UTC</samp> either immediately following the time, or instead of it (would default to 00:00)</li>
  </ul>
 
+ <p><samp>HOUR:MINUTE</samp> always uses local time, unless followed by <samp>UTC</samp></p>
+
  <a href="https://github.com/xoseperez/espurna/wiki/Scheduler">See full documentation</a>
 
  <div class="page">
+ <fieldset>
+ <legend>General settings</legend>
+
+ <div class="pure-control-group">
+ <label>Restore days</label>
+ <input name="schRstrDays" type="number">
+ <span class="pure-form-message">
+ Number of days to look back when restoring schedule. Set to zero to only check current day.
+ </span>
+ </div>
+ </fieldset>
+
+ <fieldset class="module module-sun">
+ <legend>Location</legend>
+
+ <p>Used for <samp>Sunrise</samp> or <samp>Sunset</samp>, which can be specified instead of <samp>HOUR:MINUTE</samp></p>
+
+ <div class="pure-control-group">
+ <label>Latitude</label>
+ <input name="schLat" type="text">
+ </div>
+
+ <div class="pure-control-group">
+ <label>Longitude</label>
+ <input name="schLong" type="text">
+ </div>
+
+ <div class="pure-control-group">
+ <label>Altitude</label>
+ <input name="schAlt" type="text">
+ </div>
+ </fieldset>
+
  <fieldset>
  <legend>List of schedules</legend>
  <div id="schedules" class="settings-group" data-settings-target="schType" data-settings-schema="schType schRestore schTime schAction"></div>
@@ -2253,9 +2287,9 @@ <h2>
  <div class="pure-g">
  <div class="pure-control-group pure-u-1 pure-u-lg-1-4">
  <select class="pure-input-2-3" name="schType">
- <option selected disabled value="unknown"></option>
- <option value="disabled">Disabled</option>
- <option value="calendar">Calendar</option>
+ <option selected disabled value="0"></option>
+ <option value="1">Disabled</option>
+ <option value="2">Calendar</option>
  </select>
  </div>