add option to hide issues section from battery live view, show live…

… for mqtt battery
helgeerbe · Sep 10, 2024 · 0fc6f37 · 0fc6f37
1 parent e9435d7
commit 0fc6f37
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 10 deletions.
diff --git a/include/BatteryStats.h b/include/BatteryStats.h
@@ -51,6 +51,8 @@ class BatteryStats {
 
         virtual float getChargeCurrentLimitation() const { return FLT_MAX; };
 
+        virtual bool supportsAlarmsAndWarnings() const { return false; };
+
     protected:
         virtual void mqttPublish() const;
 
@@ -110,6 +112,7 @@ class PylontechBatteryStats : public BatteryStats {
         void mqttPublish() const final;
         bool getImmediateChargingRequest() const { return _chargeImmediately; } ;
         float getChargeCurrentLimitation() const { return _chargeCurrentLimitation; } ;
+        bool supportsAlarmsAndWarnings() const final { return true; }
 
     private:
         void setLastUpdate(uint32_t ts) { _lastUpdate = ts; }
@@ -146,7 +149,8 @@ class PytesBatteryStats : public BatteryStats {
     public:
         void getLiveViewData(JsonVariant& root) const final;
         void mqttPublish() const final;
-        float getChargeCurrentLimitation() const { return _chargeCurrentLimit; } ;
+        float getChargeCurrentLimitation() const { return _chargeCurrentLimit; };
+        bool supportsAlarmsAndWarnings() const final { return true; }
 
     private:
         void setLastUpdate(uint32_t ts) { _lastUpdate = ts; }
@@ -228,6 +232,8 @@ class JkBmsBatteryStats : public BatteryStats {
 
         void updateFrom(JkBms::DataPointContainer const& dp);
 
+        bool supportsAlarmsAndWarnings() const final { return true; }
+
     private:
         void getJsonData(JsonVariant& root, bool verbose) const;
 
@@ -247,6 +253,7 @@ class VictronSmartShuntStats : public BatteryStats {
         void mqttPublish() const final;
 
         void updateFrom(VeDirectShuntController::data_t const& shuntData);
+        bool supportsAlarmsAndWarnings() const final { return true; }
 
     private:
         float _temperature;
@@ -276,8 +283,7 @@ class MqttBatteryStats : public BatteryStats {
         // we do NOT publish the same data under a different topic.
         void mqttPublish() const final { }
 
-        // we don't need a card in the liveview, since the SoC and
-        // voltage (if available) is already displayed at the top.
-        void getLiveViewData(JsonVariant& root) const final { }
-        // TODO(AndreasBoehm): we could show the discharge current limit if available
+        void getLiveViewData(JsonVariant& root) const final;
+
+        bool supportsAlarmsAndWarnings() const final { return false; }
 };
diff --git a/src/BatteryStats.cpp b/src/BatteryStats.cpp
@@ -89,13 +89,30 @@ void BatteryStats::getLiveViewData(JsonVariant& root) const
     }
     root["data_age"] = getAgeSeconds();
 
-    addLiveViewValue(root, "SoC", _soc, "%", _socPrecision);
-    addLiveViewValue(root, "voltage", _voltage, "V", 2);
-    addLiveViewValue(root, "current", _current, "A", _currentPrecision);
+    if (isSoCValid()) {
+        addLiveViewValue(root, "SoC", _soc, "%", _socPrecision);
+    }
+
+    if (isVoltageValid()) {
+        addLiveViewValue(root, "voltage", _voltage, "V", 2);
+    }
+
+    if (isCurrentValid()) {
+        addLiveViewValue(root, "current", _current, "A", _currentPrecision);
+    }
 
     if (isDischargeCurrentLimitValid()) {
         addLiveViewValue(root, "dischargeCurrentLimitation", _dischargeCurrentLimit, "A", 1);
     }
+
+    root["showIssues"] = supportsAlarmsAndWarnings();
+}
+
+void MqttBatteryStats::getLiveViewData(JsonVariant& root) const
+{
+    if (isDischargeCurrentLimitValid()) {
+        BatteryStats::getLiveViewData(root);
+    }
 }
 
 void PylontechBatteryStats::getLiveViewData(JsonVariant& root) const

diff --git a/src/MqttBattery.cpp b/src/MqttBattery.cpp
@@ -9,6 +9,7 @@
 bool MqttBattery::init(bool verboseLogging)
 {
     _verboseLogging = verboseLogging;
+    _stats->setManufacturer("MQTT");
 
     auto const& config = Configuration.get();
 

diff --git a/webapp/src/components/BatteryView.vue b/webapp/src/components/BatteryView.vue
@@ -6,7 +6,6 @@
     </div>
 
     <div v-else-if="'values' in batteryData">
-        <!-- suppress the card for MQTT battery provider -->
         <div class="row gy-3 mt-0">
             <div class="tab-content col-sm-12 col-md-12" id="v-pills-tabContent">
                 <div class="card">
@@ -89,7 +88,7 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="col order-1">
+                            <div class="col order-1" v-show="batteryData.showIssues">
                                 <div class="card">
                                     <div :class="{ 'card-header': true, 'border-bottom-0': maxIssueValue === 0 }">
                                         <div class="d-flex flex-row justify-content-between align-items-baseline">

diff --git a/webapp/src/types/BatteryDataStatus.ts b/webapp/src/types/BatteryDataStatus.ts
@@ -14,5 +14,6 @@ export interface Battery {
     hwversion: string;
     data_age: number;
     values: BatteryData[];
+    showIssues: boolean;
     issues: number[];
 }