bat: use enum values by LKuemmel · Pull Request #3289 · openWB/core

LKuemmel · 2026-04-13T10:23:46Z

No description provided.

Copilot

Pull request overview

This PR refactors the battery control logic to use Enum members directly (instead of their .value strings) for configuration and state fields in bat_all, and updates related unit tests accordingly.

Changes:

Change BatAllData.Config and BatAllData.Set fields from str to Enum-typed fields and update defaults.
Replace multiple comparisons against *.value with comparisons against Enum members.
Update bat_all_test.py parameter defaults and test cases to pass Enum members instead of strings.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 5 comments.

File	Description
packages/control/bat_all.py	Switches configuration/state fields and comparisons from string values to Enum members throughout battery control logic.
packages/control/bat_all_test.py	Updates test parameter defaults/cases to use Enum members (but still has some mismatched type hints).

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-04-13T10:28:58Z

+    power_limit_mode: BatPowerLimitMode = field(default=BatPowerLimitMode.MODE_NO_DISCHARGE,
+                                                metadata={"topic": "config/power_limit_mode"})
+    power_limit_condition: BatPowerLimitCondition = field(default=BatPowerLimitCondition.VEHICLE_CHARGING,
+                                                          metadata={"topic": "config/power_limit_condition"})
+    manual_mode: ManualMode = field(default=ManualMode.MANUAL_DISABLE,
+                                    metadata={"topic": "config/manual_mode"})


The config fields are now typed/stored as Enum instances, but MQTT subscription writes per-field config values via SubData.set_json_payload_class without Enum coercion (it assigns decoded payloads directly). That means these attributes will typically become plain strings at runtime (e.g., "mode_no_discharge"), and later Enum comparisons will fail. Either keep these config fields as str (and compare to .value), or update the subscription/deserialization path to convert strings to the declared Enum type for dataclass fields.

Copilot · 2026-04-13T10:28:58Z

@@ -349,7 +349,7 @@
                    charging_power_left = 0
                self.data.set.regulate_up = True if self.data.get.soc < 100 else False
            #  ev wird nach Speicher geladen
-            elif config.bat_mode == BatConsiderationMode.EV_MODE.value:
+            elif config.bat_mode == BatConsiderationMode.EV_MODE:


pv_charging.bat_mode is populated as a string in practice (see PvCharging.bat_mode default in packages/control/general.py and SubData.set_json_payload_class assignment), but this code now compares it against BatConsiderationMode Enum members. This will make both branches unreachable unless the value is explicitly converted to the Enum elsewhere. Compare against .value or ensure bat_mode is stored as BatConsiderationMode (with conversion on MQTT receive).

Copilot · 2026-04-13T10:28:59Z

        # Speicher entlädt oder Speicher lädt bei gewollter PV-Ladung
        bat_power_valid = (self.data.get.power <= 0 or
                           (self.data.get.power > 0 and
-                            self.data.config.power_limit_mode == BatPowerLimitMode.MODE_CHARGE_PV_PRODUCTION.value))
+                            self.data.config.power_limit_mode == BatPowerLimitMode.MODE_CHARGE_PV_PRODUCTION))
        # EVU Bezug vorhanden oder gewollte PV-Ladung aktiv
        evu_power_valid = (data.data.counter_all_data.get_evu_counter().data.get.power >= -100 or
-                           self.data.config.power_limit_mode == BatPowerLimitMode.MODE_CHARGE_PV_PRODUCTION.value)
+                           self.data.config.power_limit_mode == BatPowerLimitMode.MODE_CHARGE_PV_PRODUCTION)


These comparisons assume power_limit_mode is a BatPowerLimitMode Enum, but when the value comes from MQTT it will be a string unless it’s converted on receipt. With the current subscription logic this will cause bat_power_valid / evu_power_valid to evaluate incorrectly. Consider comparing to BatPowerLimitMode.*.value or adding Enum coercion when setting config values from topics.

Copilot · 2026-04-13T10:28:59Z

        if ((self.data.config.bat_control_permitted is False or
                self.data.config.bat_control_activated is False)
-                and self.data.set.current_state == CurrentState.STARTUP.value):
+                and self.data.set.current_state == CurrentState.STARTUP):
            self.data.set.set_limit = False
