fixup! Initial UART HW flow control support

Author: Veijo Pesonen

ESP8266/ESP8266.cpp

@@ -16,7 +16,7 @@
 
 #include "ESP8266.h"
 #include "Callback.h"
-#include "mbed_debug.h"
+#include "mbed_error.h"
 #include "nsapi_types.h"
 #include "PinNames.h"
 
@@ -25,11 +25,6 @@
 #define ESP8266_DEFAULT_BAUD_RATE   115200
 #define ESP8266_ALL_SOCKET_IDS      -1
 
-// Big enough, target specific
-#ifndef MBED_CONF_ESP8266_SOCKET_BUFSIZE
-#define MBED_CONF_ESP8266_SOCKET_BUFSIZE 102400
-#endif
-
 ESP8266::ESP8266(PinName tx, PinName rx, bool debug, PinName rts, PinName cts)
     : _serial(tx, rx, ESP8266_DEFAULT_BAUD_RATE),
       _serial_rts(rts),
@@ -83,33 +78,24 @@ int ESP8266::get_firmware_version()
 bool ESP8266::start_uart_hw_flow_ctrl(void)
 {
     bool done = true;
-    static const int DATABITS_8 = 8;  // 8-bit data
-    static const int STOPBITS_1 = 1;  // 1-bit stop bit
-    static const int PARITY_NONE = 0; // None
-    static const int FC_RTS = 1;      // Flow Control RTS
-    static const int FC_CTS = 2;      // Flow Control CTS
-    static const int FC_RTSCTS = 3;   // Flow Control RTS&CTS
 
     if (_serial_rts != NC && _serial_cts != NC) {
         // Start board's flow control
         _serial.set_flow_control(SerialBase::RTSCTS, _serial_rts, _serial_cts);
 
         // Start ESP8266's flow control
-        done = _parser.send("AT+UART_CUR=%u,%u,%u,%u,%u", ESP8266_DEFAULT_BAUD_RATE, DATABITS_8, STOPBITS_1,
-                PARITY_NONE, FC_RTSCTS)
-                        && _parser.recv("OK\n");
+        done = _parser.send("AT+UART_CUR=%u,8,1,0,3", ESP8266_DEFAULT_BAUD_RATE)
+            && _parser.recv("OK\n");
+
     } else if (_serial_rts != NC) {
         _serial.set_flow_control(SerialBase::RTS, _serial_rts, NC);
 
-        // Start ESP8266's flow control
-        done = _parser.send("AT+UART_CUR=%u,%u,%u,%u,%u", ESP8266_DEFAULT_BAUD_RATE, DATABITS_8, STOPBITS_1,
-                PARITY_NONE, FC_CTS)
-                        && _parser.recv("OK\n");
+        done = _parser.send("AT+UART_CUR=%u,8,1,0,2", ESP8266_DEFAULT_BAUD_RATE)
+            && _parser.recv("OK\n");
+
     } else if (_serial_cts != NC) {
-        // Start ESP8266's flow control
-        done = _parser.send("AT+UART_CUR=%u,%u,%u,%u,%u", ESP8266_DEFAULT_BAUD_RATE, DATABITS_8, STOPBITS_1,
-                PARITY_NONE, FC_RTS)
-                        && _parser.recv("OK\n");
+        done = _parser.send("AT+UART_CUR=%u,8,1,0,1", ESP8266_DEFAULT_BAUD_RATE)
+            && _parser.recv("OK\n");
 
         _serial.set_flow_control(SerialBase::CTS, NC, _serial_cts);
     }
@@ -435,16 +421,16 @@ void ESP8266::_packet_handler()
 
     pdu_len = sizeof(struct packet) + amount;
 
-    if ((_heap_usage + pdu_len) > _MAX_HEAP_USAGE) {
-        debug("ESP8266: socket buffer max memory limit exceeded, either increase socket buffer size from mbed_lib.json or enable UART HW flow control\n");
-        MBED_ASSERT(false);
+    if ((_heap_usage + pdu_len) > MBED_CONF_ESP8266_SOCKET_BUFSIZE) {
+        MBED_WARNING(MBED_MAKE_ERROR(MBED_MODULE_DRIVER, MBED_ERROR_CODE_ENOBUFS), \
+                "ESP8266::_packet_handler(): \"esp8266.socket-bufsize\"-limit exceeded, packet dropped");
         return;
     }
 
     struct packet *packet = (struct packet*)malloc(pdu_len);
     if (!packet) {
-        debug("ESP8266: could not allocate memory for RX data\n");
-        MBED_ASSERT(packet);
+        MBED_WARNING(MBED_MAKE_ERROR(MBED_MODULE_DRIVER, MBED_ERROR_CODE_ENOMEM), \
+                "ESP8266::_packet_handler(): Could not allocate memory for RX data");
         return;
     }
     _heap_usage += pdu_len;
@@ -457,7 +443,6 @@ void ESP8266::_packet_handler()
     if (_parser.read((char*)(packet + 1), amount) < amount) {
         free(packet);
         _heap_usage -= pdu_len;
-        MBED_ASSERT(_heap_usage >= 0);
         return;
     }
 
@@ -498,11 +483,10 @@ int32_t ESP8266::recv_tcp(int id, void *data, uint32_t amount, uint32_t timeout)
 
                 _smutex.unlock();
 
-                uint32_t alloc_len = q->alloc_len;
+                uint32_t pdu_len = sizeof(struct packet) + q->alloc_len;
                 uint32_t len = q->len;
                 free(q);
-                _heap_usage -= sizeof(struct packet) + alloc_len;
-                MBED_ASSERT(_heap_usage >= 0);
+                _heap_usage -= pdu_len;
                 return len;
             } else { // return only partial packet
                 memcpy(data, q+1, amount);
@@ -555,11 +539,9 @@ int32_t ESP8266::recv_udp(int id, void *data, uint32_t amount, uint32_t timeout)
             *p = (*p)->next;
             _smutex.unlock();
 
-            uint32_t alloc_len = q->alloc_len;
+            uint32_t pdu_len = sizeof(struct packet) + q->alloc_len;
             free(q);
-			_heap_usage -= sizeof(struct packet) + alloc_len;
-	        MBED_ASSERT(_heap_usage >= 0);
-
+            _heap_usage -= pdu_len;
             return len;
         }
     }
@@ -575,23 +557,19 @@ void ESP8266::_clear_socket_packets(int id)
     while (*p) {
         if ((*p)->id == id || id == ESP8266_ALL_SOCKET_IDS) {
             struct packet *q = *p;
-            int alloc_len = q->alloc_len;
+            int pdu_len = sizeof(struct packet) + q->alloc_len;
 
             if (_packets_end == &(*p)->next) {
                 _packets_end = p; // Set last packet next field/_packets
             }
             *p = (*p)->next;
-            _heap_usage -= sizeof(struct packet) + alloc_len;
-
             free(q);
+            _heap_usage -= pdu_len;
         } else {
             // Point to last packet next field
             p = &(*p)->next;
         }
     }
-    if (id == ESP8266_ALL_SOCKET_IDS) {
-        MBED_ASSERT(_heap_usage == 0);
-    }
 }
 
 bool ESP8266::close(int id)

ESP8266/ESP8266.h

@@ -20,7 +20,6 @@
 #include "ATCmdParser.h"
 #include "nsapi_types.h"
 #include "rtos.h"
-#include "UARTSerial.h"
 
 // Various timeouts for different ESP8266 operations
 #ifndef ESP8266_CONNECT_TIMEOUT
@@ -316,8 +315,7 @@ class ESP8266
     int _socket_open[SOCKET_COUNT];
     nsapi_connection_status_t _connection_status;
     Callback<void(nsapi_event_t, intptr_t)> _connection_status_cb;
-    static const int32_t _MAX_HEAP_USAGE = MBED_CONF_ESP8266_SOCKET_BUFSIZE;
-    int32_t _heap_usage;
+    size_t _heap_usage;
 };
 
 #endif

ESP8266Interface.cpp

@@ -37,18 +37,6 @@
 #endif
 #endif
 
-#ifndef MBED_CONF_ESP8266_DEBUG
-#define MBED_CONF_ESP8266_DEBUG false
-#endif
-
-#ifndef MBED_CONF_ESP8266_RTS
-#define MBED_CONF_ESP8266_RTS NC
-#endif
-
-#ifndef MBED_CONF_ESP8266_CTS
-#define MBED_CONF_ESP8266_CTS NC
-#endif
-
 // Firmware version
 #define ESP8266_VERSION 2
 

mbed_lib.json

@@ -3,27 +3,27 @@
     "config": {
         "tx": {
             "help": "TX pin for serial connection",
-            "value": null
+            "value": "D1"
         },
         "rx": {
             "help": "RX pin for serial connection",
-            "value": null
+            "value": "D0"
         },
         "rts": {
             "help": "RTS pin for serial connection",
-            "value": null
+            "value": "NC"
         },
         "cts": {
             "help": "CTS pin for serial connection",
-            "value": null
+            "value": "NC"
         },
         "debug": {
             "help": "Enable debug logs",
             "value": false
         },
         "socket-bufsize": {
             "help": "Size of the socket data buffer",
-            "value": 30720
+            "value": 102400
         }
     },
     "target_overrides": {