Skip to content

Commit c32fd67

Browse files
JerzeekJerzeek
committed
Merge remote-tracking branch 'origin/main' into picoexpander
2 parents cb8ad1f + 557a530 commit c32fd67

58 files changed

Lines changed: 1170 additions & 175 deletions

Some content is hidden

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

‎locale/circuitpython.pot‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ msgid "%q in %q must be of type %q, not %q"
111111
msgstr ""
112112

113113
#: ports/espressif/common-hal/espulp/ULP.c
114+
#: ports/espressif/common-hal/mipidsi/Bus.c
114115
#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
115116
#: ports/mimxrt10xx/common-hal/usb_host/Port.c
116117
#: ports/raspberrypi/common-hal/picodvi/Framebuffer_RP2040.c
@@ -244,7 +245,8 @@ msgstr ""
244245
#: ports/nordic/common-hal/pulseio/PulseIn.c
245246
#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
246247
#: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
247-
#: shared-bindings/canio/Match.c shared-bindings/time/__init__.c
248+
#: shared-bindings/bitmaptools/__init__.c shared-bindings/canio/Match.c
249+
#: shared-bindings/time/__init__.c
248250
msgid "%q out of range"
249251
msgstr ""
250252

@@ -834,10 +836,6 @@ msgstr ""
834836
msgid "Clock unit in use"
835837
msgstr ""
836838

837-
#: ports/espressif/common-hal/mipidsi/Display.c
838-
msgid "Color depth must be 16 or 24"
839-
msgstr ""
840-
841839
#: shared-bindings/_bleio/Connection.c
842840
msgid ""
843841
"Connection has been disconnected and can no longer be used. Create a new "
@@ -1119,8 +1117,9 @@ msgid ""
11191117
"Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz"
11201118
msgstr ""
11211119

1122-
#: shared-bindings/bitbangio/I2C.c shared-bindings/bitbangio/SPI.c
1123-
#: shared-bindings/busio/I2C.c shared-bindings/busio/SPI.c
1120+
#: ports/zephyr-cp/bindings/zephyr_i2c/I2C.c shared-bindings/bitbangio/I2C.c
1121+
#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/I2C.c
1122+
#: shared-bindings/busio/SPI.c
11241123
msgid "Function requires lock"
11251124
msgstr ""
11261125

@@ -1271,6 +1270,7 @@ msgstr ""
12711270
#: ports/espressif/common-hal/_bleio/Service.c
12721271
#: ports/espressif/common-hal/espulp/ULP.c
12731272
#: ports/espressif/common-hal/microcontroller/Processor.c
1273+
#: ports/espressif/common-hal/mipidsi/Display.c
12741274
#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
12751275
#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
12761276
#: ports/raspberrypi/bindings/picodvi/Framebuffer.c

‎locale/cs.po‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ msgid "%q in %q must be of type %q, not %q"
122122
msgstr "%q v %q musí být typu %q, ne %q"
123123

124124
#: ports/espressif/common-hal/espulp/ULP.c
125+
#: ports/espressif/common-hal/mipidsi/Bus.c
125126
#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
126127
#: ports/mimxrt10xx/common-hal/usb_host/Port.c
127128
#: ports/raspberrypi/common-hal/picodvi/Framebuffer_RP2040.c
@@ -255,7 +256,8 @@ msgstr "%q je mimo hranice"
255256
#: ports/nordic/common-hal/pulseio/PulseIn.c
256257
#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
257258
#: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
258-
#: shared-bindings/canio/Match.c shared-bindings/time/__init__.c
259+
#: shared-bindings/bitmaptools/__init__.c shared-bindings/canio/Match.c
260+
#: shared-bindings/time/__init__.c
259261
msgid "%q out of range"
260262
msgstr "%q je mimo rozsah"
261263

@@ -850,10 +852,6 @@ msgstr "Jádro kódu CircuitPython tvrdě havarovalo. Jejda!\n"
850852
msgid "Clock unit in use"
851853
msgstr "Jednotka hodin je používána"
852854

