From 4ca635a3b6234a5dca5dfc3f44647235666b431d Mon Sep 17 00:00:00 2001
From: Lucas Saavedra Vaz <32426024+lucasssvaz@users.noreply.github.com>
Date: Sat, 19 Oct 2024 06:00:48 -0300
Subject: [PATCH 1/9] ci(json): Add requires_any field and use QIO by default
 to match IDE (#10472)

* ci(FQBN): Use QIO as default as DIO can be used on demand now

* fix(indentation): Fix default indentation for bash files

* fix(compilation): Make errors appear on CI fail

* ci(json): Add requires_any field to JSON and fix comparison
---
 .editorconfig                               |  2 +-
 .github/scripts/install-platformio-esp32.sh | 42 +++++++++--
 .github/scripts/sketch_utils.sh             | 79 ++++++++++++++++-----
 .github/scripts/tests_run.sh                | 23 +++++-
 docs/en/contributing.rst                    | 16 +++--
 5 files changed, 130 insertions(+), 32 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index eda8544321b..e22936cb1fe 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -18,7 +18,7 @@ indent_size = 2
 indent_style = space
 
 [*.{bash,sh}]
-indent_size = 2
+indent_size = 4
 indent_style = space
 
 [*.{c,cc,cp,cpp,cxx,h,hh,hpp,hxx,ii,inl,ino,ixx,pde,tpl,tpp,txx}]
diff --git a/.github/scripts/install-platformio-esp32.sh b/.github/scripts/install-platformio-esp32.sh
index a9aab496e19..5091ea69353 100755
--- a/.github/scripts/install-platformio-esp32.sh
+++ b/.github/scripts/install-platformio-esp32.sh
@@ -96,9 +96,9 @@ function count_sketches(){ # count_sketches <examples-path>
                 continue
             fi
 
-            # Check if the sketch requires any configuration options
+            # Check if the sketch requires any configuration options (AND)
             requirements=$(jq -r '.requires[]? // empty' $sketchdir/ci.json)
-            if [[ "$requirements" != "null" ]] || [[ "$requirements" != "" ]]; then
+            if [[ "$requirements" != "null" && "$requirements" != "" ]]; then
                 for requirement in $requirements; do
                     requirement=$(echo $requirement | xargs)
                     found_line=$(grep -E "^$requirement" "$SDKCONFIG_DIR/esp32/sdkconfig")
@@ -107,6 +107,23 @@ function count_sketches(){ # count_sketches <examples-path>
                     fi
                 done
             fi
+
+            # Check if the sketch requires any configuration options (OR)
+            requirements_or=$(jq -r '.requires_any[]? // empty' $sketchdir/ci.json)
+            if [[ "$requirements_or" != "null" && "$requirements_or" != "" ]]; then
+                found=false
+                for requirement in $requirements_or; do
+                    requirement=$(echo $requirement | xargs)
+                    found_line=$(grep -E "^$requirement" "$SDKCONFIG_DIR/esp32/sdkconfig")
+                    if [[ "$found_line" != "" ]]; then
+                        found=true
+                        break
+                    fi
+                done
+                if [[ "$found" == "false" ]]; then
+                    continue
+                fi
+            fi
         fi
 
         echo $sketch >> sketches.txt
@@ -187,9 +204,9 @@ function build_pio_sketches(){ # build_pio_sketches <board> <options> <examples-
                 continue
             fi
 
-            # Check if the sketch requires any configuration options
+            # Check if the sketch requires any configuration options (AND)
             requirements=$(jq -r '.requires[]? // empty' $sketchdir/ci.json)
-            if [[ "$requirements" != "null" ]] || [[ "$requirements" != "" ]]; then
+            if [[ "$requirements" != "null" && "$requirements" != "" ]]; then
                 for requirement in $requirements; do
                     requirement=$(echo $requirement | xargs)
                     found_line=$(grep -E "^$requirement" "$SDKCONFIG_DIR/esp32/sdkconfig")
@@ -198,6 +215,23 @@ function build_pio_sketches(){ # build_pio_sketches <board> <options> <examples-
                     fi
                 done
             fi
+
+            # Check if the sketch requires any configuration options (OR)
+            requirements_or=$(jq -r '.requires_any[]? // empty' $sketchdir/ci.json)
+            if [[ "$requirements_or" != "null" && "$requirements_or" != "" ]]; then
+                found=false
+                for requirement in $requirements_or; do
+                    requirement=$(echo $requirement | xargs)
+                    found_line=$(grep -E "^$requirement" "$SDKCONFIG_DIR/esp32/sdkconfig")
+                    if [[ "$found_line" != "" ]]; then
+                        found=true
+                        break
+                    fi
+                done
+                if [[ "$found" == "false" ]]; then
+                    continue
+                fi
+            fi
         fi
 
         sketchnum=$(($sketchnum + 1))
diff --git a/.github/scripts/sketch_utils.sh b/.github/scripts/sketch_utils.sh
index 47d9271e171..30ee9239e82 100755
--- a/.github/scripts/sketch_utils.sh
+++ b/.github/scripts/sketch_utils.sh
@@ -98,34 +98,42 @@ function build_sketch(){ # build_sketch <ide_path> <user_path> <path-to-ino> [ex
 
             # Default FQBN options if none were passed in the command line.
 
-            esp32_opts="PSRAM=enabled,FlashMode=dio${fqbn_append:+,$fqbn_append}"
-            esp32s2_opts="PSRAM=enabled,FlashMode=dio${fqbn_append:+,$fqbn_append}"
-            esp32s3_opts="PSRAM=opi,USBMode=default,FlashMode=dio${fqbn_append:+,$fqbn_append}"
-            esp32c3_opts="FlashMode=dio${fqbn_append:+,$fqbn_append}"
-            esp32c6_opts="FlashMode=dio${fqbn_append:+,$fqbn_append}"
-            esp32h2_opts="FlashMode=dio${fqbn_append:+,$fqbn_append}"
+            esp32_opts="PSRAM=enabled${fqbn_append:+,$fqbn_append}"
+            esp32s2_opts="PSRAM=enabled${fqbn_append:+,$fqbn_append}"
+            esp32s3_opts="PSRAM=opi,USBMode=default${fqbn_append:+,$fqbn_append}"
+            esp32c3_opts="$fqbn_append"
+            esp32c6_opts="$fqbn_append"
+            esp32h2_opts="$fqbn_append"
 
             # Select the common part of the FQBN based on the target.  The rest will be
             # appended depending on the passed options.
 
+            opt=""
+
             case "$target" in
                 "esp32")
-                    fqbn="espressif:esp32:esp32:${options:-$esp32_opts}"
+                    [ -n "${options:-$esp32_opts}" ] && opt=":${options:-$esp32_opts}"
+                    fqbn="espressif:esp32:esp32$opt"
                 ;;
                 "esp32s2")
-                    fqbn="espressif:esp32:esp32s2:${options:-$esp32s2_opts}"
+                    [ -n "${options:-$esp32s2_opts}" ] && opt=":${options:-$esp32s2_opts}"
+                    fqbn="espressif:esp32:esp32s2$opt"
                 ;;
                 "esp32c3")
-                    fqbn="espressif:esp32:esp32c3:${options:-$esp32c3_opts}"
+                    [ -n "${options:-$esp32c3_opts}" ] && opt=":${options:-$esp32c3_opts}"
+                    fqbn="espressif:esp32:esp32c3$opt"
                 ;;
                 "esp32s3")
-                    fqbn="espressif:esp32:esp32s3:${options:-$esp32s3_opts}"
+                    [ -n "${options:-$esp32s3_opts}" ] && opt=":${options:-$esp32s3_opts}"
+                    fqbn="espressif:esp32:esp32s3$opt"
                 ;;
                 "esp32c6")
-                    fqbn="espressif:esp32:esp32c6:${options:-$esp32c6_opts}"
+                    [ -n "${options:-$esp32c6_opts}" ] && opt=":${options:-$esp32c6_opts}"
+                    fqbn="espressif:esp32:esp32c6$opt"
                 ;;
                 "esp32h2")
-                    fqbn="espressif:esp32:esp32h2:${options:-$esp32h2_opts}"
+                    [ -n "${options:-$esp32h2_opts}" ] && opt=":${options:-$esp32h2_opts}"
+                    fqbn="espressif:esp32:esp32h2$opt"
                 ;;
             esac
 
@@ -163,9 +171,9 @@ function build_sketch(){ # build_sketch <ide_path> <user_path> <path-to-ino> [ex
             exit 0
         fi
 
-        # Check if the sketch requires any configuration options
+        # Check if the sketch requires any configuration options (AND)
         requirements=$(jq -r '.requires[]? // empty' $sketchdir/ci.json)
-        if [[ "$requirements" != "null" ]] || [[ "$requirements" != "" ]]; then
+        if [[ "$requirements" != "null" && "$requirements" != "" ]]; then
             for requirement in $requirements; do
                 requirement=$(echo $requirement | xargs)
                 found_line=$(grep -E "^$requirement" "$SDKCONFIG_DIR/$target/sdkconfig")
@@ -175,6 +183,24 @@ function build_sketch(){ # build_sketch <ide_path> <user_path> <path-to-ino> [ex
                 fi
             done
         fi
+
+        # Check if the sketch excludes any configuration options (OR)
+        requirements_or=$(jq -r '.requires_any[]? // empty' $sketchdir/ci.json)
+        if [[ "$requirements_or" != "null" && "$requirements_or" != "" ]]; then
+            found=false
+            for requirement in $requirements_or; do
+                requirement=$(echo $requirement | xargs)
+                found_line=$(grep -E "^$requirement" "$SDKCONFIG_DIR/$target/sdkconfig")
+                if [[ "$found_line" != "" ]]; then
+                    found=true
+                    break
+                fi
+            done
+            if [[ "$found" == "false" ]]; then
+                echo "Target $target meets none of the requirements in requires_any for $sketchname. Skipping."
+                exit 0
+            fi
+        fi
     fi
 
     ARDUINO_CACHE_DIR="$HOME/.arduino/cache.tmp"
@@ -213,9 +239,9 @@ function build_sketch(){ # build_sketch <ide_path> <user_path> <path-to-ino> [ex
                 --build-cache-path "$ARDUINO_CACHE_DIR" \
                 --build-path "$build_dir" \
                 $xtra_opts "${sketchdir}" \
-                > $output_file
+                2>&1 | tee $output_file
 
-            exit_status=$?
+            exit_status=${PIPESTATUS[0]}
             if [ $exit_status -ne 0 ]; then
                 echo "ERROR: Compilation failed with error code $exit_status"
                 exit $exit_status
@@ -322,9 +348,9 @@ function count_sketches(){ # count_sketches <path> [target] [file] [ignore-requi
             fi
 
             if [ "$ignore_requirements" != "1" ]; then
-                # Check if the sketch requires any configuration options
+                # Check if the sketch requires any configuration options (AND)
                 requirements=$(jq -r '.requires[]? // empty' $sketchdir/ci.json)
-                if [[ "$requirements" != "null" ]] || [[ "$requirements" != "" ]]; then
+                if [[ "$requirements" != "null" && "$requirements" != "" ]]; then
                     for requirement in $requirements; do
                         requirement=$(echo $requirement | xargs)
                         found_line=$(grep -E "^$requirement" $SDKCONFIG_DIR/$target/sdkconfig)
@@ -333,6 +359,23 @@ function count_sketches(){ # count_sketches <path> [target] [file] [ignore-requi
                         fi
                     done
                 fi
+
+                # Check if the sketch excludes any configuration options (OR)
+                requirements_or=$(jq -r '.requires_any[]? // empty' $sketchdir/ci.json)
+                if [[ "$requirements_or" != "null" && "$requirements_or" != "" ]]; then
+                    found=false
+                    for requirement in $requirements_or; do
+                        requirement=$(echo $requirement | xargs)
+                        found_line=$(grep -E "^$requirement" $SDKCONFIG_DIR/$target/sdkconfig)
+                        if [[ "$found_line" != "" ]]; then
+                            found=true
+                            break
+                        fi
+                    done
+                    if [[ "$found" == "false" ]]; then
+                        continue 2
+                    fi
+                fi
             fi
         fi
         echo $sketch >> sketches.txt
diff --git a/.github/scripts/tests_run.sh b/.github/scripts/tests_run.sh
index 63ab2ca6dad..f4a9b9d6dd4 100755
--- a/.github/scripts/tests_run.sh
+++ b/.github/scripts/tests_run.sh
@@ -36,9 +36,9 @@ function run_test() {
             return 0
         fi
 
-        # Check if the sketch requires any configuration options
+        # Check if the sketch requires any configuration options (AND)
         requirements=$(jq -r '.requires[]? // empty' $sketchdir/ci.json)
-        if [[ "$requirements" != "null" ]] || [[ "$requirements" != "" ]]; then
+        if [[ "$requirements" != "null" && "$requirements" != "" ]]; then
             for requirement in $requirements; do
                 requirement=$(echo $requirement | xargs)
                 found_line=$(grep -E "^$requirement" "$SDKCONFIG_PATH")
@@ -49,6 +49,25 @@ function run_test() {
                 fi
             done
         fi
+
+        # Check if the sketch requires any configuration options (OR)
+        requirements_or=$(jq -r '.requires_any[]? // empty' $sketchdir/ci.json)
+        if [[ "$requirements_or" != "null" && "$requirements_or" != "" ]]; then
+            found=false
+            for requirement in $requirements_or; do
+                requirement=$(echo $requirement | xargs)
+                found_line=$(grep -E "^$requirement" "$SDKCONFIG_PATH")
+                if [[ "$found_line" != "" ]]; then
+                    found=true
+                    break
+                fi
+            done
+            if [[ "$found" == "false" ]]; then
+                printf "\033[93mTarget $target meets none of the requirements in requires_any for $sketchname. Skipping.\033[0m\n"
+                printf "\n\n\n"
+                return 0
+            fi
+        fi
     fi
 
     if [ $len -eq 1 ]; then
diff --git a/docs/en/contributing.rst b/docs/en/contributing.rst
index f4ed6c34761..bc3e2e89674 100644
--- a/docs/en/contributing.rst
+++ b/docs/en/contributing.rst
@@ -172,12 +172,12 @@ And in the ``README.md`` file:
 By default, the CI system will use the FQBNs specified in the ``.github/scripts/sketch_utils.sh`` file to compile the sketches.
 Currently, the default FQBNs are:
 
-* ``espressif:esp32:esp32:PSRAM=enabled,FlashMode=dio``
-* ``espressif:esp32:esp32s2:PSRAM=enabled,FlashMode=dio``
-* ``espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,FlashMode=dio``
-* ``espressif:esp32:esp32c3:FlashMode=dio``
-* ``espressif:esp32:esp32c6:FlashMode=dio``
-* ``espressif:esp32:esp32h2:FlashMode=dio``
+* ``espressif:esp32:esp32:PSRAM=enabled``
+* ``espressif:esp32:esp32s2:PSRAM=enabled``
+* ``espressif:esp32:esp32s3:PSRAM=opi,USBMode=default``
+* ``espressif:esp32:esp32c3``
+* ``espressif:esp32:esp32c6``
+* ``espressif:esp32:esp32h2``
 
 There are two ways to alter the FQBNs used to compile the sketches: by using the ``fqbn`` or ``fqbn_append`` fields in the ``ci.json`` file.
 
@@ -408,7 +408,9 @@ CI JSON File
 The ``ci.json`` file is used to specify how the test suite and sketches will handled by the CI system. It can contain the following fields:
 
 * ``requires``: A list of configurations in ``sdkconfig`` that are required to run the test suite. The test suite will only run on the targets
-  that have the required configurations. By default, no configurations are required.
+  that have **ALL** the required configurations. By default, no configurations are required.
+* ``requires_any``: A list of configurations in ``sdkconfig`` that are required to run the test suite. The test suite will only run on the targets
+  that have **ANY** of the required configurations. By default, no configurations are required.
 * ``targets``: A dictionary that specifies the targets for which the tests will be run. The key is the target name and the value is a boolean
   that specifies if the test should be run for that target. By default, all targets are enabled as long as they have the required configurations
   specified in the ``requires`` field. This field is also valid for examples.

From a7d9b670a8655778c08d745c061e6a6f9f223061 Mon Sep 17 00:00:00 2001
From: Me No Dev <me-no-dev@users.noreply.github.com>
Date: Mon, 21 Oct 2024 11:56:01 +0300
Subject: [PATCH 2/9] Add missing versions to ISSUE_REPORT

Versions 3.0.5 and 3.0.6 were added
---
 .github/ISSUE_TEMPLATE/Issue-report.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/ISSUE_TEMPLATE/Issue-report.yml b/.github/ISSUE_TEMPLATE/Issue-report.yml
index 17a3f7f2612..d5b756085c7 100644
--- a/.github/ISSUE_TEMPLATE/Issue-report.yml
+++ b/.github/ISSUE_TEMPLATE/Issue-report.yml
@@ -41,6 +41,8 @@ body:
       options:
         - latest master (checkout manually)
         - latest development Release Candidate (RC-X)
+        - v3.0.6
+        - v3.0.5
         - v3.0.4
         - v3.0.3
         - v3.0.2

From 9e643c08a700a62415a5c3f311788e1b1edd64fe Mon Sep 17 00:00:00 2001
From: Lucas Saavedra Vaz <32426024+lucasssvaz@users.noreply.github.com>
Date: Mon, 21 Oct 2024 09:45:59 -0300
Subject: [PATCH 3/9] fix(testing): Checkout proper branch for Wokwi tests and
 small QoL improvements (#10435)

* fix(tests): Add missing newlines to output

* fix(tests): Improve fibonacci test

* fix(tests): Remove redundant targets from json

* fix(wokwi): Checkout proper base branch for wokwi tests

* feat(logging): Add logging to some tests to improve debugging

* fix(ci): Make CI more permissive and improve messages

* fix(tests): Bump pytest-embedded version to support P4
---
 .github/scripts/tests_matrix.sh               | 26 +++++++++++++
 .github/workflows/dangerjs.yml                |  4 +-
 .github/workflows/tests.yml                   | 38 +++++++++----------
 .github/workflows/tests_results.yml           |  1 +
 .github/workflows/tests_wokwi.yml             | 36 ++++++++++++++++--
 tests/performance/coremark/coremark.ino       |  2 +-
 tests/performance/fibonacci/fibonacci.ino     |  2 +-
 tests/performance/fibonacci/test_fibonacci.py | 33 ++++++++--------
 tests/performance/psramspeed/ci.json          |  8 ++--
 tests/performance/psramspeed/psramspeed.ino   |  2 +-
 tests/performance/ramspeed/ramspeed.ino       |  2 +-
 tests/performance/superpi/superpi.ino         |  2 +-
 tests/requirements.txt                        |  8 ++--
 tests/validation/gpio/test_gpio.py            | 10 +++++
 tests/validation/nvs/test_nvs.py              |  9 +++++
 tests/validation/periman/test_periman.py      |  8 +++-
 tests/validation/psram/ci.json                |  7 +---
 tests/validation/wifi/test_wifi.py            |  9 +++++
 18 files changed, 143 insertions(+), 64 deletions(-)
 create mode 100644 .github/scripts/tests_matrix.sh

diff --git a/.github/scripts/tests_matrix.sh b/.github/scripts/tests_matrix.sh
new file mode 100644
index 00000000000..ca0b6eb8684
--- /dev/null
+++ b/.github/scripts/tests_matrix.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+build_types="'validation'"
+hw_types="'validation'"
+wokwi_types="'validation'"
+qemu_types="'validation'"
+
+if [[ $IS_PR != 'true' ]] || [[ $PERFORMANCE_ENABLED == 'true' ]]; then
+  build_types+=",'performance'"
+  hw_types+=",'performance'"
+  #wokwi_types+=",'performance'"
+  #qemu_types+=",'performance'"
+fi
+
+targets="'esp32','esp32s2','esp32s3','esp32c3','esp32c6','esp32h2'"
+
+mkdir -p info
+
+echo "[$wokwi_types]" > info/wokwi_types.txt
+echo "[$targets]" > info/targets.txt
+
+echo "build-types=[$build_types]" >> $GITHUB_OUTPUT
+echo "hw-types=[$hw_types]" >> $GITHUB_OUTPUT
+echo "wokwi-types=[$wokwi_types]" >> $GITHUB_OUTPUT
+echo "qemu-types=[$qemu_types]" >> $GITHUB_OUTPUT
+echo "targets=[$targets]" >> $GITHUB_OUTPUT
diff --git a/.github/workflows/dangerjs.yml b/.github/workflows/dangerjs.yml
index 9f7360bc34f..75c046731f3 100644
--- a/.github/workflows/dangerjs.yml
+++ b/.github/workflows/dangerjs.yml
@@ -19,4 +19,6 @@ jobs:
     - name: DangerJS pull request linter
       uses: espressif/shared-github-dangerjs@v1
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        rule-max-commits: 'false'
+        commit-messages-min-summary-length: '10'
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 26de19d8f10..ab8baa6d14c 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -57,29 +57,25 @@ jobs:
       hw-types: ${{ steps.set-matrix.outputs.hw-types }}
       wokwi-types: ${{ steps.set-matrix.outputs.wokwi-types }}
       qemu-types: ${{ steps.set-matrix.outputs.qemu-types }}
+      targets: ${{ steps.set-matrix.outputs.targets }}
+    env:
+      IS_PR: ${{ github.event.pull_request.number != null }}
+      PERFORMANCE_ENABLED: ${{ contains(github.event.pull_request.labels.*.name, 'perf_test') }}
     steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          sparse-checkout: .github/scripts/tests_matrix.sh
+
       - name: Set matrix
         id: set-matrix
-        run: |
-          build_types='["validation"'
-          hw_types='["validation"'
-          wokwi_types='["validation"'
-          qemu_types='["validation"'
-
-          is_pr=${{ github.event.pull_request.number != null }}
-          is_performance_enabled=${{ contains(github.event.pull_request.labels.*.name, 'perf_test') }}
-
-          if [[ $is_pr != 'true' ]] || [[ $is_performance_enabled == 'true' ]]; then
-            build_types+=',"performance"'
-            hw_types+=',"performance"'
-            #wokwi_types+=',"performance"'
-            #qemu_types+=',"performance"'
-          fi
+        run: bash .github/scripts/tests_matrix.sh
 
-          echo "build-types=$build_types]" >> $GITHUB_OUTPUT
-          echo "hw-types=$hw_types]" >> $GITHUB_OUTPUT
-          echo "wokwi-types=$wokwi_types]" >> $GITHUB_OUTPUT
-          echo "qemu-types=$qemu_types]" >> $GITHUB_OUTPUT
+      - name: Upload
+        uses: actions/upload-artifact@v4
+        with:
+          name: matrix_info
+          path: info/*
 
   call-build-tests:
     name: Build
@@ -88,7 +84,7 @@ jobs:
     strategy:
       matrix:
         type: ${{ fromJson(needs.gen-matrix.outputs.build-types) }}
-        chip: ['esp32', 'esp32s2', 'esp32s3', 'esp32c3', 'esp32c6', 'esp32h2']
+        chip: ${{ fromJson(needs.gen-matrix.outputs.targets) }}
     with:
       type: ${{ matrix.type }}
       chip: ${{ matrix.chip }}
@@ -105,7 +101,7 @@ jobs:
       fail-fast: false
       matrix:
         type: ${{ fromJson(needs.gen-matrix.outputs.hw-types) }}
-        chip: ['esp32', 'esp32s2', 'esp32s3', 'esp32c3', 'esp32c6', 'esp32h2']
+        chip: ${{ fromJson(needs.gen-matrix.outputs.targets) }}
     with:
       type: ${{ matrix.type }}
       chip: ${{ matrix.chip }}
diff --git a/.github/workflows/tests_results.yml b/.github/workflows/tests_results.yml
index a255016c413..f9c572bf546 100644
--- a/.github/workflows/tests_results.yml
+++ b/.github/workflows/tests_results.yml
@@ -79,6 +79,7 @@ jobs:
           event_name: ${{ env.original_event }}
           files: ./artifacts/**/*.xml
           action_fail: true
+          compare_to_earlier_commit: false
 
       - name: Fail if tests failed
         if: ${{ env.original_conclusion == 'failure' || env.original_conclusion == 'timed_out' || github.event.workflow_run.conclusion == 'failure' || github.event.workflow_run.conclusion == 'timed_out' }}
diff --git a/.github/workflows/tests_wokwi.yml b/.github/workflows/tests_wokwi.yml
index f016cad25e0..a891ca89dfd 100644
--- a/.github/workflows/tests_wokwi.yml
+++ b/.github/workflows/tests_wokwi.yml
@@ -22,6 +22,9 @@ jobs:
     outputs:
       pr_num: ${{ steps.set-ref.outputs.pr_num }}
       ref: ${{ steps.set-ref.outputs.ref }}
+      base: ${{ steps.set-ref.outputs.base }}
+      targets: ${{ steps.set-ref.outputs.targets }}
+      types: ${{ steps.set-ref.outputs.types }}
     steps:
       - name: Report pending
         uses: actions/github-script@v7
@@ -51,10 +54,18 @@ jobs:
           name: event_file
           path: artifacts/event_file
 
+      - name: Download and extract matrix info
+        uses: actions/download-artifact@v4
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          run-id: ${{ github.event.workflow_run.id }}
+          name: matrix_info
+          path: artifacts/matrix_info
+
       - name: Try to read PR number
         id: set-ref
         run: |
-          pr_num=$(jq -r '.pull_request.number' artifacts/event_file/event.json)
+          pr_num=$(jq -r '.pull_request.number' artifacts/event_file/event.json | tr -cd "[:digit:]")
           if [ -z "$pr_num" ] || [ "$pr_num" == "null" ]; then
             pr_num=""
           fi
@@ -64,11 +75,22 @@ jobs:
             ref=${{ github.ref }}
           fi
 
-          action=$(jq -r '.action' artifacts/event_file/event.json)
+          action=$(jq -r '.action' artifacts/event_file/event.json | tr -cd "[:alpha:]_")
           if [ "$action" == "null" ]; then
             action=""
           fi
 
+          base=$(jq -r '.pull_request.base.ref' artifacts/event_file/event.json | tr -cd "[:alnum:]/_.-")
+          if [ -z "$base" ] || [ "$base" == "null" ]; then
+            base=${{ github.ref }}
+          fi
+
+          types=$(cat artifacts/matrix_info/wokwi_types.txt | tr -cd "[:alpha:],[]'")
+          targets=$(cat artifacts/matrix_info/targets.txt | tr -cd "[:alnum:],[]'")
+
+          echo "base = $base"
+          echo "targets = $targets"
+          echo "types = $types"
           echo "pr_num = $pr_num"
 
           printf "$ref" >> artifacts/ref.txt
@@ -98,6 +120,9 @@ jobs:
           cat artifacts/conclusion.txt
 
           echo "pr_num=$pr_num" >> $GITHUB_OUTPUT
+          echo "base=$base" >> $GITHUB_OUTPUT
+          echo "targets=$targets" >> $GITHUB_OUTPUT
+          echo "types=$types" >> $GITHUB_OUTPUT
           echo "ref=$ref" >> $GITHUB_OUTPUT
 
       - name: Download and extract parent hardware results
@@ -164,8 +189,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        type: ['validation']
-        chip: ['esp32', 'esp32s2', 'esp32s3', 'esp32c3', 'esp32c6', 'esp32h2']
+        type: ${{ fromJson(needs.get-artifacts.outputs.types) }}
+        chip: ${{ fromJson(needs.get-artifacts.outputs.targets) }}
     steps:
       - name: Report pending
         uses: actions/github-script@v7
@@ -211,9 +236,12 @@ jobs:
           echo "enabled=$enabled" >> $GITHUB_OUTPUT
 
       # Note that changes to the workflows and tests will only be picked up after the PR is merged
+      # DO NOT CHECKOUT THE USER'S REPOSITORY IN THIS WORKFLOW. IT HAS HIGH SECURITY RISKS.
       - name: Checkout repository
         if: ${{ steps.check-tests.outputs.enabled == 'true' }}
         uses: actions/checkout@v4
+        with:
+          ref: ${{ needs.get-artifacts.outputs.base || github.ref }}
 
       - uses: actions/setup-python@v5
         if: ${{ steps.check-tests.outputs.enabled == 'true' }}
diff --git a/tests/performance/coremark/coremark.ino b/tests/performance/coremark/coremark.ino
index 776db7874db..872b53050f0 100644
--- a/tests/performance/coremark/coremark.ino
+++ b/tests/performance/coremark/coremark.ino
@@ -40,7 +40,7 @@ void setup() {
   Serial.printf("Cores: %d\n", CONFIG_SOC_CPU_CORES_NUM);
   Serial.flush();
   for (int i = 0; i < N_RUNS; i++) {
-    Serial.printf("Run %d", i);
+    Serial.printf("Run %d\n", i);
     coremark_main();
     Serial.flush();
   }
diff --git a/tests/performance/fibonacci/fibonacci.ino b/tests/performance/fibonacci/fibonacci.ino
index 01fd6f7bee2..c82fd6b70d8 100644
--- a/tests/performance/fibonacci/fibonacci.ino
+++ b/tests/performance/fibonacci/fibonacci.ino
@@ -31,7 +31,7 @@ void setup() {
   Serial.printf("N: %d\n", FIB_N);
   Serial.flush();
   for (int i = 0; i < N_RUNS; i++) {
-    Serial.printf("Run %d", i);
+    Serial.printf("Run %d\n", i);
     unsigned long start = millis();
     fibonacci = fib(FIB_N);
     unsigned long elapsed = millis() - start;
diff --git a/tests/performance/fibonacci/test_fibonacci.py b/tests/performance/fibonacci/test_fibonacci.py
index 622ea77ee4b..ced9368184e 100644
--- a/tests/performance/fibonacci/test_fibonacci.py
+++ b/tests/performance/fibonacci/test_fibonacci.py
@@ -2,24 +2,21 @@
 import logging
 import os
 
+fib_results = {}
+
+def fib(n):
+    if n < 2:
+        return n
+    elif str(n) in fib_results:
+        return fib_results[str(n)]
+    else:
+        fib_results[str(n)] = fib(n - 1) + fib(n - 2)
+        return fib_results[str(n)]
+
 
 def test_fibonacci(dut, request):
     LOGGER = logging.getLogger(__name__)
 
-    # Fibonacci results starting from fib(35) to fib(45)
-    fib_results = [
-        9227465,
-        14930352,
-        24157817,
-        39088169,
-        63245986,
-        102334155,
-        165580141,
-        267914296,
-        433494437,
-        701408733,
-    ]
-
     # Match "Runs: %d"
     res = dut.expect(r"Runs: (\d+)", timeout=60)
     runs = int(res.group(0).decode("utf-8").split(" ")[1])
@@ -30,7 +27,11 @@ def test_fibonacci(dut, request):
     res = dut.expect(r"N: (\d+)", timeout=300)
     fib_n = int(res.group(0).decode("utf-8").split(" ")[1])
     LOGGER.info("Calculating Fibonacci({})".format(fib_n))
-    assert fib_n > 30 and fib_n < 50, "Invalid Fibonacci number"
+    assert fib_n > 0, "Invalid Fibonacci number"
+
+    # Calculate Fibonacci results
+    expected_result = fib(fib_n)
+    LOGGER.info("Expected Fibonacci result: {}".format(expected_result))
 
     list_time = []
 
@@ -48,7 +49,7 @@ def test_fibonacci(dut, request):
         assert fib_result > 0, "Invalid Fibonacci result"
 
         # Check if the result is correct
-        assert fib_result == fib_results[fib_n - 35]
+        assert fib_result == expected_result
 
         # Match "Time: %lu.%03lu s"
         res = dut.expect(r"Time: (\d+)\.(\d+) s", timeout=300)
diff --git a/tests/performance/psramspeed/ci.json b/tests/performance/psramspeed/ci.json
index 8d58dbf5250..341df103671 100644
--- a/tests/performance/psramspeed/ci.json
+++ b/tests/performance/psramspeed/ci.json
@@ -3,9 +3,7 @@
     "qemu": false,
     "wokwi": false
   },
-  "targets": {
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SPIRAM=y"
+  ]
 }
diff --git a/tests/performance/psramspeed/psramspeed.ino b/tests/performance/psramspeed/psramspeed.ino
index 81175e6b3a5..be91733abfc 100644
--- a/tests/performance/psramspeed/psramspeed.ino
+++ b/tests/performance/psramspeed/psramspeed.ino
@@ -252,7 +252,7 @@ void setup() {
   Serial.printf("Max test size: %d\n", MAX_TEST_SIZE);
   Serial.flush();
   for (int i = 0; i < N_RUNS; i++) {
-    Serial.printf("Run %d", i);
+    Serial.printf("Run %d\n", i);
     memcpy_speed_test(dest, src, MAX_TEST_SIZE, N_COPIES);
     Serial.flush();
     memset_speed_test(dest, FILL_VALUE, MAX_TEST_SIZE, N_COPIES);
diff --git a/tests/performance/ramspeed/ramspeed.ino b/tests/performance/ramspeed/ramspeed.ino
index e0ab0db4c5f..776f6540679 100644
--- a/tests/performance/ramspeed/ramspeed.ino
+++ b/tests/performance/ramspeed/ramspeed.ino
@@ -248,7 +248,7 @@ void setup() {
   Serial.printf("Max test size: %d\n", MAX_TEST_SIZE);
   Serial.flush();
   for (int i = 0; i < N_RUNS; i++) {
-    Serial.printf("Run %d", i);
+    Serial.printf("Run %d\n", i);
     memcpy_speed_test(dest, src, MAX_TEST_SIZE, N_COPIES);
     Serial.flush();
     memset_speed_test(dest, FILL_VALUE, MAX_TEST_SIZE, N_COPIES);
diff --git a/tests/performance/superpi/superpi.ino b/tests/performance/superpi/superpi.ino
index ffa6c932b35..7ac4b2f13d7 100644
--- a/tests/performance/superpi/superpi.ino
+++ b/tests/performance/superpi/superpi.ino
@@ -25,7 +25,7 @@ void setup() {
   Serial.printf("Digits: %d\n", DIGITS);
   Serial.flush();
   for (int i = 0; i < N_RUNS; i++) {
-    Serial.printf("Run %d", i);
+    Serial.printf("Run %d\n", i);
     unsigned long start = millis();
     pi_calc(DIGITS);
     unsigned long elapsed = millis() - start;
diff --git a/tests/requirements.txt b/tests/requirements.txt
index 1b43a6104f2..63d204a96b0 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -1,7 +1,7 @@
 cryptography==43.0.1
 --only-binary cryptography
 pytest-cov==5.0.0
-pytest-embedded-serial-esp==1.11.5
-pytest-embedded-arduino==1.11.5
-pytest-embedded-wokwi==1.11.5
-pytest-embedded-qemu==1.11.5
+pytest-embedded-serial-esp==1.11.6
+pytest-embedded-arduino==1.11.6
+pytest-embedded-wokwi==1.11.6
+pytest-embedded-qemu==1.11.6
diff --git a/tests/validation/gpio/test_gpio.py b/tests/validation/gpio/test_gpio.py
index e36282561b5..f11b9fd99cc 100644
--- a/tests/validation/gpio/test_gpio.py
+++ b/tests/validation/gpio/test_gpio.py
@@ -1,5 +1,15 @@
+import logging
+
 def test_gpio(dut):
+    LOGGER = logging.getLogger(__name__)
+
     dut.expect_exact("Button test")
+
+    LOGGER.info("Expecting button press 1")
     dut.expect_exact("Button pressed 1 times")
+
+    LOGGER.info("Expecting button press 2")
     dut.expect_exact("Button pressed 2 times")
+
+    LOGGER.info("Expecting button press 3")
     dut.expect_exact("Button pressed 3 times")
diff --git a/tests/validation/nvs/test_nvs.py b/tests/validation/nvs/test_nvs.py
index 364df56de1c..a2b4842fa91 100644
--- a/tests/validation/nvs/test_nvs.py
+++ b/tests/validation/nvs/test_nvs.py
@@ -1,4 +1,13 @@
+import logging
+
 def test_nvs(dut):
+    LOGGER = logging.getLogger(__name__)
+
+    LOGGER.info("Expecting counter value 0")
     dut.expect_exact("Current counter value: 0")
+
+    LOGGER.info("Expecting counter value 1")
     dut.expect_exact("Current counter value: 1")
+
+    LOGGER.info("Expecting counter value 2")
     dut.expect_exact("Current counter value: 2")
diff --git a/tests/validation/periman/test_periman.py b/tests/validation/periman/test_periman.py
index d8dc4b8eeb5..a2d25f5ba09 100644
--- a/tests/validation/periman/test_periman.py
+++ b/tests/validation/periman/test_periman.py
@@ -1,4 +1,7 @@
+import logging
+
 def test_periman(dut):
+    LOGGER = logging.getLogger(__name__)
     peripherals = [
         "GPIO",
         "SigmaDelta",
@@ -29,9 +32,10 @@ def test_periman(dut):
 
         if peripheral in peripherals:
             if "not" in console_output:
-                assert False, f"Peripheral {peripheral} printed when it should not"
+                assert False, f"Output printed when it should not after peripheral {peripheral}"
+            LOGGER.info(f"Correct output after peripheral: {peripheral}")
             peripherals.remove(peripheral)
         else:
             assert False, f"Unknown peripheral: {peripheral}"
 
-    assert peripherals == [], f"Missing peripherals output: {peripherals}"
+    assert peripherals == [], f"Missing output after peripherals: {peripherals}"
diff --git a/tests/validation/psram/ci.json b/tests/validation/psram/ci.json
index fc34574cf37..341df103671 100644
--- a/tests/validation/psram/ci.json
+++ b/tests/validation/psram/ci.json
@@ -5,10 +5,5 @@
   },
   "requires": [
     "CONFIG_SPIRAM=y"
-  ],
-  "targets": {
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false
-  }
+  ]
 }
diff --git a/tests/validation/wifi/test_wifi.py b/tests/validation/wifi/test_wifi.py
index 49dd22797d2..769283b06bd 100644
--- a/tests/validation/wifi/test_wifi.py
+++ b/tests/validation/wifi/test_wifi.py
@@ -1,6 +1,15 @@
+import logging
+
 def test_wifi(dut):
+    LOGGER = logging.getLogger(__name__)
+
+    LOGGER.info("Starting WiFi Scan")
     dut.expect_exact("Scan start")
     dut.expect_exact("Scan done")
     dut.expect_exact("Wokwi-GUEST")
+    LOGGER.info("WiFi Scan done")
+
+    LOGGER.info("Connecting to WiFi")
     dut.expect_exact("WiFi connected")
     dut.expect_exact("IP address:")
+    LOGGER.info("WiFi connected")

From 01789a7a894bee8c75e25a6c99b5059174c9b8a5 Mon Sep 17 00:00:00 2001
From: Lucas Saavedra Vaz <32426024+lucasssvaz@users.noreply.github.com>
Date: Mon, 21 Oct 2024 12:29:05 -0300
Subject: [PATCH 4/9] fix(formatting): Fix formatting and disable JSON hook
 (#10492)

---
 .pre-commit-config.yaml                       | 1 +
 tests/performance/fibonacci/test_fibonacci.py | 1 +
 tests/validation/gpio/test_gpio.py            | 1 +
 tests/validation/nvs/test_nvs.py              | 1 +
 tests/validation/periman/test_periman.py      | 1 +
 tests/validation/wifi/test_wifi.py            | 1 +
 6 files changed, 6 insertions(+)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 0aff5b6f07b..6a949631bd9 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -26,6 +26,7 @@ repos:
       - id: trailing-whitespace
         args: [--markdown-linebreak-ext=md]
       - id: pretty-format-json
+        stages: [manual]
         args: [--autofix]
         types_or: [json]
         exclude: |
diff --git a/tests/performance/fibonacci/test_fibonacci.py b/tests/performance/fibonacci/test_fibonacci.py
index ced9368184e..cf560d9691c 100644
--- a/tests/performance/fibonacci/test_fibonacci.py
+++ b/tests/performance/fibonacci/test_fibonacci.py
@@ -4,6 +4,7 @@
 
 fib_results = {}
 
+
 def fib(n):
     if n < 2:
         return n
diff --git a/tests/validation/gpio/test_gpio.py b/tests/validation/gpio/test_gpio.py
index f11b9fd99cc..8aa3a42dcc6 100644
--- a/tests/validation/gpio/test_gpio.py
+++ b/tests/validation/gpio/test_gpio.py
@@ -1,5 +1,6 @@
 import logging
 
+
 def test_gpio(dut):
     LOGGER = logging.getLogger(__name__)
 
diff --git a/tests/validation/nvs/test_nvs.py b/tests/validation/nvs/test_nvs.py
index a2b4842fa91..424095a49ba 100644
--- a/tests/validation/nvs/test_nvs.py
+++ b/tests/validation/nvs/test_nvs.py
@@ -1,5 +1,6 @@
 import logging
 
+
 def test_nvs(dut):
     LOGGER = logging.getLogger(__name__)
 
diff --git a/tests/validation/periman/test_periman.py b/tests/validation/periman/test_periman.py
index a2d25f5ba09..2728abcef80 100644
--- a/tests/validation/periman/test_periman.py
+++ b/tests/validation/periman/test_periman.py
@@ -1,5 +1,6 @@
 import logging
 
+
 def test_periman(dut):
     LOGGER = logging.getLogger(__name__)
     peripherals = [
diff --git a/tests/validation/wifi/test_wifi.py b/tests/validation/wifi/test_wifi.py
index 769283b06bd..5049aae7b85 100644
--- a/tests/validation/wifi/test_wifi.py
+++ b/tests/validation/wifi/test_wifi.py
@@ -1,5 +1,6 @@
 import logging
 
+
 def test_wifi(dut):
     LOGGER = logging.getLogger(__name__)
 

From e509d33d27a6933223679d5813245e10481ab5a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Proch=C3=A1zka?=
 <90197375+P-R-O-C-H-Y@users.noreply.github.com>
Date: Mon, 21 Oct 2024 23:56:18 +0200
Subject: [PATCH 5/9] fix(ci): Chnage approach in listing the changed boards
 (#10495)

---
 .github/scripts/find_new_boards.sh | 54 +++++++++---------------------
 1 file changed, 16 insertions(+), 38 deletions(-)

diff --git a/.github/scripts/find_new_boards.sh b/.github/scripts/find_new_boards.sh
index 77c98877d2a..083f1448e83 100755
--- a/.github/scripts/find_new_boards.sh
+++ b/.github/scripts/find_new_boards.sh
@@ -8,53 +8,32 @@ url="https://api.github.com/repos/$owner_repository/pulls/$pr_number/files"
 echo $url
 
 # Get changes in boards.txt file from PR
-Patch=$(curl $url | jq -r '.[] | select(.filename == "boards.txt") | .patch ')
+Boards_modified_url=$(curl -s $url | jq -r '.[] | select(.filename == "boards.txt") | .raw_url')
 
-# Extract only changed lines number and count
-substring_patch=$(echo "$Patch" | grep -o '@@[^@]*@@')
+# Echo the modified boards.txt file URL
+echo "Modified boards.txt file URL:"
+echo $Boards_modified_url
 
-params_array=()
+# Download the modified boards.txt file
+curl -L -o boards_pr.txt $Boards_modified_url
 
-IFS=$'\n' read -d '' -ra params <<< $(echo "$substring_patch" | grep -oE '[-+][0-9]+,[0-9]+')
+# Compare boards.txt file in the repo with the modified file
+diff=$(diff -u boards.txt boards_pr.txt)
 
-for param in "${params[@]}"
-do
-    echo "The parameter is $param"
-    params_array+=("$param")
-done
+# Extract added or modified lines (lines starting with '+' or '-')
+modified_lines=$(echo "$diff" | grep -E '^[+-][^+-]')
 
 boards_array=()
 previous_board=""
 file="boards.txt"
 
-# Loop through boards.txt file and extract all boards that were added
-for (( c=0; c<${#params_array[@]}; c+=2 ))
+# Extract board names from the modified lines, and add them to the boards_array
+while read -r line
 do
-    deletion_count=$( echo "${params_array[c]}" | cut -d',' -f2 | cut -d' ' -f1 )
-    addition_line=$( echo "${params_array[c+1]}" | cut -d'+' -f2 | cut -d',' -f1 )
-    addition_count=$( echo "${params_array[c+1]}" | cut -d'+' -f2 | cut -d',' -f2 | cut -d' ' -f1 )
-    addition_end=$(($addition_line+$addition_count))
-    
-    addition_line=$(($addition_line + 3))
-    addition_end=$(($addition_end - $deletion_count))
-
-    echo $addition_line
-    echo $addition_end
-
-    i=0
-
-    while read -r line
-    do
-    i=$((i+1))
-    if [ $i -lt $addition_line ]
-    then
-    continue
-    elif [ $i -gt $addition_end ]
-    then
-    break
-    fi
     board_name=$(echo "$line" | cut -d '.' -f1 | cut -d '#' -f1)
-    if [ "$board_name" != "" ] && [ "$board_name" != "esp32_family" ]
+    # remove + or - from the board name at the beginning
+    board_name=$(echo "$board_name" | sed 's/^[+-]//')
+    if [ "$board_name" != "" ] && [ "$board_name" != "+" ] && [ "$board_name" != "-" ] && [ "$board_name" != "esp32_family" ]
     then
         if [ "$board_name" != "$previous_board" ]
         then
@@ -63,8 +42,7 @@ do
             echo "Added 'espressif:esp32:$board_name' to array"
         fi
     fi
-    done < "$file"
-done
+done <<< "$modified_lines"
 
 # Create JSON like string with all boards found and pass it to env variable
 board_count=${#boards_array[@]}

From 4944dd0df3dcf452b86a72e652ef3bc08eb7da83 Mon Sep 17 00:00:00 2001
From: clashman <cl3m3ns@gmail.com>
Date: Tue, 22 Oct 2024 19:22:15 +0200
Subject: [PATCH 6/9] fix(littlefs): Add missing dependency (#10496)

---
 CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9a858ee79cd..16639e689c7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -157,6 +157,7 @@ set(ARDUINO_LIBRARY_HTTPUpdate_SRCS libraries/HTTPUpdate/src/HTTPUpdate.cpp)
 set(ARDUINO_LIBRARY_Insights_SRCS libraries/Insights/src/Insights.cpp)
 
 set(ARDUINO_LIBRARY_LittleFS_SRCS libraries/LittleFS/src/LittleFS.cpp)
+set(ARDUINO_LIBRARY_LittleFS_REQUIRES esp_littlefs)
 
 set(ARDUINO_LIBRARY_NetBIOS_SRCS libraries/NetBIOS/src/NetBIOS.cpp)
 

From 4285912a46d6b5283a55d2342a7ca5ed1b926e15 Mon Sep 17 00:00:00 2001
From: Me No Dev <me-no-dev@users.noreply.github.com>
Date: Tue, 22 Oct 2024 20:40:15 +0300
Subject: [PATCH 7/9] fix(cmake): Use proper name for LittleFS component

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 16639e689c7..d7e5ae83b35 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -157,7 +157,7 @@ set(ARDUINO_LIBRARY_HTTPUpdate_SRCS libraries/HTTPUpdate/src/HTTPUpdate.cpp)
 set(ARDUINO_LIBRARY_Insights_SRCS libraries/Insights/src/Insights.cpp)
 
 set(ARDUINO_LIBRARY_LittleFS_SRCS libraries/LittleFS/src/LittleFS.cpp)
-set(ARDUINO_LIBRARY_LittleFS_REQUIRES esp_littlefs)
+set(ARDUINO_LIBRARY_LittleFS_REQUIRES joltwallet__littlefs)
 
 set(ARDUINO_LIBRARY_NetBIOS_SRCS libraries/NetBIOS/src/NetBIOS.cpp)
 

From 5042912fa6edb9f8169a5f576c09a5d3529eeb7b Mon Sep 17 00:00:00 2001
From: Me No Dev <me-no-dev@users.noreply.github.com>
Date: Wed, 23 Oct 2024 02:40:33 +0300
Subject: [PATCH 8/9] IDF release/v5.1 (#10505)

* fix(psram): Do not disable PSRAM when used as component

Information: https://github.com/espressif/arduino-esp32/issues/10500

* IDF release/v5.1 Update
---
 cores/esp32/esp32-hal-psram.h             |  3 ++-
 package/package_esp32_index.template.json | 32 +++++++++++------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/cores/esp32/esp32-hal-psram.h b/cores/esp32/esp32-hal-psram.h
index e82af1342c2..69c1c625157 100644
--- a/cores/esp32/esp32-hal-psram.h
+++ b/cores/esp32/esp32-hal-psram.h
@@ -21,7 +21,8 @@ extern "C" {
 
 #include "sdkconfig.h"
 
-#ifndef BOARD_HAS_PSRAM
+// Clear flags in Arduino IDE when PSRAM is disabled
+#if defined(ESP32_ARDUINO_LIB_BUILDER) && !defined(BOARD_HAS_PSRAM)
 #ifdef CONFIG_SPIRAM_SUPPORT
 #undef CONFIG_SPIRAM_SUPPORT
 #endif
diff --git a/package/package_esp32_index.template.json b/package/package_esp32_index.template.json
index 3abb765e970..da789e9a42f 100644
--- a/package/package_esp32_index.template.json
+++ b/package/package_esp32_index.template.json
@@ -111,57 +111,57 @@
               "host": "i686-mingw32",
               "url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-632e0c2a.zip",
               "archiveFileName": "esp32-arduino-libs-idf-release_v5.1-632e0c2a.zip",
-              "checksum": "SHA-256:5c3bdfeb5396fb5272d374122d9563458517820ddb35dd846c119fc6a741abe9",
-              "size": "309891323"
+              "checksum": "SHA-256:41f67e1c11f68b57d651955c93b63d6a8d35808ce6aff6ba3d1e1476178758f2",
+              "size": "309895581"
             },
             {
               "host": "x86_64-mingw32",
               "url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-632e0c2a.zip",
               "archiveFileName": "esp32-arduino-libs-idf-release_v5.1-632e0c2a.zip",
-              "checksum": "SHA-256:5c3bdfeb5396fb5272d374122d9563458517820ddb35dd846c119fc6a741abe9",
-              "size": "309891323"
+              "checksum": "SHA-256:41f67e1c11f68b57d651955c93b63d6a8d35808ce6aff6ba3d1e1476178758f2",
+              "size": "309895581"
             },
             {
               "host": "arm64-apple-darwin",
               "url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-632e0c2a.zip",
               "archiveFileName": "esp32-arduino-libs-idf-release_v5.1-632e0c2a.zip",
-              "checksum": "SHA-256:5c3bdfeb5396fb5272d374122d9563458517820ddb35dd846c119fc6a741abe9",
-              "size": "309891323"
+              "checksum": "SHA-256:41f67e1c11f68b57d651955c93b63d6a8d35808ce6aff6ba3d1e1476178758f2",
+              "size": "309895581"
             },
             {
               "host": "x86_64-apple-darwin",
               "url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-632e0c2a.zip",
               "archiveFileName": "esp32-arduino-libs-idf-release_v5.1-632e0c2a.zip",
-              "checksum": "SHA-256:5c3bdfeb5396fb5272d374122d9563458517820ddb35dd846c119fc6a741abe9",
-              "size": "309891323"
+              "checksum": "SHA-256:41f67e1c11f68b57d651955c93b63d6a8d35808ce6aff6ba3d1e1476178758f2",
+              "size": "309895581"
             },
             {
               "host": "x86_64-pc-linux-gnu",
               "url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-632e0c2a.zip",
               "archiveFileName": "esp32-arduino-libs-idf-release_v5.1-632e0c2a.zip",
-              "checksum": "SHA-256:5c3bdfeb5396fb5272d374122d9563458517820ddb35dd846c119fc6a741abe9",
-              "size": "309891323"
+              "checksum": "SHA-256:41f67e1c11f68b57d651955c93b63d6a8d35808ce6aff6ba3d1e1476178758f2",
+              "size": "309895581"
             },
             {
               "host": "i686-pc-linux-gnu",
               "url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-632e0c2a.zip",
               "archiveFileName": "esp32-arduino-libs-idf-release_v5.1-632e0c2a.zip",
-              "checksum": "SHA-256:5c3bdfeb5396fb5272d374122d9563458517820ddb35dd846c119fc6a741abe9",
-              "size": "309891323"
+              "checksum": "SHA-256:41f67e1c11f68b57d651955c93b63d6a8d35808ce6aff6ba3d1e1476178758f2",
+              "size": "309895581"
             },
             {
               "host": "aarch64-linux-gnu",
               "url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-632e0c2a.zip",
               "archiveFileName": "esp32-arduino-libs-idf-release_v5.1-632e0c2a.zip",
-              "checksum": "SHA-256:5c3bdfeb5396fb5272d374122d9563458517820ddb35dd846c119fc6a741abe9",
-              "size": "309891323"
+              "checksum": "SHA-256:41f67e1c11f68b57d651955c93b63d6a8d35808ce6aff6ba3d1e1476178758f2",
+              "size": "309895581"
             },
             {
               "host": "arm-linux-gnueabihf",
               "url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-632e0c2a.zip",
               "archiveFileName": "esp32-arduino-libs-idf-release_v5.1-632e0c2a.zip",
-              "checksum": "SHA-256:5c3bdfeb5396fb5272d374122d9563458517820ddb35dd846c119fc6a741abe9",
-              "size": "309891323"
+              "checksum": "SHA-256:41f67e1c11f68b57d651955c93b63d6a8d35808ce6aff6ba3d1e1476178758f2",
+              "size": "309895581"
             }
           ]
         },

From 3bfa3e0a56c80305eec90f10e8318af8d8091bab Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Wed, 23 Oct 2024 09:47:14 +0300
Subject: [PATCH 9/9] Update core version to 3.0.7

---
 cores/esp32/esp_arduino_version.h                | 2 +-
 libraries/ArduinoOTA/library.properties          | 2 +-
 libraries/AsyncUDP/library.properties            | 2 +-
 libraries/BLE/library.properties                 | 2 +-
 libraries/BluetoothSerial/library.properties     | 2 +-
 libraries/DNSServer/library.properties           | 2 +-
 libraries/EEPROM/library.properties              | 2 +-
 libraries/ESP32/library.properties               | 2 +-
 libraries/ESP_I2S/library.properties             | 2 +-
 libraries/ESP_NOW/library.properties             | 2 +-
 libraries/ESP_SR/library.properties              | 2 +-
 libraries/ESPmDNS/library.properties             | 2 +-
 libraries/Ethernet/library.properties            | 2 +-
 libraries/FFat/library.properties                | 2 +-
 libraries/FS/library.properties                  | 2 +-
 libraries/HTTPClient/library.properties          | 2 +-
 libraries/HTTPUpdate/library.properties          | 2 +-
 libraries/HTTPUpdateServer/library.properties    | 2 +-
 libraries/Insights/library.properties            | 2 +-
 libraries/LittleFS/library.properties            | 2 +-
 libraries/NetBIOS/library.properties             | 2 +-
 libraries/Network/library.properties             | 2 +-
 libraries/NetworkClientSecure/library.properties | 2 +-
 libraries/OpenThread/library.properties          | 2 +-
 libraries/PPP/library.properties                 | 2 +-
 libraries/Preferences/library.properties         | 2 +-
 libraries/RainMaker/library.properties           | 2 +-
 libraries/SD/library.properties                  | 2 +-
 libraries/SD_MMC/library.properties              | 2 +-
 libraries/SPI/library.properties                 | 2 +-
 libraries/SPIFFS/library.properties              | 2 +-
 libraries/SimpleBLE/library.properties           | 2 +-
 libraries/TFLiteMicro/library.properties         | 2 +-
 libraries/Ticker/library.properties              | 2 +-
 libraries/USB/library.properties                 | 2 +-
 libraries/Update/library.properties              | 2 +-
 libraries/WebServer/library.properties           | 2 +-
 libraries/WiFi/library.properties                | 2 +-
 libraries/WiFiProv/library.properties            | 2 +-
 libraries/Wire/library.properties                | 2 +-
 libraries/Zigbee/library.properties              | 2 +-
 package.json                                     | 2 +-
 platform.txt                                     | 2 +-
 43 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/cores/esp32/esp_arduino_version.h b/cores/esp32/esp_arduino_version.h
index 1342a8085e4..2faa05bbb94 100644
--- a/cores/esp32/esp_arduino_version.h
+++ b/cores/esp32/esp_arduino_version.h
@@ -23,7 +23,7 @@ extern "C" {
 /** Minor version number (x.X.x) */
 #define ESP_ARDUINO_VERSION_MINOR 0
 /** Patch version number (x.x.X) */
-#define ESP_ARDUINO_VERSION_PATCH 6
+#define ESP_ARDUINO_VERSION_PATCH 7
 
 /**
  * Macro to convert ARDUINO version number into an integer
diff --git a/libraries/ArduinoOTA/library.properties b/libraries/ArduinoOTA/library.properties
index 4bd7a7119e6..58362afc281 100644
--- a/libraries/ArduinoOTA/library.properties
+++ b/libraries/ArduinoOTA/library.properties
@@ -1,5 +1,5 @@
 name=ArduinoOTA
-version=3.0.6
+version=3.0.7
 author=Ivan Grokhotkov and Hristo Gochkov
 maintainer=Hristo Gochkov <hristo@espressif.com>
 sentence=Enables Over The Air upgrades, via wifi and espota.py UDP request/TCP download.
diff --git a/libraries/AsyncUDP/library.properties b/libraries/AsyncUDP/library.properties
index 8a9b29c55e2..616141e50aa 100644
--- a/libraries/AsyncUDP/library.properties
+++ b/libraries/AsyncUDP/library.properties
@@ -1,5 +1,5 @@
 name=ESP32 Async UDP
-version=3.0.6
+version=3.0.7
 author=Me-No-Dev
 maintainer=Me-No-Dev
 sentence=Async UDP Library for ESP32
diff --git a/libraries/BLE/library.properties b/libraries/BLE/library.properties
index 162e03c45b6..85da9ec1ada 100644
--- a/libraries/BLE/library.properties
+++ b/libraries/BLE/library.properties
@@ -1,5 +1,5 @@
 name=BLE
-version=3.0.6
+version=3.0.7
 author=Neil Kolban <kolban1@kolban.com>
 maintainer=Dariusz Krempa <esp32@esp32.eu.org>
 sentence=BLE functions for ESP32
diff --git a/libraries/BluetoothSerial/library.properties b/libraries/BluetoothSerial/library.properties
index 05d35bc99ca..98380aa378c 100644
--- a/libraries/BluetoothSerial/library.properties
+++ b/libraries/BluetoothSerial/library.properties
@@ -1,5 +1,5 @@
 name=BluetoothSerial
-version=3.0.6
+version=3.0.7
 author=Evandro Copercini
 maintainer=Evandro Copercini
 sentence=Simple UART to Classical Bluetooth bridge for ESP32
diff --git a/libraries/DNSServer/library.properties b/libraries/DNSServer/library.properties
index d25605c1d6d..14a339ce65d 100644
--- a/libraries/DNSServer/library.properties
+++ b/libraries/DNSServer/library.properties
@@ -1,5 +1,5 @@
 name=DNSServer
-version=3.0.6
+version=3.0.7
 author=Kristijan Novoselić
 maintainer=Kristijan Novoselić, <kristijan.novoselic@gmail.com>
 sentence=A simple DNS server for ESP32.
diff --git a/libraries/EEPROM/library.properties b/libraries/EEPROM/library.properties
index f62717389de..91eed68ebb8 100644
--- a/libraries/EEPROM/library.properties
+++ b/libraries/EEPROM/library.properties
@@ -1,5 +1,5 @@
 name=EEPROM
-version=3.0.6
+version=3.0.7
 author=Ivan Grokhotkov
 maintainer=Paolo Becchi <pbecchi@aerobusiness.it>
 sentence=Enables reading and writing data a sequential, addressable FLASH storage
diff --git a/libraries/ESP32/library.properties b/libraries/ESP32/library.properties
index 9f60758ecd5..17f712cb591 100644
--- a/libraries/ESP32/library.properties
+++ b/libraries/ESP32/library.properties
@@ -1,5 +1,5 @@
 name=ESP32
-version=3.0.6
+version=3.0.7
 author=Hristo Gochkov, Ivan Grokhtkov
 maintainer=Hristo Gochkov <hristo@espressif.com>
 sentence=ESP32 sketches examples
diff --git a/libraries/ESP_I2S/library.properties b/libraries/ESP_I2S/library.properties
index 9e7d28625f0..c31204696ce 100644
--- a/libraries/ESP_I2S/library.properties
+++ b/libraries/ESP_I2S/library.properties
@@ -1,5 +1,5 @@
 name=ESP_I2S
-version=3.0.6
+version=3.0.7
 author=me-no-dev
 maintainer=me-no-dev
 sentence=Library for ESP I2S communication
diff --git a/libraries/ESP_NOW/library.properties b/libraries/ESP_NOW/library.properties
index 2729a9cfba6..65cefdd1337 100644
--- a/libraries/ESP_NOW/library.properties
+++ b/libraries/ESP_NOW/library.properties
@@ -1,5 +1,5 @@
 name=ESP_NOW
-version=3.0.6
+version=3.0.7
 author=me-no-dev
 maintainer=P-R-O-C-H-Y
 sentence=Library for ESP_NOW
diff --git a/libraries/ESP_SR/library.properties b/libraries/ESP_SR/library.properties
index a9d9b28a7ae..1a2c230fa35 100644
--- a/libraries/ESP_SR/library.properties
+++ b/libraries/ESP_SR/library.properties
@@ -1,5 +1,5 @@
 name=ESP_SR
-version=3.0.6
+version=3.0.7
 author=me-no-dev
 maintainer=me-no-dev
 sentence=Library for ESP Sound Recognition
diff --git a/libraries/ESPmDNS/library.properties b/libraries/ESPmDNS/library.properties
index 7a4d4f13eed..c159f1e59a3 100644
--- a/libraries/ESPmDNS/library.properties
+++ b/libraries/ESPmDNS/library.properties
@@ -1,5 +1,5 @@
 name=ESPmDNS
-version=3.0.6
+version=3.0.7
 author=Hristo Gochkov, Ivan Grokhtkov
 maintainer=Hristo Gochkov <hristo@espressif.com>
 sentence=ESP32 mDNS Library
diff --git a/libraries/Ethernet/library.properties b/libraries/Ethernet/library.properties
index 43394bc3785..99215a07035 100644
--- a/libraries/Ethernet/library.properties
+++ b/libraries/Ethernet/library.properties
@@ -1,5 +1,5 @@
 name=Ethernet
-version=3.0.6
+version=3.0.7
 author=Hristo Gochkov
 maintainer=Hristo Gochkov <hristo@espressif.com>
 sentence=Enables network connection (local and Internet) using the ESP32 Ethernet.
diff --git a/libraries/FFat/library.properties b/libraries/FFat/library.properties
index ee525b23cef..b79e7234cbb 100644
--- a/libraries/FFat/library.properties
+++ b/libraries/FFat/library.properties
@@ -1,5 +1,5 @@
 name=FFat
-version=3.0.6
+version=3.0.7
 author=Hristo Gochkov, Ivan Grokhtkov, Larry Bernstone
 maintainer=Hristo Gochkov <hristo@espressif.com>
 sentence=ESP32 FAT on Flash File System
diff --git a/libraries/FS/library.properties b/libraries/FS/library.properties
index ba611fb2491..0ab46ef568b 100644
--- a/libraries/FS/library.properties
+++ b/libraries/FS/library.properties
@@ -1,5 +1,5 @@
 name=FS
-version=3.0.6
+version=3.0.7
 author=Hristo Gochkov, Ivan Grokhtkov
 maintainer=Hristo Gochkov <hristo@espressif.com>
 sentence=ESP32 File System
diff --git a/libraries/HTTPClient/library.properties b/libraries/HTTPClient/library.properties
index 74cc8018442..4a21278f681 100644
--- a/libraries/HTTPClient/library.properties
+++ b/libraries/HTTPClient/library.properties
@@ -1,5 +1,5 @@
 name=HTTPClient
-version=3.0.6
+version=3.0.7
 author=Markus Sattler
 maintainer=Markus Sattler
 sentence=HTTP Client for ESP32
diff --git a/libraries/HTTPUpdate/library.properties b/libraries/HTTPUpdate/library.properties
index 14f78eb2d7c..ad68b21cd09 100644
--- a/libraries/HTTPUpdate/library.properties
+++ b/libraries/HTTPUpdate/library.properties
@@ -1,5 +1,5 @@
 name=HTTPUpdate
-version=3.0.6
+version=3.0.7
 author=Markus Sattler
 maintainer=Markus Sattler
 sentence=Http Update for ESP32
diff --git a/libraries/HTTPUpdateServer/library.properties b/libraries/HTTPUpdateServer/library.properties
index a227a633327..8aa0a8a5899 100644
--- a/libraries/HTTPUpdateServer/library.properties
+++ b/libraries/HTTPUpdateServer/library.properties
@@ -1,5 +1,5 @@
 name=HTTPUpdateServer
-version=3.0.6
+version=3.0.7
 author=Hristo Kapanakov
 maintainer=
 sentence=Simple HTTP Update server based on the WebServer
diff --git a/libraries/Insights/library.properties b/libraries/Insights/library.properties
index 53af96c6bac..3ca20d59618 100644
--- a/libraries/Insights/library.properties
+++ b/libraries/Insights/library.properties
@@ -1,5 +1,5 @@
 name=ESP Insights
-version=3.0.6
+version=3.0.7
 author=Sanket Wadekar <sanket.wadekar@espressif.com>
 maintainer=Sanket Wadekar <sanket.wadekar@espressif.com>
 sentence=ESP Insights
diff --git a/libraries/LittleFS/library.properties b/libraries/LittleFS/library.properties
index cd6127ebe5e..225a057b1f1 100644
--- a/libraries/LittleFS/library.properties
+++ b/libraries/LittleFS/library.properties
@@ -1,5 +1,5 @@
 name=LittleFS
-version=3.0.6
+version=3.0.7
 author=
 maintainer=
 sentence=LittleFS for esp32
diff --git a/libraries/NetBIOS/library.properties b/libraries/NetBIOS/library.properties
index 93ff7b9901c..9555f878ad6 100644
--- a/libraries/NetBIOS/library.properties
+++ b/libraries/NetBIOS/library.properties
@@ -1,5 +1,5 @@
 name=NetBIOS
-version=3.0.6
+version=3.0.7
 author=Pablo@xpablo.cz
 maintainer=Hristo Gochkov<hristo@espressif.com>
 sentence=Enables NBNS (NetBIOS) name resolution.
diff --git a/libraries/Network/library.properties b/libraries/Network/library.properties
index 122889bd012..a12e7e493b5 100644
--- a/libraries/Network/library.properties
+++ b/libraries/Network/library.properties
@@ -1,5 +1,5 @@
 name=Networking
-version=3.0.6
+version=3.0.7
 author=Hristo Gochkov
 maintainer=Hristo Gochkov <hristo@espressif.com>
 sentence=General network management library.
diff --git a/libraries/NetworkClientSecure/library.properties b/libraries/NetworkClientSecure/library.properties
index 59248431f8e..2ea86bf87f8 100644
--- a/libraries/NetworkClientSecure/library.properties
+++ b/libraries/NetworkClientSecure/library.properties
@@ -1,5 +1,5 @@
 name=NetworkClientSecure
-version=3.0.6
+version=3.0.7
 author=Evandro Luis Copercini
 maintainer=Github Community
 sentence=Enables secure network connection (local and Internet) using the ESP32 built-in WiFi.
diff --git a/libraries/OpenThread/library.properties b/libraries/OpenThread/library.properties
index 526078c24c6..580b88e918b 100644
--- a/libraries/OpenThread/library.properties
+++ b/libraries/OpenThread/library.properties
@@ -1,5 +1,5 @@
 name=OpenThread
-version=3.0.6
+version=3.0.7
 author=Rodrigo Garcia | GitHub @SuGlider
 maintainer=Rodrigo Garcia <Rodrigo.Garcia@espressif.com>
 sentence=Library for OpenThread Network on ESP32.
diff --git a/libraries/PPP/library.properties b/libraries/PPP/library.properties
index 82f8f725cbf..25fbd7ce444 100644
--- a/libraries/PPP/library.properties
+++ b/libraries/PPP/library.properties
@@ -1,5 +1,5 @@
 name=PPP
-version=3.0.6
+version=3.0.7
 author=Hristo Gochkov
 maintainer=Hristo Gochkov <hristo@espressif.com>
 sentence=Enables network connection using GSM Modem.
diff --git a/libraries/Preferences/library.properties b/libraries/Preferences/library.properties
index 49e233e8df0..a3f65e82ebe 100644
--- a/libraries/Preferences/library.properties
+++ b/libraries/Preferences/library.properties
@@ -1,5 +1,5 @@
 name=Preferences
-version=3.0.6
+version=3.0.7
 author=Hristo Gochkov
 maintainer=Hristo Gochkov <hristo@espressif.com>
 sentence=Provides friendly access to ESP32's Non-Volatile Storage
diff --git a/libraries/RainMaker/library.properties b/libraries/RainMaker/library.properties
index 9cf148b0f13..7da1df55202 100644
--- a/libraries/RainMaker/library.properties
+++ b/libraries/RainMaker/library.properties
@@ -1,5 +1,5 @@
 name=ESP RainMaker
-version=3.0.6
+version=3.0.7
 author=Sweety Mhaiske <switi.mhaiske@espressif.com>
 maintainer=Hristo Gochkov <hristo@espressif.com>
 sentence=ESP RainMaker Support
diff --git a/libraries/SD/library.properties b/libraries/SD/library.properties
index 1a44590539c..855d748b985 100644
--- a/libraries/SD/library.properties
+++ b/libraries/SD/library.properties
@@ -1,5 +1,5 @@
 name=SD
-version=3.0.6
+version=3.0.7
 author=Arduino, SparkFun
 maintainer=Arduino <info@arduino.cc>
 sentence=Enables reading and writing on SD cards. For all Arduino boards.
diff --git a/libraries/SD_MMC/library.properties b/libraries/SD_MMC/library.properties
index 970e7bc3273..f2abfb5bf2c 100644
--- a/libraries/SD_MMC/library.properties
+++ b/libraries/SD_MMC/library.properties
@@ -1,5 +1,5 @@
 name=SD_MMC
-version=3.0.6
+version=3.0.7
 author=Hristo Gochkov, Ivan Grokhtkov
 maintainer=Hristo Gochkov <hristo@espressif.com>
 sentence=ESP32 SDMMC File System
diff --git a/libraries/SPI/library.properties b/libraries/SPI/library.properties
index 68b8a525a56..9566bc09d38 100644
--- a/libraries/SPI/library.properties
+++ b/libraries/SPI/library.properties
@@ -1,5 +1,5 @@
 name=SPI
-version=3.0.6
+version=3.0.7
 author=Hristo Gochkov
 maintainer=Hristo Gochkov <hristo@espressif.com>
 sentence=Enables the communication with devices that use the Serial Peripheral Interface (SPI) Bus. For all Arduino boards, BUT Arduino DUE.
diff --git a/libraries/SPIFFS/library.properties b/libraries/SPIFFS/library.properties
index 5bbc084bd80..04a435a61ef 100644
--- a/libraries/SPIFFS/library.properties
+++ b/libraries/SPIFFS/library.properties
@@ -1,5 +1,5 @@
 name=SPIFFS
-version=3.0.6
+version=3.0.7
 author=Hristo Gochkov, Ivan Grokhtkov
 maintainer=Hristo Gochkov <hristo@espressif.com>
 sentence=ESP32 SPIFFS File System
diff --git a/libraries/SimpleBLE/library.properties b/libraries/SimpleBLE/library.properties
index 767359fd0a4..b27300d7e49 100644
--- a/libraries/SimpleBLE/library.properties
+++ b/libraries/SimpleBLE/library.properties
@@ -1,5 +1,5 @@
 name=SimpleBLE
-version=3.0.6
+version=3.0.7
 author=Hristo Gochkov
 maintainer=Hristo Gochkov <hristo@espressif.com>
 sentence=Provides really simple BLE advertizer with just on and off
diff --git a/libraries/TFLiteMicro/library.properties b/libraries/TFLiteMicro/library.properties
index 7e72f0dd595..888fd48bc3c 100644
--- a/libraries/TFLiteMicro/library.properties
+++ b/libraries/TFLiteMicro/library.properties
@@ -1,5 +1,5 @@
 name=TFLite Micro
-version=3.0.6
+version=3.0.7
 author=Sanket Wadekar
 maintainer=Sanket Wadekar
 sentence=TensorFlow Lite for Microcontrollers
diff --git a/libraries/Ticker/library.properties b/libraries/Ticker/library.properties
index 5b060761f80..76565e0a602 100644
--- a/libraries/Ticker/library.properties
+++ b/libraries/Ticker/library.properties
@@ -1,5 +1,5 @@
 name=Ticker
-version=3.0.6
+version=3.0.7
 author=Bert Melis
 maintainer=Hristo Gochkov <hristo@espressif.com>
 sentence=Allows to call functions with a given interval.
diff --git a/libraries/USB/library.properties b/libraries/USB/library.properties
index 8a704350fdc..b137a5e654b 100644
--- a/libraries/USB/library.properties
+++ b/libraries/USB/library.properties
@@ -1,5 +1,5 @@
 name=USB
-version=3.0.6
+version=3.0.7
 author=Hristo Gochkov
 maintainer=Hristo Gochkov <hristo@espressif.com>
 sentence=ESP32S2 USB Library
diff --git a/libraries/Update/library.properties b/libraries/Update/library.properties
index 49fdcbe7dc1..bf101c15903 100644
--- a/libraries/Update/library.properties
+++ b/libraries/Update/library.properties
@@ -1,5 +1,5 @@
 name=Update
-version=3.0.6
+version=3.0.7
 author=Hristo Gochkov
 maintainer=Hristo Gochkov <hristo@espressif.com>
 sentence=ESP32 Sketch Update Library
diff --git a/libraries/WebServer/library.properties b/libraries/WebServer/library.properties
index 4ccda7ef22d..9d6a2522690 100644
--- a/libraries/WebServer/library.properties
+++ b/libraries/WebServer/library.properties
@@ -1,5 +1,5 @@
 name=WebServer
-version=3.0.6
+version=3.0.7
 author=Ivan Grokhotkov
 maintainer=Ivan Grokhtkov <ivan@esp8266.com>
 sentence=Simple web server library
diff --git a/libraries/WiFi/library.properties b/libraries/WiFi/library.properties
index 24695223078..af476f743df 100644
--- a/libraries/WiFi/library.properties
+++ b/libraries/WiFi/library.properties
@@ -1,5 +1,5 @@
 name=WiFi
-version=3.0.6
+version=3.0.7
 author=Hristo Gochkov
 maintainer=Hristo Gochkov <hristo@espressif.com>
 sentence=Enables network connection (local and Internet) using the ESP32 built-in WiFi.
diff --git a/libraries/WiFiProv/library.properties b/libraries/WiFiProv/library.properties
index 6389f778ca5..ad30cda54be 100644
--- a/libraries/WiFiProv/library.properties
+++ b/libraries/WiFiProv/library.properties
@@ -1,5 +1,5 @@
 name=WiFiProv
-version=3.0.6
+version=3.0.7
 author=Switi Mhaiske <sweetymhaiske@gmail.com>
 maintainer=Hristo Gochkov <hristo@espressif.com>
 sentence=Enables provisioning.
diff --git a/libraries/Wire/library.properties b/libraries/Wire/library.properties
index f9bbc20c38f..42c2dafe487 100644
--- a/libraries/Wire/library.properties
+++ b/libraries/Wire/library.properties
@@ -1,5 +1,5 @@
 name=Wire
-version=3.0.6
+version=3.0.7
 author=Hristo Gochkov
 maintainer=Hristo Gochkov <hristo@espressif.com>
 sentence=Allows the communication between devices or sensors connected via Two Wire Interface Bus. For esp8266 boards.
diff --git a/libraries/Zigbee/library.properties b/libraries/Zigbee/library.properties
index b1d70f01a28..eacc6bf3ce0 100644
--- a/libraries/Zigbee/library.properties
+++ b/libraries/Zigbee/library.properties
@@ -1,5 +1,5 @@
 name=Zigbee
-version=3.0.6
+version=3.0.7
 author=P-R-O-C-H-Y
 maintainer=Jan Procházka <jan.prochazka@espressif.com>
 sentence=Enables zigbee connection with the ESP32
diff --git a/package.json b/package.json
index 9b8ef042b40..f8f50a9cc1b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "framework-arduinoespressif32",
-  "version": "3.0.6",
+  "version": "3.0.7",
   "description": "Arduino Wiring-based Framework for the Espressif ESP32, ESP32-S and ESP32-C series of SoCs",
   "keywords": [
     "framework",
diff --git a/platform.txt b/platform.txt
index 26edee0cdaf..0c961a3ff37 100644
--- a/platform.txt
+++ b/platform.txt
@@ -1,5 +1,5 @@
 name=ESP32 Arduino
-version=3.0.6
+version=3.0.7
 
 tools.esp32-arduino-libs.path={runtime.platform.path}/tools/esp32-arduino-libs
 tools.esp32-arduino-libs.path.windows={runtime.platform.path}\tools\esp32-arduino-libs