From d37543fd954ec40fea98d63fc2791081cbd722e6 Mon Sep 17 00:00:00 2001
From: Thomas Basler <thomas@familie-basler.net>
Date: Fri, 14 Oct 2022 19:16:37 +0200
Subject: [PATCH] Show current limit in header of live view

---
 src/WebApi_ws_live.cpp             |  6 ++++++
 webapp/src/components/HomeView.vue | 14 +++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/WebApi_ws_live.cpp b/src/WebApi_ws_live.cpp
index ab098fa..032c907 100644
--- a/src/WebApi_ws_live.cpp
+++ b/src/WebApi_ws_live.cpp
@@ -87,6 +87,12 @@ void WebApiWsLiveClass::generateJsonResponse(JsonVariant& root)
         root[i][F("data_age")] = (millis() - inv->Statistics()->getLastUpdate()) / 1000;
         root[i][F("reachable")] = inv->isReachable();
         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
         for (uint8_t c = 0; c <= inv->Statistics()->getChannelCount(); c++) {
diff --git a/webapp/src/components/HomeView.vue b/webapp/src/components/HomeView.vue
index 6f00083..4a7f028 100644
--- a/webapp/src/components/HomeView.vue
+++ b/webapp/src/components/HomeView.vue
@@ -38,9 +38,15 @@
                                     'bg-warning': inverter.reachable && !inverter.producing,
                                     'bg-primary': inverter.reachable && inverter.producing,
                                 }">
-                                {{ inverter.name }} (Inverter Serial Number:
-                                {{ inverter.serial }}) (Data Age:
-                                {{ inverter.data_age }} seconds)
+                                <div>
+                                    {{ inverter.name }} (Inverter Serial Number:
+                                    {{ inverter.serial }}) (Data Age:
+                                    {{ 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-group me-2" role="group">
@@ -319,6 +325,8 @@ declare interface Inverter {
     name: string,
     reachable: boolean,
     producing: boolean,
+    limit_relative: 0,
+    limit_absolute: 0,
     data_age: 0,
     events: 0
 }