Skip to content

Commit 1b2996a

Browse files
sommersoftsommersoft
committed
Merge branch 'master' of https://github.com/adafruit/circuitpython into mixer_voice
2 parents 17190ae + 0ddfbb0 commit 1b2996a

151 files changed

Lines changed: 5092 additions & 1647 deletions

File tree

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: 21 additions & 9 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 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" 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:
@@ -88,7 +100,7 @@ before_script:
88100
# Check if there's any board missing in TRAVIS_BOARDS
89101
- cd tools && python3 -u travis_new_boards_check.py
90102
- cd ..
91-
103+
92104
# report some good version numbers to the build
93105
- gcc --version
94106
- (! var_search "${TRAVIS_SDK-}" arm || arm-none-eabi-gcc --version)

‎frozen/circuitpython-stage‎

‎lib/tinyusb‎

‎locale/ID.po‎

Lines changed: 81 additions & 19 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-07-25 22:48-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"
@@ -255,6 +255,7 @@ msgstr "Semua timer untuk pin ini sedang digunakan"
255255
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
256256
#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
257257
#: ports/atmel-samd/common-hal/pulseio/PulseOut.c
258+
#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c
258259
#: ports/nrf/common-hal/pulseio/PulseOut.c shared-bindings/pulseio/PWMOut.c
259260
#: shared-module/_pew/PewPew.c
260261
msgid "All timers in use"
@@ -329,6 +330,11 @@ msgstr ""
329330
msgid "Buffer incorrect size. Should be %d bytes."
330331
msgstr ""
331332

333+
#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c
334+
#, c-format
335+
msgid "Buffer length %d too big. It must be less than %d"
336+
msgstr ""
337+
332338
#: shared-bindings/bitbangio/I2C.c shared-bindings/busio/I2C.c
333339
msgid "Buffer must be at least length 1"
334340
msgstr ""
@@ -358,7 +364,7 @@ msgid "Can not use dotstar with %s"
358364
msgstr ""
359365

360366
#: ports/nrf/common-hal/bleio/Characteristic.c
361-
msgid "Can't set CCCD for local Characteristic"
367+
msgid "Can't set CCCD on local Characteristic"
362368
msgstr ""
363369

364370
#: shared-bindings/displayio/Bitmap.c shared-bindings/pulseio/PulseIn.c
@@ -427,6 +433,10 @@ msgstr ""
427433
msgid "Characteristic already in use by another Service."
428434
msgstr ""
429435

436+
#: shared-bindings/bleio/Service.c
437+
msgid "Characteristic is already attached to a Service"
438+
msgstr ""
439+
430440
#: shared-bindings/bleio/CharacteristicBuffer.c
431441
msgid "CharacteristicBuffer writing not provided"
432442
msgstr ""
@@ -502,6 +512,10 @@ msgstr ""
502512
msgid "Data too large for advertisement packet"
503513
msgstr "Tidak bisa menyesuaikan data ke dalam paket advertisment"
504514

515+
#: shared-bindings/bleio/Characteristic.c
516+
msgid "Descriptor is already attached to a Characteristic"
517+
msgstr ""
518+
505519
#: shared-bindings/audiobusio/PDMIn.c
506520
msgid "Destination capacity is smaller than destination_length."
507521
msgstr ""
@@ -596,7 +610,7 @@ msgstr ""
596610
msgid "Failed to continue scanning, err 0x%04x"
597611
msgstr "Gagal untuk melanjutkan scanning, status: 0x%08lX"
598612

599-
#: ports/nrf/common-hal/bleio/Central.c
613+
#: ports/nrf/common-hal/bleio/__init__.c
600614
#, fuzzy
601615
msgid "Failed to discover services"
602616
msgstr "Gagal untuk menemukan layanan, status: 0x%08lX"
@@ -616,17 +630,22 @@ msgstr "Gagal untuk mendapatkan status softdevice, error: 0x%08lX"
616630
msgid "Failed to notify or indicate attribute value, err 0x%04x"
617631
msgstr ""
618632

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

