Telemetry: add green power
This commit is contained in:
parent
39c633241f
commit
e3465967fa
3 changed files with 12 additions and 7 deletions
|
|
@ -455,7 +455,7 @@ func (site *Site) update(lp Updater) {
|
|||
// TODO: use energy instead of current power for better results
|
||||
deltaCharged, deltaSelf := site.savings.Update(site, site.gridPower, site.pvPower, site.batteryPower, totalChargePower)
|
||||
if telemetry.Enabled && totalChargePower > standbyPower {
|
||||
go telemetry.ChargeProgress(site.log, totalChargePower, deltaCharged, deltaSelf)
|
||||
go telemetry.UpdateChargeProgress(site.log, totalChargePower, deltaCharged, deltaSelf)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -24,15 +24,12 @@ func Create(token string) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func ChargeProgress(log *util.Logger, power, deltaCharged, deltaGreen float64) {
|
||||
func UpdateChargeProgress(log *util.Logger, power, deltaCharged, deltaGreen float64) {
|
||||
log.DEBUG.Printf("telemetry: charge: Δ%.0f/%.0fWh @ %.0fW", deltaGreen*1e3, deltaCharged*1e3, power)
|
||||
|
||||
data := struct {
|
||||
ChargePower float64 `json:"chargePower"`
|
||||
ChargeEnergy float64 `json:"chargeEnergy"`
|
||||
GreenEnergy float64 `json:"greenEnergy"`
|
||||
}{
|
||||
data := ChargeProgress{
|
||||
ChargePower: power,
|
||||
GreenPower: power * deltaGreen / deltaCharged,
|
||||
ChargeEnergy: deltaCharged,
|
||||
GreenEnergy: deltaGreen,
|
||||
}
|
||||
|
|
|
|||
8
util/telemetry/types.go
Normal file
8
util/telemetry/types.go
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
package telemetry
|
||||
|
||||
type ChargeProgress struct {
|
||||
ChargePower float64 `json:"chargePower"`
|
||||
GreenPower float64 `json:"greenPower"`
|
||||
ChargeEnergy float64 `json:"chargeEnergy"`
|
||||
GreenEnergy float64 `json:"greenEnergy"`
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue