Skip to content

chore: rebase the eebus fork rollups on upstream dev - #33340

Merged
andig merged 1 commit into
masterfrom
chore/eebus-rollup-20260831
Aug 31, 2026
Merged

andig merged 1 commit into
masterfrom
chore/eebus-rollup-20260831

Conversation

@andig

@andig andig commented Aug 31, 2026 •

Copy link
Copy Markdown
Member

Rebases all three eebus fork rollup branches on their current enbility dev and bumps the replace directives accordingly.

module rollup contents
spine-go andig/spine-go@3757d61 dev + enbility/spine-go#107
eebus-go andig/eebus-go@7e1f121 dev + enbility/eebus-go#255
ship-go andig/ship-go@ed7d718 dev + enbility/ship-go#109

enbility/spine-go#104 was merged upstream, so the spine-go rollup no longer carries it — it now comes in through dev. That is the partial-update fix for smartEnergyManagementPsData: a re-announced power sequence used to lose operatingConstraintsInterrupt, after which every OHPCF control attempt failed with

The remote data structure is in an invalid state (alternative attribute present but no power sequence operating interrupt constraints defined)

which is #32252. Replaying that report's trace against the rebased rollup ends with a complete sequence.

Also picked up through the dev rebases, all merged upstream since the last bump:

The eebus-go rollup deliberately does not carry enbility/eebus-go#257, so the recovery window stays: #104 repairs a sequence on the remote's next complete announce, and until that arrives the stored entry has a sequenceId but no operatingConstraintsInterrupt, so the four OHPCF control methods keep erroring even though each of them uses only the sequence id. In the #32252 trace that window was 5 h 25 min.

No evcc code changes, go.mod/go.sum only. go test ./charger/... ./server/eebus/... passes.

enbility/spine-go#104 has been merged upstream, so the
spine-go rollup no longer has to carry it. All three fork branches are rebased
on their current enbility dev:

- spine-go: dev + enbility/spine-go#107
- eebus-go: dev + enbility/eebus-go#255
- ship-go:  dev + enbility/ship-go#109

Picking up #104 fixes the partial update of smartEnergyManagementPsData that
dropped a re-announced power sequence's operatingConstraintsInterrupt and left
OHPCF control failing with "no power sequence operating interrupt constraints
defined" (#32252).

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>

@sourcery-ai sourcery-ai Bot 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.

Hey - I've reviewed your changes and they look great!

Sourcery assessment

Approved.


Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

@github-actions github-actions Bot added bug Something isn't working heating Heating labels Aug 31, 2026
@andig
andig enabled auto-merge (squash) August 31, 2026 16:25
@andig
andig disabled auto-merge August 31, 2026 16:26
@andig
andig merged commit a0dc797 into master Aug 31, 2026
15 checks passed
@andig
andig deleted the chore/eebus-rollup-20260831 branch August 31, 2026 16:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working heating Heating

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant