Diff: ESP8266.cpp

Revision:

30:46a560b71e61

Parent:

29:75185b05d6a4

Child:

33:f721a46ef2f2

--- a/ESP8266.cpp	Wed Feb 04 14:27:30 2015 +0000
+++ b/ESP8266.cpp	Wed Feb 04 15:03:52 2015 +0000
@@ -18,41 +18,41 @@
     return m_uart.find("eady");
 }
 
-bool ESP8266::init(uint8_t mode, String ssid, String pwd, uint8_t chl, uint8_t ecn)
+bool ESP8266::setStationMode(String ssid, String pwd)
 {
-    if (mode == ESP8266_MODE_STA)
-    {   
-        bool b = confMode(mode);
-        if (!b)
-        {
-            return false;
-        }
-        reset();
-        confJAP(ssid, pwd);
+    if (!confMode(ESP8266_MODE_STA))
+    {
+        return false;
     }
-    else if (mode == ESP8266_MODE_SAP)
+    reset();
+    return confJAP(ssid, pwd);
+}
+
+bool ESP8266::setSoftAPMode(String sap_ssid, String sap_pwd,
+    ESP8266Channel chl, ESP8266Encrypstion ecn)
+{
+    if (!confMode(ESP8266_MODE_SAP))
     {
-        bool b = confMode(mode);
-        if (!b)
-        {
-            return false;
-        }
-        reset();
-        confSAP(ssid, pwd, chl, ecn);
+        return false;
     }
-    else if (mode == ESP8266_MODE_STA_SAP)
+    reset();
+    return confSAP(sap_ssid, sap_pwd, chl, ecn);
+}
+
+bool ESP8266::setStationSoftAPMode(String ssid, String pwd, 
+        String sap_ssid, String sap_pwd ,
+        ESP8266Channel chl, ESP8266Encrypstion ecn)
+{
+    if (!confMode(ESP8266_MODE_STA_SAP))
     {
-        bool b = confMode(mode);
-        if (!b)
-        {
-            return false;
-        }
-        reset();
-        confJAP(ssid, pwd);
-        confSAP(ssid, pwd, chl, ecn);
+        return false;
     }
-    
-    return true;
+    reset();
+    if (confJAP(ssid, pwd) && confSAP(sap_ssid, sap_pwd, chl, ecn)) {
+        return true;
+    } else {
+        return false;
+    }
 }