restoring CWiFi methods to extract scanned access point info

Author: andreagilardoni

libraries/WiFi/src/WiFi.cpp

@@ -208,6 +208,36 @@ uint8_t CWifi::channel() {
 }
 /* -------------------------------------------------------------------------- */
 
+/* -------------------------------------------------------------------------- */
+const char* CWifi::SSID(uint8_t networkItem) {
+    return WiFiStation.getSSID(networkItem);
+}
+/* -------------------------------------------------------------------------- */
+
+/* -------------------------------------------------------------------------- */
+int32_t CWifi::RSSI(uint8_t networkItem) {
+    return WiFiStation.getRSSI(networkItem);
+}
+/* -------------------------------------------------------------------------- */
+
+/* -------------------------------------------------------------------------- */
+uint8_t CWifi::encryptionType(uint8_t networkItem) {
+    return WiFiStation.getEncrType(networkItem);
+}
+/* -------------------------------------------------------------------------- */
+
+/* -------------------------------------------------------------------------- */
+uint8_t* CWifi::BSSID(uint8_t networkItem, uint8_t* bssid) {
+    return WiFiStation.getBSSID(networkItem,bssid);
+}
+/* -------------------------------------------------------------------------- */
+
+/* -------------------------------------------------------------------------- */
+uint8_t CWifi::channel(uint8_t networkItem) {
+    return WiFiStation.getChannel(networkItem);
+}
+/* -------------------------------------------------------------------------- */
+
 /* -------------------------------------------------------------------------- */
 uint8_t CWifi::status() { // FIXME
 /* -------------------------------------------------------------------------- */

libraries/WiFi/src/WiFiC3.h

@@ -171,10 +171,10 @@ class CWifi {
     int32_t RSSI();
 
     /*
-      * Return the Encryption Type associated with the network
-      *
-      * return: one value of wl_enc_type enum
-      */
+     * Return the Encryption Type associated with the network
+     *
+     * return: one value of wl_enc_type enum
+     */
     uint8_t encryptionType();
 
     /*
@@ -183,6 +183,45 @@ class CWifi {
      * return: Number of discovered networks
      */
     int8_t scanNetworks();
+    /*
+     * Return the SSID discovered during the network scan.
+     *
+     * param networkItem: specify from which network item want to get the information
+     *
+     * return: SSID string of the specified item on the networks scanned list
+     */
+    const char*   SSID(uint8_t networkItem);
+
+    /*
+     * Return the encryption type of the networks discovered during the scanNetworks
+     *
+     * param networkItem: specify from which network item want to get the information
+     *
+     * return: encryption type (enum wl_enc_type) of the specified item on the networks scanned list
+     *    enum wl_enc_type :
+     *    ENC_TYPE_WEP,
+     *    ENC_TYPE_WPA,
+     *    ENC_TYPE_WPA2,
+     *    ENC_TYPE_WPA2_ENTERPRISE,
+     *    ENC_TYPE_WPA3,
+     *    ENC_TYPE_NONE,
+     *    ENC_TYPE_AUTO,
+     *    ENC_TYPE_UNKNOWN = 255
+     */
+    uint8_t encryptionType(uint8_t networkItem);
+
+    uint8_t* BSSID(uint8_t networkItem, uint8_t* bssid);
+    uint8_t channel(uint8_t networkItem);
+
+    /*
+     * Return the RSSI of the networks discovered during the scanNetworks
+     *
+     * param networkItem: specify from which network item want to get the information
+     *
+     * return: signed value of RSSI of the specified item on the networks scanned list
+     */
+    int32_t RSSI(uint8_t networkItem);
+
 
     uint8_t channel();
 

libraries/lwIpWrapper/src/CNetIf.cpp

@@ -811,6 +811,43 @@ uint8_t CWifiStation::getChannel() {
     return (uint8_t)access_point_cfg.channel;
 }
 
+const char* CWifiStation::getSSID(uint8_t i)
+{
+    if (access_points.size() > 0 && i < access_points.size()) {
+        return (const char*)access_points[i].ssid;
+    }
+    return nullptr;
+}
+
+int32_t CWifiStation::getRSSI(uint8_t i) {
+    if (access_points.size() > 0 && i < access_points.size()) {
+        return (int32_t)access_points[i].rssi;
+    }
+    return 0;
+}
+
+uint8_t CWifiStation::getEncrType(uint8_t i) {
+    if (access_points.size() > 0 && i < access_points.size()) {
+        return Encr2wl_enc(access_points[i].encryption_mode);
+    }
+    return 0;
+}
+
+uint8_t* CWifiStation::getBSSID(uint8_t i, uint8_t* bssid) {
+    if (access_points.size() > 0 && i < access_points.size()) {
+        CNetUtilities::macStr2macArray(bssid, (const char*)access_points[i].bssid);
+        return bssid;
+    }
+    return nullptr;
+}
+
+uint8_t CWifiStation::getChannel(uint8_t i) {
+    if (access_points.size() > 0 && i < access_points.size()) {
+        return (uint8_t)access_points[i].channel;
+    }
+    return 0;
+}
+
 int CWifiStation::setLowPowerMode() {
     return CEspControl::getInstance().setPowerSaveMode(1);
 }

libraries/lwIpWrapper/src/CNetIf.h

@@ -259,6 +259,12 @@ class CWifiStation : public CNetIf {
     virtual uint8_t getEncryptionType();
     virtual uint8_t getChannel();
 
+    const char* getSSID(uint8_t i);
+    int32_t getRSSI(uint8_t i);
+    uint8_t getEncrType(uint8_t i);
+    uint8_t* getBSSID(uint8_t i, uint8_t* bssid);
+    uint8_t getChannel(uint8_t i);
+
     int setLowPowerMode();
     int resetLowPowerMode();
 protected: