Skip to content

Commit aab2874

Browse files
nickzoicnickzoic
committed
Merge remote-tracking branch 'origin/master' into circuitpython/nickzoic/703-wiznet-5500-native
2 parents 09e6127 + 852cbca commit aab2874

35 files changed

Lines changed: 4608 additions & 609 deletions

File tree

‎.travis.yml‎

Lines changed: 32 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -9,36 +9,15 @@ git:
99
# Put a representative board from each port or sub-port near the top
1010
# to determine more quickly whether that port is going to build or not.
1111
env:
12-
- TRAVIS_TEST=unix
13-
- TRAVIS_TEST=docs
14-
- TRAVIS_TEST=translations
15-
- TRAVIS_BOARD=feather_huzzah
16-
- TRAVIS_BOARD=circuitplayground_express
17-
- TRAVIS_BOARD=pca10056
18-
# The rest of the boards, in alphabetical order.
19-
- TRAVIS_BOARD=trinket_m0
20-
- TRAVIS_BOARD=feather_m4_express
21-
- TRAVIS_BOARD=grandcentral_m4_express
22-
- TRAVIS_BOARD=arduino_zero
23-
- TRAVIS_BOARD=circuitplayground_express_crickit
24-
- TRAVIS_BOARD=feather_m0_adalogger
25-
- TRAVIS_BOARD=feather_m0_basic
26-
- TRAVIS_BOARD=feather_m0_express
27-
- TRAVIS_BOARD=feather_m0_express_crickit
28-
- TRAVIS_BOARD=feather_m0_rfm69
29-
- TRAVIS_BOARD=feather_m0_rfm9x
30-
- TRAVIS_BOARD=feather_nrf52832
31-
- TRAVIS_BOARD=feather_nrf52840_express
32-
- TRAVIS_BOARD=feather_radiofruit_zigbee
33-
- TRAVIS_BOARD=gemma_m0
34-
- TRAVIS_BOARD=hallowing_m0_express
35-
- TRAVIS_BOARD=itsybitsy_m0_express
36-
- TRAVIS_BOARD=itsybitsy_m4_express
37-
- TRAVIS_BOARD=metro_m0_express
38-
- TRAVIS_BOARD=metro_m4_express
39-
- TRAVIS_BOARD=pca10059
40-
- TRAVIS_BOARD=pirkey_m0
41-
- TRAVIS_BOARD=trellis_m4_express
12+
- TRAVIS_TESTS="unix docs translations"
13+
- TRAVIS_BOARDS="feather_huzzah circuitplayground_express pca10056" TRAVIS_SDK=arm:nrf:esp8266
14+
# Group nrf builds together..
15+
- TRAVIS_BOARDS="pca10056 pca10059 feather_nrf52832 feather_nrf52840_express" TRAVIS_SDK=arm:nrf
16+
# The rest of the M0/M4 boards, in arbitrary order.
17+
- TRAVIS_BOARDS="metro_m0_express metro_m4_express pirkey_m0 trellis_m4_express trinket_m0" TRAVIS_SDK=arm
18+
- TRAVIS_BOARDS="feather_radiofruit_zigbee gemma_m0 hallowing_m0_express itsybitsy_m0_express itsybitsy_m4_express" TRAVIS_SDK=arm
19+
- TRAVIS_BOARDS="feather_m0_express_crickit feather_m0_rfm69 feather_m0_rfm9x feather_m4_express arduino_zero" TRAVIS_SDK=arm
20+
- TRAVIS_BOARDS="circuitplayground_express_crickit feather_m0_adalogger feather_m0_basic feather_m0_express" TRAVIS_SDK=arm
4221

4322
addons:
4423
artifacts:
@@ -57,21 +36,28 @@ notifications:
5736
on_error: always
5837

5938
before_script:
39+
- function var_search () { case "$1" in *$2*) true;; *) false;; esac; }
6040
- sudo dpkg --add-architecture i386
6141

