Stefan/evcc-io
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Easee: poll chargerOpMode on demand (#11119)

Browse source
This commit is contained in:
Michael Heß 2024-01-03 22:49:00 +01:00 • committed by GitHub
parent 2f267e737c
commit 0e30e819e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

30
charger/easee.go
View file

@ -46,6 +46,7 @@ type Easee struct {
charger string
site, circuit int
lastEnergyPollTriggered time.Time
lastOpModePollTriggered time.Time
log *util.Logger
mux sync.Mutex
lastEnergyPollMux sync.Mutex
@ -57,6 +58,7 @@ type Easee struct {
authorize bool
enabled bool
opMode int
pilotMode string
reasonForNoCurrent int
phaseMode int
sessionStartEnergy *float64
@ -243,11 +245,6 @@ func (c *Easee) subscribe(client signalr.Client) {
if err := <-client.Send("SubscribeWithCurrentState", c.charger, true); err != nil {
c.log.ERROR.Printf("SubscribeWithCurrentState: %v", err)
}
// poll opMode from charger as API can give outdated initial data after (re)connect
uri := fmt.Sprintf("%s/chargers/%s/commands/poll_chargeropmode", easee.API, c.charger)
if _, err := c.Post(uri, request.JSONContent, nil); err != nil {
c.log.WARN.Printf("failed to poll CHARGER_OP_MODE, results may vary: %v", err)
}
}
}
}()
@ -368,6 +365,8 @@ func (c *Easee) ProductUpdate(i json.RawMessage) {
case easee.REASON_FOR_NO_CURRENT:
c.reasonForNoCurrent = value.(int)
case easee.PILOT_MODE:
c.pilotMode = value.(string)
}
select {
@ -407,6 +406,7 @@ func (c *Easee) chargers() ([]easee.Charger, error) {
// Status implements the api.Charger interface
func (c *Easee) Status() (api.ChargeStatus, error) {
c.updateSmartCharging()
c.confirmStatusConsistency()
c.mux.Lock()
defer c.mux.Unlock()
@ -839,3 +839,23 @@ var _ loadpoint.Controller = (*Easee)(nil)
func (c *Easee) LoadpointControl(lp loadpoint.API) {
c.lp = lp
}
// checks that opMode matches powerflow and polls if inconsistent
func (c *Easee) confirmStatusConsistency() {
c.mux.Lock()
opCharging := c.opMode == easee.ModeCharging
pilotCharging := c.pilotMode == "C"
powerFlowing := c.currentPower > 0
c.mux.Unlock()
if opCharging != powerFlowing || opCharging != pilotCharging {
// poll opMode from charger as API can give outdated data after SignalR (re)connect
if time.Since(c.lastOpModePollTriggered) > time.Minute*3 { // api rate limit, max once in 3 minutes
uri := fmt.Sprintf("%s/chargers/%s/commands/poll_chargeropmode", easee.API, c.charger)
if _, err := c.Post(uri, request.JSONContent, nil); err != nil {
c.log.WARN.Printf("failed to poll CHARGER_OP_MODE, results may vary: %v", err)
}
c.lastOpModePollTriggered = time.Now()
}
}
}