From 03c22787d21587fa930c01a1abf770da2d152390 Mon Sep 17 00:00:00 2001 From: Debarko De Date: Fri, 28 Dec 2018 00:32:51 +0530 Subject: [PATCH 1/4] Fix: Add Debug flag for compilation of wifiDebug() function --- code/espurna/wifi.ino | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/espurna/wifi.ino b/code/espurna/wifi.ino index 24889a37..173c2d30 100644 --- a/code/espurna/wifi.ino +++ b/code/espurna/wifi.ino @@ -467,6 +467,8 @@ void _wifiWebSocketOnAction(uint32_t client_id, const char * action, JsonObject& // INFO // ----------------------------------------------------------------------------- +#if DEBUG_SUPPORT + void wifiDebug(WiFiMode_t modes) { bool footer = false; @@ -516,6 +518,8 @@ void wifiDebug() { wifiDebug(WIFI_AP_STA); } +#endif //DEBUG_SUPPORT + // ----------------------------------------------------------------------------- // API // ----------------------------------------------------------------------------- From 4be9de04b6b044287d352793dd099cc251ea89bf Mon Sep 17 00:00:00 2001 From: Debarko De Date: Fri, 28 Dec 2018 00:39:24 +0530 Subject: [PATCH 2/4] Update: Add terminal support for wifiDebug --- code/espurna/wifi.ino | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/espurna/wifi.ino b/code/espurna/wifi.ino index 173c2d30..24b0b69b 100644 --- a/code/espurna/wifi.ino +++ b/code/espurna/wifi.ino @@ -467,7 +467,7 @@ void _wifiWebSocketOnAction(uint32_t client_id, const char * action, JsonObject& // INFO // ----------------------------------------------------------------------------- -#if DEBUG_SUPPORT +#if DEBUG_SUPPORT || TERMINAL_SUPPORT void wifiDebug(WiFiMode_t modes) { From 214080e852ba3a1b91899d8f7954588b97f3648c Mon Sep 17 00:00:00 2001 From: Debarko De Date: Fri, 28 Dec 2018 22:41:12 +0530 Subject: [PATCH 3/4] Update: Debug check position to make sure definition is not nullified to avoid putting checks in all places --- code/espurna/wifi.ino | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/code/espurna/wifi.ino b/code/espurna/wifi.ino index 24b0b69b..8fec1ca9 100644 --- a/code/espurna/wifi.ino +++ b/code/espurna/wifi.ino @@ -467,10 +467,9 @@ void _wifiWebSocketOnAction(uint32_t client_id, const char * action, JsonObject& // INFO // ----------------------------------------------------------------------------- -#if DEBUG_SUPPORT || TERMINAL_SUPPORT - void wifiDebug(WiFiMode_t modes) { + #if DEBUG_SUPPORT || TERMINAL_SUPPORT bool footer = false; if (((modes & WIFI_STA) > 0) && ((WiFi.getMode() & WIFI_STA) > 0)) { @@ -511,6 +510,7 @@ void wifiDebug(WiFiMode_t modes) { if (footer) { DEBUG_MSG_P(PSTR("[WIFI] ----------------------------------------------\n")); } + #endif //DEBUG_SUPPORT } @@ -518,8 +518,6 @@ void wifiDebug() { wifiDebug(WIFI_AP_STA); } -#endif //DEBUG_SUPPORT - // ----------------------------------------------------------------------------- // API // ----------------------------------------------------------------------------- From b205656ae3db1f307ec79af60ea3c73f13d895a8 Mon Sep 17 00:00:00 2001 From: Debarko De Date: Tue, 1 Jan 2019 23:08:21 +0530 Subject: [PATCH 4/4] Remove TELNET check as per recommendation --- code/espurna/wifi.ino | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/espurna/wifi.ino b/code/espurna/wifi.ino index 8fec1ca9..7ce93208 100644 --- a/code/espurna/wifi.ino +++ b/code/espurna/wifi.ino @@ -469,7 +469,7 @@ void _wifiWebSocketOnAction(uint32_t client_id, const char * action, JsonObject& void wifiDebug(WiFiMode_t modes) { - #if DEBUG_SUPPORT || TERMINAL_SUPPORT + #if DEBUG_SUPPORT bool footer = false; if (((modes & WIFI_STA) > 0) && ((WiFi.getMode() & WIFI_STA) > 0)) {