From 51c68bc24df34b43a9aa2449f791002f7dac31c7 Mon Sep 17 00:00:00 2001 From: andig Date: Wed, 27 Jul 2022 21:44:54 +0200 Subject: [PATCH] chore: idiomatically rename AlarmClock to Resurrector --- api/api.go | 4 ++-- charger/abl.go | 4 ++-- charger/evsewifi.go | 4 ++-- charger/heidelberg-ec.go | 4 ++-- charger/openwb.go | 4 ++-- cmd/charger.go | 2 +- cmd/vehicle.go | 2 +- core/loadpoint.go | 4 ++-- core/site.go | 4 ++-- vehicle/ford/provider.go | 4 ++-- vehicle/renault/provider.go | 4 ++-- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/api/api.go b/api/api.go index 38e0c83c1..ed5ee9756 100644 --- a/api/api.go +++ b/api/api.go @@ -179,8 +179,8 @@ type VehicleChargeController interface { StopCharge() error } -// AlarmClock provides wakeup calls to the vehicle with an API call or a CP interrupt from the charger -type AlarmClock interface { +// Resurrector provides wakeup calls to the vehicle with an API call or a CP interrupt from the charger +type Resurrector interface { WakeUp() error } diff --git a/charger/abl.go b/charger/abl.go index 80c60bd21..623c24e91 100644 --- a/charger/abl.go +++ b/charger/abl.go @@ -250,9 +250,9 @@ func (wb *ABLeMH) Diagnose() { } } -var _ api.AlarmClock = (*ABLeMH)(nil) +var _ api.Resurrector = (*ABLeMH)(nil) -// WakeUp implements the api.AlarmClock interface +// WakeUp implements the api.Resurrector interface func (wb *ABLeMH) WakeUp() error { // temporary jump to status E0 (Outlet disabled) err := wb.set(ablRegModifyState, 0xE0E0) diff --git a/charger/evsewifi.go b/charger/evsewifi.go index cb1c13dcb..7b0f1b440 100644 --- a/charger/evsewifi.go +++ b/charger/evsewifi.go @@ -243,9 +243,9 @@ func (wb *EVSEWifi) identify() (string, error) { // return params.Energy, err // } -var _ api.AlarmClock = (*EVSEWifi)(nil) +var _ api.Resurrector = (*EVSEWifi)(nil) -// WakeUp implements the AlarmClock interface +// WakeUp implements the Resurrector interface func (wb *EVSEWifi) WakeUp() error { uri := fmt.Sprintf("%s/interruptCp", wb.uri) _, err := wb.GetBody(uri) diff --git a/charger/heidelberg-ec.go b/charger/heidelberg-ec.go index 3b883b8b8..5be8b92d6 100644 --- a/charger/heidelberg-ec.go +++ b/charger/heidelberg-ec.go @@ -268,9 +268,9 @@ func (wb *HeidelbergEC) Diagnose() { } } -var _ api.AlarmClock = (*HeidelbergEC)(nil) +var _ api.Resurrector = (*HeidelbergEC)(nil) -// WakeUp implements the api.AlarmClock interface +// WakeUp implements the api.Resurrector interface func (wb *HeidelbergEC) WakeUp() error { // force status F by locking err := wb.set(hecRegRemoteLock, 0) diff --git a/charger/openwb.go b/charger/openwb.go index 8c3b321f3..13ffe359f 100644 --- a/charger/openwb.go +++ b/charger/openwb.go @@ -234,9 +234,9 @@ func (m *OpenWB) Authorize(key string) error { return m.authS(key) } -var _ api.AlarmClock = (*OpenWB)(nil) +var _ api.Resurrector = (*OpenWB)(nil) -// WakeUp implements the api.AlarmClock interface +// WakeUp implements the api.Resurrector interface func (m *OpenWB) WakeUp() error { return m.wakeupS(1) } diff --git a/cmd/charger.go b/cmd/charger.go index ef8bfc73b..78dbd73b5 100644 --- a/cmd/charger.go +++ b/cmd/charger.go @@ -110,7 +110,7 @@ func runCharger(cmd *cobra.Command, args []string) { if cmd.PersistentFlags().Lookup(flagWakeup).Changed { flagUsed = true - if vv, ok := v.(api.AlarmClock); ok { + if vv, ok := v.(api.Resurrector); ok { if err := vv.WakeUp(); err != nil { log.ERROR.Println("wakeup:", err) } diff --git a/cmd/vehicle.go b/cmd/vehicle.go index ae3f470de..bea264874 100644 --- a/cmd/vehicle.go +++ b/cmd/vehicle.go @@ -68,7 +68,7 @@ func runVehicle(cmd *cobra.Command, args []string) { if cmd.PersistentFlags().Lookup(flagWakeup).Changed { flagUsed = true - if vv, ok := v.(api.AlarmClock); ok { + if vv, ok := v.(api.Resurrector); ok { if err := vv.WakeUp(); err != nil { log.ERROR.Println("wakeup:", err) } diff --git a/core/loadpoint.go b/core/loadpoint.go index d9d3aaeab..3bb810444 100644 --- a/core/loadpoint.go +++ b/core/loadpoint.go @@ -834,7 +834,7 @@ func (lp *LoadPoint) setActiveVehicle(vehicle api.Vehicle) { func (lp *LoadPoint) wakeUpVehicle() { // charger - if c, ok := lp.charger.(api.AlarmClock); ok { + if c, ok := lp.charger.(api.Resurrector); ok { if err := c.WakeUp(); err != nil { lp.log.ERROR.Printf("wake-up charger: %v", err) } @@ -843,7 +843,7 @@ func (lp *LoadPoint) wakeUpVehicle() { // vehicle if lp.vehicle != nil { - if vs, ok := lp.vehicle.(api.AlarmClock); ok { + if vs, ok := lp.vehicle.(api.Resurrector); ok { if err := vs.WakeUp(); err != nil { lp.log.ERROR.Printf("wake-up vehicle: %v", err) } diff --git a/core/site.go b/core/site.go index 12fd85099..10bee30f7 100644 --- a/core/site.go +++ b/core/site.go @@ -194,7 +194,7 @@ func (site *Site) DumpConfig() { _, energy := lp.charger.(api.MeterEnergy) _, currents := lp.charger.(api.MeterCurrent) _, phases := lp.charger.(api.ChargePhases) - _, wakeup := lp.charger.(api.AlarmClock) + _, wakeup := lp.charger.(api.Resurrector) lp.log.INFO.Printf(" charger: power %s energy %s currents %s phases %s wakeup %s", presence[power], @@ -218,7 +218,7 @@ func (site *Site) DumpConfig() { _, finish := v.(api.VehicleFinishTimer) _, status := v.(api.ChargeState) _, climate := v.(api.VehicleClimater) - _, wakeup := v.(api.AlarmClock) + _, wakeup := v.(api.Resurrector) lp.log.INFO.Printf(" vehicle %d: range %s finish %s status %s climate %s wakeup %s", i+1, presence[rng], presence[finish], presence[status], presence[climate], presence[wakeup], ) diff --git a/vehicle/ford/provider.go b/vehicle/ford/provider.go index 2e74b58b9..0e4401ff3 100644 --- a/vehicle/ford/provider.go +++ b/vehicle/ford/provider.go @@ -132,9 +132,9 @@ func (v *Provider) Position() (float64, float64, error) { return res.VehicleStatus.Gps.Latitude, res.VehicleStatus.Gps.Longitude, err } -var _ api.AlarmClock = (*Provider)(nil) +var _ api.Resurrector = (*Provider)(nil) -// WakeUp implements the api.AlarmClock interface +// WakeUp implements the api.Resurrector interface func (v *Provider) WakeUp() error { return v.wakeup() } diff --git a/vehicle/renault/provider.go b/vehicle/renault/provider.go index 3817da853..4d5b673fe 100644 --- a/vehicle/renault/provider.go +++ b/vehicle/renault/provider.go @@ -142,9 +142,9 @@ func (v *Provider) Climater() (active bool, outsideTemp float64, targetTemp floa return false, 0, 0, err } -var _ api.AlarmClock = (*Provider)(nil) +var _ api.Resurrector = (*Provider)(nil) -// WakeUp implements the api.AlarmClock interface +// WakeUp implements the api.Resurrector interface func (v *Provider) WakeUp() error { _, err := v.wakeup() return err