Skip to content

Commit a789dd6

Browse files
authored
Release/v3.3 solo1 (#7)
* trigger * Arduino branch changed to release/v1.0 * Change source toolchain * Update sdkconfig * Update config.sh * Back to espressif source * Copy all new files * Update config.sh * Update install-esp-idf.sh * trigger
1 parent ab1379b commit a789dd6

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

tools/archive-build.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,15 @@ if [ -d "out" ]; then
2525
git clone https://github.com/espressif/arduino-esp32 -b release/v1.0
2626
rm -rf arduino-esp32/tools/sdk
2727
rm -rf arduino-esp32/docs
28+
rm -rf arduino-esp32/tools/esptool.py
29+
rm -rf arduino-esp32/tools/gen_esp32part.py
30+
rm -rf arduino-esp32/tools/platformio-build.py
31+
rm -rf arduino-esp32/platform.txt
2832
cp -Rf tools/sdk arduino-esp32/tools/sdk
33+
cp -Rf tools/esptool.py arduino-esp32/tools/esptool.py
34+
cp -Rf tools/gen_esp32part.py arduino-esp32/tools/gen_esp32part.py
35+
cp -Rf tools/platformio-build.py arduino-esp32/tools/platformio-build.py
36+
cp -Rf platform.txt arduino-esp32/platform.txt
2937
cp ../core_version.h arduino-esp32/cores/esp32/core_version.h
3038
mv arduino-esp32/ framework-arduinoespressif32/
3139
tar --exclude=.* -zcf ../$pio_archive_path framework-arduinoespressif32/

tools/config.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
IDF_COMPS="$IDF_PATH/components"
44
IDF_TOOLCHAIN="xtensa-esp32-elf"
5-
IDF_TOOLCHAIN_LINUX_ARMEL="https://dl.espressif.com/dl/xtensa-esp32-elf-linux-armel-1.22.0-97-gc752ad5-5.2.0.tar.gz"
6-
IDF_TOOLCHAIN_LINUX32="https://dl.espressif.com/dl/xtensa-esp32-elf-linux32-1.22.0-97-gc752ad5-5.2.0.tar.gz"
7-
IDF_TOOLCHAIN_LINUX64="https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-97-gc752ad5-5.2.0.tar.gz"
8-
IDF_TOOLCHAIN_WIN32="https://dl.espressif.com/dl/xtensa-esp32-elf-win32-1.22.0-97-gc752ad5-5.2.0.zip"
9-
IDF_TOOLCHAIN_MACOS="https://dl.espressif.com/dl/xtensa-esp32-elf-macos-1.22.0-97-gc752ad5-5.2.0.tar.gz"
5+
IDF_TOOLCHAIN_LINUX_ARMEL="https://github.com/espressif/arduino-esp32/releases/download/1.0.5-rc5/xtensa-esp32-elf-linux-armel-1.22.0-97-gc752ad5-5.2.0.tar.gz"
6+
IDF_TOOLCHAIN_LINUX32="https://github.com/espressif/arduino-esp32/releases/download/1.0.5-rc5/xtensa-esp32-elf-linux32-1.22.0-97-gc752ad5-5.2.0.tar.gz"
7+
IDF_TOOLCHAIN_LINUX64="https://github.com/espressif/arduino-esp32/releases/download/1.0.5-rc5/xtensa-esp32-elf-linux64-1.22.0-97-gc752ad5-5.2.0.tar.gz"
8+
IDF_TOOLCHAIN_WIN32="https://github.com/espressif/arduino-esp32/releases/download/1.0.5-rc5/xtensa-esp32-elf-win32-1.22.0-97-gc752ad5-5.2.0.zip"
9+
IDF_TOOLCHAIN_MACOS="https://github.com/espressif/arduino-esp32/releases/download/1.0.5-rc5/xtensa-esp32-elf-macos-1.22.0-97-gc752ad5-5.2.0.tar.gz"
1010

1111
if [ -z $IDF_BRANCH ]; then
1212
IDF_BRANCH="release/v3.3"

tools/install-esp-idf.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ if ! [ -x "$(command -v $IDF_TOOLCHAIN-gcc)" ]; then
128128
exit 1
129129
fi
130130
echo "Downloading $TC_LINK"
131-
curl -k -o $IDF_TOOLCHAIN.$TC_EXT $TC_LINK || exit 1
131+
curl -Lk -o $IDF_TOOLCHAIN.$TC_EXT $TC_LINK || exit 1
132132
fi
133133
if [[ "$AR_OS" == "win32" ]]; then
134134
unzip $IDF_TOOLCHAIN.$TC_EXT || exit 1

0 commit comments

Comments
 (0)