patrick/OpenDTU
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Show current limit in header of live view

Browse Source
This commit is contained in:
Thomas Basler 2022-10-14 19:16:37 +02:00
parent 8d6cbc617b
commit d37543fd95
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/WebApi_ws_live.cpp
View File

@ -87,6 +87,12 @@ void WebApiWsLiveClass::generateJsonResponse(JsonVariant& root)
root[i][F("data_age")] = (millis() - inv->Statistics()->getLastUpdate()) / 1000; root[i][F("data_age")] = (millis() - inv->Statistics()->getLastUpdate()) / 1000;
root[i][F("reachable")] = inv->isReachable(); root[i][F("reachable")] = inv->isReachable();
root[i][F("producing")] = inv->isProducing(); root[i][F("producing")] = inv->isProducing();
root[i][F("limit_relative")] = inv->SystemConfigPara()->getLimitPercent();
if (inv->DevInfo()->getMaxPower() > 0) {
root[i][F("limit_absolute")] = inv->SystemConfigPara()->getLimitPercent() * inv->DevInfo()->getMaxPower() / 100.0;
} else {
root[i][F("limit_absolute")] = -1;
}
// Loop all channels // Loop all channels
for (uint8_t c = 0; c <= inv->Statistics()->getChannelCount(); c++) { for (uint8_t c = 0; c <= inv->Statistics()->getChannelCount(); c++) {

8
webapp/src/components/HomeView.vue
View File

@ -38,9 +38,15 @@
'bg-warning': inverter.reachable && !inverter.producing, 'bg-warning': inverter.reachable && !inverter.producing,
'bg-primary': inverter.reachable && inverter.producing, 'bg-primary': inverter.reachable && inverter.producing,
}"> }">
<div>
{{ inverter.name }} (Inverter Serial Number: {{ inverter.name }} (Inverter Serial Number:
{{ inverter.serial }}) (Data Age: {{ inverter.serial }}) (Data Age:
{{ inverter.data_age }} seconds) {{ inverter.data_age }} seconds)
<span>Current Limit: {{ inverter.limit_absolute.toFixed(0) }}W | {{
inverter.limit_relative.toFixed(0)
}}%</span>
</div>
<div class="btn-toolbar" role="toolbar"> <div class="btn-toolbar" role="toolbar">
<div class="btn-group me-2" role="group"> <div class="btn-group me-2" role="group">
@ -319,6 +325,8 @@ declare interface Inverter {
name: string, name: string,
reachable: boolean, reachable: boolean,
producing: boolean, producing: boolean,
limit_relative: 0,
limit_absolute: 0,
data_age: 0, data_age: 0,
events: 0 events: 0
} }