From 539f453a6c6ff10adb6e934376c1eda4ba587415 Mon Sep 17 00:00:00 2001 From: andig Date: Sun, 28 Apr 2024 11:54:49 +0200 Subject: [PATCH] TWC3/Bender: remove api.ChargeDuration (#13615) --- charger/bender.go | 23 ++--------------------- charger/twc3.go | 9 ++------- 2 files changed, 4 insertions(+), 28 deletions(-) diff --git a/charger/bender.go b/charger/bender.go index 1267103afd..0c1f24bccd 100644 --- a/charger/bender.go +++ b/charger/bender.go @@ -27,7 +27,6 @@ import ( "encoding/binary" "fmt" "math" - "time" "github.com/evcc-io/evcc/api" "github.com/evcc-io/evcc/util" @@ -201,26 +200,8 @@ func (wb *BenderCC) MaxCurrent(current int64) error { return err } -var _ api.ChargeTimer = (*BenderCC)(nil) - -// ChargeDuration implements the api.ChargeTimer interface -func (wb *BenderCC) ChargeDuration() (time.Duration, error) { - if wb.legacy { - b, err := wb.conn.ReadHoldingRegisters(bendRegChargingDurationLegacy, 1) - if err != nil { - return 0, err - } - - return time.Duration(binary.BigEndian.Uint16(b)) * time.Second, nil - } - - b, err := wb.conn.ReadHoldingRegisters(bendRegChargingDuration, 2) - if err != nil { - return 0, err - } - - return time.Duration(binary.BigEndian.Uint32(b)) * time.Second, nil -} +// removed: https://github.com/evcc-io/evcc/issues/13555 +// var _ api.ChargeTimer = (*BenderCC)(nil) // CurrentPower implements the api.Meter interface func (wb *BenderCC) currentPower() (float64, error) { diff --git a/charger/twc3.go b/charger/twc3.go index 9cb49ae3c3..9c34a4cf5a 100644 --- a/charger/twc3.go +++ b/charger/twc3.go @@ -166,13 +166,8 @@ func (v *Twc3) ChargedEnergy() (float64, error) { return res.SessionEnergyWh / 1e3, err } -var _ api.ChargeTimer = (*Twc3)(nil) - -// ChargeDuration implements the api.ChargeTimer interface -func (v *Twc3) ChargeDuration() (time.Duration, error) { - res, err := v.vitalsG() - return time.Duration(res.SessionS) * time.Second, err -} +// removed: https://github.com/evcc-io/evcc/issues/13555 +// var _ api.ChargeTimer = (*Twc3)(nil) // Use workaround if voltageC_v is approximately half of grid_v //