VladislavOstapov/terminal-web-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

добавил получение sysinfo и вывод аптайма в веб-морде

Browse Source
This commit is contained in:
Vladislav Ostapov
2025-01-09 12:02:42 +03:00
parent ab654a754c
commit 20cf08e2a1
5 changed files with 78 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
static/main-scpc.html
View File

@@ -118,6 +118,7 @@
<tr><th>Температура ADRV</th><td>{{ stat_device.adrv }} °C</td></tr>
<tr><th>Температура ZYNQ</th><td>{{ stat_device.zynq }} °C</td></tr>
<tr><th>Температура FPGA</th><td>{{ stat_device.fpga }} °C</td></tr>
<tr><th>Uptime</th><td>{{ stat_os.uptime }}</td></tr>
</tbody>
</table>
</div>
@@ -849,6 +850,7 @@
stat_device: { // температурные датчики
adrv: 0, zynq: 0, fpga: 0
},
stat_os: {uptime: '?'},
param: {
general: {
@@ -1037,6 +1039,21 @@
this.stat_device.fpga = vals["mainState"]["device.fpga"]
this.testState = vals["mainState"]["testState"]
// аптайм приходит в секундах, надо преобразовать его в человеко-читаемый вид
let uptime = vals["sysinfo"]["uptime"]
if (uptime) {
let secs = uptime % 60; uptime = Math.floor(uptime / 60)
let mins = uptime % 60; uptime = Math.floor(uptime / 60)
let hours = uptime % 24
uptime = Math.floor( uptime / 24)
let res = `${mins}m ${secs}s`
if (hours > 0) { res = `${hours}h ` + res }
if (uptime > 0) { res = `${uptime}d ` + res }
this.stat_os.uptime = res
} else {
this.stat_os.uptime = '?'
}
},
resetPacketsStatistics() {

17
static/main-tdma.html
View File

@@ -105,6 +105,7 @@
<tr><th>Температура ADRV</th><td>{{ stat_device.adrv }} °C</td></tr>
<tr><th>Температура ZYNQ</th><td>{{ stat_device.zynq }} °C</td></tr>
<tr><th>Температура FPGA</th><td>{{ stat_device.fpga }} °C</td></tr>
<tr><th>Uptime</th><td>{{ stat_os.uptime }}</td></tr>
</tbody>
</table>
</div>
@@ -641,6 +642,7 @@
stat_device: { // температурные датчики
adrv: 0, zynq: 0, fpga: 0
},
stat_os: {uptime: '?'},
param: {
tx: {
@@ -775,6 +777,21 @@
this.stat_device.fpga = vals["mainState"]["device.fpga"]
this.testState = vals["mainState"]["testState"]
// аптайм приходит в секундах, надо преобразовать его в человеко-читаемый вид
let uptime = vals["sysinfo"]["uptime"]
if (uptime) {
let secs = uptime % 60; uptime = Math.floor(uptime / 60)
let mins = uptime % 60; uptime = Math.floor(uptime / 60)
let hours = uptime % 24
uptime = Math.floor( uptime / 24)
let res = `${mins}m ${secs}s`
if (hours > 0) { res = `${hours}h ` + res }
if (uptime > 0) { res = `${uptime}d ` + res }
this.stat_os.uptime = res
} else {
this.stat_os.uptime = '?'
}
},
resetPacketsStatistics() {