From 485e9ee706f5c103b78bdb3164db6e9cc86936dc Mon Sep 17 00:00:00 2001
From: andig <cpuidle@gmx.de>
Date: Wed, 4 Nov 2020 10:58:16 +0100
Subject: [PATCH] Fix charger wrongly enabled on startup when vehicle connected
 and minsoc defined (#402)

---
 core/loadpoint.go | 12 +++++++-----
 core/site.go      |  2 ++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/core/loadpoint.go b/core/loadpoint.go
index 5bfc51cfc..95bb98d85 100644
--- a/core/loadpoint.go
+++ b/core/loadpoint.go
@@ -455,7 +455,7 @@ func (lp *LoadPoint) findActiveVehicle() {
 	}
 }
 
-// updateChargerStatus updates car status and detects car connected/disconnected events
+// updateChargerStatus updates charger status and detects car connected/disconnected events
 func (lp *LoadPoint) updateChargerStatus() error {
 	status, err := lp.handler.Status()
 	if err != nil {
@@ -705,10 +705,6 @@ func (lp *LoadPoint) Update(sitePower float64) {
 	// update progress and soc before status is updated
 	lp.publishChargeProgress()
 
-	// update active vehicle and publish soc
-	lp.findActiveVehicle()
-	lp.publishSoC()
-
 	// read and publish status
 	if err := lp.updateChargerStatus(); err != nil {
 		lp.log.ERROR.Printf("charge controller error: %v", err)
@@ -718,6 +714,12 @@ func (lp *LoadPoint) Update(sitePower float64) {
 	lp.publish("connected", lp.connected())
 	lp.publish("charging", lp.charging)
 
+	// update active vehicle and publish soc
+	// must be run after updating charger status to make sure
+	// initial update of connected state matches charger status
+	lp.findActiveVehicle()
+	lp.publishSoC()
+
 	// sync settings with charger
 	if lp.status != api.StatusA {
 		lp.handler.SyncEnabled()
diff --git a/core/site.go b/core/site.go
index 0d0cf653e..dab2523e2 100644
--- a/core/site.go
+++ b/core/site.go
@@ -196,6 +196,8 @@ func (site *Site) DumpConfig() {
 		lp.log.INFO.Println("  charger config:")
 		logMeter(lp.log, charger)
 		lp.log.INFO.Printf("    timer %s", presence[timer])
+
+		lp.log.INFO.Printf("  mode: %s", lp.GetMode())
 	}
 }