From 11467a560701a8dd7d9d805815dd976e94447e44 Mon Sep 17 00:00:00 2001 From: andig Date: Sat, 9 Dec 2023 11:14:53 +0100 Subject: [PATCH] chore: simplify loops --- charger/abb.go | 2 +- charger/abl-em4.go | 2 +- charger/abl.go | 2 +- charger/alfen.go | 2 +- charger/amperfied.go | 2 +- charger/bender.go | 2 +- charger/dadapower.go | 2 +- charger/daheimladen-mb.go | 2 +- charger/eebus.go | 8 ++++---- charger/etrel.go | 2 +- charger/heidelberg-ec.go | 2 +- charger/hesotec.go | 4 ++-- charger/huawei-ac.go | 2 +- charger/innogy.go | 2 +- charger/keba-modbus.go | 4 ++-- charger/kse.go | 2 +- charger/mennekes.go | 2 +- charger/obo.go | 2 +- charger/openwb-2.0.go | 2 +- charger/phoenix-charx.go | 4 ++-- charger/phoenix-em-eth.go | 2 +- charger/phoenix-ev-eth.go | 2 +- charger/schneider.go | 2 +- charger/versicharge.go | 2 +- charger/weidmüller.go | 2 +- meter/dsmr.go | 2 +- 26 files changed, 32 insertions(+), 32 deletions(-) diff --git a/charger/abb.go b/charger/abb.go index 2961b7c21..6d24b3996 100644 --- a/charger/abb.go +++ b/charger/abb.go @@ -217,7 +217,7 @@ func (wb *ABB) getPhaseValues(reg uint16, divider float64) (float64, float64, fl } var res [3]float64 - for i := 0; i < 3; i++ { + for i := range res { res[i] = float64(binary.BigEndian.Uint32(b[4*i:])) / divider } diff --git a/charger/abl-em4.go b/charger/abl-em4.go index 976e33dce..ed282176a 100644 --- a/charger/abl-em4.go +++ b/charger/abl-em4.go @@ -211,7 +211,7 @@ func (wb *AblEm4) getPhaseValues(reg uint16) (float64, float64, float64, error) } var res [3]float64 - for i := 0; i < 3; i++ { + for i := range res { res[i] = float64(binary.BigEndian.Uint32(b[4*i:])) / 10 } diff --git a/charger/abl.go b/charger/abl.go index 195c16641..edaed4672 100644 --- a/charger/abl.go +++ b/charger/abl.go @@ -233,7 +233,7 @@ func (wb *ABLeMH) currents() (float64, float64, float64, error) { } var res [3]float64 - for i := 0; i < 3; i++ { + for i := range res { u := binary.BigEndian.Uint16(b[2*(2+i):]) if u == ablAmpsDisabled || u == 1 { u = 0 diff --git a/charger/alfen.go b/charger/alfen.go index 9ad954aa1..c20e611cf 100644 --- a/charger/alfen.go +++ b/charger/alfen.go @@ -233,7 +233,7 @@ func (wb *Alfen) voltagesOrCurrents(reg uint16) (float64, float64, float64, erro } var res [3]float64 - for i := 0; i < 3; i++ { + for i := range res { f := rs485.RTUIeee754ToFloat64(b[4*i:]) if math.IsNaN(f) { f = 0 diff --git a/charger/amperfied.go b/charger/amperfied.go index de14e0c6b..7290a7c89 100644 --- a/charger/amperfied.go +++ b/charger/amperfied.go @@ -255,7 +255,7 @@ func (wb *Amperfied) getPhaseValues(reg uint16, divider float64) (float64, float } var res [3]float64 - for i := 0; i < 3; i++ { + for i := range res { res[i] = float64(binary.BigEndian.Uint16(b[2*i:])) / divider } diff --git a/charger/bender.go b/charger/bender.go index 3b91f3bef..d172b1ce6 100644 --- a/charger/bender.go +++ b/charger/bender.go @@ -288,7 +288,7 @@ func (wb *BenderCC) getPhaseValues(reg uint16, divider float64) (float64, float6 } var res [3]float64 - for i := 0; i < 3; i++ { + for i := range res { res[i] = float64(binary.BigEndian.Uint32(b[4*i:])) / divider } diff --git a/charger/dadapower.go b/charger/dadapower.go index f3124c3af..c21376231 100644 --- a/charger/dadapower.go +++ b/charger/dadapower.go @@ -196,7 +196,7 @@ func (wb *Dadapower) Currents() (float64, float64, float64, error) { } var res [3]float64 - for i := 0; i < 3; i++ { + for i := range res { res[i] = float64(binary.BigEndian.Uint16(b[2*i:])) / 100 } diff --git a/charger/daheimladen-mb.go b/charger/daheimladen-mb.go index df7e844e2..3890e09b4 100644 --- a/charger/daheimladen-mb.go +++ b/charger/daheimladen-mb.go @@ -244,7 +244,7 @@ func (wb *DaheimLadenMB) getPhaseValues(reg uint16) (float64, float64, float64, } var res [3]float64 - for i := 0; i < 3; i++ { + for i := range res { res[i] = float64(binary.BigEndian.Uint32(b[4*i:])) / 10 } diff --git a/charger/eebus.go b/charger/eebus.go index 3a77d844a..5a562cc4c 100644 --- a/charger/eebus.go +++ b/charger/eebus.go @@ -444,7 +444,7 @@ func (c *EEBus) currents() (float64, float64, float64, error) { return 0, 0, 0, nil } - currents, err := c.emobility.EVCurrentsPerPhase() + res, err := c.emobility.EVCurrentsPerPhase() if err != nil { if err == features.ErrDataNotAvailable { err = api.ErrNotAvailable @@ -453,11 +453,11 @@ func (c *EEBus) currents() (float64, float64, float64, error) { } // fill phases - for i := len(currents); i < 3; i++ { - currents = append(currents, 0) + for len(res) < 3 { + res = append(res, 0) } - return currents[0], currents[1], currents[2], nil + return res[0], res[1], res[2], nil } var _ api.Identifier = (*EEBus)(nil) diff --git a/charger/etrel.go b/charger/etrel.go index 2d34a26a8..92ac23bba 100644 --- a/charger/etrel.go +++ b/charger/etrel.go @@ -212,7 +212,7 @@ func (wb *Etrel) Currents() (float64, float64, float64, error) { } var res [3]float64 - for i := 0; i < 3; i++ { + for i := range res { res[i] = float64(encoding.Float32(b[4*i:])) } diff --git a/charger/heidelberg-ec.go b/charger/heidelberg-ec.go index 7e7363f82..514378072 100644 --- a/charger/heidelberg-ec.go +++ b/charger/heidelberg-ec.go @@ -266,7 +266,7 @@ func (wb *HeidelbergEC) getPhaseValues(reg uint16, divider float64) (float64, fl } var res [3]float64 - for i := 0; i < 3; i++ { + for i := range res { res[i] = float64(binary.BigEndian.Uint16(b[2*i:])) / divider } diff --git a/charger/hesotec.go b/charger/hesotec.go index 0db4dad25..1b5910874 100644 --- a/charger/hesotec.go +++ b/charger/hesotec.go @@ -186,7 +186,7 @@ func (wb *Hesotec) Currents() (float64, float64, float64, error) { } var res [3]float64 - for i := 0; i < 3; i++ { + for i := range res { res[i] = float64(binary.BigEndian.Uint32(b[4*i:])) / 1e3 } @@ -203,7 +203,7 @@ func (wb *Hesotec) Voltages() (float64, float64, float64, error) { } var res [3]float64 - for i := 0; i < 3; i++ { + for i := range res { res[i] = float64(binary.BigEndian.Uint16(b[2*i:])) } diff --git a/charger/huawei-ac.go b/charger/huawei-ac.go index c5054e280..d41b1d65e 100644 --- a/charger/huawei-ac.go +++ b/charger/huawei-ac.go @@ -196,7 +196,7 @@ func (wb *HuaweiACCharger) getPhaseValues(reg uint16) (float64, float64, float64 } var res [3]float64 - for i := 0; i < 3; i++ { + for i := range res { res[i] = float64(binary.BigEndian.Uint32(b[4*i:])) / 10 } diff --git a/charger/innogy.go b/charger/innogy.go index 30d39f46b..7ef73a68b 100644 --- a/charger/innogy.go +++ b/charger/innogy.go @@ -173,7 +173,7 @@ func (wb *Innogy) Currents() (float64, float64, float64, error) { } var res [3]float64 - for i := 0; i < 3; i++ { + for i := range res { res[i] = float64(math.Float32frombits(binary.BigEndian.Uint32(b[4*i:]))) } diff --git a/charger/keba-modbus.go b/charger/keba-modbus.go index 2d3388d3b..cdb5a715c 100644 --- a/charger/keba-modbus.go +++ b/charger/keba-modbus.go @@ -245,9 +245,9 @@ func (wb *Keba) totalEnergy() (float64, error) { // currents implements the api.PhaseCurrents interface func (wb *Keba) currents() (float64, float64, float64, error) { var res [3]float64 - for i := uint16(0); i < 3; i++ { + for i := range res { // does not support reading across register boundaries - b, err := wb.conn.ReadHoldingRegisters(kebaRegCurrents+2*i, 2) + b, err := wb.conn.ReadHoldingRegisters(kebaRegCurrents+2*uint16(i), 2) if err != nil { return 0, 0, 0, err } diff --git a/charger/kse.go b/charger/kse.go index 17622e4fb..0541365e9 100644 --- a/charger/kse.go +++ b/charger/kse.go @@ -195,7 +195,7 @@ func (wb *KSE) Currents() (float64, float64, float64, error) { } var res [3]float64 - for i := 0; i < 3; i++ { + for i := range res { res[i] = float64(binary.BigEndian.Uint16(b[2*i:])) / 1e3 } diff --git a/charger/mennekes.go b/charger/mennekes.go index c7d350986..25e8cc7ed 100644 --- a/charger/mennekes.go +++ b/charger/mennekes.go @@ -229,7 +229,7 @@ func (wb *Mennekes) getPhaseValues(reg uint16) (float64, float64, float64, error } var res [3]float64 - for i := 0; i < 3; i++ { + for i := range res { res[i] = float64(encoding.Float32LswFirst(b[4*i:])) } diff --git a/charger/obo.go b/charger/obo.go index a29fa290d..6b3c0342e 100644 --- a/charger/obo.go +++ b/charger/obo.go @@ -70,7 +70,7 @@ func NewObo(uri, device, comset string, baudrate int, proto modbus.Protocol, sla // go func() { // conn.WriteSingleRegister(3, 1) // for { - // for i := 0; i < 3; i++ { + // for i := range res { // u := rand.Int31n(256) // conn.WriteSingleRegister(uint16(i), uint16(u)) // } diff --git a/charger/openwb-2.0.go b/charger/openwb-2.0.go index 4565a4624..35c8a30d9 100644 --- a/charger/openwb-2.0.go +++ b/charger/openwb-2.0.go @@ -181,7 +181,7 @@ func (wb *OpenWB20) getPhaseValues(reg uint16) (float64, float64, float64, error } var res [3]float64 - for i := 0; i < 3; i++ { + for i := range res { res[i] = float64(binary.BigEndian.Uint16(b[2*i:])) / 100 } diff --git a/charger/phoenix-charx.go b/charger/phoenix-charx.go index 979a5af15..2ae37c032 100644 --- a/charger/phoenix-charx.go +++ b/charger/phoenix-charx.go @@ -218,7 +218,7 @@ func (wb *PhoenixCharx) currents() (float64, float64, float64, error) { } var res [3]float64 - for i := 0; i < 3; i++ { + for i := range res { res[i] = float64(encoding.Int32(b[4*i:])) / 1e3 } @@ -233,7 +233,7 @@ func (wb *PhoenixCharx) voltages() (float64, float64, float64, error) { } var res [3]float64 - for i := 0; i < 3; i++ { + for i := range res { res[i] = float64(encoding.Int32(b[4*i:])) / 1e3 } diff --git a/charger/phoenix-em-eth.go b/charger/phoenix-em-eth.go index 9029c8758..7000834fa 100644 --- a/charger/phoenix-em-eth.go +++ b/charger/phoenix-em-eth.go @@ -178,7 +178,7 @@ func (wb *PhoenixEMEth) getPhaseValues(reg uint16) (float64, float64, float64, e } var res [3]float64 - for i := 0; i < 3; i++ { + for i := range res { res[i] = float64(encoding.Int32LswFirst(b[4*i:])) / 1e3 } diff --git a/charger/phoenix-ev-eth.go b/charger/phoenix-ev-eth.go index 9609c0b2f..a6aca9fbd 100644 --- a/charger/phoenix-ev-eth.go +++ b/charger/phoenix-ev-eth.go @@ -228,7 +228,7 @@ func (wb *PhoenixEVEth) getPhaseValues(reg uint16) (float64, float64, float64, e } var res [3]float64 - for i := 0; i < 3; i++ { + for i := range res { res[i] = float64(encoding.Int32LswFirst(b[4*i:])) } diff --git a/charger/schneider.go b/charger/schneider.go index 9d5adbdb5..375d32d7b 100644 --- a/charger/schneider.go +++ b/charger/schneider.go @@ -218,7 +218,7 @@ func (wb *Schneider) getPhaseValues(reg uint16) (float64, float64, float64, erro } var res [3]float64 - for i := 0; i < 3; i++ { + for i := range res { res[i] = float64(encoding.Float32LswFirst(b[4*i:])) } diff --git a/charger/versicharge.go b/charger/versicharge.go index e05280490..bf1a99d3c 100644 --- a/charger/versicharge.go +++ b/charger/versicharge.go @@ -175,7 +175,7 @@ func (wb *Versicharge) getPhaseValues(reg uint16) (float64, float64, float64, er } var res [3]float64 - for i := 0; i < 3; i++ { + for i := range res { res[i] = float64(binary.BigEndian.Uint16(b[2*i:])) } diff --git a/charger/weidmüller.go b/charger/weidmüller.go index 65141cf6e..035b6af52 100644 --- a/charger/weidmüller.go +++ b/charger/weidmüller.go @@ -121,7 +121,7 @@ func (wb *Weidmüller) getPhaseValues(reg uint16) (float64, float64, float64, er } var res [3]float64 - for i := 0; i < 3; i++ { + for i := range res { res[i] = float64(binary.BigEndian.Uint32(b[4*i:])) / 1e3 } diff --git a/meter/dsmr.go b/meter/dsmr.go index d7b4ee400..5bac99091 100644 --- a/meter/dsmr.go +++ b/meter/dsmr.go @@ -269,7 +269,7 @@ func (m *Dsmr) totalEnergy() (float64, error) { func (m *Dsmr) currents() (float64, float64, float64, error) { var res [3]float64 - for i := 0; i < 3; i++ { + for i := range res { var err error if res[i], err = m.get(currentObis[i]); err != nil { return 0, 0, 0, err