libraries/wifi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove multi wifi functionality

Browse Source
This commit is contained in:
Nicu Hodos 2024-06-29 17:40:23 +02:00
parent 443b7c29d8
commit abc4469f58
3 changed files with 9 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library.json
View File

@ -1,6 +1,6 @@
{ {
"name": "Wifi", "name": "Wifi",
"version": "1.0.2", "version": "2.0.0",
"description": "Helper classes for handling wifi connectiviy and OTA", "description": "Helper classes for handling wifi connectiviy and OTA",
"repository": "repository":
{ {

2
src/credentials.h.tpl
View File

@ -1,4 +1,4 @@
struct WifiCredentials { struct WifiCredentials {
const char* ssid; const char* ssid;
const char* password; const char* password;
} credentials[] = {"foo", "bar"}; } credentials = {"foo", "bar"};

37
src/wifi.h
View File

@ -1,65 +1,42 @@
#include <ESP8266WiFi.h> #include <ESP8266WiFi.h>
#include <ESP8266WiFiMulti.h>
#include <ESP8266mDNS.h> #include <ESP8266mDNS.h>
#include "credentials.h" #include "credentials.h"
namespace Wifi { namespace Wifi {
ESP8266WiFiMulti wifiMulti;
WiFiEventHandler stationConnectedHandler; WiFiEventHandler stationConnectedHandler;
WiFiEventHandler stationDisconnectedHandler; WiFiEventHandler stationDisconnectedHandler;
String currentSSID;
String currentPsk;
void printStatus(); void printStatus();
Task tReconnect(1 * TASK_MINUTE, TASK_FOREVER, Task tConnect(1 * TASK_MINUTE, TASK_FOREVER,
[] { [] {
if (WiFi.status() != WL_CONNECTED) { if (WiFi.status() != WL_CONNECTED) {
Serial.println("Reconnecting to WiFi netowrk..."); Serial.println("Connecting to WiFi netowrk...");
WiFi.forceSleepWake(); WiFi.forceSleepWake();
WiFi.begin(currentSSID.c_str(), currentPsk.c_str()); WiFi.begin(credentials.ssid, credentials.password);
} }
}); },
&ts, true);
Task tInitialConnect(500 * TASK_MILLISECOND, 120,
[] {
Serial.println("Finding WiFi netowrk...");
if (wifiMulti.run() == WL_CONNECTED) tInitialConnect.disable();
}, nullptr, false, nullptr,
[] {
currentSSID = WiFi.SSID();
currentPsk = WiFi.psk();
tReconnect.enable();
}
);
void setup(Scheduler& ts, void(*onConnected)() = nullptr, void(*onDisconnected)() = nullptr) { void setup(Scheduler& ts, void(*onConnected)() = nullptr, void(*onDisconnected)() = nullptr) {
stationConnectedHandler = WiFi.onStationModeGotIP( stationConnectedHandler = WiFi.onStationModeGotIP(
[onConnected](const WiFiEventStationModeGotIP& e) { [onConnected](const WiFiEventStationModeGotIP& e) {
Serial.println("Connected to network."); Serial.println("Connected to network.");
printStatus(); printStatus();
tReconnect.cancel(); tConnect.cancel();
if (onConnected) onConnected(); if (onConnected) onConnected();
}); });
stationDisconnectedHandler = WiFi.onStationModeDisconnected( stationDisconnectedHandler = WiFi.onStationModeDisconnected(
[onDisconnected](const WiFiEventStationModeDisconnected& e) { [onDisconnected](const WiFiEventStationModeDisconnected& e) {
Serial.println("Disconnected from network."); Serial.println("Disconnected from network.");
tReconnect.enableIfNot(); tConnect.enableIfNot();
if (onDisconnected) onDisconnected(); if (onDisconnected) onDisconnected();
}); });
WiFi.setHostname(MAIN_DEVICE_ID); WiFi.setHostname(MAIN_DEVICE_ID);
for (uint32_t i = 0; i < sizeof(credentials) / sizeof(WifiCredentials); i++) {
wifiMulti.addAP(credentials[i].ssid, credentials[i].password);
}
ts.addTask(tInitialConnect);
ts.addTask(tReconnect);
tInitialConnect.enable();
} }
void disconnect() { void disconnect() {