use soc and current precision in live view

hoylabs · Jul 25, 2024 · a6a261d · a6a261d
1 parent 91176eb
commit a6a261d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/include/BatteryStats.h b/include/BatteryStats.h
@@ -20,11 +20,13 @@ class BatteryStats {
 
         uint8_t getSoC() const { return _soc; }
         uint32_t getSoCAgeSeconds() const { return (millis() - _lastUpdateSoC) / 1000; }
+        uint8_t getSoCPrecision() const { return _socPrecision; }
 
         float getVoltage() const { return _voltage; }
         uint32_t getVoltageAgeSeconds() const { return (millis() - _lastUpdateVoltage) / 1000; }
 
         float getChargeCurrent() const { return _current; };
+        uint8_t getChargeCurrentPrecision() const { return _currentPrecision; }
 
         // convert stats to JSON for web application live view
         virtual void getLiveViewData(JsonVariant& root) const;

diff --git a/src/WebApi_ws_live.cpp b/src/WebApi_ws_live.cpp
@@ -93,15 +93,15 @@ void WebApiWsLiveClass::generateOnBatteryJsonResponse(JsonVariant& root, bool al
 
         if (config.Battery.Enabled) {
             if (spStats->isSoCValid()) {
-                addTotalField(batteryObj, "soc", spStats->getSoC(), "%", 0);
+                addTotalField(batteryObj, "soc", spStats->getSoC(), "%", spStats->getSoCPrecision());
             }
 
             if (spStats->isVoltageValid()) {
                 addTotalField(batteryObj, "voltage", spStats->getVoltage(), "V", 2);
             }
 
             if (spStats->isCurrentValid()) {
-                addTotalField(batteryObj, "current", spStats->getChargeCurrent(), "A", 1);
+                addTotalField(batteryObj, "current", spStats->getChargeCurrent(), "A", spStats->getChargeCurrentPrecision());
             }
 
             if (spStats->isVoltageValid() && spStats->isCurrentValid()) {