Stefan/evcc-io
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: clarify error messages

Browse source
This commit is contained in:
andig 2024-08-19 22:53:35 +02:00
parent 22d24936bc
commit d970fc94cb
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
core/wrapper/chargerater.go
View file

@ -48,7 +48,7 @@ func (cr *ChargeRater) StartCharge(continued bool) {
cr.startEnergy = f
cr.log.DEBUG.Printf("charge start energy: %.3gkWh", f)
} else {
cr.log.ERROR.Printf("charge meter: %v", err)
cr.log.ERROR.Printf("charge total import: %v", err)
}
}
@ -71,9 +71,9 @@ func (cr *ChargeRater) StopCharge() {
if m, ok := cr.meter.(api.MeterEnergy); ok {
if f, err := m.TotalEnergy(); err == nil {
cr.chargedEnergy += f - cr.startEnergy
cr.log.DEBUG.Printf("final charge energy: %.3gkWh", cr.chargedEnergy)
cr.log.DEBUG.Printf("charge final energy: %.3gkWh", cr.chargedEnergy)
} else {
cr.log.ERROR.Printf("charge meter error %v", err)
cr.log.ERROR.Printf("charge total import: %v", err)
}
}
}
@ -110,12 +110,11 @@ func (cr *ChargeRater) ChargedEnergy() (float64, error) {
// get current energy amount
if m, ok := cr.meter.(api.MeterEnergy); ok {
f, err := m.TotalEnergy()
if err == nil {
return cr.chargedEnergy + f - cr.startEnergy, nil
}
return 0, fmt.Errorf("charge meter error %v", err)
return 0, fmt.Errorf("charge total import: %v", err)
}
// return charged energy sofar if meter is not used