Skip to content

Commit e3dc5e3

Browse files
dhalbertdhalbert
committed
Merge remote-tracking branch 'adafruit/master' into run-background-tasks
Restore dependencies indicated by indentation in circuitpy_mpconfig.h.
2 parents e3c0428 + 6b54e67 commit e3dc5e3

91 files changed

Lines changed: 3457 additions & 1404 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.travis.yml‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,32 @@ git:
1212
# pip packages, and so forth. By gathering activities together in optimal
1313
# ways, the "run time" and "total time" of the travis jobs can be minimized.
1414
#
15-
# Since at the time of writing Travis generally starts 5 or 6 jobs, the
16-
# builds have been organized into 5 groups of *approximately* equal durations.
17-
# Additionally, the jobs that need extra SDKs are also organized together.
15+
# Builds are organized so some will complete quickly, and others are of
16+
# approximately equal size. Try not to freeze out other Travis users.
17+
#
18+
# Board names are in alphabetical order for easy finding, but grouped by
19+
# Adafruit/modified-Adafruit and Other. Ideally they'd be separated into
20+
# separate jobs, but there are too many.
1821
#
1922
# When adding new boards, take a look on the travis CI page
2023
# https://travis-ci.org/adafruit/circuitpython to which build that installs
2124
# that SDK is shortest and add it there. In the case of major re-organizations,
2225
# just try to make the builds "about equal in run time"
2326
env:
24-
- TRAVIS_TESTS="unix docs translations website" TRAVIS_BOARDS="trinket_m0_haxpress circuitplayground_express mini_sam_m4 grandcentral_m4_express capablerobot_usbhub pygamer pca10056 pca10059 feather_nrf52840_express metro_nrf52840_express makerdiary_nrf52840_mdk makerdiary_nrf52840_mdk_usb_dongle particle_boron particle_argon particle_xenon sparkfun_nrf52840_mini electronut_labs_papyr electronut_labs_blip" TRAVIS_SDK=arm:nrf
25-
- TRAVIS_BOARDS="metro_m0_express metro_m4_express metro_m4_airlift_lite pirkey_m0 trellis_m4_express trinket_m0 sparkfun_lumidrive sparkfun_redboard_turbo bast_pro_mini_m0 datum_distance pyruler" TRAVIS_SDK=arm
26-
- TRAVIS_BOARDS="cp32-m4 feather_radiofruit_zigbee gemma_m0 hallowing_m0_express itsybitsy_m0_express itsybitsy_m4_express meowmeow sam32 uchip escornabot_makech pygamer_advance datum_imu snekboard" TRAVIS_SDK=arm
27-
- TRAVIS_BOARDS="feather_m0_supersized feather_m0_express_crickit feather_m0_rfm69 feather_m0_rfm9x feather_m4_express arduino_zero arduino_mkr1300 arduino_mkrzero pewpew10 kicksat-sprite ugame10 robohatmm1_m0 robohatmm1_m4 datum_light" TRAVIS_SDK=arm
28-
- TRAVIS_BOARDS="datalore_ip_m4 circuitplayground_express_crickit feather_m0_adalogger feather_m0_basic feather_m0_express catwan_usbstick pyportal sparkfun_samd21_mini sparkfun_samd21_dev pybadge pybadge_airlift datum_weather" TRAVIS_SDK=arm
27+
# Non-board tasks
28+
- TRAVIS_TESTS="unix docs translations website" TRAVIS_BOARDS=""
29+
# Adafruit and Nordic nRF boards
30+
- TRAVIS_BOARDS="circuitplayground_bluefruit feather_nrf52840_express metro_nrf52840_express pca10056 pca10059" TRAVIS_SDK=arm
31+
# Other nRF boards
32+
- TRAVIS_BOARDS="electronut_labs_blip electronut_labs_papyr makerdiary_nrf52840_mdk makerdiary_nrf52840_mdk_usb_dongle particle_argon particle_boron particle_xenon sparkfun_nrf52840_mini" TRAVIS_SDK=arm
33+
# Adafruit and modified Adafruit SAMD21 (M0) + Other SAMD21 (M0)
34+
- TRAVIS_BOARDS="circuitplayground_express circuitplayground_express_crickit feather_m0_adalogger feather_m0_basic feather_m0_express feather_m0_express_crickit feather_m0_rfm69 feather_m0_rfm9x feather_m0_supersized feather_radiofruit_zigbee gemma_m0 hallowing_m0_express " TRAVIS_SDK=arm
35+
- TRAVIS_BOARDS="itsybitsy_m0_express metro_m0_express pirkey_m0 pyruler trinket_m0 trinket_m0_haxpress arduino_mkr1300 arduino_mkrzero arduino_zero bast_pro_mini_m0 catwan_usbstick datum_distance datum_imu datum_weather" TRAVIS_SDK=arm
36+
- TRAVIS_BOARDS="escornabot_makech meowmeow pewpew10 robohatmm1_m0 snekboard sparkfun_lumidrive sparkfun_redboard_turbo sparkfun_samd21_dev sparkfun_samd21_mini uchip ugame10" TRAVIS_SDK=arm
37+
# Adafruit SAMD51 (M4) + Other SAMD51
38+
- TRAVIS_BOARDS="feather_m4_express grandcentral_m4_express itsybitsy_m4_express metro_m4_airlift_lite metro_m4_express pybadge pybadge_airlift pygamer pygamer_advance" TRAVIS_SDK=arm
39+
- TRAVIS_BOARDS="pyportal pyportal_titano trellis_m4_express capablerobot_usbhub cp32-m4 datalore_ip_m4 datum_light kicksat-sprite mini_sam_m4 robohatmm1_m4 sam32" TRAVIS_SDK=arm
40+
2941

