### v2.1.0 (2017-11-10)

  * Added + tested support for ESP32
  * Improved display messages

Author: Jeroen Vermeulen

.gitignore

@@ -1,4 +1,4 @@
 .DS_Store
 *~
-Icon
+Icon?
 /.idea

CHANGELOG.md

@@ -1,15 +1,20 @@
-### 2.0.1 (2017-11-10)
+### v2.1.0 (2017-11-10)
+
+  * Added + tested support for ESP32
+  * Improved display messages
+
+### v2.0.1 (2017-11-10)
 
   * Added installation instructions to README.md
   * Added problem solving instructions
 
-### 2.0.0 (2017-11-10)
+### v2.0.0 (2017-11-10)
 
   * Renamed from JV_OTA to JeVe_EasyOTA
   * Improved OTA_U8g2 example
   * Added README and CHANGELOG
 
-### 1.0.0 (2017-11-18)
+### v1.0.0 (2017-11-18)
 
   * First working version
   * Added U8g2 example

JeVe_EasyOTA.cpp

@@ -1,11 +1,12 @@
 /*
- * EasyOTA.cpp - library to include to allow Over-The-Air updates of ESP8266
+ * EasyOTA.cpp - library to include to allow Over-The-Air updates of ESP8266 and ESP32
  *
  * Inspired on:
  *    http://simplestuffmatters.com/?p=69
  *    https://github.com/esp8266/Arduino/tree/master/libraries/ESP8266mDNS/examples/OTA-mDNS-SPIFFS
+ *    https://github.com/espressif/arduino-esp32/blob/master/libraries/ArduinoOTA/examples/BasicOTA/BasicOTA.ino
  *
- *  mDNS monitor (OSX):  dns-sd -B _arduino._tcp .
+ *  mDNS monitor (OSX):  dns-sd -B _arduino._tcp
  *
  */
 
@@ -14,61 +15,65 @@
 //Necesary to make Arduino Software autodetect OTA device
 WiFiServer TelnetServer(8266);
 
