feat: add ESP32-S31 Wi-Fi and Bluetooth targets

Author: fffonion

.github/workflows/ci.yml

@@ -28,7 +28,7 @@ jobs:
         run: cargo test --all-targets
         working-directory: app
       - name: Test embedded host-function ABI
-        run: cargo test --features esp32c3
+        run: cargo test --features esp32c3,wifi,bluetooth
         working-directory: app
       - name: Test VMBC partition packer
         run: |
@@ -44,19 +44,27 @@ jobs:
   esp32:
     name: ESP32-C3 factory firmware
     runs-on: ubuntu-latest
+    env:
+      PLATFORMIO_CORE_DIR: /mnt/TEMP/platformio/core
+      PIP_CACHE_DIR: /mnt/TEMP/platformio/pip-cache
     steps:
       - uses: actions/checkout@v4
         with:
           path: app
       - uses: dtolnay/rust-toolchain@1.94.1
         with:
           components: llvm-tools-preview
-          targets: riscv32imc-unknown-none-elf
+          targets: riscv32imc-unknown-none-elf,riscv32imafc-unknown-none-elf
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          python-version: "3.11"
       - name: Install PlatformIO
-        run: python -m pip install platformio==6.1.19
+        run: |
+          sudo mkdir -p /mnt/TEMP
+          sudo chown -R "$USER:$USER" /mnt/TEMP
+          python -m venv /mnt/TEMP/platformio/venv
+          /mnt/TEMP/platformio/venv/bin/pip install platformio==6.1.19
+          echo /mnt/TEMP/platformio/venv/bin >> "$GITHUB_PATH"
       - name: Build complete firmware
         run: pio run
         working-directory: app
@@ -67,32 +75,48 @@ jobs:
           grep 'micro-rustscript:gpio=low' /tmp/arduino.log
           grep 'rss:status=0' /tmp/arduino.log
         working-directory: app
+      - name: Install ESP-IDF preview toolchain under /mnt/TEMP
+        run: |
+          sudo mkdir -p /mnt/TEMP
+          sudo chown -R "$USER:$USER" /mnt/TEMP
+          ci/install-esp-idf-s31.sh
+        working-directory: app
+      - name: Build ESP32-S31 factory image
+        run: pio run -e esp32s31
+        working-directory: app
       - name: Verify firmware artifacts
         run: |
           test -s .pio/build/esp32-c3-devkitm-1/firmware.elf
           test -s .pio/build/esp32-c3-devkitm-1/firmware.bin
           test -s dist/micro-rustscript-esp32-c3.factory.bin
           test -s .pio/generated/rustscript.partition.bin
           test -s .pio/build/arduino/program
+          test -s dist/micro-rustscript-esp32-s31.factory.bin
+          test -s /mnt/TEMP/micro-rustscript-esp32s31/build/micro_rustscript_esp32s31.elf
+          cp /mnt/TEMP/micro-rustscript-esp32s31/build/micro_rustscript_esp32s31.elf \
+            dist/micro-rustscript-esp32-s31.elf
           nm -C .pio/build/esp32-c3-devkitm-1/firmware.elf | grep rustscript_run_vmbc
           nm -C .pio/build/esp32-c3-devkitm-1/firmware.elf | grep rustscript_dispatch_host
-          grep 'rustscript.*0x0b0000.*0x010000' partitions.csv
+          grep 'rustscript.*0x110000.*0x010000' partitions.csv
           stat --format='%n %s bytes' \
             .pio/build/esp32-c3-devkitm-1/firmware.elf \
             .pio/build/esp32-c3-devkitm-1/firmware.bin \
             dist/micro-rustscript-esp32-c3.factory.bin \
             .pio/generated/esp32-blinky.vmbc \
             .pio/generated/rustscript.partition.bin
-          test "$(stat --format=%s dist/micro-rustscript-esp32-c3.factory.bin)" -lt 1000000
+          test "$(stat --format=%s dist/micro-rustscript-esp32-c3.factory.bin)" -lt 1200000
         working-directory: app
       - uses: actions/upload-artifact@v4
         with:
-          name: micro-rustscript-esp32-c3
+          name: micro-rustscript-firmware
           path: |
             app/dist/micro-rustscript-esp32-c3.factory.bin
             app/.pio/build/esp32-c3-devkitm-1/firmware.elf
             app/.pio/generated/esp32-blinky.vmbc
             app/.pio/generated/rustscript.partition.bin
