From e5598884c60b75181529b34ca6897bc6c7cb2e3f Mon Sep 17 00:00:00 2001 From: Serge NOEL Date: Sat, 31 Oct 2026 10:38:49 +0100 Subject: [PATCH] Configuration Wifi OK --- .vscode/extensions.json | 22 +++++++------- include/wifi_config.h | 1 + platformio.ini | 7 ++--- src/eeprom.cpp | 10 +++---- src/main.cpp | 1 + src/wifi.cpp | 65 +++++++++++++++++++++++++++++++++-------- 6 files changed, 74 insertions(+), 32 deletions(-) diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 84bf925..a91ca8f 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,11 +1,11 @@ -{ - // See http://go.microsoft.com/fwlink/?LinkId=827846 - // for the documentation about the extensions.json format - "recommendations": [ - "platformio.platformio-ide" - ], - "unwantedRecommendations": [ - "ms-vscode.cpptools-extension-pack", - "pioarduino.pioarduino-ide" - ] -} +{ + // See http://go.microsoft.com/fwlink/?LinkId=827846 + // for the documentation about the extensions.json format + "recommendations": [ + "platformio.platformio-ide" + ], + "unwantedRecommendations": [ + "ms-vscode.cpptools-extension-pack", + "pioarduino.pioarduino-ide" + ] +} diff --git a/include/wifi_config.h b/include/wifi_config.h index 7d6dd06..c949e23 100644 --- a/include/wifi_config.h +++ b/include/wifi_config.h @@ -4,3 +4,4 @@ extern MyConfig myConfig; void WifiSetup(void); +void WifiLoop(void); diff --git a/platformio.ini b/platformio.ini index 8d57fa3..78a3149 100644 --- a/platformio.ini +++ b/platformio.ini @@ -1,6 +1,6 @@ -[env:esp32-s3-devkitc-1] +[env:esp32dev] platform = espressif32 -board = esp32-s3-devkitc-1 +board = esp32dev framework = arduino monitor_speed = 115200 @@ -11,5 +11,4 @@ lib_deps = tzapu/WiFiManager@^2.0.17 build_flags = - -D ARDUINO_USB_CDC_ON_BOOT=1 - -D ARDUINO_USB_MODE=1 + -D LANG_FR \ No newline at end of file diff --git a/src/eeprom.cpp b/src/eeprom.cpp index 682e036..20f3cae 100644 --- a/src/eeprom.cpp +++ b/src/eeprom.cpp @@ -11,13 +11,13 @@ constexpr uint32_t ConfigMagic = 0xDEADBEEF; void ReadConfig(void) { if (!EEPROM.begin(sizeof(myConfig))) { - Serial.println("EEPROM initialization failed."); + Serial.println("Erreur de initialisation de l'EEPROM."); return; } EEPROM.get(0, myConfig); if (myConfig.magic != ConfigMagic) { - Serial.println("EEPROM is not initialized; loading default configuration."); + Serial.println("EEPROM n'est pas initialisée ou contient des données invalides. Réinitialisation de la configuration."); myConfig = {}; myConfig.magic = ConfigMagic; strcpy(myConfig.mqtt_server, "undefined"); @@ -30,14 +30,14 @@ void ReadConfig(void) { return; } - Serial.println("Configuration loaded from EEPROM."); + Serial.println("Configuration chargée depuis l'EEPROM."); } void SaveConfig(void) { EEPROM.put(0, myConfig); if (!EEPROM.commit()) { - Serial.println("Failed to save configuration to EEPROM."); + Serial.println("Erreur lors de la sauvegarde de la configuration dans l'EEPROM."); return; } - Serial.println("Configuration saved to EEPROM."); + Serial.println("Configuration sauvegardée dans l'EEPROM."); } diff --git a/src/main.cpp b/src/main.cpp index 0e6e521..c156ebe 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -33,5 +33,6 @@ void setup() void loop() { OtaLoop(); + WifiLoop(); delay(100); } \ No newline at end of file diff --git a/src/wifi.cpp b/src/wifi.cpp index 270787a..c314340 100644 --- a/src/wifi.cpp +++ b/src/wifi.cpp @@ -1,6 +1,7 @@ #include #include #include +#include #include #include @@ -11,6 +12,16 @@ MyConfig myConfig; namespace { +WiFiManager wifiManager; +WiFiManagerParameter customMqttServer( + "mqtt_server", "Serveur MQTT", "", sizeof(myConfig.mqtt_server) - 1); +WiFiManagerParameter customMqttUser( + "mqtt_user", "Utilisateur MQTT", "", sizeof(myConfig.mqtt_user) - 1); +WiFiManagerParameter customMqttPassword( + "mqtt_password", "Mot de passe MQTT", "", sizeof(myConfig.mqtt_passw) - 1); +WiFiManagerParameter customTopic( + "topic", "Topic", "", sizeof(myConfig.topic) - 1); + void copyConfigString(char* destination, size_t destinationSize, const char* value) { if (destinationSize == 0) { return; @@ -18,39 +29,61 @@ void copyConfigString(char* destination, size_t destinationSize, const char* val strncpy(destination, value, destinationSize - 1); destination[destinationSize - 1] = '\0'; } + +bool setStationCredentials(const MyConfig& config) { + wifi_config_t stationConfig = {}; + const size_t ssidLength = strnlen(config.ssid, sizeof(config.ssid)); + const size_t passwordLength = strnlen(config.password, sizeof(config.password)); + + memcpy(stationConfig.sta.ssid, config.ssid, ssidLength); + memcpy(stationConfig.sta.password, config.password, passwordLength); + + const esp_err_t result = esp_wifi_set_config(WIFI_IF_STA, &stationConfig); + if (result != ESP_OK) { + Serial.print("Impossible de charger les identifiants Wi-Fi de l'EEPROM : "); + Serial.println(esp_err_to_name(result)); + return false; + } + return true; +} } +/** + * Configure le Wi-Fi et le serveur MQTT en utilisant WiFiManager. + * Si la connexion Wi-Fi échoue, un point d'accès est créé pour permettre à l'utilisateur de saisir les informations de connexion via une interface web. + * Les paramètres MQTT sont également configurés via cette interface. + */ void WifiSetup(void) { - WiFiManager wifiManager; uint8_t mac[6]; char accessPointName[32]; WiFi.macAddress(mac); snprintf(accessPointName, sizeof(accessPointName), "Legende-%02X%02X", mac[4], mac[5]); - wifiManager.setTitle("Légende de trains - Configuration Wi-Fi et MQTT"); - - WiFiManagerParameter customMqttServer( - "mqtt_server", "Serveur MQTT", myConfig.mqtt_server, sizeof(myConfig.mqtt_server) - 1); - WiFiManagerParameter customMqttUser( - "mqtt_user", "Utilisateur MQTT", myConfig.mqtt_user, sizeof(myConfig.mqtt_user) - 1); - WiFiManagerParameter customMqttPassword( - "mqtt_password", "Mot de passe MQTT", myConfig.mqtt_passw, sizeof(myConfig.mqtt_passw) - 1); - WiFiManagerParameter customTopic( - "topic", "Topic", myConfig.topic, sizeof(myConfig.topic) - 1); + wifiManager.setTitle("Légende de trains"); + customMqttServer.setValue(myConfig.mqtt_server, sizeof(myConfig.mqtt_server) - 1); + customMqttUser.setValue(myConfig.mqtt_user, sizeof(myConfig.mqtt_user) - 1); + customMqttPassword.setValue(myConfig.mqtt_passw, sizeof(myConfig.mqtt_passw) - 1); + customTopic.setValue(myConfig.topic, sizeof(myConfig.topic) - 1); wifiManager.addParameter(&customMqttServer); wifiManager.addParameter(&customMqttUser); wifiManager.addParameter(&customMqttPassword); wifiManager.addParameter(&customTopic); + wifiManager.setWebServerCallback([]() { + Serial.println("Page de configuration web accessible."); + }); - if (!wifiManager.autoConnect(accessPointName, "Legende_2026")) { + if (!WiFi.mode(WIFI_STA) || !setStationCredentials(myConfig) || + !wifiManager.autoConnect(accessPointName, "")) { Serial.println("Échec de connexion Wi-Fi ou délai dépassé."); delay(3000); ESP.restart(); return; } + copyConfigString(myConfig.ssid, sizeof(myConfig.ssid), WiFi.SSID().c_str()); + copyConfigString(myConfig.password, sizeof(myConfig.password), WiFi.psk().c_str()); copyConfigString(myConfig.mqtt_server, sizeof(myConfig.mqtt_server), customMqttServer.getValue()); copyConfigString(myConfig.mqtt_user, sizeof(myConfig.mqtt_user), customMqttUser.getValue()); copyConfigString(myConfig.mqtt_passw, sizeof(myConfig.mqtt_passw), customMqttPassword.getValue()); @@ -62,4 +95,12 @@ void WifiSetup(void) { Serial.println(myConfig.mqtt_server); Serial.print("Topic enregistré : "); Serial.println(myConfig.topic); + wifiManager.startWebPortal(); + Serial.print("Page de configuration : http://"); + Serial.print(WiFi.localIP()); + Serial.println("/"); +} + +void WifiLoop(void) { + wifiManager.process(); }