Skip to content

Commit d956b3b

Browse files
tannewttannewt
committed
Merge remote-tracking branch 'adafruit/master' into remove_i2c_stop_kwarg
2 parents 5662b58 + 42956a6 commit d956b3b

107 files changed

Lines changed: 2629 additions & 773 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: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,9 @@ env:
3535
- 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
3636
- 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
3737
# 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
38+
- TRAVIS_BOARDS="feather_m4_express grandcentral_m4_express itsybitsy_m4_express metro_m4_airlift_lite metro_m4_express pybadge pybadge_airlift" TRAVIS_SDK=arm
39+
- TRAVIS_BOARDS="pyportal pyportal_titano trellis_m4_express capablerobot_usbhub cp32-m4 datalore_ip_m4 datum_light" TRAVIS_SDK=arm
40+
- TRAVIS_BOARDS="pygamer pygamer_advance monster_m4sk kicksat-sprite mini_sam_m4 robohatmm1_m4 sam32" TRAVIS_SDK=arm
4041

4142

4243
addons:

‎locale/ID.po‎

Lines changed: 26 additions & 9 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-21 14:18-0400\n"
11+
"POT-Creation-Date: 2019-08-22 14:29-0700\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"
@@ -301,6 +301,10 @@ msgstr ""
301301
"Auto-reload aktif. Silahkan simpan data-data (files) melalui USB untuk "
302302
"menjalankannya atau masuk ke REPL untukmenonaktifkan.\n"
303303

304+
#: shared-module/displayio/Display.c
305+
msgid "Below minimum frame rate"
306+
msgstr ""
307+
304308
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
305309
msgid "Bit clock and word select must share a clock unit"
306310
msgstr "Bit clock dan word harus memiliki kesamaan pada clock unit"
@@ -533,6 +537,7 @@ msgid "Display must have a 16 bit colorspace."
533537
msgstr ""
534538

535539
#: shared-bindings/displayio/Display.c
540+
#: shared-bindings/displayio/EPaperDisplay.c
536541
msgid "Display rotation must be in 90 degree increments"
537542
msgstr ""
538543

@@ -749,6 +754,7 @@ msgid "Function requires lock"
749754
msgstr ""
750755

751756
#: shared-bindings/displayio/Display.c
757+
#: shared-bindings/displayio/EPaperDisplay.c
752758
msgid "Group already used"
753759
msgstr ""
754760

@@ -980,6 +986,10 @@ msgstr ""
980986
msgid "No hardware support on pin"
981987
msgstr "Tidak ada dukungan hardware untuk pin"
982988

989+
#: shared-module/touchio/TouchIn.c
990+
msgid "No pulldown on pin; 1Mohm recommended"
991+
msgstr ""
992+
983993
#: py/moduerrno.c
984994
msgid "No space left on device"
985995
msgstr ""
@@ -1022,8 +1032,8 @@ msgstr ""
10221032
#: shared-module/displayio/OnDiskBitmap.c
10231033
#, c-format
10241034
msgid ""
1025-
"Only monochrome, indexed 8bpp, and 16bpp or greater BMPs supported: %d bpp "
1026-
"given"
1035+
"Only monochrome, indexed 4bpp or 8bpp, and 16bpp or greater BMPs supported: "
1036+
"%d bpp given"
10271037
msgstr ""
10281038

10291039
#: shared-bindings/_pixelbuf/PixelBuf.c
@@ -1100,6 +1110,10 @@ msgstr "sistem file (filesystem) bersifat Read-only"
11001110
msgid "Read-only object"
11011111
msgstr "sistem file (filesystem) bersifat Read-only"
11021112

1113+
#: shared-bindings/displayio/EPaperDisplay.c
1114+
msgid "Refresh too soon"
1115+
msgstr ""
1116+
11031117
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
11041118
msgid "Right channel unsupported"
11051119
msgstr "Channel Kanan tidak didukung"
@@ -1214,11 +1228,11 @@ msgstr ""
12141228
msgid "Tile height must exactly divide bitmap height"
12151229
msgstr ""
12161230

1217-
#: shared-bindings/displayio/TileGrid.c
1231+
#: shared-bindings/displayio/TileGrid.c shared-module/displayio/TileGrid.c
12181232
msgid "Tile index out of bounds"
12191233
msgstr ""
12201234

1221-
#: shared-bindings/displayio/TileGrid.c shared-module/displayio/TileGrid.c
1235+
#: shared-bindings/displayio/TileGrid.c
12221236
msgid "Tile value out of bounds"
12231237
msgstr ""
12241238

@@ -1240,6 +1254,7 @@ msgid "Too many display busses"
12401254
msgstr ""
12411255

12421256
#: shared-bindings/displayio/Display.c
1257+
#: shared-bindings/displayio/EPaperDisplay.c
12431258
msgid "Too many displays"
12441259
msgstr ""
12451260

@@ -1311,7 +1326,7 @@ msgstr ""
13111326
msgid "Unsupported baudrate"
13121327
msgstr "Baudrate tidak didukung"
13131328

1314-
#: shared-module/displayio/Display.c
1329+
#: shared-module/displayio/display_core.c
13151330
#, fuzzy
13161331
msgid "Unsupported display bus type"
13171332
msgstr "Baudrate tidak didukung"
@@ -1329,9 +1344,6 @@ msgid "Unsupported pull value."
13291344
msgstr ""
13301345

13311346
#: ports/nrf/common-hal/bleio/Characteristic.c
1332-
msgid "Value length required fixed length"
1333-
msgstr ""
1334-
13351347
#: ports/nrf/common-hal/bleio/Descriptor.c
13361348
msgid "Value length != required fixed length"
13371349
msgstr ""
@@ -2197,6 +2209,11 @@ msgstr "tidak ada ikatan/bind pada temuan nonlocal"
21972209
msgid "no module named '%q'"
21982210
msgstr "tidak ada modul yang bernama '%q'"
21992211

2212+
#: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c
2213+
#: shared-bindings/displayio/ParallelBus.c
2214+
msgid "no reset pin available"
2215+
msgstr ""
2216+
22002217
#: py/runtime.c shared-bindings/_pixelbuf/__init__.c
22012218
msgid "no such attribute"
22022219
msgstr ""

‎locale/circuitpython.pot‎

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2019-08-21 14:18-0400\n"
12-
"POT-Creation-Date: 2019-08-19 10:22-0400\n"
11+
"POT-Creation-Date: 2019-08-22 14:29-0700\n"
1312
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1413
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1514
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -298,6 +297,10 @@ msgid ""
298297
"disable.\n"
299298
msgstr ""
300299

300+
#: shared-module/displayio/Display.c
301+
msgid "Below minimum frame rate"
302+
msgstr ""
303+
301304
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
302305
msgid "Bit clock and word select must share a clock unit"
303306
msgstr ""
@@ -523,6 +526,7 @@ msgid "Display must have a 16 bit colorspace."
523526
msgstr ""
524527

525528
#: shared-bindings/displayio/Display.c
529+
#: shared-bindings/displayio/EPaperDisplay.c
526530
msgid "Display rotation must be in 90 degree increments"
527531
msgstr ""
528532

@@ -735,6 +739,7 @@ msgid "Function requires lock"
735739
msgstr ""
736740

737741
#: shared-bindings/displayio/Display.c
742+
#: shared-bindings/displayio/EPaperDisplay.c
738743
msgid "Group already used"
739744
msgstr ""
740745

@@ -966,6 +971,10 @@ msgstr ""
966971
msgid "No hardware support on pin"
967972
msgstr ""
968973

974+
#: shared-module/touchio/TouchIn.c
975+
msgid "No pulldown on pin; 1Mohm recommended"
976+
msgstr ""
977+
969978
#: py/moduerrno.c
970979
msgid "No space left on device"
971980
msgstr ""
@@ -1007,8 +1016,8 @@ msgstr ""
10071016
#: shared-module/displayio/OnDiskBitmap.c
10081017
#, c-format
10091018
msgid ""
1010-
"Only monochrome, indexed 8bpp, and 16bpp or greater BMPs supported: %d bpp "
1011-
"given"
1019+
"Only monochrome, indexed 4bpp or 8bpp, and 16bpp or greater BMPs supported: "
1020+
"%d bpp given"
10121021
msgstr ""
10131022

10141023
#: shared-bindings/_pixelbuf/PixelBuf.c
@@ -1082,6 +1091,10 @@ msgstr ""
10821091
msgid "Read-only object"
10831092
msgstr ""
10841093

1094+
#: shared-bindings/displayio/EPaperDisplay.c
1095+
msgid "Refresh too soon"
1096+
msgstr ""
1097+
10851098
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
10861099
msgid "Right channel unsupported"
10871100
msgstr ""
@@ -1192,11 +1205,11 @@ msgstr ""
11921205
msgid "Tile height must exactly divide bitmap height"
11931206
msgstr ""
11941207

1195-
#: shared-bindings/displayio/TileGrid.c
1208+
#: shared-bindings/displayio/TileGrid.c shared-module/displayio/TileGrid.c
11961209
msgid "Tile index out of bounds"
11971210
msgstr ""
11981211

1199-
#: shared-bindings/displayio/TileGrid.c shared-module/displayio/TileGrid.c
1212+
#: shared-bindings/displayio/TileGrid.c
12001213
msgid "Tile value out of bounds"
12011214
msgstr ""
12021215

@@ -1218,6 +1231,7 @@ msgid "Too many display busses"
12181231
msgstr ""
12191232

12201233
#: shared-bindings/displayio/Display.c
1234+
#: shared-bindings/displayio/EPaperDisplay.c
12211235
msgid "Too many displays"
12221236
msgstr ""
12231237

@@ -1289,7 +1303,7 @@ msgstr ""
12891303
msgid "Unsupported baudrate"
12901304
msgstr ""
12911305

1292-
#: shared-module/displayio/Display.c
1306+
#: shared-module/displayio/display_core.c
12931307
msgid "Unsupported display bus type"
12941308
msgstr ""
12951309

@@ -1306,9 +1320,6 @@ msgid "Unsupported pull value."
13061320
msgstr ""
13071321

13081322
#: ports/nrf/common-hal/bleio/Characteristic.c
1309-
msgid "Value length required fixed length"
1310-
msgstr ""
1311-
13121323
#: ports/nrf/common-hal/bleio/Descriptor.c
13131324
msgid "Value length != required fixed length"
13141325
msgstr ""
@@ -2163,6 +2174,11 @@ msgstr ""
21632174
msgid "no module named '%q'"
21642175
msgstr ""
21652176

2177+
#: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c
2178+
#: shared-bindings/displayio/ParallelBus.c
2179+
msgid "no reset pin available"
2180+
msgstr ""
2181+
21662182
#: py/runtime.c shared-bindings/_pixelbuf/__init__.c
21672183
msgid "no such attribute"
21682184
msgstr ""

‎locale/de_DE.po‎

Lines changed: 26 additions & 9 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: 2019-08-21 14:18-0400\n"
10+
"POT-Creation-Date: 2019-08-22 14:29-0700\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: Pascal Deneaux\n"
1313
"Language-Team: Sebastian Plamauer, Pascal Deneaux\n"
@@ -301,6 +301,10 @@ msgstr ""
301301
"Automatisches Neuladen ist aktiv. Speichere Dateien über USB um sie "
302302
"auszuführen oder verbinde dich mit der REPL zum Deaktivieren.\n"
303303

304+
#: shared-module/displayio/Display.c
305+
msgid "Below minimum frame rate"
306+
msgstr ""
307+
304308
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
305309
msgid "Bit clock and word select must share a clock unit"
306310
msgstr "Bit clock und word select müssen eine clock unit teilen"
@@ -526,6 +530,7 @@ msgid "Display must have a 16 bit colorspace."
526530
msgstr ""
527531

528532
#: shared-bindings/displayio/Display.c
533+
#: shared-bindings/displayio/EPaperDisplay.c
529534
msgid "Display rotation must be in 90 degree increments"
530535
msgstr "Die Rotation der Anzeige muss in 90-Grad-Schritten erfolgen"
531536

@@ -738,6 +743,7 @@ msgid "Function requires lock"
738743
msgstr "Die Funktion erwartet, dass der 'lock'-Befehl zuvor ausgeführt wurde"
739744