62-
- ([[ -z "$TRAVIS_BOARD" || $TRAVIS_BOARD = "feather_huzzah" ]] || (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))
42+
- (! 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))
6343

6444
# For nrf builds
65-
- ([[ $TRAVIS_BOARD != "feather_nrf52832" && $TRAVIS_BOARD != "feather_nrf52840_express" && $TRAVIS_BOARD != "pca10056" && $TRAVIS_BOARD != "pca10059" ]] || sudo ports/nrf/drivers/bluetooth/download_ble_stack.sh)
45+
- (! var_search "${TRAVIS_SDK-}" nrf || sudo ports/nrf/drivers/bluetooth/download_ble_stack.sh)
46+
6647
# For huzzah builds
67-
- 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
48+
- (! 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 xavf xtensa-lx106-elf-standalone.tar.gz))
49+
- if var_search "${TRAVIS_SDK-}" esp8266 ; then PATH=$(readlink -f xtensa-lx106-elf/bin):$PATH; fi
50+
6851
# For coverage testing (upgrade is used to get latest urllib3 version)
69-
- ([[ -z "$TRAVIS_TEST" ]] || sudo apt-get install -y python3-pip)
70-
- ([[ -z "$TRAVIS_TEST" ]] || sudo pip install --upgrade cpp-coveralls)
71-
- ([[ $TRAVIS_TEST != "docs" ]] || sudo pip install 'Sphinx<1.8.0' sphinx-rtd-theme recommonmark)
72-
- ([[ $TRAVIS_TEST != "translations" ]] || sudo pip3 install polib)
52+
- ([[ -z "$TRAVIS_TESTS" ]] || sudo apt-get install -y python3-pip)
53+
- ([[ -z "$TRAVIS_TESTS" ]] || sudo pip install --upgrade cpp-coveralls)
54+
- (! var_search "${TRAVIS_TESTS-}" docs || sudo pip install 'Sphinx<1.8.0' sphinx-rtd-theme recommonmark)
55+
- (! var_search "${TRAVIS_TESTS-}" translations || sudo pip3 install polib)
56+
57+
# report some good version numbers to the buil
7358
- gcc --version
74-
- ([[ -z "$TRAVIS_BOARD" || $TRAVIS_BOARD = "feather_huzzah" ]] || arm-none-eabi-gcc --version)
59+
- (! var_search "${TRAVIS_SDK-}" elf || arm-none-eabi-gcc --version)
60+
- (! var_search "${TRAVIS_SDK-}" esp8266 || xtensa-lx106-elf-gcc --version)
7561
- python3 --version
7662

7763
script:
@@ -81,13 +67,11 @@ script:
8167
- echo -en 'travis_fold:end:mpy-cross\\r'
8268

8369
- echo 'Building Adafruit binaries' && echo -en 'travis_fold:start:adafruit-bins\\r'
84-
- ([[ -z "$TRAVIS_BOARD" ]] || tools/build_adafruit_bins.sh)
70+
- (for board in $TRAVIS_BOARDS; do TRAVIS_BOARD=$board tools/build_adafruit_bins.sh || exit $?; done)
8571
- echo -en 'travis_fold:end:adafruit-bins\\r'
8672

8773
- echo 'Building unix' && echo -en 'travis_fold:start:unix\\r'
88-
- ([[ $TRAVIS_TEST != "unix" ]] || make -C ports/unix deplibs -j2)
89-
- ([[ $TRAVIS_TEST != "unix" ]] || make -C ports/unix -j2)
90-
- ([[ $TRAVIS_TEST != "unix" ]] || make -C ports/unix coverage -j2)
74+
- (! var_search "${TRAVIS_TESTS-}" unix || (make -C ports/unix deplibs -j2 && make -C ports/unix -j2 && make -C ports/unix coverage -j2))
9175
- echo -en 'travis_fold:end:unix\\r'
9276

9377
# run tests without coverage info
@@ -96,27 +80,27 @@ script:
9680

