Merge pull request #17 from Pho3niX90/feature/16

feat: This commit adds additional sensor entities for Overcharge SOC,…
Pho3niX90 · Dec 12, 2023 · f9573c4 · f9573c4
2 parents 53b3ddd + 41da57e
commit f9573c4
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 7 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.0.10"
+VERSION = "1.1.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.0.10"
+  "version": "1.1.0"
 }
diff --git a/custom_components/solis_modbus/number.py b/custom_components/solis_modbus/number.py
@@ -57,10 +57,19 @@ async def async_setup_entry(hass, config_entry: ConfigEntry, async_add_devices):
          "default": 3000.0, "multiplier": 0.1,
          "min_val": 0, "max_val": 6000, "step": 1,
          "unit_of_measurement": UnitOfPower.WATT, "enabled": True},
-        # {"type": "SNE", "name": "Solis Inverter Storage Control Switch Value", "register": 43110,
-        #  "default": 80.0, "multiplier": 1,
-        #  "min_val": 0, "max_val": 100, "step": 1,
-        #  "unit_of_measurement": PERCENTAGE, "enabled": True},
+
+        {"type": "SNE", "name": "Solis Overcharge SOC", "register": 43010,
+         "default": 90, "multiplier": 1,
+         "min_val": 70, "max_val": 100, "step": 1,
+         "unit_of_measurement": PERCENTAGE, "enabled": True},
+        {"type": "SNE", "name": "Solis Overdischarge SOC", "register": 43011,
+         "default": 20, "multiplier": 1,
+         "min_val": 5, "max_val": 40, "step": 1,
+         "unit_of_measurement": PERCENTAGE, "enabled": True},
+        {"type": "SNE", "name": "Solis Force Charge SOC", "register": 43018,
+         "default": 10, "multiplier": 1,
+         "min_val": 0, "max_val": 100, "step": 1,
+         "unit_of_measurement": PERCENTAGE, "enabled": True}
     ]
 
     for entity_definition in numbers:

diff --git a/custom_components/solis_modbus/sensor.py b/custom_components/solis_modbus/sensor.py
@@ -607,9 +607,35 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, asyn
             ]
         },
         {
-            "register_start": 43024,
+            "register_start": 43011,
             "scan_interval": 10,
             "entities": [
+
+                {"type": "SS", "name": "Solis Overcharge SOC",
+                 "unique": "solis_modbus_inverter_overcharge_soc",
+                 "register": ['43010'],
+                 "decimal_places": 0,
+                 "unit_of_measurement": PERCENTAGE,
+                 "state_class": SensorStateClass.MEASUREMENT},
+
+                {"type": "SS", "name": "Solis Overdischarge SOC",
+                 "unique": "solis_modbus_inverter_overdischarge_soc",
+                 "register": ['43011'],
+                 "decimal_places": 0,
+                 "unit_of_measurement": PERCENTAGE,
+                 "state_class": SensorStateClass.MEASUREMENT},
+
+                {"type": "reserve", "register": ['43012', '43013', '43014', '43015', '43016', '43017']},
+
+                {"type": "SS", "name": "Solis Force Charge SOC",
+                 "unique": "solis_modbus_inverter_force_charge_soc",
+                 "register": ['43018'],
+                 "decimal_places": 0,
+                 "unit_of_measurement": PERCENTAGE,
+                 "state_class": SensorStateClass.MEASUREMENT},
+
+                {"type": "reserve", "register": ['43019', '43020', '43021', '43022', '43023']},
+
                 {"type": "SS", "name": "Solis Backup SOC",
                  "unique": "solis_modbus_inverter_backup_soc",
                  "register": ['43024'],