summaryrefslogtreecommitdiff
path: root/shared-bindings
diff options
context:
space:
mode:
authorScott Shawcroft <scott@tannewt.org>2019-04-10 10:58:45 -0700
committerScott Shawcroft <scott@tannewt.org>2019-04-10 10:58:45 -0700
commita152ac1cef31a9b2825e7e02b4d3252f25146451 (patch)
tree8c4e850c90c7f35650cf4dd8646462f094d6df3c /shared-bindings
parent34c8c669a35657e67602a7e1fc3c1966165284d5 (diff)
parentf115ec219353cb43027548d900be740522035bff (diff)
Merge remote-tracking branch 'adafruit/master' into pybadge_revd
Diffstat (limited to 'shared-bindings')
-rw-r--r--shared-bindings/busio/UART.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/shared-bindings/busio/UART.c b/shared-bindings/busio/UART.c
index b40f3fa03..94ad1bd3e 100644
--- a/shared-bindings/busio/UART.c
+++ b/shared-bindings/busio/UART.c
@@ -57,7 +57,7 @@
//| :param int bits: the number of bits per byte, 7, 8 or 9.
//| :param Parity parity: the parity used for error checking.
//| :param int stop: the number of stop bits, 1 or 2.
-//| :param int timeout: the timeout in seconds to wait for the first character and between subsequent characters. Raises ``ValueError`` if timeout >100 seconds.
+//| :param float timeout: the timeout in seconds to wait for the first character and between subsequent characters. Raises ``ValueError`` if timeout >100 seconds.
//| :param int receiver_buffer_size: the character length of the read buffer (0 to disable). (When a character is 9 bits the buffer will be 2 * receiver_buffer_size bytes.)
//|
//| *New in CircuitPython 4.0:* ``timeout`` has incompatibly changed units from milliseconds to seconds.