740745
#: shared-bindings/displayio/Display.c
746+
#: shared-bindings/displayio/EPaperDisplay.c
741747
msgid "Group already used"
742748
msgstr ""
743749

@@ -978,6 +984,10 @@ msgstr ""
978984
msgid "No hardware support on pin"
979985
msgstr "Keine Hardwareunterstützung an diesem Pin"
980986

987+
#: shared-module/touchio/TouchIn.c
988+
msgid "No pulldown on pin; 1Mohm recommended"
989+
msgstr ""
990+
981991
#: py/moduerrno.c
982992
msgid "No space left on device"
983993
msgstr "Kein Speicherplatz auf Gerät"
@@ -1021,8 +1031,8 @@ msgstr ""
10211031
#: shared-module/displayio/OnDiskBitmap.c
10221032
#, c-format
10231033
msgid ""
1024-
"Only monochrome, indexed 8bpp, and 16bpp or greater BMPs supported: %d bpp "
1025-
"given"
1034+
"Only monochrome, indexed 4bpp or 8bpp, and 16bpp or greater BMPs supported: "
1035+
"%d bpp given"
10261036
msgstr ""
10271037

10281038
#: shared-bindings/_pixelbuf/PixelBuf.c
@@ -1098,6 +1108,10 @@ msgstr "Schreibgeschützte Dateisystem"
10981108
msgid "Read-only object"
10991109
msgstr "Schreibgeschützte Objekt"
11001110

1111+
#: shared-bindings/displayio/EPaperDisplay.c
1112+
msgid "Refresh too soon"
1113+
msgstr ""
1114+
11011115
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
11021116
msgid "Right channel unsupported"
11031117
msgstr "Rechter Kanal wird nicht unterstützt"
@@ -1220,11 +1234,11 @@ msgstr ""
12201234
msgid "Tile height must exactly divide bitmap height"
12211235
msgstr ""
12221236

1223-
#: shared-bindings/displayio/TileGrid.c
1237+
#: shared-bindings/displayio/TileGrid.c shared-module/displayio/TileGrid.c
12241238
msgid "Tile index out of bounds"
12251239
msgstr ""
12261240

1227-
#: shared-bindings/displayio/TileGrid.c shared-module/displayio/TileGrid.c
1241+
#: shared-bindings/displayio/TileGrid.c
12281242
msgid "Tile value out of bounds"
12291243
msgstr ""
12301244

@@ -1246,6 +1260,7 @@ msgid "Too many display busses"
12461260
msgstr ""
12471261

12481262
#: shared-bindings/displayio/Display.c
1263+
#: shared-bindings/displayio/EPaperDisplay.c
12491264
msgid "Too many displays"
12501265
msgstr "Zu viele displays"
12511266

@@ -1319,7 +1334,7 @@ msgstr ""
13191334
msgid "Unsupported baudrate"
13201335
msgstr "Baudrate wird nicht unterstützt"
13211336

1322-
#: shared-module/displayio/Display.c
1337+
#: shared-module/displayio/display_core.c
13231338
msgid "Unsupported display bus type"
13241339
msgstr "Nicht unterstützter display bus type"
13251340

@@ -1336,9 +1351,6 @@ msgid "Unsupported pull value."
13361351
msgstr "Nicht unterstützter Pull-Wert"
13371352

13381353
#: ports/nrf/common-hal/bleio/Characteristic.c
1339-
msgid "Value length required fixed length"
1340-
msgstr ""
1341-
13421354
#: ports/nrf/common-hal/bleio/Descriptor.c
13431355
msgid "Value length != required fixed length"
13441356
msgstr ""
@@ -2209,6 +2221,11 @@ msgstr ""
22092221
msgid "no module named '%q'"
22102222
msgstr "Kein Modul mit dem Namen '%q'"
22112223

2224+
#: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c
2225+
#: shared-bindings/displayio/ParallelBus.c
2226+
msgid "no reset pin available"
2227+
msgstr ""
2228+
22122229
#: py/runtime.c shared-bindings/_pixelbuf/__init__.c
22132230
msgid "no such attribute"
22142231
msgstr ""

0 commit comments

Comments
 (0)