Skip to content

Commit c490af2

Browse files
committed
Fixes static assert.
Edits the tools.
1 parent 3c0d8c7 commit c490af2

File tree

5 files changed

+36
-41
lines changed

5 files changed

+36
-41
lines changed

build.sh

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -316,13 +316,19 @@ if [ "$BUILD_TYPE" = "all" ]; then
316316
fi
317317
export IDF_COMMIT=$(git -C "$IDF_PATH" rev-parse --short HEAD)
318318

319+
# Generate PlatformIO library manifest file
320+
if [ "$BUILD_TYPE" = "all" ]; then
321+
python3 ./tools/gen_pio_lib_manifest.py -o "$TOOLS_JSON_OUT/" -s "v$IDF_VERSION" -c "$IDF_COMMIT"
322+
if [ $? -ne 0 ]; then exit 1; fi
323+
fi
324+
325+
AR_VERSION=$(jq -c '.version' "$AR_COMPS/arduino/package.json" | tr -d '"')
326+
AR_VERSION_UNDERSCORE=`echo "$AR_VERSION" | tr . _`
319327
# Generate PlatformIO manifest file
328+
rm -rf "$AR_ROOT/package.json"
329+
320330
if [ "$BUILD_TYPE" = "all" ]; then
321-
pushd $IDF_PATH
322-
ibr=$(git describe --all --exact-match 2>/dev/null)
323-
ic=$(git -C "$IDF_PATH" rev-parse --short HEAD)
324-
popd
325-
python3 ./tools/gen_platformio_manifest.py -o "$TOOLS_JSON_OUT/" -s "$ibr" -c "$ic"
331+
python3 ./tools/gen_platformio_manifest.py -o "$AR_ROOT/" -s "v$AR_VERSION" -c "$IDF_COMMIT"
326332
if [ $? -ne 0 ]; then exit 1; fi
327333
fi
328334

configs/defconfig.common

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=8192
99
CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=8192
1010
CONFIG_MBEDTLS_SSL_VARIABLE_BUFFER_LENGTH=y
1111
CONFIG_MBEDTLS_HAVE_TIME=y
12+
CONFIG_IDF_EXPERIMENTAL_FEATURES=y
1213

1314
CONFIG_AUTOSTART_ARDUINO=y
1415
# CONFIG_WS2812_LED_ENABLE is not set

main/idf_component.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@ dependencies:
77
require: public
88
rules:
99
- if: "target in [esp32, esp32s2, esp32s3]"
10-
espressif/esp-tflite-micro:
11-
version: ">=1.2.0"
12-
require: public
13-
rules:
14-
- if: "target not in [esp32c2]"
15-
espressif/esp-dl:
16-
version: "master"
17-
git: https://github.com/espressif/esp-dl.git
18-
require: public
19-
rules:
20-
- if: "target in [esp32s3, esp32s2, esp32]"
21-
espressif/esp-sr:
22-
version: ">=1.4.2"
23-
rules:
24-
- if: "target in [esp32s3]"
10+
# espressif/esp-tflite-micro:
11+
# version: ">=1.2.0"
12+
# require: public
13+
# rules:
14+
# - if: "target not in [esp32c2]"
15+
# espressif/esp-dl:
16+
# version: "master"
17+
# git: https://github.com/espressif/esp-dl.git
18+
# require: public
19+
# rules:
20+
# - if: "target in [esp32s3, esp32s2, esp32]"
21+
# espressif/esp-sr:
22+
# version: ">=1.4.2"
23+
# rules:
24+
# - if: "target in [esp32s3]"
2525

2626
# esp-sr: "^1.3.1"
2727
# esp32-camera: "^2.0.4"

tools/archive-build.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ rm -rf arduino-esp32/tools/esptool.py
4545
rm -rf arduino-esp32/tools/get.py
4646
rm -rf arduino-esp32/tools/ide-debug
4747
rm -rf arduino-esp32/tools/gen_insights_package.py
48-
#rm -rf arduino-esp32/platform.txt
49-
#rm -rf arduino-esp32/programmers.txt
50-
#rm -rf arduino-esp32/boards.txt
51-
#rm -rf arduino-esp32/package.json
52-
#rm -rf arduino-esp32/*.md
48+
rm -rf arduino-esp32/platform.txt
49+
rm -rf arduino-esp32/programmers.txt
50+
rm -rf arduino-esp32/boards.txt
51+
rm -rf arduino-esp32/package.json
52+
rm -rf arduino-esp32/*.md
5353
cp -Rf tools/esp32-arduino-libs arduino-esp32/tools/
5454
cp ../package.json arduino-esp32/package.json
5555
cp ../core_version.h arduino-esp32/cores/esp32/core_version.h

tools/install-arduino.sh

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ if [ $? -ne 0 ]; then exit 1; fi
6767
#
6868
# remove code and libraries not needed/wanted for Tasmota framework
6969
#
70-
# rm -rf "$AR_COMPS/arduino/docs"
71-
# rm -rf "$AR_COMPS/arduino/idf_component_examples"
72-
# rm -rf "$AR_COMPS/arduino/package"
73-
# rm -rf "$AR_COMPS/arduino/tests"
70+
rm -rf "$AR_COMPS/arduino/docs"
71+
rm -rf "$AR_COMPS/arduino/idf_component_examples"
72+
rm -rf "$AR_COMPS/arduino/package"
73+
rm -rf "$AR_COMPS/arduino/tests"
7474
# rm -rf "$AR_COMPS/arduino/cores/esp32/chip-debug-report.cpp"
7575
# rm -rf "$AR_COMPS/arduino/cores/esp32/chip-debug-report.h"
7676
# rm -rf "$AR_COMPS/arduino/libraries/RainMaker"
@@ -87,17 +87,5 @@ if [ $? -ne 0 ]; then exit 1; fi
8787
# rm -rf "$AR_COMPS/arduino/libraries/ESP_SR"
8888
# rm -rf "$AR_COMPS/arduino/libraries/ESP_NOW"
8989
# rm -rf "$AR_COMPS/arduino/libraries/TFLiteMicro"
90-
# CLONE/UPDATE ESP32-ARDUINO-LIBS
91-
#
92-
93-
# Might remove ...
94-
if [ ! -d "$IDF_LIBS_DIR" ]; then
95-
echo "Cloning esp32-arduino-libs..."
96-
git clone "$AR_LIBS_REPO_URL" "$IDF_LIBS_DIR"
97-
else
98-
echo "Updating esp32-arduino-libs..."
99-
git -C "$IDF_LIBS_DIR" fetch && \
100-
git -C "$IDF_LIBS_DIR" pull --ff-only
101-
fi
10290
if [ $? -ne 0 ]; then exit 1; fi
10391

0 commit comments

Comments
 (0)