Merge pull request #84 from OpenEVSE/emoncms_config_feedback

Immediately post to the EmonCMS server when config changes.

Author: glynhudson

gui

@@ -34,7 +34,7 @@ version = -DBUILD_TAG=3.2.0
 monitor_speed = 115200
 lib_deps =
   [email protected]
-  [email protected].12
+  [email protected].13
   Micro [email protected]
   [email protected]
   [email protected]

platformio.ini

@@ -3,6 +3,8 @@
 #include "divert.h"
 #include "mqtt.h"
 #include "tesla_client.h"
+#include "emoncms.h"
+#include "input.h"
 
 #include "app_config.h"
 #include "app_config_mqtt.h"
@@ -173,8 +175,13 @@ void config_changed(String name)
     if(mqtt_connected() != config_mqtt_enabled()) {
       mqtt_restart();
     }
+    if(emoncms_connected != config_emoncms_enabled()) {
+      emoncms_updated = true;
+    }
   } else if(name.startsWith("mqtt_")) {
     mqtt_restart();
+  } else if(name.startsWith("emoncms_")) {
+    emoncms_updated = true;
   } else if(name == "divert_enabled" || name == "charge_mode") {
     DBUGVAR(config_divert_enabled());
     DBUGVAR(config_charge_mode());

src/app_config.cpp

@@ -11,8 +11,10 @@
 #include "emoncms.h"
 #include "app_config.h"
 #include "input.h"
+#include "event.h"
 
 boolean emoncms_connected = false;
+boolean emoncms_updated = false;
 
 unsigned long packets_sent = 0;
 unsigned long packets_success = 0;
@@ -21,11 +23,21 @@ const char *post_path = "/input/post?";
 
 static MongooseHttpClient client;
 
+static void emoncms_result(bool success, String message)
+{
+  StaticJsonDocument<128> event;
+  
+  emoncms_connected = success;
+  event["emoncms_connected"] = (int)emoncms_connected;
+  event["emoncms_message"] = message.substring(0, 64);
+  event_send(event);
+}
+
 void emoncms_publish(JsonDocument &data)
 {
   Profile_Start(emoncms_publish);
 
-  if (emoncms_apikey != 0)
+  if (config_emoncms_enabled() && emoncms_apikey != 0)
   {
     String url = emoncms_server + post_path;
     String json;
@@ -47,23 +59,33 @@ void emoncms_publish(JsonDocument &data)
       MongooseString result = response->body();
       DBUGF("result = %.*s", result.length(), result.c_str());
 
-      StaticJsonDocument<32> doc;
+      const size_t capacity = JSON_OBJECT_SIZE(2) + result.length();
+      DynamicJsonDocument doc(capacity);
       if(DeserializationError::Code::Ok == deserializeJson(doc, result.c_str(), result.length()))
       {
+        DBUGLN("Got JSON");
         bool success = doc["success"]; // true
         if(success) {
           packets_success++;
-          emoncms_connected = true;
         }
+        emoncms_result(success, doc["message"]);
       } else if (result == "ok") {
         packets_success++;
-        emoncms_connected = true;
+        emoncms_result(true, result);
       } else {
-        emoncms_connected = false;
         DEBUG.print("Emoncms error: ");
         DEBUG.printf("%.*s\n", result.length(), (const char *)result);
+        emoncms_result(false, result.toString());
+      }
+    }, [](MongooseHttpClientResponse *response)
+    {
+      DBUGF("onClose %p", response);
+      if(NULL == response) {
+        emoncms_result(false, String("Failed to connect"));
       }
     });
+  } else {
+    emoncms_result(false, String("Disabled"));
   }
 
   Profile_End(emoncms_publish, 10);

src/emoncms.cpp

@@ -9,6 +9,8 @@
 // -------------------------------------------------------------------
 
 extern boolean emoncms_connected;
+extern boolean emoncms_updated;
+
 extern unsigned long packets_sent;
 extern unsigned long packets_success;
 

src/emoncms.h

@@ -102,6 +102,7 @@ void create_rapi_json(JsonDocument &doc)
   doc["state"] = state;
   doc["freeram"] = ESPAL.getFreeHeap();
   doc["divertmode"] = divertmode;
+  doc["srssi"] = WiFi.RSSI();
 }
 
 // -------------------------------------------------------------------

src/input.cpp

@@ -193,9 +193,7 @@ loop() {
         DynamicJsonDocument data(4096);
         create_rapi_json(data); // create JSON Strings for EmonCMS and MQTT
 
-        if (config_emoncms_enabled()) {
-          emoncms_publish(data);
-        }
+        emoncms_publish(data);
 
         teslaClient.getChargeInfoJson(data);
         event_send(data);
@@ -207,6 +205,15 @@ loop() {
 
       Timer1 = millis();
     }
+
+    if(emoncms_updated)
+    {
+      // Send the current state to check the config
+      DynamicJsonDocument data(4096);
+      create_rapi_json(data);
+      emoncms_publish(data);
+      emoncms_updated = false;
+    }
   } // end WiFi connected
 
   Profile_End(loop, 10);

src/main.cpp

@@ -568,7 +568,7 @@ handleStatus(MongooseHttpServerRequest *request) {
   doc["srssi"] = WiFi.RSSI();
   doc["ipaddress"] = ipaddress;
 
-  doc["emoncms_connected"] = emoncms_connected;
+  doc["emoncms_connected"] = (int)emoncms_connected;
   doc["packets_sent"] = packets_sent;
   doc["packets_success"] = packets_success;
 

src/web_server.cpp

@@ -4,7 +4,7 @@ static const char CONTENT_HOME_HTML[] PROGMEM =
   "                  optionsText: function(item) {\n"
   "                    return item + '://'\n"
   "                  },\n"
-  "                  value: emoncms_protocol\"></select> <input type=\"text\" autocapitalize=\"none\" data-bind=\"textInput: emoncms_server\"> </div> <div class=\"small-text\">e.g: <a href=\"https://data.openevse.com/emoncms\">data.openevse.com/emoncms</a>, <a href=\"https://emoncms.org\">emoncms.org</a>, <a href=\"http://emonpi/emoncms\">emonpi/emoncms</a> </div> </div> <p data-bind=\"visible: config.emoncms_enabled\"> <b>Emoncms Node*:</b><br> <input type=\"text\" autocapitalize=\"none\" data-bind=\"textInput: config.emoncms_node\"> </p> <p data-bind=\"visible: config.emoncms_enabled\"> <b>Emoncms write-apikey*:</b><br> <input type=\"password\" autocapitalize=\"none\" data-bind=\"textInput: emoncmsApiKey.value, attr: { type: emoncmsApiKey.show() ? 'text' : 'password' }\"><br> <span> <input id=\"emoncmsApiKey\" type=\"checkbox\" data-bind=\"checked: emoncmsApiKey.show\"> <label for=\"emoncmsApiKey\">Show password</label> </span> </p> <p data-bind=\"visible: config.emoncms_enabled && config.http_supported_protocols().length === 0\"> <b>Emoncms SSL SHA-1 Fingerprint (optional):</b><br> <input type=\"text\" autocapitalize=\"none\" data-bind=\"textInput: config.emoncms_fingerprint\"><br> <br><span class=\"small-text\">HTTPS will be enabled if present e.g:</span> <span class=\"small-text\"> 7D:82:15:BE:D7:BC:72:58:87:7D:8E:40:D4:80:BA:1A:9F:8B:8D:DA </span> </p> <p> <button data-bind=\"click: saveEmonCms, text: (saveEmonCmsFetching() ? 'Saving' : (saveEmonCmsSuccess() ? 'Saved' : 'Save')), disable: saveEmonCmsFetching\">Save</button> <span data-bind=\"visible: config.emoncms_enabled\"><b>&nbsp; Connected:&nbsp;<span data-bind=\"text: 1 === status.emoncms_connected() ? 'Yes' : 'No'\"></span></b></span> <span data-bind=\"visible: config.emoncms_enabled() &amp;&amp; 1 === status.emoncms_connected()\"><b>&nbsp; Successful posts:&nbsp;<span data-bind=\"text: status.packets_success\"></span></b></span> </p> </div> <div class=\"box380 right\"> <h2>MQTT</h2> <p> <input type=\"checkbox\" id=\"mqtt_enabled\" data-bind=\"checked: config.mqtt_enabled\"> <label for=\"mqtt_enabled\"><b>Enable MQTT</b></label> <span class=\"info\" data-bind=\"click: toggle.bind($data, showMqttInfo)\"></span> </p> <div class=\"box\" data-bind=\"visible: showMqttInfo\"> <div> Status published to:<br> <span class=\"small-text\">{base-topic}/{status} value</span><br> <span class=\"small-text\">e.g. <span data-bind=\"text: '' !== config.mqtt_topic() ? config.mqtt_topic() : 'openevse'\"></span>/amp 16</span><br> </div> <p> RAPI control subscribes to:<br> <span class=\"small-text\">{base-topic}/rapi/in/{command} value</span><br> <span class=\"small-text\">e.g. <span data-bind=\"text: '' !== config.mqtt_topic() ? config.mqtt_topic() : 'openevse'\"></span>/rapi/in/$SC 16</span><br> <span class=\"small-text\">e.g. <span data-bind=\"text: '' !== config.mqtt_topic() ? config.mqtt_topic() : 'openevse'\"></span>/rapi/in/$GC</span><br> </p> <p> RAPI response published to:<br> <span class=\"small-text\">{base-topic}/rapi/out response</span><br> <span class=\"small-text\">e.g. <span data-bind=\"text: '' !== config.mqtt_topic() ? config.mqtt_topic() : 'openevse'\"></span>/rapi/out $OK 6 32</span><br> </p> </div> <div data-bind=\"visible: config.mqtt_enabled\"> <b>Host*:</b><br> <div data-bind=\"css: { protocol: config.mqtt_supported_protocols().length > 0 }\"> <select data-bind=\"visible: config.mqtt_protocol_enable,\n"
+  "                  value: emoncms_protocol\"></select> <input type=\"text\" autocapitalize=\"none\" data-bind=\"textInput: emoncms_server\"> </div> <div class=\"small-text\">e.g: <a href=\"https://data.openevse.com/emoncms\">data.openevse.com/emoncms</a>, <a href=\"https://emoncms.org\">emoncms.org</a>, <a href=\"http://emonpi/emoncms\">emonpi/emoncms</a> </div> </div> <p data-bind=\"visible: config.emoncms_enabled\"> <b>Emoncms Node*:</b><br> <input type=\"text\" autocapitalize=\"none\" data-bind=\"textInput: config.emoncms_node\"> </p> <p data-bind=\"visible: config.emoncms_enabled\"> <b>Emoncms write-apikey*:</b><br> <input type=\"password\" autocapitalize=\"none\" data-bind=\"textInput: emoncmsApiKey.value, attr: { type: emoncmsApiKey.show() ? 'text' : 'password' }\"><br> <span> <input id=\"emoncmsApiKey\" type=\"checkbox\" data-bind=\"checked: emoncmsApiKey.show\"> <label for=\"emoncmsApiKey\">Show password</label> </span> </p> <p data-bind=\"visible: config.emoncms_enabled && config.http_supported_protocols().length === 0\"> <b>Emoncms SSL SHA-1 Fingerprint (optional):</b><br> <input type=\"text\" autocapitalize=\"none\" data-bind=\"textInput: config.emoncms_fingerprint\"><br> <br><span class=\"small-text\">HTTPS will be enabled if present e.g:</span> <span class=\"small-text\"> 7D:82:15:BE:D7:BC:72:58:87:7D:8E:40:D4:80:BA:1A:9F:8B:8D:DA </span> </p> <p> <button data-bind=\"click: saveEmonCms, text: (saveEmonCmsFetching() ? 'Saving' : (saveEmonCmsSuccess() ? 'Saved' : 'Save')), disable: saveEmonCmsFetching\">Save</button> <span data-bind=\"visible: config.emoncms_enabled\"><b>&nbsp; Connected:&nbsp;<span data-bind=\"text: 1 === status.emoncms_connected() ? 'Yes' : 'No'\"></span></b></span> <span data-bind=\"visible: config.emoncms_enabled() &amp;&amp; 1 === status.emoncms_connected()\"><b>&nbsp; Successful posts:&nbsp;<span data-bind=\"text: status.packets_success\"></span></b></span> </p> <p data-bind=\"visible: config.emoncms_enabled() &amp;&amp; 0 === status.emoncms_connected() &amp;&amp; false !== status.emoncms_message(), text: status.emoncms_message\"></p> </div> <div class=\"box380 right\"> <h2>MQTT</h2> <p> <input type=\"checkbox\" id=\"mqtt_enabled\" data-bind=\"checked: config.mqtt_enabled\"> <label for=\"mqtt_enabled\"><b>Enable MQTT</b></label> <span class=\"info\" data-bind=\"click: toggle.bind($data, showMqttInfo)\"></span> </p> <div class=\"box\" data-bind=\"visible: showMqttInfo\"> <div> Status published to:<br> <span class=\"small-text\">{base-topic}/{status} value</span><br> <span class=\"small-text\">e.g. <span data-bind=\"text: '' !== config.mqtt_topic() ? config.mqtt_topic() : 'openevse'\"></span>/amp 16</span><br> </div> <p> RAPI control subscribes to:<br> <span class=\"small-text\">{base-topic}/rapi/in/{command} value</span><br> <span class=\"small-text\">e.g. <span data-bind=\"text: '' !== config.mqtt_topic() ? config.mqtt_topic() : 'openevse'\"></span>/rapi/in/$SC 16</span><br> <span class=\"small-text\">e.g. <span data-bind=\"text: '' !== config.mqtt_topic() ? config.mqtt_topic() : 'openevse'\"></span>/rapi/in/$GC</span><br> </p> <p> RAPI response published to:<br> <span class=\"small-text\">{base-topic}/rapi/out response</span><br> <span class=\"small-text\">e.g. <span data-bind=\"text: '' !== config.mqtt_topic() ? config.mqtt_topic() : 'openevse'\"></span>/rapi/out $OK 6 32</span><br> </p> </div> <div data-bind=\"visible: config.mqtt_enabled\"> <b>Host*:</b><br> <div data-bind=\"css: { protocol: config.mqtt_supported_protocols().length > 0 }\"> <select data-bind=\"visible: config.mqtt_protocol_enable,\n"
   "                                    options: config.mqtt_supported_protocols,\n"
   "                                    optionsText: function(item) {\n"
   "                                      return item + '://'\n"