Repository navigation
chore: rebase the eebus fork rollups on upstream dev - #33340
Merged
Merged
Conversation
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>
andig
enabled auto-merge (squash)
August 31, 2026 16:25
andig
disabled auto-merge
August 31, 2026 16:26
2 tasks done
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Rebases all three eebus fork rollup branches on their current
enbilitydev and bumps thereplacedirectives accordingly.andig/spine-go@3757d61andig/eebus-go@7e1f121andig/ship-go@ed7d718enbility/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 loseoperatingConstraintsInterrupt, after which every OHPCF control attempt failed withwhich 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:
remoteFeaturenil-check inSubscribeToRemote/BindToRemote(fix(spine): nil-check remoteFeature in SubscribeToRemote/BindToRemote (minimal patch for #87) enbility/spine-go#90)useCaseAvailableflag on the client (EG) side (fix: ignore useCaseAvailable flag on client (EG) side enbility/eebus-go#253)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
sequenceIdbut nooperatingConstraintsInterrupt, 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.sumonly.go test ./charger/... ./server/eebus/...passes.