Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitbd7a74e

Browse files
authored
Merge pull requestespressif#10202 from espressif/release/v3.1.x
ESP32 Arduino v3.1.x
2 parentsee33ad5 +4fdf9ef commitbd7a74e

File tree

383 files changed

+13701
-3158
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

383 files changed

+13701
-3158
lines changed

‎.github/ISSUE_TEMPLATE/Issue-report.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ body:
55
-type:markdown
66
attributes:
77
value:|
8-
* Before reporting a new issue please check and search in [List of existing issues](https://github.com/espressif/arduino-esp32/issues?q=is%3Aissue)
8+
* Before reporting a new issue please check and search in [List of existing issues](https://github.com/espressif/arduino-esp32/issues?q=is%3Aissue)
99
* Please check [Online Documentation](https://docs.espressif.com/projects/arduino-esp32/en/latest/index.html)
1010
* Take a look on [Troubleshooting guide](https://docs.espressif.com/projects/arduino-esp32/en/latest/troubleshooting.html)
1111
* 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:
2424
description:What development board or other hardware is the chip attached to?
2525
placeholder:ex. DevKitC, plain module on breadboard, etc. If your hardware is custom or unusual, please attach a photo.
2626
validations:
27-
required:true
27+
required:true
2828
-type:textarea
2929
id:other-hw
3030
attributes:
@@ -60,7 +60,7 @@ body:
6060
-v2.0.8
6161
-v2.0.7
6262
-v2.0.6
63-
-v2.0.5
63+
-v2.0.5
6464
-v2.0.4
6565
-v2.0.3
6666
-v2.0.2
@@ -77,7 +77,7 @@ body:
7777
description:What IDE are you using?
7878
placeholder:eg. Arduino IDE, VSCode, Sloeber...
7979
validations:
80-
required:true
80+
required:true
8181
-type:input
8282
id:os
8383
attributes:
@@ -95,13 +95,13 @@ body:
9595
validations:
9696
required:true
9797
-type:dropdown
98-
id:PSRAM
98+
id:PSRAM
9999
attributes:
100100
label:PSRAM enabled
101101
description:Is PSRAM enabled?
102102
options:
103-
-'yes'
104-
-'no'
103+
-"yes"
104+
-"no"
105105
validations:
106106
required:true
107107
-type:input
@@ -116,8 +116,8 @@ body:
116116
id:Description
117117
attributes:
118118
label:Description
119-
description:Please describe your problem here and expectedbehaviour
120-
placeholder:ex. Can't connect/weirdbehaviour/wrong function/missing parameter..
119+
description:Please describe your problem here and expectedbehavior
120+
placeholder:ex. Can't connect/weirdbehavior/wrong function/missing parameter..
121121
validations:
122122
required:true
123123
-type:textarea
@@ -128,7 +128,7 @@ body:
128128
placeholder:ex. Related part of the code to replicate the issue
129129
render:cpp
130130
validations:
131-
required:true
131+
required:true
132132
-type:textarea
133133
id:Debug
134134
attributes:
@@ -137,11 +137,11 @@ body:
137137
placeholder:Enable Core debug level - Debug on tools menu of Arduino IDE, then put the serial output here.
138138
render:plain
139139
validations:
140-
required:true
140+
required:true
141141
-type:textarea
142142
id:other-remarks
143143
attributes:
144-
label:Other Steps to Reproduce
144+
label:Other Steps to Reproduce
145145
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.
146146
placeholder:ex. I also tried on other OS, HW...it works correctly on that setup.
147147
-type:checkboxes

‎.github/ISSUE_TEMPLATE/config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ contact_links:
55
about:Community channel for questions and help
66
-name:ESP32 Forum - Arduino
77
url:https://esp32.com/viewforum.php?f=19
8-
about:Official Forum for questions
8+
about:Official Forum for questions

‎.github/scripts/check-cmakelists.sh‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/bin/bash
2+
23
#
34
# This script is used in the CI workflow. It checks all non-examples source files in libraries/ and cores/ are listed in
45
# CMakeLists.txt for the cmake-based IDF component
@@ -12,10 +13,10 @@ set -e
1213
git submodule update --init --recursive
1314

1415
# find all source files in repo
15-
REPO_SRCS=`find cores/esp32/ libraries/ -name'examples' -prune -o -name'*.c' -print -o -name'*.cpp' -print| sort`
16+
REPO_SRCS=$(find cores/esp32/ libraries/ -name'examples' -prune -o -name'*.c' -print -o -name'*.cpp' -print| sort)
1617

1718
# find all source files named in CMakeLists.txt COMPONENT_SRCS
18-
CMAKE_SRCS=`cmake --trace-expand -P CMakeLists.txt2>&1| grep set\(srcs| cut -d'(' -f3| sed's/ )//'| sed's/srcs //'| tr' ;''\n'| sort`
19+
CMAKE_SRCS=$(cmake --trace-expand -P CMakeLists.txt2>&1| grep set\(srcs| cut -d'(' -f3| sed's/ )//'| sed's/srcs //'| tr' ;''\n'| sort)
1920

2021
if! diff -u0 --label"Repo Files" --label"srcs"<(echo"$REPO_SRCS")<(echo"$CMAKE_SRCS");then
2122
echo"Source files in repo (-) and source files in CMakeLists.txt (+) don't match"

‎.github/scripts/find_all_boards.sh‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
# Get all boards
44
boards_array=()
55

6-
forlinein`grep'.tarch=' boards.txt`;do
6+
boards_list=$(grep'.tarch=' boards.txt)
7+
8+
whileread -r line;do
79
board_name=$(echo"$line"| cut -d'.' -f1| cut -d'#' -f1)
810
# skip esp32c2 as we dont build libs for it
911
if ["$board_name"=="esp32c2" ];then
@@ -12,29 +14,26 @@ for line in `grep '.tarch=' boards.txt`; do
1214
fi
1315
boards_array+=("espressif:esp32:$board_name")
1416
echo"Added 'espressif:esp32:$board_name' to array"
15-
done
17+
done<<<"$boards_list"
1618

1719
# Create JSON like string with all boards found and pass it to env variable
1820
board_count=${#boards_array[@]}
1921
echo"Boards found:$board_count"
20-
echo"BOARD-COUNT=$board_count">>$GITHUB_ENV
22+
echo"BOARD-COUNT=$board_count">>"$GITHUB_ENV"
2123

22-
if [$board_count-gt 0 ]
23-
then
24+
if ["$board_count"-gt 0 ];then
2425
json_matrix='['
25-
forboardin${boards_array[@]}
26-
do
26+
forboardin"${boards_array[@]}";do
2727
json_matrix+='"'$board'"'
28-
if [$board_count-gt 1 ]
29-
then
28+
if ["$board_count"-gt 1 ];then
3029
json_matrix+=","
3130
fi
32-
board_count=$(($board_count-1))
31+
board_count=$((board_count-1))
3332
done
3433
json_matrix+=']'
3534

36-
echo$json_matrix
37-
echo"FQBNS=${json_matrix}">>$GITHUB_ENV
35+
echo"$json_matrix"
36+
echo"FQBNS=${json_matrix}">>"$GITHUB_ENV"
3837
else
39-
echo"FQBNS=">>$GITHUB_ENV
38+
echo"FQBNS=">>"$GITHUB_ENV"
4039
fi

‎.github/scripts/find_new_boards.sh‎

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@ owner_repository=$1
55
base_ref=$2
66

77
# Download the boards.txt file from the base branch
8-
curl -L -o boards_base.txt https://raw.githubusercontent.com/$owner_repository/$base_ref/boards.txt
8+
curl -L -o boards_base.txt https://raw.githubusercontent.com/"$owner_repository"/"$base_ref"/boards.txt
99

1010
# Compare boards.txt file in the repo with the modified file from PR
1111
diff=$(diff -u boards_base.txt boards.txt)
1212

1313
# Check if the diff is empty
14-
if [-z"$diff" ]
15-
then
14+
if [-z"$diff" ];then
1615
echo"No changes in boards.txt file"
1716
echo"FQBNS="
1817
exit 0
@@ -21,23 +20,20 @@ fi
2120
# Extract added or modified lines (lines starting with '+' or '-')
2221
modified_lines=$(echo"$diff"| grep -E'^[+-][^+-]')
2322

24-
# Print the modified lines for debugging
23+
#Print the modified lines for debugging
2524
echo"Modified lines:"
2625
echo"$modified_lines"
2726

2827
boards_array=()
2928
previous_board=""
3029

3130
# Extract board names from the modified lines, and add them to the boards_array
32-
whileread -r line
33-
do
31+
whileread -r line;do
3432
board_name=$(echo"$line"| cut -d'.' -f1| cut -d'#' -f1)
3533
# remove + or - from the board name at the beginning
36-
board_name=$(echo"$board_name"| sed's/^[+-]//')
37-
if ["$board_name"!="" ]&& ["$board_name"!="+" ]&& ["$board_name"!="-" ]&& ["$board_name"!="esp32_family" ]
38-
then
39-
if ["$board_name"!="$previous_board" ]
40-
then
34+
board_name=${board_name#[-+]}
35+
if ["$board_name"!="" ]&& ["$board_name"!="+" ]&& ["$board_name"!="-" ]&& ["$board_name"!="esp32_family" ];then
36+
if ["$board_name"!="$previous_board" ];then
4137
boards_array+=("espressif:esp32:$board_name")
4238
previous_board="$board_name"
4339
echo"Added 'espressif:esp32:$board_name' to array"
@@ -48,22 +44,19 @@ done <<< "$modified_lines"
4844
# Create JSON like string with all boards found and pass it to env variable
4945
board_count=${#boards_array[@]}
5046

51-
if [$board_count-gt 0 ]
52-
then
47+
if ["$board_count"-gt 0 ];then
5348
json_matrix='{"fqbn": ['
54-
forboardin${boards_array[@]}
55-
do
49+
forboardin"${boards_array[@]}";do
5650
json_matrix+='"'$board'"'
57-
if [$board_count-gt 1 ]
58-
then
51+
if ["$board_count"-gt 1 ];then
5952
json_matrix+=","
6053
fi
61-
board_count=$(($board_count-1))
54+
board_count=$((board_count-1))
6255
done
6356
json_matrix+=']}'
6457

65-
echo$json_matrix
66-
echo"FQBNS=${json_matrix}">>$GITHUB_ENV
58+
echo"$json_matrix"
59+
echo"FQBNS=${json_matrix}">>"$GITHUB_ENV"
6760
else
68-
echo"FQBNS=">>$GITHUB_ENV
69-
fi
61+
echo"FQBNS=">>"$GITHUB_ENV"
62+
fi

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
OSBITS=`uname -m`
3+
OSBITS=$(uname -m)
44
if [["$OSTYPE"=="linux"* ]];then
55
export OS_IS_LINUX="1"
66
if [["$OSBITS"=="i686" ]];then
@@ -49,4 +49,3 @@ if [ ! -d "$ARDUINO_IDE_PATH" ] || [ ! -f "$ARDUINO_IDE_PATH/arduino-cli" ]; the
4949
curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh| BINDIR="$ARDUINO_IDE_PATH" sh
5050
fi
5151
fi
52-

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ if [ ! -d "$ARDUINO_ESP32_PATH" ]; then
55
echo"Installing ESP32 Arduino Core ..."
66
script_init_path="$PWD"
77
mkdir -p"$ARDUINO_USR_PATH/hardware/espressif"
8-
cd"$ARDUINO_USR_PATH/hardware/espressif"
8+
cd"$ARDUINO_USR_PATH/hardware/espressif"||exit
99

1010
echo"Installing Python Serial ..."
1111
pip install pyserial> /dev/null
@@ -15,25 +15,25 @@ if [ ! -d "$ARDUINO_ESP32_PATH" ]; then
1515
pip install requests> /dev/null
1616
fi
1717

18-
if [!-z"$GITHUB_REPOSITORY" ];then
18+
if [-n"$GITHUB_REPOSITORY" ];then
1919
echo"Linking Core..."
20-
ln -s$GITHUB_WORKSPACE esp32
20+
ln -s"$GITHUB_WORKSPACE" esp32
2121
else
2222
echo"Cloning Core Repository..."
2323
git clone https://github.com/espressif/arduino-esp32.git esp32> /dev/null2>&1
2424
fi
2525

2626
#echo "Updating Submodules ..."
27-
cd esp32
27+
cd esp32||exit
2828
#git submodule update --init --recursive > /dev/null 2>&1
2929

3030
echo"Installing Platform Tools ..."
3131
if ["$OS_IS_WINDOWS"=="1" ];then
32-
cd tools&& ./get.exe
32+
cd tools&& ./get.exe
3333
else
34-
cd tools&& python get.py
34+
cd tools&& python get.py
3535
fi
36-
cd$script_init_path
36+
cd"$script_init_path"||exit
3737

3838
echo"ESP32 Arduino has been installed in '$ARDUINO_ESP32_PATH'"
3939
echo""

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#OSTYPE: 'msys', ARCH: 'x86_64' => win32
55
#OSTYPE: 'darwin18', ARCH: 'i386' => macos
66

7-
OSBITS=`uname -m`
7+
OSBITS=$(uname -m)
88
if [["$OSTYPE"=="linux"* ]];then
99
export OS_IS_LINUX="1"
1010
ARCHIVE_FORMAT="tar.xz"
@@ -77,4 +77,3 @@ if [ ! -d "$ARDUINO_IDE_PATH" ]; then
7777
echo"Arduino IDE Installed in '$ARDUINO_IDE_PATH'"
7878
echo""
7979
fi
80-

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp