Skip to content

EEBus: add controlbox test #28908

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andig merged 4 commits into from
Jun 23, 2026
+13 −9
Merged

EEBus: add controlbox test #28908

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ff0f4e6
EEBus: upgrade and add tests
andig Feb 2, 2026
73dea7f
wip
andig Apr 7, 2026
a58b6fb
Merge branch 'master' into chore/eebus
andig Apr 15, 2026
6ffdb89
Merge remote-tracking branch 'origin/master' into chore/eebus
Copilot Jun 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ require (
github.com/denisbrodbeck/machineid v1.0.1
github.com/dylanmei/iso8601 v0.1.0
github.com/eclipse/paho.mqtt.golang v1.5.1
github.com/enbility/eebus-go v0.7.0
github.com/enbility/ship-go v0.6.0
github.com/enbility/spine-go v0.7.0
github.com/enbility/eebus-go v0.7.1-0.20260202090553-bdf852420469
github.com/enbility/ship-go v0.6.1-0.20260202091856-448b5082110c
github.com/enbility/spine-go v0.7.1-0.20260202104400-b02c9fc77135
github.com/evcc-io/openapi-mcp v0.6.0
github.com/evcc-io/optimizer v0.0.0-20260411145738-bf13a64d411c
github.com/evcc-io/rct v0.2.0
Expand Down Expand Up @@ -181,6 +181,7 @@ require (
github.com/google/renameio/v2 v2.0.0 // indirect
github.com/gorilla/websocket v1.5.3 // indirect
github.com/gosimple/unidecode v1.0.1 // indirect
github.com/govalues/decimal v0.1.36 // indirect
github.com/grid-x/serial v0.0.0-20211107191517-583c7356b3aa // indirect
github.com/huandu/xstrings v1.5.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
Expand All @@ -196,8 +197,8 @@ require (
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-runewidth v0.0.19 // indirect
github.com/mergermarket/go-pkcs7 v0.0.0-20170926155232-153b18ea13c9 // indirect
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
github.com/miekg/dns v1.1.62 // indirect
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
github.com/miekg/dns v1.1.66 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
Expand All @@ -223,8 +224,8 @@ require (
github.com/quic-go/webtransport-go v0.10.0 // indirect
github.com/relvacode/iso8601 v1.6.0 // indirect
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
github.com/rickb777/date v1.21.1 // indirect
github.com/rickb777/plural v1.4.2 // indirect
github.com/rickb777/period v1.0.15 // indirect
github.com/rickb777/plural v1.4.4 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/sagikazarmark/locafero v0.12.0 // indirect
github.com/segmentio/asm v1.1.3 // indirect
Expand Down Expand Up @@ -271,3 +272,5 @@ replace github.com/grid-x/modbus => github.com/evcc-io/modbus v0.0.0-20250501165
replace github.com/lorenzodonini/ocpp-go => github.com/evcc-io/ocpp-go v0.0.0-20251212212612-b7f92ee0443b

replace go.yaml.in/yaml/v4 => go.yaml.in/yaml/v4 v4.0.0-rc.3

replace github.com/enbility/eebus-go => ../eebus-go

@sourcery-ai sourcery-ai Bot Apr 7, 2026

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.

issue (bug_risk): Local replace directive will break consumers who don’t have ../eebus-go.

This hardcodes your local directory structure into go.mod and will fail for others or in CI where ../eebus-go isn’t present. If it’s only needed for local development, keep it out of the committed go.mod (e.g., via a local GOWORK/GOFLAGS setup or another local-only config).

34 changes: 20 additions & 14 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/
github.com/WulfgarW/sensonet v0.0.7 h1:WkrZF7UNoQVyQIvpaUPqZfKTvHfFXTRmSF/zMQKJo+Q=
github.com/WulfgarW/sensonet v0.0.7/go.mod h1:GNOik1nTPswwtZ4bLpIRglEn9dNgEG79iOhVUq4IKgA=
github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=
github.com/ahmetb/go-linq/v3 v3.2.0 h1:BEuMfp+b59io8g5wYzNoFe9pWPalRklhlhbiU3hYZDE=
github.com/ahmetb/go-linq/v3 v3.2.0/go.mod h1:haQ3JfOeWK8HpVxMtHHEMPVgBKiYyQ+f1/kLZh/cj9U=
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
Expand Down Expand Up @@ -183,14 +181,14 @@ github.com/eclipse/paho.golang v0.23.0/go.mod h1:nQRhTkoZv8EAiNs5UU0/WdQIx2NrnWU
github.com/eclipse/paho.mqtt.golang v1.5.1 h1:/VSOv3oDLlpqR2Epjn1Q7b2bSTplJIeV2ISgCl2W7nE=
github.com/eclipse/paho.mqtt.golang v1.5.1/go.mod h1:1/yJCneuyOoCOzKSsOTUc0AJfpsItBGWvYpBLimhArU=
github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
github.com/enbility/eebus-go v0.7.0 h1:Uh3i+HMmTYecWA+BBlYYhNFuNtqzWWQarbv4z9n/aQI=
github.com/enbility/eebus-go v0.7.0/go.mod h1:ftoVhXGC00IEcfN4RZSb1PbBIglE9i3JYqwrjhXnYSA=
github.com/enbility/eebus-go v0.7.1-0.20260202090553-bdf852420469 h1:sUbmLWJjQjYE8CK6jR3TFrZlwCdLur/NRYJgVvatUHY=
github.com/enbility/eebus-go v0.7.1-0.20260202090553-bdf852420469/go.mod h1:1Ibczmpm6NIdWr8NPzmbpfgNvk5lJ+OxKZQ4ysehb9E=
github.com/enbility/go-avahi v0.0.0-20240909195612-d5de6b280d7a h1:foChWb8lhzqa6lWDRs6COYMdp649YlUirFP8GqoT0JQ=
github.com/enbility/go-avahi v0.0.0-20240909195612-d5de6b280d7a/go.mod h1:H64mhYcAQUGUUnVqMdZQf93kPecH4M79xwH95Lddt3U=
github.com/enbility/ship-go v0.6.0 h1:1ft5NJJHqqGU3/ryYwQj8xBYJLFbf0q2cP9mjlYHlgw=
github.com/enbility/ship-go v0.6.0/go.mod h1:JJp8EQcJhUhTpZ2LSEU4rpdaM3E2n08tswWFWtmm/wU=
github.com/enbility/spine-go v0.7.0 h1:UZeghFgnM3VFU0ghc57Htt6gnxwP9jLppfU2GUMJGgY=
github.com/enbility/spine-go v0.7.0/go.mod h1:IF1sBTr7p3wXqlejeBJcJ8BYFlzzRaZcJsGw8XjgEgc=
github.com/enbility/ship-go v0.6.1-0.20260202091856-448b5082110c h1:kdoh29PfboIv44PtqPVwq/J5z/mzWdywEv2kPFqPMv4=
github.com/enbility/ship-go v0.6.1-0.20260202091856-448b5082110c/go.mod h1:jIQLnpW8WnKvqWx/W+pT8nIeTqTs6nBUH0JWu40lrZI=
github.com/enbility/spine-go v0.7.1-0.20260202104400-b02c9fc77135 h1:1/I3X2NHwOzREq80fcQ5mD3rUMV5QjRZGKlGsfAv5zQ=
github.com/enbility/spine-go v0.7.1-0.20260202104400-b02c9fc77135/go.mod h1:JDbMWRaMtTS6dkPbzBLfBSvSs4eS32K1kk2EUrQCmcw=
github.com/enbility/zeroconf/v2 v2.0.0-20240920094356-be1cae74fda6 h1:XOYvxKtT1oxT37w/5oEiRLuPbm9FuJPt3fiYhX0h8Po=
github.com/enbility/zeroconf/v2 v2.0.0-20240920094356-be1cae74fda6/go.mod h1:BszP9qFV14mPXgyIREbgIdQtWxbAj3OKqvK02HihMoM=
github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g=
Expand Down Expand Up @@ -361,6 +359,8 @@ github.com/gosimple/slug v1.15.0 h1:wRZHsRrRcs6b0XnxMUBM6WK1U1Vg5B0R7VkIf1Xzobo=
github.com/gosimple/slug v1.15.0/go.mod h1:UiRaFH+GEilHstLUmcBgWcI42viBN7mAb818JrYOeFQ=
github.com/gosimple/unidecode v1.0.1 h1:hZzFTMMqSswvf0LBJZCZgThIZrpDHFXux9KeGmn6T/o=
github.com/gosimple/unidecode v1.0.1/go.mod h1:CP0Cr1Y1kogOtx0bJblKzsVWrqYaqfNOnHzpgWw4Awc=
github.com/govalues/decimal v0.1.36 h1:dojDpsSvrk0ndAx8+saW5h9WDIHdWpIwrH/yhl9olyU=
github.com/govalues/decimal v0.1.36/go.mod h1:Ee7eI3Llf7hfqDZtpj8Q6NCIgJy1iY3kH1pSwDrNqlM=
github.com/gregdel/pushover v1.4.0 h1:P77WAJ2zPG+b0mEsmMjWGrPMuvhkh9k3v7OviwsoveE=
github.com/gregdel/pushover v1.4.0/go.mod h1:EcaO66Nn1StkpEm1iKtBTV3d2A16SoMsVER1PthX7to=
github.com/grid-x/serial v0.0.0-20211107191517-583c7356b3aa h1:Rsn6ARgNkXrsXJIzhkE4vQr5Gbx2LvtEMv4BJOK4LyU=
Expand Down Expand Up @@ -510,8 +510,8 @@ github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1f
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4=
github.com/miekg/dns v1.1.62 h1:cN8OuEF1/x5Rq6Np+h1epln8OiyPWV+lROx9LxcGgIQ=
github.com/miekg/dns v1.1.62/go.mod h1:mvDlcItzm+br7MToIKqkglaGhlFMHJ9DTNNWONWXbNQ=
github.com/miekg/dns v1.1.66 h1:FeZXOS3VCVsKnEAd+wBkjMC3D2K+ww66Cq3VnCINuJE=
github.com/miekg/dns v1.1.66/go.mod h1:jGFzBsSNbJw6z1HYut1RKBKHA9PBdxeHrZG8J+gC2WE=
github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
Expand Down Expand Up @@ -607,6 +607,8 @@ github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9
github.com/perimeterx/marshmallow v1.1.5 h1:a2LALqQ1BlHM8PZblsDdidgv1mWi1DgC2UmX50IvK2s=
github.com/perimeterx/marshmallow v1.1.5/go.mod h1:dsXbUu8CRzfYP5a87xpp0xq9S3u0Vchtcl8we9tYaXw=
github.com/peterbourgon/ff v1.2.0/go.mod h1:ljiF7yxtUvZaxUDyUqQa0+uiEOgwVboj+Q2S2+0nq40=
github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7 h1:Dx7Ovyv/SFnMFw3fD4oEoeorXc6saIiQ23LrGLth0Gw=
github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4=
github.com/philippseith/signalr v0.8.0 h1:CvylMNn7TkJi4adUlk75K08OwljdmBqo6jd12Pz2Guw=
github.com/philippseith/signalr v0.8.0/go.mod h1:ZIAyv2b3xIsh+8j++0Omtp0Xe4CwDnwfyyZBEh5Z9uk=
github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc=
Expand Down Expand Up @@ -664,10 +666,12 @@ github.com/relvacode/iso8601 v1.6.0 h1:eFXUhMJN3Gz8Rcq82f9DTMW0svjtAVuIEULglM7QH
github.com/relvacode/iso8601 v1.6.0/go.mod h1:FlNp+jz+TXpyRqgmM7tnzHHzBnz776kmAH2h3sZCn0I=
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
github.com/rickb777/date v1.21.1 h1:tUcQS8riIRoYK5kUAv5aevllFEYUEk2x8OYDyoldOn4=
github.com/rickb777/date v1.21.1/go.mod h1:gnDexsbXViZr2fCKMrY3m6IfAF5U2vSkEaiGJcNFaLQ=
github.com/rickb777/plural v1.4.2 h1:Kl/syFGLFZ5EbuV8c9SVud8s5HI2HpCCtOMw2U1kS+A=
github.com/rickb777/plural v1.4.2/go.mod h1:kdmXUpmKBJTS0FtG/TFumd//VBWsNTD7zOw7x4umxNw=
github.com/rickb777/expect v0.24.0 h1:IzFxn4jINkVuCmx4jdQP7LxaIBhG60bDVbeGWk3xnzo=
github.com/rickb777/expect v0.24.0/go.mod h1:jwwS3gmukQ7wPxzEtOhMJEv43UxSwOBE7MUgTt8CX0k=
github.com/rickb777/period v1.0.15 h1:nWR4rgCtImT0CXw5kAsjHv+ExCEFt/18zAySOi7pWI8=
github.com/rickb777/period v1.0.15/go.mod h1:3lWluyeZEk6n1jfLCPG4dH3C0N3NxjmYL4Dmcxip3es=
github.com/rickb777/plural v1.4.4 h1:OpZU8uRr9P2NkYAbkLMwlKNVJyJ5HvRcRBFyXGJtKGI=
github.com/rickb777/plural v1.4.4/go.mod h1:DB19dtrplGS5s6VJVHn7tvmFYPoE83p1xqio3oVnNRM=
github.com/robertkrimen/otto v0.5.1 h1:avDI4ToRk8k1hppLdYFTuuzND41n37vPGJU7547dGf0=
github.com/robertkrimen/otto v0.5.1/go.mod h1:bS433I4Q9p+E5pZLu7r17vP6FkE6/wLxBdmKjoqJXF8=
github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
Expand All @@ -685,6 +689,8 @@ github.com/samber/lo v1.53.0/go.mod h1:4+MXEGsJzbKGaUEQFKBq2xtfuznW9oz/WrgyzMzRo
github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E=
github.com/sandrolain/httpcache v1.4.0 h1:Jf4Vx62X2ybvNPSpPvI1kT3xvMdDG1AsApQjOQKO9E0=
github.com/sandrolain/httpcache v1.4.0/go.mod h1:kHBuXveitSn39SNPBhdf/ybG272X706HJ2RJqOQ+Em0=
github.com/sasha-s/go-deadlock v0.3.5 h1:tNCOEEDG6tBqrNDOX35j/7hL5FcFViG6awUGROb2NsU=
github.com/sasha-s/go-deadlock v0.3.5/go.mod h1:bugP6EGbdGYObIlx7pUZtWqlvo8k9H6vCBBsiChJQ5U=
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
github.com/segmentio/asm v1.1.3 h1:WM03sfUOENvvKexOLp+pCqgb/WDjsi7EK8gIsICtzhc=
github.com/segmentio/asm v1.1.3/go.mod h1:Ld3L4ZXGNcSLRg4JBsZ3//1+f/TjYl0Mzen/DQy1EJg=
Expand Down
5 changes: 4 additions & 1 deletion server/eebus/eebus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
"time"

"dario.cat/mergo"
eebusapi "github.com/enbility/eebus-go/api"

Check failure on line 13 in server/eebus/eebus.go

View workflow job for this annotation

GitHub Actions / Build 

github.com/enbility/eebus-go@v0.7.1-0.20260202090553-bdf852420469: replacement directory ../eebus-go does not exist

Check failure on line 13 in server/eebus/eebus.go

View workflow job for this annotation

GitHub Actions / Integration 

github.com/enbility/eebus-go@v0.7.1-0.20260202090553-bdf852420469: replacement directory ../eebus-go does not exist

Check failure on line 13 in server/eebus/eebus.go

View workflow job for this annotation

GitHub Actions / Test 

github.com/enbility/eebus-go@v0.7.1-0.20260202090553-bdf852420469: replacement directory ../eebus-go does not exist
service "github.com/enbility/eebus-go/service"

Check failure on line 14 in server/eebus/eebus.go

View workflow job for this annotation

GitHub Actions / Build 

github.com/enbility/eebus-go@v0.7.1-0.20260202090553-bdf852420469: replacement directory ../eebus-go does not exist

Check failure on line 14 in server/eebus/eebus.go

View workflow job for this annotation

GitHub Actions / Integration 

github.com/enbility/eebus-go@v0.7.1-0.20260202090553-bdf852420469: replacement directory ../eebus-go does not exist

Check failure on line 14 in server/eebus/eebus.go

View workflow job for this annotation

GitHub Actions / Test 

github.com/enbility/eebus-go@v0.7.1-0.20260202090553-bdf852420469: replacement directory ../eebus-go does not exist
ucapi "github.com/enbility/eebus-go/usecases/api"

Check failure on line 15 in server/eebus/eebus.go

View workflow job for this annotation

GitHub Actions / Build 

github.com/enbility/eebus-go@v0.7.1-0.20260202090553-bdf852420469: replacement directory ../eebus-go does not exist

Check failure on line 15 in server/eebus/eebus.go

View workflow job for this annotation

GitHub Actions / Integration 

github.com/enbility/eebus-go@v0.7.1-0.20260202090553-bdf852420469: replacement directory ../eebus-go does not exist

Check failure on line 15 in server/eebus/eebus.go

View workflow job for this annotation

GitHub Actions / Test 

github.com/enbility/eebus-go@v0.7.1-0.20260202090553-bdf852420469: replacement directory ../eebus-go does not exist
"github.com/enbility/eebus-go/usecases/cem/evcc"

Check failure on line 16 in server/eebus/eebus.go

View workflow job for this annotation

GitHub Actions / Build 

github.com/enbility/eebus-go@v0.7.1-0.20260202090553-bdf852420469: replacement directory ../eebus-go does not exist

Check failure on line 16 in server/eebus/eebus.go

View workflow job for this annotation

GitHub Actions / Integration 

github.com/enbility/eebus-go@v0.7.1-0.20260202090553-bdf852420469: replacement directory ../eebus-go does not exist

Check failure on line 16 in server/eebus/eebus.go

View workflow job for this annotation

GitHub Actions / Test 

github.com/enbility/eebus-go@v0.7.1-0.20260202090553-bdf852420469: replacement directory ../eebus-go does not exist
"github.com/enbility/eebus-go/usecases/cem/evcem"

Check failure on line 17 in server/eebus/eebus.go

View workflow job for this annotation

GitHub Actions / Build 

github.com/enbility/eebus-go@v0.7.1-0.20260202090553-bdf852420469: replacement directory ../eebus-go does not exist

Check failure on line 17 in server/eebus/eebus.go

View workflow job for this annotation

GitHub Actions / Integration 

github.com/enbility/eebus-go@v0.7.1-0.20260202090553-bdf852420469: replacement directory ../eebus-go does not exist

Check failure on line 17 in server/eebus/eebus.go

View workflow job for this annotation

GitHub Actions / Test 

github.com/enbility/eebus-go@v0.7.1-0.20260202090553-bdf852420469: replacement directory ../eebus-go does not exist
"github.com/enbility/eebus-go/usecases/cem/evsecc"

Check failure on line 18 in server/eebus/eebus.go

View workflow job for this annotation

GitHub Actions / Build 

github.com/enbility/eebus-go@v0.7.1-0.20260202090553-bdf852420469: replacement directory ../eebus-go does not exist

Check failure on line 18 in server/eebus/eebus.go

View workflow job for this annotation

GitHub Actions / Integration 

github.com/enbility/eebus-go@v0.7.1-0.20260202090553-bdf852420469: replacement directory ../eebus-go does not exist

Check failure on line 18 in server/eebus/eebus.go

View workflow job for this annotation

GitHub Actions / Test 

github.com/enbility/eebus-go@v0.7.1-0.20260202090553-bdf852420469: replacement directory ../eebus-go does not exist
"github.com/enbility/eebus-go/usecases/cem/evsoc"

Check failure on line 19 in server/eebus/eebus.go

View workflow job for this annotation

GitHub Actions / Build 

github.com/enbility/eebus-go@v0.7.1-0.20260202090553-bdf852420469: replacement directory ../eebus-go does not exist

Check failure on line 19 in server/eebus/eebus.go

View workflow job for this annotation

GitHub Actions / Integration 

github.com/enbility/eebus-go@v0.7.1-0.20260202090553-bdf852420469: replacement directory ../eebus-go does not exist

Check failure on line 19 in server/eebus/eebus.go

View workflow job for this annotation

GitHub Actions / Test 

github.com/enbility/eebus-go@v0.7.1-0.20260202090553-bdf852420469: replacement directory ../eebus-go does not exist
"github.com/enbility/eebus-go/usecases/cem/opev"

Check failure on line 20 in server/eebus/eebus.go

View workflow job for this annotation

GitHub Actions / Build 

github.com/enbility/eebus-go@v0.7.1-0.20260202090553-bdf852420469: replacement directory ../eebus-go does not exist

Check failure on line 20 in server/eebus/eebus.go

View workflow job for this annotation

GitHub Actions / Integration 

github.com/enbility/eebus-go@v0.7.1-0.20260202090553-bdf852420469: replacement directory ../eebus-go does not exist

Check failure on line 20 in server/eebus/eebus.go

View workflow job for this annotation

GitHub Actions / Test 

github.com/enbility/eebus-go@v0.7.1-0.20260202090553-bdf852420469: replacement directory ../eebus-go does not exist
"github.com/enbility/eebus-go/usecases/cem/oscev"

Check failure on line 21 in server/eebus/eebus.go

View workflow job for this annotation

GitHub Actions / Build 

github.com/enbility/eebus-go@v0.7.1-0.20260202090553-bdf852420469: replacement directory ../eebus-go does not exist

Check failure on line 21 in server/eebus/eebus.go

View workflow job for this annotation

GitHub Actions / Integration 

github.com/enbility/eebus-go@v0.7.1-0.20260202090553-bdf852420469: replacement directory ../eebus-go does not exist

Check failure on line 21 in server/eebus/eebus.go

View workflow job for this annotation

GitHub Actions / Test 

github.com/enbility/eebus-go@v0.7.1-0.20260202090553-bdf852420469: replacement directory ../eebus-go does not exist
csplc "github.com/enbility/eebus-go/usecases/cs/lpc"
cslpp "github.com/enbility/eebus-go/usecases/cs/lpp"
eglpc "github.com/enbility/eebus-go/usecases/eg/lpc"
Expand Down Expand Up @@ -115,6 +115,7 @@

configuration, err := eebusapi.NewConfiguration(
BrandName, BrandName, Model, serial,
[]shipapi.DeviceCategoryType{shipapi.DeviceCategoryTypeEnergyManagementSystem},
model.DeviceTypeTypeEnergyManagementSystem,
[]model.EntityTypeType{model.EntityTypeTypeCEM},
cc.Port, certificate, time.Second*4,
Expand Down Expand Up @@ -223,7 +224,9 @@
if len(ip) > 0 {
c.service.RemoteServiceForSKI(ski).SetIPv4(ip)
}
c.service.RegisterRemoteSKI(ski)

// TODO add SHIP-ID
c.service.RegisterRemoteSKI(ski, "")

c.mux.Lock()
defer c.mux.Unlock()
Expand Down
15 changes: 9 additions & 6 deletions server/eebus/test/controlbox.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func createControlbox(ctx context.Context, remoteSki string, port int) (*control

configuration, err := api.NewConfiguration(
"Demo", "Demo", "ControlBox", "123456789",
// []shipapi.DeviceCategoryType{shipapi.DeviceCategoryTypeGridConnectionHub},
[]shipapi.DeviceCategoryType{shipapi.DeviceCategoryTypeGridConnectionHub},
model.DeviceTypeTypeElectricitySupplySystem,
[]model.EntityTypeType{model.EntityTypeTypeGridGuard},
port, certificate, time.Second*60)
Expand All @@ -73,7 +73,8 @@ func createControlbox(ctx context.Context, remoteSki string, port int) (*control
h.uclpp = lpp.NewLPP(localEntity, h.OnLPPEvent)
h.myService.AddUseCase(h.uclpp)

h.myService.RegisterRemoteSKI(remoteSki)
// TODO add SHIP-ID
h.myService.RegisterRemoteSKI(remoteSki, "")
h.myService.Start()

go func() {
Expand Down Expand Up @@ -117,10 +118,12 @@ func (h *controlbox) OnLPCEvent(ski string, device spineapi.DeviceRemoteInterfac
switch event {
case lpc.UseCaseSupportUpdate:
h.registerRemoteEntity(entity, event)
// case lpc.DataUpdateLimit:
// if currentLimit, err := h.uclpc.ConsumptionLimit(entity); err == nil {
// fmt.Println("New consumption limit received", currentLimit.Value, "W")
// }
if currentLimit, err := h.uclpc.ConsumptionLimit(entity); err == nil {
fmt.Println("New consumption limit received", currentLimit.Value, "W")
}

case lpc.DataUpdateLimit:
h.registerRemoteEntity(entity, event)
default:
fmt.Println("lpc:", event)
}
Expand Down
12 changes: 7 additions & 5 deletions server/eebus/test/cs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ import (
const remotePort = 9001

func TestEEBus(t *testing.T) {
t.Skip()

util.LogLevel("error", map[string]string{"eebus": "trace"})

certificate, err := cert.CreateCertificate("Demo", "Demo", "DE", "Demo-Server-01")
Expand All @@ -47,7 +45,7 @@ func TestEEBus(t *testing.T) {
box, err := createControlbox(t.Context(), server.Ski(), remotePort)
require.NoError(t, err, "controlbox")

eventC := make(chan api.EventType, 1)
eventC := make(chan api.EventType, 16)
box.remoteEventC = eventC

gridcontrol, err := circuit.New(util.NewLogger("gridcontrol"), "gridcontrol", 0, 0, nil, time.Minute)
Expand All @@ -58,9 +56,13 @@ func TestEEBus(t *testing.T) {

go hems.Run()

<-eventC
// wait for DataUpdateLimit which signals that limit descriptions and data are available
require.Eventually(t, func() bool {
return len(box.remoteEntity(lpc.DataUpdateLimit)) > 0
}, 30*time.Second, 100*time.Millisecond, "waiting for lpc.DataUpdateLimit")

t.Log(box.remoteEntities)
srvEntity := box.remoteEntity(lpc.UseCaseSupportUpdate)[0]
srvEntity := box.remoteEntity(lpc.DataUpdateLimit)[0]

_, err = box.uclpc.WriteConsumptionLimit(srvEntity, ucapi.LoadLimit{
IsActive: true,
Expand Down
Loading