Skip to content

vampair - #3807

Closed
LKuemmel wants to merge 39 commits into
openWB:feature_consumerfrom
LKuemmel:consumer_dev
Closed

vampair#3807
LKuemmel wants to merge 39 commits into
openWB:feature_consumerfrom
LKuemmel:consumer_dev

Conversation

@LKuemmel

@LKuemmel LKuemmel commented Aug 17, 2026

Copy link
Copy Markdown
Contributor

No description provided.

LKuemmel and others added 30 commits August 6, 2026 15:24
@LKuemmel
Squashed commit of the following: move_feed_in_limit
4953b9e 
commit 227b921
Author: LKuemmel <[email protected]>
Date:   Thu Aug 6 15:24:02 2026 +0200

    ammend

commit b6b262d
Merge: f3e4414 b83ca17
Author: LKuemmel <[email protected]>
Date:   Thu Aug 6 15:23:26 2026 +0200

    Merge remote-tracking branch 'upstream/master' into move_feed_in_limit

commit f3e4414
Author: LKuemmel <[email protected]>
Date:   Wed Aug 5 12:02:06 2026 +0200

    fix

commit 42bad2b
Author: LKuemmel <[email protected]>
Date:   Wed Aug 5 10:28:32 2026 +0200

    review

commit 563cb25
Author: LKuemmel <[email protected]>
Date:   Wed Aug 5 09:58:28 2026 +0200

    fix

commit 91f9e68
Author: LKuemmel <[email protected]>
Date:   Wed Aug 5 09:55:14 2026 +0200

    fix

commit d203883
Author: LKuemmel <[email protected]>
Date:   Mon Aug 3 13:42:51 2026 +0200

    untested
@LKuemmel
Squashed commit of the following: feature_loadmanagement_prio_list
10e3344 
commit 9909442
Author: LKuemmel <[email protected]>
Date:   Thu Aug 6 15:14:15 2026 +0200

    fix merge

commit 11b6bb6
Merge: 3ade662 b83ca17
Author: LKuemmel <[email protected]>
Date:   Thu Aug 6 15:09:13 2026 +0200

    Merge remote-tracking branch 'upstream/master' into feature_loadmanagement_prio_list

commit 3ade662
Author: LKuemmel <[email protected]>
Date:   Thu Jul 23 15:21:38 2026 +0200

    pytest

commit 3a6e222
Author: LKuemmel <[email protected]>
Date:   Wed Jul 8 15:39:01 2026 +0200

    add pytest

commit 1bc4f9b
Author: LKuemmel <[email protected]>
Date:   Tue Jun 16 15:29:58 2026 +0200

    falke8

commit 33389ff
Author: LKuemmel <[email protected]>
Date:   Tue Jun 2 12:22:21 2026 +0200

    fix missing import

commit 6bf65ba
Author: LKuemmel <[email protected]>
Date:   Tue Jun 2 12:19:27 2026 +0200

    update config for prio list

commit c702b94
Author: LKuemmel <[email protected]>
Date:   Fri May 29 12:58:59 2026 +0200

    add loadmanagement prios to user management

commit d939755
Author: LKuemmel <[email protected]>
Date:   Wed Apr 29 15:28:05 2026 +0200

    update openwb_local.conf

commit 6fd7cb0
Author: LKuemmel <[email protected]>
Date:   Mon Apr 13 16:33:43 2026 +0200

    fixes

commit 1fd6b31
Author: LKuemmel <[email protected]>
Date:   Mon Apr 13 15:58:51 2026 +0200

    fixes

commit b27646b
Author: LKuemmel <[email protected]>
Date:   Mon Apr 13 14:33:27 2026 +0200

    draft

commit e4f8b5a
Author: LKuemmel <[email protected]>
Date:   Mon Apr 13 09:53:38 2026 +0200

    fix pytest

commit c693452
Author: LKuemmel <[email protected]>
Date:   Fri Apr 10 16:06:59 2026 +0200

    loadmanagement prio operations

commit 80698bc
Author: LKuemmel <[email protected]>
Date:   Fri Apr 10 07:57:21 2026 +0200

    counter all refactoring, mixin

commit ed658be
Author: LKuemmel <[email protected]>
Date:   Thu Apr 9 15:09:15 2026 +0200

    move files
@LKuemmel
ammend
08f6d38
@LKuemmel
draft
51ef4e7
@LKuemmel
draft
64b557d
@LKuemmel
fixes
94f6054
@LKuemmel
fixes
26eaf82
@LKuemmel
Anlauferkennung, Betriebsmodus zurücksetzen, Befehle für Pläne (openW…
4ff35eb 
…B#3588)

* draft

* Anlauferkennung

* Betriebsmodus zurücksetzen

* ammend

* Anlauferkennung

* draft

* draft scheduled charging

* add scheduled und time plan commands for adding and removing

* flake8

* update config

* Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <[email protected]>

* review

* fix pytest

---------

Co-authored-by: Copilot Autofix powered by AI <[email protected]>
@LKuemmel
on time, fixes (openWB#3612)
bba5562 
* on_time

* eco default price, typo
@LKuemmel
on_time accessible via 1883 (openWB#3626)
4750d26 
* on_time accessible via 1883

* fix
@Brett-S-OWB @LKuemmel
Add Consumer tab and cards to koala web theme (openWB#3630)
1de1093 
* add consumer tab/cards

* apply new design to consumer cards

* add consumer time on to consumer card

* fix consumer card CSS

* remove redundant placeholders
@LKuemmel
imported and exported for consumers; daily, monthly log; daily yields…
27214b6 
…; graph data (openWB#3644)

* update module config

* imported and exported for consumers

* daily, monthly log

* daily yields

* graph data
@Brett-S-OWB @LKuemmel
Consumer cards in carousel - small screen mobile view (openWB#3637)
437e446
@Brett-S-OWB @LKuemmel
Intergrate consumers in koala theme charts (openWB#3672)
9233a63 
* Add consumer to energy flow chart

* Add consumer row to daily totals chart

* Add consumer total to history chart

* add consumer color to store

* Align legend category dropdowns
@Brett-S-OWB @LKuemmel
Add consumer component to display flow chart (openWB#3673)
25b6c87 
* Add consumer component to display flow chart

* Add user management role
@LKuemmel
energy percentage, set usage per json, several fixes (openWB#3705)
fafad7a 
* energy percentage, set usage per json

* consider min interval

* fixes

* pv

* fix

* pycheck, fix extra meter

* ammend

* fixes

* ammend

* fix

* switch interval elapsed

* flake8
@LKuemmel
improve wait for start
cdf2df1
@LKuemmel
shelly, pytest (openWB#3730)
39a91df 
* add shelly, flake8, pytest consumer chargemodes

* fix shelly

* existing pytests running

* review
@LKuemmel
fix colors, lookup dict names and colors for consumers (openWB#3736)
b6d7c78 
* fix colors, lookup dict names and colors for consumers

* review
@Brett-S-OWB @LKuemmel
hide mode controls for consumer measurement only (openWB#3715)
47ecc5b
@Brett-S-OWB @LKuemmel
update consumer-configuration-access (user management) (openWB#3743)
8110f51
@LKuemmel
diagram colors, pytests, remove extra meters from log data (openWB#3742)
3a90d87 
* fix colors, lookup dict names and colors for consumers

* review

* extend tests

* add colors for yearly graph data

* remove extra meters from log data

* remove comment

* flake8
@LKuemmel
ammend
424adcb
@LKuemmel
fix_merge
2417eaf
@LKuemmel @benderl
switch mode on card
1143049
@Brett-S-OWB @benderl
update consumer button groups
ffb2dae
@Brett-S-OWB @benderl
update message - data order in consumer card
6a8ac20
@benderl
linting
dff66d7
@benderl
reapply lost changes from openWB#3715
822f91f
@LKuemmel
usage type self controlled (openWB#3775)
4bd5005 
* usage type self controlled

* fix

* review
LKuemmel and others added 7 commits August 7, 2026 13:24
@LKuemmel
review (openWB#3776)
1fbcfc7
@LKuemmel
calc on time (openWB#3777)
17f8ab0 
* calc on time

* review
@LKuemmel
pytest (openWB#3786)
5138c6e 
* fix pytest

* fixes, pytest

* review

* fix
@LKuemmel
fixes (openWB#3794)
ff7bbcd 
* typo

* fix

* pytest
@seaspotter
Reworked IDM and Lambda consumer and add Ovum (openWB#3737)
3ceea9d 
* 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.
@LKuemmel
Vampair
48dd6a9
@LKuemmel
typo
5049397
@LKuemmel
LKuemmel requested a lite review from Copilot August 17, 2026 12:18
Copilot AI reviewed Aug 17, 2026
View reviewed changes

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Adds a new Solarfocus “vampair” consumer module (heat pump) to the consumers framework, including vendor registration, configuration model, and Modbus-based runtime implementation.

Changes:

  • Introduces a new solarfocus vendor descriptor for grouping and UI/vendor metadata.
  • Adds vampair consumer implementation using Modbus TCP reads/writes and SimCounterConsumer for energy accounting.
  • Adds vampair configuration classes and wiring to the vendor descriptor.

Reviewed changes

Copilot reviewed 3 out of 5 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
packages/modules/consumers/solarfocus/vendor.py Registers the Solarfocus vendor descriptor used by consumer setups under this vendor.
packages/modules/consumers/solarfocus/vampair/consumer.py Implements the Vampair consumer behavior (initializer, update, set limit, send values) via Modbus TCP.
packages/modules/consumers/solarfocus/vampair/config.py Defines Vampair configuration/setup classes and connects them to the Solarfocus vendor descriptor.
packages/modules/consumers/solarfocus/vampair/init.py Marks the vampair directory as a Python package.
packages/modules/consumers/solarfocus/init.py Marks the solarfocus directory as a Python package.

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

Comment thread packages/modules/consumers/solarfocus/vampair/consumer.py
Comment on lines +42 to +47
return ConfigurableConsumer(consumer_config=config,
initializer=initializer,
error_handler=error_handler,
update=update,
set_limit=set_limit,
send_values=send_values)
@LKuemmel LKuemmel closed this Aug 18, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot
Copilot review effort
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@LKuemmel @Brett-S-OWB @benderl @seaspotter