jeka/OTGateway
1
0
Fork 0
mirror of https://github.com/Laxilef/OTGateway.git synced 2025-12-12 19:24:27 +05:00
Code Issues Packages Projects Releases Wiki Activity

New features and refactoring

Browse Source
This commit is contained in:
Yurii
2022-11-17 03:24:39 +03:00
parent 0b887a8400
commit 5be63c4f85
10 changed files with 212 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/WifiManagerTask.h
View File

@@ -19,7 +19,7 @@ public:
protected:
void setup() {
WiFi.mode(WIFI_STA);
//WiFi.mode(WIFI_STA);
wm.setDebugOutput(settings.debug);
wmHostname = new WiFiManagerParameter("hostname", "Hostname", settings.hostname, 80);
@@ -28,7 +28,6 @@ protected:
wmMqttServer = new WiFiManagerParameter("mqtt_server", "MQTT server", settings.mqtt.server, 80);
wm.addParameter(wmMqttServer);
//char mqttPort[6];
sprintf(buffer, "%d", settings.mqtt.port);
wmMqttPort = new WiFiManagerParameter("mqtt_port", "MQTT port", buffer, 6);
wm.addParameter(wmMqttPort);
@@ -42,6 +41,9 @@ protected:
wmMqttPrefix = new WiFiManagerParameter("mqtt_prefix", "MQTT prefix", settings.mqtt.prefix, 32);
wm.addParameter(wmMqttPrefix);
//wm.setCleanConnect(true);
wm.setRestorePersistent(false);
wm.setHostname(settings.hostname);
wm.setWiFiAutoReconnect(true);
wm.setConfigPortalBlocking(false);
@@ -49,16 +51,24 @@ protected:
wm.setConfigPortalTimeout(300);
wm.setDisableConfigPortal(false);
if (wm.autoConnect(AP_SSID)) {
INFO_F("Wifi connected. IP: %s, RSSI: %d\n", WiFi.localIP().toString().c_str(), WiFi.RSSI());
wm.startWebPortal();
} else {
INFO(F("Failed to connect to WIFI, start the configuration portal..."));
}
wm.autoConnect(AP_SSID);
}
void loop() {
if (connected && WiFi.status() != WL_CONNECTED) {
connected = false;
INFO("[wifi] Disconnected");
} else if (!connected && WiFi.status() == WL_CONNECTED) {
connected = true;
INFO_F("[wifi] Connected. IP address: %s, RSSI: %d\n", WiFi.localIP().toString().c_str(), WiFi.RSSI());
}
if (WiFi.status() == WL_CONNECTED && !wm.getWebPortalActive() && !wm.getConfigPortalActive()) {
wm.startWebPortal();
}
wm.process();
}
@@ -74,4 +84,6 @@ protected:
eeSettings.updateNow();
INFO(F("Settings saved"));
}
bool connected = false;
};