853-
#: ports/espressif/common-hal/mipidsi/Display.c
854-
msgid "Color depth must be 16 or 24"
855-
msgstr ""
856-
857855
#: shared-bindings/_bleio/Connection.c
858856
msgid ""
859857
"Connection has been disconnected and can no longer be used. Create a new "
@@ -1139,8 +1137,9 @@ msgstr ""
11391137
"Frekvence musí být 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 nebo 1008 "
11401138
"Mhz"
11411139

1142-
#: shared-bindings/bitbangio/I2C.c shared-bindings/bitbangio/SPI.c
1143-
#: shared-bindings/busio/I2C.c shared-bindings/busio/SPI.c
1140+
#: ports/zephyr-cp/bindings/zephyr_i2c/I2C.c shared-bindings/bitbangio/I2C.c
1141+
#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/I2C.c
1142+
#: shared-bindings/busio/SPI.c
11441143
msgid "Function requires lock"
11451144
msgstr "Funkce vyžaduje zámek"
11461145

@@ -1291,6 +1290,7 @@ msgstr ""
12911290
#: ports/espressif/common-hal/_bleio/Service.c
12921291
#: ports/espressif/common-hal/espulp/ULP.c
12931292
#: ports/espressif/common-hal/microcontroller/Processor.c
1293+
#: ports/espressif/common-hal/mipidsi/Display.c
12941294
#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
12951295
#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
12961296
#: ports/raspberrypi/bindings/picodvi/Framebuffer.c

‎locale/el.po‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ msgid "%q in %q must be of type %q, not %q"
126126
msgstr "%q στο %q πρέπει να είναι τύπου %q, όχι %q"
127127

128128
#: ports/espressif/common-hal/espulp/ULP.c
129+
#: ports/espressif/common-hal/mipidsi/Bus.c
129130
#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
130131
#: ports/mimxrt10xx/common-hal/usb_host/Port.c
131132
#: ports/raspberrypi/common-hal/picodvi/Framebuffer_RP2040.c
@@ -259,7 +260,8 @@ msgstr "%q εκτός ορίων"
259260
#: ports/nordic/common-hal/pulseio/PulseIn.c
260261
#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
261262
#: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
262-
#: shared-bindings/canio/Match.c shared-bindings/time/__init__.c
263+
#: shared-bindings/bitmaptools/__init__.c shared-bindings/canio/Match.c
264+
#: shared-bindings/time/__init__.c
263265
msgid "%q out of range"
264266
msgstr "%q εκτός εμβέλειας"
265267

@@ -855,10 +857,6 @@ msgstr "Ο πυρήνας της CircuitPython κατέρευσε. Οουπς!\n
855857
msgid "Clock unit in use"
856858
msgstr "Μονάδα ρολογιού ήδη σε χρήση"
857859

858-
#: ports/espressif/common-hal/mipidsi/Display.c
859-
msgid "Color depth must be 16 or 24"
860-
msgstr ""
861-
862860
#: shared-bindings/_bleio/Connection.c
863861
msgid ""
864862
"Connection has been disconnected and can no longer be used. Create a new "
@@ -1145,8 +1143,9 @@ msgid ""
11451143
"Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz"
11461144
msgstr ""
11471145

1148-
#: shared-bindings/bitbangio/I2C.c shared-bindings/bitbangio/SPI.c
1149-
#: shared-bindings/busio/I2C.c shared-bindings/busio/SPI.c
1146+
#: ports/zephyr-cp/bindings/zephyr_i2c/I2C.c shared-bindings/bitbangio/I2C.c
1147+
#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/I2C.c
1148+
#: shared-bindings/busio/SPI.c
11501149
msgid "Function requires lock"
11511150
msgstr ""
11521151

@@ -1297,6 +1296,7 @@ msgstr ""
12971296
#: ports/espressif/common-hal/_bleio/Service.c
12981297
#: ports/espressif/common-hal/espulp/ULP.c
12991298
#: ports/espressif/common-hal/microcontroller/Processor.c
1299+
#: ports/espressif/common-hal/mipidsi/Display.c
13001300
#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
13011301
#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
13021302
#: ports/raspberrypi/bindings/picodvi/Framebuffer.c

‎locale/hi.po‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ msgid "%q in %q must be of type %q, not %q"
113113
msgstr ""
114114

115115
#: ports/espressif/common-hal/espulp/ULP.c
116+
#: ports/espressif/common-hal/mipidsi/Bus.c
116117
#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
117118
#: ports/mimxrt10xx/common-hal/usb_host/Port.c
118119
#: ports/raspberrypi/common-hal/picodvi/Framebuffer_RP2040.c
@@ -246,7 +247,8 @@ msgstr ""
246247
#: ports/nordic/common-hal/pulseio/PulseIn.c
247248
#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
248249
#: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
249-
#: shared-bindings/canio/Match.c shared-bindings/time/__init__.c
250+
#: shared-bindings/bitmaptools/__init__.c shared-bindings/canio/Match.c
251+
#: shared-bindings/time/__init__.c
250252
msgid "%q out of range"
251253
msgstr ""
252254

@@ -836,10 +838,6 @@ msgstr ""
836838
msgid "Clock unit in use"
837839
msgstr ""
838840

839-
#: ports/espressif/common-hal/mipidsi/Display.c
840-
msgid "Color depth must be 16 or 24"
841-
msgstr ""
842-
843841
#: shared-bindings/_bleio/Connection.c
844842
msgid ""
845843
"Connection has been disconnected and can no longer be used. Create a new "
@@ -1121,8 +1119,9 @@ msgid ""
11211119
"Frequency must be 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 or 1008 Mhz"
11221120
msgstr ""
11231121

1124-
#: shared-bindings/bitbangio/I2C.c shared-bindings/bitbangio/SPI.c
1125-
#: shared-bindings/busio/I2C.c shared-bindings/busio/SPI.c
1122+
#: ports/zephyr-cp/bindings/zephyr_i2c/I2C.c shared-bindings/bitbangio/I2C.c
1123+
#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/I2C.c
1124+
#: shared-bindings/busio/SPI.c
11261125
msgid "Function requires lock"
11271126
msgstr ""
11281127

@@ -1273,6 +1272,7 @@ msgstr ""
12731272
#: ports/espressif/common-hal/_bleio/Service.c
12741273
#: ports/espressif/common-hal/espulp/ULP.c
12751274
#: ports/espressif/common-hal/microcontroller/Processor.c
1275+
#: ports/espressif/common-hal/mipidsi/Display.c
12761276
#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
12771277
#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
12781278
#: ports/raspberrypi/bindings/picodvi/Framebuffer.c

‎locale/ko.po‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ msgid "%q in %q must be of type %q, not %q"
124124
msgstr "%q의 %q는 %q가 아니라 %q 유형이어야 합니다"
125125

126126
#: ports/espressif/common-hal/espulp/ULP.c
127+
#: ports/espressif/common-hal/mipidsi/Bus.c
127128
#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
128129
#: ports/mimxrt10xx/common-hal/usb_host/Port.c
129130
#: ports/raspberrypi/common-hal/picodvi/Framebuffer_RP2040.c
@@ -263,7 +264,8 @@ msgstr "%q가 경계를 벗어남"
263264
#: ports/nordic/common-hal/pulseio/PulseIn.c
264265
#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
265266
#: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
266-
#: shared-bindings/canio/Match.c shared-bindings/time/__init__.c
267+
#: shared-bindings/bitmaptools/__init__.c shared-bindings/canio/Match.c
268+
#: shared-bindings/time/__init__.c
267269
#, fuzzy
268270
msgid "%q out of range"
269271
msgstr "%q가 범위를 벗어남"
@@ -880,10 +882,6 @@ msgstr "CircuitPython 핵심 코드가 심하게 충돌했습니다. 앗!\n"
880882
msgid "Clock unit in use"
881883
msgstr "시계 장치가 사용 중입니다"
882884

