Merge pull request #2 from adafruit/main

merge from circuit python

Author: noelanderson

ports/raspberrypi/supervisor/internal_flash.c

@@ -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/port.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);
     }
 }
 

requirements-dev.txt

@@ -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

shared-bindings/_bleio/__init__.c

@@ -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.