-        elif (self.data.set.current_state == CurrentState.IDLE.value and
+        elif (self.data.set.current_state == CurrentState.IDLE and
                charge_mode == BatChargeMode.BAT_SELF_REGULATION):
            self.data.set.set_limit = False
        else:
            self.data.set.set_limit = True

        if charge_mode == BatChargeMode.BAT_SELF_REGULATION:
-            self.data.set.current_state = CurrentState.IDLE.value
+            self.data.set.current_state = CurrentState.IDLE
        else:
-            self.data.set.current_state = CurrentState.ACTIVE.value
+            self.data.set.current_state = CurrentState.ACTIVE


current_state is now modeled as CurrentState, but the MQTT subscription path sets set/current_state directly from the decoded payload (string). This can lead to mixed types (str vs Enum) and make these state checks/assignments behave incorrectly after retained topics are received. Either keep current_state as str and use .value, or ensure Enum conversion when consuming the topic payload.

Copilot · 2026-04-13T10:28:59Z

+    power_limit_mode: str = BatPowerLimitMode.MODE_NO_DISCHARGE
+    power_limit_condition: str = BatPowerLimitCondition.VEHICLE_CHARGING
+    bat_manual_mode: str = ManualMode.MANUAL_DISABLE


These fields are still annotated as str but now default to Enum members. Update the type hints to the corresponding Enum types (BatPowerLimitMode, BatPowerLimitCondition, ManualMode) to match how the params are used and avoid misleading typing in tests.

Suggested change

power_limit_mode: str = BatPowerLimitMode.MODE_NO_DISCHARGE

power_limit_condition: str = BatPowerLimitCondition.VEHICLE_CHARGING

bat_manual_mode: str = ManualMode.MANUAL_DISABLE

power_limit_mode: BatPowerLimitMode = BatPowerLimitMode.MODE_NO_DISCHARGE

power_limit_condition: BatPowerLimitCondition = BatPowerLimitCondition.VEHICLE_CHARGING

bat_manual_mode: ManualMode = ManualMode.MANUAL_DISABLE

* use chargemode enums for chargepoints * fix * flake8 * flake8 * fix amount * use enum also for chargemode selected * fix asdict import * review

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* usage type self controlled * fix * review

* calc on time * review

* fix pytest * fixes, pytest * review * fix

* typo * fix * pytest

* IDM: send PV/Hausverbrauch/Batterie via GLT statt Leistungsvorgabe * Lambda: PV-Überschuss statt power_limit an E-Manager senden * Add OVUM CubeSpeicher/MPlus consumer module * IDM: revert scaling factor, fix flake8 formatting * flake8 * Rename send_grid_values to send_values in config.py * Adjust surplus calculation to account for charging power Include charging power in surplus calculation to avoid misreporting surplus to the heat pump. * Update send_values function to send grid power * Add Self_Controlled for IDM and Lambda * flake8: fix syntax error and whitespace in consumer modules Stray pasted line broke lambda_ consumer.py syntax; idm/lambda_/ovum files had trailing whitespace on blank lines and missing EOF newlines.

* clean up * fix loadmanagement * review * review * flake8

openWB#3840) * no charge for loads * consider non charging for consumers and update consumer state messages * flake8 * review

* Vampair * typo * review * review * review

* draft dac * add dataclass object for set_power_limit * Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

LKuemmel marked this pull request as draft April 13, 2026 10:23

LKuemmel added this to the 2.2.1 milestone Apr 13, 2026

LKuemmel requested a review from Copilot April 13, 2026 10:25

Copilot AI reviewed Apr 13, 2026

View reviewed changes

LKuemmel force-pushed the fix_bat_set_power branch from 89005cf to 2ca0b49 Compare August 26, 2026 13:29

LKuemmel and others added 25 commits August 26, 2026 15:36

use chargemode enums for chargepoints

9a05ff2

fix

b26677a

flake8

fa1e001

flake8

b2c867d

fix amount

0e9aca3

use enum also for chargemode selected

448212d

fix asdict import (openWB#3847)

e2b6986

* use chargemode enums for chargepoints * fix * flake8 * flake8 * fix amount * use enum also for chargemode selected * fix asdict import * review

untested

2f13bc2

fix

b4623f8

fix

dfb9445

review

808e72b

fix

43a0a36

ammend

38c8ae1

fix

28e59f0

fix subdata (openWB#3817)

cc35a39

Apply suggestions from code review

5ece834

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

review

76c974e

review

afa929c

move files

852d625

counter all refactoring, mixin

09090e2

loadmanagement prio operations

0652ed6

fix pytest

13d11eb

draft

7643a6d

fixes

e3cf23a

fixes

1d53a28

LKuemmel and others added 25 commits August 26, 2026 15:41

fix_merge

090953c

switch mode on card

a51c9a3

update consumer button groups

a3878e7

update message - data order in consumer card

3526efe

linting

3a345e6

reapply lost changes from openWB#3715

f3c9a80

usage type self controlled (openWB#3775)

9156196

* usage type self controlled * fix * review

review (openWB#3776)

064645c

calc on time (openWB#3777)

3d3e90a

* calc on time * review

pytest (openWB#3786)

bf7f8fe

* fix pytest * fixes, pytest * review * fix

fixes (openWB#3794)

b0c04e0

* typo * fix * pytest

split PR: remove moduls except mqtt

00eb89a

fix loadmanagement, clean up (openWB#3819)

056dc7b

* clean up * fix loadmanagement * review * review * flake8

fix versions

2840bcd

fix merge error

f63e08d

consider non charging for consumers and update consumer state messages (

131c7cd

openWB#3840) * no charge for loads * consider non charging for consumers and update consumer state messages * flake8 * review

fix rebase

f8c6ec9

pass data object as parameter in set_power_limit methode (openWB#3854)

e356251

modules

c78c878

Vampair (openWB#3815)

2044142

* Vampair * typo * review * review * review

fix asdict import

a77148b

review

1f08b1c

draft

f654156

LKuemmel force-pushed the fix_bat_set_power branch from 2ca0b49 to f654156 Compare August 27, 2026 13:27

LKuemmel changed the base branch from master to feature_consumer_modules August 27, 2026 13:29

LKuemmel added 2 commits August 27, 2026 15:37

fix

b9231d7

fix

534f3ae

LKuemmel force-pushed the feature_consumer_modules branch from f8780fb to fe16993 Compare August 28, 2026 13:14

Navigation Menu

Uh oh!

bat: use enum values - #3289

bat: use enum values#3289
LKuemmel wants to merge 84 commits into
openWB:feature_consumer_modulesfrom
LKuemmel:fix_bat_set_power

LKuemmel commented Apr 13, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Apr 13, 2026

Uh oh!

Copilot AI Apr 13, 2026

Uh oh!

Copilot AI Apr 13, 2026

Uh oh!

Copilot AI Apr 13, 2026

Uh oh!

Copilot AI Apr 13, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Uh oh!

Conversation

LKuemmel commented Apr 13, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Apr 13, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 13, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 13, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 13, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 13, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants