Revision 13:41098c907200, committed 2014-11-30

Comitter:

michaeljkoster

Date:

Sun Nov 30 21:14:09 2014 +0000

Parent:

12:c5f0eac67a8a

Child:

14:4d1128f72e00

Commit message:

First commit function templates for lightweight UDP client interface to ESP8266

Changed in this revision

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ESP8266/CBuffer.h	Sun Nov 30 21:14:09 2014 +0000
@@ -0,0 +1,75 @@
+/* Copyright (C) 2012 mbed.org, MIT License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+ * and associated documentation files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+ * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef CIRCBUFFER_H_
+#define CIRCBUFFER_H_
+
+template <class T>
+class CircBuffer {
+public:
+    CircBuffer(int length) {
+        write = 0;
+        read = 0;
+        size = length + 1;
+        buf = (T *)malloc(size * sizeof(T));
+    };
+
+    bool isFull() {
+        return (((write + 1) % size) == read);
+    };
+
+    bool isEmpty() {
+        return (read == write);
+    };
+
+    void queue(T k) {
+        if (isFull()) {
+            read++;
+            read %= size;
+        }
+        buf[write++] = k;
+        write %= size;
+    }
+    
+    void flush() {
+        read = 0;
+        write = 0;
+    }
+    
+
+    uint32_t available() {
+        return (write >= read) ? write - read : size - read + write;
+    };
+
+    bool dequeue(T * c) {
+        bool empty = isEmpty();
+        if (!empty) {
+            *c = buf[read++];
+            read %= size;
+        }
+        return(!empty);
+    };
+
+private:
+    volatile uint32_t write;
+    volatile uint32_t read;
+    uint32_t size;
+    T * buf;
+};
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ESP8266/ESP8266.cpp	Sun Nov 30 21:14:09 2014 +0000
@@ -0,0 +1,299 @@
+/* Copyright (C) 2012 mbed.org, MIT License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+ * and associated documentation files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+ * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include "mbed.h"
+#include "ESP8266.h"
+#include <string>
+#include <algorithm>
+
+//Debug is disabled by default
+#if (defined(DEBUG))
+#define DBG(x, ...) std::printf("[ESP8266 : DBG]"x"\r\n", ##__VA_ARGS__);
+#define WARN(x, ...) std::printf("[ESP8266 : WARN]"x"\r\n", ##__VA_ARGS__);
+#define ERR(x, ...) std::printf("[ESP8266 : ERR]"x"\r\n", ##__VA_ARGS__);
+#else
+#define DBG(x, ...)
+#define WARN(x, ...)
+#define ERR(x, ...)
+#endif
+
+#if defined(DEBUG)
+#define INFO(x, ...) printf("[ESP8266 : INFO]"x"\r\n", ##__VA_ARGS__);
+#else
+#define INFO(x, ...)
+#endif
+
+#define MAX_TRY_JOIN 3
+
+extern Serial pc;
+
+ESP8266 * ESP8266::inst;
+
+ESP8266::ESP8266(   PinName tx, PinName rx, PinName _reset, const char * ssid, const char * phrase ):
+    wifi(tx, rx), reset_pin(_reset), buf_ESP8266(256)
+{
+    memset(&state, 0, sizeof(state));
+
+    // change all ' ' in '$' in the ssid and the passphrase
+    strcpy(this->ssid, ssid);
+    for (int i = 0; i < strlen(ssid); i++) {
+        if (this->ssid[i] == ' ')
+            this->ssid[i] = '$';
+    }
+    strcpy(this->phrase, phrase);
+    for (int i = 0; i < strlen(phrase); i++) {
+        if (this->phrase[i] == ' ')
+            this->phrase[i] = '$';
+    }
+
+    inst = this;
+    attach_rx(false);
+}
+
+bool ESP8266::join()
+{
+
+    for (int i= 0; i < MAX_TRY_JOIN; i++) {
+
+        //join the network
+        state.associated = true;
+        INFO("\r\nssid: %s\r\nphrase: %s\r\nsecurity: %s\r\n\r\n", this->ssid, this->phrase);
+        return true;
+    }
+    return false;
+}
+
+bool ESP8266::connect()
+{
+    return join();
+}
+
+bool ESP8266::gethostbyname(const char * host, char * ip)
+{
+    string h = host;
+    int nb_digits = 0;
+
+    // no dns needed
+    int pos = h.find(".");
+    if (pos != string::npos) {
+        string sub = h.substr(0, h.find("."));
+        nb_digits = atoi(sub.c_str());
+    }
+    //printf("substrL %s\r\n", sub.c_str());
+    if (count(h.begin(), h.end(), '.') == 3 && nb_digits > 0) {
+        strcpy(ip, host);
+        return true;
+    }
+    else {
+        // dns needed, not currently available
+        return false;
+    }
+}
+
+void ESP8266::flush()
+{
+    buf_ESP8266.flush();
+}
+
+bool ESP8266::sendCommand(const char * cmd, const char * ack, char * res, int timeout)
+{
+    return true;
+}
+
+bool ESP8266::close()
+{
+    return true;
+}
+
+bool ESP8266::disconnect()
+{
+    // if already disconnected, return
+    if (!state.associated)
+        return true;
+    // send command to quit AP
+    //    
+    state.associated = false;
+    return true;
+
+}
+
+bool ESP8266::is_connected()
+{
+    return true;
+}
+
+
+void ESP8266::reset()
+{
+    reset_pin = 0;
+    wait(0.2);
+    reset_pin = 1;
+    wait(0.2);
+}
+
+bool ESP8266::reboot()
+{
+    return true;
+}
+
+int ESP8266::putc(char c)
+{
+    while (!wifi.writeable());
+    return wifi.putc(c);
+}
+
+int ESP8266::readable()
+{
+    return buf_ESP8266.available();
+}
+
+int ESP8266::writeable()
+{
+    return wifi.writeable();
+}
+
+char ESP8266::getc()
+{
+    char c;
+    while (!buf_ESP8266.available());
+    buf_ESP8266.dequeue(&c);
+    return c;
+}
+
+void ESP8266::handler_rx(void)
+{
+    //read characters
+    while (wifi.readable())
+        buf_ESP8266.queue(wifi.getc());
+}
+
+void ESP8266::attach_rx(bool callback)
+{
+    if (!callback)
+        wifi.attach(NULL);
+    else
+        wifi.attach(this, &ESP8266::handler_rx);
+}
+
+
+int ESP8266::send(const char * str, int len, const char * ACK, char * res, int timeout)
+{
+    char read;
+    size_t found = string::npos;
+    string checking;
+    Timer tmr;
+    int result = 0;
+
+    DBG("will send: %s\r\n",str);
+
+    attach_rx(false);
+
+    //We flush the buffer
+    while (wifi.readable())
+        wifi.getc();
+
+    if (!ACK || !strcmp(ACK, "NO")) {
+        for (int i = 0; i < len; i++)
+            result = (putc(str[i]) == str[i]) ? result + 1 : result;
+    } else {
+        //We flush the buffer
+        while (wifi.readable())
+            wifi.getc();
+
+        tmr.start();
+        for (int i = 0; i < len; i++)
+            result = (putc(str[i]) == str[i]) ? result + 1 : result;
+
+        while (1) {
+            if (tmr.read_ms() > timeout) {
+                //We flush the buffer
+                while (wifi.readable())
+                    wifi.getc();
+
+                DBG("check: %s\r\n", checking.c_str());
+
+                attach_rx(true);
+                return -1;
+            } else if (wifi.readable()) {
+                read = wifi.getc();
+                if ( read != '\r' && read != '\n') {
+                    checking += read;
+                    found = checking.find(ACK);
+                    if (found != string::npos) {
+                        wait(0.01);
+
+                        //We flush the buffer
+                        while (wifi.readable())
+                            wifi.getc();
+
+                        break;
+                    }
+                }
+            }
+        }
+        DBG("check: %s\r\n", checking.c_str());
+
+        attach_rx(true);
+        return result;
+    }
+
+    //the user wants the result from the command (ACK == NULL, res != NULL)
+    if ( res != NULL) {
+        int i = 0;
+        Timer timeout;
+        timeout.start();
+        tmr.reset();
+        while (1) {
+            if (timeout.read() > 2) {
+                if (i == 0) {
+                    res = NULL;
+                    break;
+                }
+                res[i] = '\0';
+                DBG("user str 1: %s\r\n", res);
+
+                break;
+            } else {
+                if (tmr.read_ms() > 300) {
+                    res[i] = '\0';
+                    DBG("user str: %s\r\n", res);
+
+                    break;
+                }
+                if (wifi.readable()) {
+                    tmr.start();
+                    read = wifi.getc();
+
+                    // we drop \r and \n
+                    if ( read != '\r' && read != '\n') {
+                        res[i++] = read;
+                    }
+                }
+            }
+        }
+        DBG("user str: %s\r\n", res);
+    }
+
+    //We flush the buffer
+    while (wifi.readable())
+        wifi.getc();
+
+    attach_rx(true);
+    DBG("result: %d\r\n", result)
+    return result;
+}
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ESP8266/ESP8266.h	Sun Nov 30 21:14:09 2014 +0000
@@ -0,0 +1,181 @@
+/* Copyright (C) 2012 mbed.org, MIT License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+ * and associated documentation files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+ * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * @section DESCRIPTION
+ *
+ * ESP8266 RN131-C, wifi module
+ *
+ * Datasheet:
+ *
+ * http://dlnmh9ip6v2uc.cloudfront.net/datasheets/Wireless/WiFi/ESP8266-RN-UM.pdf
+ */
+
+#ifndef ESP8266_H
+#define ESP8266_H
+
+#include "mbed.h"
+#include "CBuffer.h"
+
+#define DEFAULT_WAIT_RESP_TIMEOUT 500
+
+/**
+ * The ESP8266 class
+ */
+class ESP8266
+{
+
+public:
+    /**
+    * Constructor
+    *
+    * @param tx mbed pin to use for tx line of Serial interface
+    * @param rx mbed pin to use for rx line of Serial interface
+    * @param reset reset pin of the wifi module ()
+    * @param ssid ssid of the network
+    * @param phrase WEP, WPA or WPA2 key
+    */
+    ESP8266( PinName tx, PinName rx, PinName reset, const char * ssid, const char * phrase );
+
+    /**
+    * Connect the wifi module to the ssid contained in the constructor.
+    *
+    * @return true if connected, false otherwise
+    */
+    bool join();
+
+    /**
+    * Disconnect the ESP8266 module from the access point
+    *
+    * @return true if successful
+    */
+    bool disconnect();
+
+    /**
+    * Join to the access point and get DHCP settings
+    * @return true if successful
+    */
+    bool connect();
+    
+    /**
+    * Check connection to the access point
+    * @return true if successful
+    */
+    bool is_connected();
+
+    /**
+    * Reset the wifi module
+    */
+    void reset();
+    
+    /**
+    * Reboot the wifi module
+    */
+    bool reboot();
+
+    /**
+    * Check if characters are available
+    *
+    * @return number of available characters
+    */
+    int readable();
+
+    /**
+    * Check if characters are available
+    *
+    * @return number of available characters
+    */
+    int writeable();
+
+    /**
+    * Read a character
+    *
+    * @return the character read
+    */
+    char getc();
+
+    /**
+    * Flush the buffer
+    */
+    void flush();
+
+    /**
+    * Write a character
+    *
+    * @param the character which will be written
+    */
+    int putc(char c);
+
+    /**
+    * Close a tcp connection
+    *
+    * @return true if successful
+    */
+    bool close();
+    
+    /**
+    * Send a string to the wifi module by serial port. This function desactivates the user interrupt handler when a character is received to analyze the response from the wifi module.
+    * Useful to send a command to the module and wait a response.
+    *
+    *
+    * @param str string to be sent
+    * @param len string length
+    * @param ACK string which must be acknowledge by the wifi module. If ACK == NULL, no string has to be acknoledged. (default: "NO")
+    * @param res this field will contain the response from the wifi module, result of a command sent. This field is available only if ACK = "NO" AND res != NULL (default: NULL)
+    *
+    * @return true if ACK has been found in the response from the wifi module. False otherwise or if there is no response in 5s.
+    */
+    int send(const char * str, int len, const char * ACK = NULL, char * res = NULL, int timeout = DEFAULT_WAIT_RESP_TIMEOUT);
+
+    /**
+    * Send a command to the wify module. Check if the module is in command mode. If not enter in command mode
+    *
+    * @param str string to be sent
+    * @param ACK string which must be acknowledge by the wifi module. If ACK == NULL, no string has to be acknoledged. (default: "NO")
+    * @param res this field will contain the response from the wifi module, result of a command sent. This field is available only if ACK = "NO" AND res != NULL (default: NULL)
+    *
+    * @return true if successful
+    */
+    bool sendCommand(const char * cmd, const char * ack = NULL, char * res = NULL, int timeout = DEFAULT_WAIT_RESP_TIMEOUT);
+
+    bool gethostbyname(const char * host, char * ip);
+
+    static ESP8266 * getInstance() {
+        return inst;
+    };
+
+protected:
+    Serial wifi;
+    DigitalOut reset_pin;
+    char phrase[30];
+    char ssid[30];
+    const char * ip;
+    CircBuffer<char> buf_ESP8266;
+
+    static ESP8266 * inst;
+
+    void attach_rx(bool null);
+    void handler_rx(void);
+
+
+    typedef struct STATE {
+        bool associated;
+    } State;
+
+    State state;
+};
+
+#endif
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ESP8266Interface.cpp	Sun Nov 30 21:14:09 2014 +0000
@@ -0,0 +1,31 @@
+#include "ESP8266Interface.h"
+
+ESP8266Interface::ESP8266Interface( PinName tx, PinName rx, PinName reset,
+                                const char * ssid, const char * phrase ) :
+    ESP8266(tx, rx, reset, ssid, phrase )
+{
+    ip_set = false;
+}
+
+int ESP8266Interface::init()
+{
+    reset();
+    return 0;
+}
+
+int ESP8266Interface::connect()
+{
+    return join();
+}
+
+int ESP8266Interface::disconnect()
+{
+    return ESP8266::disconnect();
+}
+
+char * ESP8266Interface::getIPAddress()
+{
+    ip_set = true;
+
+    return ip_string;
+}
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ESP8266Interface.h	Sun Nov 30 21:14:09 2014 +0000
@@ -0,0 +1,73 @@
+/* ESP8266Interface.h */
+/* Copyright (C) 2012 mbed.org, MIT License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+ * and associated documentation files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+ * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+ 
+#ifndef ESP8266INTERFACE_H_
+#define ESP8266INTERFACE_H_
+
+#include "ESP8266.h"
+
+ /**
+ * Interface using ESP8266 to connect to an IP-based network
+ */
+class ESP8266Interface: public ESP8266 {
+public:
+
+    /**
+    * Constructor
+    *
+    * \param tx mbed pin to use for tx line of Serial interface
+    * \param rx mbed pin to use for rx line of Serial interface
+    * \param reset reset pin of the wifi module ()
+    * \param ssid ssid of the network
+    * \param phrase WEP or WPA key
+    */
+  ESP8266Interface(PinName tx, PinName rx, PinName reset, const char * ssid, const char * phrase );
+
+  /** Initialize the interface with DHCP.
+  * Initialize the interface and configure it to use DHCP (no connection at this point).
+  * \return 0 on success, a negative number on failure
+  */
+  int init(); //With DHCP
+
+  /** Connect
+  * Bring the interface up, start DHCP if needed.
+  * \return 0 on success, a negative number on failure
+  */
+  int connect();
+  
+  /** Disconnect
+  * Bring the interface down
+  * \return 0 on success, a negative number on failure
+  */
+  int disconnect();
+  
+  /** Get IP address
+  *
+  * \return ip address
+  */
+  char* getIPAddress();
+  
+private:
+    char ip_string[20];
+    bool ip_set;
+};
+
+#include "UDPSocket.h"
+
+#endif /* ESP8266INTERFACE_H_ */

--- a/Socket/Endpoint.cpp	Wed Oct 08 19:57:58 2014 +0000
+++ b/Socket/Endpoint.cpp	Sun Nov 30 21:14:09 2014 +0000
@@ -22,9 +22,9 @@
 using std::memset;
 
 Endpoint::Endpoint()  {
-    wifly = Wifly::getInstance();
-    if (wifly == NULL)
-        error("Endpoint constructor error: no wifly instance available!\r\n");
+    ESP8266 = ESP8266::getInstance();
+    if (ESP8266 == NULL)
+        error("Endpoint constructor error: no ESP8266 instance available!\r\n");
     reset_address();
 }
 Endpoint::~Endpoint() {}
@@ -36,7 +36,7 @@
 
 int Endpoint::set_address(const char* host, const int port) {
     //Resolve DNS address or populate hard-coded IP address
-    wifly->gethostbyname(host, _ipAddress);
+    ESP8266->gethostbyname(host, _ipAddress);
     _port = port;
     return 0;
 }

--- a/Socket/Endpoint.h	Wed Oct 08 19:57:58 2014 +0000
+++ b/Socket/Endpoint.h	Sun Nov 30 21:14:09 2014 +0000
@@ -18,7 +18,7 @@
 #ifndef ENDPOINT_H
 #define ENDPOINT_H
 
-#include "Wifly.h"
+#include "ESP8266.h"
 
 class UDPSocket;
 
@@ -59,7 +59,7 @@
 protected:
     char _ipAddress[16];
     int _port;
-    Wifly * wifly;
+    ESP8266 * ESP8266;
 };
 
 #endif

--- a/Socket/Socket.cpp	Wed Oct 08 19:57:58 2014 +0000
+++ b/Socket/Socket.cpp	Sun Nov 30 21:14:09 2014 +0000
@@ -20,9 +20,9 @@
 #include <cstring>
 
 Socket::Socket() : _blocking(true), _timeout(1500) {
-    wifi = Wifly::getInstance();
+    wifi = ESP8266::getInstance();
     if (wifi == NULL)
-        error("Socket constructor error: no wifly instance available!\r\n");
+        error("Socket constructor error: no ESP8266 instance available!\r\n");
 }
 
 void Socket::set_blocking(bool blocking, unsigned int timeout) {

--- a/Socket/Socket.h	Wed Oct 08 19:57:58 2014 +0000
+++ b/Socket/Socket.h	Sun Nov 30 21:14:09 2014 +0000
@@ -18,7 +18,7 @@
 #ifndef SOCKET_H_
 #define SOCKET_H_
 
-#include "Wifly.h"
+#include "ESP8266.h"
 
 /** Socket file descriptor and select wrapper
   */
@@ -44,7 +44,7 @@
 protected:
     bool _blocking;
     int _timeout;
-    Wifly * wifi;
+    ESP8266 * wifi;
 };
 
 

--- a/Socket/TCPSocketConnection.cpp	Wed Oct 08 19:57:58 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,125 +0,0 @@
-/* Copyright (C) 2012 mbed.org, MIT License
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
- * and associated documentation files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge, publish, distribute,
- * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or
- * substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include "TCPSocketConnection.h"
-#include <algorithm>
-
-TCPSocketConnection::TCPSocketConnection() {}
-
-int TCPSocketConnection::connect(const char* host, const int port)
-{  
-    if (!wifi->connect(host, port))
-        return -1;
-    wifi->flush();
-    return 0;
-}
-
-bool TCPSocketConnection::is_connected(void)
-{
-    return wifi->is_connected();
-}
-
-int TCPSocketConnection::send(char* data, int length)
-{
-    Timer tmr;
-
-    if (!_blocking) {
-        tmr.start();
-        while (tmr.read_ms() < _timeout) {
-            if (wifi->writeable())
-                break;
-        }
-        if (tmr.read_ms() >= _timeout) {
-            return -1;
-        }
-    }
-    return wifi->send(data, length);
-}
-
-// -1 if unsuccessful, else number of bytes written
-int TCPSocketConnection::send_all(char* data, int length)
-{
-    Timer tmr;
-    int idx = 0;
-    tmr.start();
-
-    while ((tmr.read_ms() < _timeout) || _blocking) {
-
-        idx += wifi->send(data, length);
-
-        if (idx == length)
-            return idx;
-    }
-    return (idx == 0) ? -1 : idx;
-}
-
-// -1 if unsuccessful, else number of bytes received
-int TCPSocketConnection::receive(char* data, int length)
-{
-    Timer tmr;
-    int time = -1;
-    
-    
-    if (!_blocking) {
-        tmr.start();
-        while (time < _timeout + 20) {
-            if (wifi->readable()) {
-                break;
-            }
-            time = tmr.read_ms();
-        }
-        if (time >= _timeout + 20) {
-            return -1;
-        }
-    }
-
-
-    while(!wifi->readable());
-    int nb_available = wifi->readable();
-    for (int i = 0; i < min(nb_available, length); i++) {
-        data[i] = wifi->getc();
-    }
-
-    return min(nb_available, length);
-}
-
-
-// -1 if unsuccessful, else number of bytes received
-int TCPSocketConnection::receive_all(char* data, int length)
-{
-    Timer tmr;
-    int idx = 0;
-    int time = -1;
-
-    tmr.start();
-    
-    while (time < _timeout || _blocking) {
-
-        int nb_available = wifi->readable();
-        for (int i = 0; i < min(nb_available, length); i++) {
-            data[idx++] = wifi->getc();
-        }
-
-        if (idx == length)
-            break;
-
-        time = tmr.read_ms();
-    }
-
-    return (idx == 0) ? -1 : idx;
-}

--- a/Socket/TCPSocketConnection.h	Wed Oct 08 19:57:58 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-/* Copyright (C) 2012 mbed.org, MIT License
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
- * and associated documentation files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge, publish, distribute,
- * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or
- * substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef TCPSOCKET_H
-#define TCPSOCKET_H
-
-#include "Socket.h"
-#include "Endpoint.h"
-
-/**
-TCP socket connection
-*/
-class TCPSocketConnection: public Socket, public Endpoint {
-    
-public:
-    /** TCP socket connection
-    */
-    TCPSocketConnection();
-    
-    /** Connects this TCP socket to the server
-    \param host The host to connect to. It can either be an IP Address or a hostname that will be resolved with DNS.
-    \param port The host's port to connect to.
-    \return 0 on success, -1 on failure.
-    */
-    int connect(const char* host, const int port);
-    
-    /** Check if the socket is connected
-    \return true if connected, false otherwise.
-    */
-    bool is_connected(void);
-    
-    /** Send data to the remote host.
-    \param data The buffer to send to the host.
-    \param length The length of the buffer to send.
-    \return the number of written bytes on success (>=0) or -1 on failure
-     */
-    int send(char* data, int length);
-    
-    /** Send all the data to the remote host.
-    \param data The buffer to send to the host.
-    \param length The length of the buffer to send.
-    \return the number of written bytes on success (>=0) or -1 on failure
-    */
-    int send_all(char* data, int length);
-    
-    /** Receive data from the remote host.
-    \param data The buffer in which to store the data received from the host.
-    \param length The maximum length of the buffer.
-    \return the number of received bytes on success (>=0) or -1 on failure
-     */
-    int receive(char* data, int length);
-    
-    /** Receive all the data from the remote host.
-    \param data The buffer in which to store the data received from the host.
-    \param length The maximum length of the buffer.
-    \return the number of received bytes on success (>=0) or -1 on failure
-    */
-    int receive_all(char* data, int length);
-};
-
-#endif

--- a/Socket/TCPSocketServer.cpp	Wed Oct 08 19:57:58 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-/* Copyright (C) 2012 mbed.org, MIT License
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
- * and associated documentation files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge, publish, distribute,
- * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or
- * substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include "TCPSocketServer.h"
-#include <string>
-
-TCPSocketServer::TCPSocketServer() {}
-
-// Server initialization
-int TCPSocketServer::bind(int port) {
-    char cmd[20];
-    
-    // set TCP protocol
-    wifi->setProtocol(TCP);
-    
-    // set local port
-    sprintf(cmd, "set i l %d\r", port);
-    if (!wifi->sendCommand(cmd, "AOK"))
-        return -1;
-    
-    // save
-    if (!wifi->sendCommand("save\r", "Stor"))
-        return -1;
-    
-    // reboot
-    wifi->reboot();
-    
-    // connect the network
-    if (wifi->isDHCP()) {
-        if (!wifi->sendCommand("join\r", "DHCP=ON", NULL, 10000))
-            return -1;
-    } else {
-        if (!wifi->sendCommand("join\r", "Associated", NULL, 10000))
-            return -1;
-    }
-        
-    // exit
-    wifi->exit();
-    
-    wait(0.2);
-    wifi->flush();
-    return 0;
-}
-
-int TCPSocketServer::listen(int backlog) {
-    if (backlog != 1)
-        return -1;
-    return 0;
-}
-
-
-int TCPSocketServer::accept(TCPSocketConnection& connection) {
-    int nb_available = 0, pos = 0;
-    char c;
-    string str;
-    bool o_find = false;
-    while (1) {
-        while(!wifi->readable());
-        nb_available = wifi->readable();
-        for (int i = 0; i < nb_available; i++) {
-            c = wifi->getc();
-            if (c == '*') {
-                o_find = true;
-            }
-            if (o_find && c != '\r' && c != '\n') {
-                str += c;
-                pos = str.find("*OPEN*");
-                if (pos != string::npos) {
-                    wifi->flush();
-                    return 0;
-                }
-            }
-        }
-    }
-}
\ No newline at end of file

--- a/Socket/TCPSocketServer.h	Wed Oct 08 19:57:58 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-/* Copyright (C) 2012 mbed.org, MIT License
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
- * and associated documentation files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge, publish, distribute,
- * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or
- * substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef TCPSOCKETSERVER_H
-#define TCPSOCKETSERVER_H
-
-#include "Socket/Socket.h"
-#include "TCPSocketConnection.h"
-
-/** TCP Server.
-  */
-class TCPSocketServer : public Socket {
-  public:
-    /** Instantiate a TCP Server.
-    */
-    TCPSocketServer();
-    
-    /** Bind a socket to a specific port.
-    \param port The port to listen for incoming connections on.
-    \return 0 on success, -1 on failure.
-    */
-    int bind(int port);
-    
-    /** Start listening for incoming connections.
-    \param backlog number of pending connections that can be queued up at any
-                   one time [Default: 1].
-    \return 0 on success, -1 on failure.
-    */
-    int listen(int backlog=1);
-    
-    /** Accept a new connection.
-    \param connection A TCPSocketConnection instance that will handle the incoming connection.
-    \return 0 on success, -1 on failure.
-    */
-    int accept(TCPSocketConnection& connection);
-};
-
-#endif

--- a/Socket/UDPSocket.cpp	Wed Oct 08 19:57:58 2014 +0000
+++ b/Socket/UDPSocket.cpp	Sun Nov 30 21:14:09 2014 +0000
@@ -31,44 +31,12 @@
 
 int UDPSocket::init(void)
 {
-    wifi->setProtocol(UDP);
-    wifi->exit();
     return 0;
 }
 
 // Server initialization
 int UDPSocket::bind(int port)
 {
-    char cmd[17];
-    
-    // set local port
-    sprintf(cmd, "set i l %d\n\r", port);
-    if (!wifi->sendCommand(cmd, "AOK")){
-        pc.printf("bind to port failed\r\n");
-        return -1;}
-        
-    // save
-    //if (!wifi->sendCommand("save\n\r", "Stor"))
-        //return -1;
-    
-    // reboot
-    //wifi->reboot();
-    
-    // set udp protocol
-    //wifi->setProtocol(UDP);
-    /*
-    // connect the network
-    if (wifi->isDHCP()) {
-        if (!wifi->sendCommand("join\n\r", "DHCP=ON", NULL, 10000))
-            return -1;
-    } else {
-        if (!wifi->sendCommand("join\n\r", "Associated", NULL, 10000))
-            return -1;
-    }
-    */    
-    // exit
-    wifi->exit();
-    wifi->flush();
     return 0;
 }
 
@@ -133,57 +101,10 @@
 
 bool UDPSocket::confEndpoint(Endpoint & ep)
 {
-    char * host;
-    char cmd[30];
-    if (!endpoint_configured) {
-        host = ep.get_address();
-        if (host[0] != '\0') {
-            // set host
-            sprintf(cmd, "set i h %s\r\n", host);
-            if (!wifi->sendCommand(cmd, "AOK"))
-                return false;
-                
-            // set remote port
-            sprintf(cmd, "set i r %d\r\n", ep.get_port());
-            if (!wifi->sendCommand(cmd, "AOK"))
-                return false;
-                
-            wifi->exit();
-            endpoint_configured = true;
-            return true;
-        }
-    }
     return true;
 }
 
 bool UDPSocket::readEndpoint(Endpoint & ep)
 {
-    char recv[256];
-    int begin = 0;
-    int end = 0;
-    string str;
-    string addr;
-    int port;
-    if (!endpoint_read) {
-        if (!wifi->sendCommand("get ip\r\n", NULL, recv))
-            return false;
-        wifi->exit();
-        str = recv;
-        begin = str.find("HOST=");
-        end = str.find("PROTO=");
-        if (begin != string::npos && end != string::npos) {
-            str = str.substr(begin + 5, end - begin - 5);
-            int pos = str.find(":");
-            if (pos != string::npos) {
-                addr = str.substr(0, pos);
-                port = atoi(str.substr(pos + 1).c_str());
-                ep.set_address(addr.c_str(), port);
-                endpoint_read = true;
-                wifi->flush();
-                return true;
-            }
-        }
-        wifi->flush();
-    }
     return false;
 }