3042
addons:
3143
artifacts:

‎lib/tinyusb‎

Submodule tinyusb updated 61 files

‎locale/ID.po‎

Lines changed: 68 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: 2019-08-05 17:52-0700\n"
11+
"POT-Creation-Date: 2019-08-19 10:22-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 <LL@li.org>\n"
@@ -364,7 +364,7 @@ msgid "Can not use dotstar with %s"
364364
msgstr ""
365365

366366
#: ports/nrf/common-hal/bleio/Characteristic.c
367-
msgid "Can't set CCCD for local Characteristic"
367+
msgid "Can't set CCCD on local Characteristic"
368368
msgstr ""
369369

370370
#: shared-bindings/displayio/Bitmap.c shared-bindings/pulseio/PulseIn.c
@@ -433,6 +433,10 @@ msgstr ""
433433
msgid "Characteristic already in use by another Service."
434434
msgstr ""
435435

436+
#: shared-bindings/bleio/Service.c
437+
msgid "Characteristic is already attached to a Service"
438+
msgstr ""
439+
436440
#: shared-bindings/bleio/CharacteristicBuffer.c
437441
msgid "CharacteristicBuffer writing not provided"
438442
msgstr ""
@@ -508,6 +512,10 @@ msgstr ""
508512
msgid "Data too large for advertisement packet"
509513
msgstr "Tidak bisa menyesuaikan data ke dalam paket advertisment"
510514

515+
#: shared-bindings/bleio/Characteristic.c
516+
msgid "Descriptor is already attached to a Characteristic"
517+
msgstr ""
518+
511519
#: shared-bindings/audiobusio/PDMIn.c
512520
msgid "Destination capacity is smaller than destination_length."
513521
msgstr ""
@@ -602,7 +610,7 @@ msgstr ""
602610
msgid "Failed to continue scanning, err 0x%04x"
603611
msgstr "Gagal untuk melanjutkan scanning, status: 0x%08lX"
604612

605-
#: ports/nrf/common-hal/bleio/Central.c
613+
#: ports/nrf/common-hal/bleio/__init__.c
606614
#, fuzzy
607615
msgid "Failed to discover services"
608616
msgstr "Gagal untuk menemukan layanan, status: 0x%08lX"
@@ -622,17 +630,22 @@ msgstr "Gagal untuk mendapatkan status softdevice, error: 0x%08lX"
622630
msgid "Failed to notify or indicate attribute value, err 0x%04x"
623631
msgstr ""
624632

