From eda4e47ca766285eadaac795c4cb0538ec9112b7 Mon Sep 17 00:00:00 2001
From: andig <cpuidle@gmx.de>
Date: Sun, 19 Dec 2021 11:11:42 +0100
Subject: [PATCH] Add support for grid meter energy (#2073)

---
 core/site.go | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/core/site.go b/core/site.go
index 9b7a3529a..487e35fcd 100644
--- a/core/site.go
+++ b/core/site.go
@@ -309,8 +309,7 @@ func (site *Site) updateMeters() error {
 			if err == nil {
 				site.batteryPower += power
 			} else {
-				err = fmt.Errorf("updating battery meter %d: %v", id, err)
-				site.log.ERROR.Println(err)
+				site.log.ERROR.Println(fmt.Errorf("updating battery meter %d: %v", id, err))
 			}
 		}
 
@@ -324,6 +323,18 @@ func (site *Site) updateMeters() error {
 		if err == nil {
 			site.log.DEBUG.Printf("grid currents: %.3gA", []float64{i1, i2, i3})
 			site.publish("gridCurrents", []float64{i1, i2, i3})
+		} else {
+			site.log.ERROR.Println(fmt.Errorf("updating grid meter currents: %v", err))
+		}
+	}
+
+	// grid energy
+	if energyMeter, ok := site.gridMeter.(api.MeterEnergy); ok {
+		val, err := energyMeter.TotalEnergy()
+		if err == nil {
+			site.publish("gridEnergy", val)
+		} else {
+			site.log.ERROR.Println(fmt.Errorf("updating grid meter energy: %v", err))
 		}
 	}