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

chore: hide phase powers if not used (#14509)

Browse source
This commit is contained in:
andig 2024-06-29 16:21:40 +02:00 • committed by GitHub
parent b9ce2fcf8d
commit 7b5bcce901
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

26
core/site.go
View file

@ -564,21 +564,21 @@ func (site *Site) updateGridMeter() error {
return fmt.Errorf("grid meter: %v", err)
}
// grid phase powers
var p1, p2, p3 float64
if phaseMeter, ok := site.gridMeter.(api.PhasePowers); ok {
var err error // phases needed for signed currents
if p1, p2, p3, err = phaseMeter.Powers(); err == nil {
phases := []float64{p1, p2, p3}
site.log.DEBUG.Printf("grid powers: %.0fW", phases)
site.publish(keys.GridPowers, phases)
} else {
site.log.ERROR.Printf("grid powers: %v", err)
}
}
// grid phase currents (signed)
if phaseMeter, ok := site.gridMeter.(api.PhaseCurrents); ok {
// grid phase powers
var p1, p2, p3 float64
if phaseMeter, ok := site.gridMeter.(api.PhasePowers); ok {
var err error // phases needed for signed currents
if p1, p2, p3, err = phaseMeter.Powers(); err == nil {
phases := []float64{p1, p2, p3}
site.log.DEBUG.Printf("grid powers: %.0fW", phases)
site.publish(keys.GridPowers, phases)
} else {
site.log.ERROR.Printf("grid powers: %v", err)
}
}
if i1, i2, i3, err := phaseMeter.Currents(); err == nil {
phases := []float64{util.SignFromPower(i1, p1), util.SignFromPower(i2, p2), util.SignFromPower(i3, p3)}
site.log.DEBUG.Printf("grid currents: %.3gA", phases)

2
util/metering.go
View file

@ -1,7 +1,7 @@
package util
// SignFromPower is a helper function to create signed current from signed power bypassing already signed current
func SignFromPower(current float64, power float64) float64 {
func SignFromPower(current, power float64) float64 {
if current > 0 && power < 0 {
return -current
}