From 8b4bc840e70fd0e39b0523efd506ab506edcc911 Mon Sep 17 00:00:00 2001 From: andig Date: Sun, 13 Aug 2023 15:06:28 +0200 Subject: [PATCH] Warp2: refactor ChargerEx implementation --- charger/warp2.go | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/charger/warp2.go b/charger/warp2.go index 3e8e4c601..b4d108f26 100644 --- a/charger/warp2.go +++ b/charger/warp2.go @@ -198,25 +198,21 @@ func (wb *Warp2) Status() (api.ChargeStatus, error) { return res, err } -// setCurrentMA sets the current in mA -func (wb *Warp2) setCurrentMA(current int64) error { - err := wb.maxcurrentS(current) - if err == nil { - wb.current = current - } - return err -} - // MaxCurrent implements the api.Charger interface func (wb *Warp2) MaxCurrent(current int64) error { - return wb.setCurrentMA(1000 * current) + return wb.MaxCurrentMillis(float64(current)) } var _ api.ChargerEx = (*Warp2)(nil) // MaxCurrentMillis implements the api.ChargerEx interface func (wb *Warp2) MaxCurrentMillis(current float64) error { - return wb.setCurrentMA(int64(1000 * current)) + curr := int64(current * 1e3) + err := wb.maxcurrentS(curr) + if err == nil { + wb.current = curr + } + return err } // CurrentPower implements the api.Meter interface