mirror of
https://github.com/lumapu/ahoy.git
synced 2025-05-11 07:56:39 +02:00
Pacth from homeautomation22
This commit is contained in:
parent
2df3c26657
commit
000ed8ac53
12 changed files with 191 additions and 38 deletions
|
@ -28,10 +28,15 @@
|
|||
<a href="/live">Visualization</a><br/>
|
||||
<br/>
|
||||
<a href="/setup">Setup</a><br/>
|
||||
<br/>
|
||||
<a href="/serial">Webserial & Commands</a><br/>
|
||||
</p>
|
||||
<p><span class="des">Uptime: </span><span id="uptime"></span></p>
|
||||
<p><span class="des">ESP-Time: </span><span id="date"></span></p>
|
||||
<div id="sun">
|
||||
<span class="des">Sunrise: </span><span id="sunrise"></span><br>
|
||||
<span class="des">Sunset: </span><span id="sunset"></span>
|
||||
</div>
|
||||
<p><span class="des">WiFi RSSI: </span><span id="wifi_rssi"></span> dBm</p>
|
||||
<p>
|
||||
<span class="des">Statistics: </span>
|
||||
|
@ -95,6 +100,8 @@
|
|||
var hrs = parseInt(up / 3600) % 24;
|
||||
var min = parseInt(up / 60) % 60;
|
||||
var sec = up % 60;
|
||||
var sunrise = new Date(obj["ts_sunrise"] * 1000);
|
||||
var sunset = new Date(obj["ts_sunset"] * 1000);
|
||||
document.getElementById("uptime").innerHTML = days + " Days, "
|
||||
+ ("0"+hrs).substr(-2) + ":"
|
||||
+ ("0"+min).substr(-2) + ":"
|
||||
|
@ -109,6 +116,13 @@
|
|||
dSpan.appendChild(span("", ["span"], "apiResult"));
|
||||
e.addEventListener("click", setTime);
|
||||
}
|
||||
document.getElementById("sunrise").innerHTML = sunrise.toLocaleString('de-DE', {timeZone: 'UTC'});
|
||||
document.getElementById("sunset").innerHTML = sunset.toLocaleString('de-DE', {timeZone: 'UTC'});
|
||||
|
||||
if(!obj["ts_sun_upd"]) {
|
||||
var elem = document.getElementById("sun");
|
||||
elem.parentNode.removeChild(elem);
|
||||
}
|
||||
}
|
||||
|
||||
function parseStat(obj) {
|
||||
|
@ -116,7 +130,7 @@
|
|||
+ "\nRX fail: " + obj["rx_fail"]
|
||||
+ "\nRX no answer: " + obj["rx_fail_answer"]
|
||||
+ "\nFrames received: " + obj["frame_cnt"]
|
||||
+ "\nTX Cnt: " + obj["tx_cnt"];
|
||||
+ "\nTX cnt: " + obj["tx_cnt"];
|
||||
}
|
||||
|
||||
function parseIv(obj) {
|
||||
|
|
|
@ -72,6 +72,20 @@
|
|||
</fieldset>
|
||||
</div>
|
||||
|
||||
<button type="button" class="s_collapsible">Sunrise & Sunset</button>
|
||||
<div class="s_content">
|
||||
<fieldset>
|
||||
<legend class="des">Sunrise & Sunset</legend>
|
||||
<label for="sunLat">Latitude (decimal)</label>
|
||||
<input type="text" class="text" name="sunLat"/>
|
||||
<label for="sunLon">Longitude (decimal)</label>
|
||||
<input type="text" class="text" name="sunLon"/>
|
||||
<br>
|
||||
<label for="sunDisNightCom">disable night communication</label>
|
||||
<input type="checkbox" class="cb" name="sunDisNightCom"/><br/>
|
||||
</fieldset>
|
||||
</div>
|
||||
|
||||
<button type="button" class="s_collapsible">MQTT</button>
|
||||
<div class="s_content">
|
||||
<fieldset>
|
||||
|
@ -156,10 +170,9 @@
|
|||
|
||||
function setTime() {
|
||||
var date = new Date();
|
||||
var offset = date.getTimezoneOffset() * -60;
|
||||
var obj = new Object();
|
||||
obj.cmd = "set_time";
|
||||
obj.ts = parseInt(offset + (date.getTime() / 1000));
|
||||
obj.ts = parseInt(date.getTime() / 1000);
|
||||
getAjax("/api/setup", apiCbNtp, "POST", JSON.stringify(obj));
|
||||
}
|
||||
|
||||
|
@ -219,7 +232,7 @@
|
|||
}
|
||||
});
|
||||
|
||||
for(var i of [["Name", "name", "Name*", 32]]) { // so richtig?
|
||||
for(var i of [["Name", "name", "Name*", 32]]) {
|
||||
iv.appendChild(lbl(id + i[0], i[2]));
|
||||
iv.appendChild(inp(id + i[0], obj[i[1]], i[3]));
|
||||
}
|
||||
|
@ -271,6 +284,12 @@
|
|||
document.getElementsByName(i[0])[0].value = obj[i[1]];
|
||||
}
|
||||
|
||||
function parseSun(obj) {
|
||||
document.getElementsByName("sunLat")[0].value = obj["lat"];
|
||||
document.getElementsByName("sunLon")[0].value = obj["lon"];
|
||||
document.getElementsByName("sunDisNightCom")[0].checked = obj["disnightcom"];
|
||||
}
|
||||
|
||||
function parsePinout(obj) {
|
||||
var e = document.getElementById("pinout");
|
||||
pins = [['cs', 'pinCs'], ['ce', 'pinCe'], ['irq', 'pinIrq']];
|
||||
|
@ -321,6 +340,7 @@
|
|||
parseIv(root["inverter"]);
|
||||
parseMqtt(root["mqtt"]);
|
||||
parseNtp(root["ntp"]);
|
||||
parseSun(root["sun"]);
|
||||
parsePinout(root["pinout"]);
|
||||
parseRadio(root["radio"]);
|
||||
parseSerial(root["serial"]);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue