Add battery monthly and yearly energy charged and discharged sensors (#407)

Author: patduckless

custom_components/solis/const.py

@@ -466,6 +466,38 @@
         SensorStateClass.TOTAL_INCREASING,
         BAT_DAILY_ENERGY_DISCHARGED
     ],
+    'batmonthlyenergycharged': [
+        'Monthly Energy Charged',
+        UnitOfEnergy.KILO_WATT_HOUR,
+        'mdi:battery-plus',
+        SensorDeviceClass.ENERGY,
+        SensorStateClass.TOTAL_INCREASING,
+        BAT_MONTHLY_ENERGY_CHARGED
+    ],
+    'batmonthlyenergydischarged': [
+        'Monthly Energy Discharged',
+        UnitOfEnergy.KILO_WATT_HOUR,
+        'mdi:battery-minus',
+        SensorDeviceClass.ENERGY,
+        SensorStateClass.TOTAL_INCREASING,
+        BAT_MONTHLY_ENERGY_DISCHARGED
+    ],
+    'batyearlyenergycharged': [
+        'Yearly Energy Charged',
+        UnitOfEnergy.KILO_WATT_HOUR,
+        'mdi:battery-plus',
+        SensorDeviceClass.ENERGY,
+        SensorStateClass.TOTAL_INCREASING,
+        BAT_YEARLY_ENERGY_CHARGED
+    ],
+    'batyearlyenergydischarged': [
+        'Yearly Energy Discharged',
+        UnitOfEnergy.KILO_WATT_HOUR,
+        'mdi:battery-minus',
+        SensorDeviceClass.ENERGY,
+        SensorStateClass.TOTAL_INCREASING,
+        BAT_YEARLY_ENERGY_DISCHARGED
+    ],
     'griddailyongridenergy': [
         'Daily On-grid Energy',
         UnitOfEnergy.KILO_WATT_HOUR,

custom_components/solis/ginlong_api.py

@@ -123,6 +123,10 @@
             BAT_TOTAL_ENERGY_DISCHARGED: ['1cy', float, 2],
             BAT_DAILY_ENERGY_CHARGED:    ['1cz', float, 2],
             BAT_DAILY_ENERGY_DISCHARGED: ['1da', float, 2],
+            BAT_MONTHLY_ENERGY_CHARGED:  ['1db', float, 2],
+            BAT_MONTHLY_ENERGY_DISCHARGED:['1dc', float, 2],
+            BAT_YEARLY_ENERGY_CHARGED:   ['1dd', float, 2],
+            BAT_YEARLY_ENERGY_DISCHARGED:['1de', float, 2],
             GRID_DAILY_ON_GRID_ENERGY:    ['1bw', float, 2],
             GRID_DAILY_ENERGY_PURCHASED:  ['1bx', float, 2],
             GRID_DAILY_ENERGY_USED:       ['1co', float, 2],

custom_components/solis/ginlong_const.py

@@ -72,6 +72,10 @@
 BAT_TOTAL_ENERGY_DISCHARGED = 'totalEnergyDischarged'
 BAT_DAILY_ENERGY_CHARGED = 'dailyEnergyCharged'
 BAT_DAILY_ENERGY_DISCHARGED = 'dailyEnergyDischarged'
+BAT_MONTHLY_ENERGY_CHARGED = 'monthlyEnergyCharged'
+BAT_MONTHLY_ENERGY_DISCHARGED = 'monthlyEnergyDischarged'
+BAT_YEARLY_ENERGY_CHARGED = 'yearlyEnergyCharged'
+BAT_YEARLY_ENERGY_DISCHARGED = 'yearlyEnergyDischarged'
 GRID_DAILY_ON_GRID_ENERGY = 'dailyOnGridEnergy'
 GRID_DAILY_ENERGY_PURCHASED = 'dailyEnergyPurchased'
 GRID_DAILY_ENERGY_USED = 'dailyEnergyUsed'

custom_components/solis/soliscloud_api.py

@@ -119,6 +119,10 @@
         BAT_TOTAL_ENERGY_DISCHARGED_STR:  ['batteryTotalDischargeEnergyStr', str, None],
         BAT_DAILY_ENERGY_CHARGED:         ['batteryTodayChargeEnergy', float, 3],
         BAT_DAILY_ENERGY_DISCHARGED:      ['batteryTodayDischargeEnergy', float, 3],
+        BAT_MONTHLY_ENERGY_CHARGED:       ['batteryMonthChargeEnergy', float, 3],
+        BAT_MONTHLY_ENERGY_DISCHARGED:    ['batteryMonthDischargeEnergy', float, 3],
+        BAT_YEARLY_ENERGY_CHARGED:        ['batteryYearChargeEnergy', float, 3],
+        BAT_YEARLY_ENERGY_DISCHARGED:     ['batteryYearDischargeEnergy', float, 3],
         #GRID_DAILY_ON_GRID_ENERGY:        ['gridSellTodayEnergy', float, 2], #On Plant detail
         #GRID_DAILY_ON_GRID_ENERGY_STR:    ['gridSellTodayEnergyStr', str, None], #On Plant detail
         #GRID_DAILY_ENERGY_PURCHASED:      ['gridPurchasedTodayEnergy', float, 2], #On Plant detail