Clear vehicle identifier on disconnect (#4046)

This commit is contained in:
andig 2022-08-04 15:23:01 +02:00 • committed by GitHub
parent 748a459ffe
commit 9ea7e84d9e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 305 additions and 264 deletions

View file

@ -123,7 +123,7 @@ type LoadPoint struct {
socUpdated time.Time // SoC updated timestamp (poll: connected)
vehicleDetect time.Time // Vehicle connected timestamp
vehicleDetectTicker *clock.Ticker
vehicleID string
vehicleIdentifier string
charger api.Charger
chargeTimer api.ChargeTimer
@ -435,6 +435,9 @@ func (lp *LoadPoint) evVehicleDisconnectHandler() {
lp.pushEvent(evVehicleDisconnect)
// remove charger vehicle id
lp.setVehicleIdentifier("")
// remove active vehicle if not default
if lp.vehicle != lp.defaultVehicle {
lp.setActiveVehicle(lp.defaultVehicle)
@ -726,6 +729,14 @@ func (lp *LoadPoint) remoteControlled(demand loadpoint.RemoteDemand) bool {
return lp.remoteDemand == demand
}
// setVehicleIdentifier updated the vehicle id as read from the charger
func (lp *LoadPoint) setVehicleIdentifier(id string) {
if lp.vehicleIdentifier != id {
lp.vehicleIdentifier = id
lp.publish("vehicleIdentity", id)
}
}
// identifyVehicle reads vehicle identification from charger
func (lp *LoadPoint) identifyVehicle() {
identifier, ok := lp.charger.(api.Identifier)
@ -739,17 +750,16 @@ func (lp *LoadPoint) identifyVehicle() {
return
}
if lp.vehicleID == id {
if lp.vehicleIdentifier == id {
return
}
// vehicle found or removed
lp.vehicleID = id
lp.log.DEBUG.Println("charger vehicle id:", id)
lp.publish("vehicleIdentity", id)
lp.setVehicleIdentifier(id)
if id != "" {
lp.log.DEBUG.Println("charger vehicle id:", id)
if vehicle := lp.selectVehicleByID(id); vehicle != nil {
lp.setActiveVehicle(vehicle)
}

View file

@ -769,261 +769,3 @@ func TestMinSoC(t *testing.T) {
}
}
}
func TestVehicleDetectByID(t *testing.T) {
ctrl := gomock.NewController(t)
v1 := mock.NewMockVehicle(ctrl)
v2 := mock.NewMockVehicle(ctrl)
type testcase struct {
string
id, i1, i2 string
res api.Vehicle
prepare func(testcase)
}
tc := []testcase{
{"1/_/_->0", "1", "", "", nil, func(tc testcase) {
v1.EXPECT().Identifiers().Return(nil)
v2.EXPECT().Identifiers().Return(nil)
v1.EXPECT().Identifiers().Return(nil)
v2.EXPECT().Identifiers().Return(nil)
}},
{"1/1/2->1", "1", "1", "2", v1, func(tc testcase) {
v1.EXPECT().Identifiers().Return([]string{tc.i1})
}},
{"2/1/2->2", "2", "1", "2", v2, func(tc testcase) {
v1.EXPECT().Identifiers().Return([]string{tc.i1})
v2.EXPECT().Identifiers().Return([]string{tc.i2})
}},
{"11/1*/2->1", "11", "1*", "2", v1, func(tc testcase) {
v1.EXPECT().Identifiers().Return([]string{tc.i1})
v2.EXPECT().Identifiers().Return([]string{tc.i2})
v1.EXPECT().Identifiers().Return([]string{tc.i1})
// v2.EXPECT().Identifiers().Return([]string{tc.i2})
}},
{"22/1*/2*->2", "22", "1*", "2*", v2, func(tc testcase) {
v1.EXPECT().Identifiers().Return([]string{tc.i1})
v2.EXPECT().Identifiers().Return([]string{tc.i2})
v1.EXPECT().Identifiers().Return([]string{tc.i1})
v2.EXPECT().Identifiers().Return([]string{tc.i2})
}},
{"2/_/*->2", "2", "", "*", v2, func(tc testcase) {
v1.EXPECT().Identifiers().Return(nil)
v2.EXPECT().Identifiers().Return([]string{tc.i2})
v1.EXPECT().Identifiers().Return(nil)
v2.EXPECT().Identifiers().Return([]string{tc.i2})
}},
}
for _, tc := range tc {
t.Logf("%+v", tc)
lp := &LoadPoint{
log: util.NewLogger("foo"),
vehicles: []api.Vehicle{v1, v2},
}
if tc.prepare != nil {
tc.prepare(tc)
}
if res := lp.selectVehicleByID(tc.id); tc.res != res {
t.Errorf("expected %v, got %v", tc.res, res)
}
}
}
func TestDefaultVehicle(t *testing.T) {
ctrl := gomock.NewController(t)
dflt := mock.NewMockVehicle(ctrl)
dflt.EXPECT().Title().Return("default").AnyTimes()
dflt.EXPECT().Capacity().AnyTimes()
dflt.EXPECT().Phases().AnyTimes()
dflt.EXPECT().OnIdentified().AnyTimes()
vehicle := mock.NewMockVehicle(ctrl)
vehicle.EXPECT().Title().Return("target").AnyTimes()
vehicle.EXPECT().Capacity().AnyTimes()
vehicle.EXPECT().Phases().AnyTimes()
vehicle.EXPECT().OnIdentified().AnyTimes()
lp := NewLoadPoint(util.NewLogger("foo"))
lp.defaultVehicle = dflt
// populate channels
x, y, z := createChannels(t)
attachChannels(lp, x, y, z)
title := func(v api.Vehicle) string {
if v == nil {
return "<nil>"
}
return v.Title()
}
// non-default vehicle identified
lp.setActiveVehicle(vehicle)
if lp.vehicle != vehicle {
t.Errorf("expected %v, got %v", title(vehicle), title(lp.vehicle))
}
// non-default vehicle disconnected
lp.evVehicleDisconnectHandler()
if lp.vehicle != dflt {
t.Errorf("expected %v, got %v", title(dflt), title(lp.vehicle))
}
// default vehicle disconnected
lp.evVehicleDisconnectHandler()
if lp.vehicle != dflt {
t.Errorf("expected %v, got %v", title(dflt), title(lp.vehicle))
}
// set non-default vehicle during disconnect - should be default on connect
lp.tasks.Clear()
lp.evVehicleConnectHandler()
if lp.vehicle != dflt {
t.Errorf("expected %v, got %v", title(dflt), title(lp.vehicle))
}
if l := lp.tasks.Size(); l != 1 {
t.Error("expected task in queue, got none")
}
// guest connected
lp.setActiveVehicle(nil)
if lp.vehicle != nil {
t.Errorf("expected %v, got %v", nil, title(lp.vehicle))
}
}
func TestApplyVehicleDefaults(t *testing.T) {
ctrl := gomock.NewController(t)
newConfig := func(mode api.ChargeMode, minCurrent, maxCurrent float64, minSoC, targetSoC int) api.ActionConfig {
return api.ActionConfig{
Mode: &mode,
MinCurrent: &minCurrent,
MaxCurrent: &maxCurrent,
MinSoC: &minSoC,
TargetSoC: &targetSoC,
}
}
assertConfig := func(lp *LoadPoint, conf api.ActionConfig) {
if lp.Mode != *conf.Mode {
t.Errorf("expected mode %v, got %v", *conf.Mode, lp.Mode)
}
if lp.MinCurrent != *conf.MinCurrent {
t.Errorf("expected minCurrent %v, got %v", *conf.MinCurrent, lp.MinCurrent)
}
if lp.MaxCurrent != *conf.MaxCurrent {
t.Errorf("expected maxCurrent %v, got %v", *conf.MaxCurrent, lp.MaxCurrent)
}
if lp.SoC.Min != *conf.MinSoC {
t.Errorf("expected minSoC %v, got %v", *conf.MinSoC, lp.SoC.Min)
}
if lp.SoC.Target != *conf.TargetSoC {
t.Errorf("expected targetSoC %v, got %v", *conf.TargetSoC, lp.SoC.Target)
}
}
oi := newConfig(api.ModePV, 7, 17, 1, 99)
od := newConfig(api.ModeOff, 5, 15, 2, 98)
vehicle := mock.NewMockVehicle(ctrl)
vehicle.EXPECT().Title().AnyTimes()
vehicle.EXPECT().Capacity().AnyTimes()
vehicle.EXPECT().OnIdentified().Return(oi)
lp := NewLoadPoint(util.NewLogger("foo"))
// populate channels
x, y, z := createChannels(t)
attachChannels(lp, x, y, z)
lp.onDisconnect = od
lp.ResetOnDisconnect = true
// vehicle identified
lp.setActiveVehicle(vehicle)
assertConfig(lp, oi)
// vehicle disconnected
vehicle.EXPECT().Phases().AnyTimes()
lp.evVehicleDisconnectHandler()
assertConfig(lp, od)
}
func TestReconnectVehicle(t *testing.T) {
ctrl := gomock.NewController(t)
clck := clock.NewMock()
type vehicleT struct {
*mock.MockVehicle
*mock.MockChargeState
}
vehicle := &vehicleT{mock.NewMockVehicle(ctrl), mock.NewMockChargeState(ctrl)}
vehicle.MockVehicle.EXPECT().Title().Return("vehicle").AnyTimes()
vehicle.MockVehicle.EXPECT().Capacity().AnyTimes()
vehicle.MockVehicle.EXPECT().Phases().AnyTimes()
vehicle.MockVehicle.EXPECT().OnIdentified().AnyTimes()
vehicle.MockVehicle.EXPECT().SoC().Return(0.0, nil).AnyTimes()
charger := mock.NewMockCharger(ctrl)
charger.EXPECT().Status().Return(api.StatusB, nil).AnyTimes()
lp := &LoadPoint{
log: util.NewLogger("foo"),
bus: evbus.New(),
clock: clck,
charger: charger,
chargeMeter: &Null{}, // silence nil panics
chargeRater: &Null{}, // silence nil panics
chargeTimer: &Null{}, // silence nil panics
wakeUpTimer: NewTimer(),
MinCurrent: minA,
MaxCurrent: maxA,
phases: 1,
Mode: api.ModeNow,
vehicles: []api.Vehicle{vehicle},
}
attachListeners(t, lp)
// mode now
charger.EXPECT().MaxCurrent(int64(maxA))
// sync charger
charger.EXPECT().Enabled().Return(true, nil)
// vehicle not updated yet
vehicle.MockChargeState.EXPECT().Status().Return(api.StatusA, nil)
lp.Update(0, false, false)
ctrl.Finish()
// detection started
if lp.vehicleDetect != lp.clock.Now() {
t.Error("vehicle detection not started")
}
// vehicle not detected yet
if lp.vehicle != nil {
t.Error("vehicle should be <nil>")
}
// sync charger
charger.EXPECT().Enabled().Return(true, nil)
// vehicle not updated yet
vehicle.MockChargeState.EXPECT().Status().Return(api.StatusB, nil)
lp.Update(0, false, false)
ctrl.Finish()
// vehicle detected
if lp.vehicle != vehicle {
t.Error("vehicle should be detected")
}
}

View file

@ -0,0 +1,289 @@
package core
import (
"testing"
evbus "github.com/asaskevich/EventBus"
"github.com/benbjohnson/clock"
"github.com/evcc-io/evcc/api"
"github.com/evcc-io/evcc/mock"
"github.com/evcc-io/evcc/util"
"github.com/golang/mock/gomock"
)
func TestVehicleDetectByID(t *testing.T) {
ctrl := gomock.NewController(t)
v1 := mock.NewMockVehicle(ctrl)
v2 := mock.NewMockVehicle(ctrl)
type testcase struct {
string
id, i1, i2 string
res api.Vehicle
prepare func(testcase)
}
tc := []testcase{
{"1/_/_->0", "1", "", "", nil, func(tc testcase) {
v1.EXPECT().Identifiers().Return(nil)
v2.EXPECT().Identifiers().Return(nil)
v1.EXPECT().Identifiers().Return(nil)
v2.EXPECT().Identifiers().Return(nil)
}},
{"1/1/2->1", "1", "1", "2", v1, func(tc testcase) {
v1.EXPECT().Identifiers().Return([]string{tc.i1})
}},
{"2/1/2->2", "2", "1", "2", v2, func(tc testcase) {
v1.EXPECT().Identifiers().Return([]string{tc.i1})
v2.EXPECT().Identifiers().Return([]string{tc.i2})
}},
{"11/1*/2->1", "11", "1*", "2", v1, func(tc testcase) {
v1.EXPECT().Identifiers().Return([]string{tc.i1})
v2.EXPECT().Identifiers().Return([]string{tc.i2})
v1.EXPECT().Identifiers().Return([]string{tc.i1})
// v2.EXPECT().Identifiers().Return([]string{tc.i2})
}},
{"22/1*/2*->2", "22", "1*", "2*", v2, func(tc testcase) {
v1.EXPECT().Identifiers().Return([]string{tc.i1})
v2.EXPECT().Identifiers().Return([]string{tc.i2})
v1.EXPECT().Identifiers().Return([]string{tc.i1})
v2.EXPECT().Identifiers().Return([]string{tc.i2})
}},
{"2/_/*->2", "2", "", "*", v2, func(tc testcase) {
v1.EXPECT().Identifiers().Return(nil)
v2.EXPECT().Identifiers().Return([]string{tc.i2})
v1.EXPECT().Identifiers().Return(nil)
v2.EXPECT().Identifiers().Return([]string{tc.i2})
}},
}
for _, tc := range tc {
t.Logf("%+v", tc)
lp := &LoadPoint{
log: util.NewLogger("foo"),
vehicles: []api.Vehicle{v1, v2},
}
if tc.prepare != nil {
tc.prepare(tc)
}
if res := lp.selectVehicleByID(tc.id); tc.res != res {
t.Errorf("expected %v, got %v", tc.res, res)
}
}
}
func TestDefaultVehicle(t *testing.T) {
ctrl := gomock.NewController(t)
dflt := mock.NewMockVehicle(ctrl)
dflt.EXPECT().Title().Return("default").AnyTimes()
dflt.EXPECT().Capacity().AnyTimes()
dflt.EXPECT().Phases().AnyTimes()
dflt.EXPECT().OnIdentified().AnyTimes()
vehicle := mock.NewMockVehicle(ctrl)
vehicle.EXPECT().Title().Return("target").AnyTimes()
vehicle.EXPECT().Capacity().AnyTimes()
vehicle.EXPECT().Phases().AnyTimes()
vehicle.EXPECT().OnIdentified().AnyTimes()
lp := NewLoadPoint(util.NewLogger("foo"))
lp.defaultVehicle = dflt
// populate channels
x, y, z := createChannels(t)
attachChannels(lp, x, y, z)
title := func(v api.Vehicle) string {
if v == nil {
return "<nil>"
}
return v.Title()
}
// non-default vehicle identified
lp.setActiveVehicle(vehicle)
if lp.vehicle != vehicle {
t.Errorf("expected %v, got %v", title(vehicle), title(lp.vehicle))
}
// non-default vehicle disconnected
lp.evVehicleDisconnectHandler()
if lp.vehicle != dflt {
t.Errorf("expected %v, got %v", title(dflt), title(lp.vehicle))
}
// default vehicle disconnected
lp.evVehicleDisconnectHandler()
if lp.vehicle != dflt {
t.Errorf("expected %v, got %v", title(dflt), title(lp.vehicle))
}
// set non-default vehicle during disconnect - should be default on connect
lp.tasks.Clear()
lp.evVehicleConnectHandler()
if lp.vehicle != dflt {
t.Errorf("expected %v, got %v", title(dflt), title(lp.vehicle))
}
if l := lp.tasks.Size(); l != 1 {
t.Error("expected task in queue, got none")
}
// guest connected
lp.setActiveVehicle(nil)
if lp.vehicle != nil {
t.Errorf("expected %v, got %v", nil, title(lp.vehicle))
}
}
func TestApplyVehicleDefaults(t *testing.T) {
ctrl := gomock.NewController(t)
newConfig := func(mode api.ChargeMode, minCurrent, maxCurrent float64, minSoC, targetSoC int) api.ActionConfig {
return api.ActionConfig{
Mode: &mode,
MinCurrent: &minCurrent,
MaxCurrent: &maxCurrent,
MinSoC: &minSoC,
TargetSoC: &targetSoC,
}
}
assertConfig := func(lp *LoadPoint, conf api.ActionConfig) {
if lp.Mode != *conf.Mode {
t.Errorf("expected mode %v, got %v", *conf.Mode, lp.Mode)
}
if lp.MinCurrent != *conf.MinCurrent {
t.Errorf("expected minCurrent %v, got %v", *conf.MinCurrent, lp.MinCurrent)
}
if lp.MaxCurrent != *conf.MaxCurrent {
t.Errorf("expected maxCurrent %v, got %v", *conf.MaxCurrent, lp.MaxCurrent)
}
if lp.SoC.Min != *conf.MinSoC {
t.Errorf("expected minSoC %v, got %v", *conf.MinSoC, lp.SoC.Min)
}
if lp.SoC.Target != *conf.TargetSoC {
t.Errorf("expected targetSoC %v, got %v", *conf.TargetSoC, lp.SoC.Target)
}
}
oi := newConfig(api.ModePV, 7, 17, 1, 99)
od := newConfig(api.ModeOff, 5, 15, 2, 98)
vehicle := mock.NewMockVehicle(ctrl)
vehicle.EXPECT().Title().Return("it's me").AnyTimes()
vehicle.EXPECT().Capacity().AnyTimes()
vehicle.EXPECT().OnIdentified().Return(oi).AnyTimes()
lp := NewLoadPoint(util.NewLogger("foo"))
// populate channels
x, y, z := createChannels(t)
attachChannels(lp, x, y, z)
lp.onDisconnect = od
lp.ResetOnDisconnect = true
// vehicle identified
lp.setActiveVehicle(vehicle)
assertConfig(lp, oi)
// vehicle disconnected
vehicle.EXPECT().Phases().AnyTimes()
lp.evVehicleDisconnectHandler()
assertConfig(lp, od)
// identify vehicle by id
charger := struct {
*mock.MockCharger
*mock.MockIdentifier
}{
MockCharger: mock.NewMockCharger(ctrl),
MockIdentifier: mock.NewMockIdentifier(ctrl),
}
lp.charger = charger
lp.vehicles = []api.Vehicle{vehicle}
const id = "don't call me stacey"
charger.MockIdentifier.EXPECT().Identify().Return(id, nil)
vehicle.EXPECT().Identifiers().Return([]string{id})
lp.identifyVehicle()
assertConfig(lp, oi)
}
func TestReconnectVehicle(t *testing.T) {
ctrl := gomock.NewController(t)
clck := clock.NewMock()
type vehicleT struct {
*mock.MockVehicle
*mock.MockChargeState
}
vehicle := &vehicleT{mock.NewMockVehicle(ctrl), mock.NewMockChargeState(ctrl)}
vehicle.MockVehicle.EXPECT().Title().Return("vehicle").AnyTimes()
vehicle.MockVehicle.EXPECT().Capacity().AnyTimes()
vehicle.MockVehicle.EXPECT().Phases().AnyTimes()
vehicle.MockVehicle.EXPECT().OnIdentified().AnyTimes()
vehicle.MockVehicle.EXPECT().SoC().Return(0.0, nil).AnyTimes()
charger := mock.NewMockCharger(ctrl)
charger.EXPECT().Status().Return(api.StatusB, nil).AnyTimes()
lp := &LoadPoint{
log: util.NewLogger("foo"),
bus: evbus.New(),
clock: clck,
charger: charger,
chargeMeter: &Null{}, // silence nil panics
chargeRater: &Null{}, // silence nil panics
chargeTimer: &Null{}, // silence nil panics
wakeUpTimer: NewTimer(),
MinCurrent: minA,
MaxCurrent: maxA,
phases: 1,
Mode: api.ModeNow,
vehicles: []api.Vehicle{vehicle},
}
attachListeners(t, lp)
// mode now
charger.EXPECT().MaxCurrent(int64(maxA))
// sync charger
charger.EXPECT().Enabled().Return(true, nil)
// vehicle not updated yet
vehicle.MockChargeState.EXPECT().Status().Return(api.StatusA, nil)
lp.Update(0, false, false)
ctrl.Finish()
// detection started
if lp.vehicleDetect != lp.clock.Now() {
t.Error("vehicle detection not started")
}
// vehicle not detected yet
if lp.vehicle != nil {
t.Error("vehicle should be <nil>")
}
// sync charger
charger.EXPECT().Enabled().Return(true, nil)
// vehicle not updated yet
vehicle.MockChargeState.EXPECT().Status().Return(api.StatusB, nil)
lp.Update(0, false, false)
ctrl.Finish()
// vehicle detected
if lp.vehicle != vehicle {
t.Error("vehicle should be detected")
}
}