WiFi: adapt to new mbed APIs

Author: facchinm

libraries/WiFi/src/WiFi.cpp

@@ -38,6 +38,32 @@ int arduino::WiFiClass::begin(char* ssid, const char *passphrase) {
     return ret == NSAPI_ERROR_OK ? WL_CONNECTED : WL_CONNECT_FAILED;
 }
 
+int arduino::WiFiClass::beginAP(const char* ssid, const char *passphrase, uint8_t channel) {
+
+#if defined(ARDUINO_ENVIE_M7) || defined(ARDUINO_ENVIE_M4)
+    softap = WhdSoftAPInterface::get_default_instance();
+#endif
+
+    if (softap == NULL) {
+        return WL_CONNECT_FAILED;
+    }
+
+    //Set ap ssid, password and channel
+    SocketAddress ip("192.168.3.1");
+    SocketAddress gw("192.168.3.1");
+    SocketAddress netmask("255.255.255.0");
+    ((WhdSoftAPInterface*)softap)->set_network(ip, gw, netmask);
+    nsapi_error_t ret = ((WhdSoftAPInterface*)softap)->start(ssid, passphrase, NSAPI_SECURITY_WPA2, channel, true /* dhcp server */, NULL, true /* cohexistance */);
+
+    return ret == NSAPI_ERROR_OK ? WL_AP_LISTENING : WL_CONNECT_FAILED;
+}
+
+void arduino::WiFiClass::end() {
+    if (softap != NULL) {
+        ((WhdSoftAPInterface*)softap)->stop();
+    }
+}
+
 char* arduino::WiFiClass::SSID() {
     return _ssid;
 }
@@ -136,13 +162,22 @@ uint8_t* arduino::WiFiClass::macAddress(uint8_t* mac) {
 arduino::IPAddress arduino::WiFiClass::localIP() {
     arduino::IPAddress addr;
 
-    const char *ip = wifi_if->get_ip_address();
-    addr.fromString(ip); // @todo: the IP we get from Mbed is correct, but is parsed incorrectly by Arduino
+    SocketAddress ip;
+    if (softap != NULL) {
+        softap->get_ip_address(&ip);
+    } else {
+        wifi_if->get_ip_address(&ip);
+    }
+    addr.fromString(ip.get_ip_address()); // @todo: the IP we get from Mbed is correct, but is parsed incorrectly by Arduino
     return addr;
 }
 
 NetworkInterface *arduino::WiFiClass::getNetwork() {
-    return wifi_if;
+    if (softap != NULL) {
+        return softap;
+    } else {
+        return wifi_if;
+    }
 }
 
 #if defined(ARDUINO_ENVIE_M7) || defined(ARDUINO_ENVIE_M4)

libraries/WiFi/src/WiFi.h

@@ -33,6 +33,10 @@ extern "C" {
 
 #include "netsocket/NetworkInterface.h"
 
+#if defined(ARDUINO_ENVIE_M7) || defined(ARDUINO_ENVIE_M4)
+#include "WhdSoftAPInterface.h"
+#endif
+
 namespace arduino {
 
 typedef void* (*voidPrtFuncPtr)(void);
@@ -86,10 +90,7 @@ class WiFiClass
      */
     int begin(char* ssid, const char *passphrase);
 
-    uint8_t beginAP(const char *ssid);
-    uint8_t beginAP(const char *ssid, uint8_t channel);
-    uint8_t beginAP(const char *ssid, const char* passphrase);
-    uint8_t beginAP(const char *ssid, const char* passphrase, uint8_t channel);
+    int beginAP(const char *ssid, const char* passphrase, uint8_t channel = 6);
 
     /* Change Ip configuration settings disabling the dhcp client
         *
@@ -279,6 +280,9 @@ class WiFiClass
     NetworkInterface *getNetwork();
 
 private:
+
+    EMACInterface* softap;
+
     bool isVisible(char* ssid);
     char* _ssid;
     WiFiInterface* wifi_if;

libraries/WiFi/src/WiFiClient.cpp

@@ -35,7 +35,8 @@ int arduino::WiFiClient::connect(const char *host, uint16_t port) {
 	//sock->sigio(mbed::callback(this, &WiFiClient::getStatus));
 	//sock->set_blocking(false);
 	sock->set_timeout(1000);
-	int ret = ((TCPSocket*)sock)->connect(host, port);
+	SocketAddress addr(host, port);
+	int ret = ((TCPSocket*)sock)->connect(addr);
 	if (ret == 0) {
 		return 1;
 	} else {
@@ -55,7 +56,8 @@ int arduino::WiFiClient::connectSSL(const char *host, uint16_t port) {
 		beforeConnect();
 	}
 	sock->set_timeout(1000);
-	int ret = ((TLSSocket*)sock)->connect(host, port);
+	SocketAddress addr(host, port);
+	int ret = ((TLSSocket*)sock)->connect(addr);
 	if (ret == 0) {
 		return 1;
 	} else {

libraries/WiFi/src/WiFiClient.h

@@ -52,6 +52,10 @@ class WiFiClient : public arduino::Client {
     return sock != NULL;
   }
 
+  void setSocket(Socket* _sock) {
+    sock = _sock;
+  }
+
   IPAddress remoteIP();
   uint16_t remotePort();
 

libraries/WiFi/src/WiFiServer.cpp

@@ -0,0 +1,39 @@
+#include "WiFiServer.h"
+#include "WiFiClient.h"
+
+extern WiFiClass WiFi;
+
+#ifndef WIFI_TCP_BUFFER_SIZE
+#define WIFI_TCP_BUFFER_SIZE        1508
+#endif
+
+arduino::WiFiServer::WiFiServer(uint16_t port) {
+	_port = port;
+}
+
+uint8_t arduino::WiFiServer::status() {
+	return 0;
+}
+
+void arduino::WiFiServer::begin() {
+	if (sock == NULL) {
+		sock = new TCPSocket(WiFi.getNetwork());
+	}
+	sock->bind(_port);
+	sock->listen(5);
+}
+
+size_t arduino::WiFiServer::write(uint8_t c) {
+	sock->send(&c, 1);
+}
+
+size_t arduino::WiFiServer::write(const uint8_t *buf, size_t size) {
+	sock->send(buf, size);
+}
+
+arduino::WiFiClient arduino::WiFiServer::available(uint8_t* status) {
+	WiFiClient ret;
+	TCPSocket* client = sock->accept();
+	ret.setSocket(client);
+	return ret;
+}

libraries/WiFi/src/WiFiServer.h

@@ -17,12 +17,12 @@
 #ifndef wifiserver_h
 #define wifiserver_h
 
-extern "C" {
-  #include "utility/wl_definitions.h"
-}
-
-#include "api/Server.h"
-#include "TCPServer.h"
+#include "WiFi.h"
+#include "api/Print.h"
+#include "api/Client.h"
+#include "api/IPAddress.h"
+#include "TLSSocket.h"
+#include "TCPSocket.h"
 
 namespace arduino {
 
@@ -31,10 +31,10 @@ class WiFiClient;
 class WiFiServer : public arduino::Server {
 private:
   uint16_t _port;
-  void*     pcb;
+  TCPSocket* sock;
 public:
   WiFiServer(uint16_t);
-  WiFiClient available(uint8_t* status = NULL);
+  arduino::WiFiClient available(uint8_t* status = NULL);
   void begin();
   virtual size_t write(uint8_t);
   virtual size_t write(const uint8_t *buf, size_t size);

libraries/WiFi/src/WiFiUdp.cpp

@@ -53,12 +53,14 @@ int arduino::WiFiUDP::endPacket() {
 // Write a single byte into the packet
 size_t arduino::WiFiUDP::write(uint8_t byte) {
     uint8_t buffer[1] = { byte };
-    return _socket.sendto(_host, _port, buffer, 1);
+    SocketAddress addr(_host, _port);
+    return _socket.sendto(addr, buffer, 1);
 }
 
 // Write size bytes from buffer into the packet
 size_t arduino::WiFiUDP::write(const uint8_t *buffer, size_t size) {
-    return _socket.sendto(_host, _port, buffer, size);
+    SocketAddress addr(_host, _port);
+    return _socket.sendto(addr, buffer, size);
 }
 
 int arduino::WiFiUDP::parsePacket() {