+// Constructor
 EasyOTA::EasyOTA() {
-  // Constructor
 }
 
 void EasyOTA::onMessage(THandlerFunction_Message fn) {
   on_message = fn;
 }
 
 void EasyOTA::setup(char* wifi_ssid, char* wifi_password, char* hostname) {
-  this->wifi_ssid = wifi_ssid;
-  this->wifi_password = wifi_password;
-  this->hostname = hostname;
   showMessage("", 1); // New line in case of using serial output
-  showMessage("Connecting Wifi:", 1);
-  showMessage(this->wifi_ssid, 2);
-  WiFi.hostname(this->hostname);
-  WiFi.begin(this->wifi_ssid, this->wifi_password);
+  String line1 = "Connect WiFi";
+  showMessage(line1, 1);
+  showMessage("SSID: " + String(wifi_ssid), 2);
+
+  WiFi.mode(WIFI_STA);
+  #ifdef ESP8266
+  WiFi.hostname(hostname);
+  #endif
+  #ifdef ESP32
+  WiFi.setHostname(hostname);
+  #endif
+
+  WiFi.begin(wifi_ssid, wifi_password);
   unsigned long startTime = millis();
   String progressDots = "";
   while (WiFi.status() != WL_CONNECTED && millis() - startTime < 10000) {
-    delay(500);
-    progressDots += ".";
-    showMessage(progressDots, 2);
+    delay(1000);
+    line1 += ".";
+    showMessage(line1, 1);
   }
-
   if (WiFi.status() == WL_CONNECTED) {
-    showMessage("IP Address:", 1);
-    showMessage(WiFi.localIP().toString(), 2);
+    showMessage("IP: " + WiFi.localIP().toString(), 1);
   } else {
     showMessage("Can't connect WiFi", 1);
     showMessage("Going into AP mode.", 2);
     WiFi.mode(WIFI_AP);
-    delay(10);
-    WiFi.softAP(this->hostname);
-    showMessage("AP: " + String(this->hostname), 1);
+    delay(500); // Extra delay to show message when using LCD / Oled
+    WiFi.softAP(hostname);
+    showMessage("AP: " + String(hostname), 1);
     showMessage("IP: " + WiFi.softAPIP().toString(), 2);
   }
 
   TelnetServer.begin();  // Necesary to make Arduino Software autodetect OTA device
 
+  // ArduinoOTA callback functions
   ArduinoOTA.onStart([this]() {
-    showMessage("OTA starting...", 1);
-    showMessage("", 2);  // If display: Clean any previous error
+    showMessage("OTA starting...", 2);
   });
   ArduinoOTA.onEnd([this]() {
-    showMessage("OTA finished.",1);
-    showMessage("Rebooting...",2);
+    showMessage("OTA done. Rebooting..",2);
+    //showMessage("Rebooting...",2);
   });
   ArduinoOTA.onProgress([this](unsigned int progress, unsigned int total) {
     static unsigned int prevPerc = 100;
     unsigned int perc = (progress / (total / 100));
     unsigned int roundPerc = 5 * (int)(perc / 5);
     if ( roundPerc != prevPerc) {
       prevPerc = roundPerc;
-      showMessage("OTA upload " + String(roundPerc) + "%");
+      showMessage("OTA upload " + String(roundPerc) + "%", 2);
     }
   });
   ArduinoOTA.onError([this](ota_error_t error) {
@@ -81,7 +86,8 @@ void EasyOTA::setup(char* wifi_ssid, char* wifi_password, char* hostname) {
     else if (error == OTA_END_ERROR)     line2 = "End Failed";
     showMessage(line2, 2);
   });
-  ArduinoOTA.setHostname(this->hostname);
+
+  ArduinoOTA.setHostname(hostname);
   ArduinoOTA.begin();
 };
 

JeVe_EasyOTA.h

@@ -1,36 +1,42 @@
 /*
- * JeVe_EasyOTA.h - library to include to allow Over-The-Air updates of ESP8266
+ * JeVe_EasyOTA.h - library to include to allow Over-The-Air updates of ESP8266 and ESP32
  *
  * Inspired on:
  *    http://simplestuffmatters.com/?p=69
  *    https://github.com/esp8266/Arduino/tree/master/libraries/ESP8266mDNS/examples/OTA-mDNS-SPIFFS
+ *    https://github.com/espressif/arduino-esp32/blob/master/libraries/ArduinoOTA/examples/BasicOTA/BasicOTA.ino
  *
- *  mDNS monitor (OSX):  dns-sd -B _arduino._tcp .
+ *  mDNS monitor (OSX):  dns-sd -B _arduino._tcp
  *
  */
 
 #ifndef EasyOTA_h
 #define EasyOTA_h
 
+#ifdef ESP8266
 #include <ESP8266WiFi.h>  // https://github.com/esp8266/Arduino/blob/master/libraries/ESP8266WiFi/src/ESP8266WiFi.h
 #include <ESP8266mDNS.h>  // https://github.com/esp8266/Arduino/blob/master/libraries/ESP8266mDNS/ESP8266mDNS.h
+#endif
+
+#ifdef ESP32
+#include <WiFi.h>         // https://github.com/espressif/arduino-esp32/blob/master/libraries/WiFi/src/WiFi.h
+#include <ESPmDNS.h>      // https://github.com/espressif/arduino-esp32/blob/master/libraries/ESPmDNS/src/ESPmDNS.h
+#endif
+
 #include <WiFiUdp.h>      // https://github.com/esp8266/Arduino/blob/master/libraries/ESP8266WiFi/src/WiFiUdp.h
 #include <ArduinoOTA.h>   // https://github.com/esp8266/Arduino/blob/master/libraries/ArduinoOTA/ArduinoOTA.h
 
+
 class EasyOTA
 {
   public:
     typedef std::function<void(char *message, int line)> THandlerFunction_Message;
-
     EasyOTA();
     void setup(char* wifi_ssid, char* wifi_password = "", char* hostname = "");
     void loop();
     void onMessage(THandlerFunction_Message fn);
 
   private:
-    char*  wifi_ssid;
-    char*  wifi_password;
-    char*  hostname;
     THandlerFunction_Message on_message;
     void showMessage(char *message, int line=1);
     void showMessage(String message, int line=1);

README.md

@@ -1,6 +1,10 @@
 JeVe_EasyOTA library for Arduino
 ================================
 
+# Purpose
+
+Library which makes it easy to add support for OTA updates to your project. Works with ESP8266 and ESP32.
+
 # Installation
 
 ## Install as ZIP
@@ -57,3 +61,5 @@ That's all folks.
 * Check if the port is found using console (OSX): `dns-sd -B _arduino._tcp`
 * Try to restart the Arduino, wait 5 minutes, check if the _Network port_ shows up
 * Try to restart your Arduino IDE, wait 5 minutes, check if the _Network port_ shows up
+* On Windows 8.1 or older, mDNS does may not work, or only when you install Bonjour.
+* Your may need op open 'mDNS' on your firewall: UDP port 5353

examples/OTA_U8g2/OTA_U8g2.ino

@@ -46,10 +46,10 @@ void displayLine(char *message, int line) {
 }
 
 void heartBeat() {
-  static int prevMillis = 0;
-  static int dotState = 0;
+  static long prevMillis = 0;
+  static bool dotState = 0;
   static char sign[2] = {0xB7, 0x0};
-  int curMillis = millis();
+  long curMillis = millis();
   if ( curMillis - prevMillis > 500 ) {
     prevMillis = curMillis;
     dotState = !dotState;

library.properties

@@ -1,9 +1,9 @@
 name=JeVe_EasyOTA
-version=2.0.1
+version=2.1.0
 author=jeroenvermeulen <[email protected]>
 maintainer=jeroenvermeulen <[email protected]>
 sentence=Easy include OTA Updates
-paragraph=Library which makes it easy to add support for OTA updates to your project. Tested with ESP8266.
+paragraph=Library which makes it easy to add support for OTA updates to your project. Works with ESP8266 and ESP32.
 category=Communication
 url=https://github.com/jeroenvermeulen/JeVe_EasyOTA
 architectures=*