Skip to content

Commit 81ae88e

Browse files
OmarEMbedOmarEMbed
authored
Merge branch 'adafruit:main' into main
2 parents 33d4ff9 + 322ad6d commit 81ae88e

File tree

149 files changed

+104172
-618
lines changed

Some content is hidden

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

149 files changed

+104172
-618
lines changed

‎.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@
312312
[submodule "ports/raspberrypi/lib/lwip"]
313313
path = ports/raspberrypi/lib/lwip
314314
url = https://github.com/adafruit/lwip.git
315-
branch = circuitpython8
315+
branch = circuitpython9
316316
[submodule "lib/mbedtls"]
317317
path = lib/mbedtls
318318
url = https://github.com/ARMmbed/mbedtls.git

‎docs/environment.rst

Lines changed: 48 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,15 +101,14 @@ Wi-Fi SSID to auto-connect to even if user code is not running.
101101
Additional board specific keys
102102
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
103103

104-
`MaTouch ESP32-S3 Parallel TFT with Touch 7“ <https://circuitpython.org/board/makerfabs_tft7/>`_
105-
106-
CIRCUITPY_DISPLAY_WIDTH
107-
~~~~~~~~~~~~~~~~~~~~~~~
104+
CIRCUITPY_DISPLAY_WIDTH (Sunton, MaTouch)
105+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
108106
Selects the correct screen resolution (1024x600 or 800x640) for the particular board variant.
109107
If the CIRCUITPY_DISPLAY_WIDTH parameter is set to a value of 1024 the display is initialized
110108
during power up at 1024x600 otherwise the display will be initialized at a resolution
111109
of 800x480.
112110

111+
`MaTouch ESP32-S3 Parallel TFT with Touch 7“ <https://circuitpython.org/board/makerfabs_tft7/>`_
113112
`Sunton ESP32-2432S028 <https://circuitpython.org/board/sunton_esp32_2432S028/>`_
114113
`Sunton ESP32-2432S024C <https://circuitpython.org/board/sunton_esp32_2432S024C/>`_
115114

@@ -122,6 +121,8 @@ a rotation of 0. Attempting to initialize the screen with a rotation other than
122121
90, 180 or 270 is not supported and will result in an unexpected screen rotation.
123122

124123
`Sunton ESP32-8048S050 <https://circuitpython.org/board/sunton_esp32_8048S050/>`_
124+
`Adafruit Feather RP2350 <https://circuitpython.org/board/adafruit_feather_rp2350/>`_
125+
`Adafruit Metro RP2350 <https://circuitpython.org/board/adafruit_metro_rp2350/>`_
125126

126127
CIRCUITPY_DISPLAY_FREQUENCY
127128
~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -130,3 +131,46 @@ If a valid frequency is not defined the board will initialize the framebuffer wi
130131
frequency of 12500000hz (12.5Mhz). The value should be entered as an integer in hertz
131132
i.e. CIRCUITPY_DISPLAY_FREQUENCY=16000000 will override the default value with a 16Mhz
132133
display frequency.
134+
135+
`Sunton ESP32-8048S050 <https://circuitpython.org/board/sunton_esp32_8048S050/>`_
136+
137+
138+
CIRCUITPY_PICODVI_ENABLE
139+
~~~~~~~~~~~~~~~~~~~~~~~~
140+
Whether to configure the display at board initialization time, one of the following:
141+
142+
.. code-block::
143+
144+
CIRCUITPY_PICODVI_ENABLE="detect" # when EDID EEPROM is detected (default)
145+
CIRCUITPY_PICODVI_ENABLE="always"
146+
CIRCUITPY_PICODVI_ENABLE="never"
147+
148+
A display configured in this manner is available at ``supervisor.runtime.display``
149+
until it is released by ``displayio.release_displays()``. It does not appear at
150+
``board.DISPLAY``.
151+
152+
`Adafruit Feather RP2350 <https://circuitpython.org/board/adafruit_feather_rp2350/>`_
153+
`Adafruit Metro RP2350 <https://circuitpython.org/board/adafruit_metro_rp2350/>`_
154+
155+
CIRCUITPY_DISPLAY_WIDTH, CIRCUITPY_DISPLAY_HEIGHT, and CIRCUITPY_DISPLAY_COLOR_DEPTH (RP2350 boards with DVI or HSTX connector)
156+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
157+
Selects the desired resolution and color depth.
158+
159+
Supported resolutions are:
160+
* 640x480 with color depth 1, 2, 4 or 8 bits per pixel
161+
* 320x240 with color depth 8 or 16 bits per pixel
162+
163+
The default value, if unspecified, is 320x240 with 16 bits per pixel.
164+
165+
If height is unspecified, it is set from the width. For example, a width of 640
166+
implies a height of 480.
167+
168+
Example: Configure the display to 640x480 black and white (1 bit per pixel):
169+
170+
.. code-block::
171+
172+
CIRCUITPY_DISPLAY_WIDTH=640
173+
CIRCUITPY_DISPLAY_COLOR_DEPTH=1
174+
175+
`Adafruit Feather RP2350 <https://circuitpython.org/board/adafruit_feather_rp2350/>`_
176+
`Adafruit Metro RP2350 <https://circuitpython.org/board/adafruit_metro_rp2350/>`_

‎docs/porting.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ as a natural "TODO" list. An example minimal build list is shown below:
7272
CIRCUITPY_FRAMEBUFFERIO = 0
7373
CIRCUITPY_FREQUENCYIO = 0
7474
CIRCUITPY_I2CTARGET = 0
75+
CIRCUITPY_SPITARGET = 0
7576
# Requires SPI, PulseIO (stub ok):
7677
CIRCUITPY_DISPLAYIO = 0
7778

‎locale/ID.po

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -606,6 +606,10 @@ msgstr "Array harus mengandung halfwords (ketik 'H')"
606606
msgid "Array values should be single bytes."
607607
msgstr "Nilai array harus berupa byte tunggal."
608608

609+
#: ports/atmel-samd/common-hal/spitarget/SPITarget.c
610+
msgid "Async SPI transfer in progress on this bus, keep awaiting."
611+
msgstr ""
612+
609613
#: shared-module/memorymonitor/AllocationAlarm.c
610614
#, c-format
611615
msgid "Attempt to allocate %d blocks"
@@ -1755,6 +1759,10 @@ msgstr ""
17551759
msgid "PWM slice channel A already in use"
17561760
msgstr ""
17571761

1762+
#: shared-bindings/spitarget/SPITarget.c
1763+
msgid "Packet buffers for an SPI transfer must have the same length."
1764+
msgstr ""
1765+
17581766
#: shared-module/jpegio/JpegDecoder.c
17591767
msgid "Parameter error"
17601768
msgstr ""
@@ -2055,8 +2063,8 @@ msgstr ""
20552063
msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
20562064
msgstr "Panjang rgb_pins harus 6, 12, 18, 24, atau 30"
20572065

2058-
#: shared-module/audiodelays/Echo.c shared-module/audiofilters/Filter.c
2059-
#: shared-module/audiomixer/MixerVoice.c
2066+
#: shared-module/audiodelays/Echo.c shared-module/audiofilters/Distortion.c
2067+
#: shared-module/audiofilters/Filter.c shared-module/audiomixer/MixerVoice.c
20602068
msgid "The sample's %q does not match"
20612069
msgstr "Sampel punya %q yang tidak cocok"
20622070

@@ -2621,8 +2629,8 @@ msgstr ""
26212629
msgid "bits must be 32 or less"
26222630
msgstr ""
26232631

2624-
#: shared-bindings/audiodelays/Echo.c shared-bindings/audiofilters/Filter.c
2625-
#: shared-bindings/audiomixer/Mixer.c
2632+
#: shared-bindings/audiodelays/Echo.c shared-bindings/audiofilters/Distortion.c
2633+
#: shared-bindings/audiofilters/Filter.c shared-bindings/audiomixer/Mixer.c
26262634
msgid "bits_per_sample must be 8 or 16"
26272635
msgstr ""
26282636

‎locale/circuitpython.pot

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -594,6 +594,10 @@ msgstr ""
594594
msgid "Array values should be single bytes."
595595
msgstr ""
596596

597+
#: ports/atmel-samd/common-hal/spitarget/SPITarget.c
598+
msgid "Async SPI transfer in progress on this bus, keep awaiting."
599+
msgstr ""
600+
597601
#: shared-module/memorymonitor/AllocationAlarm.c
598602
#, c-format
599603
msgid "Attempt to allocate %d blocks"
@@ -1725,6 +1729,10 @@ msgstr ""
17251729
msgid "PWM slice channel A already in use"
17261730
msgstr ""
17271731

1732+
#: shared-bindings/spitarget/SPITarget.c
1733+
msgid "Packet buffers for an SPI transfer must have the same length."
1734+
msgstr ""
1735+
17281736
#: shared-module/jpegio/JpegDecoder.c
17291737
msgid "Parameter error"
17301738
msgstr ""
@@ -2017,8 +2025,8 @@ msgstr ""
20172025
msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
20182026
msgstr ""
20192027

