Merge pull request #258 from jeremypoulter/jeremypoulter/issue59

Added support for downloading firmware update

Author: glynhudson

platformio.ini

@@ -33,7 +33,7 @@ version = -D BUILD_TAG=4.1.0
 monitor_speed = 115200
 lib_deps =
   bblanchon/[email protected]
-  jeremypoulter/[email protected].16
+  jeremypoulter/[email protected].17
   jeremypoulter/Micro [email protected]
   jeremypoulter/[email protected]
   jeremypoulter/[email protected]
@@ -141,6 +141,7 @@ build_flags =
   -D TX1=27
   -ggdb
 #upload_port = openevse.local
+#upload_protocol = espota
 upload_speed = 2000000
 #upload_protocol = ftdi
 monitor_speed = 115200

src/emoncms.cpp

@@ -23,10 +23,19 @@ const char *post_path = "/input/post?";
 
 static MongooseHttpClient client;
 
+struct EmonCmsClientState {
+  bool connected;
+};
+
 static void emoncms_result(bool success, String message)
 {
   StaticJsonDocument<128> event;
-  
+
+  if(emoncms_connected && success) {
+    // Don't send events if we have already reported success
+    return;
+  }
+
   emoncms_connected = success;
   event["emoncms_connected"] = (int)emoncms_connected;
   event["emoncms_message"] = message.substring(0, 64);
@@ -54,11 +63,17 @@ void emoncms_publish(JsonDocument &data)
     DBUGVAR(url);
     packets_sent++;
 
-    client.get(url, [](MongooseHttpClientResponse *response)
+    auto state = new EmonCmsClientState;
+
+    state->connected = false;
+
+    client.get(url, [state](MongooseHttpClientResponse *response)
     {
       MongooseString result = response->body();
       DBUGF("result = %.*s", result.length(), result.c_str());
 
+      state->connected = true;
+
       const size_t capacity = JSON_OBJECT_SIZE(2) + result.length();
       DynamicJsonDocument doc(capacity);
       if(DeserializationError::Code::Ok == deserializeJson(doc, result.c_str(), result.length()))
@@ -77,12 +92,13 @@ void emoncms_publish(JsonDocument &data)
         DEBUG.printf("%.*s\n", result.length(), (const char *)result);
         emoncms_result(false, result.toString());
       }
-    }, [](MongooseHttpClientResponse *response)
+    }, [state]()
     {
-      DBUGF("onClose %p", response);
-      if(NULL == response) {
+      DBUGF("onClose");
+      if(false == state->connected) {
         emoncms_result(false, String("Failed to connect"));
       }
+      delete state;
     });
   } else {
     if(false != emoncms_connected) {

src/emonesp.h

@@ -161,4 +161,6 @@
 extern String currentfirmware;
 extern String buildenv;
 
+void restart_system();
+
 #endif // _EMONESP_H

src/http_update.cpp

@@ -0,0 +1,132 @@
+#if defined(ENABLE_DEBUG) && !defined(ENABLE_DEBUG_HTTP_UPATE)
+#undef ENABLE_DEBUG
+#endif
+
+#include "http_update.h"
+#include "lcd.h"
+#include "debug.h"
+#include "emonesp.h"
+
+#include <MongooseHttpClient.h>
+#include <Update.h>
+
+MongooseHttpClient client;
+static int lastPercent = -1;
+static size_t update_total_size = 0;
+static size_t update_position = 0;
+
+bool http_update_from_url(String url,
+  std::function<void(size_t complete, size_t total)> progress,
+  std::function<void(int)> success,
+  std::function<void(int)> error)
+{
+  MongooseHttpClientRequest *request = client.beginRequest(url.c_str());
+  if(request)
+  {
+    request->setMethod(HTTP_GET);
+
+    request->onBody([url,progress,error,request](MongooseHttpClientResponse *response)
+    {
+      if(response->respCode() == 200)
+      {
+        size_t total = response->contentLength();
+        DBUGVAR(total);
+        if(Update.isRunning() || http_update_start(url, total))
+        {
+          uint8_t *data = (uint8_t *)response->body().c_str();
+          size_t len = response->body().length();
+          if(http_update_write(data, len))
+          {
+            progress(len, total);
+            return;
+          } else {
+            error(HTTP_UPDATE_ERROR_WRITE_FAILED);
+          }
+        } else {
+          error(HTTP_UPDATE_ERROR_FAILED_TO_START_UPDATE);
+        }
+      } else {
+        error(response->respCode());
+      }
+      request->abort();
+    });
+
+    request->onClose([success, error]()
+    {
+      if(http_update_end())
+      {
+        success(HTTP_UPDATE_OK);
+        restart_system();
+      } else {
+        error(HTTP_UPDATE_ERROR_FAILED_TO_END_UPDATE);
+      }
+    });
+    client.send(request);
+
+    return true;
+  }
+
+  return false;
+}
+
+bool http_update_start(String source, size_t total)
+{
+  update_position = 0;
+  update_total_size = total;
+  if(Update.begin())
+  {
+    DEBUG_PORT.printf("Update Start: %s %zu\n", source.c_str(), total);
+
+    lcd.display(F("Updating WiFi"), 0, 0, 10 * 1000, LCD_CLEAR_LINE | LCD_DISPLAY_NOW);
+    lcd.display(F(""), 0, 1, 10 * 1000, LCD_CLEAR_LINE | LCD_DISPLAY_NOW);
+
+    return true;
+  }
+
+  return false;
+}
+
+bool http_update_write(uint8_t *data, size_t len)
+{
+  DBUGF("Update Writing %u, %u", update_position, len);
+  size_t written = Update.write(data, len);
+  DBUGVAR(written);
+  if(written == len)
+  {
+    update_position += len;
+    if(update_total_size > 0)
+    {
+      int percent = update_position / (update_total_size / 100);
+      DBUGVAR(percent);
+      DBUGVAR(lastPercent);
+      if(percent != lastPercent)
+      {
+        String text = String(percent) + F("%");
+        lcd.display(text, 0, 1, 10 * 1000, LCD_DISPLAY_NOW);
+
+        DEBUG_PORT.printf("Update: %d%%\n", percent);
+        lastPercent = percent;
+      }
+    }
+
+    return true;
+  }
+
+  return false;
+}
+
+bool http_update_end()
+{
+  DBUGLN("Upload finished");
+  if(Update.end(true))
+  {
+    DBUGF("Update Success: %u", update_position);
+    lcd.display(F("Complete"), 0, 1, 10 * 1000, LCD_CLEAR_LINE | LCD_DISPLAY_NOW);
+    return true;
+  } else {
+    DBUGF("Update failed: %d", Update.getError());
+    lcd.display(F("Error"), 0, 1, 10 * 1000, LCD_CLEAR_LINE | LCD_DISPLAY_NOW);
+  }
+
+  return false;
+}

src/http_update.h

@@ -0,0 +1,26 @@
+#ifndef _HTTP_UPDATE_H
+#define _HTTP_UPDATE_H
+
+// -------------------------------------------------------------------
+// Support for updating the fitmware os the ESP8266
+// -------------------------------------------------------------------
+
+#include <Arduino.h>
+#include <functional>
+
+#define HTTP_UPDATE_ERROR_FAILED_TO_START_UPDATE      -1
+#define HTTP_UPDATE_ERROR_WRITE_FAILED                -2
+#define HTTP_UPDATE_ERROR_FAILED_TO_END_UPDATE        -3
+
+#define HTTP_UPDATE_OK                                 0
+
+bool http_update_from_url(String url,
+  std::function<void(size_t complete, size_t total)> progress,
+  std::function<void(int)> success,
+  std::function<void(int)> error);
+
+bool http_update_start(String source, size_t total);
+bool http_update_write(uint8_t *data, size_t len);
+bool http_update_end();
+
+#endif // _HTTP_UPDATE_H

src/main.cpp

@@ -256,3 +256,19 @@ void hardware_setup()
 
   enableLoopWDT();
 }
+
+class SystemRestart : public MicroTasks::Alarm
+{
+  public:
+    void Trigger()
+    {
+      DBUGLN("Restarting...");
+      net_wifi_disconnect();
+      ESPAL.reset();
+    }
+} systemRestartAlarm;
+
+void restart_system()
+{
+  systemRestartAlarm.Set(1000, false);
+}

src/ota.cpp

@@ -8,7 +8,7 @@
 #include "lcd.h"
 #include "app_config.h"
 
-static int lastPercent = -1;
+static int last_percent = -1;
 
 void ota_setup()
 {
@@ -26,12 +26,12 @@ void ota_setup()
 
   ArduinoOTA.onProgress([](unsigned int progress, unsigned int total) {
     int percent = progress / (total / 100);
-    if (percent != lastPercent)
+    if (percent != last_percent)
     {
       DBUGF("ArduinoOTA progress %d%%", percent);
       String text = String(percent) + F("%");
       lcd.display(text, 0, 1, 10 * 1000, LCD_DISPLAY_NOW);
-      lastPercent = percent;
+      last_percent = percent;
       feedLoopWDT();
     }
   });