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

Charger: add expection handling for status E (#8460)

Browse source
This commit is contained in:
andig 2023-06-15 12:19:19 +02:00 • committed by GitHub
parent 1ec690c6a8
commit d4cfa052bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
api/api.go
View file

@ -54,6 +54,15 @@ func ChargeStatusString(s string) (ChargeStatus, error) {
}
}
// ChargeStatusStringWithMapping converts a string to ChargeStatus. In case of error, mapping is applied.
func ChargeStatusStringWithMapping(s string, m map[ChargeStatus]ChargeStatus) (ChargeStatus, error) {
status, err := ChargeStatusString(s)
if mappedStatus, ok := m[status]; ok && err != nil {
return mappedStatus, nil
}
return status, err
}
// String implements Stringer
func (c ChargeStatus) String() string {
return string(c)

2
charger/alfen.go
View file

@ -129,7 +129,7 @@ func (wb *Alfen) Status() (api.ChargeStatus, error) {
switch r := rune(b[0]); r {
case 'A', 'B', 'D', 'E', 'F':
return api.ChargeStatusString(string(r))
return api.ChargeStatusStringWithMapping(string(r), map[api.ChargeStatus]api.ChargeStatus{api.StatusE: api.StatusA})
case 'C':
// C1 is "connected"
if rune(b[1]) == '1' {

2
charger/innogy.go
View file

@ -98,7 +98,7 @@ func (wb *Innogy) Status() (api.ChargeStatus, error) {
switch r := rune(b[0]); r {
case 'A', 'B', 'D', 'E', 'F':
return api.ChargeStatusString(string(r))
return api.ChargeStatusStringWithMapping(string(r), map[api.ChargeStatus]api.ChargeStatus{api.StatusE: api.StatusA})
case 'C':
// C1 is "connected"
if rune(b[1]) == '1' {