+            app/.pio/build/arduino/program
+            app/dist/micro-rustscript-esp32-s31.factory.bin
+            app/dist/micro-rustscript-esp32-s31.elf
             app/scripts/flash_vmbc.py
             app/scripts/vmbc_image.py
             app/scripts/repl_vmbc.py

.github/workflows/release-esp32.yml

@@ -1,4 +1,4 @@
-name: ESP32 firmware release
+name: Firmware release
 
 on:
   push:
@@ -11,47 +11,67 @@ permissions:
 jobs:
   release:
     runs-on: ubuntu-latest
+    env:
+      PLATFORMIO_CORE_DIR: /mnt/TEMP/platformio/core
+      PIP_CACHE_DIR: /mnt/TEMP/platformio/pip-cache
     steps:
       - uses: actions/checkout@v4
         with:
           path: app
       - uses: dtolnay/rust-toolchain@1.94.1
         with:
           components: llvm-tools-preview
-          targets: riscv32imc-unknown-none-elf
+          targets: riscv32imc-unknown-none-elf,riscv32imafc-unknown-none-elf
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          python-version: "3.11"
       - name: Install build tools
-        run: python -m pip install platformio==6.1.19
-      - name: Build factory image
-        run: pio run
+        run: |
+          sudo mkdir -p /mnt/TEMP
+          sudo chown -R "$USER:$USER" /mnt/TEMP
+          python -m venv /mnt/TEMP/platformio/venv
+          /mnt/TEMP/platformio/venv/bin/pip install platformio==6.1.19
+          echo /mnt/TEMP/platformio/venv/bin >> "$GITHUB_PATH"
+      - name: Install ESP-IDF preview toolchain under /mnt/TEMP
+        run: |
+          sudo mkdir -p /mnt/TEMP
+          sudo chown -R "$USER:$USER" /mnt/TEMP
+          ci/install-esp-idf-s31.sh
+        working-directory: app
+      - name: Build all release targets
+        run: pio run -e esp32-c3-devkitm-1 -e arduino -e esp32s31
         working-directory: app
       - name: Prepare release assets
         run: |
           cp .pio/build/esp32-c3-devkitm-1/firmware.elf dist/micro-rustscript-esp32-c3.elf
+          cp .pio/build/arduino/program dist/micro-rustscript-arduino
+          cp /mnt/TEMP/micro-rustscript-esp32s31/build/micro_rustscript_esp32s31.elf dist/micro-rustscript-esp32-s31.elf
           cp .pio/generated/esp32-blinky.vmbc dist/esp32-blinky.vmbc
           cp .pio/generated/rustscript.partition.bin dist/rustscript.partition.bin
           cp scripts/flash_vmbc.py scripts/vmbc_image.py scripts/repl_vmbc.py partitions.csv dist/
           cd dist
-          sha256sum micro-rustscript-esp32-c3.factory.bin micro-rustscript-esp32-c3.elf esp32-blinky.vmbc rustscript.partition.bin flash_vmbc.py vmbc_image.py repl_vmbc.py partitions.csv > SHA256SUMS
+          sha256sum micro-rustscript-esp32-c3.factory.bin micro-rustscript-esp32-c3.elf micro-rustscript-arduino micro-rustscript-esp32-s31.factory.bin micro-rustscript-esp32-s31.elf esp32-blinky.vmbc rustscript.partition.bin flash_vmbc.py vmbc_image.py repl_vmbc.py partitions.csv > SHA256SUMS
         working-directory: app
       - name: Publish GitHub Release
         uses: softprops/action-gh-release@v2
         with:
-          name: micro-rustscript ESP32-C3 ${{ github.ref_name }}
+          name: micro-rustscript firmware ${{ github.ref_name }}
           generate_release_notes: true
           body: |
