Skip to content

Commit db64f57

Browse files
cubeinhabitantcubeinhabitant
authored
Merge branch 'espressif:master' into master
2 parents f4d3b1c + 23d715a commit db64f57

File tree

1,126 files changed

+342553
-9273
lines changed

Some content is hidden

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

1,126 files changed

+342553
-9273
lines changed

‎.github/ISSUE_TEMPLATE/Issue-report.yml

+1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ body:
4141
options:
4242
- latest master (checkout manually)
4343
- latest development Release Candidate (RC-X)
44+
- v2.0.6
4445
- v2.0.5
4546
- v2.0.4
4647
- v2.0.3

‎.github/scripts/install-platformio-esp32.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ export PLATFORMIO_ESP32_PATH="$HOME/.platformio/packages/framework-arduinoespres
44
PLATFORMIO_ESP32_URL="https://github.com/platformio/platform-espressif32.git"
55

66
TOOLCHAIN_VERSION="8.4.0+2021r2-patch3"
7-
ESPTOOLPY_VERSION="~1.30100.0"
7+
ESPTOOLPY_VERSION="~1.40201.0"
88
ESPRESSIF_ORGANIZATION_NAME="espressif"
99

1010
echo "Installing Python Wheel ..."

‎.github/scripts/on-push.sh

+7-20
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,13 @@ if [ "$BUILD_PIO" -eq 0 ]; then
7171
$ARDUINO_ESP32_PATH/libraries/WiFiClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino\
7272
$ARDUINO_ESP32_PATH/libraries/BLE/examples/BLE_server/BLE_server.ino\
7373
$ARDUINO_ESP32_PATH/libraries/ESP32/examples/Camera/CameraWebServer/CameraWebServer.ino\
74+
$ARDUINO_ESP32_PATH/libraries/Insights/examples/MinimalDiagnostics/MinimalDiagnostics.ino\
7475
"
7576

7677
SKETCHES_ESP32XX="\
7778
$ARDUINO_ESP32_PATH/libraries/WiFiClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino\
7879
$ARDUINO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino\
80+
$ARDUINO_ESP32_PATH/libraries/Insights/examples/MinimalDiagnostics/MinimalDiagnostics.ino\
7981
"
8082

8183
build "esp32s3" $FQBN_ESP32S3 $CHUNK_INDEX $CHUNKS_CNT $SKETCHES_ESP32
@@ -93,26 +95,11 @@ else
9395
build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/BLE/examples/BLE_server/BLE_server.ino" && \
9496
build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/ESP32/examples/Camera/CameraWebServer/CameraWebServer.ino"
9597

96-
# PlatformIO ESP32 Test
97-
# OPTIONS="board_build.mcu = esp32s2"
98-
# build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino" && \
99-
# build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/WiFiClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino"
100-
101-
python -m platformio ci --board "$BOARD" "$PLATFORMIO_ESP32_PATH/libraries/WiFi/examples/WiFiClient" --project-option="board_build.mcu = esp32s2" --project-option="board_build.partitions = huge_app.csv"
102-
python -m platformio ci --board "$BOARD" "$PLATFORMIO_ESP32_PATH/libraries/WiFi/examples/WiFiClient" --project-option="board_build.mcu = esp32c3" --project-option="board_build.partitions = huge_app.csv"
103-
104-
echo "Hacking in S3 support ..."
105-
replace_script="import json; import os;"
106-
replace_script+="fp=open(os.path.expanduser('~/.platformio/platforms/espressif32/platform.json'), 'r+');"
107-
replace_script+="data=json.load(fp);"
108-
replace_script+="data['packages']['toolchain-xtensa-esp32']['optional']=True;"
109-
replace_script+="data['packages']['toolchain-xtensa-esp32s3']['optional']=False;"
110-
replace_script+="data['packages']['tool-esptoolpy']['owner']='tasmota';"
111-
replace_script+="data['packages']['tool-esptoolpy']['version']='https://github.com/tasmota/esptool/releases/download/v4.2.1/esptool-4.2.1.zip';"
112-
replace_script+="fp.seek(0);fp.truncate();json.dump(data, fp, indent=2);fp.close()"
113-
python -c "$replace_script"
114-
115-
python -m platformio ci --board "$BOARD" "$PLATFORMIO_ESP32_PATH/libraries/WiFi/examples/WiFiClient" --project-option="board_build.mcu = esp32s3" --project-option="board_build.partitions = huge_app.csv"
98+
# Basic sanity testing for other series
99+
for board in "esp32-c3-devkitm-1" "esp32-s2-saola-1" "esp32-s3-devkitc-1"
100+
do
101+
python -m platformio ci --board "$board" "$PLATFORMIO_ESP32_PATH/libraries/WiFi/examples/WiFiClient" --project-option="board_build.partitions = huge_app.csv"
102+
done
116103

117104
#build_pio_sketches "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries"
118105
fi

‎.github/scripts/on-release.sh

+22-15
Original file line numberDiff line numberDiff line change
@@ -171,20 +171,22 @@ mkdir -p "$PKG_DIR/tools"
171171

172172
# Copy all core files to the package folder
173173
echo "Copying files for packaging ..."
174-
cp -f "$GITHUB_WORKSPACE/boards.txt" "$PKG_DIR/"
175-
cp -f "$GITHUB_WORKSPACE/package.json" "$PKG_DIR/"
176-
cp -f "$GITHUB_WORKSPACE/programmers.txt" "$PKG_DIR/"
177-
cp -Rf "$GITHUB_WORKSPACE/cores" "$PKG_DIR/"
178-
cp -Rf "$GITHUB_WORKSPACE/libraries" "$PKG_DIR/"
179-
cp -Rf "$GITHUB_WORKSPACE/variants" "$PKG_DIR/"
180-
cp -f "$GITHUB_WORKSPACE/tools/espota.exe" "$PKG_DIR/tools/"
181-
cp -f "$GITHUB_WORKSPACE/tools/espota.py" "$PKG_DIR/tools/"
182-
cp -f "$GITHUB_WORKSPACE/tools/esptool.py" "$PKG_DIR/tools/"
183-
cp -f "$GITHUB_WORKSPACE/tools/gen_esp32part.py" "$PKG_DIR/tools/"
184-
cp -f "$GITHUB_WORKSPACE/tools/gen_esp32part.exe" "$PKG_DIR/tools/"
185-
cp -Rf "$GITHUB_WORKSPACE/tools/partitions" "$PKG_DIR/tools/"
186-
cp -Rf "$GITHUB_WORKSPACE/tools/sdk" "$PKG_DIR/tools/"
187-
cp -f $GITHUB_WORKSPACE/tools/platformio-build*.py "$PKG_DIR/tools/"
174+
cp -f "$GITHUB_WORKSPACE/boards.txt" "$PKG_DIR/"
175+
cp -f "$GITHUB_WORKSPACE/package.json" "$PKG_DIR/"
176+
cp -f "$GITHUB_WORKSPACE/programmers.txt" "$PKG_DIR/"
177+
cp -Rf "$GITHUB_WORKSPACE/cores" "$PKG_DIR/"
178+
cp -Rf "$GITHUB_WORKSPACE/libraries" "$PKG_DIR/"
179+
cp -Rf "$GITHUB_WORKSPACE/variants" "$PKG_DIR/"
180+
cp -f "$GITHUB_WORKSPACE/tools/espota.exe" "$PKG_DIR/tools/"
181+
cp -f "$GITHUB_WORKSPACE/tools/espota.py" "$PKG_DIR/tools/"
182+
cp -f "$GITHUB_WORKSPACE/tools/gen_esp32part.py" "$PKG_DIR/tools/"
183+
cp -f "$GITHUB_WORKSPACE/tools/gen_esp32part.exe" "$PKG_DIR/tools/"
184+
cp -f "$GITHUB_WORKSPACE/tools/gen_insights_package.py" "$PKG_DIR/tools/"
185+
cp -f "$GITHUB_WORKSPACE/tools/gen_insights_package.exe" "$PKG_DIR/tools/"
186+
cp -Rf "$GITHUB_WORKSPACE/tools/partitions" "$PKG_DIR/tools/"
187+
cp -Rf "$GITHUB_WORKSPACE/tools/ide-debug" "$PKG_DIR/tools/"
188+
cp -Rf "$GITHUB_WORKSPACE/tools/sdk" "$PKG_DIR/tools/"
189+
cp -f $GITHUB_WORKSPACE/tools/platformio-build*.py "$PKG_DIR/tools/"
188190

189191
# Remove unnecessary files in the package folder
190192
echo "Cleaning up folders ..."
@@ -197,7 +199,12 @@ cat "$GITHUB_WORKSPACE/platform.txt" | \
197199
sed "s/version=.*/version=$ver$extent/g" | \
198200
sed 's/runtime.tools.xtensa-esp32-elf-gcc.path={runtime.platform.path}\/tools\/xtensa-esp32-elf//g' | \
199201
sed 's/runtime.tools.xtensa-esp32s2-elf-gcc.path={runtime.platform.path}\/tools\/xtensa-esp32s2-elf//g' | \
200-
sed 's/tools.esptool_py.path={runtime.platform.path}\/tools\/esptool/tools.esptool_py.path=\{runtime.tools.esptool_py.path\}/g' \
202+
sed 's/runtime.tools.xtensa-esp32s3-elf-gcc.path={runtime.platform.path}\/tools\/xtensa-esp32s3-elf//g' | \
203+
sed 's/runtime.tools.riscv32-esp-elf-gcc.path={runtime.platform.path}\/tools\/riscv32-esp-elf//g' | \
204+
sed 's/tools.esptool_py.path={runtime.platform.path}\/tools\/esptool/tools.esptool_py.path=\{runtime.tools.esptool_py.path\}/g' | \
205+
sed 's/debug.server.openocd.path={runtime.platform.path}\/tools\/openocd-esp32\/bin\/openocd/debug.server.openocd.path=\{runtime.tools.openocd-esp32.path\}\/bin\/openocd/g' | \
206+
sed 's/debug.server.openocd.scripts_dir={runtime.platform.path}\/tools\/openocd-esp32\/share\/openocd\/scripts\//debug.server.openocd.scripts_dir=\{runtime.tools.openocd-esp32.path\}\/share\/openocd\/scripts\//g' | \
207+
sed 's/debug.server.openocd.scripts_dir.windows={runtime.platform.path}\\tools\\openocd-esp32\\share\\openocd\\scripts\\/debug.server.openocd.scripts_dir.windows=\{runtime.tools.openocd-esp32.path\}\\share\\openocd\\scripts\\/g' \
201208
> "$PKG_DIR/platform.txt"
202209

203210
# Add header with version information

‎.github/workflows/docs.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
run:
2323
shell: bash
2424
steps:
25-
- uses: actions/checkout@v2
25+
- uses: actions/checkout@v3
2626
with:
2727
submodules: true
28-
- uses: actions/setup-python@v2
28+
- uses: actions/setup-python@v4
2929
with:
3030
python-version: '3.x'
3131
- name: Build

‎.github/workflows/gh-pages.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
name: Build GitHub Pages
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v2
19+
- uses: actions/checkout@v3
2020
- name: Copy Files
2121
env:
2222
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/hil.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
chunks: ${{ steps.gen-chunks.outputs.chunks }}
2626
steps:
2727
- name: Checkout Repository
28-
uses: actions/checkout@v2
28+
uses: actions/checkout@v3
2929

3030
- name: Generate Chunks matrix
3131
id: gen-chunks
@@ -52,7 +52,7 @@ jobs:
5252

5353
steps:
5454
- name: Checkout Repository
55-
uses: actions/checkout@v2
55+
uses: actions/checkout@v3
5656

5757
- name: Build sketches
5858
run: |
@@ -84,7 +84,7 @@ jobs:
8484

8585
steps:
8686
- name: Checkout repository
87-
uses: actions/checkout@v2
87+
uses: actions/checkout@v3
8888

8989
- name: Download ${{matrix.chip}}-${{matrix.chunks}} artifacts
9090
uses: actions/download-artifact@v2

‎.github/workflows/push.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
name: Check cmake file
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: actions/checkout@v2
21+
- uses: actions/checkout@v3
2222
- run: bash ./.github/scripts/check-cmakelists.sh
2323

2424
# Ubuntu
@@ -30,13 +30,13 @@ jobs:
3030
chunk: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14]
3131

3232
steps:
33-
- uses: actions/checkout@v2
34-
- uses: actions/setup-python@v2
33+
- uses: actions/checkout@v3
34+
- uses: actions/setup-python@v4
3535
with:
3636
python-version: '3.x'
3737
- name: Cache tools
3838
id: cache-linux
39-
uses: actions/cache@v2
39+
uses: actions/cache@v3
4040
with:
4141
path: |
4242
./tools/dist
@@ -56,8 +56,8 @@ jobs:
5656
os: [windows-latest, macOS-latest]
5757

