Merge pull request #75 from ARMmbed/mbed_lib_added

Added mbed_lib.json based default constructor

Author: Seppo Takalo

ESP8266Interface.cpp

@@ -21,9 +21,41 @@
 #include "nsapi_types.h"
 
 
+#ifndef MBED_CONF_ESP8266_TX
+#ifdef TARGET_FF_ARDUINO
+#define MBED_CONF_ESP8266_TX D1
+#else
+#define MBED_CONF_ESP8266_TX NC
+#endif
+#endif
+
+#ifndef MBED_CONF_ESP8266_RX
+#ifdef TARGET_FF_ARDUINO
+#define MBED_CONF_ESP8266_RX D0
+#else
+#define MBED_CONF_ESP8266_RX NC
+#endif
+#endif
+
 // Firmware version
 #define ESP8266_VERSION 2
 
+ESP8266Interface::ESP8266Interface()
+    : _esp(MBED_CONF_ESP8266_TX, MBED_CONF_ESP8266_RX, MBED_CONF_ESP8266_DEBUG),
+      _initialized(false),
+      _started(false)
+{
+    memset(_ids, 0, sizeof(_ids));
+    memset(_cbs, 0, sizeof(_cbs));
+    memset(ap_ssid, 0, sizeof(ap_ssid));
+    memset(ap_pass, 0, sizeof(ap_pass));
+    memset(_local_ports, 0, sizeof(_local_ports));
+    ap_sec = NSAPI_SECURITY_UNKNOWN;
+
+    _esp.sigio(this, &ESP8266Interface::event);
+    _esp.setTimeout();
+}
+
 // ESP8266Interface implementation
 ESP8266Interface::ESP8266Interface(PinName tx, PinName rx, bool debug)
     : _esp(tx, rx, debug),
@@ -271,24 +303,24 @@ int ESP8266Interface::socket_open(void **handle, nsapi_protocol_t proto)
 {
     // Look for an unused socket
     int id = -1;
- 
+
     for (int i = 0; i < ESP8266_SOCKET_COUNT; i++) {
         if (!_ids[i]) {
             id = i;
             _ids[i] = true;
             break;
         }
     }
- 
+
     if (id == -1) {
         return NSAPI_ERROR_NO_SOCKET;
     }
-    
+
     struct esp8266_socket *socket = new struct esp8266_socket;
     if (!socket) {
         return NSAPI_ERROR_NO_SOCKET;
     }
-    
+
     socket->id = id;
     socket->proto = proto;
     socket->connected = false;
@@ -305,7 +337,7 @@ int ESP8266Interface::socket_close(void *handle)
     if (!socket) {
         return NSAPI_ERROR_NO_SOCKET;
     }
- 
+
     if (socket->connected && !_esp.close(socket->id)) {
         err = NSAPI_ERROR_DEVICE_ERROR;
     }
@@ -372,7 +404,7 @@ int ESP8266Interface::socket_connect(void *handle, const SocketAddress &addr)
     socket->connected = true;
     return 0;
 }
-    
+
 int ESP8266Interface::socket_accept(void *server, void **socket, SocketAddress *addr)
 {
     return NSAPI_ERROR_UNSUPPORTED;
@@ -386,7 +418,7 @@ int ESP8266Interface::socket_send(void *handle, const void *data, unsigned size)
     if (!socket) {
         return NSAPI_ERROR_NO_SOCKET;
     }
- 
+
     status = _esp.send(socket->id, data, size);
 
     return status != NSAPI_ERROR_OK ? status : size;
@@ -395,7 +427,7 @@ int ESP8266Interface::socket_send(void *handle, const void *data, unsigned size)
 int ESP8266Interface::socket_recv(void *handle, void *data, unsigned size)
 {
     struct esp8266_socket *socket = (struct esp8266_socket *)handle;
- 
+
     if (!socket) {
         return NSAPI_ERROR_NO_SOCKET;
     }
@@ -409,7 +441,7 @@ int ESP8266Interface::socket_recv(void *handle, void *data, unsigned size)
     } else {
         recv = _esp.recv_udp(socket->id, data, size);
     }
- 
+
     return recv;
 }
 
@@ -439,7 +471,7 @@ int ESP8266Interface::socket_sendto(void *handle, const SocketAddress &addr, con
         }
         socket->addr = addr;
     }
-    
+
     return socket_send(socket, data, size);
 }
 

ESP8266Interface.h

@@ -29,6 +29,12 @@
 class ESP8266Interface : public NetworkStack, public WiFiInterface
 {
 public:
+    /**
+     * @brief ESP8266Interface default constructor
+     *        Will use values defined in mbed_lib.json
+     */
+    ESP8266Interface();
+
     /** ESP8266Interface lifetime
      * @param tx        TX pin
      * @param rx        RX pin

mbed_lib.json

@@ -0,0 +1,31 @@
+{
+    "name": "esp8266",
+    "config": {
+        "tx": {
+            "help": "TX pin for serial connection",
+            "value": null
+        },
+        "rx": {
+            "help": "RX pin for serial connection",
+            "value": null
+        },
+        "debug": {
+            "help": "Enable debug logs",
+            "value": false
+        }
+    },
+    "target_overrides": {
+         "HEXIWEAR": {
+            "tx": "PTD3",
+            "rx": "PTD2"
+        },
+        "NUCLEO_F401RE": {
+            "tx": "D8",
+            "rx": "D2"
+        },
+        "NUCLEO_F411RE": {
+            "tx": "D8",
+            "rx": "D2"
+        }
+    }
+}