Skip to content
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.

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

EEbus: upgrade stack to v2 #12407

Closed
wants to merge 19 commits into from
Prev Previous commit
Upgrade
  • Loading branch information
andig committed Apr 14, 2024
commit 88a7db4e5b68dc2f57aa08058b6caabcb3bb2435
6 changes: 3 additions & 3 deletions charger/eebus.go
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ func (c *EEBus) isEVConnected() bool {
var _ api.CurrentLimiter = (*EEBus)(nil)

func (c *EEBus) minMax() (minMax, error) {
minLimits, maxLimits, _, err := c.uc.EvCC.CurrentLimits(c.entity)
minLimits, maxLimits, _, err := c.uc.OpEV.CurrentLimits(c.entity)
if err != nil {
if err == eebusapi.ErrDataNotAvailable {
err = api.ErrNotAvailable
Expand Down Expand Up @@ -231,7 +231,7 @@ func (c *EEBus) isCharging() bool { // d *communication.EVSEClientDataType
if err != nil {
return false
}
limitsMin, _, _, err := c.uc.EvCC.CurrentLimits(c.entity)
limitsMin, _, _, err := c.uc.OpEV.CurrentLimits(c.entity)
if err != nil || limitsMin == nil || len(limitsMin) == 0 {
return false
}
Expand Down Expand Up @@ -360,7 +360,7 @@ func (c *EEBus) writeCurrentLimitData(currents []float64) error {
// So if there are currents smaller than 6A with unknown communication standard change them to 6A.
// Keep in mind that this will still confuse evcc as it thinks charging is stopped, but it hasn't yet.
if comStandard == ucevcc.UCEVCCCommunicationStandardUnknown {
minLimits, _, _, err := c.uc.EvCC.CurrentLimits(c.entity)
minLimits, _, _, err := c.uc.OpEV.CurrentLimits(c.entity)
if err == nil {
for index, current := range currents {
if index < len(minLimits) && current < minLimits[index] {
Expand Down
8 changes: 4 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ require (
github.com/dmarkham/enumer v1.5.9
github.com/dylanmei/iso8601 v0.1.0
github.com/eclipse/paho.mqtt.golang v1.4.3
github.com/enbility/cemd v0.2.3-0.20240315101910-0745d4bbc9f9
github.com/enbility/eebus-go v0.2.1-0.20240313120500-d123aac13800
github.com/enbility/ship-go v0.0.0-20240315183950-c1cb9cfb9562
github.com/enbility/spine-go v0.0.0-20240313120235-e9eec2c46534
github.com/enbility/cemd v0.2.3-0.20240410172929-002c4873ca17
github.com/enbility/eebus-go v0.2.1-0.20240409162436-d7be76ca222b
github.com/enbility/ship-go v0.0.0-20240409162155-d5c47f397f77
github.com/enbility/spine-go v0.0.0-20240409160227-cdb210396e4c
github.com/evcc-io/tesla-proxy-client v0.0.0-20240221194046-4168b3759701
github.com/fatih/structs v1.1.0
github.com/glebarez/sqlite v1.10.0
Expand Down
16 changes: 8 additions & 8 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -122,14 +122,14 @@ github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFP
github.com/eclipse/paho.mqtt.golang v1.4.3 h1:2kwcUGn8seMUfWndX0hGbvH8r7crgcJguQNCyp70xik=
github.com/eclipse/paho.mqtt.golang v1.4.3/go.mod h1:CSYvoAlsMkhYOXh/oKyxa8EcBci6dVkLCbo5tTC1RIE=
github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
github.com/enbility/cemd v0.2.3-0.20240315101910-0745d4bbc9f9 h1:lakoeEAi3XHqoQlzV2xkY+X58VQRU8LHMdM/yuVpSRs=
github.com/enbility/cemd v0.2.3-0.20240315101910-0745d4bbc9f9/go.mod h1:koro/uhdzJMpyWENrf4VoEiiCeBOfFNIJDUflXH/Jag=
github.com/enbility/eebus-go v0.2.1-0.20240313120500-d123aac13800 h1:DGSO15mAVgLQtq45oAdpTnum3iPalf2RWd7buJHN5Ew=
github.com/enbility/eebus-go v0.2.1-0.20240313120500-d123aac13800/go.mod h1:30YZwH+GzLqK4Q2NxvrreI9Ib4LUSeT7c6Sbpvr9+Bk=
github.com/enbility/ship-go v0.0.0-20240315183950-c1cb9cfb9562 h1:TR1/jWRlQLVtys2S8ihfS2UwZEWFQYgluHz3MuF4ltY=
github.com/enbility/ship-go v0.0.0-20240315183950-c1cb9cfb9562/go.mod h1:ovyrJE3oPnGT5+eQnOqWut80gFDQ0XHn3ZWU2fHV9xQ=
github.com/enbility/spine-go v0.0.0-20240313120235-e9eec2c46534 h1:DPyWFN3+6eAJwdA2nrLzXOXPSoe+mb0ccUFSVB8TI90=
github.com/enbility/spine-go v0.0.0-20240313120235-e9eec2c46534/go.mod h1:2SXeC20kPX23mTnsudvPq9qprgo7GKDiNiVdX0ebovw=
github.com/enbility/cemd v0.2.3-0.20240410172929-002c4873ca17 h1:UYIDji1R7AUzX1Hrl6QMaLdUKzrBr34C7XcI4otWbQg=
github.com/enbility/cemd v0.2.3-0.20240410172929-002c4873ca17/go.mod h1:ARAFnGiaBsetTm4tSFxSdv0SLd8qWtltGi/ePyP1cMs=
github.com/enbility/eebus-go v0.2.1-0.20240409162436-d7be76ca222b h1:aHobHvgEGZxY7GZvYwWE6eVa+uz/VxYC4Ygb8vDTz0g=
github.com/enbility/eebus-go v0.2.1-0.20240409162436-d7be76ca222b/go.mod h1:SIr4W8XTlS+zIjZreeksebaao40MEkl3r0/alurqcB4=
github.com/enbility/ship-go v0.0.0-20240409162155-d5c47f397f77 h1:A4odLKYuqCfiv08Ths5gVkiDjgnHxhbVUhThizMucPA=
github.com/enbility/ship-go v0.0.0-20240409162155-d5c47f397f77/go.mod h1:ovyrJE3oPnGT5+eQnOqWut80gFDQ0XHn3ZWU2fHV9xQ=
github.com/enbility/spine-go v0.0.0-20240409160227-cdb210396e4c h1:Hk48Nz21cfd2wXe1DHK5lB1mmW2PNs/WYzseTno7rTI=
github.com/enbility/spine-go v0.0.0-20240409160227-cdb210396e4c/go.mod h1:2SXeC20kPX23mTnsudvPq9qprgo7GKDiNiVdX0ebovw=
github.com/enbility/zeroconf/v2 v2.0.0-20240210101930-d0004078577b h1:sg3c6LJ4eWffwtt9SW0lgcIX4Oh274vwdJnNFNNrDco=
github.com/enbility/zeroconf/v2 v2.0.0-20240210101930-d0004078577b/go.mod h1:BjzRRiYX6mWdOgku1xxDE+NsV8PijTby7Q7BkYVdfDU=
github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g=
Expand Down