Merge pull request #36 from Pho3niX90/feature/33036-33040

Feature/33036 33040
Pho3niX90 · Mar 9, 2024 · 1f750da · 1f750da
2 parents af1beca + 8d25540
commit 1f750da
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 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.3.4"
+VERSION = "1.3.5"
 POLL_INTERVAL_SECONDS = 15
 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.3.4"
+  "version": "1.3.5"
 }
diff --git a/custom_components/solis_modbus/sensor.py b/custom_components/solis_modbus/sensor.py
@@ -82,6 +82,18 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, asyn
                  "unique": "solis_modbus_inverter_pv_today_generation",
                  "register": ['33035'], "device_class": SensorDeviceClass.ENERGY, "multiplier": 0.1,
                  "unit_of_measurement": UnitOfEnergy.KILO_WATT_HOUR, "state_class": SensorStateClass.TOTAL_INCREASING},
+                {"type": "SS", "name": "Solis PV Yesterday Energy Generation",
+                 "unique": "solis_modbus_inverter_pv_yesterday_generation",
+                 "register": ['33036'], "device_class": SensorDeviceClass.ENERGY, "multiplier": 0.1,
+                 "unit_of_measurement": UnitOfEnergy.KILO_WATT_HOUR, "state_class": SensorStateClass.TOTAL_INCREASING},
+                {"type": "SS", "name": "Solis PV This Year Energy Generation",
+                 "unique": "solis_modbus_inverter_pv_this_year_generation",
+                 "register": ['33037', '33038'], "device_class": SensorDeviceClass.ENERGY, "multiplier": 0.1,
+                 "unit_of_measurement": UnitOfEnergy.KILO_WATT_HOUR, "state_class": SensorStateClass.TOTAL_INCREASING},
+                {"type": "SS", "name": "Solis PV Last Year Energy Generation",
+                 "unique": "solis_modbus_inverter_pv_last_year_generation",
+                 "register": ['33039', '33040'], "device_class": SensorDeviceClass.ENERGY, "multiplier": 0.1,
+                 "unit_of_measurement": UnitOfEnergy.KILO_WATT_HOUR, "state_class": SensorStateClass.TOTAL_INCREASING},
             ]
         },
         {

diff --git a/docs/source/sensors.md b/docs/source/sensors.md
@@ -55,6 +55,9 @@ The following sensors are provided in the integration.
 | Solis PV Current Month Energy Generation            | ENERGY         | KILO_WATT_HOUR             | TOTAL_INCREASING | 33031, 33032                           |
 | Solis PV Last Month Energy Generation               | ENERGY         | KILO_WATT_HOUR             | TOTAL_INCREASING | 33033, 33034                           |
 | Solis PV Today Energy Generation                    | ENERGY         | KILO_WATT_HOUR             | TOTAL_INCREASING | 33035                                  |
+| Solis PV Yesterday Energy Generation                | ENERGY         | KILO_WATT_HOUR             | TOTAL_INCREASING | 33036                                  |
+| Solis PV This Year Energy Generation                | ENERGY         | KILO_WATT_HOUR             | TOTAL_INCREASING | 33037, 33038                           |
+| Solis PV Last Year Energy Generation                | ENERGY         | KILO_WATT_HOUR             | TOTAL_INCREASING | 33039, 33040                           |
 | Solis PV Voltage 1                                  | VOLTAGE        | VOLT                       | MEASUREMENT      | 33049                                  |
 | Solis PV Current 1                                  | CURRENT        | AMPERE                     | MEASUREMENT      | 33050                                  |
 | Solis PV Voltage 2                                  | VOLTAGE        | VOLT                       | MEASUREMENT      | 33051                                  |