summaryrefslogtreecommitdiff
path: root/shared-module
diff options
context:
space:
mode:
authorScott Shawcroft <scott@adafruit.com>2019-11-27 15:36:04 -0800
committerGitHub <noreply@github.com>2019-11-27 15:36:04 -0800
commit83ecb1b65e24d970833d17d8322230ba05c5d527 (patch)
tree8879176ac3119b850d32bc9f3050aaead8c3ebee /shared-module
parentd9c808d93886cbe071b4e1acd3730cf508dac3df (diff)
parentae52ec7c8591450b4953426f6bc21fe17d221531 (diff)
Merge pull request #2331 from dhalbert/uart-blocking-and-timeout
make UART.write be blocking on SAMD; add timeout property
Diffstat (limited to 'shared-module')
-rw-r--r--shared-module/board/__init__.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/shared-module/board/__init__.c b/shared-module/board/__init__.c
index dd07d7190..914bc4313 100644
--- a/shared-module/board/__init__.c
+++ b/shared-module/board/__init__.c
@@ -101,7 +101,7 @@ mp_obj_t common_hal_board_create_uart(void) {
const mcu_pin_obj_t* rx = MP_OBJ_TO_PTR(DEFAULT_UART_BUS_RX);
const mcu_pin_obj_t* tx = MP_OBJ_TO_PTR(DEFAULT_UART_BUS_TX);
- common_hal_busio_uart_construct(self, tx, rx, 9600, 8, PARITY_NONE, 1, 1000, 64);
+ common_hal_busio_uart_construct(self, tx, rx, 9600, 8, PARITY_NONE, 1, 1.0f, 64);
MP_STATE_VM(shared_uart_bus) = MP_OBJ_FROM_PTR(self);
return MP_STATE_VM(shared_uart_bus);
}