3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-05-10 23:46:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

added link to git commit from git sha in footer (feature request from @stefan123t)

Browse source
This commit is contained in:
lumapu 2022-10-22 23:35:56 +02:00
parent 1d385b1d60
commit 2a3c267906
7 changed files with 34 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
tools/esp8266/html/api.js
View file

@ -93,3 +93,12 @@ function span(val, cl=null, id=null) {
function br() {
return document.createElement('br');
}
function link(dst, text, target=null) {
var a = document.createElement('a');
var t = document.createTextNode(text);
a.href = dst;
a.target = target;
a.appendChild(t);
return a;
}

13
tools/esp8266/html/index.html
View file

@ -65,7 +65,7 @@
<p class="right"><a href="/api">REST API</a></p>
</div>
<script type="text/javascript">
var mIntervalSet = false;
var exeOnce = true;
function apiCb(obj) {
var e = document.getElementById("apiResult");
@ -88,8 +88,11 @@
function parseSys(obj) {
// Disclaimer
//if(obj["disclaimer"] == false) sessionStorage.setItem("gDisclaimer", promptFunction());
document.getElementById("version").innerHTML = "Git SHA: " + obj["build"] + " :: " + obj["version"];
if(true == exeOnce) {
document.getElementById("version").appendChild(
link("https://github.com/lumapu/ahoy/commits/" + obj["build"], "Git SHA: " + obj["build"] + " :: " + obj["version"], "_blank")
);
}
document.getElementById("wifi_rssi").innerHTML = obj["wifi_rssi"];
var date = new Date(obj["ts_now"] * 1000);
@ -175,9 +178,9 @@
parseIv(obj["inverter"]);
parseWarnInfo(obj["warnings"], obj["infos"]);
document.getElementById("refresh").innerHTML = obj["refresh_interval"];
if(false == mIntervalSet) {
if(true == exeOnce) {
window.setInterval("getAjax('/api/index', parse)", obj["refresh_interval"] * 1000);
mIntervalSet = true;
exeOnce = false;
}
}
else

4
tools/esp8266/html/serial.html
View file

@ -74,7 +74,9 @@
+ ("0"+sec).substr(-2);
if(false == mIntervalSet) {
document.getElementById("version").innerHTML = "Git SHA: " + obj["build"] + " :: " + obj["version"];
document.getElementById("version").appendChild(
link("https://github.com/lumapu/ahoy/commits/" + obj["build"], "Git SHA: " + obj["build"] + " :: " + obj["version"], "_blank")
);
window.setInterval("getAjax('/api/system', parseSys)", 10000);
mIntervalSet = true;
}

4
tools/esp8266/html/setup.html
View file

@ -268,7 +268,9 @@
function parseSys(obj) {
for(var i of [["device", "device_name"], ["ssid", "ssid"]])
document.getElementsByName(i[0])[0].value = obj[i[1]];
document.getElementById("version").innerHTML = "Git SHA: " + obj["build"] + " :: " + obj["version"];
document.getElementById("version").appendChild(
link("https://github.com/lumapu/ahoy/commits/" + obj["build"], "Git SHA: " + obj["build"] + " :: " + obj["version"], "_blank")
);
}
function parseIv(obj) {

4
tools/esp8266/html/update.html
View file

@ -26,7 +26,9 @@
</div>
<script type="text/javascript">
function parseSys(obj) {
document.getElementById("version").innerHTML = "Git SHA: " + obj["build"] + " :: " + obj["version"];
document.getElementById("version").appendChild(
link("https://github.com/lumapu/ahoy/commits/" + obj["build"], "Git SHA: " + obj["build"] + " :: " + obj["version"], "_blank")
);
}
getAjax("/api/system", parseSys);

11
tools/esp8266/html/visualization.html
View file

@ -19,9 +19,12 @@
<p class="right" id="version"></p>
</div>
<script type="text/javascript">
var intervalSet = false;
var exeOnce = true;
function parseSys(obj) {
document.getElementById("version").innerHTML = "Git SHA: " + obj["build"] + " :: " + obj["version"];
if(exeOnce == true) {
document.getElementById("version").appendChild(
link("https://github.com/lumapu/ahoy/commits/" + obj["build"], "Git SHA: " + obj["build"] + " :: " + obj["version"], "_blank")
);}
}
function parseIv(obj, root) {
@ -111,9 +114,9 @@
parseSys(obj["system"]);
parseIv(obj["inverter"], obj);
document.getElementById("refresh").innerHTML = obj["refresh_interval"];
if(false == intervalSet) {
if(true == exeOnce) {
window.setInterval("getAjax('/api/live', parse)", obj["refresh_interval"] * 1000);
intervalSet = true;
exeOnce = false;
}
}
else

2
tools/esp8266/scripts/auto_firmware_version.py
View file

@ -21,7 +21,7 @@ def get_firmware_specifier_build_flag():
except:
build_version = "g0000000"
build_flag = "-D AUTO_GIT_HASH=\\\"" + build_version + "\\\""
build_flag = "-D AUTO_GIT_HASH=\\\"" + build_version[1:] + "\\\""
print ("Firmware Revision: " + build_version)
return (build_flag)