From d7dec13e07581607092cd607bda4172f37816a5b Mon Sep 17 00:00:00 2001
From: andig <andi@evcc.io>
Date: Thu, 8 Aug 2024 21:29:13 +0200
Subject: [PATCH] EEbus: res-set current limit when reconnecting (#15313)

---
 charger/eebus.go | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/charger/eebus.go b/charger/eebus.go
index 515722799..8e8ae5ace 100644
--- a/charger/eebus.go
+++ b/charger/eebus.go
@@ -42,6 +42,7 @@ type EEBus struct {
 	vasVW                 bool // wether the EVSE supports VW VAS with ISO15118-2
 
 	expectedEnableUnpluggedState bool
+	reconnect                    bool
 	current                      float64
 
 	currentLimit float64
@@ -141,11 +142,11 @@ func (c *EEBus) UseCaseEvent(device spineapi.DeviceRemoteInterface, entity spine
 	switch event {
 	// EV
 	case evcc.EvConnected:
-		c.log.TRACE.Println("EV Connected")
 		c.setEvEntity(entity)
+		c.reconnect = true
 		c.currentLimit = -1
+
 	case evcc.EvDisconnected:
-		c.log.TRACE.Println("EV Disconnected")
 		c.setEvEntity(nil)
 		c.currentLimit = -1
 	}
@@ -223,11 +224,25 @@ func (c *EEBus) isCharging() bool {
 }
 
 // Status implements the api.Charger interface
-func (c *EEBus) Status() (api.ChargeStatus, error) {
+func (c *EEBus) Status() (res api.ChargeStatus, err error) {
 	if !c.Connected() {
 		return api.StatusNone, api.ErrTimeout
 	}
 
+	// re-set current limit after reconnect
+	defer func() {
+		if err == nil {
+			c.mux.Lock()
+			if c.reconnect {
+				c.reconnect = false
+				c.mux.Unlock()
+				err = c.MaxCurrentMillis(c.current)
+			} else {
+				c.mux.Unlock()
+			}
+		}
+	}()
+
 	evEntity := c.evEntity()
 	if !c.uc.EvCC.EVConnected(evEntity) {
 		c.expectedEnableUnpluggedState = false