Merge pull request #101 from hultenvp/93_add_solarman_battery_and_temp_sensors

93 add solarman battery and temp sensors

Author: hultenvp

custom_components/solis/const.py

@@ -86,6 +86,14 @@
         STATE_CLASS_MEASUREMENT,
         INVERTER_TEMPERATURE
     ],
+    'radiatortemperature1': [
+        'Radiator temperature 1', # Solarman only
+        TEMP_CELSIUS,
+        'mdi:thermometer',
+        DEVICE_CLASS_TEMPERATURE,
+        STATE_CLASS_MEASUREMENT,
+        RADIATOR1_TEMP
+    ],
     'dcinputvoltagepv1': [
         'DC Voltage PV1',
         ELECTRIC_POTENTIAL_VOLT,
@@ -286,6 +294,14 @@
         STATE_CLASS_TOTAL_INCREASING,
         INVERTER_ENERGY_TOTAL_LIFE
     ],
+    'batpack1capacityremaining': [
+        'Battery pack 1 remaining battery capacity', # Solarman only
+        PERCENTAGE,
+        'mdi:battery',
+        DEVICE_CLASS_BATTERY,
+        STATE_CLASS_MEASUREMENT,
+        BAT1_REMAINING_CAPACITY
+    ],
     'batteryPower': [
         'Battery Power',
         POWER_WATT,

custom_components/solis/ginlong_api.py

@@ -21,7 +21,7 @@
 _LOGGER = logging.getLogger(__name__)
 
 # VERSION
-VERSION = '0.1.5'
+VERSION = '0.2.0'
 
 # Response constants
 SUCCESS = 'Success'
@@ -68,6 +68,16 @@
             INVERTER_POWER_STATE:       ['1fd', int, None],
         }
     ],
+    'realTimeDataTemp': [
+        VALUE_RECORD, {
+            RADIATOR1_TEMP:       ['1to', int, None],
+        }
+    ],
+    'realTimeDataBattery': [
+        VALUE_RECORD, {
+            BAT1_REMAINING_CAPACITY:       ['3je', int, None],
+        }
+    ],
     'realTimeDataPower': [
         VALUE_RECORD, {
             INVERTER_ACPOWER:           ['1ao', float, 2],

custom_components/solis/ginlong_const.py

@@ -29,6 +29,7 @@
 INVERTER_ENERGY_TOTAL_LIFE = 'energyTotalLife'
 INVERTER_POWER_STATE = "powerState"
 INVERTER_STATE = "state"
+RADIATOR1_TEMP = "radiatorTemp1"
 STRING1_VOLTAGE = 'dcVoltage1'
 STRING2_VOLTAGE = 'dcVoltage2'
 STRING3_VOLTAGE = 'dcVoltage3'
@@ -47,6 +48,7 @@
 PHASE1_CURRENT = 'acCurrent1'
 PHASE2_CURRENT = 'acCurrent2'
 PHASE3_CURRENT = 'acCurrent3'
+BAT1_REMAINING_CAPACITY = 'packRemainingCapacity1'
 BAT_POWER = 'batteryPower'
 BAT_REMAINING_CAPACITY = 'remainingCapacity'
 BAT_TOTAL_ENERGY_CHARGED = 'totalEnergyCharged'

custom_components/solis/manifest.json

@@ -1,8 +1,8 @@
 {
   "domain": "solis",
-  "version": "2.0.7",
+  "version": "2.1.0",
   "name": "Solis Inverter",
-  "iot_class": "cloud_polling",
+  "iot_class": "cloud_push",
   "documentation": "https://github.com/hultenvp/solis-sensor/",
   "issue_tracker": "https://github.com/hultenvp/solis-sensor/issues",
   "dependencies": [],

custom_components/solis/sensor.py

@@ -44,7 +44,7 @@
 _LOGGER = logging.getLogger(__name__)
 
 # VERSION
-VERSION = '2.0.7'
+VERSION = '2.1.0'
 
 LAST_UPDATED = 'Last updated'
 SERIAL = 'Inverter serial'