Skip to content

Commit efba441

Browse files
ndrsnhsLKuemmel
andauthored
fix growatt and goodwe enum comparison (#2001)
Co-authored-by: LKuemmel <[email protected]>
1 parent 14ac8f3 commit efba441

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

packages/modules/devices/good_we/good_we/device.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
from modules.devices.good_we.good_we import counter
1111
from modules.devices.good_we.good_we import inverter
1212
from modules.devices.good_we.good_we.config import GoodWe, GoodWeBatSetup, GoodWeCounterSetup, GoodWeInverterSetup
13+
from modules.devices.good_we.good_we.version import GoodWeVersion
1314

1415
log = logging.getLogger(__name__)
1516

@@ -19,17 +20,20 @@
1920
def create_device(device_config: GoodWe):
2021
def create_bat_component(component_config: GoodWeBatSetup):
2122
return bat.GoodWeBat(device_config.configuration.modbus_id,
22-
device_config.configuration.version, device_config.configuration.firmware,
23+
GoodWeVersion(device_config.configuration.version),
24+
device_config.configuration.firmware,
2325
component_config, client)
2426

2527
def create_counter_component(component_config: GoodWeCounterSetup):
2628
return counter.GoodWeCounter(device_config.id, device_config.configuration.modbus_id,
27-
device_config.configuration.version, device_config.configuration.firmware,
29+
GoodWeVersion(device_config.configuration.version),
30+
device_config.configuration.firmware,
2831
component_config, client)
2932

3033
def create_inverter_component(component_config: GoodWeInverterSetup):
3134
return inverter.GoodWeInverter(device_config.configuration.modbus_id,
32-
device_config.configuration.version, device_config.configuration.firmware,
35+
GoodWeVersion(device_config.configuration.version),
36+
device_config.configuration.firmware,
3337
component_config, client)
3438

3539
def update_components(components: Iterable[good_we_component_classes]):

packages/modules/devices/growatt/growatt/device.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
from modules.devices.growatt.growatt.config import Growatt, GrowattBatSetup, GrowattCounterSetup, GrowattInverterSetup
1111
from modules.devices.growatt.growatt.counter import GrowattCounter
1212
from modules.devices.growatt.growatt.inverter import GrowattInverter
13+
from modules.devices.growatt.growatt.version import GrowattVersion
1314

1415
log = logging.getLogger(__name__)
1516

@@ -18,17 +19,17 @@ def create_device(device_config: Growatt):
1819
def create_bat_component(component_config: GrowattBatSetup):
1920
return GrowattBat(component_config,
2021
device_config.configuration.modbus_id,
21-
device_config.configuration.version)
22+
GrowattVersion(device_config.configuration.version))
2223

2324
def create_counter_component(component_config: GrowattCounterSetup):
2425
return GrowattCounter(component_config,
2526
device_config.configuration.modbus_id,
26-
device_config.configuration.version)
27+
GrowattVersion(device_config.configuration.version))
2728

2829
def create_inverter_component(component_config: GrowattInverterSetup):
2930
return GrowattInverter(component_config,
3031
device_config.configuration.modbus_id,
31-
device_config.configuration.version)
32+
GrowattVersion(device_config.configuration.version))
3233

3334
def update_components(components: Iterable[Union[GrowattBat, GrowattCounter, GrowattInverter]]):
3435
with client as c:

0 commit comments

Comments
 (0)