Merge pull request #1428 from hathach/nrf52_esp83266_uart_bug

Nrf52 esp83266 uart bug

1 files changed, 21 insertions, 9 deletions

diff --git a/ports/nrf/common-hal/busio/UART.c b/ports/nrf/common-hal/busio/UART.c
index a291af578..912956369 100644
--- a/ports/nrf/common-hal/busio/UART.c
+++ b/ports/nrf/common-hal/busio/UART.c
@@ -67,21 +67,27 @@ static void ringbuf_clear(ringbuf_t *r)
     r->iput = r->iget = 0;
 }
 
+// will overwrite old data
+static void ringbuf_put_n(ringbuf_t* r, uint8_t* buf, uint8_t bufsize)
+{
+    for(uint8_t i=0; i < bufsize; i++) {
+        if ( ringbuf_put(r, buf[i]) < 0 ) {
+            // if full overwrite old data
+            (void) ringbuf_get(r);
+            ringbuf_put(r, buf[i]);
+        }
+    }
+}
+
 static void uart_callback_irq (const nrfx_uarte_event_t * event, void * context) {
     busio_uart_obj_t* self = (busio_uart_obj_t*) context;
 
     switch ( event->type ) {
         case NRFX_UARTE_EVT_RX_DONE:
-            for(uint8_t i=0; i < event->data.rxtx.bytes; i++) {
-                if ( ringbuf_put(&self->rbuf, event->data.rxtx.p_data[i]) < 0 ) {
-                    // if full overwrite old data
-                    (void) ringbuf_get(&self->rbuf);
-                    ringbuf_put(&self->rbuf, event->data.rxtx.p_data[i]);
-                }
-            }
+            ringbuf_put_n(&self->rbuf, event->data.rxtx.p_data, event->data.rxtx.bytes);
 
             // keep receiving
-            _VERIFY_ERR(nrfx_uarte_rx(&self->uarte, &self->rx_char, 1));
+            (void) nrfx_uarte_rx(&self->uarte, &self->rx_char, 1);
         break;
 
         case NRFX_UARTE_EVT_TX_DONE:
@@ -89,7 +95,13 @@ static void uart_callback_irq (const nrfx_uarte_event_t * event, void * context)
         break;
 
         case NRFX_UARTE_EVT_ERROR:
-            // Handle error
+            // Possible Error source is Overrun, Parity, Framing, Break
+            // uint32_t errsrc = event->data.error.error_mask;
+
+            ringbuf_put_n(&self->rbuf, event->data.error.rxtx.p_data, event->data.error.rxtx.bytes);
+
+            // Keep receiving
+            (void) nrfx_uarte_rx(&self->uarte, &self->rx_char, 1);
         break;
 
         default: