Merge pull request #928 from tannewt/fix_uart_timeout

dhalbert · web-flow · commit 144c0597e9f1 · 2018-06-12T18:41:18.000-04:00
Correct UART reads to return error on timeout.
diff --git a/ports/atmel-samd/common-hal/busio/UART.c b/ports/atmel-samd/common-hal/busio/UART.c
@@ -269,6 +269,11 @@ size_t common_hal_busio_uart_read(busio_uart_obj_t *self, uint8_t *data, size_t
 #endif
     }
 
+    if (total_read == 0) {
+        *errcode = EAGAIN;
+        return MP_STREAM_ERROR;
+    }
+
     return total_read;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -269,6 +269,11 @@ size_t common_hal_busio_uart_read(busio_uart_obj_t self, uint8_t data, size_t`
`269`	`269`	`#endif`
`270`	`270`	`}`
`271`	`271`
	`272`	`+ if (total_read == 0) {`
	`273`	`+ *errcode = EAGAIN;`
	`274`	`+ return MP_STREAM_ERROR;`
	`275`	`+ }`
	`276`	`+`
`272`	`277`	`return total_read;`
`273`	`278`	`}`
`274`	`279`