From f7dbb35c922125960e6bc74b50817181277baf70 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Fri, 22 May 2015 18:11:09 +0300 Subject: [PATCH] Fix case of WiFi.channel() method --- libraries/ESP8266WiFi/src/ESP8266WiFi.cpp | 4 ++-- libraries/ESP8266WiFi/src/ESP8266WiFi.h | 8 ++++---- libraries/ESP8266WiFi/src/ESP8266WiFiMulti.cpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp b/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp index 1ec6f8b36..5a3db6143 100644 --- a/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp +++ b/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp @@ -251,7 +251,7 @@ uint8_t* ESP8266WiFiClass::BSSID(void) return reinterpret_cast(conf.bssid); } -int32_t ESP8266WiFiClass::Channel(void) { +int32_t ESP8266WiFiClass::channel(void) { return wifi_get_channel(); } @@ -353,7 +353,7 @@ uint8_t * ESP8266WiFiClass::BSSID(uint8_t i) return it->bssid; } -int32_t ESP8266WiFiClass::Channel(uint8_t i) +int32_t ESP8266WiFiClass::channel(uint8_t i) { struct bss_info* it = reinterpret_cast(_getScanInfoByIndex(i)); if (!it) diff --git a/libraries/ESP8266WiFi/src/ESP8266WiFi.h b/libraries/ESP8266WiFi/src/ESP8266WiFi.h index f1a2977c3..1a3a7b366 100644 --- a/libraries/ESP8266WiFi/src/ESP8266WiFi.h +++ b/libraries/ESP8266WiFi/src/ESP8266WiFi.h @@ -160,7 +160,7 @@ public: * * return: channel */ - int32_t Channel(void); + int32_t channel(void); /* * Return the current network RSSI. Note: this is just a stub, there is no way to @@ -214,11 +214,11 @@ public: uint8_t * BSSID(uint8_t networkItem); /** - * return Channel of scanned wifi + * return channel of scanned wifi * @param networkItem specify from which network item want to get the information - * @return uint32_t Channel of scanned wifi + * @return uint32_t channel of scanned wifi */ - int32_t Channel(uint8_t networkItem); + int32_t channel(uint8_t networkItem); /** * return if the scanned wifi is Hidden (no SSID) diff --git a/libraries/ESP8266WiFi/src/ESP8266WiFiMulti.cpp b/libraries/ESP8266WiFi/src/ESP8266WiFiMulti.cpp index 7aab82ae0..e0a7ddeb2 100644 --- a/libraries/ESP8266WiFi/src/ESP8266WiFiMulti.cpp +++ b/libraries/ESP8266WiFi/src/ESP8266WiFiMulti.cpp @@ -123,7 +123,7 @@ wl_status_t ESP8266WiFiMulti::run(void) { DEBUG_WIFI_MULTI("[WIFI] SSID: %s\n", WiFi.SSID()); DEBUG_WIFI_MULTI("[WIFI] IP: %d.%d.%d.%d\n", ip[0], ip[1], ip[2], ip[3]); DEBUG_WIFI_MULTI("[WIFI] MAC: %02X:%02X:%02X:%02X:%02X:%02X\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); - DEBUG_WIFI_MULTI("[WIFI] Channel: %d\n", WiFi.Channel()); + DEBUG_WIFI_MULTI("[WIFI] Channel: %d\n", WiFi.channel()); break; case WL_NO_SSID_AVAIL: DEBUG_WIFI_MULTI("[WIFI] Connecting Faild AP not found.\n");