From 289867d27fdc86fe04f34e0b37f0985300c4981a Mon Sep 17 00:00:00 2001 From: andig Date: Sun, 15 Mar 2026 17:52:11 +0100 Subject: [PATCH] chore: remove charge status E (#28248) --- api/chargemodestatus.go | 4 ++-- charger/nexblue.go | 20 ++++++++------------ charger/plugchoice.go | 4 +--- charger/solax.go | 2 -- 4 files changed, 11 insertions(+), 19 deletions(-) diff --git a/api/chargemodestatus.go b/api/chargemodestatus.go index 5123772b1..6d90c7784 100644 --- a/api/chargemodestatus.go +++ b/api/chargemodestatus.go @@ -31,10 +31,10 @@ const ( StatusA ChargeStatus = "A" // Fzg. angeschlossen: nein Laden aktiv: nein Ladestation betriebsbereit, Fahrzeug getrennt StatusB ChargeStatus = "B" // Fzg. angeschlossen: ja Laden aktiv: nein Fahrzeug verbunden, Netzspannung liegt nicht an StatusC ChargeStatus = "C" // Fzg. angeschlossen: ja Laden aktiv: ja Fahrzeug lädt, Netzspannung liegt an - StatusE ChargeStatus = "E" // Fzg. angeschlossen: ja Laden aktiv: nein Fehler Fahrzeug / Kabel (CP-Kurzschluss, 0V) + statusE ChargeStatus = "E" // Fzg. angeschlossen: ja Laden aktiv: nein Fehler Fahrzeug / Kabel (CP-Kurzschluss, 0V) ) -var StatusEasA = map[ChargeStatus]ChargeStatus{StatusE: StatusA} +var StatusEasA = map[ChargeStatus]ChargeStatus{statusE: StatusA} // ChargeStatusString converts a string to ChargeStatus func ChargeStatusString(status string) (ChargeStatus, error) { diff --git a/charger/nexblue.go b/charger/nexblue.go index e1c53865d..3eaf54727 100644 --- a/charger/nexblue.go +++ b/charger/nexblue.go @@ -169,20 +169,16 @@ func (wb *Nexblue) Status() (api.ChargeStatus, error) { switch res.ChargingState { case 0: // Idle return api.StatusA, nil - case 1: // Connected + case + 1, // Connected + 3, // Finished + 6, // Delayed + 7: // EV Waiting return api.StatusB, nil - case 2: // Charging + case + 2, // Charging + 5: // Load Balancing return api.StatusC, nil - case 3: // Finished - return api.StatusB, nil - case 4: // Error - return api.StatusE, nil - case 5: // Load Balancing - return api.StatusC, nil - case 6: // Delayed - return api.StatusB, nil - case 7: // EV Waiting - return api.StatusB, nil default: return api.StatusNone, fmt.Errorf("invalid status: %d", res.ChargingState) } diff --git a/charger/plugchoice.go b/charger/plugchoice.go index 5d1e2e195..2478f5414 100644 --- a/charger/plugchoice.go +++ b/charger/plugchoice.go @@ -147,14 +147,12 @@ func (c *Plugchoice) Status() (api.ChargeStatus, error) { switch status := connector.Status; status { case core.ChargePointStatusAvailable: return api.StatusA, nil - case core.ChargePointStatusUnavailable, core.ChargePointStatusFaulted: - return api.StatusE, nil // Using StatusE for error conditions case core.ChargePointStatusPreparing, core.ChargePointStatusSuspendedEVSE, core.ChargePointStatusSuspendedEV, core.ChargePointStatusFinishing: return api.StatusB, nil case core.ChargePointStatusCharging: return api.StatusC, nil default: - return api.StatusNone, fmt.Errorf("unknown status: %s", status) + return api.StatusNone, fmt.Errorf("invalid status: %s", status) } } } diff --git a/charger/solax.go b/charger/solax.go index ca8bc0eb6..f7944b11c 100644 --- a/charger/solax.go +++ b/charger/solax.go @@ -171,8 +171,6 @@ func (wb *Solax) Status() (api.ChargeStatus, error) { return api.StatusB, nil case 2: // "Charging" return api.StatusC, nil - case 4: // "Fault" - return api.StatusE, nil default: return api.StatusNone, fmt.Errorf("invalid status: %d", s) }