2020-
#: shared-module/audiodelays/Echo.c shared-module/audiofilters/Filter.c
2021-
#: shared-module/audiomixer/MixerVoice.c
2028+
#: shared-module/audiodelays/Echo.c shared-module/audiofilters/Distortion.c
2029+
#: shared-module/audiofilters/Filter.c shared-module/audiomixer/MixerVoice.c
20222030
msgid "The sample's %q does not match"
20232031
msgstr ""
20242032

@@ -2570,8 +2578,8 @@ msgstr ""
25702578
msgid "bits must be 32 or less"
25712579
msgstr ""
25722580

2573-
#: shared-bindings/audiodelays/Echo.c shared-bindings/audiofilters/Filter.c
2574-
#: shared-bindings/audiomixer/Mixer.c
2581+
#: shared-bindings/audiodelays/Echo.c shared-bindings/audiofilters/Distortion.c
2582+
#: shared-bindings/audiofilters/Filter.c shared-bindings/audiomixer/Mixer.c
25752583
msgid "bits_per_sample must be 8 or 16"
25762584
msgstr ""
25772585

‎locale/cs.po

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -605,6 +605,10 @@ msgstr "Pole musí obsahovat poloviční slova (typ „H“)"
605605
msgid "Array values should be single bytes."
606606
msgstr "Hodnoty pole by měly být jednoduché bajty."
607607

608+
#: ports/atmel-samd/common-hal/spitarget/SPITarget.c
609+
msgid "Async SPI transfer in progress on this bus, keep awaiting."
610+
msgstr ""
611+
608612
#: shared-module/memorymonitor/AllocationAlarm.c
609613
#, c-format
610614
msgid "Attempt to allocate %d blocks"
@@ -1748,6 +1752,10 @@ msgstr "PWM kanál je již využíván"
17481752
msgid "PWM slice channel A already in use"
17491753
msgstr "PWM kanál A je již využíván"
17501754

1755+
#: shared-bindings/spitarget/SPITarget.c
1756+
msgid "Packet buffers for an SPI transfer must have the same length."
1757+
msgstr ""
1758+
17511759
#: shared-module/jpegio/JpegDecoder.c
17521760
msgid "Parameter error"
17531761
msgstr ""
@@ -2042,8 +2050,8 @@ msgstr "Výše uvedená výjimka byla přímá příčina následující výjimk
20422050
msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
20432051
msgstr "Počet prvků rgb_pin musí být 6, 12, 18, 24, nebo 30"
20442052

2045-
#: shared-module/audiodelays/Echo.c shared-module/audiofilters/Filter.c
2046-
#: shared-module/audiomixer/MixerVoice.c
2053+
#: shared-module/audiodelays/Echo.c shared-module/audiofilters/Distortion.c
2054+
#: shared-module/audiofilters/Filter.c shared-module/audiomixer/MixerVoice.c
20472055
msgid "The sample's %q does not match"
20482056
msgstr ""
20492057

@@ -2601,8 +2609,8 @@ msgstr "velikosti bitmapy musí odpovídat"
26012609
msgid "bits must be 32 or less"
26022610
msgstr "počet bitů nesmí přesáhnout 32"
26032611

2604-
#: shared-bindings/audiodelays/Echo.c shared-bindings/audiofilters/Filter.c
2605-
#: shared-bindings/audiomixer/Mixer.c
2612+
#: shared-bindings/audiodelays/Echo.c shared-bindings/audiofilters/Distortion.c
2613+
#: shared-bindings/audiofilters/Filter.c shared-bindings/audiomixer/Mixer.c
26062614
msgid "bits_per_sample must be 8 or 16"
26072615
msgstr ""
26082616

‎locale/de_DE.po

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -609,6 +609,10 @@ msgstr "Array muss Halbwörter enthalten (type 'H')"
609609
msgid "Array values should be single bytes."
610610
msgstr "Array-Werte sollten aus Einzelbytes bestehen."
611611

612+
#: ports/atmel-samd/common-hal/spitarget/SPITarget.c
613+
msgid "Async SPI transfer in progress on this bus, keep awaiting."
614+
msgstr ""
615+
612616
#: shared-module/memorymonitor/AllocationAlarm.c
613617
#, c-format
614618
msgid "Attempt to allocate %d blocks"
@@ -1762,6 +1766,10 @@ msgstr "PWM-Stück wird bereits verwendet"
17621766
msgid "PWM slice channel A already in use"
17631767
msgstr "PWM-Stück-Kanal A wird bereits verwendet"
17641768

