From f528dca381859dbd4a89b5fa4a2ce8941785cbd2 Mon Sep 17 00:00:00 2001 From: andig Date: Sun, 15 Mar 2026 10:19:59 +0100 Subject: [PATCH] Optimizer: use SCapacity (#28212) --- core/site_optimizer.go | 11 ++++++----- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/core/site_optimizer.go b/core/site_optimizer.go index 732e99c2a..275fea66c 100644 --- a/core/site_optimizer.go +++ b/core/site_optimizer.go @@ -409,9 +409,10 @@ func (site *Site) loadpointRequest(lp loadpoint.API, minLen int, firstSlotDurati func (site *Site) batteryRequest(dev config.Device[api.Meter], b types.Measurement, grid api.Rates, minLen int, firstSlotDuration time.Duration) (optimizer.BatteryConfig, batteryDetail) { bat := optimizer.BatteryConfig{ - CMax: batteryPower, - DMax: batteryPower, - SInitial: float32(*b.Capacity * *b.Soc * 10), // Wh + CMax: batteryPower, + DMax: batteryPower, + SCapacity: float32(*b.Capacity * 10), // Wh + SInitial: float32(*b.Capacity * *b.Soc * 10), // Wh // PA: pa, } bat.SMax = max(bat.SInitial, float32(*b.Capacity*1e3)) // Wh @@ -430,8 +431,8 @@ func (site *Site) batteryRequest(dev config.Device[api.Meter], b types.Measureme if m, ok := instance.(api.BatterySocLimiter); ok { minSoc, maxSoc := m.GetSocLimits() - bat.SMin = min(bat.SInitial, float32(*b.Capacity*minSoc*10)) // Wh - bat.SMax = max(bat.SInitial, float32(*b.Capacity*maxSoc*10)) // Wh + bat.SMin = float32(*b.Capacity * minSoc * 10) // Wh + bat.SMax = float32(*b.Capacity * maxSoc * 10) // Wh } detail := batteryDetail{ diff --git a/go.mod b/go.mod index b1a57365c..bdb8baca6 100644 --- a/go.mod +++ b/go.mod @@ -32,7 +32,7 @@ require ( github.com/enbility/ship-go v0.6.0 github.com/enbility/spine-go v0.7.0 github.com/evcc-io/openapi-mcp v0.6.0 - github.com/evcc-io/optimizer v0.0.0-20260310135618-de48ea1cf9f6 + github.com/evcc-io/optimizer v0.0.0-20260314150137-cff404fedb5e github.com/evcc-io/rct v0.2.0 github.com/evcc-io/tesla-proxy-client v0.0.0-20240221194046-4168b3759701 github.com/fatih/structs v1.1.0 diff --git a/go.sum b/go.sum index 38575e33d..ecbef6ef3 100644 --- a/go.sum +++ b/go.sum @@ -196,8 +196,8 @@ github.com/evcc-io/ocpp-go v0.0.0-20251212212612-b7f92ee0443b h1:5vFr7wOwoi5ylyb github.com/evcc-io/ocpp-go v0.0.0-20251212212612-b7f92ee0443b/go.mod h1:2kcukDdhui4u730VfnYVWuwzDLgw+mBRGDir/QAyBhg= github.com/evcc-io/openapi-mcp v0.6.0 h1:cq8CWG+3gNQ9ID0ZE8MoDHZxgdJmBZ1fFyt5xAfTRfA= github.com/evcc-io/openapi-mcp v0.6.0/go.mod h1:YyOx4zwr6xVUcchAETHERZ+75cZMIrdcjVIZFwBlE1Q= -github.com/evcc-io/optimizer v0.0.0-20260310135618-de48ea1cf9f6 h1:W4j2gpIs5d5c1lLS4cD0/rsZYuluPS3KJoGXXANBBYY= -github.com/evcc-io/optimizer v0.0.0-20260310135618-de48ea1cf9f6/go.mod h1:cHMeq6GfoXQ8LxqY4LH1wn/hrgYEn+ka5RPI1CF37SY= +github.com/evcc-io/optimizer v0.0.0-20260314150137-cff404fedb5e h1:mOgfcHyUHBnUVs6Ow+SX+89dcJWe1emEHIEm/Q3ApXI= +github.com/evcc-io/optimizer v0.0.0-20260314150137-cff404fedb5e/go.mod h1:cHMeq6GfoXQ8LxqY4LH1wn/hrgYEn+ka5RPI1CF37SY= github.com/evcc-io/rct v0.2.0 h1:qjXKI7NKwW5YpEKEb27MwLMBaR4ne2Kd2cPV2PYTKn4= github.com/evcc-io/rct v0.2.0/go.mod h1:n6MTBU36QOadGlxxiADu86VaT5l0eYdbmFBHF14AD/s= github.com/evcc-io/tesla-proxy-client v0.0.0-20240221194046-4168b3759701 h1:3JplY3KS6KMDVDNAU+3+KWmSWmoHIU34qwuIpW6SiHk=