From dd6333ee8b26dd9cc82dea252ba150e85c0ebb11 Mon Sep 17 00:00:00 2001 From: dav1901 <44604348+dav1901@users.noreply.github.com> Date: Sun, 23 Dec 2018 03:48:31 +0200 Subject: [PATCH] Add support for String args to softAP and begin (#5295) --- libraries/ESP8266WiFi/src/ESP8266WiFiAP.cpp | 3 +++ libraries/ESP8266WiFi/src/ESP8266WiFiAP.h | 1 + libraries/ESP8266WiFi/src/ESP8266WiFiSTA.cpp | 4 ++++ libraries/ESP8266WiFi/src/ESP8266WiFiSTA.h | 1 + 4 files changed, 9 insertions(+) diff --git a/libraries/ESP8266WiFi/src/ESP8266WiFiAP.cpp b/libraries/ESP8266WiFi/src/ESP8266WiFiAP.cpp index e93ff7b247..dd448f7a46 100644 --- a/libraries/ESP8266WiFi/src/ESP8266WiFiAP.cpp +++ b/libraries/ESP8266WiFi/src/ESP8266WiFiAP.cpp @@ -185,6 +185,9 @@ bool ESP8266WiFiAPClass::softAP(const char* ssid, const char* passphrase, int ch return ret; } +bool ESP8266WiFiAPClass::softAP(const String& ssid, const String& passphrase, int channel, int ssid_hidden, int max_connection) { + return softAP(ssid.c_str(), passphrase.c_str(), channel, ssid_hidden, max_connection); +} /** * Configure access point diff --git a/libraries/ESP8266WiFi/src/ESP8266WiFiAP.h b/libraries/ESP8266WiFi/src/ESP8266WiFiAP.h index 78156f102a..599c8e0e11 100644 --- a/libraries/ESP8266WiFi/src/ESP8266WiFiAP.h +++ b/libraries/ESP8266WiFi/src/ESP8266WiFiAP.h @@ -37,6 +37,7 @@ class ESP8266WiFiAPClass { public: bool softAP(const char* ssid, const char* passphrase = NULL, int channel = 1, int ssid_hidden = 0, int max_connection = 4); + bool softAP(const String& ssid,const String& passphrase = emptyString,int channel = 1,int ssid_hidden = 0,int max_connection = 4); bool softAPConfig(IPAddress local_ip, IPAddress gateway, IPAddress subnet); bool softAPdisconnect(bool wifioff = false); diff --git a/libraries/ESP8266WiFi/src/ESP8266WiFiSTA.cpp b/libraries/ESP8266WiFi/src/ESP8266WiFiSTA.cpp index 3e6967b705..105d70d692 100644 --- a/libraries/ESP8266WiFi/src/ESP8266WiFiSTA.cpp +++ b/libraries/ESP8266WiFi/src/ESP8266WiFiSTA.cpp @@ -190,6 +190,10 @@ wl_status_t ESP8266WiFiSTAClass::begin(char* ssid, char *passphrase, int32_t cha return begin((const char*) ssid, (const char*) passphrase, channel, bssid, connect); } +wl_status_t ESP8266WiFiSTAClass::begin(const String& ssid, const String& passphrase, int32_t channel, const uint8_t* bssid, bool connect) { + return begin(ssid.c_str(), passphrase.c_str(), channel, bssid, connect); +} + /** * Use to connect to SDK config. * @return wl_status_t diff --git a/libraries/ESP8266WiFi/src/ESP8266WiFiSTA.h b/libraries/ESP8266WiFi/src/ESP8266WiFiSTA.h index ea1d549134..7988005313 100644 --- a/libraries/ESP8266WiFi/src/ESP8266WiFiSTA.h +++ b/libraries/ESP8266WiFi/src/ESP8266WiFiSTA.h @@ -38,6 +38,7 @@ class ESP8266WiFiSTAClass { wl_status_t begin(const char* ssid, const char *passphrase = NULL, int32_t channel = 0, const uint8_t* bssid = NULL, bool connect = true); wl_status_t begin(char* ssid, char *passphrase = NULL, int32_t channel = 0, const uint8_t* bssid = NULL, bool connect = true); + wl_status_t begin(const String& ssid, const String& passphrase = emptyString, int32_t channel = 0, const uint8_t* bssid = NULL, bool connect = true); wl_status_t begin(); //The argument order for ESP is not the same as for Arduino. However, there is compatibility code under the hood