Merge branch 'master' into feat(boards-nesso-n1)

Author: imliubo

.github/scripts/find_all_boards.sh

@@ -8,7 +8,7 @@ boards_list=$(grep '.tarch=' boards.txt)
 while read -r line; do
     board_name=$(echo "$line" | cut -d '.' -f1 | cut -d '#' -f1)
     # skip esp32c2 as we dont build libs for it
-    if [ "$board_name" == "esp32c2" ]; then
+    if [ "$board_name" == "esp32c2" ] || [ "$board_name" == "esp32c61" ]; then
         echo "Skipping 'espressif:esp32:$board_name'"
         continue
     fi

.github/scripts/tests_run.sh

@@ -92,7 +92,6 @@ function run_test {
             if [[ -f "$sketchdir/diagram.$target.json" ]]; then
                 extra_args+=("--wokwi-diagram" "$sketchdir/diagram.$target.json")
             fi
-
         elif [ $platform == "qemu" ]; then
             PATH=$HOME/qemu/bin:$PATH
             extra_args=("--embedded-services" "qemu" "--qemu-image-path" "$build_dir/$sketchname.ino.merged.bin")
@@ -111,15 +110,23 @@ function run_test {
 
         rm "$sketchdir"/diagram.json 2>/dev/null || true
 
+        local wifi_args=""
+        if [ -n "$wifi_ssid" ]; then
+            wifi_args="--wifi-ssid \"$wifi_ssid\""
+        fi
+        if [ -n "$wifi_password" ]; then
+            wifi_args="$wifi_args --wifi-password \"$wifi_password\""
+        fi
+
         result=0
-        printf "\033[95mpytest -s \"%s/test_%s.py\" --build-dir \"%s\" --junit-xml=\"%s\" -o junit_suite_name=%s_%s_%s_%s%s %s\033[0m\n" "$sketchdir" "$sketchname" "$build_dir" "$report_file" "$test_type" "$platform" "$target" "$sketchname" "$i" "${extra_args[*]@Q}"
-        bash -c "set +e; pytest -s \"$sketchdir/test_$sketchname.py\" --build-dir \"$build_dir\" --junit-xml=\"$report_file\" -o junit_suite_name=${test_type}_${platform}_${target}_${sketchname}${i} ${extra_args[*]@Q}; exit \$?" || result=$?
+        printf "\033[95mpytest -s \"%s/test_%s.py\" --build-dir \"%s\" --junit-xml=\"%s\" -o junit_suite_name=%s_%s_%s_%s%s %s %s\033[0m\n" "$sketchdir" "$sketchname" "$build_dir" "$report_file" "$test_type" "$platform" "$target" "$sketchname" "$i" "${extra_args[*]@Q}" "$wifi_args"
+        bash -c "set +e; pytest -s \"$sketchdir/test_$sketchname.py\" --build-dir \"$build_dir\" --junit-xml=\"$report_file\" -o junit_suite_name=${test_type}_${platform}_${target}_${sketchname}${i} ${extra_args[*]@Q} $wifi_args; exit \$?" || result=$?
         printf "\n"
         if [ $result -ne 0 ]; then
             result=0
             printf "\033[95mRetrying test: %s -- Config: %s\033[0m\n" "$sketchname" "$i"
-            printf "\033[95mpytest -s \"%s/test_%s.py\" --build-dir \"%s\" --junit-xml=\"%s\" -o junit_suite_name=%s_%s_%s_%s%s %s\033[0m\n" "$sketchdir" "$sketchname" "$build_dir" "$report_file" "$test_type" "$platform" "$target" "$sketchname" "$i" "${extra_args[*]@Q}"
-            bash -c "set +e; pytest -s \"$sketchdir/test_$sketchname.py\" --build-dir \"$build_dir\" --junit-xml=\"$report_file\" -o junit_suite_name=${test_type}_${platform}_${target}_${sketchname}${i} ${extra_args[*]@Q}; exit \$?" || result=$?
+            printf "\033[95mpytest -s \"%s/test_%s.py\" --build-dir \"%s\" --junit-xml=\"%s\" -o junit_suite_name=%s_%s_%s_%s%s %s %s\033[0m\n" "$sketchdir" "$sketchname" "$build_dir" "$report_file" "$test_type" "$platform" "$target" "$sketchname" "$i" "${extra_args[*]@Q}" "$wifi_args"
+            bash -c "set +e; pytest -s \"$sketchdir/test_$sketchname.py\" --build-dir \"$build_dir\" --junit-xml=\"$report_file\" -o junit_suite_name=${test_type}_${platform}_${target}_${sketchname}${i} ${extra_args[*]@Q} $wifi_args; exit \$?" || result=$?
             printf "\n"
             if [ $result -ne 0 ]; then
                 printf "\033[91mFailed test: %s -- Config: %s\033[0m\n\n" "$sketchname" "$i"
@@ -137,6 +144,8 @@ platform="hardware"
 chunk_run=0
 options=0
 erase=0
+wifi_ssid=""
+wifi_password=""
 
 while [ -n "$1" ]; do
     case $1 in
@@ -151,7 +160,6 @@ while [ -n "$1" ]; do
         platform="qemu"
         ;;
     -W )
-        shift
         if [[ -z $WOKWI_CLI_TOKEN ]]; then
             echo "Wokwi CLI token is not set"
             exit 1
@@ -188,6 +196,14 @@ while [ -n "$1" ]; do
         shift
         test_type=$1
         ;;
+    -wifi-ssid )
+        shift
+        wifi_ssid=$1
+        ;;
+    -wifi-password )
+        shift
+        wifi_password=$1
+        ;;
     * )
         break
         ;;

.github/workflows/build_component.yml

@@ -4,13 +4,13 @@ on:
   workflow_dispatch:
     inputs:
       idf_ver:
-        description: "IDF Versions"
-        default: "release-v5.3,release-v5.4,release-v5.5"
+        description: "Comma separated list of IDF branches to build"
+        default: "release-v5.5"
         type: "string"
         required: true
       idf_targets:
-        description: "IDF Targets"
-        default: "esp32,esp32s2,esp32s3,esp32c2,esp32c3,esp32c6,esp32h2,esp32p4"
+        description: "Comma separated list of IDF targets to build"
+        default: "esp32,esp32s2,esp32s3,esp32c2,esp32c3,esp32c5,esp32c6,esp32c61,esp32h2,esp32p4"
         type: "string"
         required: false
   push:
@@ -37,6 +37,7 @@ on:
       - "variants/esp32c3/**"
       - "variants/esp32c5/**"
       - "variants/esp32c6/**"
+      - "variants/esp32c61/**"
       - "variants/esp32h2/**"
       - "variants/esp32p4/**"
       - "variants/esp32s2/**"
@@ -125,7 +126,7 @@ jobs:
                 echo "esp32,esp32s2,esp32s3,esp32c2,esp32c3,esp32c6,esp32h2,esp32p4"
                 ;;
               "release-v5.5")
-                echo "esp32,esp32s2,esp32s3,esp32c2,esp32c3,esp32c5,esp32c6,esp32h2,esp32p4"
+                echo "esp32,esp32s2,esp32s3,esp32c2,esp32c3,esp32c5,esp32c6,esp32c61,esp32h2,esp32p4"
                 ;;
               *)
                 echo ""

.github/workflows/release.yml

@@ -68,7 +68,7 @@ jobs:
           mkdir -p ${{ github.workspace }}/hosted
 
           # Copy hosted binaries to proper directory without overwriting existing files
-          cp -n ${{ github.workspace }}/hosted-latest/*.bin ${{ github.workspace }}/hosted/
+          cp --update=none ${{ github.workspace }}/hosted-latest/*.bin ${{ github.workspace }}/hosted/
 
           # Commit the changes
           git config user.name "github-actions[bot]"

.github/workflows/tests_hw_wokwi.yml

@@ -361,7 +361,14 @@ jobs:
           download_artifacts: 'true'
           download_artifacts_on_failure: 'true'
           download_path: './gitlab-artifacts'
-          variables: '{"TEST_TYPES":"${{ steps.prepare-variables.outputs.test_types }}","TEST_CHIPS":"${{ steps.prepare-variables.outputs.test_chips }}","PIPELINE_ID":"${{ env.id }}","BINARIES_RUN_ID":"${{ github.event.workflow_run.id }}","GITHUB_REPOSITORY":"${{ github.repository }}"}'
+          variables: >-
+            {
+              "TEST_TYPES":"${{ steps.prepare-variables.outputs.test_types }}",
+              "TEST_CHIPS":"${{ steps.prepare-variables.outputs.test_chips }}",
+              "PIPELINE_ID":"${{ env.id }}",
+              "BINARIES_RUN_ID":"${{ github.event.workflow_run.id }}",
+              "GITHUB_REPOSITORY":"${{ github.repository }}"
+            }
 
       - name: Process Downloaded Artifacts
         if: ${{ always() && steps.check-tests.outputs.enabled == 'true' }}
@@ -536,8 +543,11 @@ jobs:
         if: ${{ steps.check-tests.outputs.enabled == 'true' }}
         env:
           WOKWI_CLI_TOKEN: ${{ secrets.WOKWI_CLI_TOKEN }}
+          WOKWI_WIFI_SSID: "Wokwi-GUEST"
+          # The Wokwi Wi-Fi does not have a password, so we use an empty string
+          WOKWI_WIFI_PASSWORD: ""
         run: |
-          bash .github/scripts/tests_run.sh -c -type ${{ matrix.type }} -t ${{ matrix.chip }} -i 0 -m 1 -W
+          bash .github/scripts/tests_run.sh -c -type "${{ matrix.type }}" -t "${{ matrix.chip }}" -i 0 -m 1 -W -wifi-ssid "${{ env.WOKWI_WIFI_SSID }}" -wifi-password "${{ env.WOKWI_WIFI_PASSWORD }}"
 
       - name: Upload ${{ matrix.chip }} ${{ matrix.type }} Wokwi results as cache
         uses: actions/cache/save@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3

.gitlab/workflows/hw_test_template.yml

@@ -12,13 +12,13 @@ include:
 hw-test-template:
   stage: test
   image: python:3.12-bookworm
+  timeout: 5h
 
   rules:
     - when: on_success
 
   variables:
     RUNNER_SCRIPT_TIMEOUT: 4h
-    RUNNER_AFTER_SCRIPT_TIMEOUT: 2h
     DEBIAN_FRONTEND: "noninteractive"
     TEST_TYPE: $TEST_TYPE
     TEST_CHIP: $TEST_CHIP
@@ -50,7 +50,7 @@ hw-test-template:
         [ -z "$d" ] && continue;
         sketch=$(basename "$d");
         echo Running $sketch in $d;
-        bash .github/scripts/tests_run.sh -t $TEST_CHIP -s $sketch -e || rc=$?;
+        bash .github/scripts/tests_run.sh -t "$TEST_CHIP" -s "$sketch" -e -wifi-ssid "$RUNNER_WIFI_SSID" -wifi-password "$RUNNER_WIFI_PASSWORD" || rc=$?;
       done <<< "$TEST_LIST"; exit $rc
 
   artifacts:

README.md

@@ -76,7 +76,7 @@ Here are the ESP32 series supported by the Arduino-ESP32 project:
 | ESP32-S3 |     Yes    |       Yes       | [ESP32-S3](https://www.espressif.com/sites/default/files/documentation/esp32-s3_datasheet_en.pdf) |
 
 > [!NOTE]
-> ESP32-C2 is also supported by Arduino-ESP32 but requires using Arduino as an ESP-IDF component or rebuilding the static libraries.
+> ESP32-C2 and ESP32-C61 are also supported by Arduino-ESP32 but require using Arduino as an ESP-IDF component or rebuilding the static libraries.
 > For more information, see the [Arduino as an ESP-IDF component documentation](https://docs.espressif.com/projects/arduino-esp32/en/latest/esp-idf_component.html) or the
 > [Lib Builder documentation](https://docs.espressif.com/projects/arduino-esp32/en/latest/lib_builder.html), respectively.