633+
#: ports/nrf/common-hal/bleio/Peripheral.c
634+
msgid "Failed to pair"
635+
msgstr ""
636+
625637
#: ports/nrf/common-hal/bleio/Characteristic.c
626638
#, fuzzy, c-format
627639
msgid "Failed to read CCCD value, err 0x%04x"
628640
msgstr "Gagal untuk membaca nilai atribut, status: 0x%08lX"
629641

630642
#: ports/nrf/common-hal/bleio/Characteristic.c
643+
#: ports/nrf/common-hal/bleio/Descriptor.c
631644
#, c-format
632645
msgid "Failed to read attribute value, err 0x%04x"
633646
msgstr ""
634647

635-
#: ports/nrf/common-hal/bleio/Characteristic.c
648+
#: ports/nrf/common-hal/bleio/__init__.c
636649
#, fuzzy, c-format
637650
msgid "Failed to read gatts value, err 0x%04x"
638651
msgstr "Gagal untuk menulis nilai gatts, status: 0x%08lX"
@@ -662,6 +675,11 @@ msgstr "Gagal untuk memulai advertisement, status: 0x%08lX"
662675
msgid "Failed to start connecting, error 0x%04x"
663676
msgstr ""
664677

678+
#: ports/nrf/common-hal/bleio/Peripheral.c
679+
#, c-format
680+
msgid "Failed to start pairing, error 0x%04x"
681+
msgstr ""
682+
665683
#: ports/nrf/common-hal/bleio/Scanner.c
666684
#, fuzzy, c-format
667685
msgid "Failed to start scanning, err 0x%04x"
@@ -677,12 +695,12 @@ msgstr "Gagal untuk memberhentikan advertisement, status: 0x%08lX"
677695
msgid "Failed to write CCCD, err 0x%04x"
678696
msgstr ""
679697

680-
#: ports/nrf/common-hal/bleio/Characteristic.c
698+
#: ports/nrf/common-hal/bleio/__init__.c
681699
#, fuzzy, c-format
682700
msgid "Failed to write attribute value, err 0x%04x"
683701
msgstr "Gagal untuk menulis nilai atribut, status: 0x%08lX"
684702

685-
#: ports/nrf/common-hal/bleio/Characteristic.c
703+
#: ports/nrf/common-hal/bleio/__init__.c
686704
#, fuzzy, c-format
687705
msgid "Failed to write gatts value, err 0x%04x"
688706
msgstr "Gagal untuk menulis nilai gatts, status: 0x%08lX"
@@ -828,10 +846,18 @@ msgstr "Pin-pin tidak valid"
828846
msgid "Invalid polarity"
829847
msgstr ""
830848

849+
#: shared-bindings/bleio/Characteristic.c
850+
msgid "Invalid properties"
851+
msgstr ""
852+
831853
#: shared-bindings/microcontroller/__init__.c
832854
msgid "Invalid run mode."
833855
msgstr ""
834856

857+
#: shared-module/bleio/Attribute.c
858+
msgid "Invalid security_mode"
859+
msgstr ""
860+
835861
#: shared-bindings/audiocore/Mixer.c
836862
msgid "Invalid voice count"
837863
msgstr ""
@@ -950,8 +976,9 @@ msgstr ""
950976
msgid "No such file/directory"
951977
msgstr ""
952978

953-
#: ports/nrf/common-hal/bleio/Characteristic.c
979+
#: ports/nrf/common-hal/bleio/__init__.c shared-bindings/bleio/Central.c
954980
#: shared-bindings/bleio/CharacteristicBuffer.c
981+
#: shared-bindings/bleio/Peripheral.c
955982
#, fuzzy
956983
msgid "Not connected"
957984
msgstr "Tidak dapat menyambungkan ke AP"
@@ -1107,7 +1134,7 @@ msgid "Slices not supported"
11071134
msgstr ""
11081135