883-
#: ports/espressif/common-hal/mipidsi/Display.c
884-
msgid "Color depth must be 16 or 24"
885-
msgstr ""
886-
887885
#: shared-bindings/_bleio/Connection.c
888886
msgid ""
889887
"Connection has been disconnected and can no longer be used. Create a new "
@@ -1172,8 +1170,9 @@ msgstr ""
11721170
"주파수는 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 또는 1008 Mhz 여야 "
11731171
"합니다"
11741172

1175-
#: shared-bindings/bitbangio/I2C.c shared-bindings/bitbangio/SPI.c
1176-
#: shared-bindings/busio/I2C.c shared-bindings/busio/SPI.c
1173+
#: ports/zephyr-cp/bindings/zephyr_i2c/I2C.c shared-bindings/bitbangio/I2C.c
1174+
#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/I2C.c
1175+
#: shared-bindings/busio/SPI.c
11771176
msgid "Function requires lock"
11781177
msgstr "이 함수에는 잠금이 필요합니다"
11791178

@@ -1324,6 +1323,7 @@ msgstr "출력 함수로 인해 종료되었다"
13241323
#: ports/espressif/common-hal/_bleio/Service.c
13251324
#: ports/espressif/common-hal/espulp/ULP.c
13261325
#: ports/espressif/common-hal/microcontroller/Processor.c
1326+
#: ports/espressif/common-hal/mipidsi/Display.c
13271327
#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
13281328
#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
13291329
#: ports/raspberrypi/bindings/picodvi/Framebuffer.c

‎locale/ru.po‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ msgid "%q in %q must be of type %q, not %q"
126126
msgstr "%q в %q должно быть типа %q, а не %q"
127127

128128
#: ports/espressif/common-hal/espulp/ULP.c
129+
#: ports/espressif/common-hal/mipidsi/Bus.c
129130
#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
130131
#: ports/mimxrt10xx/common-hal/usb_host/Port.c
131132
#: ports/raspberrypi/common-hal/picodvi/Framebuffer_RP2040.c
@@ -259,7 +260,8 @@ msgstr "%q за пределом"
259260
#: ports/nordic/common-hal/pulseio/PulseIn.c
260261
#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
261262
#: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
262-
#: shared-bindings/canio/Match.c shared-bindings/time/__init__.c
263+
#: shared-bindings/bitmaptools/__init__.c shared-bindings/canio/Match.c
264+
#: shared-bindings/time/__init__.c
263265
msgid "%q out of range"
264266
msgstr "%q вне диапазона"
265267

@@ -858,10 +860,6 @@ msgstr "Основной код CircuitPython сильно разбился. У
858860
msgid "Clock unit in use"
859861
msgstr "Источник тактирования уже используется"
860862

861-
#: ports/espressif/common-hal/mipidsi/Display.c
862-
msgid "Color depth must be 16 or 24"
863-
msgstr ""
864-
865863
#: shared-bindings/_bleio/Connection.c
866864
msgid ""
867865
"Connection has been disconnected and can no longer be used. Create a new "
@@ -1156,8 +1154,9 @@ msgstr ""
11561154
"Частота должна быть 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 или 1008 "
11571155
"МГц"
11581156

1159-
#: shared-bindings/bitbangio/I2C.c shared-bindings/bitbangio/SPI.c
1160-
#: shared-bindings/busio/I2C.c shared-bindings/busio/SPI.c
1157+
#: ports/zephyr-cp/bindings/zephyr_i2c/I2C.c shared-bindings/bitbangio/I2C.c
1158+
#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/I2C.c
1159+
#: shared-bindings/busio/SPI.c
11611160
msgid "Function requires lock"
11621161
msgstr "Функция требует блокировки"
11631162

@@ -1312,6 +1311,7 @@ msgstr "Прерывается функцией выхода"
13121311
#: ports/espressif/common-hal/_bleio/Service.c
13131312
#: ports/espressif/common-hal/espulp/ULP.c
13141313
#: ports/espressif/common-hal/microcontroller/Processor.c
1314+
#: ports/espressif/common-hal/mipidsi/Display.c
13151315
#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
13161316
#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
13171317
#: ports/raspberrypi/bindings/picodvi/Framebuffer.c

