Added month max to mqtt

src/mqtt/JsonMqttHandler.cpp

@@ -24,7 +24,8 @@ bool JsonMqttHandler::publish(AmsData* data, AmsData* previousState, EnergyAccou
             data->getActiveImportPower(),
             ea->getUseThisHour(),
             ea->getUseToday(),
-            ea->getCurrentThreshold()
+            ea->getCurrentThreshold(),
+            ea->getMonthMax()
         );
         return mqtt->publish(topic, json);
     } else if(data->getListType() == 2) {
@@ -51,7 +52,8 @@ bool JsonMqttHandler::publish(AmsData* data, AmsData* previousState, EnergyAccou
             data->getL3Voltage(),
             ea->getUseThisHour(),
             ea->getUseToday(),
-            ea->getCurrentThreshold()
+            ea->getCurrentThreshold(),
+            ea->getMonthMax()
         );
         return mqtt->publish(topic, json);
     } else if(data->getListType() == 3) {
@@ -83,7 +85,8 @@ bool JsonMqttHandler::publish(AmsData* data, AmsData* previousState, EnergyAccou
             data->getMeterTimestamp(),
             ea->getUseThisHour(),
             ea->getUseToday(),
-            ea->getCurrentThreshold()
+            ea->getCurrentThreshold(),
+            ea->getMonthMax()
         );
         return mqtt->publish(topic, json);
     } else if(data->getListType() == 4) {
@@ -119,7 +122,8 @@ bool JsonMqttHandler::publish(AmsData* data, AmsData* previousState, EnergyAccou
             data->getMeterTimestamp(),
             ea->getUseThisHour(),
             ea->getUseToday(),
-            ea->getCurrentThreshold()
+            ea->getCurrentThreshold(),
+            ea->getMonthMax()
         );
         return mqtt->publish(topic, json);
     }

src/mqtt/RawMqttHandler.cpp

@@ -75,6 +75,7 @@ bool RawMqttHandler::publish(AmsData* data, AmsData* meterState, EnergyAccountin
     mqtt->publish(topic + "/realtime/import/hour", String(ea->getUseThisHour(), 3));
     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);
     return true;
 }
 

web/json1.json

@@ -12,6 +12,7 @@
     "realtime" : {
         "h" : %.2f,
         "d" : %.1f,
-        "t" : %d
+        "t" : %d,
+        "x" : %.2f
     }
 }

web/json2.json

@@ -24,6 +24,7 @@
     "realtime" : {
         "h" : %.2f,
         "d" : %.1f,
-        "t" : %d
+        "t" : %d,
+        "x" : %.2f
     }
 }

web/json3.json

@@ -29,6 +29,7 @@
     "realtime" : {
         "h" : %.2f,
         "d" : %.1f,
-        "t" : %d
+        "t" : %d,
+        "x" : %.2f
     }
 }

web/json4.json

@@ -33,6 +33,7 @@
     "realtime" : {
         "h" : %.2f,
         "d" : %.1f,
-        "t" : %d
+        "t" : %d,
+        "x" : %.2f
     }
 }