--- a/Wifly/CBuffer.h	Wed Oct 08 19:57:58 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-/* Copyright (C) 2012 mbed.org, MIT License
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
- * and associated documentation files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge, publish, distribute,
- * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or
- * substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef CIRCBUFFER_H_
-#define CIRCBUFFER_H_
-
-template <class T>
-class CircBuffer {
-public:
-    CircBuffer(int length) {
-        write = 0;
-        read = 0;
-        size = length + 1;
-        buf = (T *)malloc(size * sizeof(T));
-    };
-
-    bool isFull() {
-        return (((write + 1) % size) == read);
-    };
-
-    bool isEmpty() {
-        return (read == write);
-    };
-
-    void queue(T k) {
-        if (isFull()) {
-            read++;
-            read %= size;
-        }
-        buf[write++] = k;
-        write %= size;
-    }
-    
-    void flush() {
-        read = 0;
-        write = 0;
-    }
-    
-
-    uint32_t available() {
-        return (write >= read) ? write - read : size - read + write;
-    };
-
-    bool dequeue(T * c) {
-        bool empty = isEmpty();
-        if (!empty) {
-            *c = buf[read++];
-            read %= size;
-        }
-        return(!empty);
-    };
-
-private:
-    volatile uint32_t write;
-    volatile uint32_t read;
-    uint32_t size;
-    T * buf;
-};
-
-#endif

--- a/Wifly/Wifly.cpp	Wed Oct 08 19:57:58 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,553 +0,0 @@
-/* Copyright (C) 2012 mbed.org, MIT License
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
- * and associated documentation files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge, publish, distribute,
- * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or
- * substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include "mbed.h"
-#include "Wifly.h"
-#include <string>
-#include <algorithm>
-
-//Debug is disabled by default
-#if (defined(DEBUG))
-#define DBG(x, ...) std::printf("[Wifly : DBG]"x"\r\n", ##__VA_ARGS__);
-#define WARN(x, ...) std::printf("[Wifly : WARN]"x"\r\n", ##__VA_ARGS__);
-#define ERR(x, ...) std::printf("[Wifly : ERR]"x"\r\n", ##__VA_ARGS__);
-#else
-#define DBG(x, ...)
-#define WARN(x, ...)
-#define ERR(x, ...)
-#endif
-
-#if defined(DEBUG)
-#define INFO(x, ...) printf("[Wifly : INFO]"x"\r\n", ##__VA_ARGS__);
-#else
-#define INFO(x, ...)
-#endif
-
-#define MAX_TRY_JOIN 3
-
-extern Serial pc;
-
-Wifly * Wifly::inst;
-
-Wifly::Wifly(   PinName tx, PinName rx, PinName _reset, PinName tcp_status, const char * ssid, const char * phrase, Security sec):
-    wifi(tx, rx), reset_pin(_reset), tcp_status(tcp_status), buf_wifly(256)
-{
-    memset(&state, 0, sizeof(state));
-    state.sec = sec;
-
-    // change all ' ' in '$' in the ssid and the passphrase
-    strcpy(this->ssid, ssid);
-    for (int i = 0; i < strlen(ssid); i++) {
-        if (this->ssid[i] == ' ')
-            this->ssid[i] = '$';
-    }
-    strcpy(this->phrase, phrase);
-    for (int i = 0; i < strlen(phrase); i++) {
-        if (this->phrase[i] == ' ')
-            this->phrase[i] = '$';
-    }
-
-    inst = this;
-    attach_rx(false);
-    state.cmd_mode = false;
-}
-
-bool Wifly::join()
-{
-    char cmd[20];
-
-    for (int i= 0; i < MAX_TRY_JOIN; i++) {
-
-        // no auto join
-        if (!sendCommand("set w j 0\r\n", "AOK"))
-            continue;
-
-        //no echo
-        if (!sendCommand("set u m 1\r\n", "AOK"))
-            continue;
-
-        // set time
-        if (!sendCommand("set c t 30\r\n", "AOK"))
-            continue;
-
-        // set size
-        if (!sendCommand("set c s 1024\r\n", "AOK"))
-            continue;
-
-        // red led on when tcp connection active
-        if (!sendCommand("set s i 0x40\r\n", "AOK"))
-            continue;
-
-        // no string sent to the tcp client
-        if (!sendCommand("set c r 0\r\n", "AOK"))
-            continue;
-
-        // tcp protocol
-        if (!sendCommand("set i p 2\r\n", "AOK"))
-            continue;
-
-        // tcp retry
-        if (!sendCommand("set i f 0x7\r\n", "AOK"))
-            continue;
-            
-        // set dns server
-        if (!sendCommand("set d n rn.microchip.com\r\n", "AOK"))
-            continue;
-
-        //dhcp
-        sprintf(cmd, "set i d %d\r\n", (state.dhcp) ? 1 : 0);
-        if (!sendCommand(cmd, "AOK"))
-            continue;
-
-        // ssid
-        sprintf(cmd, "set w s %s\r\n", ssid);
-        if (!sendCommand(cmd, "AOK", NULL, 1000))
-            continue;
-
-        //auth
-        sprintf(cmd, "set w a %d\r\n", state.sec);
-        if (!sendCommand(cmd, "AOK"))
-            continue;
-
-        // if no dhcp, set ip, netmask and gateway
-        if (!state.dhcp) {
-            DBG("not dhcp\r\n");
-
-            sprintf(cmd, "set i a %s\r\n", ip);
-            if (!sendCommand(cmd, "AOK"))
-                continue;
-
-            sprintf(cmd, "set i n %s\r\n", netmask);
-            if (!sendCommand(cmd, "AOK"))
-                continue;
-
-            sprintf(cmd, "set i g %s\r", gateway);
-            if (!sendCommand(cmd, "AOK"))
-                continue;
-        }
-
-        //key step
-        if (state.sec != NONE) {
-            if (state.sec == WPA)
-                sprintf(cmd, "set w p %s\r\n", phrase);
-            else if (state.sec == WEP_128)
-                sprintf(cmd, "set w k %s\r\n", phrase);
-
-            if (!sendCommand(cmd, "AOK", NULL, 1000))
-                continue;
-        }
-
-        //join the network
-        sprintf(cmd, "join\r\n");
-        if (!sendCommand(cmd, "Associated", NULL, 3000))
-            continue;
-        
-        if (!sendCommand("", "IP=", NULL, 10000))
-            continue;
-
-        if (state.dhcp) {
-            if (!sendCommand("get i\r\n", "DHCP=ON", NULL, 3000))
-                continue;
-        }
-
-        if (!sendCommand("save\r\n", "Stor"))
-            continue;
-
-        exit();
-
-        state.associated = true;
-        INFO("\r\nssid: %s\r\nphrase: %s\r\nsecurity: %s\r\n\r\n", this->ssid, this->phrase, getStringSecurity());
-        return true;
-    }
-    return false;
-}
-
-
-bool Wifly::setProtocol(Protocol p)
-{
-    // use udp auto pairing
-    char cmd[20];
-    sprintf(cmd, "set i p %d\r\n", p);
-    if (!sendCommand(cmd, "AOK"))
-        return false;
-
-    switch(p) {
-        case TCP:
-            // set ip flags: tcp retry enabled
-            if (!sendCommand("set i f 0x07\r\n", "AOK"))
-                return false;
-            break;
-        case UDP:
-            // set ip flags: udp auto pairing enabled
-            if (!sendCommand("set i h 0.0.0.0\r\n", "AOK"))
-                return false;
-            if (!sendCommand("set i f 0x40\r\n", "AOK"))
-//            if (!sendCommand("set i f 0x00\r\n", "AOK")) // TEST turn off autopairing
-                return false;
-            break;
-    }
-    state.proto = p;
-    return true;
-}
-
-char * Wifly::getStringSecurity()
-{
-    switch(state.sec) {
-        case NONE:
-            return "NONE";
-        case WEP_128:
-            return "WEP_128";
-        case WPA:
-            return "WPA";
-    }
-    return "UNKNOWN";
-}
-
-bool Wifly::connect(const char * host, int port)
-{
-    char rcv[20];
-    char cmd[20];
-
-    // try to open
-    sprintf(cmd, "open %s %d\r\n", host, port);
-    if (sendCommand(cmd, "OPEN", NULL, 10000)) {
-        state.tcp = true;
-        state.cmd_mode = false;
-        return true;
-    }
-
-    // if failed, retry and parse the response
-    if (sendCommand(cmd, NULL, rcv, 5000)) {
-        if (strstr(rcv, "OPEN") == NULL) {
-            if (strstr(rcv, "Connected") != NULL) {
-                wait(0.25);
-                if (!sendCommand("close\r\n", "CLOS"))
-                    return false;
-                wait(0.25);
-                if (!sendCommand(cmd, "OPEN", NULL, 10000))
-                    return false;
-            } else {
-                return false;
-            }
-        }
-    } else {
-        return false;
-    }
-
-    state.tcp = true;
-    state.cmd_mode = false;
-
-    return true;
-}
-
-
-bool Wifly::gethostbyname(const char * host, char * ip)
-{
-    string h = host;
-    char cmd[30], rcv[100];
-    int l = 0;
-    char * point;
-    int nb_digits = 0;
-
-    // no dns needed
-    int pos = h.find(".");
-    if (pos != string::npos) {
-        string sub = h.substr(0, h.find("."));
-        nb_digits = atoi(sub.c_str());
-    }
-    //printf("substrL %s\r\n", sub.c_str());
-    if (count(h.begin(), h.end(), '.') == 3 && nb_digits > 0) {
-        strcpy(ip, host);
-    }
-    // dns needed
-    else {
-        nb_digits = 0;
-        sprintf(cmd, "lookup %s\r\n", host);
-        if (!sendCommand(cmd, NULL, rcv))
-            return false;
-
-        // look for the ip address
-        char * begin = strstr(rcv, "=") + 1;
-        for (int i = 0; i < 3; i++) {
-            point = strstr(begin + l, ".");
-            DBG("str: %s", begin + l);
-            l += point - (begin + l) + 1;
-        }
-        DBG("str: %s", begin + l);
-        while(*(begin + l + nb_digits) >= '0' && *(begin + l + nb_digits) <= '9') {
-            DBG("digit: %c", *(begin + l + nb_digits));
-            nb_digits++;
-        }
-        memcpy(ip, begin, l + nb_digits);
-        ip[l+nb_digits] = 0;
-        DBG("ip from dns: %s", ip);
-    }
-    return true;
-}
-
-
-void Wifly::flush()
-{
-    buf_wifly.flush();
-}
-
-bool Wifly::sendCommand(const char * cmd, const char * ack, char * res, int timeout)
-{
-    if (!state.cmd_mode) {
-        cmdMode();
-    }
-    if (send(cmd, strlen(cmd), ack, res, timeout) == -1) {
-        ERR("sendCommand: cannot %s\r\n", cmd);
-        exit();
-        return false;
-    }
-    return true;
-}
-
-bool Wifly::cmdMode()
-{
-    // if already in cmd mode, return
-    if (state.cmd_mode)
-        return true;
-        
-    if (send("$$$", 3, "CMD") == -1 && send("\r",1,">") != true) {
-        ERR("cannot enter in cmd mode\r\n");
-        exit();
-        return false;
-    }
-    state.cmd_mode = true;
-    return true;
-}
-
-bool Wifly::disconnect()
-{
-    // if already disconnected, return
-    if (!state.associated)
-        return true;
-
-    if (!sendCommand("leave\r", "DeAuth"))
-        return false;
-    exit();
-
-    state.associated = false;
-    return true;
-
-}
-
-bool Wifly::is_connected()
-{
-    return (tcp_status.read() ==  1) ? true : false;
-}
-
-
-void Wifly::reset()
-{
-    reset_pin = 0;
-    wait(0.2);
-    reset_pin = 1;
-    wait(0.2);
-}
-
-bool Wifly::reboot()
-{
-    // if already in cmd mode, return
-    if (!sendCommand("reboot\r\n"))
-        return false;
-    
-    wait(0.3);
-
-    state.cmd_mode = false;
-    return true;
-}
-
-bool Wifly::close()
-{
-    // if not connected, return
-    if (!state.tcp)
-        return true;
-
-    wait(0.25);
-    if (!sendCommand("close\r\n", "CLOS"))
-        return false;
-    exit();
-
-    state.tcp = false;
-    return true;
-}
-
-
-int Wifly::putc(char c)
-{
-    while (!wifi.writeable());
-    return wifi.putc(c);
-}
-
-
-bool Wifly::exit()
-{
-    flush();
-    if (!state.cmd_mode)
-        return true;
-    if (!sendCommand("exit\r\n", "EXIT"))
-        return false;
-    state.cmd_mode = false;
-    flush();
-    return true;
-}
-
-
-int Wifly::readable()
-{
-    return buf_wifly.available();
-}
-
-int Wifly::writeable()
-{
-    return wifi.writeable();
-}
-
-char Wifly::getc()
-{
-    char c;
-    while (!buf_wifly.available());
-    buf_wifly.dequeue(&c);
-    return c;
-}
-
-void Wifly::handler_rx(void)
-{
-    //read characters
-    while (wifi.readable())
-        buf_wifly.queue(wifi.getc());
-}
-
-void Wifly::attach_rx(bool callback)
-{
-    if (!callback)
-        wifi.attach(NULL);
-    else
-        wifi.attach(this, &Wifly::handler_rx);
-}
-
-
-int Wifly::send(const char * str, int len, const char * ACK, char * res, int timeout)
-{
-    char read;
-    size_t found = string::npos;
-    string checking;
-    Timer tmr;
-    int result = 0;
-
-    DBG("will send: %s\r\n",str);
-
-    attach_rx(false);
-
-    //We flush the buffer
-    while (wifi.readable())
-        wifi.getc();
-
-    if (!ACK || !strcmp(ACK, "NO")) {
-        for (int i = 0; i < len; i++)
-            result = (putc(str[i]) == str[i]) ? result + 1 : result;
-    } else {
-        //We flush the buffer
-        while (wifi.readable())
-            wifi.getc();
-
-        tmr.start();
-        for (int i = 0; i < len; i++)
-            result = (putc(str[i]) == str[i]) ? result + 1 : result;
-
-        while (1) {
-            if (tmr.read_ms() > timeout) {
-                //We flush the buffer
-                while (wifi.readable())
-                    wifi.getc();
-
-                DBG("check: %s\r\n", checking.c_str());
-
-                attach_rx(true);
-                return -1;
-            } else if (wifi.readable()) {
-                read = wifi.getc();
-                if ( read != '\r' && read != '\n') {
-                    checking += read;
-                    found = checking.find(ACK);
-                    if (found != string::npos) {
-                        wait(0.01);
-
-                        //We flush the buffer
-                        while (wifi.readable())
-                            wifi.getc();
-
-                        break;
-                    }
-                }
-            }
-        }
-        DBG("check: %s\r\n", checking.c_str());
-
-        attach_rx(true);
-        return result;
-    }
-
-    //the user wants the result from the command (ACK == NULL, res != NULL)
-    if ( res != NULL) {
-        int i = 0;
-        Timer timeout;
-        timeout.start();
-        tmr.reset();
-        while (1) {
-            if (timeout.read() > 2) {
-                if (i == 0) {
-                    res = NULL;
-                    break;
-                }
-                res[i] = '\0';
-                DBG("user str 1: %s\r\n", res);
-
-                break;
-            } else {
-                if (tmr.read_ms() > 300) {
-                    res[i] = '\0';
-                    DBG("user str: %s\r\n", res);
-
-                    break;
-                }
-                if (wifi.readable()) {
-                    tmr.start();
-                    read = wifi.getc();
-
-                    // we drop \r and \n
-                    if ( read != '\r' && read != '\n') {
-                        res[i++] = read;
-                    }
-                }
-            }
-        }
-        DBG("user str: %s\r\n", res);
-    }
-
-    //We flush the buffer
-    while (wifi.readable())
-        wifi.getc();
-
-    attach_rx(true);
-    DBG("result: %d\r\n", result)
-    return result;
-}
\ No newline at end of file

--- a/Wifly/Wifly.h	Wed Oct 08 19:57:58 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,242 +0,0 @@
-/* Copyright (C) 2012 mbed.org, MIT License
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
- * and associated documentation files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge, publish, distribute,
- * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or
- * substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * @section DESCRIPTION
- *
- * Wifly RN131-C, wifi module
- *
- * Datasheet:
- *
- * http://dlnmh9ip6v2uc.cloudfront.net/datasheets/Wireless/WiFi/WiFly-RN-UM.pdf
- */
-
-#ifndef WIFLY_H
-#define WIFLY_H
-
-#include "mbed.h"
-#include "CBuffer.h"
-
-#define DEFAULT_WAIT_RESP_TIMEOUT 500
-
-enum Security {
-    NONE = 0,
-    WEP_128 = 1,
-    WPA = 3,
-    WPA2 = 4,
-};
-
-enum Protocol {
-    UDP = (1 << 0),
-    TCP = (1 << 1)
-};
-
-/**
- * The Wifly class
- */
-class Wifly
-{
-
-public:
-    /**
-    * Constructor
-    *
-    * @param tx mbed pin to use for tx line of Serial interface
-    * @param rx mbed pin to use for rx line of Serial interface
-    * @param reset reset pin of the wifi module ()
-    * @param tcp_status connection status pin of the wifi module (GPIO 6)
-    * @param ssid ssid of the network
-    * @param phrase WEP, WPA or WPA2 key
-    * @param sec Security type (NONE, WEP_128 or WPA, WPA2)
-    */
-    Wifly(  PinName tx, PinName rx, PinName reset, PinName tcp_status, const char * ssid, const char * phrase, Security sec);
-
-    /**
-    * Connect the wifi module to the ssid contained in the constructor.
-    *
-    * @return true if connected, false otherwise
-    */
-    bool join();
-
-    /**
-    * Disconnect the wifly module from the access point
-    *
-    * @return true if successful
-    */
-    bool disconnect();
-
-    /**
-    * Open a tcp connection with the specified host on the specified port
-    *
-    * @param host host (can be either an ip address or a name. If a name is provided, a dns request will be established)
-    * @param port port
-    * @return true if successful
-    */
-    bool connect(const char * host, int port);
-
-
-    /**
-    * Set the protocol (UDP or TCP)
-    *
-    * @param p protocol
-    * @return true if successful
-    */
-    bool setProtocol(Protocol p);
-
-    /**
-    * Reset the wifi module
-    */
-    void reset();
-    
-    /**
-    * Reboot the wifi module
-    */
-    bool reboot();
-
-    /**
-    * Check if characters are available
-    *
-    * @return number of available characters
-    */
-    int readable();
-
-    /**
-    * Check if characters are available
-    *
-    * @return number of available characters
-    */
-    int writeable();
-
-    /**
-    * Check if a tcp link is active
-    *
-    * @return true if successful
-    */
-    bool is_connected();
-
-    /**
-    * Read a character
-    *
-    * @return the character read
-    */
-    char getc();
-
-    /**
-    * Flush the buffer
-    */
-    void flush();
-
-    /**
-    * Write a character
-    *
-    * @param the character which will be written
-    */
-    int putc(char c);
-
-
-    /**
-    * To enter in command mode (we can configure the module)
-    *
-    * @return true if successful, false otherwise
-    */
-    bool cmdMode();
-
-    /**
-    * To exit the command mode
-    *
-    * @return true if successful, false otherwise
-    */
-    bool exit();
-
-    /**
-    * Close a tcp connection
-    *
-    * @return true if successful
-    */
-    bool close();
-
-    /**
-    * Send a string to the wifi module by serial port. This function desactivates the user interrupt handler when a character is received to analyze the response from the wifi module.
-    * Useful to send a command to the module and wait a response.
-    *
-    *
-    * @param str string to be sent
-    * @param len string length
-    * @param ACK string which must be acknowledge by the wifi module. If ACK == NULL, no string has to be acknoledged. (default: "NO")
-    * @param res this field will contain the response from the wifi module, result of a command sent. This field is available only if ACK = "NO" AND res != NULL (default: NULL)
-    *
-    * @return true if ACK has been found in the response from the wifi module. False otherwise or if there is no response in 5s.
-    */
-    int send(const char * str, int len, const char * ACK = NULL, char * res = NULL, int timeout = DEFAULT_WAIT_RESP_TIMEOUT);
-
-    /**
-    * Send a command to the wify module. Check if the module is in command mode. If not enter in command mode
-    *
-    * @param str string to be sent
-    * @param ACK string which must be acknowledge by the wifi module. If ACK == NULL, no string has to be acknoledged. (default: "NO")
-    * @param res this field will contain the response from the wifi module, result of a command sent. This field is available only if ACK = "NO" AND res != NULL (default: NULL)
-    *
-    * @return true if successful
-    */
-    bool sendCommand(const char * cmd, const char * ack = NULL, char * res = NULL, int timeout = DEFAULT_WAIT_RESP_TIMEOUT);
-    
-    /**
-    * Return true if the module is using dhcp
-    *
-    * @return true if the module is using dhcp
-    */
-    bool isDHCP() {
-        return state.dhcp;
-    }
-
-    bool gethostbyname(const char * host, char * ip);
-
-    static Wifly * getInstance() {
-        return inst;
-    };
-
-protected:
-    Serial wifi;
-    DigitalOut reset_pin;
-    DigitalIn tcp_status;
-    char phrase[30];
-    char ssid[30];
-    const char * ip;
-    const char * netmask;
-    const char * gateway;
-    int channel;
-    CircBuffer<char> buf_wifly;
-
-    static Wifly * inst;
-
-    void attach_rx(bool null);
-    void handler_rx(void);
-
-
-    typedef struct STATE {
-        bool associated;
-        bool tcp;
-        bool dhcp;
-        Security sec;
-        Protocol proto;
-        bool cmd_mode;
-    } State;
-
-    State state;
-    char * getStringSecurity();
-};
-
-#endif
\ No newline at end of file

--- a/WiflyInterface.cpp	Wed Oct 08 19:57:58 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-#include "WiflyInterface.h"
-
-WiflyInterface::WiflyInterface( PinName tx, PinName rx, PinName reset, PinName tcp_status,
-                                const char * ssid, const char * phrase, Security sec) :
-    Wifly(tx, rx, reset, tcp_status, ssid, phrase, sec)
-{
-    ip_set = false;
-}
-
-int WiflyInterface::init()
-{
-    state.dhcp = true;
-    reset();
-    return 0;
-}
-
-int WiflyInterface::init(const char* ip, const char* mask, const char* gateway)
-{
-    state.dhcp = false;
-    this->ip = ip;
-    strcpy(ip_string, ip);
-    ip_set = true;
-    this->netmask = mask;
-    this->gateway = gateway;
-    reset();
-
-    return 0;
-}
-
-int WiflyInterface::connect()
-{
-    return join();
-}
-
-int WiflyInterface::disconnect()
-{
-    return Wifly::disconnect();
-}
-
-char * WiflyInterface::getIPAddress()
-{
-    char * match = 0;
-    if (!ip_set) {
-        if (!sendCommand("get ip a\r\n", NULL, ip_string))
-            return NULL;
-        exit();
-        flush();
-        match = strstr(ip_string, "<");
-        if (match != NULL) {
-            *match = '\0';
-        }
-        if (strlen(ip_string) < 6) {
-            match = strstr(ip_string, ">");
-            if (match != NULL) {
-                int len = strlen(match + 1);
-                memcpy(ip_string, match + 1, len);
-            }
-        }
-        ip_set = true;
-    }
-    return ip_string;
-}
\ No newline at end of file