‎locale/tr.po‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ msgid "%q in %q must be of type %q, not %q"
124124
msgstr ""
125125

126126
#: ports/espressif/common-hal/espulp/ULP.c
127+
#: ports/espressif/common-hal/mipidsi/Bus.c
127128
#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
128129
#: ports/mimxrt10xx/common-hal/usb_host/Port.c
129130
#: ports/raspberrypi/common-hal/picodvi/Framebuffer_RP2040.c
@@ -257,7 +258,8 @@ msgstr "%q sınırların dışında"
257258
#: ports/nordic/common-hal/pulseio/PulseIn.c
258259
#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
259260
#: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c
260-
#: shared-bindings/canio/Match.c shared-bindings/time/__init__.c
261+
#: shared-bindings/bitmaptools/__init__.c shared-bindings/canio/Match.c
262+
#: shared-bindings/time/__init__.c
261263
msgid "%q out of range"
262264
msgstr "%q aralık dışında"
263265

@@ -850,10 +852,6 @@ msgstr "CircuitPython kor kodu patladı. Haydaaa!\n"
850852
msgid "Clock unit in use"
851853
msgstr "Saat ünitesi kullanımda"
852854

853-
#: ports/espressif/common-hal/mipidsi/Display.c
854-
msgid "Color depth must be 16 or 24"
855-
msgstr ""
856-
857855
#: shared-bindings/_bleio/Connection.c
858856
msgid ""
859857
"Connection has been disconnected and can no longer be used. Create a new "
@@ -1139,8 +1137,9 @@ msgstr ""
11391137
"Frekans 24, 150, 396, 450, 528, 600, 720, 816, 912, 960 ya da 1008 Mhz "
11401138
"olmalıdır"
11411139

1142-
#: shared-bindings/bitbangio/I2C.c shared-bindings/bitbangio/SPI.c
1143-
#: shared-bindings/busio/I2C.c shared-bindings/busio/SPI.c
1140+
#: ports/zephyr-cp/bindings/zephyr_i2c/I2C.c shared-bindings/bitbangio/I2C.c
1141+
#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/I2C.c
1142+
#: shared-bindings/busio/SPI.c
11441143
msgid "Function requires lock"
11451144
msgstr "Fonksiyon kilit gerektirir"
11461145

@@ -1291,6 +1290,7 @@ msgstr ""
12911290
#: ports/espressif/common-hal/_bleio/Service.c
12921291
#: ports/espressif/common-hal/espulp/ULP.c
12931292
#: ports/espressif/common-hal/microcontroller/Processor.c
1293+
#: ports/espressif/common-hal/mipidsi/Display.c
12941294
#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
12951295
#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
12961296
#: ports/raspberrypi/bindings/picodvi/Framebuffer.c

‎ports/analog/boards/apard32690/mpconfigboard.mk‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ USB_VID=0x0456
1919
USB_PID=0x003C
2020
USB_MANUFACTURER="Analog Devices, Inc."
2121
USB_PRODUCT="MAX32690 APARD"
22-
USB_HIGHSPEED=1
2322

2423
# NOTE: MAX32 devices do not support IN/OUT pairs on the same EP
2524
USB_NUM_ENDPOINT_PAIRS=12

‎ports/analog/boards/max32690evkit/mpconfigboard.mk‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ USB_VID=0x0456
1919
USB_PID=0x003D
2020
USB_MANUFACTURER="Analog Devices, Inc."
2121
USB_PRODUCT="MAX32690 EvKit"
22-
USB_HIGHSPEED=1
2322

2423
# NOTE: MAX32 devices do not support IN/OUT pairs on the same EP
2524
USB_NUM_ENDPOINT_PAIRS=12

‎ports/analog/mpconfigport.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
// 24KiB stack
1313
#define CIRCUITPY_DEFAULT_STACK_SIZE 0x6000
1414

15+
#define CIRCUITPY_USB_DEVICE_HIGH_SPEED (1)
16+
1517
// Also includes mpconfigboard.h
1618
#include "py/circuitpy_mpconfig.h"
1719

0 commit comments

Comments
 (0)