mirror of
https://github.com/emsesp/EMS-ESP32.git
synced 2025-12-08 00:39:50 +03:00
cosmetic changes in web
This commit is contained in:
@@ -7,8 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||
|
||||
## Important!! Known Issues in 1.9 beta:
|
||||
|
||||
- The Timezone is the NTP section is obsolete and will be replaced with a JavaScript version since all times are in UTC. Ignore that for now.
|
||||
- Building with EEPROM (-DCRASH option) causes web to fail so its disabled for now, meaning no stacks for debugging for now.
|
||||
|
||||
|
||||
## How to build the firmware with 1.9.x
|
||||
- Make sure you update your local `platformio.ini` using the example one and set the target to `debug`.
|
||||
- On first boot it will re-build the SPIFFS config file so if you're upgrading from 1.8.x all the settings will be deleted and you will need to re-enter. This can be doen now via the web interface by connecting to WiFi AP called 'ems-esp'.
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
<div id="customcontent">
|
||||
<br>
|
||||
<br>
|
||||
<legend>Custom Settings</legend>
|
||||
<h6 class="text-muted">Please refer to the Help for configuration options.</h6>
|
||||
<h6 class="text-muted">Please refer to the Help for configuration options</h6>
|
||||
<br>
|
||||
|
||||
<div class="row form-group">
|
||||
@@ -21,13 +20,14 @@
|
||||
</div>
|
||||
|
||||
<div class="row form-group">
|
||||
<label class="col-xs-3">LED pin<i style="margin-left: 10px;"
|
||||
<label class="col-xs-3">LED Pin<i style="margin-left: 10px;"
|
||||
class="glyphicon glyphicon-exclamation-sign text-danger" aria-hidden="true" data-toggle="popover"
|
||||
data-trigger="hover" data-placement="right" data-content="Choose "LED pin" pin"></i></label>
|
||||
data-trigger="hover" data-placement="right"
|
||||
data-content="Select with GPIO pin the LED is on"></i></label>
|
||||
<span class="col-xs-9 col-md-5">
|
||||
<select class="form-control input-sm" id="led_gpio">
|
||||
<option value="0">GPIO-0</option>
|
||||
<option selected="selected" value="2">GPIO-2 (LED_BUILTIN)</option>
|
||||
<option selected="selected" value="2">GPIO-2 (onboard LED)</option>
|
||||
<option value="4">GPIO-4</option>
|
||||
<option value="5">GPIO-5</option>
|
||||
<option value="12">GPIO-12</option>
|
||||
@@ -38,10 +38,10 @@
|
||||
</div>
|
||||
|
||||
<div class="row form-group">
|
||||
<label class="col-xs-3">Dallas parasite<i style="margin-left: 10px;"
|
||||
<label class="col-xs-3">Dallas Parasite<i style="margin-left: 10px;"
|
||||
class="glyphicon glyphicon-exclamation-sign text-danger" aria-hidden="true" data-toggle="popover"
|
||||
data-trigger="hover" data-placement="right"
|
||||
data-content="Enable if Dallas sensors powered via parasite"></i></label>
|
||||
data-content="Enable if Dallas sensors are powered via parasite"></i></label>
|
||||
<div class="col-xs-9">
|
||||
<form>
|
||||
<label class="radio-inline">
|
||||
@@ -53,10 +53,10 @@
|
||||
</div>
|
||||
|
||||
<div class="row form-group">
|
||||
<label class="col-xs-3">Dallas pin<i style="margin-left: 10px;"
|
||||
<label class="col-xs-3">Dallas Pin<i style="margin-left: 10px;"
|
||||
class="glyphicon glyphicon-exclamation-sign text-danger" aria-hidden="true" data-toggle="popover"
|
||||
data-trigger="hover" data-placement="right"
|
||||
data-content="Choose "Dallas pin" pin."></i></label>
|
||||
data-content="Select GPIO pin to where the Dallas sensor is connected"></i></label>
|
||||
<span class="col-xs-9 col-md-5">
|
||||
<select class="form-control input-sm" id="dallas_gpio">
|
||||
<option value="0">GPIO-0</option>
|
||||
@@ -70,9 +70,9 @@
|
||||
</div>
|
||||
|
||||
<div class="row form-group">
|
||||
<label class="col-xs-3">Listen mode<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
|
||||
<label class="col-xs-3">Listen Mode<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
|
||||
aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right"
|
||||
data-content="Listen mode disables Tx"></i></label>
|
||||
data-content="Listen mode disables Tx. Used when debugging."></i></label>
|
||||
<div class="col-xs-9">
|
||||
<form>
|
||||
<label class="radio-inline">
|
||||
@@ -84,9 +84,9 @@
|
||||
</div>
|
||||
|
||||
<div class="row form-group">
|
||||
<label class="col-xs-3">Shower timer<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
|
||||
<label class="col-xs-3">Shower Timer<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
|
||||
aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right"
|
||||
data-content="Monitors and alerts on shower duration"></i></label>
|
||||
data-content="Monitors and sends MQTT message on shower duration"></i></label>
|
||||
<div class="col-xs-9">
|
||||
<form>
|
||||
<label class="radio-inline">
|
||||
@@ -98,9 +98,9 @@
|
||||
</div>
|
||||
|
||||
<div class="row form-group">
|
||||
<label class="col-xs-3">Shower alert<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
|
||||
<label class="col-xs-3">Shower Alert<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
|
||||
aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right"
|
||||
data-content="Sends blasts of cold water after a fixed shower duration"></i></label>
|
||||
data-content="Tells boiler to blast 3 shots of cold water after a specific duration has exceeded (7 mins)"></i></label>
|
||||
<div class="col-xs-9">
|
||||
<form>
|
||||
<label class="radio-inline">
|
||||
@@ -112,9 +112,9 @@
|
||||
</div>
|
||||
|
||||
<div class="row form-group">
|
||||
<label class="col-xs-3">Publish time<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
|
||||
<label class="col-xs-3">Publish Time<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
|
||||
aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right"
|
||||
data-content="Publish Time in seconds"></i></label>
|
||||
data-content="How often to send MQTT topics with stats (in seconds)"></i></label>
|
||||
<span class="col-xs-9">
|
||||
<input class="form-control input-sm" placeholder="120" value="" style="display:inline;max-width:185px"
|
||||
id="publish_time" type="text">
|
||||
@@ -123,9 +123,9 @@
|
||||
</div>
|
||||
|
||||
<div class="row form-group">
|
||||
<label class="col-xs-3">Heating circuit<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
|
||||
<label class="col-xs-3">Heating Circuit<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
|
||||
aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right"
|
||||
data-content="Select main heating circuit to use"></i></label>
|
||||
data-content="Select the main heating circuit to use. Default is HC1."></i></label>
|
||||
<span class="col-xs-9 col-md-5">
|
||||
<select class="form-control input-sm" id="heating_circuit">
|
||||
<option selected="selected" value="1">HC1 (default)</option>
|
||||
@@ -143,7 +143,7 @@
|
||||
</div>
|
||||
|
||||
<h6 class="text-muted">Note: any setting marked with a <span
|
||||
class="glyphicon glyphicon-exclamation-sign text-danger"></span> requires a restart after saving.</h6>
|
||||
class="glyphicon glyphicon-exclamation-sign text-danger"></span> requires a system restart after saving.</h6>
|
||||
</div>
|
||||
|
||||
<div id="custom_statuscontent">
|
||||
@@ -151,7 +151,7 @@
|
||||
<div class="row text-left">
|
||||
<div class="col-md-8 col-md-offset-2">
|
||||
<h2>EMS Dashboard</h2>
|
||||
<p>Real-time values from the EMS-ESP device are shown here.</p>
|
||||
<h6>Real-time values from the EMS-ESP device are shown here</h6>
|
||||
</div>
|
||||
<div class="col-md-8 col-md-offset-2">
|
||||
<div class="panel panel-default table-responsive">
|
||||
@@ -228,4 +228,3 @@
|
||||
<button onclick="refreshStatus()" class="btn btn-primary">Refresh</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
<a href="#" id="mqtt"><i class="glyphicon glyphicon-link"></i>MQTT Settings</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="#" id="ntp"><i class="glyphicon glyphicon-hourglass"></i>NTP (Time) Settings</a>
|
||||
<a href="#" id="ntp"><i class="glyphicon glyphicon-hourglass"></i>Time Settings</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="#" id="custom"><i class="glyphicon glyphicon-wrench"></i>Custom Settings</a>
|
||||
@@ -67,7 +67,7 @@
|
||||
<a href="#" id="restart"><i class="glyphicon glyphicon-refresh"></i>Restart System</a>
|
||||
</li>
|
||||
<li>
|
||||
<a data-toggle="modal" href="#update"><i class="glyphicon glyphicon-open"></i>Check for Updates</a>
|
||||
<a data-toggle="modal" href="#update"><i class="glyphicon glyphicon-open"></i>Update Firmware</a>
|
||||
</li>
|
||||
</ul>
|
||||
<ul class="list-unstyled CTAs">
|
||||
@@ -261,8 +261,6 @@
|
||||
<br>
|
||||
</div>
|
||||
<div>
|
||||
<h4>Current Version:</h4>
|
||||
<h5 id="versionhead"></h5>
|
||||
<div class="form-group">
|
||||
<input id="binform" onchange="allowUpload();" type="file" name="update"
|
||||
accept=".bin">
|
||||
|
||||
@@ -22,13 +22,6 @@
|
||||
style="display:none;">
|
||||
</div>
|
||||
<br>
|
||||
<div>
|
||||
<legend>Restart</legend>
|
||||
<h6 class="text-muted">Click to restart your device without saving changes.</h6>
|
||||
<label for="restart" class="btn btn-link btn-sm">Restart Device</label>
|
||||
<button id="restart" class="btn btn-link btn-sm" onclick="restartESP();" style="display:none;"></button>
|
||||
</div>
|
||||
<br>
|
||||
<div id="restoremodal" class="modal fade" role="dialog">
|
||||
<div class="modal-dialog">
|
||||
<div class="modal-content">
|
||||
@@ -81,14 +74,14 @@
|
||||
</div>
|
||||
|
||||
<div id="generalcontent">
|
||||
<br>
|
||||
<br>
|
||||
<legend>General Settings</legend>
|
||||
<h6 class="text-muted">Setup general system settings</h6>
|
||||
<br>
|
||||
<div class="row form-group">
|
||||
<label class="col-xs-3">Admin Password<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
|
||||
aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right"
|
||||
data-content="Log On password"></i></label>
|
||||
data-content="Password for logging into the web console"></i></label>
|
||||
<span class="col-xs-9 col-md-5">
|
||||
<input class="form-control input-sm" placeholder="Administrator Password" id="adminpwd" type="password">
|
||||
</span>
|
||||
@@ -97,7 +90,7 @@
|
||||
<div class="row form-group">
|
||||
<label class="col-xs-3">Host Name<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
|
||||
aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right"
|
||||
data-content="Hostname. When Bonjour is installed on your computer you can access via http://hostname.local"></i></label>
|
||||
data-content="Unique name of the device, used in MQTT, AP SSID and web/telnet hostname"></i></label>
|
||||
<span class="col-xs-9 col-md-5">
|
||||
<input class="form-control input-sm" placeholder="Hostname" id="hostname" type="text">
|
||||
</span>
|
||||
@@ -107,7 +100,7 @@
|
||||
<div class="row form-group">
|
||||
<label class="col-xs-3">Serial Port<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
|
||||
aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right"
|
||||
data-content="Serial port for console output directly via USB as well as Telnet"></i></label>
|
||||
data-content="Enabling Serial port will echo Telnet output to the monitoring console via USB"></i></label>
|
||||
<div class="col-xs-9">
|
||||
<form>
|
||||
<label class="radio-inline">
|
||||
@@ -128,18 +121,18 @@
|
||||
</div>
|
||||
</div>
|
||||
<br>
|
||||
<br>
|
||||
</div>
|
||||
|
||||
<div id="eventcontent">
|
||||
<br>
|
||||
<br>
|
||||
<div class="text-center" id="loading-img">
|
||||
<h5>Please wait while fetching data...<span id="loadpages"></span></h5>
|
||||
<h5>Please wait while processing the log data...<span id="loadpages"></span></h5>
|
||||
<br>
|
||||
</div>
|
||||
<div>
|
||||
<br>
|
||||
<legend>Event Log</legend>
|
||||
<h6 class="text-muted">Dates shown in () represent elapsed time in seconds when NTP is disabled</h6>
|
||||
<br>
|
||||
<div class="panel panel-default">
|
||||
<div>
|
||||
<table id="eventtable" class="table" data-paging="true" data-filtering="true" data-sorting="true"
|
||||
@@ -155,14 +148,14 @@
|
||||
</div>
|
||||
|
||||
<div id="mqttcontent">
|
||||
<br>
|
||||
<br>
|
||||
<legend>MQTT Settings</legend>
|
||||
<h6 class="text-muted">Set up access to an MQTT broker</h6>
|
||||
<br>
|
||||
<div class="row form-group">
|
||||
<label class="col-xs-3">MQTT<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
|
||||
aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right"
|
||||
data-content="Please choose if you want to enable MQTT"></i></label>
|
||||
data-content="Enable or Disable MQTT support"></i></label>
|
||||
<div class="col-xs-9">
|
||||
<form>
|
||||
<label class="radio-inline">
|
||||
@@ -175,7 +168,7 @@
|
||||
<div class="row form-group">
|
||||
<label class="col-xs-3">IP<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign" aria-hidden="true"
|
||||
data-toggle="popover" data-trigger="hover" data-placement="right"
|
||||
data-content="MQTT server IP Address"></i></label>
|
||||
data-content="MQTT Server IP Address"></i></label>
|
||||
<span class="col-xs-9">
|
||||
<input class="form-control input-sm" placeholder="MQTT IP" style="display:inline;max-width:185px"
|
||||
id="mqttip" type="text">
|
||||
@@ -185,7 +178,7 @@
|
||||
<div class="row form-group">
|
||||
<label class="col-xs-3">Port<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
|
||||
aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right"
|
||||
data-content="MQTT server port"></i></label>
|
||||
data-content="MQTT Server port number"></i></label>
|
||||
<span class="col-xs-9">
|
||||
<input class="form-control input-sm" placeholder="MQTT Port" value="" style="display:inline;max-width:185px"
|
||||
id="mqttport" type="text">
|
||||
@@ -195,7 +188,7 @@
|
||||
<div class="row form-group">
|
||||
<label class="col-xs-3">Username<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
|
||||
aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right"
|
||||
data-content="MQTT username"></i></label>
|
||||
data-content="MQTT Server username (can be blank)"></i></label>
|
||||
<span class="col-xs-9">
|
||||
<input class="form-control input-sm" placeholder="" value="" style="display:inline;max-width:185px"
|
||||
id="mqttuser" type="text">
|
||||
@@ -205,7 +198,7 @@
|
||||
<div class="row form-group">
|
||||
<label class="col-xs-3">Password<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
|
||||
aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right"
|
||||
data-content="MQTT server password if any"></i></label>
|
||||
data-content="MQTT Server password (can be blank)"></i></label>
|
||||
<span class="col-xs-9">
|
||||
<input class="form-control input-sm" placeholder="" value="" style="display:inline;max-width:185px"
|
||||
id="mqttpwd" type="password">
|
||||
@@ -224,7 +217,7 @@
|
||||
<div class="row form-group">
|
||||
<label class="col-xs-3">Heartbeat<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
|
||||
aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right"
|
||||
data-content="enable/disable an automatic MQTT publish with system stats"></i></label>
|
||||
data-content="Enable or Disable an automatic MQTT topic publish with system stats"></i></label>
|
||||
<div class="col-xs-9">
|
||||
<form>
|
||||
<label class="radio-inline">
|
||||
@@ -242,14 +235,13 @@
|
||||
|
||||
<div id="networkcontent">
|
||||
<br>
|
||||
<br>
|
||||
<legend>Wi-Fi Settings</legend>
|
||||
<h6 class="text-muted">Type your Wi-Fi Network's SSID or Scan for nerby Wireless Networks to join.</h6>
|
||||
<legend>Wireless Settings</legend>
|
||||
<h6 class="text-muted">Enter the wireless network settings here, or use Scan to find nearby networks to join</h6>
|
||||
<br>
|
||||
<div class="row form-group">
|
||||
<label class="col-xs-3">Wi-Fi Mode<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
|
||||
<label class="col-xs-3">Mode<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
|
||||
aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right"
|
||||
data-content="You can run your ESP in AP Mode or Client Mode. In client mode you will need to connect to an existing Wi-Fi network, in AP Mode ESP creates a Wi-Fi network itself."></i></label>
|
||||
data-content="You can run your ESP in AP Mode (non-captive) or join an existing wireless network"></i></label>
|
||||
<div class="col-xs-9">
|
||||
<form>
|
||||
<label class="radio-inline">
|
||||
@@ -263,7 +255,7 @@
|
||||
<div class="row form-group" style="display:none" id="hidessid">
|
||||
<label class="col-xs-3">SSID<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
|
||||
aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right"
|
||||
data-content="Wi-Fi Network's Name"></i></label>
|
||||
data-content="wifi Network Name"></i></label>
|
||||
<span class="col-xs-7 col-md-5">
|
||||
<input class="form-control input-sm" id="inputtohide" type="text" name="ap_ssid">
|
||||
<select class="form-control input-sm" style="display:none;" id="ssid" onchange="listBSSID();"></select>
|
||||
@@ -276,7 +268,7 @@
|
||||
<div class="row form-group" style="display:none" id="hidepasswd">
|
||||
<label class="col-xs-3">Password<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
|
||||
aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right"
|
||||
data-content="Wi-Fi Password"></i></label>
|
||||
data-content="wifi Password"></i></label>
|
||||
<span class="col-xs-9 col-md-5">
|
||||
<input id="wifipass" class="form-control input-sm" name="ap_passwd" type="password">
|
||||
</span>
|
||||
@@ -288,10 +280,10 @@
|
||||
</div>
|
||||
|
||||
<div id="ntpcontent">
|
||||
<br>
|
||||
<br>
|
||||
<legend>Time Settings</legend>
|
||||
<h6 class="text-muted">Daylight saving times are taken into account</h6>
|
||||
<h6 class="text-muted">With NTP enabled, all times are adjusted to the local timezone and respect daylight saving
|
||||
time (DST)</h6>
|
||||
<br>
|
||||
<div class="row form-group">
|
||||
<label class="col-xs-3">Device Time</label>
|
||||
@@ -325,9 +317,9 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="row form-group">
|
||||
<label class="col-xs-3">NTP Server<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
|
||||
<label class="col-xs-3">NTP Server Address<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
|
||||
aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right"
|
||||
data-content="The server for the time sync. Choose nearest server for better accuracy, see https://www.ntppool.org for servers nearby."></i></label>
|
||||
data-content="The URL or IP of the NTP server. Choose the nearest server for better accuracy (see https://www.ntppool.org)"></i></label>
|
||||
<span class="col-xs-9 col-md-5">
|
||||
<input class="form-control input-sm" placeholder="eg. pool.ntp.org" value="pool.ntp.org" id="ntpserver"
|
||||
type="text">
|
||||
@@ -335,52 +327,14 @@
|
||||
<br>
|
||||
</div>
|
||||
<div class="row form-group">
|
||||
<label class="col-xs-3">Intervals<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
|
||||
<label class="col-xs-3">Refresh Time<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
|
||||
aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right"
|
||||
data-content="Intervals between Time Sync in Minutes"></i></label>
|
||||
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">
|
||||
</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="DropDownTimezone" id="DropDownTimezone">
|
||||
<option value="-12">(GMT -12:00) Eniwetok, Kwajalein</option>
|
||||
<option value="-11">(GMT -11:00) Midway Island, Samoa</option>
|
||||
<option value="-10">(GMT -10:00) Hawaii</option>
|
||||
<option value="-9">(GMT -9:00) Alaska</option>
|
||||
<option value="-8">(GMT -8:00) Pacific Time (US & Canada)</option>
|
||||
<option value="-7">(GMT -7:00) Mountain Time (US & Canada)</option>
|
||||
<option value="-6">(GMT -6:00) Central Time (US & Canada), Mexico City</option>
|
||||
<option value="-5">(GMT -5:00) Eastern Time (US & Canada), Bogota, Lima</option>
|
||||
<option value="-4">(GMT -4:00) Atlantic Time (Canada), Caracas, La Paz</option>
|
||||
<option value="-3.5">(GMT -3:30) Newfoundland</option>
|
||||
<option value="-3">(GMT -3:00) Brazil, Buenos Aires, Georgetown</option>
|
||||
<option value="-2">(GMT -2:00) Mid-Atlantic</option>
|
||||
<option value="-1">(GMT -1:00 hour) Azores, Cape Verde Islands</option>
|
||||
<option value="0">(GMT) Western Europe Time, London, Lisbon, Casablanca</option>
|
||||
<option selected="selected" value="1">(GMT +1:00 hour) Brussels, Copenhagen, Madrid, Paris</option>
|
||||
<option value="2">(GMT +2:00) Kaliningrad, South Africa</option>
|
||||
<option value="3">(GMT +3:00) Baghdad, Riyadh, Moscow, St. Petersburg</option>
|
||||
<option value="3.5">(GMT +3:30) Tehran</option>
|
||||
<option value="4">(GMT +4:00) Abu Dhabi, Muscat, Baku, Tbilisi</option>
|
||||
<option value="4.5">(GMT +4:30) Kabul</option>
|
||||
<option value="5">(GMT +5:00) Ekaterinburg, Islamabad, Karachi, Tashkent</option>
|
||||
<option value="5.5">(GMT +5:30) Bombay, Calcutta, Madras, New Delhi</option>
|
||||
<option value="5.75">(GMT +5:45) Kathmandu</option>
|
||||
<option value="6">(GMT +6:00) Almaty, Dhaka, Colombo</option>
|
||||
<option value="7">(GMT +7:00) Bangkok, Hanoi, Jakarta</option>
|
||||
<option value="8">(GMT +8:00) Beijing, Perth, Singapore, Hong Kong</option>
|
||||
<option value="9">(GMT +9:00) Tokyo, Seoul, Osaka, Sapporo, Yakutsk</option>
|
||||
<option value="9.5">(GMT +9:30) Adelaide, Darwin</option>
|
||||
<option value="10">(GMT +10:00) Eastern Australia, Guam, Vladivostok</option>
|
||||
<option value="11">(GMT +11:00) Magadan, Solomon Islands, New Caledonia</option>
|
||||
<option value="12">(GMT +12:00) Auckland, Wellington, Fiji, Kamchatka</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>
|
||||
@@ -388,14 +342,14 @@
|
||||
</div>
|
||||
|
||||
<div id="statuscontent">
|
||||
<br><br>
|
||||
<legend>System Status</legend>
|
||||
<br>
|
||||
<div class="row text-left">
|
||||
<div class="col-md-8 col-md-offset-2">
|
||||
<h2>System Status</h2>
|
||||
<h6>Current health of the ESP is displayed here</h6>
|
||||
<div class="panel panel-default table-responsive">
|
||||
<table class="table table-hover table-striped table-condensed">
|
||||
<caption>System</caption>
|
||||
<caption>General</caption>
|
||||
<tr>
|
||||
<th>Uptime</th>
|
||||
<td id="uptime"></td>
|
||||
@@ -463,7 +417,6 @@
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div class="panel panel-default table-responsive">
|
||||
<table class="table">
|
||||
<caption>MQTT</caption>
|
||||
|
||||
@@ -3,7 +3,6 @@ var version = "";
|
||||
var websock = null;
|
||||
var wsUri = "ws://" + window.location.host + "/ws";
|
||||
var utcSeconds;
|
||||
var timezone;
|
||||
var data = [];
|
||||
var ajaxobj;
|
||||
|
||||
@@ -31,7 +30,6 @@ var config = {
|
||||
"ntp": {
|
||||
"server": "pool.ntp.org",
|
||||
"interval": 30,
|
||||
"timezone": 1,
|
||||
"enabled": true
|
||||
}
|
||||
};
|
||||
@@ -74,7 +72,6 @@ function listntp() {
|
||||
|
||||
document.getElementById("ntpserver").value = config.ntp.server;
|
||||
document.getElementById("intervals").value = config.ntp.interval;
|
||||
document.getElementById("DropDownTimezone").value = config.ntp.timezone;
|
||||
|
||||
if (config.ntp.enabled) {
|
||||
$("input[name=\"ntpenabled\"][value=\"1\"]").prop("checked", true);
|
||||
@@ -108,7 +105,6 @@ function custom_uncommited() {
|
||||
function saventp() {
|
||||
config.ntp.server = document.getElementById("ntpserver").value;
|
||||
config.ntp.interval = parseInt(document.getElementById("intervals").value);
|
||||
config.ntp.timezone = parseInt(document.getElementById("DropDownTimezone").value);
|
||||
|
||||
config.ntp.enabled = false;
|
||||
if (parseInt($("input[name=\"ntpenabled\"]:checked").val()) === 1) {
|
||||
@@ -689,7 +685,6 @@ function socketMessageListener(evt) {
|
||||
break;
|
||||
case "gettime":
|
||||
utcSeconds = obj.epoch;
|
||||
timezone = obj.timezone;
|
||||
deviceTime();
|
||||
break;
|
||||
case "ssidlist":
|
||||
@@ -958,7 +953,6 @@ function getLatestReleaseInfo() {
|
||||
$("#releasehead").text(releaseInfo);
|
||||
$("#releasebody").text(release.body);
|
||||
$("#releaseinfo").fadeIn("slow");
|
||||
$("#versionhead").text(version);
|
||||
}).error(function () { $("#onlineupdate").html("<h5>Couldn't get release details. Make sure there is an Internet connection.</h5>"); });
|
||||
}
|
||||
|
||||
|
||||
@@ -90,7 +90,6 @@ var configfile = {
|
||||
"ntp": {
|
||||
"server": "pool.ntp.org",
|
||||
"interval": "30",
|
||||
"timezone": "0",
|
||||
"enabled": false
|
||||
}
|
||||
};
|
||||
@@ -227,7 +226,6 @@ wss.on('connection', function connection(ws) {
|
||||
var res = {};
|
||||
res.command = "gettime";
|
||||
res.epoch = Math.floor((new Date).getTime() / 1000);
|
||||
res.timezone = configfile.timezone;
|
||||
wss.broadcast(res);
|
||||
break;
|
||||
case "settime":
|
||||
@@ -235,7 +233,6 @@ wss.on('connection', function connection(ws) {
|
||||
var res = {};
|
||||
res.command = "gettime";
|
||||
res.epoch = Math.floor((new Date).getTime() / 1000);
|
||||
res.timezone = configfile.timezone;
|
||||
wss.broadcast(res);
|
||||
break;
|
||||
case "getconf":
|
||||
|
||||
Reference in New Issue
Block a user