Merge branch 'jmason/add-soh' into jmason/always-record-updates

jmason · Dec 15, 2022 · da9b23d · da9b23d
2 parents 6b6882e + 2cbafdd
commit da9b23d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/custom_components/solis/const.py b/custom_components/solis/const.py
@@ -14,7 +14,6 @@
     ENERGY_KILO_WATT_HOUR,
     ENERGY_MEGA_WATT_HOUR,
     POWER_WATT,
-    POWER_KILO_WATT,
     ELECTRIC_CURRENT_AMPERE,
     DEVICE_CLASS_CURRENT,
     DEVICE_CLASS_ENERGY,
@@ -306,7 +305,7 @@
     ],
     'batpower': [
         'Battery Power',
-        POWER_KILO_WATT,
+        POWER_WATT,
         'mdi:battery',
         DEVICE_CLASS_POWER,
         STATE_CLASS_MEASUREMENT,

diff --git a/custom_components/solis/soliscloud_api.py b/custom_components/solis/soliscloud_api.py
@@ -375,7 +375,14 @@ def _post_process(self) -> None:
                         float(self._data[GRID_DAILY_ON_GRID_ENERGY])*10
             except KeyError:
                 pass
-
+
+            # turn batteryPower negative when discharging (fix for https://github.com/hultenvp/solis-sensor/issues/158)
+            try:
+                if self._data[BAT_CURRENT] < 0:
+                    self._data[BAT_POWER] = self._data[BAT_POWER] * -1
+            except KeyError:
+                pass
+
             # Unused phases are still in JSON payload as 0.0, remove them
             # FIXME: use acOutputType
             self._purge_if_unused(0.0, PHASE1_CURRENT, PHASE1_VOLTAGE)

diff --git a/custom_components/solis/workarounds.yaml b/custom_components/solis/workarounds.yaml
@@ -1,4 +1,4 @@
 # Switch on/off SolisCloud workarounds 
 
 #SolisCloud returns daily on grid energy a factor 10 off
-correct_daily_on_grid_energy_enabled: false
+correct_daily_on_grid_energy_enabled: true