Merge branch 'espressif:master' into master

Author: bmorcelli

.codespellrc

@@ -1,9 +1,8 @@
 [codespell]
 # Source: https://github.com/arduino/tooling-project-assets/blob/main/workflow-templates/assets/spell-check/.codespellrc
 # In the event of a false positive, add the problematic word, in all lowercase, to a comma-separated list here:
-ignore-words-list = ba,licence,ot,dout,als,exten,acount,totaly,pasttime
+ignore-words-list = ba,licence,ot,dout,als,exten
 skip = ./.git,./.licenses,__pycache__,.clang-format,.codespellrc,.editorconfig,.flake8,.prettierignore,.yamllint.yml,.gitignore,boards.txt,platform.txt,programmers.txt
 builtin = clear,informal,en-GB_to_en-US
 check-filenames =
 check-hidden =
-write-changes =

.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}]

.github/ISSUE_TEMPLATE/Issue-report.yml

@@ -5,7 +5,7 @@ body:
  - type: markdown
 attributes:
 value: |
- * Before reporting a new issue please check and search in [List of existing issues](https://github.com/espressif/arduino-esp32/issues?q=is%3Aissue)
+ * Before reporting a new issue please check and search in [List of existing issues](https://github.com/espressif/arduino-esp32/issues?q=is%3Aissue)
  * Please check [Online Documentation](https://docs.espressif.com/projects/arduino-esp32/en/latest/index.html)
  * Take a look on [Troubleshooting guide](https://docs.espressif.com/projects/arduino-esp32/en/latest/troubleshooting.html)
  * If still experiencing the issue, please provide as many details as possible below about your hardware, computer setup and code.
@@ -24,7 +24,7 @@ body:
 description: What development board or other hardware is the chip attached to?
 placeholder: ex. DevKitC, plain module on breadboard, etc. If your hardware is custom or unusual, please attach a photo.
 validations:
-required: true
+required: true
  - type: textarea
 id: other-hw
 attributes:
@@ -41,6 +41,13 @@ body:
 options:
  - latest master (checkout manually)
  - latest development Release Candidate (RC-X)
+ - v3.1.0
+ - v3.0.7
+ - v3.0.6
+ - v3.0.5
+ - v3.0.4
+ - v3.0.3
+ - v3.0.2
  - v3.0.1
  - v3.0.0
  - v2.0.17
@@ -55,7 +62,7 @@ body:
  - v2.0.8
  - v2.0.7
  - v2.0.6
- - v2.0.5
+ - v2.0.5
  - v2.0.4
  - v2.0.3
  - v2.0.2
@@ -70,9 +77,9 @@ body:
 attributes:
 label: IDE Name
 description: What IDE are you using?
-placeholder: eg. Arduino IDE, PlatformIO, Sloeber...
+placeholder: eg. Arduino IDE, VSCode, Sloeber...
 validations:
-required: true
+required: true
  - type: input
 id: os
 attributes:
@@ -90,13 +97,13 @@ body:
 validations:
 required: true
  - type: dropdown
-id: PSRAM
+id: PSRAM
 attributes:
 label: PSRAM enabled
 description: Is PSRAM enabled?
 options:
- - 'yes'
- - 'no'
+ - "yes"
+ - "no"
 validations:
 required: true
  - type: input
@@ -111,8 +118,8 @@ body:
 id: Description
 attributes:
 label: Description
-description: Please describe your problem here and expected behaviour
-placeholder: ex. Can't connect/weird behaviour/wrong function/missing parameter..
+description: Please describe your problem here and expected behavior
+placeholder: ex. Can't connect/weird behavior/wrong function/missing parameter..
 validations:
 required: true
  - type: textarea
@@ -123,7 +130,7 @@ body:
 placeholder: ex. Related part of the code to replicate the issue
 render: cpp
 validations:
-required: true
+required: true
  - type: textarea
 id: Debug
 attributes:
@@ -132,11 +139,11 @@ body:
 placeholder: Enable Core debug level - Debug on tools menu of Arduino IDE, then put the serial output here.
 render: plain
 validations:
-required: true
+required: true
  - type: textarea
 id: other-remarks
 attributes:
-label: Other Steps to Reproduce
+label: Other Steps to Reproduce
 description: Is there any other information you can think of which will help us reproduce this problem? Any additional info can be added as well.
 placeholder: ex. I also tried on other OS, HW...it works correctly on that setup.
  - type: checkboxes

.github/ISSUE_TEMPLATE/config.yml

@@ -5,4 +5,4 @@ contact_links:
 about: Community channel for questions and help
  - name: ESP32 Forum - Arduino
 url: https://esp32.com/viewforum.php?f=19
-about: Official Forum for questions
+about: Official Forum for questions

.github/scripts/check-cmakelists.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+
 #
 # This script is used in the CI workflow. It checks all non-examples source files in libraries/ and cores/ are listed in
 # CMakeLists.txt for the cmake-based IDF component
@@ -12,10 +13,10 @@ set -e
 git submodule update --init --recursive
 
 # find all source files in repo
-REPO_SRCS=`find cores/esp32/ libraries/ -name 'examples' -prune -o -name '*.c' -print -o -name '*.cpp' -print | sort`
+REPO_SRCS=$(find cores/esp32/ libraries/ -name 'examples' -prune -o -name '*.c' -print -o -name '*.cpp' -print | sort)
 
 # find all source files named in CMakeLists.txt COMPONENT_SRCS
-CMAKE_SRCS=`cmake --trace-expand -P CMakeLists.txt 2>&1| grep set\(srcs | cut -d'(' -f3 | sed 's/ )//'| sed 's/srcs //'| tr ' ;''\n'| sort`
+CMAKE_SRCS=$(cmake --trace-expand -P CMakeLists.txt 2>&1| grep set\(srcs | cut -d'(' -f3 | sed 's/ )//'| sed 's/srcs //'| tr ' ;''\n'| sort)
 
 if! diff -u0 --label "Repo Files" --label "srcs"<(echo "$REPO_SRCS")<(echo "$CMAKE_SRCS");then
 echo"Source files in repo (-) and source files in CMakeLists.txt (+) don't match"

.github/scripts/find_all_boards.sh

@@ -3,7 +3,9 @@
 # Get all boards
 boards_array=()
 
-forlinein`grep '.tarch=' boards.txt`;do
+boards_list=$(grep '.tarch=' boards.txt)
+
+whileread -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
@@ -12,29 +14,26 @@ for line in `grep '.tarch=' boards.txt`; do
 fi
  boards_array+=("espressif:esp32:$board_name")
 echo"Added 'espressif:esp32:$board_name' to array"
-done
+done<<<"$boards_list"
 
 # Create JSON like string with all boards found and pass it to env variable
 board_count=${#boards_array[@]}
 echo"Boards found: $board_count"
-echo"BOARD-COUNT=$board_count">>$GITHUB_ENV
+echo"BOARD-COUNT=$board_count">>"$GITHUB_ENV"
 
-if [ $board_count-gt 0 ]
-then
+if [ "$board_count"-gt 0 ];then
  json_matrix='['
-forboardin${boards_array[@]}
-do
+forboardin"${boards_array[@]}";do
  json_matrix+='"'$board'"'
-if [ $board_count-gt 1 ]
-then
+if [ "$board_count"-gt 1 ];then
  json_matrix+=","
 fi
- board_count=$(($board_count-1))
+ board_count=$((board_count -1))
 done
  json_matrix+=']'
 
-echo$json_matrix
-echo"FQBNS=${json_matrix}">>$GITHUB_ENV
+echo"$json_matrix"
+echo"FQBNS=${json_matrix}">>"$GITHUB_ENV"
 else
-echo"FQBNS=">>$GITHUB_ENV
+echo"FQBNS=">>"$GITHUB_ENV"
 fi

.github/scripts/find_new_boards.sh

@@ -2,89 +2,61 @@
 
 # Get inputs from command
 owner_repository=$1
-pr_number=$2
+base_ref=$2
 
-url="https://api.github.com/repos/$owner_repository/pulls/$pr_number/files"
-echo$url
+# Download the boards.txt file from the base branch
+curl -L -o boards_base.txt https://raw.githubusercontent.com/"$owner_repository"/"$base_ref"/boards.txt
 
-#Get changes in boards.txt file from PR
-Patch=$(curl $url| jq -r '.[] | select(.filename == "boards.txt") | .patch ')
+#Compare boards.txt file in the repo with the modified file from PR
+diff=$(diff -u boards_base.txt boards.txt)
 
-# Extract only changed lines number and count
-substring_patch=$(echo "$Patch"| grep -o '@@[^@]*@@')
+# Check if the diff is empty
+if [ -z"$diff" ];then
+echo"No changes in boards.txt file"
+echo"FQBNS="
+exit 0
+fi
 
-params_array=()
+# Extract added or modified lines (lines starting with '+' or '-')
+modified_lines=$(echo "$diff"| grep -E '^[+-][^+-]')
 
-IFS=$'\n'read -d '' -ra params <<<$(echo"$substring_patch"| grep -oE '[-+][0-9]+,[0-9]+')
-
-forparamin"${params[@]}"
-do
-echo"The parameter is $param"
- params_array+=("$param")
-done
+# Print the modified lines for debugging
+echo"Modified lines:"
+echo"$modified_lines"
 
 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))
-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
-
-whileread -r line
-do
- i=$((i+1))
-if [ $i-lt$addition_line ]
-then
-continue
-elif [ $i-gt$addition_end ]
-then
-break
-fi
+# Extract board names from the modified lines, and add them to the boards_array
+whileread -r line;do
  board_name=$(echo "$line"| cut -d '.' -f1 | cut -d '#' -f1)
-if [ "$board_name"!="" ] && [ "$board_name"!="esp32_family" ]
-then
-if[ "$board_name"!="$previous_board" ]
-then
+# remove + or - from the board name at the beginning
+board_name=${board_name#[-+]}
+if [ "$board_name"!="" ] &&[ "$board_name"!="+" ] && [ "$board_name"!="-" ] && [ "$board_name"!="esp32_family" ];then
+if [ "$board_name"!="$previous_board" ];then
  boards_array+=("espressif:esp32:$board_name")
  previous_board="$board_name"
 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[@]}
 
-if [ $board_count-gt 0 ]
-then
+if [ "$board_count"-gt 0 ];then
  json_matrix='{"fqbn": ['
-forboardin${boards_array[@]}
-do
+forboardin"${boards_array[@]}";do
  json_matrix+='"'$board'"'
-if [ $board_count-gt 1 ]
-then
+if [ "$board_count"-gt 1 ];then
  json_matrix+=","
 fi
- board_count=$(($board_count-1))
+ board_count=$((board_count -1))
 done
  json_matrix+=']}'
 
-echo$json_matrix
-echo"FQBNS=${json_matrix}">>$GITHUB_ENV
+echo"$json_matrix"
+echo"FQBNS=${json_matrix}">>"$GITHUB_ENV"
 else
-echo"FQBNS=">>$GITHUB_ENV
-fi
+echo"FQBNS=">>"$GITHUB_ENV"
+fi

.github/scripts/install-arduino-cli.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-OSBITS=`uname -m`
+OSBITS=$(uname -m)
 if [[ "$OSTYPE"=="linux"* ]];then
 export OS_IS_LINUX="1"
 if [[ "$OSBITS"=="i686" ]];then
@@ -41,6 +41,11 @@ fi
 if [ !-d"$ARDUINO_IDE_PATH" ] || [ !-f"$ARDUINO_IDE_PATH/arduino-cli" ];then
 echo"Installing Arduino CLI on $OS_NAME ..."
  mkdir -p "$ARDUINO_IDE_PATH"
- curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh | BINDIR="$ARDUINO_IDE_PATH" sh
+if [ "$OS_IS_WINDOWS"=="1" ];then
+ curl -fsSL https://downloads.arduino.cc/arduino-cli/arduino-cli_latest_Windows_64bit.zip -o arduino-cli.zip
+ unzip -q arduino-cli.zip -d "$ARDUINO_IDE_PATH"
+ rm arduino-cli.zip
+else
+ curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh | BINDIR="$ARDUINO_IDE_PATH" sh
+fi
 fi
-

.github/scripts/install-arduino-core-esp32.sh

@@ -5,7 +5,7 @@ if [ ! -d "$ARDUINO_ESP32_PATH" ]; then
 echo"Installing ESP32 Arduino Core ..."
  script_init_path="$PWD"
  mkdir -p "$ARDUINO_USR_PATH/hardware/espressif"
-cd"$ARDUINO_USR_PATH/hardware/espressif"
+cd"$ARDUINO_USR_PATH/hardware/espressif"||exit
 
 echo"Installing Python Serial ..."
  pip install pyserial > /dev/null
@@ -15,25 +15,25 @@ if [ ! -d "$ARDUINO_ESP32_PATH" ]; then
  pip install requests > /dev/null
 fi
 
-if [ !-z"$GITHUB_REPOSITORY" ];then
+if [ -n"$GITHUB_REPOSITORY" ];then
 echo"Linking Core..."
- ln -s $GITHUB_WORKSPACE esp32
+ ln -s "$GITHUB_WORKSPACE" esp32
 else
 echo"Cloning Core Repository..."
  git clone https://github.com/espressif/arduino-esp32.git esp32 > /dev/null 2>&1
 fi
 
 #echo "Updating Submodules ..."
-cd esp32
+cd esp32||exit
 #git submodule update --init --recursive > /dev/null 2>&1
 
 echo"Installing Platform Tools ..."
 if [ "$OS_IS_WINDOWS"=="1" ];then
-cd tools && ./get.exe
+cd tools && ./get.exe
 else
-cd tools && python get.py
+cd tools && python get.py
 fi
-cd$script_init_path
+cd"$script_init_path"||exit
 
 echo"ESP32 Arduino has been installed in '$ARDUINO_ESP32_PATH'"
 echo""

.github/scripts/install-arduino-ide.sh

@@ -4,7 +4,7 @@
 #OSTYPE: 'msys', ARCH: 'x86_64' => win32
 #OSTYPE: 'darwin18', ARCH: 'i386' => macos
 
-OSBITS=`uname -m`
+OSBITS=$(uname -m)
 if [[ "$OSTYPE"=="linux"* ]];then
 export OS_IS_LINUX="1"
  ARCHIVE_FORMAT="tar.xz"
@@ -77,4 +77,3 @@ if [ ! -d "$ARDUINO_IDE_PATH" ]; then
 echo"Arduino IDE Installed in '$ARDUINO_IDE_PATH'"
 echo""
 fi
-