--- a/WiflyInterface.h	Wed Oct 08 19:57:58 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-/* WiflyInterface.h */
-/* Copyright (C) 2012 mbed.org, MIT License
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
- * and associated documentation files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge, publish, distribute,
- * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or
- * substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
- 
-#ifndef WIFLYINTERFACE_H_
-#define WIFLYINTERFACE_H_
-
-#include "Wifly.h"
-
- /**
- * Interface using Wifly to connect to an IP-based network
- */
-class WiflyInterface: public Wifly {
-public:
-
-    /**
-    * Constructor
-    *
-    * \param tx mbed pin to use for tx line of Serial interface
-    * \param rx mbed pin to use for rx line of Serial interface
-    * \param reset reset pin of the wifi module ()
-    * \param tcp_status connection status pin of the wifi module (GPIO 6)
-    * \param ssid ssid of the network
-    * \param phrase WEP or WPA key
-    * \param sec Security type (NONE, WEP_128 or WPA)
-    */
-  WiflyInterface(PinName tx, PinName rx, PinName reset, PinName tcp_status, const char * ssid, const char * phrase, Security sec = NONE);
-
-  /** Initialize the interface with DHCP.
-  * Initialize the interface and configure it to use DHCP (no connection at this point).
-  * \return 0 on success, a negative number on failure
-  */
-  int init(); //With DHCP
-
-  /** Initialize the interface with a static IP address.
-  * Initialize the interface and configure it with the following static configuration (no connection at this point).
-  * \param ip the IP address to use
-  * \param mask the IP address mask
-  * \param gateway the gateway to use
-  * \return 0 on success, a negative number on failure
-  */
-  int init(const char* ip, const char* mask, const char* gateway);
-
-  /** Connect
-  * Bring the interface up, start DHCP if needed.
-  * \return 0 on success, a negative number on failure
-  */
-  int connect();
-  
-  /** Disconnect
-  * Bring the interface down
-  * \return 0 on success, a negative number on failure
-  */
-  int disconnect();
-  
-  /** Get IP address
-  *
-  * \return ip address
-  */
-  char* getIPAddress();
-  
-private:
-    char ip_string[20];
-    bool ip_set;
-};
-
-#include "TCPSocketConnection.h"
-#include "TCPSocketServer.h"
-#include "UDPSocket.h"
-
-#endif /* WIFLYINTERFACE_H_ */