andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2026-01-29 18:19:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

timezone support

Browse Source
This commit is contained in:
Paul
2019-11-01 15:04:17 +01:00
parent 905ae885f7
commit 6275245b03
14 changed files with 642 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/websrc/myesp.htm
View File

@@ -391,10 +391,29 @@
aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right"
data-content="Time in minutes between scheduled NTP refreshes"></i></label>
<span class="col-xs-9 col-md-5">
<input class="form-control input-sm" placeholder="in Minutes" value="30" id="intervals" type="text">
<input class="form-control input-sm" placeholder="in Minutes" value="30" id="interval" type="text">
</span>
<br>
</div>
<div class="row form-group">
<label class="col-xs-3">Time Zone</label>
<span class="col-xs-9 col-md-5">
<select class="form-control input-sm" name="timzeone" id="timezone">
<option value="0">Australia Eastern (Sydney, Melbourne)</option>
<option value="1">Moscow (MSK, does not observe DST)</option>
<option selected="selected" value="2">Central European Time (Frankfurt, Paris, Amsterdam)</option>
<option value="3">United Kingdom (London, Belfast)</option>
<option value="4">UTC</option>
<option value="5">US Eastern (New York, Detroit)</option>
<option value="6">US Central (Chicago, Houston)</option>
<option value="7">US Mountain (Denver, Salt Lake City)</option>
<option value="8">Arizona (no DST)</option>
<option value="9">US Pacific (Las Vegas, Los Angeles)</option>
</select>
</span>
</div>
<br>
<div class="col-xs-9 col-md-8">
<button onclick="saventp()" class="btn btn-primary btn-sm pull-right">Save</button>

24
src/websrc/myesp.js
View File

@@ -2,7 +2,7 @@ var version = "";
var websock = null;
var wsUri = "ws://" + window.location.host + "/ws";
var utcSeconds;
var ntpSeconds;
var data = [];
var ajaxobj;
@@ -37,7 +37,8 @@ var config = {
"hostname": "",
"serial": false,
"password": "admin",
"log_events": true
"log_events": true,
"version": "1.0.0"
},
"mqtt": {
"enabled": false,
@@ -53,13 +54,14 @@ var config = {
},
"ntp": {
"server": "pool.ntp.org",
"interval": 30,
"interval": 60,
"timezone": 2,
"enabled": true
}
};
function browserTime() {
var d = new Date(0);
var d = new Date(0); // The 0 there is the key, which sets the date to the epoch
var c = new Date();
var timestamp = Math.floor((c.getTime() / 1000) + ((c.getTimezoneOffset() * 60) * -1));
d.setUTCSeconds(timestamp);
@@ -67,10 +69,8 @@ function browserTime() {
}
function deviceTime() {
var c = new Date();
var t = new Date(0); // The 0 there is the key, which sets the date to the epoch
var devTime = Math.floor(utcSeconds + ((c.getTimezoneOffset() * 60) * -1));
t.setUTCSeconds(devTime);
t.setUTCSeconds(ntpSeconds);
document.getElementById("utc").innerHTML = t.toUTCString().slice(0, -3);
}
@@ -96,7 +96,8 @@ function listntp() {
websock.send("{\"command\":\"gettime\"}");
document.getElementById("ntpserver").value = config.ntp.server;
document.getElementById("intervals").value = config.ntp.interval;
document.getElementById("interval").value = config.ntp.interval;
document.getElementById("timezone").value = config.ntp.timezone;
if (config.ntp.enabled) {
$("input[name=\"ntpenabled\"][value=\"1\"]").prop("checked", true);
@@ -137,7 +138,8 @@ function custom_saveconfig() {
function saventp() {
config.ntp.server = document.getElementById("ntpserver").value;
config.ntp.interval = parseInt(document.getElementById("intervals").value);
config.ntp.interval = parseInt(document.getElementById("interval").value);
config.ntp.timezone = parseInt(document.getElementById("timezone").value);
config.ntp.enabled = false;
if (parseInt($("input[name=\"ntpenabled\"]:checked").val()) === 1) {
@@ -674,8 +676,6 @@ function initEventTable() {
if (value < 1563300000) {
return "(" + value + ")";
} else {
var comp = new Date();
value = Math.floor(value + ((comp.getTimezoneOffset() * 60) * -1));
var vuepoch = new Date(value * 1000);
var formatted = vuepoch.getUTCFullYear() +
"-" + twoDigits(vuepoch.getUTCMonth() + 1) +
@@ -769,7 +769,7 @@ function socketMessageListener(evt) {
builddata(obj);
break;
case "gettime":
utcSeconds = obj.epoch;
ntpSeconds = obj.epoch;
deviceTime();
break;
case "ssidlist":