From 53bf6b4aac4725fc5c026eef527214062ad1339d Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Wed, 7 Oct 2026 15:12:51 +0200 Subject: [PATCH 1/2] Shelly: Fix Phasenrotation --- packages/modules/consumers/shelly/shelly_em/consumer.py | 3 +-- packages/modules/consumers/shelly/shelly_pm/consumer.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/modules/consumers/shelly/shelly_em/consumer.py b/packages/modules/consumers/shelly/shelly_em/consumer.py index edceb74e85..a748b85ab3 100644 --- a/packages/modules/consumers/shelly/shelly_em/consumer.py +++ b/packages/modules/consumers/shelly/shelly_em/consumer.py @@ -24,8 +24,7 @@ def error_handler() -> None: def update() -> ConsumerState: status = request_status(config.configuration.ip_address, generation) - powers, voltages, currents, _, power, _ = parse_data( - data.data.consumer_data[f"consumer{config.id}"].data.config.phase_1, config.configuration.factor, status) + powers, voltages, currents, _, power, _ = parse_data(1, config.configuration.factor, status) imported, exported = sim_counter.sim_count(power) consumer_state = ConsumerState( power=power, diff --git a/packages/modules/consumers/shelly/shelly_pm/consumer.py b/packages/modules/consumers/shelly/shelly_pm/consumer.py index 74e02cd600..f3b2268508 100644 --- a/packages/modules/consumers/shelly/shelly_pm/consumer.py +++ b/packages/modules/consumers/shelly/shelly_pm/consumer.py @@ -62,8 +62,7 @@ def switch_off() -> None: def update() -> ConsumerState: status = request_status(config.configuration.ip_address, generation) - powers, voltages, currents, _, power, _ = parse_data( - data.data.consumer_data[f"consumer{config.id}"].data.config.phase_1, config.configuration.factor, status) + powers, voltages, currents, _, power, _ = parse_data(1, config.configuration.factor, status) imported, exported = sim_counter.sim_count(power) return ConsumerState( power=power, From 95dfd1a60cbcde0def9eb2d82e0edeb110e7d5e0 Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Wed, 7 Oct 2026 15:17:48 +0200 Subject: [PATCH 2/2] flake8 --- packages/modules/consumers/shelly/shelly_em/consumer.py | 1 - packages/modules/consumers/shelly/shelly_pm/consumer.py | 1 - 2 files changed, 2 deletions(-) diff --git a/packages/modules/consumers/shelly/shelly_em/consumer.py b/packages/modules/consumers/shelly/shelly_em/consumer.py index a748b85ab3..001dcec6af 100644 --- a/packages/modules/consumers/shelly/shelly_em/consumer.py +++ b/packages/modules/consumers/shelly/shelly_em/consumer.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -from control import data from modules.common.abstract_device import DeviceDescriptor from typing import Optional from modules.common.component_state import ConsumerState diff --git a/packages/modules/consumers/shelly/shelly_pm/consumer.py b/packages/modules/consumers/shelly/shelly_pm/consumer.py index f3b2268508..e1bd62c5c9 100644 --- a/packages/modules/consumers/shelly/shelly_pm/consumer.py +++ b/packages/modules/consumers/shelly/shelly_pm/consumer.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -from control import data from modules.common import req from typing import Optional from modules.common.abstract_device import DeviceDescriptor