mirror of
https://github.com/lumapu/ahoy.git
synced 2025-08-06 01:48:19 +02:00
0.8.134
* redesigned `/system`
This commit is contained in:
lumapu
parent
a7702437f1
commit
5b6ffcc07b
12 changed files with 276 additions and 146 deletions
|
|
@ -8,7 +8,7 @@
|
|||
{#HTML_NAV}
|
||||
<div id="wrapper">
|
||||
<div id="content">
|
||||
<div id="info" class="col-sm-12 col-md-6 mt-3"></div>
|
||||
<div id="info" class="col-sm-12 col-md-10 mt-3"></div>
|
||||
<div id="html" class="mt-3 mb-3"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -21,17 +21,31 @@
|
|||
parseTitle(obj)
|
||||
}
|
||||
|
||||
function parseSysInfo(obj) {
|
||||
const data = ["sdk", "cpu_freq", "chip_revision", "device_name",
|
||||
"chip_model", "chip_cores", "esp_type", "mac", "wifi_rssi", "wifi_channel", "ts_uptime",
|
||||
"flash_size", "sketch_used", "heap_total", "heap_free", "heap_frag",
|
||||
"max_free_blk", "version", "modules", "env", "core_version", "reboot_reason", "is_eth_con"];
|
||||
function parseUptime(up) {
|
||||
var days = parseInt(up / 86400) % 365
|
||||
var hrs = parseInt(up / 3600) % 24
|
||||
var min = parseInt(up / 60) % 60
|
||||
var sec = up % 60
|
||||
var str = days + " day"
|
||||
if(1 != days)
|
||||
str += "s"
|
||||
str += ", " + ("0"+hrs).substr(-2) + ":"
|
||||
+ ("0"+min).substr(-2) + ":"
|
||||
+ ("0"+sec).substr(-2)
|
||||
|
||||
lines = [];
|
||||
for (const [key, value] of Object.entries(obj)) {
|
||||
if(!data.includes(key) || (typeof value == 'undefined')) continue;
|
||||
lines.push(tr(key.replace('_', ' '), value));
|
||||
}
|
||||
return ml("span", {}, str)
|
||||
}
|
||||
|
||||
function parseSysInfo(obj) {
|
||||
lines = [
|
||||
tr("{#DEVICE_NAME}", obj.device_name),
|
||||
tr("{#UPTIME}", parseUptime(obj.generic.ts_uptime)),
|
||||
tr("{#REBOOT_REASON}", obj.chip.reboot_reason),
|
||||
tr("{#ENVIRONMENT}", obj.generic.env + " ({#BUILD_OPTIONS}: " + obj.generic.modules + ")"),
|
||||
tr("Version", obj.generic.version + " - " + obj.generic.build),
|
||||
tr("Chip", "CPU: " + obj.chip.cpu_freq + "MHz, " + obj.chip.cores + " Core(s)"),
|
||||
tr("Chip Model", obj.chip.model)
|
||||
]
|
||||
|
||||
document.getElementById("info").append(
|
||||
headline("System Information"),
|
||||
|
|
@ -47,9 +61,9 @@
|
|||
|
||||
function irqBadge(state) {
|
||||
switch(state) {
|
||||
case 0: return badge(false, "{#UNKNOWN}", "warning"); break;
|
||||
case 1: return badge(true, "{#TRUE}"); break;
|
||||
default: return badge(false, "{#FALSE}"); break;
|
||||
case 0: return badge(false, "unknown", "warning"); break;
|
||||
case 1: return badge(true, "true"); break;
|
||||
default: return badge(false, "false"); break;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -58,16 +72,16 @@
|
|||
|
||||
if(obj.radioNrf.en) {
|
||||
lines = [
|
||||
tr("NRF24L01", badge(obj.radioNrf.isconnected, ((obj.radioNrf.isconnected) ? "" : "{#NOT} ") + "{#CONNECTED}")),
|
||||
tr("{#IRQ_WORKING}", irqBadge(obj.radioNrf.irqOk)),
|
||||
tr("{#NRF24_DATA_RATE}", dr[obj.radioNrf.dataRate] + "bps"),
|
||||
tr("NRF24L01", badge(obj.radioNrf.isconnected, ((obj.radioNrf.isconnected) ? "" : "not ") + "connected")),
|
||||
tr("Interrupt Pin working", irqBadge(obj.radioNrf.irqOk)),
|
||||
tr("NRF24 Data Rate", dr[obj.radioNrf.dataRate] + "bps"),
|
||||
tr("DTU Radio ID", obj.radioNrf.sn)
|
||||
];
|
||||
} else
|
||||
lines = [tr("NRF24L01", badge(false, "{#NOT_ENABLED}"))];
|
||||
lines = [tr("NRF24L01", badge(false, "not enabled"))];
|
||||
|
||||
document.getElementById("info").append(
|
||||
headline("{#NRF24_RADIO}"),
|
||||
headline("Radio NRF24"),
|
||||
ml("table", {class: "table"},
|
||||
ml("tbody", {}, lines)
|
||||
)
|
||||
|
|
@ -76,15 +90,15 @@
|
|||
/*IF_ESP32*/
|
||||
if(obj.radioCmt.en) {
|
||||
cmt = [
|
||||
tr("CMT2300A", badge(obj.radioCmt.isconnected, ((obj.radioCmt.isconnected) ? "" : "{#NOT} ") + "{#CONNECTED}")),
|
||||
tr("{#IRQ_WORKING}", irqBadge(obj.radioCmt.irqOk)),
|
||||
tr("CMT2300A", badge(obj.radioCmt.isconnected, ((obj.radioCmt.isconnected) ? "" : "not ") + "connected")),
|
||||
tr("Interrupt Pin working", irqBadge(obj.radioCmt.irqOk)),
|
||||
tr("DTU Radio ID", obj.radioCmt.sn)
|
||||
];
|
||||
} else
|
||||
cmt = [tr("CMT2300A", badge(false, "{#NOT_ENABLED}"))];
|
||||
cmt = [tr("CMT2300A", badge(false, "not enabled"))];
|
||||
|
||||
document.getElementById("info").append(
|
||||
headline("{#CMT_RADIO}"),
|
||||
headline("Radio CMT"),
|
||||
ml("table", {class: "table"},
|
||||
ml("tbody", {}, cmt)
|
||||
)
|
||||
|
|
@ -92,16 +106,32 @@
|
|||
/*ENDIF_ESP32*/
|
||||
}
|
||||
|
||||
function parseNetwork(obj, gen) {
|
||||
lines = [
|
||||
tr("connection", ((obj.wired) ? "{#WIRED}" : "{#WIFI} (SSID: " + obj.ssid + ", RSSI: " + gen.wifi_rssi + ", CH: " + obj.wifi_channel + ")")),
|
||||
tr("Hostname", gen.host),
|
||||
tr("IP {#ADDRESS}", obj.ip),
|
||||
tr("MAC {#ADDRESS}", obj.mac)
|
||||
]
|
||||
|
||||
document.getElementById("info").append(
|
||||
headline("{#NETWORK}"),
|
||||
ml("table", {class: "table"},
|
||||
ml("tbody", {}, lines)
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
function parseMqtt(obj) {
|
||||
if(obj.enabled) {
|
||||
lines = [
|
||||
tr("{#CONNECTED}", badge(obj.connected, ((obj.connected) ? "{#TRUE}" : "{#FALSE}"))),
|
||||
tr("connected", badge(obj.connected, ((obj.connected) ? "true" : "false"))),
|
||||
tr("#TX", obj.tx_cnt),
|
||||
tr("#RX", obj.rx_cnt)
|
||||
];
|
||||
]
|
||||
|
||||
} else
|
||||
lines = tr("{#ENABLED}", badge(false, "{#FALSE}"));
|
||||
lines = tr("enabled", badge(false, "false"));
|
||||
|
||||
document.getElementById("info").append(
|
||||
headline("MqTT"),
|
||||
|
|
@ -111,30 +141,34 @@
|
|||
);
|
||||
}
|
||||
|
||||
/*IF_ETHERNET*/
|
||||
function parseEthernet(obj) {
|
||||
lines = tr("{#CONNECTION_TYPE}", ((obj.wired) ? "{#WIRED}" : "{#WIFI}"));
|
||||
function parseMemory(obj) {
|
||||
lines = [
|
||||
tr("Flash size", obj.flash_size / 1024 / 1024 + "MB"),
|
||||
tr("{#CONFIG_PARTITION} (" + Math.round(obj.par_used_spiffs / 1024) + "kB of " + obj.par_size_spiffs / 1024 + "kB)", progress(obj.par_used_spiffs / obj.par_size_spiffs * 100)),
|
||||
tr("{#FIRMWARE_PARTITION} (" + Math.round(obj.par_used_app0 / 1024) + "kB of " + obj.par_size_app0 / 1024 + "kB)", progress(obj.par_used_app0 / obj.par_size_app0 * 100)),
|
||||
tr("Heap (" + Math.round(obj.heap_free / 1024) + "kB of " + Math.round(obj.heap_total / 1024) + "kB)", progress(obj.heap_free / obj.heap_total * 100)),
|
||||
tr("Heap max free block", Math.round(obj.heap_max_free_blk / 1024) + "kB (Fragmentation: " + obj.heap_frag + ")")
|
||||
]
|
||||
|
||||
document.getElementById("info").append(
|
||||
headline("{#NETWORK}"),
|
||||
headline("{#MEMORY}"),
|
||||
ml("table", {class: "table"},
|
||||
ml("tbody", {}, lines)
|
||||
)
|
||||
);
|
||||
}
|
||||
/*ENDIF_ETHERNET*/
|
||||
|
||||
function parseIndex(obj) {
|
||||
if(obj.ts_sunrise > 0) {
|
||||
document.getElementById("info").append(
|
||||
headline("{#SUN}"),
|
||||
headline("Sun"),
|
||||
ml("table", {class: "table"},
|
||||
ml("tbody", {}, [
|
||||
tr("{#SUNRISE}", new Date(obj.ts_sunrise * 1000).toLocaleString('de-DE')),
|
||||
tr("{#SUNSET}", new Date(obj.ts_sunset * 1000).toLocaleString('de-DE')),
|
||||
tr("{#COMMUNICATION_START}", new Date((obj.ts_sunrise + obj.ts_offsSr) * 1000).toLocaleString('de-DE')),
|
||||
tr("{#COMMUNICATION_STOP}", new Date((obj.ts_sunset + obj.ts_offsSs) * 1000).toLocaleString('de-DE')),
|
||||
tr("{#NIGHT_BEHAVE}", badge(obj.disNightComm, ((obj.disNightComm) ? "{#NOT}" : "") + " {#COMMUNICATING}", "warning"))
|
||||
tr("sunrise", new Date(obj.ts_sunrise * 1000).toLocaleString('de-DE')),
|
||||
tr("sunset", new Date(obj.ts_sunset * 1000).toLocaleString('de-DE')),
|
||||
tr("Communication start", new Date((obj.ts_sunrise + obj.ts_offsSr) * 1000).toLocaleString('de-DE')),
|
||||
tr("Communication stop", new Date((obj.ts_sunset + obj.ts_offsSs) * 1000).toLocaleString('de-DE')),
|
||||
tr("Night behaviour", badge(obj.disNightComm, ((obj.disNightComm) ? "not" : "") + " communicating", "warning"))
|
||||
])
|
||||
)
|
||||
);
|
||||
|
|
@ -152,10 +186,9 @@
|
|||
document.getElementsByTagName('head')[0].appendChild(meta);
|
||||
} else if(null != obj.system) {
|
||||
parseRadio(obj.system)
|
||||
parseNetwork(obj.system.network, obj.system.generic)
|
||||
parseMqtt(obj.system.mqtt)
|
||||
/*IF_ETHERNET*/
|
||||
parseEthernet(obj.system.eth)
|
||||
/*ENDIF_ETHERNET*/
|
||||
parseMemory(obj.system.memory)
|
||||
parseSysInfo(obj.system)
|
||||
getAjax('/api/index', parseIndex)
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue