jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-27 20:56:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor wifi code

Browse Source
This commit is contained in:
Theo Arends 2020-01-26 15:52:26 +01:00
parent 3d00c4f093
commit 9efe67127d
1 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
tasmota/support_wifi.ino
View File

@ -22,18 +22,16 @@
\*********************************************************************************************/ \*********************************************************************************************/
#ifndef WIFI_RSSI_THRESHOLD #ifndef WIFI_RSSI_THRESHOLD
// decrease the roam threshold to address devices connecting at very low RSSI and being close to inoperative // Decrease the roam threshold from 10 to 5 to address devices connecting at very low RSSI and being close to inoperative
//#define WIFI_RSSI_THRESHOLD 10 // Difference in dB between current network and scanned network
#define WIFI_RSSI_THRESHOLD 5 // Difference in dB between current network and scanned network #define WIFI_RSSI_THRESHOLD 5 // Difference in dB between current network and scanned network
#endif #endif
#ifndef WIFI_RESCAN_MINUTES #ifndef WIFI_RESCAN_MINUTES
// increase rescan interval to 5 minutes to improve ability for devices to reach network harmony // Increase rescan interval from 44 to 5 minutes to improve ability for devices to reach network harmony
//#define WIFI_RESCAN_MINUTES 44 // Number of minutes between wifi network rescan #define WIFI_RESCAN_MINUTES 5 // Number of minutes between wifi network rescan
#define WIFI_RESCAN_MINUTES 5 // Number of minutes between wifi network rescan
#endif #endif
const uint8_t WIFI_CONFIG_SEC = 180; // seconds before restart const uint8_t WIFI_CONFIG_SEC = 180; // seconds before restart
// drop from 20 seconds to 5 seconds since we control the reconnections, not the Arduino SDK // Drop from 20 seconds to 5 seconds since we control the reconnections, not the Arduino SDK
const uint8_t WIFI_CHECK_SEC = 5; // seconds const uint8_t WIFI_CHECK_SEC = 5; // seconds
const uint8_t WIFI_RETRY_OFFSET_SEC = 20; // seconds const uint8_t WIFI_RETRY_OFFSET_SEC = 20; // seconds
@ -56,6 +54,7 @@ struct WIFI {
uint8_t scan_state; uint8_t scan_state;
uint8_t bssid[6] = {0}; uint8_t bssid[6] = {0};
uint8_t bssid_last[6] = {0}; // store the last connect bssid uint8_t bssid_last[6] = {0}; // store the last connect bssid
int8_t best_network_db;
} Wifi; } Wifi;
int WifiGetRssiAsQuality(int rssi) int WifiGetRssiAsQuality(int rssi)
@ -168,7 +167,6 @@ void WiFiSetSleepMode(void)
void WifiBegin(uint8_t flag, uint8_t channel) void WifiBegin(uint8_t flag, uint8_t channel)
{ {
const char kWifiPhyMode[] = " BGN"; const char kWifiPhyMode[] = " BGN";
char hex_char[18];
#ifdef USE_EMULATION #ifdef USE_EMULATION
UdpDisconnect(); UdpDisconnect();
@ -189,9 +187,8 @@ void WifiBegin(uint8_t flag, uint8_t channel)
// if (WiFi.getPhyMode() != WIFI_PHY_MODE_11N) { WiFi.setPhyMode(WIFI_PHY_MODE_11N); } // B/G/N // if (WiFi.getPhyMode() != WIFI_PHY_MODE_11N) { WiFi.setPhyMode(WIFI_PHY_MODE_11N); } // B/G/N
// if (WiFi.getPhyMode() != WIFI_PHY_MODE_11G) { WiFi.setPhyMode(WIFI_PHY_MODE_11G); } // B/G // if (WiFi.getPhyMode() != WIFI_PHY_MODE_11G) { WiFi.setPhyMode(WIFI_PHY_MODE_11G); } // B/G
if (!WiFi.getAutoConnect()) { WiFi.setAutoConnect(true); } if (!WiFi.getAutoConnect()) { WiFi.setAutoConnect(true); }
// WiFi.setAutoReconnect(true); // Handle the reconnection in WifiCheckIp() since the autoreconnect keeps sending deauthentication messages which causes the AP to block traffic as it looks like an DoS attack
// handle the reconnection in WifiCheckIp() since the autoreconnect keeps sending deauthentication messages which causes the AP to block traffic as it looks like an DoS attack // This needs to be explicitly called as "false" otherwise the default is enabled
// this needs to be explicitly called as "false" otherwise the default is enabled
WiFi.setAutoReconnect(false); WiFi.setAutoReconnect(false);
switch (flag) { switch (flag) {
case 0: // AP1 case 0: // AP1
@ -208,19 +205,18 @@ void WifiBegin(uint8_t flag, uint8_t channel)
WiFi.config(Settings.ip_address[0], Settings.ip_address[1], Settings.ip_address[2], Settings.ip_address[3]); // Set static IP WiFi.config(Settings.ip_address[0], Settings.ip_address[1], Settings.ip_address[2], Settings.ip_address[3]); // Set static IP
} }
WiFi.hostname(my_hostname); WiFi.hostname(my_hostname);
char stemp[40] = { 0 };
if (channel) { if (channel) {
WiFi.begin(SettingsText(SET_STASSID1 + Settings.sta_active), SettingsText(SET_STAPWD1 + Settings.sta_active), channel, Wifi.bssid); WiFi.begin(SettingsText(SET_STASSID1 + Settings.sta_active), SettingsText(SET_STAPWD1 + Settings.sta_active), channel, Wifi.bssid);
// add debug output to console to show connected BSSID and channel for multi-AP installations // Add connected BSSID and channel for multi-AP installations
AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_WIFI D_CONNECTING_TO_AP "%d %s Channel %d BSSId %s " D_IN_MODE " 11%c " D_AS " %s..."), char hex_char[18];
Settings.sta_active +1, SettingsText(SET_STASSID1 + Settings.sta_active), snprintf_P(stemp, sizeof(stemp), PSTR(" Channel %d BSSId %s"), channel, ToHex_P((unsigned char*)Wifi.bssid, 6, hex_char, sizeof(hex_char), ':'));
channel, ToHex_P((unsigned char*)Wifi.bssid, 6, hex_char, sizeof(hex_char), ':'),
kWifiPhyMode[WiFi.getPhyMode() & 0x3], my_hostname);
} else { } else {
WiFi.begin(SettingsText(SET_STASSID1 + Settings.sta_active), SettingsText(SET_STAPWD1 + Settings.sta_active)); WiFi.begin(SettingsText(SET_STASSID1 + Settings.sta_active), SettingsText(SET_STAPWD1 + Settings.sta_active));
AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_WIFI D_CONNECTING_TO_AP "%d %s " D_IN_MODE " 11%c " D_AS " %s..."),
Settings.sta_active +1, SettingsText(SET_STASSID1 + Settings.sta_active),
kWifiPhyMode[WiFi.getPhyMode() & 0x3], my_hostname);
} }
AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_WIFI D_CONNECTING_TO_AP "%d %s%s " D_IN_MODE " 11%c " D_AS " %s..."),
Settings.sta_active +1, SettingsText(SET_STASSID1 + Settings.sta_active), stemp, kWifiPhyMode[WiFi.getPhyMode() & 0x3], my_hostname);
#if LWIP_IPV6 #if LWIP_IPV6
for (bool configured = false; !configured;) { for (bool configured = false; !configured;) {
@ -239,22 +235,22 @@ void WifiBegin(uint8_t flag, uint8_t channel)
void WifiBeginAfterScan(void) void WifiBeginAfterScan(void)
{ {
static int8_t best_network_db;
// Not active // Not active
if (0 == Wifi.scan_state) { return; } if (0 == Wifi.scan_state) { return; }
// Init scan when not connected // Init scan when not connected
if (1 == Wifi.scan_state) { if (1 == Wifi.scan_state) {
memset((void*) &Wifi.bssid, 0, sizeof(Wifi.bssid)); memset((void*) &Wifi.bssid, 0, sizeof(Wifi.bssid));
best_network_db = -127; Wifi.best_network_db = -127;
Wifi.scan_state = 3; Wifi.scan_state = 3;
} }
// Init scan when connected // Init scan when connected
if (2 == Wifi.scan_state) { if (2 == Wifi.scan_state) {
uint8_t* bssid = WiFi.BSSID(); // Get current bssid uint8_t* bssid = WiFi.BSSID(); // Get current bssid
memcpy((void*) &Wifi.bssid, (void*) bssid, sizeof(Wifi.bssid)); memcpy((void*) &Wifi.bssid, (void*) bssid, sizeof(Wifi.bssid));
best_network_db = WiFi.RSSI(); // Get current rssi and add threshold Wifi.best_network_db = WiFi.RSSI(); // Get current rssi and add threshold
if (best_network_db < -WIFI_RSSI_THRESHOLD) { best_network_db += WIFI_RSSI_THRESHOLD; } if (Wifi.best_network_db < -WIFI_RSSI_THRESHOLD) {
Wifi.best_network_db += WIFI_RSSI_THRESHOLD;
}
Wifi.scan_state = 3; Wifi.scan_state = 3;
} }
// Init scan // Init scan
@ -305,7 +301,7 @@ void WifiBeginAfterScan(void)
if (ssid_scan == SettingsText(SET_STASSID1 + j)) { // SSID match if (ssid_scan == SettingsText(SET_STASSID1 + j)) { // SSID match
known = true; known = true;
number_known++; number_known++;
if (rssi_scan > best_network_db) { // Best network if (rssi_scan > Wifi.best_network_db) { // Best network
if (sec_scan == ENC_TYPE_NONE || SettingsText(SET_STAPWD1 + j)) { // Check for passphrase if not open wlan if (sec_scan == ENC_TYPE_NONE || SettingsText(SET_STAPWD1 + j)) { // Check for passphrase if not open wlan
// store the max values in case there is only one AP and we need to try to reconnect // store the max values in case there is only one AP and we need to try to reconnect
memcpy((void*) &bssid_max, (void*) bssid_scan, sizeof(bssid_max)); memcpy((void*) &bssid_max, (void*) bssid_scan, sizeof(bssid_max));
@ -314,7 +310,7 @@ void WifiBeginAfterScan(void)
// if the bssid is not the same as the last failed attempt, force picking the next strongest AP to prevent getting stuck on a strong RSSI, but poor channel health // if the bssid is not the same as the last failed attempt, force picking the next strongest AP to prevent getting stuck on a strong RSSI, but poor channel health
for (uint32_t i = 0; i < sizeof(Wifi.bssid_last); i++) { for (uint32_t i = 0; i < sizeof(Wifi.bssid_last); i++) {
if (bssid_scan[i] != Wifi.bssid_last[i]) { if (bssid_scan[i] != Wifi.bssid_last[i]) {
best_network_db = (int8_t)rssi_scan; Wifi.best_network_db = (int8_t)rssi_scan;
channel = chan_scan; channel = chan_scan;
ap = j; // AP1 or AP2 ap = j; // AP1 or AP2
memcpy((void*) &Wifi.bssid, (void*) bssid_scan, sizeof(Wifi.bssid)); memcpy((void*) &Wifi.bssid, (void*) bssid_scan, sizeof(Wifi.bssid));