add ArduinoOTA to ESP32 builds. although neither it nor the old SimpleUpdater work on the Heltec Lora32 devices. TODO.

include/SimpleUpdater.h

@@ -29,21 +29,22 @@ class SimpleUpdater {
 public:
     SimpleUpdater(String _uri = String("/update"));
     void setup(UPDATE_WEB_SERVER *_server);
-    
+    void run(void);
+
 private:
 
 #if defined(ARDUINO_ARCH_ESP8266)
-    
+
     ESP8266HTTPUpdateServer updateServer;
 
 #elif defined(ARDUINO_ARCH_ESP32)
-    
+
     void get(void);
     void postResult(void);
     void postUpload(void);
-    
+
 #endif
-    
+
     String uri;
     UPDATE_WEB_SERVER *server;
 };

platformio.ini

@@ -67,6 +67,9 @@ board = heltec_wifi_lora_32_V3
 framework = arduino
 upload_protocol = esptool
 upload_port = /dev/ttyUSB2
+# TODO neither web ota nor arduino ota work on heltec esp32?!
+#upload_protocol = espota
+#upload_port = lora-testing
 monitor_port = /dev/ttyUSB2
 monitor_speed = 115200
 extra_scripts = pre:extra_script.py

src/SimpleUpdater.cpp

@@ -15,6 +15,7 @@
 #include <ESP8266HTTPUpdateServer.h>
 #elif defined(ARDUINO_ARCH_ESP32)
 #include <Update.h>
+#include <ArduinoOTA.h>
 #endif
 
 #include "config.h"
@@ -148,6 +149,42 @@ void SimpleUpdater::setup(UPDATE_WEB_SERVER *_server) {
         get();
     });
 
+    ArduinoOTA.setMdnsEnabled(false);
+
+    ArduinoOTA.onStart([]() {
+        String type;
+        if (ArduinoOTA.getCommand() == U_FLASH) {
+            type = "sketch";
+        } else {  // U_SPIFFS
+            type = "filesystem";
+        }
+
+        // NOTE: if updating SPIFFS this would be the place to unmount SPIFFS using SPIFFS.end()
+        Serial.println("Start updating " + type);
+    })
+    .onEnd([]() {
+        Serial.println("\nEnd");
+    })
+    .onProgress([](unsigned int progress, unsigned int total) {
+        Serial.printf("Progress: %u%%\r", (progress / (total / 100)));
+    })
+    .onError([](ota_error_t error) {
+        Serial.printf("Error[%u]: ", error);
+        if (error == OTA_AUTH_ERROR) {
+            Serial.println("Auth Failed");
+        } else if (error == OTA_BEGIN_ERROR) {
+            Serial.println("Begin Failed");
+        } else if (error == OTA_CONNECT_ERROR) {
+            Serial.println("Connect Failed");
+        } else if (error == OTA_RECEIVE_ERROR) {
+            Serial.println("Receive Failed");
+        } else if (error == OTA_END_ERROR) {
+            Serial.println("End Failed");
+        }
+    });
+
+    ArduinoOTA.begin();
+
 #endif
 }
 
@@ -156,4 +193,10 @@ SimpleUpdater::SimpleUpdater(String _uri) {
     server = NULL;
 }
 
+void SimpleUpdater::run(void) {
+#ifdef ARDUINO_ARCH_ESP32
+    ArduinoOTA.handle();
+#endif
+}
+
 #endif

src/main.cpp

@@ -133,6 +133,10 @@ void setup() {
 #endif // FEATURE_UI
     }
     debug.println(F("\nWiFi connected!"));
+
+    debug.printf("IP: %s\n", WiFi.localIP().toString().c_str());
+    debug.printf("Hostname: %s\n", hostname.c_str());
+
 #ifdef FEATURE_UI
     ui_progress(UI_WIFI_CONNECTED);
 #endif // FEATURE_UI
@@ -183,6 +187,10 @@ void setup() {
 #endif // FEATURE_UI
     }
     debug.println(F("\nWiFi connected!"));
+
+    debug.printf("IP: %s\n", WiFi.localIP().toString().c_str());
+    debug.printf("Hostname: %s\n", hostname.c_str());
+
 #ifdef FEATURE_UI
     ui_progress(UI_WIFI_CONNECTED);
 #endif // FEATURE_UI

src/servers.cpp

@@ -207,10 +207,11 @@ static void http_server() {
 static void handleServers() {
 #if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
     server.handleClient();
+    updater.run();
 #else
     http_server();
 #endif
-    
+
 #if defined(ARDUINO_ARCH_ESP8266)
     MDNS.update();
 #endif