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

Etrel: remove ChargeTimer and ChargeRater (#5384)

Browse source
This commit is contained in:
premultiply 2022-12-06 08:06:42 +01:00 • committed by GitHub
parent 39229896d4
commit 8e6ef69716
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

55
charger/etrel.go
View file

@ -21,7 +21,6 @@ import (
"encoding/binary"
"fmt"
"math"
"time"
"github.com/evcc-io/evcc/api"
"github.com/evcc-io/evcc/util"
@ -38,13 +37,15 @@ const (
etrelRegTargetCurrent = 4
etrelRegCurrents = 14 // 16, 18
etrelRegPower = 26
etrelRegSessionEnergy = 30
etrelRegChargeTime = 32
etrelRegSerial = 990
etrelRegModel = 1000
etrelRegHWVersion = 1010
etrelRegSWVersion = 1015
// Always zero, see https://github.com/evcc-io/evcc/issues/5346
//etrelRegSessionEnergy = 30
//etrelRegChargeTime = 32
// holding, write-only!
etrelRegMaxCurrent = 8
)
@ -189,18 +190,6 @@ func (wb *Etrel) MaxCurrentMillis(current float64) error {
return err
}
var _ api.ChargeTimer = (*Etrel)(nil)
// ChargingTime implements the api.ChargeTimer interface
func (wb *Etrel) ChargingTime() (time.Duration, error) {
b, err := wb.conn.ReadInputRegisters(wb.base+etrelRegChargeTime, 4)
if err != nil {
return 0, err
}
return time.Duration(int64(binary.BigEndian.Uint64(b))) * time.Second, nil
}
var _ api.Meter = (*Etrel)(nil)
// CurrentPower implements the api.Meter interface
@ -213,18 +202,6 @@ func (wb *Etrel) CurrentPower() (float64, error) {
return float64(encoding.Float32(b) * 1e3), err
}
var _ api.ChargeRater = (*Etrel)(nil)
// ChargedEnergy implements the api.ChargeRater interface
func (wb *Etrel) ChargedEnergy() (float64, error) {
b, err := wb.conn.ReadInputRegisters(wb.base+etrelRegSessionEnergy, 2)
if err != nil {
return 0, err
}
return float64(encoding.Float32(b)), err
}
var _ api.MeterCurrent = (*Etrel)(nil)
// Currents implements the api.MeterCurrent interface
@ -242,6 +219,30 @@ func (wb *Etrel) Currents() (float64, float64, float64, error) {
return currents[0], currents[1], currents[2], nil
}
// var _ api.ChargeTimer = (*Etrel)(nil)
//
// // ChargingTime implements the api.ChargeTimer interface
// func (wb *Etrel) ChargingTime() (time.Duration, error) {
// b, err := wb.conn.ReadInputRegisters(wb.base+etrelRegChargeTime, 4)
// if err != nil {
// return 0, err
// }
//
// return time.Duration(int64(binary.BigEndian.Uint64(b))) * time.Second, nil
// }
// var _ api.ChargeRater = (*Etrel)(nil)
//
// // ChargedEnergy implements the api.ChargeRater interface
// func (wb *Etrel) ChargedEnergy() (float64, error) {
// b, err := wb.conn.ReadInputRegisters(wb.base+etrelRegSessionEnergy, 2)
// if err != nil {
// return 0, err
// }
//
// return float64(encoding.Float32(b)), err
// }
var _ api.Diagnosis = (*Etrel)(nil)
// Diagnose implements the api.Diagnosis interface