-            Directly flashable ESP32-C3-DevKitM-1 image with namespaced GPIO, I2C, MCU, and serial framework APIs. Startup checks SD, then the dedicated VMBC partition, then opens the serial VMBC REPL.
+            Release images for ESP32-C3-DevKitM-1, Arduino host, and ESP32-S31. Supported ESP targets include optional ESP-IDF Wi-Fi and Bluetooth LE controller APIs.
 
             Flash at offset `0x0`:
             ```bash
             python -m esptool --chip esp32c3 erase_flash
             python -m esptool --chip esp32c3 write_flash 0x0 micro-rustscript-esp32-c3.factory.bin
+            python -m esptool --chip esp32s31 write_flash 0x0 micro-rustscript-esp32-s31.factory.bin
             ```
           files: |
             app/dist/micro-rustscript-esp32-c3.factory.bin
             app/dist/micro-rustscript-esp32-c3.elf
+            app/dist/micro-rustscript-arduino
+            app/dist/micro-rustscript-esp32-s31.factory.bin
+            app/dist/micro-rustscript-esp32-s31.elf
             app/dist/esp32-blinky.vmbc
             app/dist/rustscript.partition.bin
             app/dist/flash_vmbc.py

Cargo.toml

@@ -19,7 +19,10 @@ required-features = ["host"]
 default = ["host"]
 host = ["dep:vm", "vm/runtime"]
 esp32c3 = ["dep:pd_vm_nostd"]
+esp32s31 = ["dep:pd_vm_nostd"]
 arduino = ["dep:pd_vm_nostd"]
+wifi = []
+bluetooth = []
 
 [dependencies]
 pd_vm_nostd = { package = "pd-vm-nostd", git = "https://github.com/rustscript-lang/rustscript.git", rev = "ab04637a9b6192dd4f37b7e6abe4dde83f2fc710", version = "0.1.0", optional = true }

README.md

@@ -19,7 +19,7 @@ python -m esptool --chip esp32c3 write_flash 0x0 micro-rustscript-esp32-c3.facto
 The boot order is fixed:
 
 1. `/rustscript/main.vmbc` on an SD card connected with CS on GPIO 7.
-2. The dedicated 64 KiB `rustscript` flash partition at `0x0b0000`.
+2. The dedicated 64 KiB `rustscript` flash partition at `0x110000`.
 3. The serial VMBC REPL at 115200 baud.
 
 An absent, unreadable, or missing SD script automatically falls through to the flash partition.
@@ -36,6 +36,8 @@ use framework::gpio as gpio;
 use framework::i2c as i2c;
 use framework::mcu as mcu;
 use framework::serial as serial;
+use framework::wifi as wifi;
+use framework::bluetooth as bluetooth;
 
 let ok: bool = gpio::configure(8, 1);
 let written: bool = gpio::digital_write(8, true);
@@ -49,6 +51,10 @@ i2c::close();
 mcu::delay_ms(100);
 let free_heap: int = mcu::free_heap();
 serial::write_line("ready");
+
+let started: bool = wifi::connect("ssid", "password");
+let address: string = wifi::local_ip();
+let ble_ready: bool = bluetooth::enable();
 ```
 
 ### GPIO
@@ -78,6 +84,18 @@ serial::write_line("ready");
 `flash_size`, `random`, `restart`, and `deep_sleep_us`. `serial` exports `write_line`, `available`,
 and `read_bytes`.
 
+### Wi-Fi and Bluetooth LE
+
+The `wifi` API exports `connect`, `disconnect`, `is_connected`, `rssi`, and `local_ip`. `connect`
+returns whether ESP-IDF accepted the asynchronous connection request; poll `is_connected` before
+using `rssi` or `local_ip`. The `bluetooth` API exports BLE-controller lifecycle operations:
+`enable`, `disable`, and `is_enabled`. Both use ESP-IDF APIs and are registered only on supported
+ESP targets.
+
+`wifi` and `bluetooth` are independent Cargo/PlatformIO features. ESP release targets enable both
+by default through `custom_rust_features`; removing either feature also removes its ESP-IDF includes
+and RSS host exports. The host `arduino` target exports neither API.
+
 The private host ABI lives in `firmware/host_framework.cpp`; the public RSS modules live under
 `programs/framework/`. This keeps script-facing APIs namespaced while allowing the VM to dispatch a
 compact static function table.
@@ -132,6 +150,8 @@ export PATH=/mnt/TEMP/platformio/bin:$PATH
 
 pio run -e esp32-c3-devkitm-1
 pio run -e arduino
+ci/install-esp-idf-s31.sh
+pio run -e esp32s31
 .pio/build/arduino/program
 ```
 
