Merge pull request #23 from Pho3niX90/bugfix/issue_22

Bugfix/issue 22
Pho3niX90 · Dec 15, 2023 · a000c1c · a000c1c
2 parents 71bfcb6 + 1c86e29
commit a000c1c
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 3 deletions.
diff --git a/custom_components/solis_modbus/const.py b/custom_components/solis_modbus/const.py
@@ -1,6 +1,6 @@
 DOMAIN = "solis_modbus"
 CONTROLLER = "modbus_controller"
-VERSION = "1.2.1"
+VERSION = "1.3.0"
 POLL_INTERVAL_SECONDS = 5
 MANUFACTURER = "Solis"
 MODEL = "S6"
diff --git a/custom_components/solis_modbus/manifest.json b/custom_components/solis_modbus/manifest.json
@@ -10,5 +10,5 @@
   "issue_tracker": "https://github.com/Pho3niX90/solis_modbus/issues",
   "quality_scale": "silver",
   "requirements": ["pymodbus==3.5.4"],
-  "version": "1.2.1"
+  "version": "1.3.0"
 }
diff --git a/custom_components/solis_modbus/sensor.py b/custom_components/solis_modbus/sensor.py
@@ -846,7 +846,20 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, asyn
          "decimal_places": 1,
          "unit_of_measurement": UnitOfPower.WATT,
          "state_class": SensorStateClass.MEASUREMENT,
-         "register": ['33051', '33052']}
+         "register": ['33051', '33052']},
+
+        {"type": "SDS", "name": "Solis Battery Charge Power",
+         "unique": "solis_modbus_inverter_battery_charge_power", "device_class": SensorDeviceClass.POWER,
+         "decimal_places": 1,
+         "unit_of_measurement": UnitOfPower.WATT,
+         "state_class": SensorStateClass.MEASUREMENT,
+         "register": ['33149', '33150', '33135', '0']},
+        {"type": "SDS", "name": "Solis Battery Discharge Power",
+         "unique": "solis_modbus_inverter_battery_discharge_power", "device_class": SensorDeviceClass.POWER,
+         "decimal_places": 1,
+         "unit_of_measurement": UnitOfPower.WATT,
+         "state_class": SensorStateClass.MEASUREMENT,
+         "register": ['33149', '33150', '33135', '1']}
     ]
 
     for sensor_group in sensors:
@@ -999,6 +1012,21 @@ def update(self):
                 r1_value = self._hass.data[DOMAIN]['values'][self._register[0]] / (10 ** self._decimal_places)
                 r2_value = self._hass.data[DOMAIN]['values'][self._register[1]] / (10 ** self._decimal_places)
                 n_value = round(r1_value * r2_value)
+            if '33135' in self._register and len(self._register) == 4:
+                registers = self._register.copy()
+                self._register = registers[:2]
+
+                p_value = get_value(self)
+                d_w_value = registers[3]
+                d_value = self._hass.data[DOMAIN]['values'][registers[2]]
+
+                self._register = registers
+
+                if str(d_value) == str(d_w_value):
+                    n_value = round(p_value * 10)
+                else:
+                    n_value = 0
+
 
             self._attr_available = True
             self._attr_native_value = n_value