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

Implement multiple loadpoints and new UI (#199)

Browse source 
* Support multiple loadpoints

* Finalize loadpoint site split

* Simplify global voltage

* Fix push template error stopping main process

* Show only last error on retry

* Improve influx v1 compatibility

* Update push templates

* Revert influx v1 user change
This commit is contained in:
andig 2020-07-16 09:34:58 +02:00 • committed by GitHub
parent 80c851e423
commit e34167ce7d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
54 changed files with 1945 additions and 1499 deletions
Download patch file Download diff file Expand all files Collapse all files

17
core/wrapper/chargerater.go
View file

@ -6,6 +6,7 @@ import (
"time"
"github.com/andig/evcc/api"
"github.com/andig/evcc/util"
"github.com/benbjohnson/clock"
)
@ -14,8 +15,8 @@ import (
// keeps track of consumed energy by regularly updating consumed power.
type ChargeRater struct {
sync.Mutex
log *util.Logger
clck clock.Clock
name string
meter api.Meter
charging bool
start time.Time
@ -24,10 +25,10 @@ type ChargeRater struct {
}
// NewChargeRater creates charge rater and initializes realtime clock
func NewChargeRater(name string, meter api.Meter) *ChargeRater {
func NewChargeRater(log *util.Logger, meter api.Meter) *ChargeRater {
return &ChargeRater{
log: log,
clck: clock.New(),
name: name,
meter: meter,
}
}
@ -46,9 +47,9 @@ func (cr *ChargeRater) StartCharge() {
if m, ok := cr.meter.(api.MeterEnergy); ok {
if f, err := m.TotalEnergy(); err == nil {
cr.startEnergy = f
log.DEBUG.Printf("%s charge start energy: %.0fkWh", cr.name, f)
cr.log.DEBUG.Printf("charge start energy: %.0fkWh", f)
} else {
log.ERROR.Printf("%s charge meter error %v", cr.name, err)
cr.log.ERROR.Printf("charge meter error %v", err)
}
} else {
cr.chargedEnergy = 0
@ -67,9 +68,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
log.DEBUG.Printf("%s final charge energy: %.0fkWh", cr.name, cr.chargedEnergy)
cr.log.DEBUG.Printf("final charge energy: %.0fkWh", cr.chargedEnergy)
} else {
log.ERROR.Printf("%s charge meter error %v", cr.name, err)
cr.log.ERROR.Printf("charge meter error %v", err)
}
}
}
@ -111,7 +112,7 @@ func (cr *ChargeRater) ChargedEnergy() (float64, error) {
return f - cr.startEnergy, nil
}
return 0, fmt.Errorf("%s charge meter error %v", cr.name, err)
return 0, fmt.Errorf("charge meter error %v", err)
}
// return charged energy sofar if meter is not used

5
core/wrapper/chargerater_test.go
View file

@ -6,12 +6,13 @@ import (
"github.com/andig/evcc/meter"
"github.com/andig/evcc/mock"
"github.com/andig/evcc/util"
"github.com/benbjohnson/clock"
"github.com/golang/mock/gomock"
)
func TestNoMeter(t *testing.T) {
cr := NewChargeRater("foo", nil)
cr := NewChargeRater(util.NewLogger("foo"), nil)
clck := clock.NewMock()
cr.clck = clck
@ -53,7 +54,7 @@ func TestWrappedMeter(t *testing.T) {
TotalEnergy().
Return(3.0, nil)
cr := NewChargeRater("foo", cm)
cr := NewChargeRater(util.NewLogger("foo"), cm)
clck := clock.NewMock()
cr.clck = clck

5
core/wrapper/log.go
View file

@ -1,5 +0,0 @@
package wrapper
import "github.com/andig/evcc/util"
var log = util.NewLogger("wrap")