Mrge with upstream evcc on 10.06.2024

Author: WulfgarW

charger/sensonet/connection.go

@@ -420,7 +420,7 @@ func (c *Connection) getSystem(relData *Vr921RelevantDataStruct) error {
 		}*/
 	}
 	//Added by WW: This block is used during development to analyse the system report return from the Vaillant portal
-	level := util.LogLevelForArea("sensonet").String()
+	level := util.WWlogLevelForArea("sensonet").String()
 	if level == "DEBUG" || level == "TRACE" {
 		c.log.DEBUG.Println("Writing debug information to files debug_sensonet_system.txt and debug_sensonet_reldata.txt")
 		fo, ioerr := os.Create("debug_sensonet_system.txt")

charger/sensonet/switch.go

@@ -140,7 +140,9 @@ func (sh *Switch) Enable(enable bool) error {
 				d.log.DEBUG.Println("Starting zone quick veto")
 			}
 		default:
-			d.log.DEBUG.Println("Enable called but no quick mode possible")
+			d.log.INFO.Println("Enable called but no quick mode possible")
+			//d.onoff = false
+			//return err
 		}
 	} else {
 		switch d.currentQuickmode {

util/log.go

@@ -101,6 +101,11 @@ func logLevelForArea(area string) jww.Threshold {
 	return level
 }
 
+// WWlogLevelForArea is used to call the private function logLevelForArea() in sensonet/connection.go for the fork with the sensonet charger
+func WWlogLevelForArea(area string) jww.Threshold {
+	return logLevelForArea(area)
+}
+
 // LogLevel sets log level for all loggers
 func LogLevel(defaultLevel string, areaLevels map[string]string) {
 	// default level