Merge remote-tracking branch 'origin/wifi_leven_dev' into wifi_leven_dev

Former-commit-id: 6a75cfb

Author: maidnl

libraries/WiFiS3/src/WiFi.cpp

@@ -421,26 +421,45 @@ uint8_t CWifi::channel(uint8_t networkItem) {
 
 /* -------------------------------------------------------------------------- */ 
 const char* CWifi::SSID() {
-/* -------------------------------------------------------------------------- */    
-  return ""; 
+/* -------------------------------------------------------------------------- */
+   string res = "";
+   if(modem.write(string(PROMPT(_GETSSID)), res, CMD_READ(_GETSSID))) {
+      return res.c_str();
+   }
+   return "";
 }
 
 /* -------------------------------------------------------------------------- */ 
 uint8_t* CWifi::BSSID(uint8_t* bssid) {
 /* -------------------------------------------------------------------------- */    
-  return nullptr;
+   string res = "";
+   if(modem.write(string(PROMPT(_GETBSSID)), res, CMD_READ(_GETBSSID))) {
+      Serial.print("BSSID: ");
+      Serial.println(res.c_str());
+      macStr2macArray(bssid, res.c_str());
+      return bssid;
+   }
+   return nullptr;
 }
 
 /* -------------------------------------------------------------------------- */ 
 int32_t CWifi::RSSI() {
-/* -------------------------------------------------------------------------- */    
-  return 0;
+/* -------------------------------------------------------------------------- */
+   string res = "";
+   if(modem.write(string(PROMPT(_GETRSSI)), res, CMD_READ(_GETRSSI))) {
+      return atoi(res.c_str());
+   }
+   return 0;
 }
 
 /* -------------------------------------------------------------------------- */ 
-uint8_t CWifi::encryptionType() {
+const char* CWifi::softAPSSID() {
 /* -------------------------------------------------------------------------- */    
-  return 0;
+   string res = "";
+   if(modem.write(string(PROMPT(_GETSOFTAPSSID)), res, CMD_READ(_GETSOFTAPSSID))) {
+      return res.c_str();
+   }
+   return "";
 }
 
 /* -------------------------------------------------------------------------- */

libraries/WiFiS3/src/WiFi.h

@@ -177,7 +177,6 @@ class CWifi {
 
     /*
       * Return the current BSSID associated with the network.
-      * It is the MAC address of the Access Point
       *
       * return: pointer to uint8_t array with length WL_MAC_ADDR_LENGTH
       */
@@ -192,11 +191,12 @@ class CWifi {
     int32_t RSSI();
 
     /*
-      * Return the Encryption Type associated with the network
-      *
-      * return: one value of wl_enc_type enum
-      */
-    uint8_t encryptionType();
+     * Return the current SSID associated with to the soft AP
+     *
+     * return: ssid string
+     */
+    const char* softAPSSID();
+
 
     /*
      * Start scan WiFi networks available