diff --git a/custom_components/solis/const.py b/custom_components/solis/const.py index 4997d2c..055f0b0 100644 --- a/custom_components/solis/const.py +++ b/custom_components/solis/const.py @@ -122,6 +122,38 @@ SensorStateClass.MEASUREMENT, STRING4_VOLTAGE ], + 'dcinputvoltagepv5': [ + 'DC Voltage PV5', + UnitOfElectricPotential.VOLT, + 'mdi:flash-outline', + SensorDeviceClass.VOLTAGE, + SensorStateClass.MEASUREMENT, + STRING5_VOLTAGE + ], + 'dcinputvoltagepv6': [ + 'DC Voltage PV6', + UnitOfElectricPotential.VOLT, + 'mdi:flash-outline', + SensorDeviceClass.VOLTAGE, + SensorStateClass.MEASUREMENT, + STRING6_VOLTAGE + ], + 'dcinputvoltagepv7': [ + 'DC Voltage PV7', + UnitOfElectricPotential.VOLT, + 'mdi:flash-outline', + SensorDeviceClass.VOLTAGE, + SensorStateClass.MEASUREMENT, + STRING7_VOLTAGE + ], + 'dcinputvoltagepv8': [ + 'DC Voltage PV8', + UnitOfElectricPotential.VOLT, + 'mdi:flash-outline', + SensorDeviceClass.VOLTAGE, + SensorStateClass.MEASUREMENT, + STRING8_VOLTAGE + ], 'dcinputcurrentpv1': [ 'DC Current PV1', UnitOfElectricCurrent.AMPERE, @@ -154,6 +186,38 @@ SensorStateClass.MEASUREMENT, STRING4_CURRENT ], + 'dcinputcurrentpv5': [ + 'DC Current PV5', + UnitOfElectricCurrent.AMPERE, + 'mdi:flash-outline', + SensorDeviceClass.CURRENT, + SensorStateClass.MEASUREMENT, + STRING5_CURRENT + ], + 'dcinputcurrentpv6': [ + 'DC Current PV6', + UnitOfElectricCurrent.AMPERE, + 'mdi:flash-outline', + SensorDeviceClass.CURRENT, + SensorStateClass.MEASUREMENT, + STRING6_CURRENT + ], + 'dcinputcurrentpv7': [ + 'DC Current PV7', + UnitOfElectricCurrent.AMPERE, + 'mdi:flash-outline', + SensorDeviceClass.CURRENT, + SensorStateClass.MEASUREMENT, + STRING7_CURRENT + ], + 'dcinputcurrentpv8': [ + 'DC Current PV8', + UnitOfElectricCurrent.AMPERE, + 'mdi:flash-outline', + SensorDeviceClass.CURRENT, + SensorStateClass.MEASUREMENT, + STRING8_CURRENT + ], 'dcinputpowerpv1': [ 'DC Power PV1', UnitOfPower.WATT, @@ -186,6 +250,38 @@ SensorStateClass.MEASUREMENT, STRING4_POWER ], + 'dcinputpowerpv5': [ + 'DC Power PV5', + UnitOfPower.WATT, + 'mdi:solar-power', + SensorDeviceClass.POWER, + SensorStateClass.MEASUREMENT, + STRING5_POWER + ], + 'dcinputpowerpv6': [ + 'DC Power PV6', + UnitOfPower.WATT, + 'mdi:solar-power', + SensorDeviceClass.POWER, + SensorStateClass.MEASUREMENT, + STRING6_POWER + ], + 'dcinputpowerpv7': [ + 'DC Power PV7', + UnitOfPower.WATT, + 'mdi:solar-power', + SensorDeviceClass.POWER, + SensorStateClass.MEASUREMENT, + STRING7_POWER + ], + 'dcinputpowerpv8': [ + 'DC Power PV8', + UnitOfPower.WATT, + 'mdi:solar-power', + SensorDeviceClass.POWER, + SensorStateClass.MEASUREMENT, + STRING8_POWER + ], 'acoutputvoltage1': [ 'AC Voltage R', UnitOfElectricPotential.VOLT, diff --git a/custom_components/solis/ginlong_const.py b/custom_components/solis/ginlong_const.py index 068515b..93a52cd 100644 --- a/custom_components/solis/ginlong_const.py +++ b/custom_components/solis/ginlong_const.py @@ -7,7 +7,7 @@ """ # VERSION -VERSION = '0.1.3' +VERSION = '0.1.4' INVERTER_SERIAL = 'serial' INVERTER_PLANT_ID = 'plantID' @@ -35,14 +35,26 @@ STRING2_VOLTAGE = 'dcVoltage2' STRING3_VOLTAGE = 'dcVoltage3' STRING4_VOLTAGE = 'dcVoltage4' +STRING5_VOLTAGE = 'dcVoltage5' +STRING6_VOLTAGE = 'dcVoltage6' +STRING7_VOLTAGE = 'dcVoltage7' +STRING8_VOLTAGE = 'dcVoltage8' STRING1_CURRENT = 'dcCurrent1' STRING2_CURRENT = 'dcCurrent2' STRING3_CURRENT = 'dcCurrent3' STRING4_CURRENT = 'dcCurrent4' +STRING5_CURRENT = 'dcCurrent5' +STRING6_CURRENT = 'dcCurrent6' +STRING7_CURRENT = 'dcCurrent7' +STRING8_CURRENT = 'dcCurrent8' STRING1_POWER = 'dcPower1' STRING2_POWER = 'dcPower2' STRING3_POWER = 'dcPower3' STRING4_POWER = 'dcPower4' +STRING5_POWER = 'dcPower5' +STRING6_POWER = 'dcPower6' +STRING7_POWER = 'dcPower7' +STRING8_POWER = 'dcPower8' PHASE1_VOLTAGE = 'acVoltage1' PHASE2_VOLTAGE = 'acVoltage2' PHASE3_VOLTAGE = 'acVoltage3' diff --git a/custom_components/solis/soliscloud_api.py b/custom_components/solis/soliscloud_api.py index 7917edf..dd4fbb2 100644 --- a/custom_components/solis/soliscloud_api.py +++ b/custom_components/solis/soliscloud_api.py @@ -30,7 +30,7 @@ _LOGGER = logging.getLogger(__name__) # VERSION -VERSION = '0.5.2' +VERSION = '0.5.3' # API NAME API_NAME = 'SolisCloud' @@ -79,14 +79,26 @@ STRING2_VOLTAGE: ['uPv2', float, 2], STRING3_VOLTAGE: ['uPv3', float, 2], STRING4_VOLTAGE: ['uPv4', float, 2], + STRING5_VOLTAGE: ['uPv5', float, 2], + STRING6_VOLTAGE: ['uPv6', float, 2], + STRING7_VOLTAGE: ['uPv7', float, 2], + STRING8_VOLTAGE: ['uPv8', float, 2], STRING1_CURRENT: ['iPv1', float, 2], STRING2_CURRENT: ['iPv2', float, 2], STRING3_CURRENT: ['iPv3', float, 2], STRING4_CURRENT: ['iPv4', float, 2], - STRING1_POWER: ['pow1', float, 2], # Undocumented - STRING2_POWER: ['pow2', float, 2], # Undocumented - STRING3_POWER: ['pow3', float, 2], # Undocumented - STRING4_POWER: ['pow4', float, 2], # Undocumented + STRING5_CURRENT: ['iPv5', float, 2], + STRING6_CURRENT: ['iPv6', float, 2], + STRING7_CURRENT: ['iPv7', float, 2], + STRING8_CURRENT: ['iPv8', float, 2], + STRING1_POWER: ['pow1', float, 2], + STRING2_POWER: ['pow2', float, 2], + STRING3_POWER: ['pow3', float, 2], + STRING4_POWER: ['pow4', float, 2], + STRING5_POWER: ['pow5', float, 2], + STRING6_POWER: ['pow6', float, 2], + STRING7_POWER: ['pow7', float, 2], + STRING8_POWER: ['pow8', float, 2], PHASE1_VOLTAGE: ['uAc1', float, 2], PHASE2_VOLTAGE: ['uAc2', float, 2], PHASE3_VOLTAGE: ['uAc3', float, 2], diff --git a/custom_components/solis/soliscloud_const.py b/custom_components/solis/soliscloud_const.py index 94510cf..60641cb 100644 --- a/custom_components/solis/soliscloud_const.py +++ b/custom_components/solis/soliscloud_const.py @@ -7,7 +7,7 @@ from .ginlong_const import * # VERSION -VERSION = '0.1.5' +VERSION = '0.1.6' STRING_COUNT = 'dcStringCount' STRING_LISTS = [ @@ -15,6 +15,10 @@ [STRING2_CURRENT,STRING2_VOLTAGE,STRING2_POWER], [STRING3_CURRENT,STRING3_VOLTAGE,STRING3_POWER], [STRING4_CURRENT,STRING4_VOLTAGE,STRING4_POWER], + [STRING5_CURRENT,STRING5_VOLTAGE,STRING5_POWER], + [STRING6_CURRENT,STRING6_VOLTAGE,STRING6_POWER], + [STRING7_CURRENT,STRING7_VOLTAGE,STRING7_POWER], + [STRING8_CURRENT,STRING8_VOLTAGE,STRING8_POWER], ] GRID_TOTAL_POWER_STR = 'gridTotalPowerUnit' GRID_TOTAL_CONSUMPTION_POWER_STR = 'gridTotalConsumptionPowerUnit'