Configuration Wifi OK
This commit is contained in:
1 parent
f13109588b
commit
e5598884c6
5 files changed
+63
-21
No files matched your search
@@ -4,3 +4,4 @@
|
|||||||
extern MyConfig myConfig;
|
extern MyConfig myConfig;
|
||||||
|
|
||||||
void WifiSetup(void);
|
void WifiSetup(void);
|
||||||
|
void WifiLoop(void);
|
||||||
+3
-4
@@ -1,6 +1,6 @@
|
|||||||
[env:esp32-s3-devkitc-1]
|
[env:esp32dev]
|
||||||
platform = espressif32
|
platform = espressif32
|
||||||
board = esp32-s3-devkitc-1
|
board = esp32dev
|
||||||
framework = arduino
|
framework = arduino
|
||||||
|
|
||||||
monitor_speed = 115200
|
monitor_speed = 115200
|
||||||
@@ -11,5 +11,4 @@ lib_deps =
|
|||||||
tzapu/WiFiManager@^2.0.17
|
tzapu/WiFiManager@^2.0.17
|
||||||
|
|
||||||
build_flags =
|
build_flags =
|
||||||
-D ARDUINO_USB_CDC_ON_BOOT=1
|
-D LANG_FR
|
||||||
-D ARDUINO_USB_MODE=1
|
|
||||||
+5
-5
@@ -11,13 +11,13 @@ constexpr uint32_t ConfigMagic = 0xDEADBEEF;
|
|||||||
|
|
||||||
void ReadConfig(void) {
|
void ReadConfig(void) {
|
||||||
if (!EEPROM.begin(sizeof(myConfig))) {
|
if (!EEPROM.begin(sizeof(myConfig))) {
|
||||||
Serial.println("EEPROM initialization failed.");
|
Serial.println("Erreur de initialisation de l'EEPROM.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
EEPROM.get(0, myConfig);
|
EEPROM.get(0, myConfig);
|
||||||
if (myConfig.magic != ConfigMagic) {
|
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 = {};
|
||||||
myConfig.magic = ConfigMagic;
|
myConfig.magic = ConfigMagic;
|
||||||
strcpy(myConfig.mqtt_server, "undefined");
|
strcpy(myConfig.mqtt_server, "undefined");
|
||||||
@@ -30,14 +30,14 @@ void ReadConfig(void) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Serial.println("Configuration loaded from EEPROM.");
|
Serial.println("Configuration chargée depuis l'EEPROM.");
|
||||||
}
|
}
|
||||||
|
|
||||||
void SaveConfig(void) {
|
void SaveConfig(void) {
|
||||||
EEPROM.put(0, myConfig);
|
EEPROM.put(0, myConfig);
|
||||||
if (!EEPROM.commit()) {
|
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;
|
return;
|
||||||
}
|
}
|
||||||
Serial.println("Configuration saved to EEPROM.");
|
Serial.println("Configuration sauvegardée dans l'EEPROM.");
|
||||||
}
|
}
|
||||||
@@ -33,5 +33,6 @@ void setup()
|
|||||||
|
|
||||||
void loop() {
|
void loop() {
|
||||||
OtaLoop();
|
OtaLoop();
|
||||||
|
WifiLoop();
|
||||||
delay(100);
|
delay(100);
|
||||||
}
|
}
|
||||||
+53
-12
@@ -1,6 +1,7 @@
|
|||||||
#include <Arduino.h>
|
#include <Arduino.h>
|
||||||
#include <WiFi.h>
|
#include <WiFi.h>
|
||||||
#include <WiFiManager.h>
|
#include <WiFiManager.h>
|
||||||
|
#include <esp_wifi.h>
|
||||||
#include <cstdio>
|
#include <cstdio>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
|
|
||||||
@@ -11,6 +12,16 @@
|
|||||||
MyConfig myConfig;
|
MyConfig myConfig;
|
||||||
|
|
||||||
namespace {
|
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) {
|
void copyConfigString(char* destination, size_t destinationSize, const char* value) {
|
||||||
if (destinationSize == 0) {
|
if (destinationSize == 0) {
|
||||||
return;
|
return;
|
||||||
@@ -18,39 +29,61 @@ void copyConfigString(char* destination, size_t destinationSize, const char* val
|
|||||||
strncpy(destination, value, destinationSize - 1);
|
strncpy(destination, value, destinationSize - 1);
|
||||||
destination[destinationSize - 1] = '\0';
|
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) {
|
void WifiSetup(void) {
|
||||||
WiFiManager wifiManager;
|
|
||||||
uint8_t mac[6];
|
uint8_t mac[6];
|
||||||
char accessPointName[32];
|
char accessPointName[32];
|
||||||
|
|
||||||
WiFi.macAddress(mac);
|
WiFi.macAddress(mac);
|
||||||
snprintf(accessPointName, sizeof(accessPointName), "Legende-%02X%02X", mac[4], mac[5]);
|
snprintf(accessPointName, sizeof(accessPointName), "Legende-%02X%02X", mac[4], mac[5]);
|
||||||
|
|
||||||
wifiManager.setTitle("Légende de trains - Configuration Wi-Fi et MQTT");
|
wifiManager.setTitle("Légende de trains");
|
||||||
|
customMqttServer.setValue(myConfig.mqtt_server, sizeof(myConfig.mqtt_server) - 1);
|
||||||
WiFiManagerParameter customMqttServer(
|
customMqttUser.setValue(myConfig.mqtt_user, sizeof(myConfig.mqtt_user) - 1);
|
||||||
"mqtt_server", "Serveur MQTT", myConfig.mqtt_server, sizeof(myConfig.mqtt_server) - 1);
|
customMqttPassword.setValue(myConfig.mqtt_passw, sizeof(myConfig.mqtt_passw) - 1);
|
||||||
WiFiManagerParameter customMqttUser(
|
customTopic.setValue(myConfig.topic, sizeof(myConfig.topic) - 1);
|
||||||
"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.addParameter(&customMqttServer);
|
wifiManager.addParameter(&customMqttServer);
|
||||||
wifiManager.addParameter(&customMqttUser);
|
wifiManager.addParameter(&customMqttUser);
|
||||||
wifiManager.addParameter(&customMqttPassword);
|
wifiManager.addParameter(&customMqttPassword);
|
||||||
wifiManager.addParameter(&customTopic);
|
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é.");
|
Serial.println("Échec de connexion Wi-Fi ou délai dépassé.");
|
||||||
delay(3000);
|
delay(3000);
|
||||||
ESP.restart();
|
ESP.restart();
|
||||||
return;
|
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_server, sizeof(myConfig.mqtt_server), customMqttServer.getValue());
|
||||||
copyConfigString(myConfig.mqtt_user, sizeof(myConfig.mqtt_user), customMqttUser.getValue());
|
copyConfigString(myConfig.mqtt_user, sizeof(myConfig.mqtt_user), customMqttUser.getValue());
|
||||||
copyConfigString(myConfig.mqtt_passw, sizeof(myConfig.mqtt_passw), customMqttPassword.getValue());
|
copyConfigString(myConfig.mqtt_passw, sizeof(myConfig.mqtt_passw), customMqttPassword.getValue());
|
||||||
@@ -62,4 +95,12 @@ void WifiSetup(void) {
|
|||||||
Serial.println(myConfig.mqtt_server);
|
Serial.println(myConfig.mqtt_server);
|
||||||
Serial.print("Topic enregistré : ");
|
Serial.print("Topic enregistré : ");
|
||||||
Serial.println(myConfig.topic);
|
Serial.println(myConfig.topic);
|
||||||
|
wifiManager.startWebPortal();
|
||||||
|
Serial.print("Page de configuration : http://");
|
||||||
|
Serial.print(WiFi.localIP());
|
||||||
|
Serial.println("/");
|
||||||
|
}
|
||||||
|
|
||||||
|
void WifiLoop(void) {
|
||||||
|
wifiManager.process();
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user