9781
# run tests with coverage info
9882
- echo 'Test all' && echo -en 'travis_fold:start:test_all\\r'
99-
- ([[ $TRAVIS_TEST != "unix" ]] || (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1))
83+
- (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1))
10084
- echo -en 'travis_fold:end:test_all\\r'
10185

10286
- echo 'Test threads' && echo -en 'travis_fold:start:test_threads\\r'
103-
- ([[ $TRAVIS_TEST != "unix" ]] || (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 -d thread))
87+
- (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 -d thread))
10488
- echo -en 'travis_fold:end:test_threads\\r'
10589

10690
- echo 'Testing with native' && echo -en 'travis_fold:start:test_native\\r'
107-
- ([[ $TRAVIS_TEST != "unix" ]] || (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --emit native))
91+
- (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --emit native))
10892
- echo -en 'travis_fold:end:test_native\\r'
10993

11094
- (echo 'Testing with mpy' && echo -en 'travis_fold:start:test_mpy\\r')
111-
- ([[ $TRAVIS_TEST != "unix" ]] || (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --via-mpy -d basics float))
95+
- (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --via-mpy -d basics float))
11296
- echo -en 'travis_fold:end:test_mpy\\r'
11397

11498
- (echo 'Building docs' && echo -en 'travis_fold:start:build_docs\\r')
115-
- ([[ $TRAVIS_TEST != "docs" ]] || sphinx-build -E -W -b html . _build/html)
99+
- (! var_search "${TRAVIS_TESTS-}" docs || sphinx-build -E -W -b html . _build/html)
116100
- echo -en 'travis_fold:end:build_docs\\r'
117101

118102
- (echo 'Building translations' && echo -en 'travis_fold:start:build_translations\\r')
119-
- ([[ $TRAVIS_TEST != "translations" ]] || make check-translate)
103+
- (! var_search "${TRAVIS_TESTS-}" translations || make check-translate)
120104
- echo -en 'travis_fold:end:build_translations\\r'
121105

122106
# run coveralls coverage analysis (try to, even if some builds/tests failed)

‎lib/tinyusb‎

‎locale/circuitpython.pot‎

Lines changed: 114 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2018-10-09 23:01+1100\n"
11+
"POT-Creation-Date: 2018-10-11 14:17+1100\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -218,7 +218,7 @@ msgstr ""
218218
msgid "soft reboot\n"
219219
msgstr ""
220220

221-
#: ports/atmel-samd/audio_dma.c:285
221+
#: ports/atmel-samd/audio_dma.c:209
222222
#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c:361
223223
msgid "All sync event channels in use"
224224
msgstr ""
@@ -413,7 +413,8 @@ msgstr ""
413413

414414
#: ports/atmel-samd/common-hal/pulseio/PWMOut.c:120
415415
#: ports/atmel-samd/common-hal/pulseio/PWMOut.c:369
416-
#: ports/nrf/common-hal/pulseio/PWMOut.c:227
416+
#: ports/nrf/common-hal/pulseio/PWMOut.c:120
417+
#: ports/nrf/common-hal/pulseio/PWMOut.c:233
417418
msgid "Invalid PWM frequency"
418419
msgstr ""
419420

@@ -728,6 +729,10 @@ msgstr ""
728729
msgid "Can not get temperature. status: 0x%02x"
729730
msgstr ""
730731

732+
#: ports/nrf/common-hal/pulseio/PWMOut.c:162
733+
msgid "All PWM peripherals are in use"
734+
msgstr ""
735+
731736
#: ports/nrf/drivers/bluetooth/ble_drv.c:199
732737
msgid "Cannot apply GAP parameters."
733738
msgstr ""
@@ -1091,38 +1096,85 @@ msgstr ""
10911096
msgid "'data' requires integer arguments"
10921097
msgstr ""
10931098

1094-
#: py/emitinlinextensa.c:86
1095-
msgid "can only have up to 4 parameters to Xtensa assembly"
1099+
#: py/emitinlinethumb.c:102
1100+
msgid "can only have up to 4 parameters to Thumb assembly"
10961101
msgstr ""
10971102

