Small changes due to sync with release 0.200.1 of evcc.io/evcc

Author: WulfgarW

charger/vaillant.go

@@ -112,38 +112,7 @@ func NewVaillantFromConfig(ctx context.Context, other map[string]interface{}) (a
 		}
 	}
 
-	var get func() (int64, error)
-	get = provider.Cached(func() (int64, error) {
-		system, err := conn.GetSystem(systemId)
-		if err != nil {
-			return 0, err
-		}
-		enabled := Normal
-		if heating {
-			z := sensonet.GetZoneData(system, cc.HeatingZone)
-			if z.State.CurrentSpecialFunction == sensonet.SPECIAL_FUNCTION_QUICK_VETO {
-				enabled = Boost
-			}
-		} else {
-			switch {
-			case len(system.State.Dhw) > 0:
-				dhw := sensonet.GetDhwData(system, sensonet.HOTWATERINDEX_DEFAULT)
-				if dhw.State.CurrentSpecialFunction == sensonet.SPECIAL_FUNCTION_HOTWATER_BOOST {
-					enabled = Boost
-				}
-			case len(system.State.DomesticHotWater) > 0:
-				domestichotwater := sensonet.GetDomesticHotWaterData(system, sensonet.HOTWATERINDEX_DEFAULT)
-				if domestichotwater.State.CurrentSpecialFunction == sensonet.SPECIAL_FUNCTION_HOTWATER_BOOST {
-					enabled = Boost
-				}
-			default:
-				return 0, api.ErrNotAvailable
-			}
-		}
-		return enabled, nil
-	}, cc.Cache)
-
-	sgr, err := NewSgReady(ctx, &cc.embed, set, get, nil, cc.Phases)
+	sgr, err := NewSgReady(ctx, &cc.embed, set, nil, nil, cc.Phases)
 	if err != nil {
 		return nil, err
 	}
@@ -202,8 +171,8 @@ func NewVaillantFromConfig(ctx context.Context, other map[string]interface{}) (a
 			default:
 				return 0, api.ErrNotAvailable
 			}
-		}
-	}, cc.Cache)
+		}, cc.Cache)
+	}
 
 	return decorateVaillant(res, power, temp), nil
 }

core/loadpoint.go

@@ -1897,7 +1897,7 @@ func (lp *Loadpoint) Update(sitePower, batteryBoostPower float64, rates api.Rate
 	//WW added by WW to show the current quick mode in the vehicle title and the SoC data even if no charge session active
 	if c, ok := lp.charger.(*charger.Sensonet); ok {
 		if lp.chargerHasFeature(api.IntegratedDevice) {
-			title := lp.Title()
+			title := lp.GetTitle()
 			lp.publish(keys.Title, title+c.ModeText())
 			if lp.socEstimator != nil {
 				soc, err := lp.socEstimator.Soc(lp.getChargedEnergy())
@@ -1936,7 +1936,7 @@ func (lp *Loadpoint) Update(sitePower, batteryBoostPower float64, rates api.Rate
 	}
 	if c, ok := lp.charger.(*charger.VaillantEbus); ok {
 		if lp.chargerHasFeature(api.IntegratedDevice) {
-			title := lp.Title()
+			title := lp.GetTitle()
 			lp.publish(keys.Title, title+c.ModeText())
 			if lp.socEstimator != nil {
 				soc, err := lp.socEstimator.Soc(lp.getChargedEnergy())
@@ -1979,7 +1979,7 @@ func (lp *Loadpoint) Update(sitePower, batteryBoostPower float64, rates api.Rate
 		api.Meter
 		api.SocLimiter
 	}); ok {
-		title := lp.Title()
+		title := lp.GetTitle()
 		lp.publish(keys.Title, title+c.ModeText())
 		if lp.socEstimator != nil {
 			soc, err := lp.socEstimator.Soc(lp.getChargedEnergy())

go.sum

@@ -23,22 +23,8 @@ github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWX
 github.com/Shopify/toxiproxy v2.1.4+incompatible h1:TKdv8HiTLgE5wdJuEML90aBgNWsokNbMijUGhmcoBJc=
 github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
 github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
-github.com/WulfgarW/sensonet v0.0.4-0.20250121131846-b163a2c9af0e h1:JNCCagaqWz1Lef7GfrhKQ9AlO34d/gkKqVPHutEJtlM=
-github.com/WulfgarW/sensonet v0.0.4-0.20250121131846-b163a2c9af0e/go.mod h1:zNfnJUhHiDL8V4f9ZC0puUOWpss0F7xqCbJ87UY6dpA=
-github.com/WulfgarW/sensonet v0.0.4-0.20250124133702-176b581f2a64 h1:7yfAerI/geLVjIAlPSOZCo2npqUmUvMgv64rt/H9I2k=
-github.com/WulfgarW/sensonet v0.0.4-0.20250124133702-176b581f2a64/go.mod h1:zNfnJUhHiDL8V4f9ZC0puUOWpss0F7xqCbJ87UY6dpA=
-github.com/WulfgarW/sensonet v0.0.4-0.20250125125415-b357453bfc35 h1:4ZC0jOHgFq2GCh4hlRUe0bJTpjtP3YsCDy+pzW8cWC0=
-github.com/WulfgarW/sensonet v0.0.4-0.20250125125415-b357453bfc35/go.mod h1:zNfnJUhHiDL8V4f9ZC0puUOWpss0F7xqCbJ87UY6dpA=
-github.com/WulfgarW/sensonet v0.0.4-0.20250125135942-1bfba3587f87 h1:03SQvvr6fj/0zKjXvVz2evPHYBWOkquw9pl1IaH17t0=
-github.com/WulfgarW/sensonet v0.0.4-0.20250125135942-1bfba3587f87/go.mod h1:zNfnJUhHiDL8V4f9ZC0puUOWpss0F7xqCbJ87UY6dpA=
 github.com/WulfgarW/sensonet v0.0.4 h1:h4n+Ic/D/ELYzBvvnJ3fXcDUMUaYiiM8t3oSNcK4k08=
 github.com/WulfgarW/sensonet v0.0.4/go.mod h1:zNfnJUhHiDL8V4f9ZC0puUOWpss0F7xqCbJ87UY6dpA=
-github.com/WulfgarW/sensonetEbus v0.0.0-20250120115035-dfee81606c76 h1:iQMpp5gfR1h6QNQSb9sbuS4rcIMcP4qIOT3bv6TIlS4=
-github.com/WulfgarW/sensonetEbus v0.0.0-20250120115035-dfee81606c76/go.mod h1:3/LYxx3qkoszNvR80KS6k03jYGqoEd8l4ZiArqImPlQ=
-github.com/WulfgarW/sensonetEbus v0.0.0-20250124081106-98625de633c3 h1:hx/0tubLgmvBGotLUPOB/8Ba6hPBotXhhp2fXYk4gIs=
-github.com/WulfgarW/sensonetEbus v0.0.0-20250124081106-98625de633c3/go.mod h1:3/LYxx3qkoszNvR80KS6k03jYGqoEd8l4ZiArqImPlQ=
-github.com/WulfgarW/sensonetEbus v0.0.0-20250124124541-9d693368737e h1:oQ8/u01vrI+ArbF7X7E7zbwn0VK/SkbOg5dTkU9+SQc=
-github.com/WulfgarW/sensonetEbus v0.0.0-20250124124541-9d693368737e/go.mod h1:3/LYxx3qkoszNvR80KS6k03jYGqoEd8l4ZiArqImPlQ=
 github.com/WulfgarW/sensonetEbus v0.0.1 h1:ug6SAILKPzz1pFA0CH4kekra0GIUKrw0r8Z3JcWC7j4=
 github.com/WulfgarW/sensonetEbus v0.0.1/go.mod h1:3/LYxx3qkoszNvR80KS6k03jYGqoEd8l4ZiArqImPlQ=
 github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=