Skip to content

GitLab

M
micropython
Commit 075ca645 authored by danicampora's avatar danicampora
Browse files
Options

cc3200: Fix UART tests after correcting uart.read() behaviour.

parent be2879ce
Show whitespace changes
Inline Side-by-side
Showing with 11 additions and 12 deletions
cc3200/mods/pybuart.c
View file @ 075ca645
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
*******-***********************************************************************/ *******-***********************************************************************/
#define PYBUART_FRAME_TIME_US(baud) ((11 * 1000000) / baud) #define PYBUART_FRAME_TIME_US(baud) ((11 * 1000000) / baud)
#define PYBUART_2_FRAMES_TIME_US(baud) (PYBUART_FRAME_TIME_US(baud) * 2) #define PYBUART_2_FRAMES_TIME_US(baud) (PYBUART_FRAME_TIME_US(baud) * 2)
#define PYBUART_RX_TIMEOUT_US(baud) (PYBUART_2_FRAMES_TIME_US(baud)) #define PYBUART_RX_TIMEOUT_US(baud) (PYBUART_2_FRAMES_TIME_US(baud) * 8) // we need at least characters in the FIFO
#define PYBUART_TX_WAIT_US(baud) ((PYBUART_FRAME_TIME_US(baud)) + 1) #define PYBUART_TX_WAIT_US(baud) ((PYBUART_FRAME_TIME_US(baud)) + 1)
#define PYBUART_TX_MAX_TIMEOUT_MS (5) #define PYBUART_TX_MAX_TIMEOUT_MS (5)
......
tests/wipy/uart.py
View file @ 075ca645
...@@ -54,7 +54,7 @@ print(uart1.read() == b'123456') ...@@ -54,7 +54,7 @@ print(uart1.read() == b'123456')
print(uart1.write(b'123') == 3) print(uart1.write(b'123') == 3)
print(uart0.read(1) == b'1') print(uart0.read(1) == b'1')
print(uart0.read(2) == b'23') print(uart0.read(2) == b'23')
print(uart0.read() == b'') print(uart0.read() == None)
uart0.write(b'123') uart0.write(b'123')
buf = bytearray(3) buf = bytearray(3)
...@@ -79,28 +79,28 @@ uart0 = UART(0, 1000000, pins=('GP12', None)) ...@@ -79,28 +79,28 @@ uart0 = UART(0, 1000000, pins=('GP12', None))
print(uart0.write(b'123456') == 6) print(uart0.write(b'123456') == 6)
print(uart1.read() == b'123456') print(uart1.read() == b'123456')
print(uart1.write(b'123') == 3) print(uart1.write(b'123') == 3)
print(uart0.read() == b'') print(uart0.read() == None)
# rx only mode # rx only mode
uart0 = UART(0, 1000000, pins=(None, 'GP13')) uart0 = UART(0, 1000000, pins=(None, 'GP13'))
print(uart0.write(b'123456') == 6) print(uart0.write(b'123456') == 6)
print(uart1.read() == b'') print(uart1.read() == None)
print(uart1.write(b'123') == 3) print(uart1.write(b'123') == 3)
print(uart0.read() == b'123') print(uart0.read() == b'123')
# leave pins as they were (rx only mode) # leave pins as they were (rx only mode)
uart0 = UART(0, 1000000, pins=None) uart0 = UART(0, 1000000, pins=None)
print(uart0.write(b'123456') == 6) print(uart0.write(b'123456') == 6)
print(uart1.read() == b'') print(uart1.read() == None)
print(uart1.write(b'123') == 3) print(uart1.write(b'123') == 3)
print(uart0.read() == b'123') print(uart0.read() == b'123')
# no pin assignemnt # no pin assignemnt
uart0 = UART(0, 1000000, pins=(None, None)) uart0 = UART(0, 1000000, pins=(None, None))
print(uart0.write(b'123456789') == 9) print(uart0.write(b'123456789') == 9)
print(uart1.read() == b'') print(uart1.read() == None)
print(uart1.write(b'123456789') == 9) print(uart1.write(b'123456789') == 9)
print(uart0.read() == b'') print(uart0.read() == None)
print(Pin.board.GP12) print(Pin.board.GP12)
print(Pin.board.GP13) print(Pin.board.GP13)
...@@ -156,4 +156,3 @@ for uart_id in uart_id_range: ...@@ -156,4 +156,3 @@ for uart_id in uart_id_range:
uart.init(115200) uart.init(115200)
print(uart) print(uart)
uart.read() uart.read()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment