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

Go-E: wait for slow updates (#1292)

Browse source
This commit is contained in:
andig 2021-08-10 14:22:28 +02:00 • committed by GitHub
parent d2b376fceb
commit 5ee4e16f79
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
charger/go-e.go
View file

@ -131,6 +131,8 @@ func (c *GoE) apiStatus() (status goeStatusResponse, err error) {
// goeStatusResponse is only valid for local api. Use Fwv if valid.
func (c *GoE) apiUpdate(payload string) (goeStatusResponse, error) {
if c.token == "" {
// let charger settle after update
defer time.Sleep(2 * time.Second)
return c.localResponse("mqtt", payload)
}
@ -143,11 +145,6 @@ func (c *GoE) apiUpdate(payload string) (goeStatusResponse, error) {
return status, err
}
// isValid checks is status response is local
func isValid(status goeStatusResponse) bool {
return status.Fwv != ""
}
// Status implements the api.Charger interface
func (c *GoE) Status() (api.ChargeStatus, error) {
status, err := c.apiStatus()
@ -192,8 +189,10 @@ func (c *GoE) Enable(enable bool) error {
}
status, err := c.apiUpdate(fmt.Sprintf("alw=%d", b))
if err == nil && isValid(status) && status.Alw != b {
return fmt.Errorf("alw update failed: %d", status.Alw)
if err == nil {
if status, err = c.apiStatus(); err == nil && status.Alw != b {
return fmt.Errorf("alw update failed: %d", status.Alw)
}
}
return err
@ -202,8 +201,10 @@ func (c *GoE) Enable(enable bool) error {
// MaxCurrent implements the api.Charger interface
func (c *GoE) MaxCurrent(current int64) error {
status, err := c.apiUpdate(fmt.Sprintf("amx=%d", current))
if err == nil && isValid(status) && int64(status.Amp) != current {
return fmt.Errorf("amp update failed: %d", status.Amp)
if err == nil {
if status, err = c.apiStatus(); err == nil && int64(status.Amp) != current {
return fmt.Errorf("amp update failed: %d", status.Amp)
}
}
return err