1098-
#: py/emitinlinextensa.c:91 py/emitinlinextensa.c:96
1099-
msgid "parameters must be registers in sequence a2 to a5"
1103+
#: py/emitinlinethumb.c:107 py/emitinlinethumb.c:112
1104+
msgid "parameters must be registers in sequence r0 to r3"
11001105
msgstr ""
11011106

1102-
#: py/emitinlinextensa.c:162
1107+
#: py/emitinlinethumb.c:188 py/emitinlinethumb.c:230
1108+
#, c-format
1109+
msgid "'%s' expects at most r%d"
1110+
msgstr ""
1111+
1112+
#: py/emitinlinethumb.c:197 py/emitinlinextensa.c:162
11031113
#, c-format
11041114
msgid "'%s' expects a register"
11051115
msgstr ""
11061116

1107-
#: py/emitinlinextensa.c:169
1117+
#: py/emitinlinethumb.c:211
1118+
#, c-format
1119+
msgid "'%s' expects a special register"
1120+
msgstr ""
1121+
1122+
#: py/emitinlinethumb.c:239
1123+
#, c-format
1124+
msgid "'%s' expects an FPU register"
1125+
msgstr ""
1126+
1127+
#: py/emitinlinethumb.c:292
1128+
#, c-format
1129+
msgid "'%s' expects {r0, r1, ...}"
1130+
msgstr ""
1131+
1132+
#: py/emitinlinethumb.c:299 py/emitinlinextensa.c:169
11081133
#, c-format
11091134
msgid "'%s' expects an integer"
11101135
msgstr ""
11111136

1112-
#: py/emitinlinextensa.c:174
1137+
#: py/emitinlinethumb.c:304
11131138
#, c-format
1114-
msgid "'%s' integer %d is not within range %d..%d"
1139+
msgid "'%s' integer 0x%x does not fit in mask 0x%x"
11151140
msgstr ""
11161141

1117-
#: py/emitinlinextensa.c:182
1142+
#: py/emitinlinethumb.c:328
1143+
#, c-format
1144+
msgid "'%s' expects an address of the form [a, b]"
1145+
msgstr ""
1146+
1147+
#: py/emitinlinethumb.c:334 py/emitinlinextensa.c:182
11181148
#, c-format
11191149
msgid "'%s' expects a label"
11201150
msgstr ""
11211151

1122-
#: py/emitinlinextensa.c:193
1152+
#: py/emitinlinethumb.c:345 py/emitinlinextensa.c:193
11231153
msgid "label '%q' not defined"
11241154
msgstr ""
11251155

1156+
#: py/emitinlinethumb.c:806
1157+
#, c-format
1158+
msgid "unsupported Thumb instruction '%s' with %d arguments"
1159+
msgstr ""
1160+
1161+
#: py/emitinlinethumb.c:810
1162+
msgid "branch not in range"
1163+
msgstr ""
1164+
1165+
#: py/emitinlinextensa.c:86
1166+
msgid "can only have up to 4 parameters to Xtensa assembly"
1167+
msgstr ""
1168+
1169+
#: py/emitinlinextensa.c:91 py/emitinlinextensa.c:96
1170+
msgid "parameters must be registers in sequence a2 to a5"
1171+
msgstr ""
1172+
1173+
#: py/emitinlinextensa.c:174
1174+
#, c-format
1175+
msgid "'%s' integer %d is not within range %d..%d"
1176+
msgstr ""
1177+
11261178
#: py/emitinlinextensa.c:327
11271179
#, c-format
11281180
msgid "unsupported Xtensa instruction '%s' with %d arguments"
@@ -1979,6 +2031,22 @@ msgid ""
19792031
"destination buffer must be a bytearray or array of type 'B' for bit_depth = 8"
19802032
msgstr ""
19812033

