Skip to content

Commit 1ae88c3

Browse files
tannewttannewt
committed
Merge remote-tracking branch 'adafruit/main' into design_guide_update
2 parents 9c6c8b5 + d645e9c commit 1ae88c3

File tree

175 files changed

+3695
-727
lines changed

Some content is hidden

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

175 files changed

+3695
-727
lines changed

‎.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,3 +307,6 @@
307307
[submodule "frozen/circuitpython_picoed"]
308308
path = frozen/circuitpython_picoed
309309
url = https://github.com/elecfreaks/circuitpython_picoed.git
310+
[submodule "ports/espressif/esp32-camera"]
311+
path = ports/espressif/esp32-camera
312+
url = https://github.com/adafruit/esp32-camera/

‎conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@ def autoapi_prepare_jinja_env(jinja_env):
199199
"ports/cxd56/spresense-exported-sdk",
200200
"ports/espressif/certificates",
201201
"ports/espressif/esp-idf",
202+
"ports/espressif/esp32-camera",
202203
"ports/espressif/.idf_tools",
203204
"ports/espressif/peripherals",
204205
"ports/litex/hw",

‎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

‎frozen/circuitpython-stage

‎locale/ID.po

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -404,12 +404,14 @@ msgstr "Alamat harus sepanjang %d byte"
404404
msgid "All CAN peripherals are in use"
405405
msgstr ""
406406

407-
#: ports/espressif/common-hal/busio/I2C.c
408-
#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
409-
#: ports/nrf/common-hal/busio/I2C.c
407+
#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
410408
msgid "All I2C peripherals are in use"
411409
msgstr "Semua perangkat I2C sedang digunakan"
412410

411+
#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
412+
msgid "All I2C targets are in use"
413+
msgstr ""
414+
413415
#: ports/espressif/common-hal/countio/Counter.c
414416
#: ports/espressif/common-hal/frequencyio/FrequencyIn.c
415417
#: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
@@ -1609,7 +1611,7 @@ msgstr ""
16091611
msgid "Only one TouchAlarm can be set in deep sleep."
16101612
msgstr ""
16111613

1612-
#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
1614+
#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
16131615
msgid "Only one address is allowed"
16141616
msgstr ""
16151617

@@ -2350,11 +2352,11 @@ msgstr "__new__ arg harus berupa user-type"
23502352
msgid "a bytes-like object is required"
23512353
msgstr "sebuah objek menyerupai byte (bytes-like) dibutuhkan"
23522354

2353-
#: shared-bindings/i2cperipheral/I2CPeripheral.c
2355+
#: shared-bindings/i2ctarget/I2CTarget.c
23542356
msgid "address out of bounds"
23552357
msgstr "alamat di luar batas"
23562358

2357-
#: shared-bindings/i2cperipheral/I2CPeripheral.c
2359+
#: shared-bindings/i2ctarget/I2CTarget.c
23582360
msgid "addresses is empty"
23592361
msgstr "alamatnya kosong"
23602362

@@ -2546,7 +2548,7 @@ msgstr "tidak dapat menetapkan ke ekspresi"
25462548
msgid "can't cancel self"
25472549
msgstr ""
25482550

2549-
#: py/obj.c py/objint.c shared-bindings/i2cperipheral/I2CPeripheral.c
2551+
#: py/obj.c py/objint.c shared-bindings/i2ctarget/I2CTarget.c
25502552
#: shared-module/adafruit_pixelbuf/PixelBuf.c
25512553
msgid "can't convert %q to %q"
25522554
msgstr ""
@@ -3283,6 +3285,10 @@ msgstr ""
32833285
msgid "invalid micropython decorator"
32843286
msgstr "micropython decorator tidak valid"
32853287

3288+
#: ports/espressif/common-hal/esp32_camera/Camera.c
3289+
msgid "invalid setting"
3290+
msgstr ""
3291+
32863292
#: shared-bindings/random/__init__.c
32873293
msgid "invalid step"
32883294
msgstr ""
@@ -3538,7 +3544,7 @@ msgstr ""
35383544
msgid "no response from SD card"
35393545
msgstr ""
35403546

3541-
#: py/objobject.c py/runtime.c
3547+
#: ports/espressif/common-hal/esp32_camera/Camera.c py/objobject.c py/runtime.c
35423548
msgid "no such attribute"
35433549
msgstr ""
35443550

‎locale/circuitpython.pot

Lines changed: 14 additions & 8 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 ""
@@ -3252,6 +3254,10 @@ msgstr ""
32523254
msgid "invalid micropython decorator"
32533255
msgstr ""
32543256

3257+
#: ports/espressif/common-hal/esp32_camera/Camera.c
3258+
msgid "invalid setting"
3259+
msgstr ""
3260+
32553261
#: shared-bindings/random/__init__.c
32563262
msgid "invalid step"
32573263
msgstr ""
@@ -3507,7 +3513,7 @@ msgstr ""
35073513
msgid "no response from SD card"
35083514
msgstr ""
35093515

3510-
#: py/objobject.c py/runtime.c
3516+
#: ports/espressif/common-hal/esp32_camera/Camera.c py/objobject.c py/runtime.c
35113517
msgid "no such attribute"
35123518
msgstr ""
35133519

‎locale/cs.po

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -405,12 +405,14 @@ msgstr "Adresa musí být %d bajtů dlouhá"
405405
msgid "All CAN peripherals are in use"
406406
msgstr "Všechny CAN periferie jsou používány"
407407

408-
#: ports/espressif/common-hal/busio/I2C.c
409-
#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
410-
#: ports/nrf/common-hal/busio/I2C.c
408+
#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
411409
msgid "All I2C peripherals are in use"
412410
msgstr "Všechny I2C periferie jsou používány"
413411

412+
#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
413+
msgid "All I2C targets are in use"
414+
msgstr ""
415+
414416
#: ports/espressif/common-hal/countio/Counter.c
415417
#: ports/espressif/common-hal/frequencyio/FrequencyIn.c
416418
#: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
@@ -1605,7 +1607,7 @@ msgstr ""
16051607
msgid "Only one TouchAlarm can be set in deep sleep."
16061608
msgstr ""
16071609

1608-
#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
1610+
#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
16091611
msgid "Only one address is allowed"
16101612
msgstr ""
16111613

@@ -2337,11 +2339,11 @@ msgstr ""
23372339
msgid "a bytes-like object is required"
23382340
msgstr ""
23392341

2340-
#: shared-bindings/i2cperipheral/I2CPeripheral.c
2342+
#: shared-bindings/i2ctarget/I2CTarget.c
23412343
msgid "address out of bounds"
23422344
msgstr ""
23432345

2344-
#: shared-bindings/i2cperipheral/I2CPeripheral.c
2346+
#: shared-bindings/i2ctarget/I2CTarget.c
23452347
msgid "addresses is empty"
23462348
msgstr ""
23472349

@@ -2533,7 +2535,7 @@ msgstr ""
25332535
msgid "can't cancel self"
25342536
msgstr ""
25352537

2536-
#: py/obj.c py/objint.c shared-bindings/i2cperipheral/I2CPeripheral.c
2538+
#: py/obj.c py/objint.c shared-bindings/i2ctarget/I2CTarget.c
25372539
#: shared-module/adafruit_pixelbuf/PixelBuf.c
25382540
msgid "can't convert %q to %q"
25392541
msgstr ""
@@ -3270,6 +3272,10 @@ msgstr ""
32703272
msgid "invalid micropython decorator"
32713273
msgstr ""
32723274

3275+
#: ports/espressif/common-hal/esp32_camera/Camera.c
3276+
msgid "invalid setting"
3277+
msgstr ""
3278+
32733279
#: shared-bindings/random/__init__.c
32743280
msgid "invalid step"
32753281
msgstr ""
@@ -3525,7 +3531,7 @@ msgstr ""
35253531
msgid "no response from SD card"
35263532
msgstr ""
35273533

3528-
#: py/objobject.c py/runtime.c
3534+
#: ports/espressif/common-hal/esp32_camera/Camera.c py/objobject.c py/runtime.c
35293535
msgid "no such attribute"
35303536
msgstr ""
35313537

‎locale/de_DE.po

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -407,12 +407,14 @@ msgstr "Die Adresse muss %d Bytes lang sein"
407407
msgid "All CAN peripherals are in use"
408408
msgstr "Alle CAN-Schnittstellen sind in Benutzung"
409409

