Skip to content

Commit 7e6350c

Browse files
wills106wills106
committed
Update plugin_solax.py
1 parent 0ce700e commit 7e6350c

1 file changed

Lines changed: 35 additions & 35 deletions

File tree

‎custom_components/solax_modbus/plugin_solax.py‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -5100,7 +5100,7 @@ def value_function_battery_voltage_cell_difference(initval, descr, datadict):
51005100
register_type=REG_INPUT,
51015101
scale=0.1,
51025102
rounding=1,
5103-
allowedtypes=HYBRID | GEN3 | GEN4 | GEN5 | X3,
5103+
allowedtypes=HYBRID | X3,
51045104
),
51055105
SolaXModbusSensorEntityDescription(
51065106
name="Inverter Current L1",
@@ -5112,7 +5112,7 @@ def value_function_battery_voltage_cell_difference(initval, descr, datadict):
51125112
unit=REGISTER_S16,
51135113
scale=0.1,
51145114
rounding=1,
5115-
allowedtypes=HYBRID | GEN3 | GEN4 | GEN5 | X3,
5115+
allowedtypes=HYBRID | X3,
51165116
),
51175117
SolaXModbusSensorEntityDescription(
51185118
name="Inverter Power L1",
@@ -5123,7 +5123,7 @@ def value_function_battery_voltage_cell_difference(initval, descr, datadict):
51235123
register=0x6C,
51245124
register_type=REG_INPUT,
51255125
unit=REGISTER_S16,
5126-
allowedtypes=AC | HYBRID | GEN3 | GEN4 | GEN5 | X3,
5126+
allowedtypes=AC | HYBRID | X3,
51275127
),
51285128
SolaXModbusSensorEntityDescription(
51295129
name="Inverter Frequency L1",
@@ -5134,7 +5134,7 @@ def value_function_battery_voltage_cell_difference(initval, descr, datadict):
51345134
register_type=REG_INPUT,
51355135
scale=0.01,
51365136
rounding=1,
5137-
allowedtypes=AC | HYBRID | GEN3 | GEN4 | GEN5 | X3,
5137+
allowedtypes=AC | HYBRID | X3,
51385138
),
51395139
SolaXModbusSensorEntityDescription(
51405140
name="Inverter Voltage L2",
@@ -5145,7 +5145,7 @@ def value_function_battery_voltage_cell_difference(initval, descr, datadict):
51455145
register_type=REG_INPUT,
51465146
scale=0.1,
51475147
rounding=1,
5148-
allowedtypes=HYBRID | GEN3 | GEN4 | GEN5 | X3,
5148+
allowedtypes=HYBRID | X3,
51495149
),
51505150
SolaXModbusSensorEntityDescription(
51515151
name="Inverter Current L2",
@@ -5157,7 +5157,7 @@ def value_function_battery_voltage_cell_difference(initval, descr, datadict):
51575157
unit=REGISTER_S16,
51585158
scale=0.1,
51595159
rounding=1,
5160-
allowedtypes=HYBRID | GEN3 | GEN4 | GEN5 | X3,
5160+
allowedtypes=HYBRID | X3,
51615161
),
51625162
SolaXModbusSensorEntityDescription(
51635163
name="Today's Yield",
@@ -5183,7 +5183,7 @@ def value_function_battery_voltage_cell_difference(initval, descr, datadict):
51835183
register=0x70,
51845184
register_type=REG_INPUT,
51855185
unit=REGISTER_S16,
5186-
allowedtypes=AC | HYBRID | GEN3 | GEN4 | GEN5 | X3,
5186+
allowedtypes=AC | HYBRID | X3,
51875187
),
51885188
SolaXModbusSensorEntityDescription(
51895189
name="Inverter Frequency L2",
@@ -5194,7 +5194,7 @@ def value_function_battery_voltage_cell_difference(initval, descr, datadict):
51945194
register_type=REG_INPUT,
51955195
scale=0.01,
51965196
rounding=1,
5197-
allowedtypes=AC | HYBRID | GEN3 | GEN4 | GEN5 | X3,
5197+
allowedtypes=AC | HYBRID | X3,
51985198
),
51995199
SolaXModbusSensorEntityDescription(
52005200
name="Inverter Voltage L3",
@@ -5205,7 +5205,7 @@ def value_function_battery_voltage_cell_difference(initval, descr, datadict):
52055205
register_type=REG_INPUT,
52065206
scale=0.1,
52075207
rounding=1,
5208-
allowedtypes=HYBRID | GEN3 | GEN4 | GEN5 | X3,
5208+
allowedtypes=HYBRID | X3,
52095209
),
52105210
SolaXModbusSensorEntityDescription(
52115211
name="Inverter Current L3",
@@ -5217,7 +5217,7 @@ def value_function_battery_voltage_cell_difference(initval, descr, datadict):
52175217
unit=REGISTER_S16,
52185218
scale=0.1,
52195219
rounding=1,
5220-
allowedtypes=HYBRID | GEN3 | GEN4 | GEN5 | X3,
5220+
allowedtypes=HYBRID | X3,
52215221
),
52225222
SolaXModbusSensorEntityDescription(
52235223
name="Inverter Power L3",
@@ -5228,7 +5228,7 @@ def value_function_battery_voltage_cell_difference(initval, descr, datadict):
52285228
register=0x74,
52295229
register_type=REG_INPUT,
52305230
unit=REGISTER_S16,
5231-
allowedtypes=AC | HYBRID | GEN3 | GEN4 | GEN5 | X3,
5231+
allowedtypes=AC | HYBRID | X3,
52325232
),
52335233
SolaXModbusSensorEntityDescription(
52345234
name="Inverter Frequency L3",
@@ -5239,7 +5239,7 @@ def value_function_battery_voltage_cell_difference(initval, descr, datadict):
52395239
register_type=REG_INPUT,
52405240
scale=0.01,
52415241
rounding=1,
5242-
allowedtypes=AC | HYBRID | GEN3 | GEN4 | GEN5 | X3,
5242+
allowedtypes=AC | HYBRID | X3,
52435243
),
52445244
SolaXModbusSensorEntityDescription(
52455245
name="EPS Voltage L1",
@@ -5250,7 +5250,7 @@ def value_function_battery_voltage_cell_difference(initval, descr, datadict):
52505250
register_type=REG_INPUT,
52515251
scale=0.1,
52525252
rounding=1,
5253-
allowedtypes=AC | HYBRID | GEN3 | GEN4 | GEN5 | X3 | EPS,
5253+
allowedtypes=AC | HYBRID | X3 | EPS,
52545254
),
52555255
SolaXModbusSensorEntityDescription(
52565256
name="EPS Current L1",
@@ -5261,7 +5261,7 @@ def value_function_battery_voltage_cell_difference(initval, descr, datadict):
52615261
register_type=REG_INPUT,
52625262
scale=0.1,
52635263
rounding=1,
5264-
allowedtypes=AC | HYBRID | GEN3 | GEN4 | GEN5 | X3 | EPS,
5264+
allowedtypes=AC | HYBRID | X3 | EPS,
52655265
),
52665266
SolaXModbusSensorEntityDescription(
52675267
name="EPS Power Active L1",
@@ -5271,15 +5271,15 @@ def value_function_battery_voltage_cell_difference(initval, descr, datadict):
52715271
state_class=SensorStateClass.MEASUREMENT,
52725272
register=0x78,
52735273
register_type=REG_INPUT,
5274-
allowedtypes=AC | HYBRID | GEN3 | GEN4 | GEN5 | X3 | EPS,
5274+
allowedtypes=AC | HYBRID | X3 | EPS,
52755275
),
52765276
SolaXModbusSensorEntityDescription(
52775277
name="EPS Power L1",
52785278
key="eps_power_l1",
52795279
native_unit_of_measurement=UnitOfApparentPower.VOLT_AMPERE,
52805280
register=0x79,
52815281
register_type=REG_INPUT,
5282-
allowedtypes=AC | HYBRID | GEN3 | GEN4 | GEN5 | X3 | EPS,
5282+
allowedtypes=AC | HYBRID | X3 | EPS,
52835283
),
52845284
SolaXModbusSensorEntityDescription(
52855285
name="EPS Voltage L2",
@@ -5290,7 +5290,7 @@ def value_function_battery_voltage_cell_difference(initval, descr, datadict):
52905290
register_type=REG_INPUT,
52915291
scale=0.1,
52925292
rounding=1,
5293-
allowedtypes=AC | HYBRID | GEN3 | GEN4 | GEN5 | X3 | EPS,
5293+
allowedtypes=AC | HYBRID | X3 | EPS,
52945294
),
52955295
SolaXModbusSensorEntityDescription(
52965296
name="EPS Current L2",
@@ -5301,7 +5301,7 @@ def value_function_battery_voltage_cell_difference(initval, descr, datadict):
53015301
register_type=REG_INPUT,
53025302
scale=0.1,
53035303
rounding=1,
5304-
allowedtypes=AC | HYBRID | GEN3 | GEN4 | GEN5 | X3 | EPS,
5304+
allowedtypes=AC | HYBRID | X3 | EPS,
53055305
),
53065306
SolaXModbusSensorEntityDescription(
53075307
name="EPS Power Active L2",
@@ -5311,15 +5311,15 @@ def value_function_battery_voltage_cell_difference(initval, descr, datadict):
53115311
state_class=SensorStateClass.MEASUREMENT,
53125312
register=0x7C,
53135313
register_type=REG_INPUT,
5314-
allowedtypes=AC | HYBRID | GEN3 | GEN4 | GEN5 | X3 | EPS,
5314+
allowedtypes=AC | HYBRID | X3 | EPS,
53155315
),
53165316
SolaXModbusSensorEntityDescription(
53175317
name="EPS Power L2",
53185318
key="eps_power_l2",
53195319
native_unit_of_measurement=UnitOfApparentPower.VOLT_AMPERE,
53205320
register=0x7D,
53215321
register_type=REG_INPUT,
5322-
allowedtypes=AC | HYBRID | GEN3 | GEN4 | GEN5 | X3 | EPS,
5322+
allowedtypes=AC | HYBRID | X3 | EPS,
53235323
),
53245324
SolaXModbusSensorEntityDescription(
53255325
name="EPS Voltage L3",
@@ -5330,7 +5330,7 @@ def value_function_battery_voltage_cell_difference(initval, descr, datadict):
53305330
register_type=REG_INPUT,
53315331
scale=0.1,
53325332
rounding=1,
5333-
allowedtypes=AC | HYBRID | GEN3 | GEN4 | GEN5 | X3 | EPS,
5333+
allowedtypes=AC | HYBRID | X3 | EPS,
53345334
),
53355335
SolaXModbusSensorEntityDescription(
53365336
name="EPS Current L3",
@@ -5341,7 +5341,7 @@ def value_function_battery_voltage_cell_difference(initval, descr, datadict):
53415341
register_type=REG_INPUT,
53425342
scale=0.1,
53435343
rounding=1,
5344-
allowedtypes=AC | HYBRID | GEN3 | GEN4 | GEN5 | X3 | EPS,
5344+
allowedtypes=AC | HYBRID | X3 | EPS,
53455345
),
53465346
SolaXModbusSensorEntityDescription(
53475347
name="EPS Power Active L3",
@@ -5351,15 +5351,15 @@ def value_function_battery_voltage_cell_difference(initval, descr, datadict):
53515351
state_class=SensorStateClass.MEASUREMENT,
53525352
register=0x80,
53535353
register_type=REG_INPUT,
5354-
allowedtypes=AC | HYBRID | GEN3 | GEN4 | GEN5 | X3 | EPS,
5354+
allowedtypes=AC | HYBRID | X3 | EPS,
53555355
),
53565356
SolaXModbusSensorEntityDescription(
53575357
name="EPS Power L3",
53585358
key="eps_power_l3",
53595359
native_unit_of_measurement=UnitOfApparentPower.VOLT_AMPERE,
53605360
register=0x81,
53615361
register_type=REG_INPUT,
5362-
allowedtypes=AC | HYBRID | GEN3 | GEN4 | GEN5 | X3 | EPS,
5362+
allowedtypes=AC | HYBRID | X3 | EPS,
53635363
),
53645364
SolaXModbusSensorEntityDescription(
53655365
name="Measured Power L1",
@@ -5370,7 +5370,7 @@ def value_function_battery_voltage_cell_difference(initval, descr, datadict):
53705370
register=0x82,
53715371
register_type=REG_INPUT,
53725372
unit=REGISTER_S32,
5373-
allowedtypes=HYBRID | GEN3 | GEN4 | GEN5 | X3,
5373+
allowedtypes=HYBRID | X3,
53745374
),
53755375
SolaXModbusSensorEntityDescription(
53765376
name="Measured Power L2",
@@ -5381,7 +5381,7 @@ def value_function_battery_voltage_cell_difference(initval, descr, datadict):
53815381
register=0x84,
53825382
register_type=REG_INPUT,
53835383
unit=REGISTER_S32,
5384-
allowedtypes=HYBRID | GEN3 | GEN4 | GEN5 | X3,
5384+
allowedtypes=HYBRID | X3,
53855385
),
53865386
SolaXModbusSensorEntityDescription(
53875387
name="Measured Power L3",
@@ -5392,7 +5392,7 @@ def value_function_battery_voltage_cell_difference(initval, descr, datadict):
53925392
register=0x86,
53935393
register_type=REG_INPUT,
53945394
unit=REGISTER_S32,
5395-
allowedtypes=HYBRID | GEN3 | GEN4 | GEN5 | X3,
5395+
allowedtypes=HYBRID | X3,
53965396
),
53975397
SolaXModbusSensorEntityDescription(
53985398
name="Grid Mode Runtime",
@@ -5403,7 +5403,7 @@ def value_function_battery_voltage_cell_difference(initval, descr, datadict):
54035403
unit=REGISTER_S32,
54045404
scale=0.1,
54055405
rounding=1,
5406-
allowedtypes=AC | HYBRID | GEN3 | GEN4 | GEN5 | X3,
5406+
allowedtypes=AC | HYBRID | X3,
54075407
icon="mdi:timer",
54085408
),
54095409
SolaXModbusSensorEntityDescription(
@@ -5415,7 +5415,7 @@ def value_function_battery_voltage_cell_difference(initval, descr, datadict):
54155415
unit=REGISTER_S32,
54165416
scale=0.1,
54175417
rounding=1,
5418-
allowedtypes=AC | HYBRID | GEN3 | GEN4 | GEN5 | X3 | EPS,
5418+
allowedtypes=AC | HYBRID | X3 | EPS,
54195419
icon="mdi:timer",
54205420
),
54215421
SolaXModbusSensorEntityDescription(
@@ -5442,7 +5442,7 @@ def value_function_battery_voltage_cell_difference(initval, descr, datadict):
54425442
unit=REGISTER_U32,
54435443
scale=0.1,
54445444
rounding=1,
5445-
allowedtypes=HYBRID | GEN2 | GEN4 | EPS,
5445+
allowedtypes=HYBRID | GEN2 | GEN4 | GEN6 | EPS,
54465446
),
54475447
SolaXModbusSensorEntityDescription(
54485448
name="EPS Yield Total",
@@ -5465,7 +5465,7 @@ def value_function_battery_voltage_cell_difference(initval, descr, datadict):
54655465
register_type=REG_INPUT,
54665466
scale=0.1,
54675467
rounding=1,
5468-
allowedtypes=AC | HYBRID | GEN3 | GEN4 | GEN5 | EPS,
5468+
allowedtypes=AC | HYBRID | EPS,
54695469
),
54705470
SolaXModbusSensorEntityDescription(
54715471
name="E Charge Today",
@@ -5479,7 +5479,7 @@ def value_function_battery_voltage_cell_difference(initval, descr, datadict):
54795479
register_type=REG_INPUT,
54805480
scale=0.1,
54815481
rounding=2,
5482-
allowedtypes=AC | HYBRID | GEN3 | GEN4 | GEN5,
5482+
allowedtypes=AC | HYBRID | GEN3 | GEN4 | GEN5 | GEN6,
54835483
),
54845484
SolaXModbusSensorEntityDescription(
54855485
name="E Charge Total",
@@ -5494,7 +5494,7 @@ def value_function_battery_voltage_cell_difference(initval, descr, datadict):
54945494
unit=REGISTER_U32,
54955495
scale=0.1,
54965496
rounding=2,
5497-
allowedtypes=AC | HYBRID | GEN3 | GEN4 | GEN5,
5497+
allowedtypes=AC | HYBRID | GEN3 | GEN4 | GEN5 | GEN6,
54985498
),
54995499
SolaXModbusSensorEntityDescription(
55005500
name="Total Solar Energy",
@@ -8487,8 +8487,8 @@ async def async_determineInverterType(self, hub, configdict):
84878487
elif seriesnumber.startswith("10K12"):
84888488
invertertype = HYBRID | GEN6 | MPPT3 | X3 # X3 G4 PRO ?
84898489
self.inverter_model = "X3-G4PRO-12kW"
8490-
elif seriesnumber.startswith("10K15"):
8491-
invertertype = HYBRID | GEN6 | MPPT3 | X3 # X3 G4 PRO ?
8490+
elif seriesnumber.startswith("10K0F"):
8491+
invertertype = HYBRID | GEN6 | MPPT3 | X3 # X3 G4 PRO #1484
84928492
self.inverter_model = "X3-G4PRO-15kW"
84938493
elif seriesnumber.startswith("XAU"):
84948494
invertertype = MIC | GEN2 | X1 # X1-Boost

0 commit comments

Comments
 (0)