Merge branch 'refs/heads/main' into vectorio_intersection

# Conflicts:
#	ports/stm/boards/meowbit_v121/mpconfigboard.mk

Author: FoamyGuy

ports/raspberrypi/lib/cyw43-driver

@@ -49,11 +49,13 @@ static uint32_t m1_timing;
 static void save_psram_settings(void) {
     #ifdef PICO_RP2350
     // We're about to invalidate the XIP cache, clean it first to commit any dirty writes to PSRAM
-    uint8_t *maintenance_ptr = (uint8_t *)XIP_MAINTENANCE_BASE;
+    volatile uint8_t *maintenance_ptr = (uint8_t *)XIP_MAINTENANCE_BASE;
     for (int i = 1; i < 16 * 1024; i += 8) {
         // Background info: https://forums.raspberrypi.com/viewtopic.php?t=378249
         maintenance_ptr[i] = 0; // Clean
+        __compiler_memory_barrier();
         maintenance_ptr[i - 1] = 0; // Explicitly invalidate
+        __compiler_memory_barrier();
     }
 
     m1_timing = qmi_hw->m[1].timing;

ports/raspberrypi/supervisor/internal_flash.c

@@ -244,7 +244,7 @@ void port_heap_init(void) {
     _heap = tlsf_create_with_pool(heap_bottom, size, 64 * 1024 * 1024);
     _ram_pool = tlsf_get_pool(_heap);
     if (_psram_size > 0) {
-        _psram_pool = tlsf_add_pool(_heap, (void *)0x11000004, _psram_size - 4);
+        _psram_pool = tlsf_add_pool(_heap, (void *)0x11000000, _psram_size);
     }
 }
 

ports/raspberrypi/supervisor/port.c

@@ -26,7 +26,9 @@ CIRCUITPY_AESIO = 0
 CIRCUITPY_BITMAPFILTER = 0
 CIRCUITPY_BITMAPTOOLS = 0
 CIRCUITPY_BLEIO_HCI = 0
-CIRCUITPY_GIFIO = 0
+CIRCUITPY_EPAPERDISPLAY = 0
+CIRCUITPY_KEYPAD_DEMUX = 0
+CIRCUITPY_SHARPDISPLAY = 0
 CIRCUITPY_ULAB = 0
 CIRCUITPY_VECTORIO = 0
 CIRCUITPY_ZLIB = 0

ports/stm/boards/meowbit_v121/mpconfigboard.mk

@@ -74,3 +74,16 @@ const mp_obj_module_t displayio_module = {
 };
 
 MP_REGISTER_MODULE(MP_QSTR_displayio, displayio_module);
+
+displayio_buffer_transform_t null_transform = {
+    .x = 0,
+    .y = 0,
+    .dx = 1,
+    .dy = 1,
+    .scale = 1,
+    .width = 0,
+    .height = 0,
+    .mirror_x = false,
+    .mirror_y = false,
+    .transpose_xy = false
+};

ports/unix/displayio_min.c

@@ -59,6 +59,11 @@ SRC_BITMAP := \
 	shared-bindings/synthio/Synthesizer.c \
 	shared-bindings/traceback/__init__.c \
 	shared-bindings/util.c \
+	shared-bindings/vectorio/Circle.c \
+	shared-bindings/vectorio/__init__.c \
+	shared-bindings/vectorio/Polygon.c \
+	shared-bindings/vectorio/Rectangle.c \
+	shared-bindings/vectorio/VectorShape.c \
 	shared-bindings/zlib/__init__.c \
 	shared-module/aesio/aes.c \
 	shared-module/aesio/__init__.c \
@@ -88,6 +93,12 @@ SRC_BITMAP := \
 	shared-module/synthio/Note.c \
 	shared-module/synthio/Biquad.c \
 	shared-module/synthio/Synthesizer.c \
+	shared-bindings/vectorio/Circle.c \
+	shared-module/vectorio/Circle.c \
+	shared-module/vectorio/__init__.c \
+	shared-module/vectorio/Polygon.c \
+	shared-module/vectorio/Rectangle.c \
+	shared-module/vectorio/VectorShape.c \
 	shared-module/traceback/__init__.c \
 	shared-module/zlib/__init__.c \
 
@@ -134,6 +145,7 @@ CFLAGS += \
 	-DCIRCUITPY_SYNTHIO=1 \
 	-DCIRCUITPY_SYNTHIO_MAX_CHANNELS=14 \
 	-DCIRCUITPY_TRACEBACK=1 \
+	-DCIRCUITPY_VECTORIO=1 \
 	-DCIRCUITPY_ZLIB=1
 
 # CIRCUITPY-CHANGE: test native base classes.

ports/unix/variants/coverage/mpconfigvariant.mk

@@ -134,6 +134,9 @@ endif
 ifeq ($(CIRCUITPY_AUDIODELAYS),1)
 SRC_PATTERNS += audiodelays/%
 endif
+ifeq ($(CIRCUITPY_AUDIOFILTERS),1)
+SRC_PATTERNS += audiofilters/%
+endif
 ifeq ($(CIRCUITPY_AUDIOMIXER),1)
 SRC_PATTERNS += audiomixer/%
 endif
@@ -622,6 +625,8 @@ SRC_SHARED_MODULE_ALL = \
 	audiocore/__init__.c \
 	audiodelays/Echo.c \
 	audiodelays/__init__.c \
+	audiofilters/Filter.c \
+	audiofilters/__init__.c \
 	audioio/__init__.c \
 	audiomixer/Mixer.c \
 	audiomixer/MixerVoice.c \

py/circuitpy_defns.mk

@@ -144,6 +144,8 @@ CFLAGS += -DCIRCUITPY_AUDIOMP3=$(CIRCUITPY_AUDIOMP3)
 CIRCUITPY_AUDIOEFFECTS ?= 0
 CIRCUITPY_AUDIODELAYS ?= $(CIRCUITPY_AUDIOEFFECTS)
 CFLAGS += -DCIRCUITPY_AUDIODELAYS=$(CIRCUITPY_AUDIODELAYS)
+CIRCUITPY_AUDIOFILTERS ?= $(CIRCUITPY_AUDIOEFFECTS)
+CFLAGS += -DCIRCUITPY_AUDIOFILTERS=$(CIRCUITPY_AUDIOFILTERS)
 
 CIRCUITPY_AURORA_EPAPER ?= 0
 CFLAGS += -DCIRCUITPY_AURORA_EPAPER=$(CIRCUITPY_AURORA_EPAPER)

py/circuitpy_mpconfig.mk

@@ -25,9 +25,7 @@ intelhex
 # for building & testing natmods
 pyelftools
 
-# for mbedtls certificate store
-# version limit due to espressif
-cryptography<36.1,>=2.1.4
+cryptography
 
 # for web workflow minify
 minify_html

requirements-dev.txt

@@ -33,7 +33,14 @@
 //| `adafruit_ble <https://circuitpython.readthedocs.io/projects/ble/en/latest/>`_
 //| CircuitPython library instead, which builds on `_bleio`, and
 //| provides higher-level convenience functionality, including predefined beacons, clients,
-//| servers."""
+//| servers.
+//|
+//| .. note:: `_bleio` uses native BLE capability on boards that support it, including Nordic nRF,
+//|   Espressif (except ESP32-S2 and ESP32-P4), and SiLabs.
+//|   On other boards, `_bleio`, if present, supports BLE using an AirLift co-processor.
+//|   Pico W boards do *not* support BLE using the on-board CYW43 co-processor,
+//|   but do support using an external AirLift.
+//| """
 
 //| adapter: Adapter
 //| """BLE Adapter used to manage device discovery and connections.