From 383fbf73aa9ec0daf36f994551942d712262f85a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20He=C3=9F?= <GrimmiMeloni@users.noreply.github.com>
Date: Sun, 17 Sep 2023 15:41:59 +0200
Subject: [PATCH] Easee: do not treat completed charge as disabled state
 (#9866)

---
 charger/easee.go | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/charger/easee.go b/charger/easee.go
index ce463d405..82803b984 100644
--- a/charger/easee.go
+++ b/charger/easee.go
@@ -54,6 +54,7 @@ type Easee struct {
 	chargerEnabled        bool
 	smartCharging         bool
 	authorize             bool
+	enabled               bool
 	opMode                int
 	reasonForNoCurrent    int
 	phaseMode             int
@@ -370,18 +371,11 @@ func (c *Easee) Status() (api.ChargeStatus, error) {
 
 // Enabled implements the api.Charger interface
 func (c *Easee) Enabled() (bool, error) {
-	c.mux.Lock()
-	defer c.mux.Unlock()
-
-	disabled := c.opMode == easee.ModeDisconnected ||
-		c.opMode == easee.ModeCompleted ||
-		c.opMode == easee.ModeAwaitingAuthentication ||
-		(c.opMode == easee.ModeAwaitingStart && c.reasonForNoCurrent == 52)
-	return !disabled && c.dynamicChargerCurrent > 0, nil
+	return c.enabled, nil
 }
 
 // Enable implements the api.Charger interface
-func (c *Easee) Enable(enable bool) error {
+func (c *Easee) Enable(enable bool) (err error) {
 	c.mux.Lock()
 	enablingRequired := enable && !c.chargerEnabled
 	opMode := c.opMode
@@ -409,24 +403,27 @@ func (c *Easee) Enable(enable bool) error {
 	if c.authorize {
 		action = easee.ChargeStop
 	}
-	var expectedEnabledState bool
 	var targetCurrent float64
 	if enable {
 		action = easee.ChargeResume
 		if opMode == easee.ModeAwaitingAuthentication && c.authorize {
 			action = easee.ChargeStart
 		}
-		expectedEnabledState = true
 		targetCurrent = 32
 	}
 
+	defer func() {
+		if err == nil {
+			c.enabled = enable
+		}
+	}()
+
 	uri := fmt.Sprintf("%s/chargers/%s/commands/%s", easee.API, c.charger, action)
-	_, err := c.postJSONAndWait(uri, nil)
-	if err != nil {
+	if _, err := c.postJSONAndWait(uri, nil); err != nil {
 		return err
 	}
 
-	if err := c.waitForChargerEnabledState(expectedEnabledState); err != nil {
+	if err := c.waitForChargerEnabledState(enable); err != nil {
 		return err
 	}