1769+
#: shared-bindings/spitarget/SPITarget.c
1770+
msgid "Packet buffers for an SPI transfer must have the same length."
1771+
msgstr ""
1772+
17651773
#: shared-module/jpegio/JpegDecoder.c
17661774
msgid "Parameter error"
17671775
msgstr "Parameter-Fehler"
@@ -2065,8 +2073,8 @@ msgstr ""
20652073
msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
20662074
msgstr "Die Länge von rgb_pins muss 6, 12, 18, 24 oder 30 betragen"
20672075

2068-
#: shared-module/audiodelays/Echo.c shared-module/audiofilters/Filter.c
2069-
#: shared-module/audiomixer/MixerVoice.c
2076+
#: shared-module/audiodelays/Echo.c shared-module/audiofilters/Distortion.c
2077+
#: shared-module/audiofilters/Filter.c shared-module/audiomixer/MixerVoice.c
20702078
msgid "The sample's %q does not match"
20712079
msgstr ""
20722080

@@ -2633,8 +2641,8 @@ msgstr "Bitmap-Größen müssen übereinstimmen"
26332641
msgid "bits must be 32 or less"
26342642
msgstr "bits müssen 32 oder kleiner sein"
26352643

2636-
#: shared-bindings/audiodelays/Echo.c shared-bindings/audiofilters/Filter.c
2637-
#: shared-bindings/audiomixer/Mixer.c
2644+
#: shared-bindings/audiodelays/Echo.c shared-bindings/audiofilters/Distortion.c
2645+
#: shared-bindings/audiofilters/Filter.c shared-bindings/audiomixer/Mixer.c
26382646
msgid "bits_per_sample must be 8 or 16"
26392647
msgstr "Es müssen 8 oder 16 bits_per_sample sein"
26402648

‎locale/el.po

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -609,6 +609,10 @@ msgstr "H παράταξη πρέπει να περιέχει halfwords (τύπ
609609
msgid "Array values should be single bytes."
610610
msgstr "Η τιμές της παράταξη πρέπει να είναι μονά bytes."
611611

612+
#: ports/atmel-samd/common-hal/spitarget/SPITarget.c
613+
msgid "Async SPI transfer in progress on this bus, keep awaiting."
614+
msgstr ""
615+
612616
#: shared-module/memorymonitor/AllocationAlarm.c
613617
#, c-format
614618
msgid "Attempt to allocate %d blocks"
@@ -1751,6 +1755,10 @@ msgstr ""
17511755
msgid "PWM slice channel A already in use"
17521756
msgstr ""
17531757

1758+
#: shared-bindings/spitarget/SPITarget.c
1759+
msgid "Packet buffers for an SPI transfer must have the same length."
1760+
msgstr ""
1761+
17541762
#: shared-module/jpegio/JpegDecoder.c
17551763
msgid "Parameter error"
17561764
msgstr ""
@@ -2045,8 +2053,8 @@ msgstr ""
20452053
msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
20462054
msgstr ""
20472055

2048-
#: shared-module/audiodelays/Echo.c shared-module/audiofilters/Filter.c
2049-
#: shared-module/audiomixer/MixerVoice.c
2056+
#: shared-module/audiodelays/Echo.c shared-module/audiofilters/Distortion.c
2057+
#: shared-module/audiofilters/Filter.c shared-module/audiomixer/MixerVoice.c
20502058
msgid "The sample's %q does not match"
20512059
msgstr ""
20522060

@@ -2598,8 +2606,8 @@ msgstr ""
25982606
msgid "bits must be 32 or less"
25992607
msgstr ""
26002608

2601-
#: shared-bindings/audiodelays/Echo.c shared-bindings/audiofilters/Filter.c
2602-
#: shared-bindings/audiomixer/Mixer.c
2609+
#: shared-bindings/audiodelays/Echo.c shared-bindings/audiofilters/Distortion.c
2610+
#: shared-bindings/audiofilters/Filter.c shared-bindings/audiomixer/Mixer.c
26032611
msgid "bits_per_sample must be 8 or 16"
26042612
msgstr ""
26052613

‎locale/en_GB.po

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -607,6 +607,10 @@ msgstr "Array must contain halfwords (type 'H')"
607607
msgid "Array values should be single bytes."
608608
msgstr "Array values should be single bytes."
609609

610+
#: ports/atmel-samd/common-hal/spitarget/SPITarget.c
611+
msgid "Async SPI transfer in progress on this bus, keep awaiting."
612+
msgstr ""
613+
610614
#: shared-module/memorymonitor/AllocationAlarm.c
611615
#, c-format
612616
msgid "Attempt to allocate %d blocks"
@@ -1748,6 +1752,10 @@ msgstr "PWM slice already in use"
17481752
msgid "PWM slice channel A already in use"
17491753
msgstr "PWM slice channel A already in use"
17501754

