Skip to content

esp-dl as managed component #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 10, 2023
Merged

esp-dl as managed component #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
18d2185
remove esp-dl cloning
SuGlider Nov 10, 2023
41e497d
Gets esp-dl managed component from GH master
SuGlider Nov 10, 2023
3aebb00
Update idf_component.yml
SuGlider Nov 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions main/idf_component.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ dependencies:
# Required IDF version
idf: ">=5.1"
espressif/esp32-camera:
version: "*"
version: "master"
git: https://github.com/espressif/esp32-camera.git
require: public
espressif/esp-tflite-micro:
version: ">=1.2.0"
require: public
espressif/esp-dl:
version: ">=2.0.0"
path: ../components/esp-dl
version: "master"
git: https://github.com/espressif/esp-dl.git
require: public
rules:
- if: "target in [esp32s3]"
Expand Down
34 changes: 17 additions & 17 deletions tools/update-components.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,25 +25,25 @@ TFLITE_REPO_URL="https://github.com/espressif/tflite-micro-esp-examples.git"
#
# CLONE/UPDATE ESP-DL
#
echo "Updating ESP-DL..."
if [ ! -d "$AR_COMPS/esp-dl" ]; then
git clone $DL_REPO_URL "$AR_COMPS/esp-dl"
#echo "Updating ESP-DL..."
#if [ ! -d "$AR_COMPS/esp-dl" ]; then
# git clone $DL_REPO_URL "$AR_COMPS/esp-dl"
#this is a temp measure to fix build issue
mv "$AR_COMPS/esp-dl/CMakeLists.txt" "$AR_COMPS/esp-dl/CMakeListsOld.txt"
echo "idf_build_get_property(target IDF_TARGET)" > "$AR_COMPS/esp-dl/CMakeLists.txt"
echo "if(NOT \${IDF_TARGET} STREQUAL \"esp32c6\" AND NOT \${IDF_TARGET} STREQUAL \"esp32h2\")" >> "$AR_COMPS/esp-dl/CMakeLists.txt"
cat "$AR_COMPS/esp-dl/CMakeListsOld.txt" >> "$AR_COMPS/esp-dl/CMakeLists.txt"
echo "endif()" >> "$AR_COMPS/esp-dl/CMakeLists.txt"
rm -rf "$AR_COMPS/esp-dl/CMakeListsOld.txt"
else
git -C "$AR_COMPS/esp-dl" fetch && \
git -C "$AR_COMPS/esp-dl" pull --ff-only
fi
if [ $? -ne 0 ]; then exit 1; fi
# mv "$AR_COMPS/esp-dl/CMakeLists.txt" "$AR_COMPS/esp-dl/CMakeListsOld.txt"
# echo "idf_build_get_property(target IDF_TARGET)" > "$AR_COMPS/esp-dl/CMakeLists.txt"
# echo "if(NOT \${IDF_TARGET} STREQUAL \"esp32c6\" AND NOT \${IDF_TARGET} STREQUAL \"esp32h2\")" >> "$AR_COMPS/esp-dl/CMakeLists.txt"
# cat "$AR_COMPS/esp-dl/CMakeListsOld.txt" >> "$AR_COMPS/esp-dl/CMakeLists.txt"
# echo "endif()" >> "$AR_COMPS/esp-dl/CMakeLists.txt"
# rm -rf "$AR_COMPS/esp-dl/CMakeListsOld.txt"
#else
# git -C "$AR_COMPS/esp-dl" fetch && \
# git -C "$AR_COMPS/esp-dl" pull --ff-only
#fi
#if [ $? -ne 0 ]; then exit 1; fi
#this is a temp measure to fix build issue
if [ -f "$AR_COMPS/esp-dl/idf_component.yml" ]; then
rm -rf "$AR_COMPS/esp-dl/idf_component.yml"
fi
#if [ -f "$AR_COMPS/esp-dl/idf_component.yml" ]; then
# rm -rf "$AR_COMPS/esp-dl/idf_component.yml"
#fi

#
# CLONE/UPDATE ESP-SR
Expand Down