Stefan/evcc-io
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix deadlock setting battery mode (#14383)

Browse source
This commit is contained in:
andig 2024-06-15 20:30:51 +02:00 • committed by GitHub
parent 23d2889880
commit 6dd6a05799
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/site.go
View file

@ -97,7 +97,7 @@ type Site struct {
pvPower float64 // PV power
batteryPower float64 // Battery charge power
batterySoc float64 // Battery soc
batteryMode api.BatteryMode // Battery mode
batteryMode api.BatteryMode // Battery mode (runtime only, not persisted)
publishCache map[string]any // store last published values to avoid unnecessary republishing
}

4
core/site_api.go
View file

@ -327,14 +327,14 @@ func (site *Site) GetTariff(tariff string) api.Tariff {
}
}
// GetBatteryControl returns the battery control mode
// GetBatteryDischargeControl returns the battery control mode (no discharge only)
func (site *Site) GetBatteryDischargeControl() bool {
site.RLock()
defer site.RUnlock()
return site.batteryDischargeControl
}
// SetBatteryControl sets the battery control mode
// SetBatteryDischargeControl sets the battery control mode (no discharge only)
func (site *Site) SetBatteryDischargeControl(val bool) error {
site.log.DEBUG.Println("set battery discharge control:", val)

15
core/site_battery.go
View file

@ -19,6 +19,12 @@ func (site *Site) GetBatteryMode() api.BatteryMode {
return site.batteryMode
}
// setBatteryMode sets the battery mode
func (site *Site) setBatteryMode(batMode api.BatteryMode) {
site.batteryMode = batMode
site.publish(keys.BatteryMode, batMode)
}
// SetBatteryMode sets the battery mode
func (site *Site) SetBatteryMode(batMode api.BatteryMode) {
site.Lock()
@ -27,11 +33,12 @@ func (site *Site) SetBatteryMode(batMode api.BatteryMode) {
site.log.DEBUG.Println("set battery mode:", batMode)
if site.batteryMode != batMode {
site.batteryMode = batMode
site.publish(keys.BatteryMode, batMode)
site.setBatteryMode(batMode)
}
}
// applyBatteryMode applies the mode to each battery and updates
// internal state if successful (requires lock)
func (site *Site) applyBatteryMode(mode api.BatteryMode) error {
// update batteries
for _, meter := range site.batteryMeters {
@ -43,7 +50,7 @@ func (site *Site) applyBatteryMode(mode api.BatteryMode) error {
}
// update state and publish
site.SetBatteryMode(mode)
site.setBatteryMode(mode)
return nil
}
@ -89,8 +96,10 @@ func (site *Site) updateBatteryMode() {
}
if batMode := site.GetBatteryMode(); mode != batMode {
site.Lock()
if err := site.applyBatteryMode(mode); err != nil {
site.log.ERROR.Println("battery mode:", err)
}
site.Unlock()
}
}