Skip to content

Refactor meter energy into import energy (BC)#29142

Draft
andig wants to merge 6 commits intomasterfrom
chore/importtotal
Draft

Refactor meter energy into import energy (BC)#29142
andig wants to merge 6 commits intomasterfrom
chore/importtotal

Conversation

@andig
Copy link
Copy Markdown
Member

@andig andig commented Apr 15, 2026

Required for collecting partial metrics.

Impact

  • API: energy becomes import
  • Templates: energy becomes importenergy, energy supported as fallback for time being for custom configurations/templates.

TODO

  • decide import vs importenergy
  • external api structures (decide import vs importenergy vs importtotal naming)
  • ui display (energy vs importtotal) @naltatis
  • ui "custom" templates (energy vs import) @naltatis
  • cli @andig
  • cc integration maintainers when getting ready

Out of scope

  • add exporttotal

@andig andig requested a review from premultiply April 15, 2026 14:52
Copy link
Copy Markdown
Contributor

@sourcery-ai sourcery-ai Bot left a comment

Choose a reason for hiding this comment

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

Sorry @andig, your pull request is larger than the review limit of 150000 diff characters

@andig andig added the infrastructure Basic functionality label Apr 15, 2026
@andig andig mentioned this pull request Apr 15, 2026
6 tasks
@andig andig marked this pull request as draft April 15, 2026 15:44
@andig andig marked this pull request as draft April 15, 2026 15:44
@andig
Copy link
Copy Markdown
Member Author

andig commented Apr 16, 2026

@copilot fix build errors

Copy link
Copy Markdown
Contributor

Copilot AI commented Apr 16, 2026

@copilot fix build errors

Fixed in b084609. I updated the remaining Measurement.Energy references to Measurement.Import, adjusted MQTT measurement topic expectations, and corrected the PV fallback log to report power in watts.

Warning

Firewall rules blocked me from connecting to one or more addresses (expand for details)

I tried to connect to the following addresses, but was blocked by firewall rules:

  • 192.168.1.1
    • Triggering command: /tmp/go-build139629307/b1485/service.test /tmp/go-build139629307/b1485/service.test -test.testlogfile=/tmp/go-build139629307/b1485/testlog.txt -test.paniconexit0 -test.timeout=10m0s /tmp/go-build139629307/b1402/_pkg_.a mal/elgamal.go mpile ux-amd64/pkg/tool/linux_amd64/vet -errorsas ik/yaegi/stdlib/-atomic mpile ux-amd64/pkg/too-buildtags -o r/shoutrrr@v0.14-errorsas r/shoutrrr@v0.14-ifaceassert ux-amd64/pkg/tool/linux_amd64/vet c516/status/stat/tmp/go-build139629307/b1400/tplink.test echarge/salia mpile ux-amd64/pkg/too-test.timeout=10m0s (packet block)
  • 224.0.0.251
    • Triggering command: REDACTED, pid is -1 (packet block)
  • api.awattar.at
    • Triggering command: /tmp/go-build139629307/b1437/tariff.test /tmp/go-build139629307/b1437/tariff.test -test.testlogfile=/tmp/go-build139629307/b1437/testlog.txt -test.paniconexit0 -test.timeout=10m0s /tmp/go-build139629307/b1315/vet.cfg /v2@v2.14.0/inte-errorsas om/andig/gosunsp-ifaceassert ux-amd64/pkg/tool/linux_amd64/vet -errorsas go/quic-go/inter-atomic mpile ux-amd64/pkg/too-buildtags -ato�� ot@v1.20.0/model-errorsas ot@v1.20.0/model-ifaceassert ux-amd64/pkg/tool/linux_amd64/vet -errorsas /gosunspec/model-o mpile ux-amd64/pkg/too-trimpath (dns block)

If you need me to access, download, or install something from one of these locations, you can either:

@andig
Copy link
Copy Markdown
Member Author

andig commented Apr 19, 2026

@copilot resolve the merge conflicts in this pull request

Co-authored-by: andig <184815+andig@users.noreply.github.com>
Copy link
Copy Markdown
Contributor

Copilot AI commented Apr 19, 2026

@copilot resolve the merge conflicts in this pull request

Resolved in 7537d69. I merged origin/master into this branch, resolved the conflict in meter/fritz/aha/aha.go, and reconciled the Fritz meter interface with ImportTotal so the merge builds/tests cleanly. No UI changes were made in this conflict-resolution commit.

Warning

Firewall rules blocked me from connecting to one or more addresses (expand for details)

I tried to connect to the following addresses, but was blocked by firewall rules:

  • 224.0.0.251
    • Triggering command: REDACTED, pid is -1 (packet block)

If you need me to access, download, or install something from one of these locations, you can either:

@naltatis naltatis added the needs documentation Triggers issue creation in evcc-io/docs label Apr 20, 2026
@github-actions github-actions Bot added the stale Outdated and ready to close label Apr 27, 2026
@andig andig added backlog Things to do later and removed stale Outdated and ready to close labels Apr 27, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backlog Things to do later infrastructure Basic functionality needs documentation Triggers issue creation in evcc-io/docs

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants