Merge branch 'master' into feature-recover_from_wdt_reset

Author: Veijo Pesonen

ESP8266/ESP8266.cpp

@@ -65,6 +65,7 @@ ESP8266::ESP8266(PinName tx, PinName rx, bool debug, PinName rts, PinName cts)
     // Don't see a reason to make distiction between software(Software WDT reset) and hardware(wdt reset) watchdog treatment
     //https://github.com/esp8266/Arduino/blob/4897e0006b5b0123a2fa31f67b14a3fff65ce561/doc/faq/a02-my-esp-crashes.md#watchdog
     _parser.oob("Soft WDT reset", callback(this, &ESP8266::_oob_watchdog_reset));
+    _parser.oob("ERROR", callback(this, &ESP8266::_oob_err));
 
     for(int i= 0; i < SOCKET_COUNT; i++) {
         _sock_i[i].open = false;
@@ -424,6 +425,10 @@ nsapi_error_t ESP8266::open_udp(int id, const char* addr, int port, int local_po
                                 "ESP8266::_open_udp: device refused to close socket");
                     }
                 }
+                if (_error) {
+                    _error = false;
+                    done = false;
+                }
                 continue;
             }
             _sock_i[id].open = true;
@@ -466,6 +471,10 @@ nsapi_error_t ESP8266::open_tcp(int id, const char* addr, int port, int keepaliv
                                 "ESP8266::_open_tcp: device refused to close socket");
                     }
                 }
+                if (_error) {
+                    _error = false;
+                    done = false;
+                }
                 continue;
             }
             _sock_i[id].open = true;
@@ -497,14 +506,19 @@ nsapi_error_t ESP8266::send(int id, const void *data, uint32_t amount)
         set_timeout(ESP8266_SEND_TIMEOUT);
         if (_parser.send("AT+CIPSEND=%d,%lu", id, amount)
             && _parser.recv(">")
-            && _parser.write((char*)data, (int)amount) >= 0) {
+            && _parser.write((char*)data, (int)amount) >= 0
+            && _parser.recv("SEND OK")) {
             // No flow control, data overrun is possible
             if (_serial_rts == NC) {
                 while (_parser.process_oob()); // Drain USART receive register
             }
             _smutex.unlock();
             return NSAPI_ERROR_OK;
         }
+        if (_error) {
+            _error = false;
+        }
+
         set_timeout();
         _smutex.unlock();
     }
@@ -581,6 +595,11 @@ int32_t ESP8266::_recv_tcp_passive(int id, void *data, uint32_t amount, uint32_t
     int32_t len;
     int32_t ret = (int32_t)NSAPI_ERROR_WOULD_BLOCK;
 
+    // No flow control, drain the USART receive register ASAP to avoid data overrun
+    if (_serial_rts == NC) {
+        _process_oob(timeout, true);
+    }
+
     _smutex.lock();
 
     // NOTE: documentation v3.0 says '+CIPRECVDATA:<data_len>,' but it's not how the FW responds...
@@ -604,6 +623,10 @@ int32_t ESP8266::_recv_tcp_passive(int id, void *data, uint32_t amount, uint32_t
         ret = done ? len : 0;
     }
 
+    // Flow control, read from USART receive register only when no more data is buffered, and as little as possible
+    if (_serial_rts != NC) {
+        _process_oob(timeout, false);
+    }
     _smutex.unlock();
     return ret;
 }
@@ -831,12 +854,18 @@ void ESP8266::_oob_conn_already()
     _parser.abort();
 }
 
+void ESP8266::_oob_err()
+{
+    _error = true;
+    _parser.abort();
+}
+
 void ESP8266::_oob_socket_close_err()
 {
-    if (_parser.recv("ERROR\n")) {
-        _closed = true; // Not possible to pinpoint to a certain socket
-        _parser.abort();
+    if (_error) {
+        _error = false;
     }
+    _closed = true; // Not possible to pinpoint to a certain socket
 }
 
 void ESP8266::_oob_socket0_closed()

ESP8266/ESP8266.h

@@ -388,6 +388,7 @@ class ESP8266
     void _oob_packet_hdlr();
     void _oob_connect_err();
     void _oob_conn_already();
+    void _oob_err();
     void _oob_socket0_closed();
     void _oob_socket1_closed();
     void _oob_socket2_closed();
@@ -402,6 +403,7 @@ class ESP8266
     bool _fail;
     bool _sock_already;
     bool _closed;
+    bool _error;
 
     // Modem's address info
     char _ip_buffer[16];