Merge pull request #1984 from iot49/uart

tannewt · web-flow · commit 380f1d6ae675 · 2019-07-07T18:14:52.000-07:00
changed type of receiver_buffer_size to uint16_t
diff --git a/ports/atmel-samd/common-hal/busio/UART.c b/ports/atmel-samd/common-hal/busio/UART.c
@@ -55,7 +55,7 @@ static void usart_async_rxc_callback(const struct usart_async_descriptor *const
 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, mp_float_t timeout,
-        uint8_t receiver_buffer_size) {
+        uint16_t receiver_buffer_size) {
     Sercom* sercom = NULL;
     uint8_t sercom_index = 255; // Unset index
     uint32_t rx_pinmux = 0;
diff --git a/ports/esp8266/common-hal/busio/UART.c b/ports/esp8266/common-hal/busio/UART.c
@@ -40,7 +40,7 @@ extern UartDevice UartDev;
 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, mp_float_t timeout,
-        uint8_t receiver_buffer_size) {
+        uint16_t receiver_buffer_size) {
     if (rx != mp_const_none || tx != &pin_GPIO2) {
         nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, translate("Only tx supported on UART1 (GPIO2).")));
     }
diff --git a/ports/nrf/common-hal/busio/UART.c b/ports/nrf/common-hal/busio/UART.c
@@ -131,7 +131,7 @@ void uart_reset(void) {
 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, mp_float_t timeout,
-                                      uint8_t receiver_buffer_size) {
+                                      uint16_t receiver_buffer_size) {
     // Find a free UART peripheral.
     self->uarte = NULL;
     for (size_t i = 0 ; i < MP_ARRAY_SIZE(nrfx_uartes); i++) {
diff --git a/shared-bindings/busio/UART.h b/shared-bindings/busio/UART.h
@@ -42,7 +42,7 @@ typedef enum {
 extern 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, mp_float_t timeout,
-    uint8_t receiver_buffer_size);
+    uint16_t receiver_buffer_size);
 
 extern void common_hal_busio_uart_deinit(busio_uart_obj_t *self);
 extern bool common_hal_busio_uart_deinited(busio_uart_obj_t *self);

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ extern UartDevice UartDev;`
`40`	`40`	`void common_hal_busio_uart_construct(busio_uart_obj_t *self,`
`41`	`41`	`const mcu_pin_obj_t * tx, const mcu_pin_obj_t * rx, uint32_t baudrate,`
`42`	`42`	`uint8_t bits, uart_parity_t parity, uint8_t stop, mp_float_t timeout,`
`43`		`- uint8_t receiver_buffer_size) {`
	`43`	`+ uint16_t receiver_buffer_size) {`
`44`	`44`	`if (rx != mp_const_none \|\| tx != &pin_GPIO2) {`
`45`	`45`	`nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, translate("Only tx supported on UART1 (GPIO2).")));`
`46`	`46`	`}`