got uart tx work

3 files changed, 191 insertions, 12 deletions

diff --git a/ports/nrf/boards/pca10056/mpconfigboard.h b/ports/nrf/boards/pca10056/mpconfigboard.h
index 5aa2191f7..00a73005c 100644
--- a/ports/nrf/boards/pca10056/mpconfigboard.h
+++ b/ports/nrf/boards/pca10056/mpconfigboard.h
@@ -38,5 +38,5 @@
 #define DEFAULT_SPI_BUS_MOSI        (&pin_P1_13)
 #define DEFAULT_SPI_BUS_MISO        (&pin_P1_14)
 
-#define DEFAULT_UART_BUS_RX         (&pin_P0_08)
-#define DEFAULT_UART_BUS_TX         (&pin_P0_06)
+#define DEFAULT_UART_BUS_RX         (&pin_P1_01)
+#define DEFAULT_UART_BUS_TX         (&pin_P1_02)
diff --git a/ports/nrf/common-hal/busio/UART.c b/ports/nrf/common-hal/busio/UART.c
index f05949e15..bcf335d65 100644
--- a/ports/nrf/common-hal/busio/UART.c
+++ b/ports/nrf/common-hal/busio/UART.c
@@ -35,54 +35,234 @@
 #include "supervisor/shared/translate.h"
 
 #include "tick.h"
+#include "nrfx_uart.h"
 
