Skip to content

Commit 4bc24c4

Browse files
committed
bleio: Fix errors after rebase
1 parent c62b708 commit 4bc24c4

22 files changed

+1472
-947
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ before_script:
5050
- (! var_search "${TRAVIS_SDK-}" arm || (wget https://s3.amazonaws.com/adafruit-circuit-python/gcc-arm-embedded_7-2018q2-1~trusty1_amd64.deb && sudo dpkg -i gcc-arm-embedded*_amd64.deb))
5151

5252
# For nrf builds
53-
- (! var_search "${TRAVIS_SDK-}" nrf || sudo ports/nrf/drivers/bluetooth/download_ble_stack.sh)
53+
- (! var_search "${TRAVIS_SDK-}" nrf || sudo ports/nrf/bluetooth/download_ble_stack.sh)
5454

5555
# For huzzah builds
5656
- (! var_search "${TRAVIS_SDK-}" esp8266 || (wget https://github.com/jepler/esp-open-sdk/releases/download/2018-06-10/xtensa-lx106-elf-standalone.tar.gz && tar -C .. -xavf xtensa-lx106-elf-standalone.tar.gz))

conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
"ports/esp8266/modules",
115115
"ports/minimal",
116116
"ports/nrf/device",
117-
"ports/nrf/drivers",
117+
"ports/nrf/bluetooth",
118118
"ports/nrf/modules",
119119
"ports/nrf/nrfx",
120120
"ports/nrf/peripherals",

0 commit comments

Comments
 (0)