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

Dsmr: fix sign for import current (#3671)

Browse source
This commit is contained in:
andig 2022-06-20 11:23:24 +02:00 • committed by GitHub
parent 2bb9e5a631
commit e3326decb8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
meter/dsmr.go
View file

@ -60,7 +60,10 @@ type Dsmr struct {
updated time.Time
}
var currentObisCodes = []string{"1-0:31.7.0", "1-0:51.7.0", "1-0:71.7.0"}
var (
currentObis = []string{"1-0:31.7.0", "1-0:51.7.0", "1-0:71.7.0"}
powerExportObis = []string{"1-0:22.7.0", "1-0:42.7.0", "1-0:62.7.0"}
)
func init() {
registry.Add("dsmr", NewDsmrFromConfig)
@ -117,7 +120,7 @@ func NewDsmr(uri, energy string, timeout time.Duration) (api.Meter, error) {
// decorate currents
var currents func() (float64, float64, float64, error)
for _, obis := range currentObisCodes {
for _, obis := range currentObis {
_, err = m.get(obis)
if err != nil {
break
@ -254,10 +257,16 @@ func (m *Dsmr) currents() (float64, float64, float64, error) {
for i := 0; i < 3; i++ {
var err error
res[i], err = m.get(currentObisCodes[i])
if err != nil {
if res[i], err = m.get(currentObis[i]); err != nil {
return 0, 0, 0, err
}
// correct import/export sign
if f, err := m.get(powerExportObis[i]); err != nil {
return 0, 0, 0, err
} else if f > 0 {
res[i] = -res[i]
}
}
return res[0], res[1], res[2], nil