Skip to content

Commit 554063a

Browse files
authored
Merge branch 'main' into espressif-camera-2
2 parents c74746f + 5084de1 commit 554063a

File tree

68 files changed

+1298
-468
lines changed

Some content is hidden

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

68 files changed

+1298
-468
lines changed

docs/porting.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ as a natural "TODO" list. An example minimal build list is shown below:
7171
CIRCUITPY_SDCARDIO = 0
7272
CIRCUITPY_FRAMEBUFFERIO = 0
7373
CIRCUITPY_FREQUENCYIO = 0
74-
CIRCUITPY_I2CPERIPHERAL = 0
74+
CIRCUITPY_I2CTARGET = 0
7575
# Requires SPI, PulseIO (stub ok):
7676
CIRCUITPY_DISPLAYIO = 0
7777

locale/ID.po

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ msgstr "%q, %q, dan %q semuanya harus memiliki panjang yang sama"
215215
msgid "%q=%q"
216216
msgstr ""
217217

218-
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
218+
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
219219
#, c-format
220220
msgid "%s error 0x%x"
221221
msgstr "%s kesalahan 0x%x"
@@ -653,7 +653,7 @@ msgstr "Blok CBC harus merupakan kelipatan 16 byte"
653653
msgid "CIRCUITPY drive could not be found or created."
654654
msgstr ""
655655

656-
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
656+
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
657657
msgid "CRC or checksum was invalid"
658658
msgstr ""
659659

@@ -876,6 +876,10 @@ msgstr "Tampilan harus memiliki ruang warna 16 bit."
876876
msgid "Display rotation must be in 90 degree increments"
877877
msgstr "Rotasi tampilan harus dalam kelipatan 90 derajat"
878878

879+
#: main.c
880+
msgid "Done"
881+
msgstr ""
882+
879883
#: shared-bindings/digitalio/DigitalInOut.c
880884
msgid "Drive mode not used when direction is input."
881885
msgstr "Mode kendara tidak digunakan saat arah input."
@@ -1032,7 +1036,7 @@ msgstr "Fungsinya membutuhkan kunci"
10321036
msgid "GNSS init"
10331037
msgstr ""
10341038

1035-
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
1039+
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
10361040
msgid "Generic Failure"
10371041
msgstr ""
10381042

@@ -1203,7 +1207,7 @@ msgstr ""
12031207
msgid "Invalid MAC address"
12041208
msgstr ""
12051209

1206-
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
1210+
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
12071211
#: py/moduerrno.c
12081212
msgid "Invalid argument"
12091213
msgstr "Argumen tidak valid"
@@ -1233,15 +1237,15 @@ msgstr ""
12331237
msgid "Invalid pins"
12341238
msgstr "Pin-pin tidak valid"
12351239

1236-
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
1240+
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
12371241
msgid "Invalid size"
12381242
msgstr ""
12391243

12401244
#: ports/espressif/common-hal/ssl/SSLContext.c
12411245
msgid "Invalid socket for TLS"
12421246
msgstr ""
12431247

1244-
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
1248+
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
12451249
msgid "Invalid state"
12461250
msgstr ""
12471251

@@ -1265,7 +1269,7 @@ msgstr ""
12651269
msgid "Layer must be a Group or TileGrid subclass"
12661270
msgstr ""
12671271

1268-
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
1272+
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
12691273
msgid "MAC address was invalid"
12701274
msgstr ""
12711275

@@ -1551,6 +1555,14 @@ msgstr ""
15511555
msgid "Odd parity is not supported"
15521556
msgstr "Parity ganjil tidak didukung"
15531557

1558+
#: supervisor/shared/bluetooth/bluetooth.c
1559+
msgid "Off"
1560+
msgstr ""
1561+
1562+
#: supervisor/shared/bluetooth/bluetooth.c
1563+
msgid "Ok"
1564+
msgstr ""
1565+
15541566
#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
15551567
#: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
15561568
msgid "Only 8 or 16 bit mono with "
@@ -1620,15 +1632,15 @@ msgstr ""
16201632
msgid "Operation not permitted"
16211633
msgstr ""
16221634

1623-
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
1635+
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
16241636
msgid "Operation or feature not supported"
16251637
msgstr ""
16261638

1627-
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
1639+
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
16281640
msgid "Operation timed out"
16291641
msgstr "Waktu habis"
16301642

1631-
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
1643+
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
16321644
msgid "Out of memory"
16331645
msgstr "Kehabisan memori"
16341646

@@ -1810,10 +1822,14 @@ msgstr "sistem file (filesystem) bersifat Read-only"
18101822
msgid "Read-only object"
18111823
msgstr "Objek Read-only"
18121824

1813-
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
1825+
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
18141826
msgid "Received response was invalid"
18151827
msgstr ""
18161828

1829+
#: supervisor/shared/bluetooth/bluetooth.c
1830+
msgid "Reconnecting"
1831+
msgstr ""
1832+
18171833
#: shared-bindings/displayio/EPaperDisplay.c
18181834
msgid "Refresh too soon"
18191835
msgstr "Segarkan terlalu cepat"
@@ -1826,7 +1842,7 @@ msgstr ""
18261842
msgid "Requested AES mode is unsupported"
18271843
msgstr "Mode AES yang diminta tidak didukung"
18281844

1829-
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
1845+
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
18301846
msgid "Requested resource not found"
18311847
msgstr ""
18321848

@@ -2252,7 +2268,7 @@ msgstr "Panjang nilai != Panjang tetap yang dibutuhkan"
22522268
msgid "Value length > max_length"
22532269
msgstr "Panjang nilai > max_length"
22542270

2255-
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
2271+
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
22562272
msgid "Version was invalid"
22572273
msgstr ""
22582274

locale/circuitpython.pot

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -398,12 +398,14 @@ msgstr ""
398398
msgid "All CAN peripherals are in use"
399399
msgstr ""
400400

401-
#: ports/espressif/common-hal/busio/I2C.c
402-
#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
403-
#: ports/nrf/common-hal/busio/I2C.c
401+
#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
404402
msgid "All I2C peripherals are in use"
405403
msgstr ""
406404

405+
#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
406+
msgid "All I2C targets are in use"
407+
msgstr ""
408+
407409
#: ports/espressif/common-hal/countio/Counter.c
408410
#: ports/espressif/common-hal/frequencyio/FrequencyIn.c
409411
#: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
@@ -1589,7 +1591,7 @@ msgstr ""
15891591
msgid "Only one TouchAlarm can be set in deep sleep."
15901592
msgstr ""
15911593

1592-
#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
1594+
#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
15931595
msgid "Only one address is allowed"
15941596
msgstr ""
15951597

@@ -2319,11 +2321,11 @@ msgstr ""
23192321
msgid "a bytes-like object is required"
23202322
msgstr ""
23212323

2322-
#: shared-bindings/i2cperipheral/I2CPeripheral.c
2324+
#: shared-bindings/i2ctarget/I2CTarget.c
23232325
msgid "address out of bounds"
23242326
msgstr ""
23252327

2326-
#: shared-bindings/i2cperipheral/I2CPeripheral.c
2328+
#: shared-bindings/i2ctarget/I2CTarget.c
23272329
msgid "addresses is empty"
23282330
msgstr ""
23292331

@@ -2515,7 +2517,7 @@ msgstr ""
25152517
msgid "can't cancel self"
25162518
msgstr ""
25172519

2518-
#: py/obj.c py/objint.c shared-bindings/i2cperipheral/I2CPeripheral.c
2520+
#: py/obj.c py/objint.c shared-bindings/i2ctarget/I2CTarget.c
25192521
#: shared-module/adafruit_pixelbuf/PixelBuf.c
25202522
msgid "can't convert %q to %q"
25212523
msgstr ""

locale/cs.po

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ msgstr "%q, %q, a %q musí mít všechny shodnou délku"
216216
msgid "%q=%q"
217217
msgstr ""
218218

219-
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
219+
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
220220
#, c-format
221221
msgid "%s error 0x%x"
222222
msgstr "%s chyba 0x%x"
@@ -654,7 +654,7 @@ msgstr "Bloky CBC musí být násobky 16 bajtů"
654654
msgid "CIRCUITPY drive could not be found or created."
655655
msgstr "Disk CIRCUITPY nelze nalézt nebo vytvořit."
656656

