chore: simplify loops

This commit is contained in:
andig 2023-12-09 11:14:53 +01:00
parent 4e65e950eb
commit 11467a5607
26 changed files with 32 additions and 32 deletions

View file

@ -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
}

View file

@ -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
}

View file

@ -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

View file

@ -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

View file

@ -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
}

View file

@ -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
}

View file

@ -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
}

View file

@ -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
}

View file

@ -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)

View file

@ -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:]))
}

View file

@ -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
}

View file

@ -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:]))
}

View file

@ -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
}

View file

@ -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:])))
}

View file

@ -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
}

View file

@ -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
}

View file

@ -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:]))
}

View file

@ -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))
// }

View file

@ -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
}

View file

@ -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
}

View file

@ -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
}

View file

@ -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:]))
}

View file

@ -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:]))
}

View file

@ -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:]))
}

View file

@ -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
}

View file

@ -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