Arduino core 3.1.2

Author: Jason2866

.github/workflows/examples.yml

@@ -1,4 +1,4 @@
-name: Examples
+name: CI Examples
 
 on:
   workflow_dispatch:      # Manually start a workflow
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04, windows-2022, macos-14]
+        os: [ubuntu-24.04, windows-2022, macos-15]
         example:
           - "examples/arduino-blink"
           - "examples/arduino-rmt-blink"
@@ -23,6 +23,7 @@ jobs:
           - "examples/tasmota"
           - "examples/espidf-arduino-h2zero-BLE_scan"
           #- "examples/espidf-arduino-matter-light"
+          - "examples/arduino-matter-light"
           - "examples/espidf-arduino-blink"
           - "examples/espidf-arduino-littlefs"
           - "examples/espidf-blink"
@@ -44,37 +45,16 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.11"
-      - name: Install Windows dependencies
+          python-version: "3.13"
+      - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
           pip install wheel
-          pip install -U https://github.com/platformio/platformio/archive/develop.zip
+          pip install -U https://github.com/pioarduino/platformio-core/archive/refs/tags/v6.1.17b2.zip
           pio pkg install --global --platform file://.
-        if: "matrix.os == 'windows-2022'"
-        env:
-          PLATFORMIO_CORE_DIR: C:\plat
-          PLATFORMIO_PACKAGES_DIR: C:\plat\pack
-          PLATFORMIO_PLATFORMS_DIR: C:\plat\plat
-      - name: Build Windows examples
-        run: pio run -d ${{ matrix.example }}
-        if: "matrix.example != 'examples/tasmota' && matrix.os == 'windows-2022'"
-        env:
-          PLATFORMIO_CORE_DIR: C:\plat
-          PLATFORMIO_PACKAGES_DIR: C:\plat\pack
-          PLATFORMIO_PLATFORMS_DIR: C:\plat\plat
-      - name: Install Ubuntu Mac dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install wheel
-          pip install -U https://github.com/platformio/platformio/archive/develop.zip
-          pio pkg install --global --platform file://.
-        if: "matrix.os != 'windows-2022'"
       - name: git clone Tasmota and add to examples
         run: |
           git clone -b development --depth 1 https://github.com/arendst/Tasmota.git examples/tasmota
           cp examples/tasmota_platformio_override.ini examples/tasmota/platformio_override.ini
-        if: "matrix.example == 'examples/tasmota' && matrix.os != 'windows-2022'"
-      - name: Build Ubuntu Mac examples
+      - name: Build examples
         run: pio run -d ${{ matrix.example }}
-        if: "matrix.os != 'windows-2022'"

README.md

@@ -6,7 +6,7 @@
 
 ESP32 is a series of low-cost, low-power system on a chip microcontrollers with integrated Wi-Fi and Bluetooth. ESP32 integrates an antenna switch, RF balun, power amplifier, low-noise receive amplifier, filters, and power management modules.
 
-* Issues with boards (wrong / missing). All issues caused from boards will **not** be fixed from the maintainer(s). A PR needs to be provided against branch `develop` to solve.
+* Issues with boards (wrong / missing). All issues caused from boards will not be fixed from the maintainer(s). A PR needs to be provided against branch `develop` to solve.
 
 ## IDE Preparation
 
@@ -19,8 +19,8 @@ ESP32 is a series of low-cost, low-power system on a chip microcontrollers with
 1. Setup new VSCode pioarduino project.
 1. Configure a platform option in platformio.ini file:
 
-### Stable version
-currently espressif Arduino 3.1.1 and IDF 5.3.2.241224
+### Stable Arduino
+currently espressif Arduino 3.1.2 and IDF 5.3.2.250210
 
 ```ini
 [env:stable]
@@ -29,7 +29,7 @@ board = ...
 ...
 ```
 
-### Development version
+### Development Arduino
 espressif Arduino repo branch master and latest compiled Arduino libs
 
 ```ini
@@ -39,4 +39,21 @@ board = ...
 ...
 ```
 
+### ESP32-solo1 and ESP32-C2 Arduino support (with pioarduino only feature: *Hybrid compile*)
+Example configuration:
+
+```ini
+[env:esp32solo1]
+platform = https://github.com/pioarduino/platform-espressif32.git#develop
+framework = arduino
+board = esp32-solo1
+monitor_speed = 115200
+
+[env:esp32-c2-devkitm-1]
+platform = https://github.com/pioarduino/platform-espressif32.git#develop
+framework = arduino
+board = esp32-c2-devkitm-1
+monitor_speed = 115200
+```
+
 Looking for sponsor button? There is none. If you want to donate, please spend a litte to a charity organization.

boards/lolin_s3_mini.json

@@ -1,18 +1,18 @@
 {
     "build": {
       "arduino": {
-        "ldscript": "esp32s3_out.ld",
         "memory_type": "qio_qspi"
       },
       "core": "esp32",
       "extra_flags": [
         "-DBOARD_HAS_PSRAM",
         "-DARDUINO_LOLIN_S3_MINI",
-        "-DARDUINO_USB_MODE=1"
+        "-DARDUINO_USB_CDC_ON_BOOT=1"
       ],
       "f_cpu": "240000000L",
       "f_flash": "80000000L",
       "flash_mode": "qio",
+      "psram_type" : "qio",
       "hwids": [
         [
           "0x303A",

boards/lolin_s3_mini_pro.json

@@ -0,0 +1,47 @@
+{
+    "build": {
+      "arduino": {
+        "memory_type": "qio_qspi"
+      },
+      "core": "esp32",
+      "extra_flags": [
+        "-DBOARD_HAS_PSRAM",
+        "-DARDUINO_LOLIN_S3_MINI_PRO",
+        "-DARDUINO_USB_CDC_ON_BOOT=1"
+      ],
+      "f_cpu": "240000000L",
+      "f_flash": "80000000L",
+      "flash_mode": "qio",
+      "psram_type" : "qio",
+      "hwids": [
+        [
+          "0x303A",
+          "0x8167"
+        ]
+      ],
+      "mcu": "esp32s3",
+      "variant": "lolin_s3_mini_pro"
+    },
+    "connectivity": [
+      "bluetooth",
+      "wifi"
+    ],
+    "debug": {
+      "openocd_target": "esp32s3.cfg"
+    },
+    "frameworks": [
+      "arduino",
+      "espidf"
+    ],
+    "name": "WEMOS LOLIN S3 Mini Pro",
+    "upload": {
+      "flash_size": "4MB",
+      "maximum_ram_size": 327680,
+      "maximum_size": 4194304,
+      "require_upload_port": true,
+      "speed": 460800
+    },
+    "url": "https://www.wemos.cc/en/latest/s3/index.html",
+    "vendor": "WEMOS"
+}
+  

boards/waveshare_esp32s3_touch_lcd_128.json

@@ -0,0 +1,52 @@
+{
+    "build": {
+      "arduino":{
+        "memory_type": "qio_qspi",
+        "partitions": "default.csv"
+      },
+      "core": "esp32",
+      "extra_flags": [
+        "-DARDUINO_WAVESHARE_ESP32S3_TOUCH_LCD_128",
+        "-DARDUINO_USB_MODE=1",
+        "-DARDUINO_RUNNING_CORE=1",
+        "-DARDUINO_EVENT_RUNNING_CORE=1",
+        "-DBOARD_HAS_PSRAM"
+      ],
+      "f_cpu": "240000000L",
+      "f_flash": "80000000L",
+      "flash_mode": "qio",
+      "hwids": [
+        [
+          "0x1a86",
+          "0x55d3"
+        ]
+      ],
+      "mcu": "esp32s3",
+      "variant": "waveshare_esp32s3_touch_lcd_128"
+    },
+    "connectivity": [
+      "bluetooth",
+      "wifi"
+    ],
+    "debug": {
+      "default_tool": "esp-builtin",
+      "onboard_tools": [
+        "esp-builtin"
+      ],
+      "openocd_target": "esp32s3.cfg"
+    },
+    "frameworks": [
+      "arduino",
+      "espidf"
+    ],
+    "name": "Waveshare ESP32-S3-Touch-LCD-1.28 (16 MB QD, 2MB PSRAM)",
+    "upload": {
+      "flash_size": "16MB",
+      "maximum_ram_size": 327680,
+      "maximum_size": 16777216,
+      "require_upload_port": true,
+      "speed": 921600
+    },
+    "url": "https://www.waveshare.com/wiki/ESP32-S3-Touch-LCD-1.28",
+    "vendor": "Waveshare"
+  }

builder/frameworks/arduino.py

@@ -26,10 +26,12 @@
 import json
 import semantic_version
 import os
+import sys
 import shutil
 from os.path import join
 
 from SCons.Script import COMMAND_LINE_TARGETS, DefaultEnvironment, SConscript
+from platformio import fs
 from platformio.package.version import pepver_to_semver
 from platformio.project.config import ProjectConfig
 from platformio.package.manager.tool import ToolPackageManager
@@ -43,6 +45,7 @@
 board_sdkconfig = board.get("espidf.custom_sdkconfig", "")
 entry_custom_sdkconfig = "\n"
 flag_custom_sdkconfig = False
+IS_WINDOWS = sys.platform.startswith("win")
 
 if config.has_option("env:"+env["PIOENV"], "custom_sdkconfig"):
     entry_custom_sdkconfig = env.GetProjectOption("custom_sdkconfig")
@@ -55,6 +58,8 @@
 framework_reinstall = False
 flag_any_custom_sdkconfig = False
 
+FRAMEWORK_LIB_DIR = platform.get_package_dir("framework-arduinoespressif32-libs")
+
 SConscript("_embed_files.py", exports="env")
 
 flag_any_custom_sdkconfig = os.path.exists(join(platform.get_package_dir("framework-arduinoespressif32-libs"),"sdkconfig"))
@@ -171,11 +176,65 @@ def check_reinstall_frwrk():
         framework_reinstall = True
     return framework_reinstall
 
+
+FRAMEWORK_SDK_DIR = fs.to_unix_path(
+    os.path.join(
+        FRAMEWORK_LIB_DIR,
+        mcu,
+        "include",
+    )
+)
+
+IS_INTEGRATION_DUMP = env.IsIntegrationDump()
+
+
+def is_framework_subfolder(potential_subfolder):
+    if not os.path.isabs(potential_subfolder):
+        return False
+    if (
+        os.path.splitdrive(FRAMEWORK_SDK_DIR)[0]
+        != os.path.splitdrive(potential_subfolder)[0]
+    ):
+        return False
+    return os.path.commonpath([FRAMEWORK_SDK_DIR]) == os.path.commonpath(
+        [FRAMEWORK_SDK_DIR, potential_subfolder]
+    )
+
+
+def shorthen_includes(env, node):
+    if IS_INTEGRATION_DUMP:
+        # Don't shorten include paths for IDE integrations
+        return node
+
+    includes = [fs.to_unix_path(inc) for inc in env.get("CPPPATH", [])]
+    shortened_includes = []
+    generic_includes = []
+    for inc in includes:
+        if is_framework_subfolder(inc):
+            shortened_includes.append(
+                "-iwithprefix/"
+                + fs.to_unix_path(os.path.relpath(inc, FRAMEWORK_SDK_DIR))
+            )
+        else:
+            generic_includes.append(inc)
+
+    return env.Object(
+        node,
+        CPPPATH=generic_includes,
+        CCFLAGS=env["CCFLAGS"]
+        + ["-iprefix", FRAMEWORK_SDK_DIR]
+        + shortened_includes,
+        ASFLAGS=env["ASFLAGS"]
+        + ["-iprefix", FRAMEWORK_SDK_DIR]
+        + shortened_includes,
+    )
+
 def call_compile_libs():
     if mcu == "esp32c2":
         ARDUINO_FRMWRK_C2_LIB_DIR = join(platform.get_package_dir("framework-arduinoespressif32-libs"),mcu)
-        ARDUINO_C2_DIR = join(platform.get_package_dir("framework-arduino-c2-skeleton-lib"),mcu)
-        shutil.copytree(ARDUINO_C2_DIR, ARDUINO_FRMWRK_C2_LIB_DIR, dirs_exist_ok=True)
+        if not os.path.exists(ARDUINO_FRMWRK_C2_LIB_DIR):
+            ARDUINO_C2_DIR = join(platform.get_package_dir("framework-arduino-c2-skeleton-lib"),mcu)
+            shutil.copytree(ARDUINO_C2_DIR, ARDUINO_FRMWRK_C2_LIB_DIR, dirs_exist_ok=True)
     print("*** Compile Arduino IDF libs for %s ***" % env["PIOENV"])
     SConscript("espidf.py")
 
@@ -192,6 +251,8 @@ def call_compile_libs():
     call_compile_libs()
 
 if "arduino" in env.subst("$PIOFRAMEWORK") and "espidf" not in env.subst("$PIOFRAMEWORK") and env.subst("$ARDUINO_LIB_COMPILE_FLAG") in ("Inactive", "True"):
+    if IS_WINDOWS:
+        env.AddBuildMiddleware(shorthen_includes)
     if os.path.exists(join(platform.get_package_dir(
             "framework-arduinoespressif32"), "tools", "platformio-build.py")):
         PIO_BUILD = "platformio-build.py"