657-
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
657+
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
658658
msgid "CRC or checksum was invalid"
659659
msgstr ""
660660

@@ -874,6 +874,10 @@ msgstr "Displej musí mít 16bitový barevný prostor."
874874
msgid "Display rotation must be in 90 degree increments"
875875
msgstr "Otočení displeje musí být po 90 stupních"
876876

877+
#: main.c
878+
msgid "Done"
879+
msgstr ""
880+
877881
#: shared-bindings/digitalio/DigitalInOut.c
878882
msgid "Drive mode not used when direction is input."
879883
msgstr ""
@@ -1032,7 +1036,7 @@ msgstr "Funkce vyžaduje zámek"
10321036
msgid "GNSS init"
10331037
msgstr "Inicializace GNSS"
10341038

1035-
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
1039+
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
10361040
msgid "Generic Failure"
10371041
msgstr "Základní chyba"
10381042

@@ -1203,7 +1207,7 @@ msgstr "Chybné BSSID"
12031207
msgid "Invalid MAC address"
12041208
msgstr "Chybná MAC adresa"
12051209

1206-
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
1210+
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
12071211
#: py/moduerrno.c
12081212
msgid "Invalid argument"
12091213
msgstr "Neplatný argument"
@@ -1233,15 +1237,15 @@ msgstr "Chybná multicastová MAC adresa"
12331237
msgid "Invalid pins"
12341238
msgstr "Neplatné piny"
12351239

1236-
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
1240+
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
12371241
msgid "Invalid size"
12381242
msgstr "Chybná velikost"
12391243

12401244
#: ports/espressif/common-hal/ssl/SSLContext.c
12411245
msgid "Invalid socket for TLS"
12421246
msgstr "Chybný soket pro TLS"
12431247

1244-
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
1248+
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
12451249
msgid "Invalid state"
12461250
msgstr "Chybný stav"
12471251

@@ -1265,7 +1269,7 @@ msgstr ""
12651269
msgid "Layer must be a Group or TileGrid subclass"
12661270
msgstr ""
12671271

1268-
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
1272+
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
12691273
msgid "MAC address was invalid"
12701274
msgstr "MAC adresa byla chybná"
12711275

@@ -1551,6 +1555,14 @@ msgstr ""
15511555
msgid "Odd parity is not supported"
15521556
msgstr ""
15531557

1558+
#: supervisor/shared/bluetooth/bluetooth.c
1559+
msgid "Off"
1560+
msgstr ""
1561+
1562+
#: supervisor/shared/bluetooth/bluetooth.c
1563+
msgid "Ok"
1564+
msgstr ""
1565+
15541566
#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
15551567
#: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
15561568
msgid "Only 8 or 16 bit mono with "
@@ -1616,15 +1628,15 @@ msgstr ""
16161628
msgid "Operation not permitted"
16171629
msgstr ""
16181630

1619-
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
1631+
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
16201632
msgid "Operation or feature not supported"
16211633
msgstr ""
16221634

1623-
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
1635+
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
16241636
msgid "Operation timed out"
16251637
msgstr ""
16261638

1627-
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
1639+
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
16281640
msgid "Out of memory"
16291641
msgstr ""
16301642

@@ -1801,10 +1813,14 @@ msgstr ""
18011813
msgid "Read-only object"
18021814
msgstr ""
18031815

1804-
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
1816+
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
18051817
msgid "Received response was invalid"
18061818
msgstr ""
18071819

1820+
#: supervisor/shared/bluetooth/bluetooth.c
1821+
msgid "Reconnecting"
1822+
msgstr ""
1823+
18081824
#: shared-bindings/displayio/EPaperDisplay.c
18091825
msgid "Refresh too soon"
18101826
msgstr ""
@@ -1817,7 +1833,7 @@ msgstr ""
18171833
msgid "Requested AES mode is unsupported"
18181834
msgstr ""
18191835

1820-
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
1836+
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
18211837
msgid "Requested resource not found"
18221838
msgstr ""
18231839

@@ -2239,7 +2255,7 @@ msgstr ""
22392255
msgid "Value length > max_length"
22402256
msgstr ""
22412257

2242-
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
2258+
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
22432259
msgid "Version was invalid"
22442260
msgstr ""
22452261

0 commit comments

Comments
 (0)