@@ -144,19 +164,25 @@ Outputs:
 .pio/generated/esp32-blinky.vmbc
 .pio/generated/rustscript.partition.bin
 dist/micro-rustscript-esp32-c3.factory.bin
+dist/micro-rustscript-esp32-s31.factory.bin
 ```
 
 The factory image merges the ESP32 boot components, application, and default script partition. The
 release includes the factory image, ELF, VMBC, packed script partition, flash helpers, partition CSV,
 and SHA-256 checksums.
 
+The `esp32s31` target uses pinned ESP-IDF master preview support. ESP-IDF source, Python environment,
+toolchains, caches, Rust target artifacts, generated files, and build output are all kept under
+`/mnt/TEMP`; only source and build configuration live in the repository.
+
 The `arduino` environment links `pd-vm-nostd` through an Arduino-compatible GPIO, delay, serial,
 and allocator bridge. It runs the bridge and compiled VMBC program on the host before a board is
 connected. A successful simulation ends with `rss:status=0`.
 
 ## ESP32 image size
 
-The ESP32 partition table uses a 640 KiB factory application slot and a 64 KiB VMBC slot. OTA data
+The ESP32 partition table uses a 1 MiB factory application slot and a 64 KiB VMBC slot. OTA data
 and SPIFFS partitions are omitted because this image is flashed directly and script updates use the
-dedicated VMBC partition. The measured factory image is 722,391 bytes, down from 2,164,183 bytes
-(66.62%), while retaining SD boot, the flash script, and the serial VMBC REPL.
+dedicated VMBC partition. With `wifi` and `bluetooth` enabled, the measured factory image is
+1,115,607 bytes, down from 2,164,183 bytes (48.45%), while retaining SD boot, the flash script,
+and the serial VMBC REPL.

ci/install-esp-idf-s31.sh

@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+IDF_COMMIT=e88643bc619dff3c21b51705113bb488c9bc0990
+IDF_PATH=${ESP_IDF_PATH:-/mnt/TEMP/esp-idf}
+IDF_TOOLS_PATH=${IDF_TOOLS_PATH:-/mnt/TEMP/esp-idf-tools}
+
+export IDF_TOOLS_PATH
+export GIT_CONFIG_GLOBAL=/dev/null
+unset IDF_PYTHON_ENV_PATH
+mkdir -p /mnt/TEMP "$IDF_TOOLS_PATH"
+
+if [[ ! -d "$IDF_PATH/.git" ]]; then
+  git clone --depth 1 --branch master \
+    https://github.com/espressif/esp-idf.git "$IDF_PATH"
+fi
+
+git -C "$IDF_PATH" fetch --depth 1 origin "$IDF_COMMIT"
+git -C "$IDF_PATH" checkout --detach "$IDF_COMMIT"
+for attempt in 1 2 3; do
+  if git -C "$IDF_PATH" submodule update --init --recursive --depth 1; then
+    break
+  fi
+  if [[ "$attempt" == 3 ]]; then
+    exit 1
+  fi
+  sleep $((attempt * 5))
+done
+
+"$IDF_PATH/install.sh" esp32s31
+printf 'ESP-IDF %s installed under %s\n' "$IDF_COMMIT" /mnt/TEMP

esp32s31/CMakeLists.txt

@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 3.16)
+include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+project(micro_rustscript_esp32s31)

esp32s31/main/CMakeLists.txt

@@ -0,0 +1,15 @@
+idf_component_register(
+    SRCS "main.cpp"
+    INCLUDE_DIRS "." "../../include" "$ENV{RUSTSCRIPT_GENERATED_DIR}"
+    REQUIRES bt esp_driver_gpio esp_event esp_netif esp_timer esp_wifi nvs_flash spi_flash
+)
+
+if(RUSTSCRIPT_FEATURE_WIFI)
+    target_compile_definitions(${COMPONENT_LIB} PRIVATE RUSTSCRIPT_FEATURE_WIFI=1)
+endif()
+if(RUSTSCRIPT_FEATURE_BLUETOOTH)
+    target_compile_definitions(${COMPONENT_LIB} PRIVATE RUSTSCRIPT_FEATURE_BLUETOOTH=1)
+endif()
+
+add_prebuilt_library(rustscript_embedded "$ENV{RUSTSCRIPT_ARCHIVE}")
+target_link_libraries(${COMPONENT_LIB} PRIVATE rustscript_embedded)