Skip to content

Commit 3f380de

Browse files
tannewttannewt
authored
Merge pull request #1197 from dhalbert/3.x-master
3.x master
2 parents 8172a2c + 91cc23f commit 3f380de

File tree

22 files changed

+277
-192
lines changed

22 files changed

+277
-192
lines changed

‎.travis.yml‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,34 +5,39 @@ compiler:
55
- gcc
66
git:
77
depth: 1
8+
9+
# Put a representative board from each port or sub-port near the top
10+
# to determine more quickly whether that port is going to build or not.
811
env:
912
- TRAVIS_TEST=unix
1013
- TRAVIS_TEST=docs
1114
- TRAVIS_TEST=translations
1215
- TRAVIS_BOARD=feather_huzzah
1316
- TRAVIS_BOARD=circuitplayground_express
1417
- TRAVIS_BOARD=pca10056
18+
# The rest of the boards, in alphabetical order.
1519
- TRAVIS_BOARD=trinket_m0
1620
- TRAVIS_BOARD=feather_m4_express
1721
- TRAVIS_BOARD=grandcentral_m4_express
18-
- TRAVIS_BOARD=feather_radiofruit_zigbee
1922
- TRAVIS_BOARD=arduino_zero
2023
- TRAVIS_BOARD=circuitplayground_express_crickit
21-
- TRAVIS_BOARD=feather_m0_basic
2224
- TRAVIS_BOARD=feather_m0_adalogger
23-
- TRAVIS_BOARD=feather_m0_rfm69
24-
- TRAVIS_BOARD=feather_m0_rfm9x
25+
- TRAVIS_BOARD=feather_m0_basic
2526
- TRAVIS_BOARD=feather_m0_express
2627
- 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
2735
- TRAVIS_BOARD=itsybitsy_m0_express
2836
- TRAVIS_BOARD=itsybitsy_m4_express
2937
- TRAVIS_BOARD=metro_m0_express
3038
- TRAVIS_BOARD=metro_m4_express
39+
- TRAVIS_BOARD=pca10059
3140
- TRAVIS_BOARD=pirkey_m0
32-
- TRAVIS_BOARD=gemma_m0
33-
- TRAVIS_BOARD=hallowing_m0_express
34-
- TRAVIS_BOARD=feather_nrf52832
35-
- TRAVIS_BOARD=feather_nrf52840_express
3641
- TRAVIS_BOARD=trellis_m4_express
3742

3843
addons:
@@ -57,7 +62,7 @@ before_script:
5762
- ([[ -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))
5863

5964
# For nrf builds
60-
- ([[ $TRAVIS_BOARD != "feather_nrf52832" && $TRAVIS_BOARD != "feather_nrf52840_express" && $TRAVIS_BOARD != "pca10056" ]] || sudo ports/nrf/drivers/bluetooth/download_ble_stack.sh)
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)
6166
# For huzzah builds
6267
- 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
6368
# For coverage testing (upgrade is used to get latest urllib3 version)

‎locale/circuitpython.pot‎

Lines changed: 14 additions & 14 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-09-12 16:24-0700\n"
11+
"POT-Creation-Date: 2018-09-18 22:20-0400\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -231,15 +231,15 @@ msgstr ""
231231
msgid "calibration is out of range"
232232
msgstr ""
233233

234-
#: ports/atmel-samd/board_busses.c:39 ports/nrf/board_busses.c:39
234+
#: ports/atmel-samd/board_busses.c:59 ports/nrf/board_busses.c:39
235235
msgid "No default I2C bus"
236236
msgstr ""
237237

238-
#: ports/atmel-samd/board_busses.c:64 ports/nrf/board_busses.c:64
238+
#: ports/atmel-samd/board_busses.c:85 ports/nrf/board_busses.c:64
239239
msgid "No default SPI bus"
240240
msgstr ""
241241

242-
#: ports/atmel-samd/board_busses.c:91 ports/nrf/board_busses.c:91
242+
#: ports/atmel-samd/board_busses.c:112 ports/nrf/board_busses.c:91
243243
msgid "No default UART bus"
244244
msgstr ""
245245

@@ -339,7 +339,7 @@ msgid "Cannot output both channels on the same pin"
339339
msgstr ""
340340

341341
#: ports/atmel-samd/common-hal/audioio/AudioOut.c:173
342-
#: ports/atmel-samd/common-hal/pulseio/PWMOut.c:186
342+
#: ports/atmel-samd/common-hal/pulseio/PWMOut.c:189
343343
#: ports/atmel-samd/common-hal/pulseio/PulseOut.c:110
344344
msgid "All timers in use"
345345
msgstr ""
@@ -376,19 +376,19 @@ msgstr ""
376376
msgid "tx and rx cannot both be None"
377377
msgstr ""
378378

379-
#: ports/atmel-samd/common-hal/busio/UART.c:139
379+
#: ports/atmel-samd/common-hal/busio/UART.c:145
380380
msgid "Failed to allocate RX buffer"
381381
msgstr ""
382382

383-
#: ports/atmel-samd/common-hal/busio/UART.c:147
383+
#: ports/atmel-samd/common-hal/busio/UART.c:153
384384
msgid "Could not initialize UART"
385385
msgstr ""
386386

387-
#: ports/atmel-samd/common-hal/busio/UART.c:234
387+
#: ports/atmel-samd/common-hal/busio/UART.c:240
388388
msgid "No RX pin"
389389
msgstr ""
390390

391-
#: ports/atmel-samd/common-hal/busio/UART.c:288
391+
#: ports/atmel-samd/common-hal/busio/UART.c:294
392392
msgid "No TX pin"
393393
msgstr ""
394394

@@ -403,12 +403,12 @@ msgid "Cannot reset into bootloader because no bootloader is present."
403403
msgstr ""
404404

405405
#: ports/atmel-samd/common-hal/pulseio/PWMOut.c:120
406-
#: ports/atmel-samd/common-hal/pulseio/PWMOut.c:366
406+
#: ports/atmel-samd/common-hal/pulseio/PWMOut.c:369
407407
#: ports/nrf/common-hal/pulseio/PWMOut.c:227
408408
msgid "Invalid PWM frequency"
409409
msgstr ""
410410

411-
#: ports/atmel-samd/common-hal/pulseio/PWMOut.c:184
411+
#: ports/atmel-samd/common-hal/pulseio/PWMOut.c:187
412412
msgid "All timers for this pin are in use"
413413
msgstr ""
414414

@@ -689,7 +689,7 @@ msgstr ""
689689
#: ports/nrf/common-hal/busio/UART.c:51 ports/nrf/common-hal/busio/UART.c:60
690690
#: ports/nrf/common-hal/busio/UART.c:66 ports/nrf/common-hal/busio/UART.c:71
691691
#: ports/nrf/common-hal/busio/UART.c:76 ports/nrf/common-hal/busio/UART.c:81
692-
#: ports/nrf/common-hal/busio/UART.c:86
692+
#: ports/nrf/common-hal/busio/UART.c:86 ports/nrf/common-hal/busio/UART.c:90
693693
msgid "busio.UART not yet implemented"
694694
msgstr ""
695695

@@ -1993,11 +1993,11 @@ msgstr ""
19931993
msgid "Function requires lock."
19941994
msgstr ""
19951995

1996-
#: shared-bindings/busio/UART.c:98
1996+
#: shared-bindings/busio/UART.c:102
19971997
msgid "bits must be 7, 8 or 9"
19981998
msgstr ""
19991999

2000-
#: shared-bindings/busio/UART.c:110
2000+
#: shared-bindings/busio/UART.c:114
20012001
msgid "stop must be 1 or 2"
20022002
msgstr ""
20032003

‎locale/de_DE.po‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2018-09-12 16:24-0700\n"
10+
"POT-Creation-Date: 2018-09-18 22:20-0400\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: Sebastian Plamauer\n"
1313
"Language-Team: \n"
@@ -240,15 +240,15 @@ msgstr "Kalibrierung ist Schreibgeschützt"
240240
msgid "calibration is out of range"
241241
msgstr "Kalibrierung ist außerhalb der Reichweite"
242242

243-
#: ports/atmel-samd/board_busses.c:39 ports/nrf/board_busses.c:39
243+
#: ports/atmel-samd/board_busses.c:59 ports/nrf/board_busses.c:39
244244
msgid "No default I2C bus"
245245
msgstr "Kein Standard I2C Bus"
246246

247-
#: ports/atmel-samd/board_busses.c:64 ports/nrf/board_busses.c:64
247+
#: ports/atmel-samd/board_busses.c:85 ports/nrf/board_busses.c:64
248248
msgid "No default SPI bus"
249249
msgstr "Kein Standard SPI Bus"
250250

251-
#: ports/atmel-samd/board_busses.c:91 ports/nrf/board_busses.c:91
251+
#: ports/atmel-samd/board_busses.c:112 ports/nrf/board_busses.c:91
252252
msgid "No default UART bus"
253253
msgstr "Kein Standard UART Bus"
254254

@@ -348,7 +348,7 @@ msgid "Cannot output both channels on the same pin"
348348
msgstr "Kann nicht beite Kanäle auf dem gleichen Pin ausgeben"
349349

350350
#: ports/atmel-samd/common-hal/audioio/AudioOut.c:173
351-
#: ports/atmel-samd/common-hal/pulseio/PWMOut.c:186
351+
#: ports/atmel-samd/common-hal/pulseio/PWMOut.c:189
352352
#: ports/atmel-samd/common-hal/pulseio/PulseOut.c:110
353353
msgid "All timers in use"
354354
msgstr "Alle timer werden benutzt"
@@ -385,19 +385,19 @@ msgstr "bytes mit merh als 8 bits werden nicht unterstützt"
385385
msgid "tx and rx cannot both be None"
386386
msgstr "tx und rx können nicht beide None sein"
387387

388-
#: ports/atmel-samd/common-hal/busio/UART.c:139
388+
#: ports/atmel-samd/common-hal/busio/UART.c:145
389389
msgid "Failed to allocate RX buffer"
390390
msgstr "Konnte keinen RX Buffer allozieren"
391391

392-
#: ports/atmel-samd/common-hal/busio/UART.c:147
392+
#: ports/atmel-samd/common-hal/busio/UART.c:153
393393
msgid "Could not initialize UART"
394394
msgstr "Konnte UART nicht initialisieren"
395395

396-
#: ports/atmel-samd/common-hal/busio/UART.c:234
396+
#: ports/atmel-samd/common-hal/busio/UART.c:240
397397
msgid "No RX pin"
398398
msgstr "Kein RX Pin"
399399

400-
#: ports/atmel-samd/common-hal/busio/UART.c:288
400+
#: ports/atmel-samd/common-hal/busio/UART.c:294
401401
msgid "No TX pin"
402402
msgstr "Kein TX Pin"
403403

@@ -412,12 +412,12 @@ msgid "Cannot reset into bootloader because no bootloader is present."
412412
msgstr "Reset zum bootloader nicht möglich da bootloader nicht vorhanden"
413413

414414
#: ports/atmel-samd/common-hal/pulseio/PWMOut.c:120
415-
#: ports/atmel-samd/common-hal/pulseio/PWMOut.c:366
415+
#: ports/atmel-samd/common-hal/pulseio/PWMOut.c:369
416416
#: ports/nrf/common-hal/pulseio/PWMOut.c:227
417417
msgid "Invalid PWM frequency"
418418
msgstr "Ungültige PWM Frequenz"
419419

420-
#: ports/atmel-samd/common-hal/pulseio/PWMOut.c:184
420+
#: ports/atmel-samd/common-hal/pulseio/PWMOut.c:187
421421
msgid "All timers for this pin are in use"
422422
msgstr "Alle timer für diesen Pin werden benutzt"
423423

@@ -698,7 +698,7 @@ msgstr ""
698698
#: ports/nrf/common-hal/busio/UART.c:51 ports/nrf/common-hal/busio/UART.c:60
699699
#: ports/nrf/common-hal/busio/UART.c:66 ports/nrf/common-hal/busio/UART.c:71
700700
#: ports/nrf/common-hal/busio/UART.c:76 ports/nrf/common-hal/busio/UART.c:81
701-
#: ports/nrf/common-hal/busio/UART.c:86
701+
#: ports/nrf/common-hal/busio/UART.c:86 ports/nrf/common-hal/busio/UART.c:90
702702
msgid "busio.UART not yet implemented"
703703
msgstr ""
704704

@@ -2002,11 +2002,11 @@ msgstr ""
20022002
msgid "Function requires lock."
20032003
msgstr ""
20042004

2005-
#: shared-bindings/busio/UART.c:98
2005+
#: shared-bindings/busio/UART.c:102
20062006
msgid "bits must be 7, 8 or 9"
20072007
msgstr ""
20082008

2009-
#: shared-bindings/busio/UART.c:110
2009+
#: shared-bindings/busio/UART.c:114
20102010
msgid "stop must be 1 or 2"
20112011
msgstr ""
20122012

‎locale/en_US.po‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2018-09-12 16:24-0700\n"
10+
"POT-Creation-Date: 2018-09-18 22:20-0400\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -231,15 +231,15 @@ msgstr ""
231231
msgid "calibration is out of range"
232232
msgstr ""
233233

234-
#: ports/atmel-samd/board_busses.c:39 ports/nrf/board_busses.c:39
234+
#: ports/atmel-samd/board_busses.c:59 ports/nrf/board_busses.c:39
235235
msgid "No default I2C bus"
236236
msgstr ""
237237

238-
#: ports/atmel-samd/board_busses.c:64 ports/nrf/board_busses.c:64
238+
#: ports/atmel-samd/board_busses.c:85 ports/nrf/board_busses.c:64
239239
msgid "No default SPI bus"
240240
msgstr ""
241241

242-
#: ports/atmel-samd/board_busses.c:91 ports/nrf/board_busses.c:91
242+
#: ports/atmel-samd/board_busses.c:112 ports/nrf/board_busses.c:91
243243
msgid "No default UART bus"
244244
msgstr ""
245245

@@ -339,7 +339,7 @@ msgid "Cannot output both channels on the same pin"
339339
msgstr ""
340340

341341
#: ports/atmel-samd/common-hal/audioio/AudioOut.c:173
342-
#: ports/atmel-samd/common-hal/pulseio/PWMOut.c:186
342+
#: ports/atmel-samd/common-hal/pulseio/PWMOut.c:189
343343
#: ports/atmel-samd/common-hal/pulseio/PulseOut.c:110
344344
msgid "All timers in use"
345345
msgstr ""
@@ -376,19 +376,19 @@ msgstr ""
376376
msgid "tx and rx cannot both be None"
377377
msgstr ""
378378

379-
#: ports/atmel-samd/common-hal/busio/UART.c:139
379+
#: ports/atmel-samd/common-hal/busio/UART.c:145
380380
msgid "Failed to allocate RX buffer"
381381
msgstr ""
382382

383-
#: ports/atmel-samd/common-hal/busio/UART.c:147
383+
#: ports/atmel-samd/common-hal/busio/UART.c:153
384384
msgid "Could not initialize UART"
385385
msgstr ""
386386

387-
#: ports/atmel-samd/common-hal/busio/UART.c:234
387+
#: ports/atmel-samd/common-hal/busio/UART.c:240
388388
msgid "No RX pin"
389389
msgstr ""
390390

391-
#: ports/atmel-samd/common-hal/busio/UART.c:288
391+
#: ports/atmel-samd/common-hal/busio/UART.c:294
392392
msgid "No TX pin"
393393
msgstr ""
394394

@@ -403,12 +403,12 @@ msgid "Cannot reset into bootloader because no bootloader is present."
403403
msgstr ""
404404

405405
#: ports/atmel-samd/common-hal/pulseio/PWMOut.c:120
406-
#: ports/atmel-samd/common-hal/pulseio/PWMOut.c:366
406+
#: ports/atmel-samd/common-hal/pulseio/PWMOut.c:369
407407
#: ports/nrf/common-hal/pulseio/PWMOut.c:227
408408
msgid "Invalid PWM frequency"
409409
msgstr ""
410410

411-
#: ports/atmel-samd/common-hal/pulseio/PWMOut.c:184
411+
#: ports/atmel-samd/common-hal/pulseio/PWMOut.c:187
412412
msgid "All timers for this pin are in use"
413413
msgstr ""
414414

@@ -689,7 +689,7 @@ msgstr ""
689689
#: ports/nrf/common-hal/busio/UART.c:51 ports/nrf/common-hal/busio/UART.c:60
690690
#: ports/nrf/common-hal/busio/UART.c:66 ports/nrf/common-hal/busio/UART.c:71
691691
#: ports/nrf/common-hal/busio/UART.c:76 ports/nrf/common-hal/busio/UART.c:81
692-
#: ports/nrf/common-hal/busio/UART.c:86
692+
#: ports/nrf/common-hal/busio/UART.c:86 ports/nrf/common-hal/busio/UART.c:90
693693
msgid "busio.UART not yet implemented"
694694
msgstr ""
695695

@@ -1993,11 +1993,11 @@ msgstr ""
19931993
msgid "Function requires lock."
19941994
msgstr ""
19951995

1996-
#: shared-bindings/busio/UART.c:98
1996+
#: shared-bindings/busio/UART.c:102
19971997
msgid "bits must be 7, 8 or 9"
19981998
msgstr ""
19991999

2000-
#: shared-bindings/busio/UART.c:110
2000+
#: shared-bindings/busio/UART.c:114
20012001
msgid "stop must be 1 or 2"
20022002
msgstr ""
20032003

0 commit comments

Comments
 (0)