micropython · dpgeorge · Apr 3, 2019 · Apr 3, 2019 · Apr 3, 2019 · Apr 3, 2019
diff --git a/.gitattributes b/.gitattributes
@@ -7,6 +7,7 @@
 *.bat text eol=crlf
 
 # These are binary so should never be modified by git.
+*.a binary
 *.png binary
 *.jpg binary
 *.dxf binary

diff --git a/.gitmodules b/.gitmodules
@@ -18,3 +18,6 @@
 [submodule "lib/nrfx"]
 	path = lib/nrfx
 	url = https://github.com/NordicSemiconductor/nrfx.git
+[submodule "lib/mbedtls"]
+	path = lib/mbedtls
+	url = https://github.com/ARMmbed/mbedtls.git
diff --git a/drivers/memory/spiflash.c b/drivers/memory/spiflash.c
@@ -159,6 +159,8 @@ void mp_spiflash_init(mp_spiflash_t *self) {
 
     mp_spiflash_acquire_bus(self);
 
+    mp_spiflash_deepsleep(self, 0);
+
     #if defined(CHECK_DEVID)
     // Validate device id
     uint32_t devid = mp_spiflash_read_cmd(self, CMD_RD_DEVID, 3);
@@ -482,3 +484,11 @@ int mp_spiflash_cached_write(mp_spiflash_t *self, uint32_t addr, size_t len, con
     mp_spiflash_release_bus(self);
     return 0;
 }
+
+void mp_spiflash_deepsleep(mp_spiflash_t *self, int value) {
+    if (value) {
+        mp_spiflash_write_cmd(self, 0xb9); // sleep
+    } else {
+        mp_spiflash_write_cmd(self, 0xab); // wake
+    }
+}
diff --git a/drivers/memory/spiflash.h b/drivers/memory/spiflash.h
@@ -79,4 +79,6 @@ void mp_spiflash_cache_flush(mp_spiflash_t *self);
 void mp_spiflash_cached_read(mp_spiflash_t *self, uint32_t addr, size_t len, uint8_t *dest);
 int mp_spiflash_cached_write(mp_spiflash_t *self, uint32_t addr, size_t len, const uint8_t *src);
 
+void mp_spiflash_deepsleep(mp_spiflash_t *self, int value);
+
 #endif // MICROPY_INCLUDED_DRIVERS_MEMORY_SPIFLASH_H
diff --git a/extmod/modlwip.c b/extmod/modlwip.c
@@ -356,7 +356,7 @@ STATIC void lwip_socket_free_incoming(lwip_socket_obj_t *socket) {
 
 static inline void exec_user_callback(lwip_socket_obj_t *socket) {
     if (socket->callback != MP_OBJ_NULL) {
-        mp_call_function_1_protected(socket->callback, MP_OBJ_FROM_PTR(socket));
+        mp_sched_schedule(socket->callback, MP_OBJ_FROM_PTR(socket));
     }
 }
 
@@ -637,22 +637,29 @@ STATIC mp_uint_t lwip_tcp_send(lwip_socket_obj_t *socket, const byte *buf, mp_ui
 
     u16_t available = tcp_sndbuf(socket->pcb.tcp);
 
-    if (available == 0) {
+    if (available == 0 || tcp_sndqueuelen(socket->pcb.tcp) >= TCP_SND_QUEUELEN) {
         // Non-blocking socket
         if (socket->timeout == 0) {
             MICROPY_PY_LWIP_EXIT
             *_errno = MP_EAGAIN;
             return MP_STREAM_ERROR;
         }
 
+        err_t err = tcp_output(socket->pcb.tcp);
+        if (err != ERR_OK) {
+            MICROPY_PY_LWIP_EXIT
+            *_errno = error_lookup_table[-err];
+            return MP_STREAM_ERROR;
+        }
+
         mp_uint_t start = mp_hal_ticks_ms();
         // Assume that STATE_PEER_CLOSED may mean half-closed connection, where peer closed it
         // sending direction, but not receiving. Consequently, check for both STATE_CONNECTED
         // and STATE_PEER_CLOSED as normal conditions and still waiting for buffers to be sent.
         // If peer fully closed socket, we would have socket->state set to ERR_RST (connection
         // reset) by error callback.
         // Avoid sending too small packets, so wait until at least 16 bytes available
-        while (socket->state >= STATE_CONNECTED && (available = tcp_sndbuf(socket->pcb.tcp)) < 16) {
+        while (socket->state >= STATE_CONNECTED && ((available = tcp_sndbuf(socket->pcb.tcp)) < 16 || tcp_sndqueuelen(socket->pcb.tcp) >= TCP_SND_QUEUELEN)) {
             MICROPY_PY_LWIP_EXIT
             if (socket->timeout != -1 && mp_hal_ticks_ms() - start > socket->timeout) {
                 *_errno = MP_ETIMEDOUT;
@@ -669,6 +676,15 @@ STATIC mp_uint_t lwip_tcp_send(lwip_socket_obj_t *socket, const byte *buf, mp_ui
     u16_t write_len = MIN(available, len);
 
     err_t err = tcp_write(socket->pcb.tcp, buf, write_len, TCP_WRITE_FLAG_COPY);
+    if (err == ERR_MEM) {
+        for (int i = 0; i < 100 && err == ERR_MEM; ++i) {
+            err = tcp_output(socket->pcb.tcp);
+            MICROPY_PY_LWIP_EXIT
+            poll_sockets();
+            MICROPY_PY_LWIP_REENTER
+            err = tcp_write(socket->pcb.tcp, buf, write_len, TCP_WRITE_FLAG_COPY);
+        }
+    }
 
     // If the output buffer is getting full then send the data to the lower layers
     if (err == ERR_OK && tcp_sndbuf(socket->pcb.tcp) < TCP_SND_BUF / 4) {

diff --git a/lib/mbedtls b/lib/mbedtls