Splitting the definition of Wifi interface from socket wrapper

Author: andreagilardoni

libraries/WiFi/library.properties

@@ -0,0 +1,10 @@
+name=WiFi
+version=1.0.0
+author=Arduino
+maintainer=Arduino <[email protected]>
+sentence=Enables WIFI connection
+paragraph=With this library you can use the WiFi to connect to Internet.
+category=Communication
+url=https://github.com/arduino/ArduinoCore-zephyr/tree/master/libraries/WiFi
+architectures=renesas,renesas_portenta
+includes=WiFi.h

libraries/SocketWrapper/WiFi.cpp renamed to libraries/WiFi/src/WiFi.cpp

@@ -16,7 +16,7 @@ class WiFiClass: public NetworkInterface
     WiFiClass() {}
     ~WiFiClass() {}
 
-    bool begin(const char* ssid, const char* passphrase, wl_enc_type security = ENC_TYPE_UNKNOWN, bool blocking = false) {
+    int begin(const char* ssid, const char* passphrase, wl_enc_type security = ENC_TYPE_UNKNOWN, bool blocking = true) {
         sta_iface = net_if_get_wifi_sta();
         netif = sta_iface;
         sta_config.ssid = (const uint8_t *)ssid;
@@ -37,10 +37,10 @@ class WiFiClass: public NetworkInterface
 
         NetworkInterface::begin(false, NET_EVENT_WIFI_MASK);
         if (blocking) {
-            net_mgmt_event_wait_on_iface(sta_iface, NET_EVENT_WIFI_AP_STA_CONNECTED, NULL, NULL, NULL, K_FOREVER);
+            net_mgmt_event_wait_on_iface(sta_iface, NET_EVENT_WIFI_CONNECT_RESULT, NULL, NULL, NULL, K_FOREVER);
         }
 
-        return true;
+        return status();
     }
 
     bool beginAP(char* ssid, char* passphrase, int channel = WIFI_CHANNEL_ANY, bool blocking = false) {
@@ -75,14 +75,14 @@ class WiFiClass: public NetworkInterface
     }
 
     int status() {
-        struct wifi_iface_status status = { 0 };
-
-        if (net_mgmt(NET_REQUEST_WIFI_IFACE_STATUS, netif, &status,
+        sta_iface = net_if_get_wifi_sta();
+        netif = sta_iface;
+        if (net_mgmt(NET_REQUEST_WIFI_IFACE_STATUS, netif, &sta_state,
                 sizeof(struct wifi_iface_status))) {
             return WL_NO_SHIELD;
         }
 
-	    if (status.state >= WIFI_STATE_ASSOCIATED) {
+	    if (sta_state.state >= WIFI_STATE_ASSOCIATED) {
             return WL_CONNECTED;
         } else {
             return WL_DISCONNECTED;
@@ -94,12 +94,28 @@ class WiFiClass: public NetworkInterface
         // TODO: borrow code from mbed core for scan results handling
     }
 
+    char* SSID() {
+        if (status() == WL_CONNECTED) {
+            return (char *)sta_state.ssid;
+        }
+        return nullptr;
+    }
+
+    int32_t RSSI() {
+        if (status() == WL_CONNECTED) {
+            return sta_state.rssi;
+        }
+        return 0;
+    }
+
 private:
     struct net_if *sta_iface = nullptr;
     struct net_if *ap_iface = nullptr;
 
     struct wifi_connect_req_params ap_config;
     struct wifi_connect_req_params sta_config;
+
+    struct wifi_iface_status sta_state = { 0 };
 };
 
 extern WiFiClass WiFi;