djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean up

Browse Source
This commit is contained in:
hathach 2018-09-21 03:53:35 +07:00
parent dddc437ea7
commit 816ff05253
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ports/nrf/common-hal/busio/UART.c
View File

@ -56,7 +56,7 @@ static void uart_callback_irq (const nrfx_uart_event_t * event, void * context)
switch ( event->type ) {
case NRFX_UART_EVT_TX_DONE:
self->xferred_bytes = event->data.rxtx.bytes;
self->tx_count = event->data.rxtx.bytes;
break;
case NRFX_UART_EVT_RX_DONE:
@ -225,25 +225,20 @@ size_t common_hal_busio_uart_write(busio_uart_obj_t *self, const uint8_t *data,
mp_raise_NotImplementedError(translate("busio.UART not yet implemented"));
return 0;
#else
self->xferred_bytes = 0;
self->tx_count = 0;
(*errcode) = nrfx_uart_tx(&_uart, data, len);
_VERIFY_ERR(*errcode);
(*errcode) = 0;
uint64_t start_ticks = ticks_ms;
while ( (0 == self->xferred_bytes) && (ticks_ms - start_ticks < self->timeout_ms) ) {
while ( (0 == self->tx_count) && (ticks_ms - start_ticks < self->timeout_ms) ) {
#ifdef MICROPY_VM_HOOK_LOOP
MICROPY_VM_HOOK_LOOP
#endif
// break if zero timeout
if ( self->timeout_ms == 0 ) {
break;
}
}
if ( self->xferred_bytes <= 0 ) {
mp_raise_msg_varg(&mp_type_AssertionError, translate("failed"));
if ( self->tx_count <= 0 ) {
*errcode = MP_EAGAIN;
return MP_STREAM_ERROR;
}

2
ports/nrf/common-hal/busio/UART.h
View File

@ -36,7 +36,7 @@ typedef struct {
mp_obj_base_t base;
uint32_t baudrate;
uint32_t timeout_ms;
volatile int32_t xferred_bytes;
volatile int32_t tx_count;
uint8_t* buffer;
uint32_t bufsize;