Show real time production

src/AmsDataStorage.cpp

@@ -67,7 +67,7 @@ bool AmsDataStorage::update(AmsData* data) {
         }
         tmElements_t last;
         breakTime(day.lastMeterReadTime, last);
-        for(int i = last.Hour; i < utc.Hour; i++) {
+        for(int i = last.Hour; i <= utc.Hour; i++) {
             if(debugger->isActive(RemoteDebug::VERBOSE)) {
                 debugger->printf("(AmsDataStorage) Clearing hour: %d\n", i);
             }
@@ -90,7 +90,7 @@ bool AmsDataStorage::update(AmsData* data) {
         }
         tmElements_t last;
         breakTime(tz->toLocal(month.lastMeterReadTime), last);
-        for(int i = last.Day; i < ltz.Day; i++) {
+        for(int i = last.Day; i <= ltz.Day; i++) {
             if(debugger->isActive(RemoteDebug::VERBOSE)) {
                 debugger->printf("(AmsDataStorage) Clearing day: %d\n", i);
             }

src/EnergyAccounting.cpp

@@ -80,6 +80,7 @@ bool EnergyAccounting::update(AmsData* amsData) {
         }
 
         use = 0;
+        produce = 0;
         costHour = 0;
         currentHour = local.Hour;
 
@@ -106,19 +107,24 @@ bool EnergyAccounting::update(AmsData* amsData) {
     }
 
     unsigned long ms = this->lastUpdateMillis > amsData->getLastUpdateMillis() ? 0 : amsData->getLastUpdateMillis() - this->lastUpdateMillis;
-    float kwh = (amsData->getActiveImportPower() * (((float) ms) / 3600000.0)) / 1000.0;
+    float kwhi = (amsData->getActiveImportPower() * (((float) ms) / 3600000.0)) / 1000.0;
+    float kwhe = (amsData->getActiveExportPower() * (((float) ms) / 3600000.0)) / 1000.0;
     lastUpdateMillis = amsData->getLastUpdateMillis();
-    if(kwh > 0) {
-        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(EnergyAccounting) Adding %.4f kWh\n", kwh);
-        use += kwh;
+    if(kwhi > 0) {
+        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(EnergyAccounting) Adding %.4f kWh import\n", kwhi);
+        use += kwhi;
         if(eapi != NULL && eapi->getValueForHour(0) != ENTSOE_NO_VALUE) {
             float price = eapi->getValueForHour(0);
-            float cost = price * kwh;
+            float cost = price * kwhi;
             if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(EnergyAccounting)  and %.4f %s\n", cost / 100.0, eapi->getCurrency());
             costHour += cost;
             costDay += cost;
         }
     }
+    if(kwhe > 0) {
+        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(EnergyAccounting) Adding %.4f kWh export\n", kwhe);
+        produce += kwhe;
+    }
 
     if(config != NULL) {
         if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(EnergyAccounting)  calculating threshold, currently at %d\n", currentThresholdIdx);
@@ -151,10 +157,6 @@ double EnergyAccounting::getUseThisHour() {
     return use;
 }
 
-double EnergyAccounting::getCostThisHour() {
-    return costHour;
-}
-
 double EnergyAccounting::getUseToday() {
     float ret = 0.0;
     time_t now = time(nullptr);
@@ -168,14 +170,6 @@ double EnergyAccounting::getUseToday() {
     return ret + getUseThisHour();
 }
 
-double EnergyAccounting::getCostToday() {
-    return costDay;
-}
-
-double EnergyAccounting::getCostYesterday() {
-    return data.costYesterday / 10.0;
-}
-
 double EnergyAccounting::getUseThisMonth() {
     time_t now = time(nullptr);
     if(now < BUILD_EPOCH) return 0;
@@ -191,6 +185,51 @@ double EnergyAccounting::getUseThisMonth() {
     return ret + getUseToday();
 }
 
+double EnergyAccounting::getProducedThisHour() {
+    return produce;
+}
+
+double EnergyAccounting::getProducedToday() {
+    float ret = 0.0;
+    time_t now = time(nullptr);
+    if(now < BUILD_EPOCH) return 0;
+    tmElements_t local, utc;
+    breakTime(tz->toLocal(now), local);
+    for(int i = 0; i < local.Hour; i++) {
+        breakTime(now - ((local.Hour - i) * 3600), utc);
+        ret += ds->getHourExport(utc.Hour) / 1000.0;
+    }
+    return ret + getProducedThisHour();
+}
+
+double EnergyAccounting::getProducedThisMonth() {
+    time_t now = time(nullptr);
+    if(now < BUILD_EPOCH) return 0;
+    tmElements_t tm;
+    if(tz != NULL)
+        breakTime(tz->toLocal(now), tm);
+    else
+        breakTime(now, tm);
+    float ret = 0;
+    for(int i = 0; i < tm.Day; i++) {
+        ret += ds->getDayExport(i) / 1000.0;
+    }
+    return ret + getProducedToday();
+}
+
+
+double EnergyAccounting::getCostThisHour() {
+    return costHour;
+}
+
+double EnergyAccounting::getCostToday() {
+    return costDay;
+}
+
+double EnergyAccounting::getCostYesterday() {
+    return data.costYesterday / 10.0;
+}
+
 double EnergyAccounting::getCostThisMonth() {
     return data.costThisMonth + getCostToday();
 }

src/EnergyAccounting.h

@@ -42,11 +42,16 @@ public:
     bool save();
 
     double getUseThisHour();
-    double getCostThisHour();
     double getUseToday();
+    double getUseThisMonth();
+
+    double getProducedThisHour();
+    double getProducedToday();
+    double getProducedThisMonth();
+
+    double getCostThisHour();
     double getCostToday();
     double getCostYesterday();
-    double getUseThisMonth();
     double getCostThisMonth();
     uint16_t getCostLastMonth();
 
@@ -66,6 +71,7 @@ private:
     Timezone *tz = NULL;
     uint8_t currentHour = 0, currentDay = 0, currentThresholdIdx = 0;
     double use, costHour, costDay;
+    double produce;
     EnergyAccountingData data = { 0, 0, 0, 0, 0, 0 };
 
     void calcDayCost();

src/mqtt/JsonMqttHandler.cpp

@@ -27,7 +27,9 @@ bool JsonMqttHandler::publish(AmsData* data, AmsData* previousState, EnergyAccou
             ea->getUseThisHour(),
             ea->getUseToday(),
             ea->getCurrentThreshold(),
-            ea->getMonthMax()
+            ea->getMonthMax(),
+            ea->getProducedThisHour(),
+            ea->getProducedToday()
         );
         return mqtt->publish(topic, json);
     } else if(data->getListType() == 2) {
@@ -55,7 +57,9 @@ bool JsonMqttHandler::publish(AmsData* data, AmsData* previousState, EnergyAccou
             ea->getUseThisHour(),
             ea->getUseToday(),
             ea->getCurrentThreshold(),
-            ea->getMonthMax()
+            ea->getMonthMax(),
+            ea->getProducedThisHour(),
+            ea->getProducedToday()
         );
         return mqtt->publish(topic, json);
     } else if(data->getListType() == 3) {
@@ -88,7 +92,9 @@ bool JsonMqttHandler::publish(AmsData* data, AmsData* previousState, EnergyAccou
             ea->getUseThisHour(),
             ea->getUseToday(),
             ea->getCurrentThreshold(),
-            ea->getMonthMax()
+            ea->getMonthMax(),
+            ea->getProducedThisHour(),
+            ea->getProducedToday()
         );
         return mqtt->publish(topic, json);
     } else if(data->getListType() == 4) {
@@ -125,7 +131,9 @@ bool JsonMqttHandler::publish(AmsData* data, AmsData* previousState, EnergyAccou
             ea->getUseThisHour(),
             ea->getUseToday(),
             ea->getCurrentThreshold(),
-            ea->getMonthMax()
+            ea->getMonthMax(),
+            ea->getProducedThisHour(),
+            ea->getProducedToday()
         );
         return mqtt->publish(topic, json);
     }

src/mqtt/RawMqttHandler.cpp

@@ -76,6 +76,8 @@ bool RawMqttHandler::publish(AmsData* data, AmsData* meterState, EnergyAccountin
     mqtt->publish(topic + "/realtime/import/day", String(ea->getUseToday(), 2));
     mqtt->publish(topic + "/realtime/import/threshold", String(ea->getCurrentThreshold(), 10), true, 0);
     mqtt->publish(topic + "/realtime/import/monthmax", String(ea->getMonthMax(), 3), true, 0);
+    mqtt->publish(topic + "/realtime/export/hour", String(ea->getProducedThisHour(), 3));
+    mqtt->publish(topic + "/realtime/export/day", String(ea->getProducedToday(), 2));
     return true;
 }
 

src/web/AmsWebServer.cpp

@@ -747,10 +747,13 @@ void AmsWebServer::dataJson() {
 		ea->getCurrentThreshold(),
 		ea->getUseThisHour(),
 		ea->getCostThisHour(),
+		ea->getProducedThisHour(),
 		ea->getUseToday(),
 		ea->getCostToday(),
+		ea->getProducedToday(),
 		ea->getUseThisMonth(),
 		ea->getCostThisMonth(),
+		ea->getProducedThisMonth(),
 		(uint32_t) time(nullptr)
 	);