Skip to content

Commit f1d2bd7

Browse files
authored
Merge pull request #89 from espressif/esp32-s3-support
Update 2 from 23022022
2 parents 3c8f0bb + 4d1c417 commit f1d2bd7

File tree

805 files changed

+81128
-15914
lines changed

Some content is hidden

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

805 files changed

+81128
-15914
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
export PLATFORMIO_ESP32_PATH="$HOME/.platformio/packages/framework-arduinoespressif32"
44
PLATFORMIO_ESP32_URL="https://github.com/platformio/platform-espressif32.git#feature/arduino-idf-master"
55

6-
XTENSA32_TOOLCHAIN_VERSION="8.4.0+2021r2-patch2"
7-
XTENSA32S2_TOOLCHAIN_VERSION="8.4.0+2021r2-patch2"
8-
RISCV_TOOLCHAIN_VERSION="8.4.0+2021r2-patch2"
6+
TOOLCHAIN_VERSION="8.4.0+2021r2-patch2"
97
ESPTOOLPY_VERSION="~1.30100.0"
108
ESPRESSIF_ORGANIZATION_NAME="espressif"
119

@@ -28,11 +26,13 @@ replace_script+="del data['packages']['framework-arduinoespressif32']['owner'];"
2826
# Use toolchain packages from the "espressif" organization
2927
replace_script+="data['packages']['toolchain-xtensa-esp32']['owner']='$ESPRESSIF_ORGANIZATION_NAME';"
3028
replace_script+="data['packages']['toolchain-xtensa-esp32s2']['owner']='$ESPRESSIF_ORGANIZATION_NAME';"
29+
replace_script+="data['packages']['toolchain-xtensa-esp32s3']['owner']='$ESPRESSIF_ORGANIZATION_NAME';"
3130
replace_script+="data['packages']['toolchain-riscv32-esp']['owner']='$ESPRESSIF_ORGANIZATION_NAME';"
3231
# Update versions to use the upstream
33-
replace_script+="data['packages']['toolchain-xtensa-esp32']['version']='$XTENSA32_TOOLCHAIN_VERSION';"
34-
replace_script+="data['packages']['toolchain-xtensa-esp32s2']['version']='$XTENSA32S2_TOOLCHAIN_VERSION';"
35-
replace_script+="data['packages']['toolchain-riscv32-esp']['version']='$RISCV_TOOLCHAIN_VERSION';"
32+
replace_script+="data['packages']['toolchain-xtensa-esp32']['version']='$TOOLCHAIN_VERSION';"
33+
replace_script+="data['packages']['toolchain-xtensa-esp32s2']['version']='$TOOLCHAIN_VERSION';"
34+
replace_script+="data['packages']['toolchain-xtensa-esp32s3']['version']='$TOOLCHAIN_VERSION';"
35+
replace_script+="data['packages']['toolchain-riscv32-esp']['version']='$TOOLCHAIN_VERSION';"
3636
# esptool.py may require an upstream version (for now platformio is the owner)
3737
replace_script+="data['packages']['tool-esptoolpy']['version']='$ESPTOOLPY_VERSION';"
3838
# Save results

.github/scripts/on-push.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ if [ "$BUILD_PIO" -eq 0 ]; then
6363

6464
FQBN_ESP32="espressif:esp32:esp32:PSRAM=enabled,PartitionScheme=huge_app"
6565
FQBN_ESP32S2="espressif:esp32:esp32s2:PSRAM=enabled,PartitionScheme=huge_app"
66+
FQBN_ESP32S3="espressif:esp32:esp32s3:PSRAM=opi,PartitionScheme=huge_app"
6667
FQBN_ESP32C3="espressif:esp32:esp32c3:PartitionScheme=huge_app"
6768

6869
SKETCHES_ESP32="\
@@ -78,6 +79,7 @@ if [ "$BUILD_PIO" -eq 0 ]; then
7879

7980
build "esp32" $FQBN_ESP32 $CHUNK_INDEX $CHUNKS_CNT $SKETCHES_ESP32
8081
build "esp32s2" $FQBN_ESP32S2 $CHUNK_INDEX $CHUNKS_CNT $SKETCHES_ESP32XX
82+
build "esp32s3" $FQBN_ESP32S3 $CHUNK_INDEX $CHUNKS_CNT $SKETCHES_ESP32
8183
build "esp32c3" $FQBN_ESP32C3 $CHUNK_INDEX $CHUNKS_CNT $SKETCHES_ESP32XX
8284
else
8385
source ./${SCRIPTS_DIR}/install-platformio-esp32.sh
@@ -96,6 +98,8 @@ else
9698
# build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/WiFiClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino"
9799

98100
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"
101+
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"
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"
99103

100104
#build_pio_sketches "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries"
101105
fi

platform.txt

Lines changed: 4 additions & 4 deletions
Large diffs are not rendered by default.

tools/esptool.py

Lines changed: 582 additions & 180 deletions
Large diffs are not rendered by default.

tools/platformio-build-esp32.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@
304304
"UNITY_INCLUDE_CONFIG_H",
305305
"WITH_POSIX",
306306
"_GNU_SOURCE",
307-
("IDF_VER", '\\"v4.4-98-geb3797dc3f\\"'),
307+
("IDF_VER", '\\"v4.4-263-g000d3823bb\\"'),
308308
"ESP_PLATFORM",
309309
"_POSIX_READER_WRITER_LOCKS",
310310
"ARDUINO_ARCH_ESP32",

tools/platformio-build-esp32c3.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@
294294
"UNITY_INCLUDE_CONFIG_H",
295295
"WITH_POSIX",
296296
"_GNU_SOURCE",
297-
("IDF_VER", '\\"v4.4-98-geb3797dc3f\\"'),
297+
("IDF_VER", '\\"v4.4-263-g000d3823bb\\"'),
298298
"ESP_PLATFORM",
299299
"_POSIX_READER_WRITER_LOCKS",
300300
"ARDUINO_ARCH_ESP32",

tools/platformio-build-esp32s2.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@
291291
"UNITY_INCLUDE_CONFIG_H",
292292
"WITH_POSIX",
293293
"_GNU_SOURCE",
294-
("IDF_VER", '\\"v4.4-98-geb3797dc3f\\"'),
294+
("IDF_VER", '\\"v4.4-263-g000d3823bb\\"'),
295295
"ESP_PLATFORM",
296296
"_POSIX_READER_WRITER_LOCKS",
297297
"ARDUINO_ARCH_ESP32",

tools/platformio-build-esp32s3.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@
308308
"UNITY_INCLUDE_CONFIG_H",
309309
"WITH_POSIX",
310310
"_GNU_SOURCE",
311-
("IDF_VER", '\\"v4.4-98-geb3797dc3f\\"'),
311+
("IDF_VER", '\\"v4.4-263-g000d3823bb\\"'),
312312
"ESP_PLATFORM",
313313
"_POSIX_READER_WRITER_LOCKS",
314314
"ARDUINO_ARCH_ESP32",
16 Bytes
Binary file not shown.
16 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)