Waveshare ESP32-S3 AMOLED 2.41" support with native RM690B0 driver (QSPI)

.devcontainer/cortex-m-toolchain.sh

@@ -14,10 +14,10 @@ echo -e "[cortex-m-toolchain.sh] downloading and installing gcc-arm-non-eabi too
 cd /workspaces
 
 wget -qO gcc-arm-none-eabi.tar.xz \
-  https://developer.arm.com/-/media/Files/downloads/gnu/14.2.rel1/binrel/arm-gnu-toolchain-14.2.rel1-x86_64-arm-none-eabi.tar.xz
+  https://developer.arm.com/-/media/Files/downloads/gnu/15.2.rel1/binrel/arm-gnu-toolchain-15.2.rel1-x86_64-arm-none-eabi.tar.xz
 
 tar -xJf gcc-arm-none-eabi.tar.xz
-ln -s arm-gnu-toolchain-14.2.rel1-x86_64-arm-none-eabi gcc-arm-none-eabi
+ln -s arm-gnu-toolchain-15.2.rel1-x86_64-arm-none-eabi gcc-arm-none-eabi
 rm -f gcc-arm-none-eabi.tar.xz
 
 echo -e "[cortex-m-toolchain.sh] update PATH in environment"

.github/actions/deps/external/action.yml

@@ -27,7 +27,7 @@ runs:
       uses: carlosperate/arm-none-eabi-gcc-action@v1
       with:
         # When changing this update what Windows grabs too!
-        release: '14.2.Rel1'
+        release: '15.2.Rel1'
 
     # espressif
     - name: Get espressif toolchain

.github/actions/deps/ports/broadcom/action.yml

@@ -5,8 +5,8 @@ runs:
   steps:
     - name: Get broadcom toolchain
       run: |
-        wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/arm-gnu-toolchain-14.2.rel1-x86_64-aarch64-none-elf.tar.xz
-        sudo tar -C /usr --strip-components=1 -xaf arm-gnu-toolchain-14.2.rel1-x86_64-aarch64-none-elf.tar.xz
+        wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/arm-gnu-toolchain-15.2.rel1-x86_64-aarch64-none-elf.tar.xz
+        sudo tar -C /usr --strip-components=1 -xaf arm-gnu-toolchain-15.2.rel1-x86_64-aarch64-none-elf.tar.xz
         sudo apt-get update
         sudo apt-get install -y mtools
       shell: bash

.github/actions/deps/ports/zephyr-cp/action.yml

@@ -3,6 +3,12 @@ name: Fetch Zephyr port deps
 runs:
   using: composite
   steps:
+    - name: Get libusb and mtools
+      if: runner.os == 'Linux'
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y libusb-1.0-0-dev libudev-dev mtools
+      shell: bash
     - name: Setup Zephyr project
       uses: zephyrproject-rtos/action-zephyr-setup@v1
       with:

.github/workflows/build.yml

@@ -246,7 +246,7 @@ jobs:
         python3 -c "import sys, locale; print(sys.getdefaultencoding(), locale.getpreferredencoding(False))"
     - name: Install dependencies
       run: |
-        wget --no-verbose -O gcc-arm.zip https://developer.arm.com/-/media/Files/downloads/gnu/14.2.rel1/binrel/arm-gnu-toolchain-14.2.rel1-mingw-w64-i686-arm-none-eabi.zip
+        wget --no-verbose -O gcc-arm.zip https://developer.arm.com/-/media/Files/downloads/gnu/15.2.rel1/binrel/arm-gnu-toolchain-15.2.rel1-mingw-w64-i686-arm-none-eabi.zip
         unzip -q -d /tmp/arm-gnu-toolchain gcc-arm.zip
         tar -C /tmp/arm-gnu-toolchain -cf - . | tar -C /usr/local -xf -
         # We could use a venv instead, but that requires entering the venv on each run step

.github/workflows/run-tests.yml

@@ -23,36 +23,36 @@ jobs:
       TEST_native: --emit native
       TEST_native_mpy: --via-mpy --emit native -d basics float micropython
     steps:
-    - name: Set up repository
-      uses: actions/checkout@v4
-      with:
-        submodules: false
-        show-progress: false
-        fetch-depth: 1
-    - name: Set up python
-      uses: actions/setup-python@v5
-      with:
-        python-version: 3.12
-    - name: Set up submodules
-      uses: ./.github/actions/deps/submodules
-      with:
-        target: tests
-    - name: Set up external
-      if: matrix.test == 'all'
-      uses: ./.github/actions/deps/external
-    - name: Set up mpy-cross
-      uses: ./.github/actions/mpy_cross
-      with:
-        cp-version: ${{ inputs.cp-version }}
-    - name: Build unix port
-      run: make -C ports/unix VARIANT=coverage -j4
-    - name: Run tests
-      run: ./run-tests.py -j4 ${{ env[format('TEST_{0}', matrix.test)] }}
-      working-directory: tests
-    - name: Print failure info
-      run: ./run-tests.py -j4 --print-failures
-      if: failure()
-      working-directory: tests
+      - name: Set up repository
+        uses: actions/checkout@v4
+        with:
+          submodules: false
+          show-progress: false
+          fetch-depth: 1
+      - name: Set up python
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.12
+      - name: Set up submodules
+        uses: ./.github/actions/deps/submodules
+        with:
+          target: tests
+      - name: Set up external
+        if: matrix.test == 'all'
+        uses: ./.github/actions/deps/external
+      - name: Set up mpy-cross
+        uses: ./.github/actions/mpy_cross
+        with:
+          cp-version: ${{ inputs.cp-version }}
+      - name: Build unix port
+        run: make -C ports/unix VARIANT=coverage -j4
+      - name: Run tests
+        run: ./run-tests.py -j4 ${{ env[format('TEST_{0}', matrix.test)] }}
+        working-directory: tests
+      - name: Print failure info
+        run: ./run-tests.py -j4 --print-failures
+        if: failure()
+        working-directory: tests
     # Not working after MicroPython v1.23 merge.
     # - name: Build native modules
     #   if: matrix.test == 'all'
@@ -66,3 +66,34 @@ jobs:
     #   if: matrix.test == 'all'
     #   run: ./run-natmodtests.py extmod/{heapq*,random*,re*}.py
     #   working-directory: tests
+
+  zephyr:
+    runs-on: ubuntu-24.04
+    strategy:
+      fail-fast: false
+    env:
+      CP_VERSION: ${{ inputs.cp-version }}
+    steps:
+      - name: Set up repository
+        uses: actions/checkout@v4
+        with:
+          submodules: false
+          show-progress: false
+          fetch-depth: 1
+      - name: Set up python
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.13
+      - name: Set up Zephyr
+        uses: ./.github/actions/deps/ports/zephyr-cp
+      - name: Set up submodules
+        id: set-up-submodules
+        uses: ./.github/actions/deps/submodules
+        with:
+          target: zephyr-cp
+      - name: Set up external
+        uses: ./.github/actions/deps/external
+      - name: Build native sim target
+        run: make -C ports/zephyr-cp -j2 BOARD=native_native_sim
+      - name: Run Zephyr tests
+        run: make -C ports/zephyr-cp test

.gitignore

@@ -55,6 +55,9 @@ __pycache__/
 ######################
 GNUmakefile
 user.props
+user_pre_mpconfigport.mk
+user_post_mpconfigport.mk
+user_post_circuitpy_defns.mk
 
 # Sphinx output
 ###############

.gitmodules

@@ -143,7 +143,7 @@
 [submodule "ports/espressif/esp-idf"]
 	path = ports/espressif/esp-idf
 	url = https://github.com/adafruit/esp-idf.git
-	branch = circuitpython-v5.4.1
+	branch = circuitpython-v5.5.1
 [submodule "ports/espressif/esp-protocols"]
 	path = ports/espressif/esp-protocols
 	url = https://github.com/adafruit/esp-protocols.git
@@ -415,3 +415,9 @@
 [submodule "ports/espressif/microros-lib"]
 	path = ports/espressif/microros-lib
 	url = https://github.com/hierophect/microros-lib.git
+[submodule "frozen/Adafruit_CircuitPython_OPT4048"]
+	path = frozen/Adafruit_CircuitPython_OPT4048
+	url = https://github.com/adafruit/Adafruit_CircuitPython_OPT4048.git
+[submodule "frozen/CircuitPython_edupico2_paj7620"]
+	path = frozen/CircuitPython_edupico2_paj7620
+	url = https://github.com/CytronTechnologies/CircuitPython_edupico2_paj7620.git

.pre-commit-config.yaml

@@ -28,7 +28,7 @@ repos:
             lib/mbedtls_errors/generate_errors.diff
           )
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.2.4
+    rev: v2.4.1
     hooks:
       - id: codespell
         args: [-w]

BUILDING.md

@@ -64,6 +64,52 @@ If you aren't sure what boards exist, have a peek in the boards subdirectory of
 If you have a fast computer with many cores, consider adding `-j` to your build flags, such as `-j17` on
 a 6-core 12-thread machine.
 
+## Configuration
+
+Ports and boards are preconfigured, thus make knows how to build a specific
+board. Power users can change the configuration of a specific board or port,
+either by passing compile-time options to make, or by creating appropriate
+make include files.
+
+The configuration system is hierarchical. A higher level will typically only
+set an option that a lower level hasn't configured:
+
+* board configuration: `mpconfigport.mk`
+* pre-port user configuration: `user_pre_mpconfigport.mk`
+* port configuration: `mpconfigport.mk`
+* post-port user configuration: `user_post_mpconfigport.mk`
+* global configuration: `py/circuitpython_mpconfig.mk`
+
+The board configuration is within the board-directory, e.g.
+`ports/raspberrypi/boards/raspberry_pi_pico/`, the port configuration is
+in the port-directory, e.g. `ports/raspberrypi/`.
+
+Editing these configuration files is the way to go if you want to change
+the default behavior and ultimately create a pull-request. Otherwise,
+changes should go into one of the user configuration files.
+
+User specific configurations are optional and should be maintained out of
+tree. Passing `-I directory` tells make where to search for the additional
+configuration files. E.g. to speed up boots by removing the wait-time for
+the save-mode button press, you would:
+
+* create a directory: `mkdir -p ~/my_cp_config`
+* create the config file: `echo 'CIRCUITPY_SKIP_SAFE_MODE_WAIT=0' > ~/my_cp_config/user_pre_mpconfigport.mk`
+* run make with: `make -I ~/my_cp_config BOARD=raspberry_pi_pico`
+
+Besides the `user*mpconfigport.mk` files, there is another optional file
+named `user_post_circuitpy_defns.mk`. This file is included at the end
+and can be used to tweak compiler-definitions that are not covered by
+one of the compile time options `CIRCUITPY_*`.
+
+Example: to create a build for the Pico2-W with an integrated saves-partition,
+you would create a `user_post_circuitpy_defns.mk` with the following content:
+
+    $(info ===> processing user_post_circuitpy_defns.mk)
+    ifeq (${BOARD},raspberry_pi_pico2_w)
+    CFLAGS += -DCIRCUITPY_SAVES_PARTITION_SIZE=1048576
+    endif
+
 ## Testing
 
 If you are working on changes to the core language, you might find it useful to run the test suite.

devices/ble_hci/common-hal/_bleio/Adapter.c

@@ -29,7 +29,7 @@
 #include "shared-bindings/_bleio/ScanEntry.h"
 #include "shared-bindings/time/__init__.h"
 
-#if CIRCUITPY_OS_GETENV
+#if CIRCUITPY_SETTINGS_TOML
 #include "shared-bindings/os/__init__.h"
 #endif
 
@@ -261,7 +261,7 @@ static void _adapter_set_name(bleio_adapter_obj_t *self, mp_obj_str_t *name_obj)
 static void bleio_adapter_hci_init(bleio_adapter_obj_t *self) {
     mp_int_t name_len = 0;
 
-    #if CIRCUITPY_OS_GETENV
+    #if CIRCUITPY_SETTINGS_TOML
     mp_obj_t name = common_hal_os_getenv("CIRCUITPY_BLE_NAME", mp_const_none);
     if (name != mp_const_none) {
         mp_arg_validate_type_string(name, MP_QSTR_CIRCUITPY_BLE_NAME);

devices/ble_hci/common-hal/_bleio/PacketBuffer.h

@@ -28,4 +28,7 @@ typedef struct {
     bool packet_queued;
 } bleio_packet_buffer_obj_t;
 
+// Unused, but needed for _common_hal_bleio_packet_buffer_construct()
+typedef void *ble_event_handler_t;
+
 void bleio_packet_buffer_update(bleio_packet_buffer_obj_t *self, mp_buffer_info_t *bufinfo);

docs/environment.rst

@@ -187,7 +187,7 @@ Allows the entry of a display scaling factor used during the terminalio console
 The entered scaling factor only affects the terminalio console and has no impact on
 the UART, Web Workflow, BLE Workflow, etc consoles.
 
-This feature is not enabled on boards that the CIRCUITPY_OS_GETENV (os CIRCUIPTY_FULL_BUILD)
+This feature is not enabled on boards that the CIRCUITPY_SETTINGS_TOML (or CIRCUITPY_FULL_BUILD)
 flag has been set to 0. Currently this is primarily boards with limited flash including some
 of the Atmel_samd boards based on the SAMD21/M0 microprocessor.
 
@@ -197,7 +197,7 @@ Specifies a custom font file path to use for the terminalio console instead of t
 ``/fonts/terminal.lvfontbin``. This allows users to create and use custom fonts for the
 CircuitPython console.
 
-This feature requires both CIRCUITPY_OS_GETENV and CIRCUITPY_LVFONTIO to be enabled.
+This feature requires both CIRCUITPY_SETTINGS_TOML and CIRCUITPY_LVFONTIO to be enabled.
 
 Example:
 

docs/shared_bindings_matrix.py

@@ -84,8 +84,9 @@
     "keypad.Keys": "CIRCUITPY_KEYPAD_KEYS",
     "keypad.ShiftRegisterKeys": "CIRCUITPY_KEYPAD_SHIFTREGISTERKEYS",
     "keypad_demux.DemuxKeyMatrix": "CIRCUITPY_KEYPAD_DEMUX",
-    "os.getenv": "CIRCUITPY_OS_GETENV",
+    "os.getenv": "CIRCUITPY_SETTINGS_TOML",
     "select": "MICROPY_PY_SELECT_SELECT",
+    "supervisor.get_setting": "CIRCUITPY_SETTINGS_TOML",
     "sys": "CIRCUITPY_SYS",
     "terminalio": "CIRCUITPY_DISPLAYIO",
     "usb": "CIRCUITPY_PYUSB",

extmod/vfs_blockdev.c

@@ -63,7 +63,16 @@ void mp_vfs_blockdev_init(mp_vfs_blockdev_t *self, mp_obj_t bdev) {
     #endif
     #if CIRCUITPY_SDIOIO
     if (mp_obj_get_type(bdev) == &sdioio_SDCard_type) {
-        // TODO: Enable native blockdev for SDIO too.
+        self->flags |= MP_BLOCKDEV_FLAG_NATIVE | MP_BLOCKDEV_FLAG_HAVE_IOCTL;
+        self->readblocks[0] = mp_const_none;
+        self->readblocks[1] = bdev;
+        self->readblocks[2] = (mp_obj_t)sdioio_sdcard_readblocks; // native version
+        self->writeblocks[0] = mp_const_none;
+        self->writeblocks[1] = bdev;
+        self->writeblocks[2] = (mp_obj_t)sdioio_sdcard_writeblocks; // native version
+        self->u.ioctl[0] = mp_const_none;
+        self->u.ioctl[1] = bdev;
+        self->u.ioctl[2] = (mp_obj_t)sdioio_sdcard_ioctl; // native version
     }
     #endif
     if (self->u.ioctl[0] != MP_OBJ_NULL) {