410-
#: ports/espressif/common-hal/busio/I2C.c
411-
#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
412-
#: ports/nrf/common-hal/busio/I2C.c
410+
#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
413411
msgid "All I2C peripherals are in use"
414412
msgstr "Alle I2C-Peripheriegeräte sind in Benutzung"
415413

414+
#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
415+
msgid "All I2C targets are in use"
416+
msgstr ""
417+
416418
#: ports/espressif/common-hal/countio/Counter.c
417419
#: ports/espressif/common-hal/frequencyio/FrequencyIn.c
418420
#: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
@@ -1624,7 +1626,7 @@ msgstr ""
16241626
msgid "Only one TouchAlarm can be set in deep sleep."
16251627
msgstr "Nur ein TouchAlarm kann in Deep Sleep gesetzt werden."
16261628

1627-
#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
1629+
#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
16281630
msgid "Only one address is allowed"
16291631
msgstr "Nur eine Adresse ist erlaubt"
16301632

@@ -2389,11 +2391,11 @@ msgstr "__new__ arg muss user-type sein"
23892391
msgid "a bytes-like object is required"
23902392
msgstr "ein Byte-ähnliches Objekt ist erforderlich"
23912393

2392-
#: shared-bindings/i2cperipheral/I2CPeripheral.c
2394+
#: shared-bindings/i2ctarget/I2CTarget.c
23932395
msgid "address out of bounds"
23942396
msgstr "Adresse außerhalb der Grenzen"
23952397

2396-
#: shared-bindings/i2cperipheral/I2CPeripheral.c
2398+
#: shared-bindings/i2ctarget/I2CTarget.c
23972399
msgid "addresses is empty"
23982400
msgstr "addresses ist leer"
23992401

@@ -2587,7 +2589,7 @@ msgstr "kann keinem Ausdruck zuweisen"
25872589
msgid "can't cancel self"
25882590
msgstr "kann self nicht abbrechen"
25892591

2590-
#: py/obj.c py/objint.c shared-bindings/i2cperipheral/I2CPeripheral.c
2592+
#: py/obj.c py/objint.c shared-bindings/i2ctarget/I2CTarget.c
25912593
#: shared-module/adafruit_pixelbuf/PixelBuf.c
25922594
msgid "can't convert %q to %q"
25932595
msgstr "kann %q nicht zu %q konvertieren"
@@ -3336,6 +3338,10 @@ msgstr "ungültiger Hostname"
33363338
msgid "invalid micropython decorator"
33373339
msgstr "ungültiger micropython decorator"
33383340

3341+
#: ports/espressif/common-hal/esp32_camera/Camera.c
3342+
msgid "invalid setting"
3343+
msgstr ""
3344+
33393345
#: shared-bindings/random/__init__.c
33403346
msgid "invalid step"
33413347
msgstr "ungültiger Schritt (step)"
@@ -3597,7 +3603,7 @@ msgstr "kein Reset Pin verfügbar"
35973603
msgid "no response from SD card"
35983604
msgstr "keine Antwort von der SD-Karte"
35993605

3600-
#: py/objobject.c py/runtime.c
3606+
#: ports/espressif/common-hal/esp32_camera/Camera.c py/objobject.c py/runtime.c
36013607
msgid "no such attribute"
36023608
msgstr "kein solches Attribut"
36033609

‎locale/el.po

Lines changed: 14 additions & 8 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 ""
@@ -3252,6 +3254,10 @@ msgstr ""
32523254
msgid "invalid micropython decorator"
32533255
msgstr ""
32543256

3257+
#: ports/espressif/common-hal/esp32_camera/Camera.c
3258+
msgid "invalid setting"
3259+
msgstr ""
3260+
32553261
#: shared-bindings/random/__init__.c
32563262
msgid "invalid step"
32573263
msgstr ""
@@ -3507,7 +3513,7 @@ msgstr ""
35073513
msgid "no response from SD card"
35083514
msgstr ""
35093515

3510-
#: py/objobject.c py/runtime.c
3516+
#: ports/espressif/common-hal/esp32_camera/Camera.c py/objobject.c py/runtime.c
35113517
msgid "no such attribute"
35123518
msgstr ""
35133519

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy