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

chore: rename api.ChargeTimer (#13561)

Browse source
This commit is contained in:
andig 2024-04-24 09:15:26 +02:00 • committed by GitHub
parent edd12cdf86
commit aeaecfd6ea
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
21 changed files with 38 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
api/api.go
View file

@ -93,7 +93,7 @@ type Diagnosis interface {
// ChargeTimer provides current charge cycle duration
type ChargeTimer interface {
ChargingTime() (time.Duration, error)
ChargeDuration() (time.Duration, error)
}
// ChargeRater provides charged energy amount in kWh

4
charger/bender.go
View file

@ -203,8 +203,8 @@ func (wb *BenderCC) MaxCurrent(current int64) error {
var _ api.ChargeTimer = (*BenderCC)(nil)
// ChargingTime implements the api.ChargeTimer interface
func (wb *BenderCC) ChargingTime() (time.Duration, error) {
// ChargeDuration implements the api.ChargeTimer interface
func (wb *BenderCC) ChargeDuration() (time.Duration, error) {
if wb.legacy {
b, err := wb.conn.ReadHoldingRegisters(bendRegChargingDurationLegacy, 1)
if err != nil {

4
charger/em2go-home.go
View file

@ -233,8 +233,8 @@ func (wb *Em2GoHome) ChargedEnergy() (float64, error) {
var _ api.ChargeTimer = (*Em2GoHome)(nil)
// ChargingTime implements the api.ChargeTimer interface
func (wb *Em2GoHome) ChargingTime() (time.Duration, error) {
// ChargeDuration implements the api.ChargeTimer interface
func (wb *Em2GoHome) ChargeDuration() (time.Duration, error) {
b, err := wb.conn.ReadHoldingRegisters(em2GoHomeRegChargeDuration, 2)
if err != nil {
return 0, err

4
charger/em2go.go
View file

@ -221,8 +221,8 @@ func (wb *Em2Go) ChargedEnergy() (float64, error) {
var _ api.ChargeTimer = (*Em2Go)(nil)
// ChargingTime implements the api.ChargeTimer interface
func (wb *Em2Go) ChargingTime() (time.Duration, error) {
// ChargeDuration implements the api.ChargeTimer interface
func (wb *Em2Go) ChargeDuration() (time.Duration, error) {
b, err := wb.conn.ReadHoldingRegisters(em2GoRegChargeDuration, 2)
if err != nil {
return 0, err

4
charger/etrel.go
View file

@ -221,8 +221,8 @@ func (wb *Etrel) Currents() (float64, float64, float64, error) {
// var _ api.ChargeTimer = (*Etrel)(nil)
//
// // ChargingTime implements the api.ChargeTimer interface
// func (wb *Etrel) ChargingTime() (time.Duration, error) {
// // ChargeDuration implements the api.ChargeTimer interface
// func (wb *Etrel) ChargeDuration() (time.Duration, error) {
// b, err := wb.conn.ReadInputRegisters(wb.base+etrelRegChargeTime, 4)
// if err != nil {
// return 0, err

4
charger/hesotec.go
View file

@ -154,8 +154,8 @@ func (wb *Hesotec) CurrentPower() (float64, error) {
var _ api.ChargeTimer = (*Hesotec)(nil)
// ChargingTime implements the api.ChargeTimer interface
func (wb *Hesotec) ChargingTime() (time.Duration, error) {
// ChargeDuration implements the api.ChargeTimer interface
func (wb *Hesotec) ChargeDuration() (time.Duration, error) {
b, err := wb.conn.ReadHoldingRegisters(hesotecRegDuration, 2)
if err != nil {
return 0, err

4
charger/mcc.go
View file

@ -340,8 +340,8 @@ func (mcc *MobileConnect) ChargedEnergy() (float64, error) {
var _ api.ChargeTimer = (*MobileConnect)(nil)
// ChargingTime implements the api.ChargeTimer interface
func (mcc *MobileConnect) ChargingTime() (time.Duration, error) {
// ChargeDuration implements the api.ChargeTimer interface
func (mcc *MobileConnect) ChargeDuration() (time.Duration, error) {
var currentSession MCCCurrentSession
if err := mcc.getEscapedJSON(mcc.apiURL(mccAPICurrentSession), &currentSession); err != nil {
return 0, err

6
charger/mcc_test.go
View file

@ -369,13 +369,13 @@ func TestMobileConnectChargingTime(t *testing.T) {
t.Run(tc.name, func(t *testing.T) {
mcc := NewTestMobileConnect(t, tc.responses)
got, err := mcc.ChargingTime()
got, err := mcc.ChargeDuration()
if (err != nil) != tc.wantErr {
t.Errorf("MobileConnect.ChargingTime() error = %v, wantErr %v", err, tc.wantErr)
t.Errorf("MobileConnect.ChargeDuration() error = %v, wantErr %v", err, tc.wantErr)
return
}
if got != tc.want {
t.Errorf("MobileConnect.ChargingTime() = %v, want %v", got, tc.want)
t.Errorf("MobileConnect.ChargeDuration() = %v, want %v", got, tc.want)
}
})
}

4
charger/mennekes-compact.go
View file

@ -248,8 +248,8 @@ func (wb *MennekesCompact) ChargedEnergy() (float64, error) {
var _ api.ChargeTimer = (*MennekesCompact)(nil)
// ChargingTime implements the api.ChargeTimer interface
func (wb *MennekesCompact) ChargingTime() (time.Duration, error) {
// ChargeDuration implements the api.ChargeTimer interface
func (wb *MennekesCompact) ChargeDuration() (time.Duration, error) {
b, err := wb.conn.ReadHoldingRegisters(mennekesRegDurationSession, 2)
if err != nil {
return 0, err

2
charger/openevse.go
View file

@ -205,7 +205,7 @@ func (c *OpenEVSE) ChargedEnergy() (float64, error) {
var _ api.ChargeTimer = (*OpenEVSE)(nil)
func (c *OpenEVSE) ChargingTime() (time.Duration, error) {
func (c *OpenEVSE) ChargeDuration() (time.Duration, error) {
res, err := c.statusG.Get()
if err != nil {
return 0, err

4
charger/phoenix-charx.go
View file

@ -180,8 +180,8 @@ func (wb *PhoenixCharx) MaxCurrent(current int64) error {
var _ api.ChargeTimer = (*PhoenixCharx)(nil)
// ChargingTime implements the api.ChargeTimer interface
func (wb *PhoenixCharx) ChargingTime() (time.Duration, error) {
// ChargeDuration implements the api.ChargeTimer interface
func (wb *PhoenixCharx) ChargeDuration() (time.Duration, error) {
b, err := wb.conn.ReadHoldingRegisters(wb.register(charxRegChargeTime), 2)
if err != nil {
return 0, err

4
charger/phoenix-em-eth.go
View file

@ -128,8 +128,8 @@ func (wb *PhoenixEMEth) MaxCurrent(current int64) error {
var _ api.ChargeTimer = (*PhoenixEMEth)(nil)
// ChargingTime implements the api.ChargeTimer interface
func (wb *PhoenixEMEth) ChargingTime() (time.Duration, error) {
// ChargeDuration implements the api.ChargeTimer interface
func (wb *PhoenixEMEth) ChargeDuration() (time.Duration, error) {
b, err := wb.conn.ReadInputRegisters(phxEMEthRegChargeTime, 2)
if err != nil {
return 0, err

4
charger/schneider-v3.go
View file

@ -227,8 +227,8 @@ func (wb *Schneider) getPhaseValues(reg uint16) (float64, float64, float64, erro
var _ api.ChargeTimer = (*Schneider)(nil)
// ChargingTime implements the api.ChargeTimer interface
func (wb *Schneider) ChargingTime() (time.Duration, error) {
// ChargeDuration implements the api.ChargeTimer interface
func (wb *Schneider) ChargeDuration() (time.Duration, error) {
b, err := wb.conn.ReadHoldingRegisters(schneiderRegSessionChargingTime, 2)
if err != nil {
return 0, err

4
charger/twc3.go
View file

@ -168,8 +168,8 @@ func (v *Twc3) ChargedEnergy() (float64, error) {
var _ api.ChargeTimer = (*Twc3)(nil)
// ChargingTime implements the api.ChargeTimer interface
func (v *Twc3) ChargingTime() (time.Duration, error) {
// ChargeDuration implements the api.ChargeTimer interface
func (v *Twc3) ChargeDuration() (time.Duration, error) {
res, err := v.vitalsG()
return time.Duration(res.SessionS) * time.Second, err
}

4
charger/vestel.go
View file

@ -182,8 +182,8 @@ func (wb *Vestel) MaxCurrent(current int64) error {
var _ api.ChargeTimer = (*Vestel)(nil)
// ChargingTime implements the api.ChargeTimer interface
func (wb *Vestel) ChargingTime() (time.Duration, error) {
// ChargeDuration implements the api.ChargeTimer interface
func (wb *Vestel) ChargeDuration() (time.Duration, error) {
b, err := wb.conn.ReadInputRegisters(vestelRegChargeTime, 2)
if err != nil {
return 0, err

4
charger/webasto-next.go
View file

@ -181,8 +181,8 @@ func (wb *WebastoNext) MaxCurrent(current int64) error {
var _ api.ChargeTimer = (*WebastoNext)(nil)
// ChargingTime implements the api.ChargeTimer interface
func (wb *WebastoNext) ChargingTime() (time.Duration, error) {
// ChargeDuration implements the api.ChargeTimer interface
func (wb *WebastoNext) ChargeDuration() (time.Duration, error) {
b, err := wb.conn.ReadHoldingRegisters(tqRegChargingTime, 2)
if err != nil {
return 0, err

2
cmd/dumper.go
View file

@ -133,7 +133,7 @@ func (d *dumper) Dump(name string, v interface{}) {
}
if v, ok := v.(api.ChargeTimer); ok {
if duration, err := v.ChargingTime(); err != nil {
if duration, err := v.ChargeDuration(); err != nil {
fmt.Fprintf(w, "Duration:\t%v\n", err)
} else {
fmt.Fprintf(w, "Duration:\t%v\n", duration.Truncate(time.Second))

2
core/loadpoint.go
View file

@ -1394,7 +1394,7 @@ func (lp *Loadpoint) publishChargeProgress() {
lp.log.ERROR.Printf("charge rater: %v", err)
}
if d, err := lp.chargeTimer.ChargingTime(); err == nil {
if d, err := lp.chargeTimer.ChargeDuration(); err == nil {
lp.chargeDuration = d.Round(time.Second)
} else {
lp.log.ERROR.Printf("charge timer: %v", err)

2
core/loadpoint_test.go
View file

@ -29,7 +29,7 @@ func (n *Null) ChargedEnergy() (float64, error) {
return 0, nil
}
func (n *Null) ChargingTime() (time.Duration, error) {
func (n *Null) ChargeDuration() (time.Duration, error) {
return 0, nil
}

4
core/wrapper/chargetimer.go
View file

@ -48,8 +48,8 @@ func (m *ChargeTimer) StopCharge() {
m.duration += m.clck.Since(m.start)
}
// ChargingTime implements the api.ChargeTimer interface
func (m *ChargeTimer) ChargingTime() (time.Duration, error) {
// ChargeDuration implements the api.ChargeTimer interface
func (m *ChargeTimer) ChargeDuration() (time.Duration, error) {
m.Lock()
defer m.Unlock()

4
core/wrapper/chargetimer_test.go
View file

@ -17,7 +17,7 @@ func TestTimer(t *testing.T) {
ct.StopCharge()
clck.Add(time.Hour)
if d, err := ct.ChargingTime(); d != 1*time.Hour || err != nil {
if d, err := ct.ChargeDuration(); d != 1*time.Hour || err != nil {
t.Error(d, err)
}
@ -26,7 +26,7 @@ func TestTimer(t *testing.T) {
clck.Add(2 * time.Hour)
ct.StopCharge()
if d, err := ct.ChargingTime(); d != 3*time.Hour || err != nil {
if d, err := ct.ChargeDuration(); d != 3*time.Hour || err != nil {
t.Error(d, err)
}
}