Enabled OTA uploading, ditched mDns lib because ArduinoOta hanldes it

Author: simonjamain

README.md

@@ -9,13 +9,16 @@ The hardware provides all the electronics needed and allows different boards to
 ## the current team
 The team is composed of a programmer ([Simon](https://github.com/simonjamain)) and two electronitians (Romain & Marcellin), all french airsofters.
 
-## installation
+## installation and build
 - Install platformio
 - "open" the project
 - for building the ui (mandatory) :
   - install node.js
   - inside the `ui` folder, run `npm install`
   - *Note : `ui.h` is recompiled by running the command `npm run build` inside the `ui` folder. this is done automaticaly before each platformio build (see platformio.ini and build_ui.py)*
+- OTA upload is enabled by default, if your board hasnt ota enabled or you want to upload with serial, uncomment that following parameters in `platformio.ini`
+  - `upload_protocol`
+  - `upload_port`
 - I think thats about it...
 
 ## hardware

platformio.ini

@@ -11,8 +11,12 @@
 [env:esp32doit-devkit-v1]
 platform = espressif32
 board = esp32doit-devkit-v1
-upload_speed = 921600
 monitor_speed = 115200
+upload_speed = 921600
+; comment line below for serial upload
+upload_protocol = espota
+; comment line below for serial upload
+upload_port = openmosfet.local
 framework = arduino
 build_flags =
 	-D DEBUG

src/config.h

@@ -8,15 +8,12 @@
 //---------- X : Global default parameters ---------------------------------------------------------------------------------------
 
 #define OM_CONFIGFILE_NAME "/cfg.json"
-#define OM_DEFAULT_APSSID "OpenMosfet"//Note : must be [OM_WIFI_SSID_MIN_SIZE-OM_WIFI_SSID_MAX_SIZE] character (exluding '\0') in order to work
-#define OM_DEFAULT_APP_PASSWD  "password"//Note : must be [OM_WIFI_PSSWD_MIN_SIZE-OM_WIFI_PSSWD_MAX_SIZE] character (exluding '\0') in order to work
-//#define OM_DEFAULT_APSSID {'o','p','e','n','M','o','s','f','e','t','\0'}//Note : must be [8-32] character (exluding '\0') in order to work
-//#define OM_DEFAULT_APP_PASSWD  {'p','a','s','s','w','o','r','d','\0'}//Note : must be [8-16] character (exluding '\0') in order to work
+#define OM_DEFAULT_APSSID "OpenMosfet"//Note : must be [OM_WIFI_SSID_MIN_SIZE-OM_WIFI_SSID_MAX_SIZE] character  in order to work
+#define OM_DEFAULT_APP_PASSWD  "password"//Note : must be [OM_WIFI_PSSWD_MIN_SIZE-OM_WIFI_PSSWD_MAX_SIZE] character in order to work
 
 #define OM_DEFAULT_AVAILABLE_NETWORK_APSSID "externalssid"//Note : must be [OM_WIFI_SSID_MIN_SIZE-OM_WIFI_SSID_MAX_SIZE] character (exluding '\0') in order to work
 #define OM_DEFAULT_AVAILABLE_NETWORK_APP_PASSWD  "externalpassword"//Note : must be [OM_WIFI_PSSWD_MIN_SIZE-OM_WIFI_PSSWD_MAX_SIZE] character (exluding '\0') in order to work
 
-
 #define OM_DEFAULT_WIFI_SEARCH_TIMEOUT_SECONDS 5
 #define OM_DEFAULT_WIFI_SHUTDOWN_DELAY_MINUTES 15
 #define OM_DEFAULT_DEEP_SLEEP_DELAY_MINUTES 60

src/openmosfet.cpp

@@ -6,6 +6,7 @@
 #include "components.h"
 #include "configuration.h"
 #include "wifiServer.h"
+#include "otaUploader.h"
 
 OMVirtualReplica replica;
 
@@ -46,12 +47,12 @@ void setup() {
   OMConfiguration::load();
 
   OMwifiserver::begin();
+  OMOtaUploader::begin();
 }
 
 void loop() {
-  
   OMwifiserver::update();
-  replica.update();
+  OMOtaUploader::update();
   OMInputsInterface::update(replica);
-  
+  replica.update();
 }

src/otaUploader.cpp

@@ -0,0 +1,46 @@
+#include <ArduinoOTA.h>
+
+#include "otaUploader.h"
+
+void OMOtaUploader::begin()
+{
+	ArduinoOTA.setPort(3232);
+	ArduinoOTA.setHostname("openmosfet");
+
+	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();
+}
+
+void OMOtaUploader::update()
+{
+	ArduinoOTA.handle();
+}

src/otaUploader.h

@@ -0,0 +1,15 @@
+#ifndef OTA_UPLOADER_H
+#define OTA_UPLOADER_H
+
+#include <Arduino.h>
+#include "components.h"
+
+class OMOtaUploader
+{
+  public:
+  
+    static void begin();
+    static void update();
+};
+
+#endif

src/wifiServer.cpp

@@ -52,9 +52,6 @@ void OMwifiserver::begin()
       }
     }
 
-    if(!MDNS.begin("openmosfet")) {
-      Serial.println("Error starting mDNS");
-    }
   }
   /* You can remove the password parameter if you want the AP to be open. */
   WiFi.softAP(OMConfiguration::appSsid, OMConfiguration::appPasswd);

src/wifiServer.h

@@ -10,7 +10,6 @@
 #include <WiFiClient.h>
 #include <WiFiAP.h>
 #include <DNSServer.h>
-#include <ESPmDNS.h>
 #include <AsyncTCP.h>
 #include <ESPAsyncWebServer.h>
 #include <AsyncJson.h>