11091136
#: ports/nrf/common-hal/bleio/Adapter.c
1110-
#, c-format
1137+
#, fuzzy, c-format
11111138
msgid "Soft device assert, id: 0x%08lX, pc: 0x%08lX"
11121139
msgstr "Dukungan soft device, id: 0x%08lX, pc: 0x%08l"
11131140

@@ -1289,6 +1316,19 @@ msgstr ""
12891316
msgid "Unsupported pull value."
12901317
msgstr ""
12911318

1319+
#: ports/nrf/common-hal/bleio/Characteristic.c
1320+
msgid "Value length required fixed length"
1321+
msgstr ""
1322+
1323+
#: ports/nrf/common-hal/bleio/Descriptor.c
1324+
msgid "Value length != required fixed length"
1325+
msgstr ""
1326+
1327+
#: ports/nrf/common-hal/bleio/Characteristic.c
1328+
#: ports/nrf/common-hal/bleio/Descriptor.c
1329+
msgid "Value length > max_length"
1330+
msgstr ""
1331+
12921332
#: py/emitnative.c
12931333
msgid "Viper functions don't currently support more than 4 arguments"
12941334
msgstr ""
@@ -1388,10 +1428,6 @@ msgstr ""
13881428
msgid "attributes not supported yet"
13891429
msgstr ""
13901430

1391-
#: ports/nrf/common-hal/bleio/Characteristic.c
1392-
msgid "bad GATT role"
1393-
msgstr ""
1394-
13951431
#: py/builtinevex.c
13961432
msgid "bad compile mode"
13971433
msgstr "mode compile buruk"
@@ -1709,6 +1745,10 @@ msgstr ""
17091745
msgid "default 'except' must be last"
17101746
msgstr "'except' standar harus terakhir"
17111747

1748+
#: shared-bindings/bleio/Characteristic.c
1749+
msgid "descriptors includes an object that is not a Descriptors"
1750+
msgstr ""
1751+
17121752
#: shared-bindings/audiobusio/PDMIn.c
17131753
msgid ""
17141754
"destination buffer must be a bytearray or array of type 'B' for bit_depth = 8"
@@ -2048,6 +2088,12 @@ msgstr ""
20482088
msgid "math domain error"
20492089
msgstr ""
20502090

2091+
#: ports/nrf/common-hal/bleio/Characteristic.c
2092+
#: ports/nrf/common-hal/bleio/Descriptor.c
2093+
#, c-format
2094+
msgid "max_length must be 0-%d when fixed_length is %s"
2095+
msgstr ""
2096+
20512097
#: py/runtime.c
20522098
msgid "maximum recursion depth exceeded"
20532099
msgstr ""
@@ -2147,8 +2193,8 @@ msgstr ""
21472193
msgid "non-Service found in services"
21482194
msgstr ""
21492195

2150-
#: ports/nrf/common-hal/bleio/Central.c
2151-
msgid "non-UUID found in service_uuids"
2196+
#: ports/nrf/common-hal/bleio/__init__.c
2197+
msgid "non-UUID found in service_uuids_whitelist"
21522198
msgstr ""
21532199

21542200
#: py/compile.c
@@ -2234,6 +2280,14 @@ msgstr "panjang data string memiliki keganjilan (odd-length)"
22342280
msgid "offset out of bounds"
22352281
msgstr "modul tidak ditemukan"
22362282

2283+
#: ports/nrf/common-hal/audiobusio/PDMIn.c
2284+
msgid "only bit_depth=16 is supported"
2285+
msgstr ""
2286+
2287+
#: ports/nrf/common-hal/audiobusio/PDMIn.c
2288+
msgid "only sample_rate=16000 is supported"
2289+
msgstr ""
2290+
22372291
#: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
22382292
#: shared-bindings/nvm/ByteArray.c
22392293
msgid "only slices with step=1 (aka None) are supported"

0 commit comments

Comments
 (0)