From dec6739e3f526d761ce35a7c3e59cdc9785651a2 Mon Sep 17 00:00:00 2001 From: Markus Sattler Date: Fri, 8 Jan 2016 19:06:28 +0100 Subject: [PATCH 1/2] add more debug to WiFi --- libraries/ESP8266WiFi/src/ESP8266WiFi.h | 11 +++++++++++ libraries/ESP8266WiFi/src/ESP8266WiFiAP.cpp | 11 ++++++++++- libraries/ESP8266WiFi/src/ESP8266WiFiGeneric.cpp | 4 ++-- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/libraries/ESP8266WiFi/src/ESP8266WiFi.h b/libraries/ESP8266WiFi/src/ESP8266WiFi.h index 4e6ce8e04..d7b56ca92 100644 --- a/libraries/ESP8266WiFi/src/ESP8266WiFi.h +++ b/libraries/ESP8266WiFi/src/ESP8266WiFi.h @@ -40,6 +40,17 @@ extern "C" { #include "WiFiServer.h" #include "WiFiClientSecure.h" +#ifdef DEBUG_ESP_WIFI +#ifdef DEBUG_ESP_PORT +#define DEBUG_WIFI(...) DEBUG_ESP_PORT.printf( __VA_ARGS__ ) +#endif +#endif + +#ifndef DEBUG_WIFI +#define DEBUG_WIFI(...) +#endif + + class ESP8266WiFiClass : public ESP8266WiFiGenericClass, public ESP8266WiFiSTAClass, public ESP8266WiFiScanClass, public ESP8266WiFiAPClass { public: diff --git a/libraries/ESP8266WiFi/src/ESP8266WiFiAP.cpp b/libraries/ESP8266WiFi/src/ESP8266WiFiAP.cpp index 6c911263a..fec121ad9 100644 --- a/libraries/ESP8266WiFi/src/ESP8266WiFiAP.cpp +++ b/libraries/ESP8266WiFi/src/ESP8266WiFiAP.cpp @@ -85,16 +85,19 @@ bool ESP8266WiFiAPClass::softAP(const char* ssid, const char* passphrase, int ch if(!WiFi.enableAP(true)) { // enable AP failed + DEBUG_WIFI("[AP] enableAP failed!"); return false; } if(!ssid || *ssid == 0 || strlen(ssid) > 31) { // fail SSID too long or missing! + DEBUG_WIFI("[AP] SSID too long or missing!"); return false; } if(passphrase && (strlen(passphrase) > 63 || strlen(passphrase) < 8)) { // fail passphrase to long or short! + DEBUG_WIFI("[AP] fail passphrase to long or short!"); return false; } @@ -117,7 +120,7 @@ bool ESP8266WiFiAPClass::softAP(const char* ssid, const char* passphrase, int ch struct softap_config conf_current; wifi_softap_get_config(&conf_current); if(softap_config_equal(conf, conf_current)) { - DEBUGV("softap config unchanged"); + DEBUG_WIFI("[AP] softap config unchanged"); return true; } @@ -131,6 +134,9 @@ bool ESP8266WiFiAPClass::softAP(const char* ssid, const char* passphrase, int ch } ETS_UART_INTR_ENABLE(); + if(!ret) { + DEBUG_WIFI("[AP] set_config faild!"); + } return ret; } @@ -145,6 +151,7 @@ bool ESP8266WiFiAPClass::softAPConfig(IPAddress local_ip, IPAddress gateway, IPA if(!WiFi.enableAP(true)) { // enable AP failed + DEBUG_WIFI("[AP] enableAP failed!"); return false; } @@ -155,6 +162,8 @@ bool ESP8266WiFiAPClass::softAPConfig(IPAddress local_ip, IPAddress gateway, IPA wifi_softap_dhcps_stop(); if(wifi_set_ip_info(SOFTAP_IF, &info)) { return wifi_softap_dhcps_start(); + } else { + DEBUG_WIFI("[AP] wifi_set_ip_info failed!"); } return false; } diff --git a/libraries/ESP8266WiFi/src/ESP8266WiFiGeneric.cpp b/libraries/ESP8266WiFi/src/ESP8266WiFiGeneric.cpp index 86bbb7091..0a06fce85 100644 --- a/libraries/ESP8266WiFi/src/ESP8266WiFiGeneric.cpp +++ b/libraries/ESP8266WiFi/src/ESP8266WiFiGeneric.cpp @@ -103,10 +103,10 @@ void ESP8266WiFiGenericClass::removeEvent(WiFiEventCb cbEvent, WiFiEvent_t event */ void ESP8266WiFiGenericClass::_eventCallback(void* arg) { System_Event_t* event = reinterpret_cast(arg); - DEBUGV("wifi evt: %d\n", event->event); + DEBUG_WIFI("wifi evt: %d\n", event->event); if(event->event == EVENT_STAMODE_DISCONNECTED) { - DEBUGV("STA disconnect: %d\n", event->event_info.disconnected.reason); + DEBUG_WIFI("STA disconnect: %d\n", event->event_info.disconnected.reason); WiFiClient::stopAll(); } From 29bb74beabca5e1b9db7d21f85b3bb63fdfbfb16 Mon Sep 17 00:00:00 2001 From: Markus Sattler Date: Fri, 8 Jan 2016 19:30:21 +0100 Subject: [PATCH 2/2] rework AP config to get DHCP in best mode if SDK config got invalid some how. --- libraries/ESP8266WiFi/src/ESP8266WiFiAP.cpp | 131 ++++++++++++++++---- 1 file changed, 108 insertions(+), 23 deletions(-) diff --git a/libraries/ESP8266WiFi/src/ESP8266WiFiAP.cpp b/libraries/ESP8266WiFi/src/ESP8266WiFiAP.cpp index fec121ad9..bf2bfb195 100644 --- a/libraries/ESP8266WiFi/src/ESP8266WiFiAP.cpp +++ b/libraries/ESP8266WiFi/src/ESP8266WiFiAP.cpp @@ -85,22 +85,24 @@ bool ESP8266WiFiAPClass::softAP(const char* ssid, const char* passphrase, int ch if(!WiFi.enableAP(true)) { // enable AP failed - DEBUG_WIFI("[AP] enableAP failed!"); + DEBUG_WIFI("[AP] enableAP failed!\n"); return false; } if(!ssid || *ssid == 0 || strlen(ssid) > 31) { // fail SSID too long or missing! - DEBUG_WIFI("[AP] SSID too long or missing!"); + DEBUG_WIFI("[AP] SSID too long or missing!\n"); return false; } if(passphrase && (strlen(passphrase) > 63 || strlen(passphrase) < 8)) { // fail passphrase to long or short! - DEBUG_WIFI("[AP] fail passphrase to long or short!"); + DEBUG_WIFI("[AP] fail passphrase to long or short!\n"); return false; } + bool ret = false; + struct softap_config conf; strcpy(reinterpret_cast(conf.ssid), ssid); conf.channel = channel; @@ -119,24 +121,51 @@ bool ESP8266WiFiAPClass::softAP(const char* ssid, const char* passphrase, int ch struct softap_config conf_current; wifi_softap_get_config(&conf_current); - if(softap_config_equal(conf, conf_current)) { - DEBUG_WIFI("[AP] softap config unchanged"); - return true; - } + if(!softap_config_equal(conf, conf_current)) { - bool ret; + ETS_UART_INTR_DISABLE(); + if(WiFi._persistent) { + ret = wifi_softap_set_config(&conf); + } else { + ret = wifi_softap_set_config_current(&conf); + } + ETS_UART_INTR_ENABLE(); + + if(!ret) { + DEBUG_WIFI("[AP] set_config failed!\n"); + return false; + } - ETS_UART_INTR_DISABLE(); - if(WiFi._persistent) { - ret = wifi_softap_set_config(&conf); } else { - ret = wifi_softap_set_config_current(&conf); + DEBUG_WIFI("[AP] softap config unchanged\n"); } - ETS_UART_INTR_ENABLE(); - if(!ret) { - DEBUG_WIFI("[AP] set_config faild!"); + if(wifi_softap_dhcps_status() != DHCP_STARTED) { + DEBUG_WIFI("[AP] DHCP not started, starting...\n"); + if(!wifi_softap_dhcps_start()) { + DEBUG_WIFI("[AP] wifi_softap_dhcps_start failed!\n"); + ret = false; + } } + + // check IP config + struct ip_info ip; + if(wifi_get_ip_info(SOFTAP_IF, &ip)) { + if(ip.ip.addr == 0x00000000) { + // Invalid config + DEBUG_WIFI("[AP] IP config Invalid resetting...\n"); + //192.168.244.1 , 192.168.244.1 , 255.255.255.0 + ret = softAPConfig(0x01F4A8C0, 0x01F4A8C0, 0x00FFFFFF); + if(!ret) { + DEBUG_WIFI("[AP] softAPConfig failed!\n"); + ret = false; + } + } + } else { + DEBUG_WIFI("[AP] wifi_get_ip_info failed!\n"); + ret = false; + } + return ret; } @@ -148,24 +177,76 @@ bool ESP8266WiFiAPClass::softAP(const char* ssid, const char* passphrase, int ch * @param subnet subnet mask */ bool ESP8266WiFiAPClass::softAPConfig(IPAddress local_ip, IPAddress gateway, IPAddress subnet) { - + DEBUG_WIFI("[APConfig] local_ip: %s gateway: %s subnet: %s\n", local_ip.toString().c_str(), gateway.toString().c_str(), subnet.toString().c_str()); if(!WiFi.enableAP(true)) { // enable AP failed - DEBUG_WIFI("[AP] enableAP failed!"); + DEBUG_WIFI("[APConfig] enableAP failed!\n"); return false; } + bool ret = true; struct ip_info info; info.ip.addr = static_cast(local_ip); info.gw.addr = static_cast(gateway); info.netmask.addr = static_cast(subnet); - wifi_softap_dhcps_stop(); - if(wifi_set_ip_info(SOFTAP_IF, &info)) { - return wifi_softap_dhcps_start(); - } else { - DEBUG_WIFI("[AP] wifi_set_ip_info failed!"); + + if(!wifi_softap_dhcps_stop()) { + DEBUG_WIFI("[APConfig] wifi_softap_dhcps_stop failed!\n"); } - return false; + + if(!wifi_set_ip_info(SOFTAP_IF, &info)) { + DEBUG_WIFI("[APConfig] wifi_set_ip_info failed!\n"); + ret = false; + } + + struct dhcps_lease dhcp_lease; + IPAddress ip = local_ip; + ip[3] += 99; + dhcp_lease.start_ip.addr = static_cast(ip); + DEBUG_WIFI("[APConfig] DHCP IP start: %s\n", ip.toString().c_str()); + + ip[3] += 100; + dhcp_lease.end_ip.addr = static_cast(ip); + DEBUG_WIFI("[APConfig] DHCP IP end: %s\n", ip.toString().c_str()); + + if(!wifi_softap_set_dhcps_lease(&dhcp_lease)) { + DEBUG_WIFI("[APConfig] wifi_set_ip_info failed!\n"); + ret = false; + } + + // set lease time to 720min --> 12h + if(!wifi_softap_set_dhcps_lease_time(720)) { + DEBUG_WIFI("[APConfig] wifi_softap_set_dhcps_lease_time failed!\n"); + ret = false; + } + + uint8 mode = 1; + if(!wifi_softap_set_dhcps_offer_option(OFFER_ROUTER, &mode)) { + DEBUG_WIFI("[APConfig] wifi_softap_set_dhcps_offer_option failed!\n"); + ret = false; + } + + if(!wifi_softap_dhcps_start()) { + DEBUG_WIFI("[APConfig] wifi_softap_dhcps_start failed!\n"); + ret = false; + } + + // check config + if(wifi_get_ip_info(SOFTAP_IF, &info)) { + if(info.ip.addr == 0x00000000) { + DEBUG_WIFI("[AP] IP config Invalid?!\n"); + ret = false; + } else if(local_ip != info.ip.addr) { + ip = info.ip.addr; + DEBUG_WIFI("[AP] IP config not set correct?! new IP: %s\n", ip.toString().c_str()); + ret = false; + } + } else { + DEBUG_WIFI("[AP] wifi_get_ip_info failed!\n"); + ret = false; + } + + return ret; } @@ -188,6 +269,10 @@ bool ESP8266WiFiAPClass::softAPdisconnect(bool wifioff) { } ETS_UART_INTR_ENABLE(); + if(!ret) { + DEBUG_WIFI("[APdisconnect] set_config failed!\n"); + } + if(wifioff) { ret = WiFi.enableAP(false); }