Fix de mDNS pour les ESP8266, utilisation de MDNS sans passer par ArduinoOTA

Author: Devdevdavid

lightkit/software/platformio.ini

@@ -10,6 +10,9 @@
 ;
 ; Note:
 ; export envid=board_ring && pio run -e $envid -t upload && pio run -e $envid -t uploadfs && pio device monitor -e $envid
+;
+; Backtrace filters:
+; https://docs.platformio.org/en/latest/core/userguide/device/cmd_monitor.html#cmd-device-monitor-filters
 
 [env]
 monitor_speed = 115200
@@ -41,6 +44,7 @@ lib_deps =
   ESP32WebServer
 build_flags =
   -DESP32
+monitor_filters = esp32_exception_decoder
 
 [base_esp8266]
 platform = espressif8266
@@ -49,6 +53,7 @@ lib_deps =
   ${env.lib_deps}
 build_flags =
   -DESP8266
+monitor_filters = esp8266_exception_decoder
 
 ; ========
 ; Below are the environnements

lightkit/software/src/ota/ota.cpp

@@ -12,10 +12,20 @@
 #include "global.hpp"
 #include "ota.hpp"
 
+#ifdef ESP32
+#include <ESPmDNS.h>
+#else
+#include <ESP8266mDNS.h>
+#endif
+
 extern uint32_t tick;
 uint32_t        otaTick = 0;
 
-static int ota_configure_mdns(void)
+/**
+ * @brief Set the hostname for MDNS
+ * @return 0: OK, -1: error
+ */
+int ota_configure_mdns(void)
 {
 	// Check if module name is set
 	if (flashSettings.moduleName[0] == '\0') {
@@ -24,15 +34,25 @@ static int ota_configure_mdns(void)
 
 	log_info("Using \"%s\" as module name", flashSettings.moduleName);
 
-	// mDNS is enabled by default in both ESP32 and ESP8266 libraries
-	ArduinoOTA.setHostname(flashSettings.moduleName);
+	// Clear MDNS before starting
+#ifdef ESP32
+	MDNS.end();
+#else
+	MDNS.close();
+#endif
+
+	// Start the service
+	if (!MDNS.begin(flashSettings.moduleName)) {
+		log_error("mDNS failed to start !");
+		return -1;
+	}
+	MDNS.enableArduino(OTA_PORT);
+	MDNS.addService("http", "tcp", 80);
 	return 0;
 }
 
 int ota_init(void)
 {
-	ota_configure_mdns();
-
 	ArduinoOTA.setPort(OTA_PORT);
 	ArduinoOTA.setPassword(OTA_PWD);
 
@@ -78,12 +98,23 @@ int ota_init(void)
 		else if (error == OTA_END_ERROR)
 			log_error("End Failed");
 	});
+
+#ifdef ESP32
+	ArduinoOTA.setMdnsEnabled(false);
 	ArduinoOTA.begin();
+#else
+	// false : don't do mdns, we do it ourself
+	ArduinoOTA.begin(false);
+#endif
 
 	return 0;
 }
 
 void ota_main(void)
 {
 	ArduinoOTA.handle();
+
+#if !defined(ESP32)
+	MDNS.update();
+#endif
 }

lightkit/software/src/ota/ota.hpp

@@ -14,6 +14,7 @@
 #define OTA_PWD  P_OTA_PWD
 
 // OTA
+int  ota_configure_mdns(void);
 int  ota_init(void);
 void ota_main(void);
 

lightkit/software/src/wifi/wifi.cpp

@@ -6,6 +6,7 @@
 
 #include "wifi.hpp"
 #include "flash/flash.hpp"
+#include "ota/ota.hpp"
 #include "script/script.hpp"
 
 // Externals
@@ -362,7 +363,7 @@ int32_t wifi_start_scan_req(uint32_t delay)
 		return -1;
 	}
 
-	log_info("Wifi scan requested, starting in %ds", delay / 1000);
+	log_info("Wifi scan requested, starting in %d ms", delay);
 
 	// Trigger a new scan
 	isScanToStartTick = tick + delay;
@@ -396,10 +397,10 @@ int wifi_init(void)
 
 	wifi_print();
 
-	// Scan wifi after startup (2s delay)
+	// Scan wifi after startup (50ms delay)
 	// Scan cannot be trigger right now because
 	// OTA and web server requieres WiFi to be up
-	wifi_start_scan_req(2000);
+	wifi_start_scan_req(50);
 
 	return 0;
 }
@@ -438,6 +439,7 @@ void wifi_main(void)
 					_set(STATUS_WIFI, STATUS_WIFI_IS_CO);
 					wifi_print();
 					wifi_save_current_ip();
+					ota_configure_mdns();
 				}
 			}
 		}