5858
steps:
59-
- uses: actions/checkout@v2
60-
- uses: actions/setup-python@v2
59+
- uses: actions/checkout@v3
60+
- uses: actions/setup-python@v4
6161
with:
6262
python-version: '3.x'
6363
- name: Build Sketches
@@ -72,8 +72,8 @@ jobs:
7272
os: [ubuntu-latest, windows-latest, macOS-latest]
7373

7474
steps:
75-
- uses: actions/checkout@v2
76-
- uses: actions/setup-python@v2
75+
- uses: actions/checkout@v3
76+
- uses: actions/setup-python@v4
7777
with:
7878
python-version: '3.x'
7979
- name: Build Sketches
@@ -93,7 +93,7 @@ jobs:
9393
container: espressif/idf:${{ matrix.idf_ver }}
9494
steps:
9595
- name: Check out arduino-esp32 as a component
96-
uses: actions/checkout@v2
96+
uses: actions/checkout@v3
9797
with:
9898
submodules: recursive
9999
path: components/arduino-esp32

‎.github/workflows/release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v3
1414
with:
1515
fetch-depth: 0
16-
- uses: actions/setup-python@v2
16+
- uses: actions/setup-python@v4
1717
with:
1818
python-version: '3.x'
1919
- name: Build Release

‎.github/workflows/upload-idf-component.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
upload_components:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v2
10+
- uses: actions/checkout@v3
1111
with:
1212
submodules: "recursive"
1313

‎.gitignore

+8-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ tools/esptool.exe
88
tools/mkspiffs
99
tools/mklittlefs
1010
tools/mkfatfs.exe
11+
tools/openocd-esp32
1112

1213
# Ignore editor backup files and macOS system metadata
1314
.DS_Store
@@ -19,8 +20,8 @@ tools/mkfatfs.exe
1920
/build
2021

2122
# Ignore files built by Visual Studio/Visual Micro
22-
[Dd]ebug*/
23-
[Rr]elease*/
23+
[Dd]ebug/
24+
[Rr]elease/
2425
.vs/
2526
__vm/
2627
*.vcxproj*
@@ -31,6 +32,11 @@ boards.sloeber.txt
3132
# Ignore docs build (Sphinx)
3233
docs/build
3334
docs/source/_build
35+
__pycache__/
36+
_build/
3437

3538
# Test log files
3639
*.log
40+
debug.cfg
41+
debug.svd
42+
debug_custom.json

‎CMakeLists.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ set(LIBRARY_SRCS
8888
libraries/HTTPClient/src/HTTPClient.cpp
8989
libraries/HTTPUpdate/src/HTTPUpdate.cpp
9090
libraries/LittleFS/src/LittleFS.cpp
91+
libraries/Insights/src/Insights.cpp
9192
libraries/I2S/src/I2S.cpp
9293
libraries/NetBIOS/src/NetBIOS.cpp
9394
libraries/Preferences/src/Preferences.cpp
@@ -184,6 +185,7 @@ set(includedirs
184185
libraries/HTTPClient/src
185186
libraries/HTTPUpdate/src
186187
libraries/LittleFS/src
188+
libraries/Insights/src
187189
libraries/I2S/src
188190
libraries/NetBIOS/src
189191
libraries/Preferences/src
@@ -217,9 +219,10 @@ if(NOT CONFIG_FREERTOS_HZ EQUAL 1000 AND NOT "$ENV{ARDUINO_SKIP_TICK_CHECK}")
217219
endif()
218220

219221
string(TOUPPER ${CONFIG_ARDUINO_VARIANT} idf_target_caps)
222+
string(REPLACE "-" "_" idf_target_for_macro "${idf_target_caps}")
220223
target_compile_options(${COMPONENT_TARGET} PUBLIC
221224
-DARDUINO=10812
222-
-DARDUINO_${idf_target_caps}_DEV
225+
-DARDUINO_${idf_target_for_macro}_DEV
223226
-DARDUINO_ARCH_ESP32
224227
-DARDUINO_BOARD="${idf_target_caps}_DEV"
225228
-DARDUINO_VARIANT="${CONFIG_ARDUINO_VARIANT}"

0 commit comments

Comments
 (0)