2034+
#: shared-bindings/audioio/Mixer.c:94
2035+
msgid "Invalid voice count"
2036+
msgstr ""
2037+
2038+
#: shared-bindings/audioio/Mixer.c:99
2039+
msgid "Invalid channel count"
2040+
msgstr ""
2041+
2042+
#: shared-bindings/audioio/Mixer.c:103
2043+
msgid "Sample rate must be positive"
2044+
msgstr ""
2045+
2046+
#: shared-bindings/audioio/Mixer.c:107
2047+
msgid "bits_per_sample must be 8 or 16"
2048+
msgstr ""
2049+
19822050
#: shared-bindings/audioio/RawSample.c:98
19832051
msgid ""
19842052
"sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' or "
@@ -2149,10 +2217,6 @@ msgstr ""
21492217
msgid "Stream missing readinto() or write() method."
21502218
msgstr ""
21512219

2152-
#: shared-bindings/network/__init__.c:79 shared-bindings/socket/__init__.c:428
2153-
msgid "no available NIC"
2154-
msgstr ""
2155-
21562220
#: shared-bindings/nvm/ByteArray.c:99
21572221
msgid "Slice and value different lengths."
21582222
msgstr ""
@@ -2180,7 +2244,7 @@ msgstr ""
21802244

21812245
#: shared-bindings/pulseio/PWMOut.c:195
21822246
msgid ""
2183-
"PWM frequency not writeable when variable_frequency is False on construction."
2247+
"PWM frequency not writable when variable_frequency is False on construction."
21842248
msgstr ""
21852249

21862250
#: shared-bindings/pulseio/PulseIn.c:275
@@ -2228,6 +2292,10 @@ msgstr ""
22282292
msgid "RTC calibration is not supported on this board"
22292293
msgstr ""
22302294

2295+
#: shared-bindings/socket/__init__.c:428 shared-module/network/__init__.c:64
2296+
msgid "no available NIC"
2297+
msgstr ""
2298+
22312299
#: shared-bindings/storage/__init__.c:77
22322300
msgid "filesystem must provide mount method"
22332301
msgstr ""
@@ -2273,6 +2341,34 @@ msgid ""
22732341
"Object has been deinitialized and can no longer be used. Create a new object."
22742342
msgstr ""
22752343

2344+
#: shared-module/audioio/Mixer.c:47 shared-module/audioio/WaveFile.c:117
2345+
msgid "Couldn't allocate first buffer"
2346+
msgstr ""
2347+
2348+
#: shared-module/audioio/Mixer.c:53 shared-module/audioio/WaveFile.c:123
2349+
msgid "Couldn't allocate second buffer"
2350+
msgstr ""
2351+
2352+
#: shared-module/audioio/Mixer.c:82
2353+
msgid "Voice index too high"
2354+
msgstr ""
2355+
2356+
#: shared-module/audioio/Mixer.c:85
2357+
msgid "The sample's sample rate does not match the mixer's"
2358+
msgstr ""
2359+
2360+
#: shared-module/audioio/Mixer.c:88
2361+
msgid "The sample's channel count does not match the mixer's"
2362+
msgstr ""
2363+
2364+
#: shared-module/audioio/Mixer.c:91
2365+
msgid "The sample's bits_per_sample does not match the mixer's"
2366+
msgstr ""
2367+
2368+
#: shared-module/audioio/Mixer.c:100
2369+
msgid "The sample's signedness does not match the mixer's"
2370+
msgstr ""
2371+
22762372
#: shared-module/audioio/WaveFile.c:61
22772373
msgid "Invalid wave file"
22782374
msgstr ""
@@ -2293,14 +2389,6 @@ msgstr ""
22932389
msgid "Invalid file"
22942390
msgstr ""
22952391

2296-
#: shared-module/audioio/WaveFile.c:117
2297-
msgid "Couldn't allocate first buffer"
2298-
msgstr ""
2299-
2300-
#: shared-module/audioio/WaveFile.c:123
2301-
msgid "Couldn't allocate second buffer"
2302-
msgstr ""
2303-
23042392
#: shared-module/bitbangio/I2C.c:58
23052393
msgid "Clock stretch too long"
23062394
msgstr ""

0 commit comments

Comments
 (0)