-void common_hal_busio_uart_construct(busio_uart_obj_t *self,
-        const mcu_pin_obj_t * tx, const mcu_pin_obj_t * rx, uint32_t baudrate,
-        uint8_t bits, uart_parity_t parity, uint8_t stop, uint32_t timeout,
-        uint8_t receiver_buffer_size) {
+static nrfx_uart_t _uart = NRFX_UART_INSTANCE(0);
+
+// expression to examine, and return value in case of failing
+#define _VERIFY_ERR(_exp, _ret) \
+    do {\
+      uint32_t _err = (_exp);\
+      if (NRFX_SUCCESS != _err ) {\
+        mp_raise_msg_varg(&mp_type_AssertionError, translate("error = 0x%08lX "), _err);\
+        return _ret;\
+      }\
+    }while(0)
+
+static uint32_t get_nrf_baud (uint32_t baudrate);
+
+
+static void uart_callback_irq (const nrfx_uart_event_t * event, void * context) {
+    busio_uart_obj_t* self = (busio_uart_obj_t*) context;
+
+    switch ( event->type ) {
+        case NRFX_UART_EVT_TX_DONE:
+        case NRFX_UART_EVT_RX_DONE:
+            self->xferred_bytes = event->data.rxtx.bytes;
+        break;
+
+        default:
+            self->xferred_bytes = -(event->data.error.rxtx.bytes);
+        break;
+    }
+}
+
+
+void common_hal_busio_uart_construct (busio_uart_obj_t *self,
+                                      const mcu_pin_obj_t * tx, const mcu_pin_obj_t * rx, uint32_t baudrate,
+                                      uint8_t bits, uart_parity_t parity, uint8_t stop, uint32_t timeout,
+                                      uint8_t receiver_buffer_size) {
+#ifndef NRF52840_XXAA
     mp_raise_NotImplementedError(translate("busio.UART not yet implemented"));
+#else
+    if ( parity == PARITY_ODD ) {
+        mp_raise_ValueError(translate("busio.UART odd parity is not supported"));
+    }
+
+    if ( (tx == mp_const_none) || (rx == mp_const_none) ) {
+        mp_raise_ValueError(translate("Invalid pins"));
+    }
+
+    if ( receiver_buffer_size == 0 ) {
+        mp_raise_ValueError(translate("Invalid buffer size"));
+    }
+
+    nrfx_uart_config_t config = {
+        .pseltxd = tx->number,
+        .pseltxd = rx->number,
+        .pselcts = NRF_UART_PSEL_DISCONNECTED,
+        .pselrts = NRF_UART_PSEL_DISCONNECTED,
+        .p_context = self,
+        .hwfc = NRF_UART_HWFC_DISABLED,
+        .parity = (parity == PARITY_NONE) ? NRF_UART_PARITY_EXCLUDED : NRF_UART_PARITY_INCLUDED,
+        .baudrate = get_nrf_baud(baudrate),
+        .interrupt_priority = 7
+    };
+
+    nrfx_uart_uninit(&_uart);
+    _VERIFY_ERR(nrfx_uart_init(&_uart, &config, uart_callback_irq),);
+    nrfx_uart_rx_enable(&_uart);
+
+    self->buffer_length = receiver_buffer_size;
+    self->buffer = (uint8_t *) gc_alloc(self->buffer_length * sizeof(uint8_t), false, false);
+    if ( self->buffer == NULL ) {
+        nrfx_uart_uninit(&_uart);
+        mp_raise_msg(&mp_type_MemoryError, translate("Failed to allocate RX buffer"));
+    }
+
+    self->baudrate = baudrate;
+    self->timeout_ms = timeout;
+#endif
 }
 
 bool common_hal_busio_uart_deinited(busio_uart_obj_t *self) {
+#ifndef NRF52840_XXAA
     mp_raise_NotImplementedError(translate("busio.UART not yet implemented"));
+#else
+    return (nrf_uart_rx_pin_get(_uart.p_reg) == NRF_UART_PSEL_DISCONNECTED) ||
+           (nrf_uart_tx_pin_get(_uart.p_reg) == NRF_UART_PSEL_DISCONNECTED);
+#endif
 }
 
 void common_hal_busio_uart_deinit(busio_uart_obj_t *self) {
+#ifndef NRF52840_XXAA
     mp_raise_NotImplementedError(translate("busio.UART not yet implemented"));
-    if (common_hal_busio_uart_deinited(self)) {
-        return;
+#else
+    if ( !common_hal_busio_uart_deinited(self) ) {
+        nrfx_uart_uninit(&_uart);
+        gc_free(self->buffer);
     }
-    // Do deinit;
+#endif
 }
 
 // Read characters.
 size_t common_hal_busio_uart_read(busio_uart_obj_t *self, uint8_t *data, size_t len, int *errcode) {
+#ifndef NRF52840_XXAA
     mp_raise_NotImplementedError(translate("busio.UART not yet implemented"));
     return 0;
+#else
+
+
+
+    if ( (*errcode) == NRFX_SUCCESS ) {
+        (*errcode) = 0;
+    }
+
+    return 0;
+#endif
 }
 
 // Write characters.
 size_t common_hal_busio_uart_write(busio_uart_obj_t *self, const uint8_t *data, size_t len, int *errcode) {
+#ifndef NRF52840_XXAA
     mp_raise_NotImplementedError(translate("busio.UART not yet implemented"));
     return 0;
+#else
+    self->xferred_bytes = 0;
+
+    (*errcode) = nrfx_uart_tx(&_uart, data, len);
+    _VERIFY_ERR(*errcode, MP_STREAM_ERROR);
+    (*errcode) = 0;
+
+    uint64_t start_ticks = ticks_ms;
+    while ( (0 == self->xferred_bytes) && (ticks_ms - start_ticks < self->timeout_ms) ) {
+#ifdef MICROPY_VM_HOOK_LOOP
+        MICROPY_VM_HOOK_LOOP
+#endif
+    }
+
+    if ( self->xferred_bytes <= 0 ) {
+        mp_raise_msg_varg(&mp_type_AssertionError, translate("failed"));
+        *errcode = MP_EAGAIN;
+        return MP_STREAM_ERROR;
+    }
+
+    return len;
+#endif
 }
 
 uint32_t common_hal_busio_uart_get_baudrate(busio_uart_obj_t *self) {
+#ifndef NRF52840_XXAA
     mp_raise_NotImplementedError(translate("busio.UART not yet implemented"));
+#endif
     return self->baudrate;
 }
 
 void common_hal_busio_uart_set_baudrate(busio_uart_obj_t *self, uint32_t baudrate) {
+#ifndef NRF52840_XXAA
     mp_raise_NotImplementedError(translate("busio.UART not yet implemented"));
+#else
     self->baudrate = baudrate;
+    nrf_uart_baudrate_set(_uart.p_reg, get_nrf_baud(baudrate));
+#endif
 }
 
 uint32_t common_hal_busio_uart_rx_characters_available(busio_uart_obj_t *self) {
+#ifndef NRF52840_XXAA
     mp_raise_NotImplementedError(translate("busio.UART not yet implemented"));
+#else
+
+#endif
     return 0;
 }
 
 bool common_hal_busio_uart_ready_to_tx(busio_uart_obj_t *self) {
+#ifndef NRF52840_XXAA
     mp_raise_NotImplementedError(translate("busio.UART not yet implemented"));
     return false;
+#else
+    return !nrfx_uart_tx_in_progress(&_uart);
+#endif
+}
+
+static uint32_t get_nrf_baud (uint32_t baudrate)
+{
+    if ( baudrate <= 1200 ) {
+        return NRF_UART_BAUDRATE_1200;
+    }
+    else if ( baudrate <= 2400 ) {
+        return NRF_UART_BAUDRATE_2400;
+    }
+    else if ( baudrate <= 4800 ) {
+        return NRF_UART_BAUDRATE_4800;
+    }
+    else if ( baudrate <= 9600 ) {
+        return NRF_UART_BAUDRATE_9600;
+    }
+    else if ( baudrate <= 14400 ) {
+        return NRF_UART_BAUDRATE_14400;
+    }
+    else if ( baudrate <= 19200 ) {
+        return NRF_UART_BAUDRATE_19200;
+    }
+    else if ( baudrate <= 28800 ) {
+        return NRF_UART_BAUDRATE_28800;
+    }
+    else if ( baudrate <= 38400 ) {
+        return NRF_UART_BAUDRATE_38400;
+    }
+    else if ( baudrate <= 57600 ) {
+        return NRF_UART_BAUDRATE_57600;
+    }
+    else if ( baudrate <= 76800 ) {
+        return NRF_UART_BAUDRATE_76800;
+    }
+    else if ( baudrate <= 115200 ) {
+        return NRF_UART_BAUDRATE_115200;
+    }
+    else if ( baudrate <= 230400 ) {
+        return NRF_UART_BAUDRATE_230400;
+    }
+    else if ( baudrate <= 250000 ) {
+        return NRF_UART_BAUDRATE_250000;
+    }
+    else if ( baudrate <= 460800 ) {
+        return NRF_UART_BAUDRATE_460800;
+    }
+    else if ( baudrate <= 921600 ) {
+        return NRF_UART_BAUDRATE_921600;
+    }
+    else {
+        return NRF_UART_BAUDRATE_1000000;
+    }
 }
diff --git a/ports/nrf/common-hal/busio/UART.h b/ports/nrf/common-hal/busio/UART.h
index 7c0493e37..ec3737357 100644
--- a/ports/nrf/common-hal/busio/UART.h
+++ b/ports/nrf/common-hal/busio/UART.h
@@ -33,9 +33,6 @@
 
 typedef struct {
     mp_obj_base_t base;
-    uint8_t rx_pin;
-    uint8_t tx_pin;
-    uint8_t character_bits;
     bool rx_error;
     uint32_t baudrate;
     uint32_t timeout_ms;
@@ -45,6 +42,8 @@ typedef struct {
     uint32_t buffer_size;
     uint32_t buffer_length;
     uint8_t* buffer;
+
+    volatile int32_t xferred_bytes;
 } busio_uart_obj_t;
 
 #endif // MICROPY_INCLUDED_NRF_COMMON_HAL_BUSIO_UART_H