Skip to content

fix growatt and goodwe enum comparison #2001

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LKuemmel merged 1 commit into from
Nov 6, 2024
Merged

fix growatt and goodwe enum comparison #2001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions packages/modules/devices/good_we/good_we/device.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
from modules.devices.good_we.good_we import counter
from modules.devices.good_we.good_we import inverter
from modules.devices.good_we.good_we.config import GoodWe, GoodWeBatSetup, GoodWeCounterSetup, GoodWeInverterSetup
from modules.devices.good_we.good_we.version import GoodWeVersion

log = logging.getLogger(__name__)

Expand All @@ -19,17 +20,20 @@
def create_device(device_config: GoodWe):
def create_bat_component(component_config: GoodWeBatSetup):
return bat.GoodWeBat(device_config.configuration.modbus_id,
device_config.configuration.version, device_config.configuration.firmware,
GoodWeVersion(device_config.configuration.version),
device_config.configuration.firmware,
component_config, client)

def create_counter_component(component_config: GoodWeCounterSetup):
return counter.GoodWeCounter(device_config.id, device_config.configuration.modbus_id,
device_config.configuration.version, device_config.configuration.firmware,
GoodWeVersion(device_config.configuration.version),
device_config.configuration.firmware,
component_config, client)

def create_inverter_component(component_config: GoodWeInverterSetup):
return inverter.GoodWeInverter(device_config.configuration.modbus_id,
device_config.configuration.version, device_config.configuration.firmware,
GoodWeVersion(device_config.configuration.version),
device_config.configuration.firmware,
component_config, client)

def update_components(components: Iterable[good_we_component_classes]):
Expand Down
7 changes: 4 additions & 3 deletions packages/modules/devices/growatt/growatt/device.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
from modules.devices.growatt.growatt.config import Growatt, GrowattBatSetup, GrowattCounterSetup, GrowattInverterSetup
from modules.devices.growatt.growatt.counter import GrowattCounter
from modules.devices.growatt.growatt.inverter import GrowattInverter
from modules.devices.growatt.growatt.version import GrowattVersion

log = logging.getLogger(__name__)

Expand All @@ -18,17 +19,17 @@ def create_device(device_config: Growatt):
def create_bat_component(component_config: GrowattBatSetup):
return GrowattBat(component_config,
device_config.configuration.modbus_id,
device_config.configuration.version)
GrowattVersion(device_config.configuration.version))

def create_counter_component(component_config: GrowattCounterSetup):
return GrowattCounter(component_config,
device_config.configuration.modbus_id,
device_config.configuration.version)
GrowattVersion(device_config.configuration.version))

def create_inverter_component(component_config: GrowattInverterSetup):
return GrowattInverter(component_config,
device_config.configuration.modbus_id,
device_config.configuration.version)
GrowattVersion(device_config.configuration.version))

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