Skip to content

Commit b1e1237

Browse files
mdroberts1243mdroberts1243
authored
Merge branch 'main' into New_quirk_for_SH1107
2 parents db74f97 + 6bfcb01 commit b1e1237

84 files changed

Lines changed: 4328 additions & 333 deletions

Some content is hidden

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

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,7 @@ jobs:
279279
- "pyportal_titano"
280280
- "pyruler"
281281
- "qtpy_m0"
282+
- "qtpy_m0_haxpress"
282283
- "raytac_mdbt50q-db-40"
283284
- "robohatmm1_m4"
284285
- "sam32"

‎docs/design_guide.rst‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -485,6 +485,19 @@ struct.pack
485485

486486
Use `struct.pack_into` instead of `struct.pack`.
487487

488+
Use of MicroPython ``const()``
489+
--------------------------------------------------------------------------------
490+
The MicroPython ``const()`` feature, as discussed in `this forum post
491+
<https://forum.micropython.org/viewtopic.php?t=450>`_, and in `this issue thread
492+
<https://github.com/micropython/micropython/issues/573>`_, provides some
493+
optimizations that can be useful on smaller, memory constrained devices. However,
494+
when using ``const()``, keep in mind these general guide lines:
495+
496+
- Always use via an import, ex: ``from micropython import const``
497+
- Limit use to global (module level) variables only.
498+
- If user will not need access to variable, prefix name with a leading
499+
underscore, ex: ``_SOME_CONST``.
500+
488501
Sensor properties and units
489502
--------------------------------------------------------------------------------
490503

‎lib/tinyusb‎

Submodule tinyusb updated 84 files

‎locale/ID.po‎

Lines changed: 53 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ msgid ""
55
msgstr ""
66
"Project-Id-Version: PACKAGE VERSION\n"
77
"Report-Msgid-Bugs-To: \n"
8-
"POT-Creation-Date: 2020-09-13 14:21-0500\n"
8+
"POT-Creation-Date: 2020-09-21 16:45-0500\n"
99
"PO-Revision-Date: 2020-07-06 18:10+0000\n"
1010
"Last-Translator: oon arfiandwi <oon.arfiandwi@gmail.com>\n"
1111
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -96,7 +96,11 @@ msgstr "%q harus >= 1"
9696
msgid "%q must be a tuple of length 2"
9797
msgstr "%q harus berupa tuple dengan panjang 2"
9898

99-
#: ports/atmel-samd/common-hal/sdioio/SDCard.c
99+
#: shared-bindings/canio/Match.c
100+
msgid "%q out of range"
101+
msgstr ""
102+
103+
#: ports/atmel-samd/common-hal/microcontroller/Pin.c
100104
msgid "%q pin invalid"
101105
msgstr "pin %q tidak valid"
102106

@@ -284,6 +288,10 @@ msgstr "Jenis alamat di luar batas"
284288
msgid "All I2C peripherals are in use"
285289
msgstr "Semua perangkat I2C sedang digunakan"
286290

291+
#: ports/atmel-samd/common-hal/canio/Listener.c
292+
msgid "All RX FIFOs in use"
293+
msgstr ""
294+
287295
#: ports/nrf/common-hal/busio/SPI.c
288296
msgid "All SPI peripherals are in use"
289297
msgstr "Semua perangkat SPI sedang digunakan"
@@ -320,6 +328,10 @@ msgstr "Semua timer sedang digunakan"
320328
msgid "Already advertising."
321329
msgstr "Sudah disebarkan."
322330

331+
#: ports/atmel-samd/common-hal/canio/Listener.c
332+
msgid "Already have all-matches listener"
333+
msgstr ""
334+
323335
#: shared-module/memorymonitor/AllocationAlarm.c
324336
#: shared-module/memorymonitor/AllocationSize.c
325337
msgid "Already running"
@@ -436,7 +448,7 @@ msgstr "Ukuran buffer salah. Seharusnya %d byte."
436448
msgid "Buffer is not a bytearray."
437449
msgstr "Buffer bukan bytearray."
438450

439-
#: shared-bindings/displayio/Display.c
451+
#: ports/cxd56/common-hal/camera/Camera.c shared-bindings/displayio/Display.c
440452
#: shared-bindings/framebufferio/FramebufferDisplay.c
441453
msgid "Buffer is too small"
442454
msgstr "Buffer terlalu kecil"
@@ -632,6 +644,10 @@ msgstr "File .mpy rusak"
632644
msgid "Corrupt raw code"
633645
msgstr "Kode raw rusak"
634646

