Skip to content

add sdm120 simcounter for openWB Kit #2080

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 2 commits into from
Dec 18, 2024
Merged

add sdm120 simcounter for openWB Kit #2080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3fabf51
add sdm120 simcounter for openWB Kit
ndrsnhs Dec 17, 2024
9032f2b
fix restore imported
LKuemmel Dec 18, 2024
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
5 changes: 5 additions & 0 deletions packages/modules/common/simcount/_simcounter_store.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,11 @@ def restore_last_energy(topic: str, value: str):
data.data.system_data[f"device{device_id}"].components[f"component{component_id}"].component_config.type)
module = getattr(data.data, f"{module_type}_data")[f"{module_type}{get_second_index(topic)}"].data.get
return getattr(module, value)
except AttributeError:
if (value == "imported" and
"inverter" in data.data.system_data[f"device{device_id}"].components[
f"component{component_id}"].component_config.type):
return 0
except ValueError:
# Wenn kein Index enthalten, ist es Hausverbrauch.
if value == "exported":
Expand Down
3 changes: 2 additions & 1 deletion packages/modules/devices/openwb/openwb_flex/bat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
from modules.common.component_type import ComponentDescriptor
from modules.common.fault_state import ComponentInfo, FaultState
from modules.common.lovato import Lovato
from modules.common.sdm import Sdm120
from modules.common.sdm import Sdm630_72
from modules.common.simcount import SimCounter
from modules.common.store import get_bat_value_store
Expand Down Expand Up @@ -40,7 +41,7 @@ def update(self):
power = power * -1
else:
_, power = self.__client.get_power()
if isinstance(self.__client, Lovato):
if isinstance(self.__client, Lovato) or isinstance(self.__client, Sdm120):
imported, exported = self.sim_counter.sim_count(power)
else:
imported = self.__client.get_imported()
Expand Down
3 changes: 2 additions & 1 deletion packages/modules/devices/openwb/openwb_flex/inverter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
from modules.common.component_type import ComponentDescriptor
from modules.common.fault_state import ComponentInfo, FaultState
from modules.common.lovato import Lovato
from modules.common.sdm import Sdm120
from modules.common.simcount import SimCounter
from modules.common.store import get_inverter_value_store
from modules.devices.openwb.openwb_flex.config import PvKitFlexSetup
Expand Down Expand Up @@ -43,7 +44,7 @@ def update(self) -> None:
power = power*-1
currents = self.__client.get_currents()

if isinstance(self.__client, Lovato):
if isinstance(self.__client, Lovato) or isinstance(self.__client, Sdm120):
_, exported = self.sim_counter.sim_count(power)
else:
exported = self.__client.get_exported()
Expand Down