summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Halbert <halbert@halwitz.org>2018-09-12 18:14:43 -0400
committerDan Halbert <halbert@halwitz.org>2018-09-12 18:37:03 -0400
commit6a72084198b10df61b1cf85fb8340f864bc54031 (patch)
tree4231d156e8aba0110c5dcfe24ce27c1b820a4a67
parent6a046f55c449da59cf4641ef4cf34c6b1b63da44 (diff)
fix nrf builds; sphinx 1.8.0 crashing: use lower version
-rw-r--r--.travis.yml2
-rw-r--r--ports/nrf/common-hal/busio/UART.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index c1a4849cf..3f123fe6e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -64,7 +64,7 @@ before_script:
- if [[ $TRAVIS_BOARD = "feather_huzzah" ]]; then wget https://github.com/jepler/esp-open-sdk/releases/download/2018-06-10/xtensa-lx106-elf-standalone.tar.gz && tar xavf xtensa-lx106-elf-standalone.tar.gz; PATH=$(readlink -f xtensa-lx106-elf/bin):$PATH; fi
# For coverage testing (upgrade is used to get latest urllib3 version)
- ([[ -z "$TRAVIS_TEST" ]] || sudo pip install --upgrade cpp-coveralls)
- - ([[ $TRAVIS_TEST != "docs" ]] || sudo pip install Sphinx sphinx-rtd-theme recommonmark)
+ - ([[ $TRAVIS_TEST != "docs" ]] || sudo pip install 'Sphinx<1.8.0' sphinx-rtd-theme recommonmark)
- gcc --version
- ([[ -z "$TRAVIS_BOARD" ]] || arm-none-eabi-gcc --version)
- python3 --version
diff --git a/ports/nrf/common-hal/busio/UART.c b/ports/nrf/common-hal/busio/UART.c
index dbc6a8533..08b4bcd16 100644
--- a/ports/nrf/common-hal/busio/UART.c
+++ b/ports/nrf/common-hal/busio/UART.c
@@ -83,6 +83,10 @@ uint32_t common_hal_busio_uart_rx_characters_available(busio_uart_obj_t *self) {
return 0;
}
+void common_hal_busio_uart_clear_rx_buffer(busio_uart_obj_t *self) {
+ mp_raise_NotImplementedError("busio.UART not yet implemented");
+}
+
bool common_hal_busio_uart_ready_to_tx(busio_uart_obj_t *self) {
mp_raise_NotImplementedError("busio.UART not yet implemented");
return false;