624642
#: ports/nrf/common-hal/bleio/Characteristic.c
643+
#: ports/nrf/common-hal/bleio/Descriptor.c
625644
#, c-format
626645
msgid "Failed to read attribute value, err 0x%04x"
627646
msgstr ""
628647

629-
#: ports/nrf/common-hal/bleio/Characteristic.c
648+
#: ports/nrf/common-hal/bleio/__init__.c
630649
#, fuzzy, c-format
631650
msgid "Failed to read gatts value, err 0x%04x"
632651
msgstr "Gagal untuk menulis nilai gatts, status: 0x%08lX"
@@ -656,6 +675,11 @@ msgstr "Gagal untuk memulai advertisement, status: 0x%08lX"
656675
msgid "Failed to start connecting, error 0x%04x"
657676
msgstr ""
658677

678+
#: ports/nrf/common-hal/bleio/Peripheral.c
679+
#, c-format
680+
msgid "Failed to start pairing, error 0x%04x"
681+
msgstr ""
682+
659683
#: ports/nrf/common-hal/bleio/Scanner.c
660684
#, fuzzy, c-format
661685
msgid "Failed to start scanning, err 0x%04x"
@@ -671,12 +695,12 @@ msgstr "Gagal untuk memberhentikan advertisement, status: 0x%08lX"
671695
msgid "Failed to write CCCD, err 0x%04x"
672696
msgstr ""
673697

674-
#: ports/nrf/common-hal/bleio/Characteristic.c
698+
#: ports/nrf/common-hal/bleio/__init__.c
675699
#, fuzzy, c-format
676700
msgid "Failed to write attribute value, err 0x%04x"
677701
msgstr "Gagal untuk menulis nilai atribut, status: 0x%08lX"
678702

679-
#: ports/nrf/common-hal/bleio/Characteristic.c
703+
#: ports/nrf/common-hal/bleio/__init__.c
680704
#, fuzzy, c-format
681705
msgid "Failed to write gatts value, err 0x%04x"
682706
msgstr "Gagal untuk menulis nilai gatts, status: 0x%08lX"
@@ -822,10 +846,18 @@ msgstr "Pin-pin tidak valid"
822846
msgid "Invalid polarity"
823847
msgstr ""
824848

849+
#: shared-bindings/bleio/Characteristic.c
850+
msgid "Invalid properties"
851+
msgstr ""
852+
825853
#: shared-bindings/microcontroller/__init__.c
826854
msgid "Invalid run mode."
827855
msgstr ""
828856

857+
#: shared-module/bleio/Attribute.c
858+
msgid "Invalid security_mode"
859+
msgstr ""
860+
829861
#: shared-bindings/audiocore/Mixer.c
830862
msgid "Invalid voice count"
831863
msgstr ""
@@ -944,13 +976,15 @@ msgstr ""
944976
msgid "No such file/directory"
945977
msgstr ""
946978

947-
#: ports/nrf/common-hal/bleio/Characteristic.c
979+
#: ports/nrf/common-hal/bleio/__init__.c shared-bindings/bleio/Central.c
948980
#: shared-bindings/bleio/CharacteristicBuffer.c
981+
#: shared-bindings/bleio/Peripheral.c
949982
#, fuzzy
950983
msgid "Not connected"
951984
msgstr "Tidak dapat menyambungkan ke AP"
952985

953986
#: shared-bindings/audiobusio/I2SOut.c shared-bindings/audioio/AudioOut.c
987+
#: shared-bindings/audiopwmio/PWMAudioOut.c
954988
msgid "Not playing"
955989
msgstr ""
956990

@@ -1080,6 +1114,7 @@ msgid "Sample rate must be positive"
10801114
msgstr ""
10811115

10821116
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
1117+
#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c
10831118
#, c-format
10841119
msgid "Sample rate too high. It must be less than %d"
10851120
msgstr "Nilai sampel terlalu tinggi. Nilai harus kurang dari %d"
@@ -1099,7 +1134,7 @@ msgid "Slices not supported"
10991134
msgstr ""
11001135

11011136
#: ports/nrf/common-hal/bleio/Adapter.c
1102-
#, c-format
1137+
#, fuzzy, c-format
11031138
msgid "Soft device assert, id: 0x%08lX, pc: 0x%08lX"
11041139
msgstr "Dukungan soft device, id: 0x%08lX, pc: 0x%08l"
11051140

@@ -1168,7 +1203,11 @@ msgid "Tile height must exactly divide bitmap height"
11681203
msgstr ""
11691204

11701205
#: shared-bindings/displayio/TileGrid.c
1171-
msgid "Tile indices must be 0 - 255"
1206+
msgid "Tile index out of bounds"
1207+
msgstr ""
1208+
1209+
#: shared-bindings/displayio/TileGrid.c shared-module/displayio/TileGrid.c
1210+
msgid "Tile value out of bounds"
11721211
msgstr ""
11731212

11741213
#: shared-bindings/displayio/TileGrid.c
@@ -1277,6 +1316,19 @@ msgstr ""
12771316
msgid "Unsupported pull value."
12781317
msgstr ""
12791318

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+
12801332
#: py/emitnative.c
12811333
msgid "Viper functions don't currently support more than 4 arguments"
12821334
msgstr ""
@@ -1376,10 +1428,6 @@ msgstr ""
13761428
msgid "attributes not supported yet"
13771429
msgstr ""
13781430

1379-
#: ports/nrf/common-hal/bleio/Characteristic.c
1380-
msgid "bad GATT role"
1381-
msgstr ""
1382-
13831431
#: py/builtinevex.c
13841432
msgid "bad compile mode"
13851433
msgstr "mode compile buruk"
@@ -1697,6 +1745,10 @@ msgstr ""
16971745
msgid "default 'except' must be last"
16981746
msgstr "'except' standar harus terakhir"
16991747

1748+
#: shared-bindings/bleio/Characteristic.c
1749+
msgid "descriptors includes an object that is not a Descriptors"
1750+
msgstr ""
1751+
17001752
#: shared-bindings/audiobusio/PDMIn.c
17011753
msgid ""
17021754
"destination buffer must be a bytearray or array of type 'B' for bit_depth = 8"
@@ -2036,6 +2088,12 @@ msgstr ""
20362088
msgid "math domain error"
20372089
msgstr ""
20382090

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+
20392097
#: py/runtime.c
20402098
msgid "maximum recursion depth exceeded"
20412099
msgstr ""
@@ -2135,8 +2193,8 @@ msgstr ""
21352193
msgid "non-Service found in services"
21362194
msgstr ""
21372195

2138-
#: ports/nrf/common-hal/bleio/Central.c
2139-
msgid "non-UUID found in service_uuids"
2196+
#: ports/nrf/common-hal/bleio/__init__.c
2197+
msgid "non-UUID found in service_uuids_whitelist"
21402198
msgstr ""
21412199

21422200
#: py/compile.c
@@ -2222,6 +2280,14 @@ msgstr "panjang data string memiliki keganjilan (odd-length)"
22222280
msgid "offset out of bounds"
22232281
msgstr "modul tidak ditemukan"
22242282

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+
22252291
#: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
22262292
#: shared-bindings/nvm/ByteArray.c
22272293
msgid "only slices with step=1 (aka None) are supported"
@@ -2445,10 +2511,6 @@ msgstr "sintaksis error pada pendeskripsi uctypes"
24452511
msgid "threshold must be in the range 0-65536"
24462512
msgstr ""
24472513

2448-
#: shared-bindings/displayio/TileGrid.c
2449-
msgid "tile index out of bounds"
2450-
msgstr ""
2451-
24522514
#: shared-bindings/time/__init__.c
24532515
msgid "time.struct_time() takes a 9-sequence"
24542516
msgstr ""

0 commit comments

Comments
 (0)