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

Loadpoint: keep mode on integrated device disconnect (#30189)

Browse source
This commit is contained in:
andig 2026-05-24 23:22:05 +02:00 • committed by GitHub
parent a77bbf8abb
commit 4d80489986
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 35 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/loadpoint.go
View file

@ -572,7 +572,11 @@ func (lp *Loadpoint) evVehicleDisconnectHandler() {
lp.stopVehicleDetection()
// set default mode on disconnect
lp.defaultMode()
// skip for integrated devices: the "disconnect" here is just the socket
// being switched off, not a vehicle being unplugged - keep the user's mode (#30187)
if !lp.chargerHasFeature(api.IntegratedDevice) {
lp.defaultMode()
}
// set default vehicle (may be nil)
lp.setActiveVehicle(lp.defaultVehicle)

30
core/loadpoint_vehicle_test.go
View file

@ -323,6 +323,36 @@ func TestDefaultVehicle(t *testing.T) {
assert.Nil(t, lp.vehicle, "expected no vehicle")
}
// integratedDeviceCharger is a minimal charger advertising the IntegratedDevice feature.
type integratedDeviceCharger struct{}
func (c *integratedDeviceCharger) Status() (api.ChargeStatus, error) { return api.StatusA, nil }
func (c *integratedDeviceCharger) Enabled() (bool, error) { return false, nil }
func (c *integratedDeviceCharger) Enable(bool) error { return nil }
func (c *integratedDeviceCharger) MaxCurrent(int64) error { return nil }
func (c *integratedDeviceCharger) Features() []api.Feature {
return []api.Feature{api.IntegratedDevice}
}
// TestDisconnectIntegratedDeviceKeepsMode is a regression test for #30187:
// switching an integrated-device loadpoint to "off" makes a switch socket report
// StatusA (disconnect). The disconnect handler must NOT reset the mode to the
// configured DefaultMode in that case, otherwise the loadpoint immediately flips
// back to pv and the socket re-enables.
func TestDisconnectIntegratedDeviceKeepsMode(t *testing.T) {
lp := NewLoadpoint(util.NewLogger("foo"), settings.NewDatabaseSettingsAdapter("foo"))
lp.charger = &integratedDeviceCharger{}
lp.DefaultMode = api.ModePV
lp.setMode(api.ModeOff)
x, y, z := createChannels(t)
attachChannels(lp, x, y, z)
lp.evVehicleDisconnectHandler()
assert.Equal(t, api.ModeOff, lp.GetMode(), "integrated device disconnect must not reset mode")
}
func TestReconnectVehicle(t *testing.T) {
tc := []struct {
name string