Skip to content

Commit a72bcab

Browse files
dhalbertdhalbert
committed
Merge remote-tracking branch 'adafruit/master' into bleio-api-revamp
2 parents 0364f1d + 7cbae3d commit a72bcab

97 files changed

Lines changed: 2715 additions & 742 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:

‎lib/utils/buffer_helper.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626

2727
#include "lib/utils/buffer_helper.h"
2828

29-
void normalize_buffer_bounds(int32_t* start, int32_t end, uint32_t* length) {
29+
void normalize_buffer_bounds(int32_t* start, int32_t end, size_t* length) {
3030
if (end < 0) {
3131
end += *length;
32-
} else if (((uint32_t) end) > *length) {
32+
} else if (((size_t) end) > *length) {
3333
end = *length;
3434
}
3535
if (*start < 0) {

‎lib/utils/buffer_helper.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828
#define MICROPY_INCLUDED_LIB_UTILS_BUFFER_HELPER_H
2929

3030
#include <stdint.h>
31+
#include <string.h>
3132

32-
void normalize_buffer_bounds(int32_t* start, int32_t end, uint32_t* length);
33+
void normalize_buffer_bounds(int32_t* start, int32_t end, size_t* length);
3334

3435
#endif // MICROPY_INCLUDED_LIB_UTILS_BUFFER_HELPER_H

‎locale/ID.po‎

Lines changed: 22 additions & 6 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-22 15:20-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

@@ -1026,8 +1032,8 @@ msgstr ""
10261032
#: shared-module/displayio/OnDiskBitmap.c
10271033
#, c-format
10281034
msgid ""
1029-
"Only monochrome, indexed 8bpp, and 16bpp or greater BMPs supported: %d bpp "
1030-
"given"
1035+
"Only monochrome, indexed 4bpp or 8bpp, and 16bpp or greater BMPs supported: "
1036+
"%d bpp given"
10311037
msgstr ""
10321038

10331039
#: shared-bindings/_pixelbuf/PixelBuf.c
@@ -1104,6 +1110,10 @@ msgstr "sistem file (filesystem) bersifat Read-only"
11041110
msgid "Read-only object"
11051111
msgstr "sistem file (filesystem) bersifat Read-only"
11061112

1113+
#: shared-bindings/displayio/EPaperDisplay.c
1114+
msgid "Refresh too soon"
1115+
msgstr ""
1116+
11071117
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
11081118
msgid "Right channel unsupported"
11091119
msgstr "Channel Kanan tidak didukung"
@@ -1218,11 +1228,11 @@ msgstr ""
12181228
msgid "Tile height must exactly divide bitmap height"
12191229
msgstr ""
12201230

1221-
#: shared-bindings/displayio/TileGrid.c
1231+
#: shared-bindings/displayio/TileGrid.c shared-module/displayio/TileGrid.c
12221232
msgid "Tile index out of bounds"
12231233
msgstr ""
12241234

1225-
#: shared-bindings/displayio/TileGrid.c shared-module/displayio/TileGrid.c
1235+
#: shared-bindings/displayio/TileGrid.c
12261236
msgid "Tile value out of bounds"
12271237
msgstr ""
12281238

@@ -1244,6 +1254,7 @@ msgid "Too many display busses"
12441254
msgstr ""
12451255

12461256
#: shared-bindings/displayio/Display.c
1257+
#: shared-bindings/displayio/EPaperDisplay.c
12471258
msgid "Too many displays"
12481259
msgstr ""
12491260

@@ -1315,7 +1326,7 @@ msgstr ""
13151326
msgid "Unsupported baudrate"
13161327
msgstr "Baudrate tidak didukung"
13171328

1318-
#: shared-module/displayio/Display.c
1329+
#: shared-module/displayio/display_core.c
13191330
#, fuzzy
13201331
msgid "Unsupported display bus type"
13211332
msgstr "Baudrate tidak didukung"
@@ -2198,6 +2209,11 @@ msgstr "tidak ada ikatan/bind pada temuan nonlocal"
21982209
msgid "no module named '%q'"
21992210
msgstr "tidak ada modul yang bernama '%q'"
22002211

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+
22012217
#: py/runtime.c shared-bindings/_pixelbuf/__init__.c
22022218
msgid "no such attribute"
22032219
msgstr ""

‎locale/circuitpython.pot‎

Lines changed: 22 additions & 6 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-22 15:20-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"
@@ -297,6 +297,10 @@ msgid ""
297297
"disable.\n"
298298
msgstr ""
299299

300+
#: shared-module/displayio/Display.c
301+
msgid "Below minimum frame rate"
302+
msgstr ""
303+
300304
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
301305
msgid "Bit clock and word select must share a clock unit"
302306
msgstr ""
@@ -522,6 +526,7 @@ msgid "Display must have a 16 bit colorspace."
522526
msgstr ""
523527

524528
#: shared-bindings/displayio/Display.c
529+
#: shared-bindings/displayio/EPaperDisplay.c
525530
msgid "Display rotation must be in 90 degree increments"
526531
msgstr ""
527532

@@ -734,6 +739,7 @@ msgid "Function requires lock"
734739
msgstr ""
735740

736741
#: shared-bindings/displayio/Display.c
742+
#: shared-bindings/displayio/EPaperDisplay.c
737743
msgid "Group already used"
738744
msgstr ""
739745

@@ -1010,8 +1016,8 @@ msgstr ""
10101016
#: shared-module/displayio/OnDiskBitmap.c
10111017
#, c-format
10121018
msgid ""
1013-
"Only monochrome, indexed 8bpp, and 16bpp or greater BMPs supported: %d bpp "
1014-
"given"
1019+
"Only monochrome, indexed 4bpp or 8bpp, and 16bpp or greater BMPs supported: "
1020+
"%d bpp given"
10151021
msgstr ""
10161022

10171023
#: shared-bindings/_pixelbuf/PixelBuf.c
@@ -1085,6 +1091,10 @@ msgstr ""
10851091
msgid "Read-only object"
10861092
msgstr ""
10871093

1094+
#: shared-bindings/displayio/EPaperDisplay.c
1095+
msgid "Refresh too soon"
1096+
msgstr ""
1097+
10881098
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
10891099
msgid "Right channel unsupported"
10901100
msgstr ""
@@ -1195,11 +1205,11 @@ msgstr ""
11951205
msgid "Tile height must exactly divide bitmap height"
11961206
msgstr ""
11971207

1198-
#: shared-bindings/displayio/TileGrid.c
1208+
#: shared-bindings/displayio/TileGrid.c shared-module/displayio/TileGrid.c
11991209
msgid "Tile index out of bounds"
12001210
msgstr ""
12011211

1202-
#: shared-bindings/displayio/TileGrid.c shared-module/displayio/TileGrid.c
1212+
#: shared-bindings/displayio/TileGrid.c
12031213
msgid "Tile value out of bounds"
12041214
msgstr ""
12051215

@@ -1221,6 +1231,7 @@ msgid "Too many display busses"
12211231
msgstr ""
12221232

12231233
#: shared-bindings/displayio/Display.c
1234+
#: shared-bindings/displayio/EPaperDisplay.c
12241235
msgid "Too many displays"
12251236
msgstr ""
12261237

@@ -1292,7 +1303,7 @@ msgstr ""
12921303
msgid "Unsupported baudrate"
12931304
msgstr ""
12941305

1295-
#: shared-module/displayio/Display.c
1306+
#: shared-module/displayio/display_core.c
12961307
msgid "Unsupported display bus type"
12971308
msgstr ""
12981309

@@ -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: 22 additions & 6 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-22 15:20-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

@@ -1025,8 +1031,8 @@ msgstr ""
10251031
#: shared-module/displayio/OnDiskBitmap.c
10261032
#, c-format
10271033
msgid ""
1028-
"Only monochrome, indexed 8bpp, and 16bpp or greater BMPs supported: %d bpp "
1029-
"given"
1034+
"Only monochrome, indexed 4bpp or 8bpp, and 16bpp or greater BMPs supported: "
1035+
"%d bpp given"
10301036
msgstr ""
10311037

10321038
#: shared-bindings/_pixelbuf/PixelBuf.c
@@ -1102,6 +1108,10 @@ msgstr "Schreibgeschützte Dateisystem"
11021108
msgid "Read-only object"
11031109
msgstr "Schreibgeschützte Objekt"
11041110

1111+
#: shared-bindings/displayio/EPaperDisplay.c
1112+
msgid "Refresh too soon"
1113+
msgstr ""
1114+
11051115
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
11061116
msgid "Right channel unsupported"
11071117
msgstr "Rechter Kanal wird nicht unterstützt"
@@ -1224,11 +1234,11 @@ msgstr ""
12241234
msgid "Tile height must exactly divide bitmap height"
12251235
msgstr ""
12261236

1227-
#: shared-bindings/displayio/TileGrid.c
1237+
#: shared-bindings/displayio/TileGrid.c shared-module/displayio/TileGrid.c
12281238
msgid "Tile index out of bounds"
12291239
msgstr ""
12301240

1231-
#: shared-bindings/displayio/TileGrid.c shared-module/displayio/TileGrid.c
1241+
#: shared-bindings/displayio/TileGrid.c
12321242
msgid "Tile value out of bounds"
12331243
msgstr ""
12341244

@@ -1250,6 +1260,7 @@ msgid "Too many display busses"
12501260
msgstr ""
12511261

12521262
#: shared-bindings/displayio/Display.c
1263+
#: shared-bindings/displayio/EPaperDisplay.c
12531264
msgid "Too many displays"
12541265
msgstr "Zu viele displays"
12551266

@@ -1323,7 +1334,7 @@ msgstr ""
13231334
msgid "Unsupported baudrate"
13241335
msgstr "Baudrate wird nicht unterstützt"
13251336

1326-
#: shared-module/displayio/Display.c
1337+
#: shared-module/displayio/display_core.c
13271338
msgid "Unsupported display bus type"
13281339
msgstr "Nicht unterstützter display bus type"
13291340

@@ -2210,6 +2221,11 @@ msgstr ""
22102221
msgid "no module named '%q'"
22112222
msgstr "Kein Modul mit dem Namen '%q'"
22122223

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+
22132229
#: py/runtime.c shared-bindings/_pixelbuf/__init__.c
22142230
msgid "no such attribute"
22152231
msgstr ""

0 commit comments

Comments
 (0)