1755+
#: shared-bindings/spitarget/SPITarget.c
1756+
msgid "Packet buffers for an SPI transfer must have the same length."
1757+
msgstr ""
1758+
17511759
#: shared-module/jpegio/JpegDecoder.c
17521760
msgid "Parameter error"
17531761
msgstr "Parameter error"
@@ -2043,8 +2051,8 @@ msgstr "The above exception was the direct cause of the following exception:"
20432051
msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
20442052
msgstr "The length of rgb_pins must be 6, 12, 18, 24, or 30"
20452053

2046-
#: shared-module/audiodelays/Echo.c shared-module/audiofilters/Filter.c
2047-
#: shared-module/audiomixer/MixerVoice.c
2054+
#: shared-module/audiodelays/Echo.c shared-module/audiofilters/Distortion.c
2055+
#: shared-module/audiofilters/Filter.c shared-module/audiomixer/MixerVoice.c
20482056
msgid "The sample's %q does not match"
20492057
msgstr "The sample's %q does not match"
20502058

@@ -2605,8 +2613,8 @@ msgstr "bitmap sizes must match"
26052613
msgid "bits must be 32 or less"
26062614
msgstr "bits must be 32 or less"
26072615

2608-
#: shared-bindings/audiodelays/Echo.c shared-bindings/audiofilters/Filter.c
2609-
#: shared-bindings/audiomixer/Mixer.c
2616+
#: shared-bindings/audiodelays/Echo.c shared-bindings/audiofilters/Distortion.c
2617+
#: shared-bindings/audiofilters/Filter.c shared-bindings/audiomixer/Mixer.c
26102618
msgid "bits_per_sample must be 8 or 16"
26112619
msgstr "bits_per_sample must be 8 or 16"
26122620

‎locale/es.po

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -611,6 +611,10 @@ msgstr "El array debe contener medias palabras (escriba 'H')"
611611
msgid "Array values should be single bytes."
612612
msgstr "Valores del array deben ser bytes individuales."
613613

614+
#: ports/atmel-samd/common-hal/spitarget/SPITarget.c
615+
msgid "Async SPI transfer in progress on this bus, keep awaiting."
616+
msgstr ""
617+
614618
#: shared-module/memorymonitor/AllocationAlarm.c
615619
#, c-format
616620
msgid "Attempt to allocate %d blocks"
@@ -1773,6 +1777,10 @@ msgstr "Segmento PWM ya esta en uso"
17731777
msgid "PWM slice channel A already in use"
17741778
msgstr "Segmento del PWM canal A ya esta en uso"
17751779

1780+
#: shared-bindings/spitarget/SPITarget.c
1781+
msgid "Packet buffers for an SPI transfer must have the same length."
1782+
msgstr ""
1783+
17761784
#: shared-module/jpegio/JpegDecoder.c
17771785
msgid "Parameter error"
17781786
msgstr "Error de parámetro"
@@ -2074,8 +2082,8 @@ msgstr "La excepción fue la causa directa de la excepción siguiente:"
20742082
msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
20752083
msgstr "La longitud de rgb_pins debe ser 6, 12, 18, 24, o 30"
20762084

2077-
#: shared-module/audiodelays/Echo.c shared-module/audiofilters/Filter.c
2078-
#: shared-module/audiomixer/MixerVoice.c
2085+
#: shared-module/audiodelays/Echo.c shared-module/audiofilters/Distortion.c
2086+
#: shared-module/audiofilters/Filter.c shared-module/audiomixer/MixerVoice.c
20792087
msgid "The sample's %q does not match"
20802088
msgstr "El %q de la muestra no concuerda"
20812089

@@ -2642,8 +2650,8 @@ msgstr "los tamaños de los bitmap deben coincidir"
26422650
msgid "bits must be 32 or less"
26432651
msgstr "los bits deben ser 32 o menos"
26442652

2645-
#: shared-bindings/audiodelays/Echo.c shared-bindings/audiofilters/Filter.c
2646-
#: shared-bindings/audiomixer/Mixer.c
2653+
#: shared-bindings/audiodelays/Echo.c shared-bindings/audiofilters/Distortion.c
2654+
#: shared-bindings/audiofilters/Filter.c shared-bindings/audiomixer/Mixer.c
26472655
msgid "bits_per_sample must be 8 or 16"
26482656
msgstr "bits_per_sample debe ser 8 ó 16"
26492657

0 commit comments

Comments
 (0)