647+
#: ports/cxd56/common-hal/camera/Camera.c
648+
msgid "Could not initialize Camera"
649+
msgstr ""
650+
635651
#: ports/cxd56/common-hal/gnss/GNSS.c
636652
msgid "Could not initialize GNSS"
637653
msgstr ""
@@ -766,7 +782,7 @@ msgstr "Channel EXTINT sedang digunakan"
766782
msgid "Error in regex"
767783
msgstr "Error pada regex"
768784

769-
#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
785+
#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
770786
#: shared-bindings/busio/SPI.c shared-bindings/microcontroller/Pin.c
771787
#: shared-bindings/neopixel_write/__init__.c
772788
#: shared-bindings/terminalio/Terminal.c
@@ -859,6 +875,14 @@ msgstr "Gagal menulis flash internal."
859875
msgid "File exists"
860876
msgstr "File sudah ada"
861877

878+
#: ports/atmel-samd/common-hal/canio/Listener.c
879+
msgid "Filters too complex"
880+
msgstr ""
881+
882+
#: ports/cxd56/common-hal/camera/Camera.c
883+
msgid "Format not supported"
884+
msgstr ""
885+
862886
#: shared-module/framebufferio/FramebufferDisplay.c
863887
#, c-format
864888
msgid "Framebuffer requires %d bytes"
@@ -926,6 +950,10 @@ msgstr ""
926950
msgid "Incorrect buffer size"
927951
msgstr "Ukuran penyangga salah"
928952

953+
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
954+
msgid "Input taking too long"
955+
msgstr ""
956+
929957
#: py/moduerrno.c
930958
msgid "Input/output error"
931959
msgstr "Kesalahan input/output"
@@ -969,6 +997,10 @@ msgstr "Nilai Unit ADC tidak valid"
969997
msgid "Invalid BMP file"
970998
msgstr "File BMP tidak valid"
971999

1000+
#: shared-bindings/wifi/Radio.c
1001+
msgid "Invalid BSSID"
1002+
msgstr ""
1003+
9721004
#: ports/stm/common-hal/analogio/AnalogOut.c
9731005
msgid "Invalid DAC pin supplied"
9741006
msgstr "Pin DAC yang diberikan tidak valid"
@@ -1132,6 +1164,10 @@ msgstr "Pin MOSI gagal inisialisasi."
11321164
msgid "Maximum x value when mirrored is %d"
11331165
msgstr "Nilai x maksimum ketika dicerminkan adalah %d"
11341166

1167+
#: shared-bindings/canio/Message.c
1168+
msgid "Messages limited to 8 bytes"
1169+
msgstr ""
1170+
11351171
#: supervisor/shared/safe_mode.c
11361172
msgid "MicroPython NLR jump failed. Likely memory corruption."
11371173
msgstr "Lompatan NLR MicroPython gagal. Kemungkinan kerusakan memori."
@@ -1524,6 +1560,10 @@ msgstr "Serializer sedang digunakan"
15241560
msgid "Server side context cannot have hostname"
15251561
msgstr ""
15261562

1563+
#: ports/cxd56/common-hal/camera/Camera.c
1564+
msgid "Size not supported"
1565+
msgstr ""
1566+
15271567
#: shared-bindings/nvm/ByteArray.c
15281568
msgid "Slice and value different lengths."
15291569
msgstr ""
@@ -2323,6 +2363,10 @@ msgstr "error = 0x%08lX"
23232363
msgid "exceptions must derive from BaseException"
23242364
msgstr ""
23252365

2366+
#: shared-bindings/canio/CAN.c shared-bindings/canio/Listener.c
2367+
msgid "expected '%q' but got '%q'"
2368+
msgstr ""
2369+
23262370
#: py/objstr.c
23272371
msgid "expected ':' after format specifier"
23282372
msgstr ""
@@ -3161,6 +3205,10 @@ msgstr ""
31613205
msgid "source palette too large"
31623206
msgstr ""
31633207

3208+
#: shared-bindings/canio/Message.c
3209+
msgid "specify size or data, but not both"
3210+
msgstr ""
3211+
31643212
#: py/objstr.c
31653213
msgid "start/end indices"
31663214
msgstr ""
@@ -3276,7 +3324,7 @@ msgid "tuple/list has wrong length"
32763324
msgstr ""
32773325

32783326
#: ports/atmel-samd/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
3279-
#: shared-bindings/busio/UART.c
3327+
#: shared-bindings/busio/UART.c shared-bindings/canio/CAN.c
32803328
msgid "tx and rx cannot both be None"
32813329
msgstr "tx dan rx keduanya tidak boleh kosong"
32823330

‎locale/circuitpython.pot‎

Lines changed: 33 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: 2020-09-16 17:07-0700\n"
11+
"POT-Creation-Date: 2020-09-24 16:55-0500\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"
@@ -92,7 +92,11 @@ msgstr ""
9292
msgid "%q must be a tuple of length 2"
9393
msgstr ""
9494

95-
#: ports/atmel-samd/common-hal/sdioio/SDCard.c
95+
#: shared-bindings/canio/Match.c
96+
msgid "%q out of range"
97+
msgstr ""
98+
99+
#: ports/atmel-samd/common-hal/microcontroller/Pin.c
96100
msgid "%q pin invalid"
97101
msgstr ""
98102

@@ -280,6 +284,10 @@ msgstr ""
280284
msgid "All I2C peripherals are in use"
281285
msgstr ""
282286

287+
#: ports/atmel-samd/common-hal/canio/Listener.c
288+
msgid "All RX FIFOs in use"
289+
msgstr ""
290+
283291
#: ports/nrf/common-hal/busio/SPI.c
284292
msgid "All SPI peripherals are in use"
285293
msgstr ""
@@ -316,6 +324,10 @@ msgstr ""
316324
msgid "Already advertising."
317325
msgstr ""
318326

327+
#: ports/atmel-samd/common-hal/canio/Listener.c
328+
msgid "Already have all-matches listener"
329+
msgstr ""
330+
319331
#: shared-module/memorymonitor/AllocationAlarm.c
320332
#: shared-module/memorymonitor/AllocationSize.c
321333
msgid "Already running"
@@ -752,7 +764,7 @@ msgstr ""
752764
msgid "Error in regex"
753765
msgstr ""
754766

755-
#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
767+
#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
756768
#: shared-bindings/busio/SPI.c shared-bindings/microcontroller/Pin.c
757769
#: shared-bindings/neopixel_write/__init__.c
758770
#: shared-bindings/terminalio/Terminal.c
@@ -845,6 +857,10 @@ msgstr ""
845857
msgid "File exists"
846858
msgstr ""
847859

860+
#: ports/atmel-samd/common-hal/canio/Listener.c
861+
msgid "Filters too complex"
862+
msgstr ""
863+
848864
#: ports/cxd56/common-hal/camera/Camera.c
849865
msgid "Format not supported"
850866
msgstr ""
@@ -1127,6 +1143,10 @@ msgstr ""
11271143
msgid "Maximum x value when mirrored is %d"
11281144
msgstr ""
11291145

1146+
#: shared-bindings/canio/Message.c
1147+
msgid "Messages limited to 8 bytes"
1148+
msgstr ""
1149+
11301150
#: supervisor/shared/safe_mode.c
11311151
msgid "MicroPython NLR jump failed. Likely memory corruption."
11321152
msgstr ""
@@ -1147,14 +1167,10 @@ msgstr ""
11471167
msgid "Must be a %q subclass."
11481168
msgstr ""
11491169

1150-
#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c
1170+
#: ports/mimxrt10xx/common-hal/busio/SPI.c shared-bindings/busio/SPI.c
11511171
msgid "Must provide MISO or MOSI pin"
11521172
msgstr ""
11531173

1154-
#: ports/stm/common-hal/busio/SPI.c
1155-
msgid "Must provide SCK pin"
1156-
msgstr ""
1157-
11581174
#: shared-bindings/rgbmatrix/RGBMatrix.c
11591175
#, c-format
11601176
msgid "Must use a multiple of 6 rgb pins, not %d"
@@ -2310,6 +2326,10 @@ msgstr ""
23102326
msgid "exceptions must derive from BaseException"
23112327
msgstr ""
23122328

2329+
#: shared-bindings/canio/CAN.c shared-bindings/canio/Listener.c
2330+
msgid "expected '%q' but got '%q'"
2331+
msgstr ""
2332+
23132333
#: py/objstr.c
23142334
msgid "expected ':' after format specifier"
23152335
msgstr ""
@@ -3147,6 +3167,10 @@ msgstr ""
31473167
msgid "source palette too large"
31483168
msgstr ""
31493169

3170+
#: shared-bindings/canio/Message.c
3171+
msgid "specify size or data, but not both"
3172+
msgstr ""
3173+
31503174
#: py/objstr.c
31513175
msgid "start/end indices"
31523176
msgstr ""
@@ -3261,7 +3285,7 @@ msgid "tuple/list has wrong length"
32613285
msgstr ""
32623286

32633287
#: ports/atmel-samd/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
3264-
#: shared-bindings/busio/UART.c
3288+
#: shared-bindings/busio/UART.c shared-bindings/canio/CAN.c
32653289
msgid "tx and rx cannot both be None"
32663290
msgstr ""
32673291

0 commit comments

Comments
 (0)