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

Send RFID auth only if required (#167)

Browse source
This commit is contained in:
andig 2020-05-18 10:16:54 +02:00 • committed by GitHub
parent d974028fce
commit 4bf9c542ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
charger/keba.go
View file

@ -24,7 +24,7 @@ const (
// RFID contains access credentials
type RFID struct {
Tag, Class string
Tag string
}
// Keba is an api.Charger implementation with configurable getters and setters.
@ -42,9 +42,7 @@ func NewKebaFromConfig(log *util.Logger, other map[string]interface{}) api.Charg
URI string
Timeout time.Duration
RFID RFID
}{
RFID: RFID{Class: "00000000000000000000"}, // default class
}
}{}
util.DecodeOther(log, other, &cc)
return NewKeba(cc.URI, cc.RFID, cc.Timeout)
@ -192,12 +190,20 @@ func (c *Keba) Enabled() (bool, error) {
// enableRFID sends RFID credentials to enable charge
func (c *Keba) enableRFID() error {
var resp string
err := c.roundtrip(fmt.Sprintf("start %s %s", c.rfid.Tag, c.rfid.Class), 0, &resp)
if err != nil {
// check if authorization required
var kr keba.Report2
if err := c.roundtrip("report 2", 2, &kr); err != nil {
return err
}
if kr.AuthReq == 0 {
return nil
}
// authorize
var resp string
if err := c.roundtrip(fmt.Sprintf("start %s", c.rfid.Tag), 0, &resp); err != nil {
return err
}
if resp == keba.OK {
return nil
}