Diff: ESP8266Interface.h

Branch:

api-changes

Revision:

34:9c26a3dcdc1f

Parent:

30:c19f1e61063b

Child:

36:3d55c7187e34

--- a/ESP8266Interface.h	Mon Feb 22 23:56:33 2016 +0000
+++ b/ESP8266Interface.h	Mon Feb 22 23:53:46 2016 -0600
@@ -14,72 +14,45 @@
  * limitations under the License.
  */
 
-#ifndef ESP8266INTERFACE_H
-#define ESP8266INTERFACE_H
+#ifndef ESP8266_INTERFACE_H
+#define ESP8266_INTERFACE_H
 
 #include "WiFiInterface.h"
 #include "ESP8266.h"
-#include "DnsQuery.h"
+
+#define ESP8266_SOCKET_COUNT 5
 
-/** ESP8266Socket class.
-    This is a ESP8266 implementation of a socket that implements the SocketInterface class.
-    This mock ESP8266 hardware uses AT commands, so an ATParser is used to communicate with the hardware over serial.
-    In a non-AT command set, ATParser could be replaced by RawSerial or another hardware communication interface.
- */
- 
-class ESP8266Socket : public SocketInterface
-{
-public:
-    ESP8266Socket(uint32_t handle, ESP8266 &driver, socket_protocol_t type, uint8_t id);
-    virtual const char *getHostByName(const char *name) const;
-    virtual void setAddress(const char* addr) ;
-    virtual void setPort(uint16_t port) ;
-    virtual void setAddressPort(const char* addr, uint16_t port);
-    virtual const char *getAddress(void) const;
-    virtual uint16_t getPort(void) const;
-    virtual int32_t bind(uint16_t port) const;
-    virtual int32_t listen(void) const;
-    virtual int32_t accept() const;
-    virtual int32_t open() ;
-    virtual int32_t send(const void *data, uint32_t amount, uint32_t timeout_ms = 15000) ;
-    virtual uint32_t recv(void *data, uint32_t amount, uint32_t timeout_ms = 15000) ;
-    virtual int32_t close() const;
-    virtual uint32_t getHandle() const;
-    
-    uint8_t getID();
-    void handleRecieve();
-    
-protected:
-    uint8_t _id;    
-    ESP8266* _driver;
-};
-
-/** ESP8266Interface class.
-    This is an interface to a ESP8266 radio.
+/** ESP8266Interface class
+ *  Implementation of the NetworkInterface for the ESP8266
  */
 class ESP8266Interface : public WiFiInterface
 {
 public:
-    ESP8266Interface(PinName tx, PinName rx, uint8_t trace = 0);
-    virtual int32_t init(void);
-    virtual int32_t init(const char *ip, const char *mask, const char *gateway);
-    virtual int32_t connect(uint32_t timeout_ms) ;
-    virtual int32_t connect(const char *ap, const char *pass_phrase = 0, wifi_security_t security = WI_NONE, uint32_t timeout_ms = 15000);
-    virtual int32_t disconnect(void) ;
-    virtual char *getIPAddress(void) ;
-    virtual char *getGateway(void) const;
-    virtual char *getNetworkMask(void) const;
-    virtual char *getMACAddress(void) const;
-    virtual int32_t isConnected(void) ;
-    virtual SocketInterface *allocateSocket(socket_protocol_t socketProtocol) ;
-    virtual int deallocateSocket(SocketInterface *socket) ;
-    void getHostByName(const char *name, char* hostIP);
+    ESP8266Interface(PinName tx, PinName rx, bool debug = false);
+
+    // Implementation of WiFiInterface
+    virtual int32_t connect(
+        const char *ssid,
+        const char *pass,
+        wifi_security_t security = WI_NONE,
+        uint32_t timeout_ms = 1500);
+
+    virtual int32_t disconnect();
+
+    // Implementation of NetworkInterface
+    virtual const char *getIPAddress();
+    virtual const char *getMACAddress();
+
+    virtual SocketInterface *createSocket(socket_protocol_t proto);
+    virtual void destroySocket(SocketInterface *socket);
+
+private:
+    ESP8266 _esp;
     
-private:
-    ESP8266 esp8266;
-    static const int numSockets = 5;
-    int availableID[numSockets];
-    char ip[100];
+    bool _ids[ESP8266_SOCKET_COUNT];
+    const char *_ip_address;
+    const char *_mac_address;
 };
 
+
 #endif