Ajout de la fonction mDNS permettant d'accéder au module par son nom plutôt que par son IP.

La configuration du nom est réalisée sur la même page web que le wifi.

Author: Devdevdavid

lightkit/software/data/wifi_settings.html

@@ -19,13 +19,22 @@
   <h1 id="title">Lightkit</h1>
   <div id="content">
     <p id="status_msg" class="message_box">Erreur</p>
-    <div id="part_select_file">
+    <div id="part_config_wifi">
       <h2>Wifi</h2>
       <p>
         Configuration des paramètres pour la connexion wifi.
       </p>
       <form id="wifi_form" class="classic_form">
 
+        <div class="frame">
+          <label for="wifiModuleName">Nom du module :</label><br>
+          <input type="text" id="wifiModuleName" name="wifiModuleName" autocomplete="off" maxlength="15" placeholder="Ex: Lightkit"><br>
+          <p class="classic_form_help">
+            Permet d'accéder à ce site web en tapant le nom du module dans un navigateur.<br>
+            (ex: "Lightkit.local")
+          </p>
+        </div>
+
         <div class="frame">
           <label>Mode :</label><br>
           <input type="radio" id="wifiModeAP" name="wifiMode" value="ap" onchange="wifi_mode_changed()">
@@ -280,6 +289,15 @@ <h2>Wifi</h2>
       });
     }
 
+    function send_module_name()
+    {
+      var params = 'v=' + document.getElementById('wifiModuleName').value;
+
+      cgi_request('/set_module_name', params, function(textReply) {
+        // Nothing here
+      });
+    }
+
     /**
      * Start function to load the page
      */
@@ -291,13 +309,19 @@ <h2>Wifi</h2>
 
       document.getElementById('wifiFormSubmit').onclick = function(event) {
         event.preventDefault()
+        send_module_name();
         read_wifi_form();
       }
       document.getElementById('wifiFormDefault').onclick = function(event) {
         event.preventDefault()
+        send_module_name();
         use_default();
       }
 
+      cgi_request('/get_module_name', '', function(textReply) {
+        document.getElementById('wifiModuleName').value = textReply;
+      });
+
       cgi_request('/get_wifi_settings', '', function(textReply) {
         var json = JSON.parse(textReply);
         write_wifi_form(json);
@@ -308,7 +332,6 @@ <h2>Wifi</h2>
         // Refresh scans only after getting settings
         refresh_scan_list();
       });
-
     }
   </script>
 </body>

lightkit/software/src/cmd/cmd.cpp

@@ -41,6 +41,35 @@ void cmd_reset_module(void)
 	script_delayed_reset(1000);
 }
 
+/**
+ * @brief Set the module name used for mDNS
+ *
+ * @param newName The new name to use (len < MODULE_NAME_SIZE_MAX)
+ * @return OK: 0, Too short: -1
+ */
+int cmd_set_module_name(String newName)
+{
+	// Copy the new name
+	strncpy(flashSettings.moduleName, newName.c_str(), MODULE_NAME_SIZE_MAX);
+
+	// Always terminate the string
+	flashSettings.moduleName[MODULE_NAME_SIZE_MAX - 1] = '\0';
+
+	flash_write();
+
+	return 0;
+}
+
+/**
+ * @brief Get the current module name
+ *
+ * @return The module name as a String
+ */
+String cmd_get_module_name(void)
+{
+	return String(flashSettings.moduleName);
+}
+
 void cmd_print_status(void)
 {
 	log_raw("APPLI:   0x%02X\n", STATUS_APPLI);

lightkit/software/src/cmd/cmd.hpp

@@ -12,6 +12,8 @@
 
 void     cmd_print_help(void);
 void     cmd_reset_module(void);
+int      cmd_set_module_name(String newName);
+String   cmd_get_module_name(void);
 void     cmd_print_status(void);
 void     cmd_set_status_led(uint8_t isEnabled);
 void     cmd_set_brightness_auto(bool newValue);

lightkit/software/src/flash/flash.hpp

@@ -16,11 +16,12 @@
 #define EEPROM_USED_SIZE 256
 
 /** Increment this each time flash_settings_t is incompatible with previous version */
-#define FLASH_STRUCT_VERSION 2
+#define FLASH_STRUCT_VERSION 3
 
 typedef struct {
 	wifi_handle_t     wifiHandle;
 	stripled_params_t stripledParams;
+	char              moduleName[MODULE_NAME_SIZE_MAX];
 
 	// -- Used for flash purpose --
 	uint8_t crc;

lightkit/software/src/global.hpp

@@ -48,6 +48,9 @@
 #define I_U                                         1                       /** Input pull-up */
 #define I_A                                         2                       /** Input analog */
 
+/** Maximum size of module name ('\0' included) */
+#define MODULE_NAME_SIZE_MAX 16
+
 /**
  * This is the configuration for the board
  * TEMP_DOMOTICZ

lightkit/software/src/ota/ota.cpp

@@ -8,14 +8,31 @@
 #include <ArduinoOTA.h>
 
 #include "file_sys/file_sys.hpp"
+#include "flash/flash.hpp"
 #include "global.hpp"
 #include "ota.hpp"
 
 extern uint32_t tick;
 uint32_t        otaTick = 0;
 
+static int ota_configure_mdns(void)
+{
+	// Check if module name is set
+	if (flashSettings.moduleName[0] == '\0') {
+		return -1;
+	}
+
+	log_info("Using \"%s\" as module name", flashSettings.moduleName);
+
+	// mDNS is enabled by default in both ESP32 and ESP8266 libraries
+	ArduinoOTA.setHostname(flashSettings.moduleName);
+	return 0;
+}
+
 int ota_init(void)
 {
+	ota_configure_mdns();
+
 	ArduinoOTA.setPort(OTA_PORT);
 	ArduinoOTA.setPassword(OTA_PWD);
 

lightkit/software/src/web/web_server.cpp

@@ -431,6 +431,24 @@ static void handle_get_wifi_scans(void)
 	server.send(200, "text/plain", jsonString);
 }
 
+static void handle_get_module_name(void)
+{
+	server.send(200, "text/plain", cmd_get_module_name());
+}
+
+static void handle_set_module_name(void)
+{
+	if (!server.hasArg("v")) {
+		handle_bad_parameter();
+		return;
+	}
+
+	log_info("Using \"%s\" as new module name", server.arg("v"));
+
+	cmd_set_module_name(server.arg("v"));
+	handle_get_module_name();
+}
+
 int web_server_init(void)
 {
 	server.begin();
@@ -491,6 +509,12 @@ int web_server_init(void)
 	server.on("/get_wifi_scans", HTTP_GET, []() {
 		handle_get_wifi_scans();
 	});
+	server.on("/set_module_name", HTTP_GET, []() {
+		handle_set_module_name();
+	});
+	server.on("/get_module_name", HTTP_GET, []() {
+		handle_get_module_name();
+	});
 
 	// --- File management ---
 	server.onNotFound([]() {