From 9ced147d9ca08a01028b87c526f3a6cbd956b2d9 Mon Sep 17 00:00:00 2001 From: CaCO3 Date: Thu, 28 Dec 2023 12:13:57 +0100 Subject: [PATCH] Update submodules (#2769) - Update `esp-nn` to v1.0.2 - Update `esp32-camera` to v2.0.6 - Updated `tflite-micro-esp-examples` (The repo got renamed to `esp-tflite-micro ` and the folder structure got cleaned up). --- .gitmodules | 6 +++--- code/CMakeLists.txt | 2 +- code/components/esp-nn | 2 +- code/components/esp-tflite-micro | 1 + code/components/esp32-camera | 2 +- code/components/jomjol_helper/CMakeLists.txt | 2 +- code/components/jomjol_mqtt/CMakeLists.txt | 2 +- code/components/jomjol_time_sntp/CMakeLists.txt | 2 +- code/components/tflite-micro-esp-examples | 1 - code/include/defines.h | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) create mode 160000 code/components/esp-tflite-micro delete mode 160000 code/components/tflite-micro-esp-examples diff --git a/.gitmodules b/.gitmodules index 51334c367..9e869709d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,9 +4,9 @@ [submodule "code/components/esp-nn"] path = code/components/esp-nn url = https://github.com/espressif/esp-nn.git -[submodule "code/components/tflite-micro-esp-examples"] - path = code/components/tflite-micro-esp-examples - url = https://github.com/espressif/tflite-micro-esp-examples.git +[submodule "code/components/esp-tflite-micro"] + path = code/components/esp-tflite-micro + url = https://github.com/espressif/esp-tflite-micro.git [submodule "code/components/stb"] path = code/components/stb url = https://github.com/nothings/stb.git diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index e866557f8..0ec36fe9b 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.16.0) -list(APPEND EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/common_components/protocol_examples_common components/tflite-micro-esp-examples/components/tflite-lib) +list(APPEND EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/common_components/protocol_examples_common components/esp-tflite-micro) ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version.cpp diff --git a/code/components/esp-nn b/code/components/esp-nn index 1a35708d9..34e97138d 160000 --- a/code/components/esp-nn +++ b/code/components/esp-nn @@ -1 +1 @@ -Subproject commit 1a35708d93c47b695f1da6da3ac49f5c253910c4 +Subproject commit 34e97138de6e80ab6e047262c1c8b77514739a39 diff --git a/code/components/esp-tflite-micro b/code/components/esp-tflite-micro new file mode 160000 index 000000000..13f26b829 --- /dev/null +++ b/code/components/esp-tflite-micro @@ -0,0 +1 @@ +Subproject commit 13f26b829405e9323e4212ffa954c261b1e21eeb diff --git a/code/components/esp32-camera b/code/components/esp32-camera index c0c17bd3d..dba8da989 160000 --- a/code/components/esp32-camera +++ b/code/components/esp32-camera @@ -1 +1 @@ -Subproject commit c0c17bd3de5ea575b775db6cbef84befd020d524 +Subproject commit dba8da9898928d9808d57a0b0cdcde9f130ed8fe diff --git a/code/components/jomjol_helper/CMakeLists.txt b/code/components/jomjol_helper/CMakeLists.txt index 2bca3ade9..0b8e0ae00 100644 --- a/code/components/jomjol_helper/CMakeLists.txt +++ b/code/components/jomjol_helper/CMakeLists.txt @@ -2,6 +2,6 @@ FILE(GLOB_RECURSE app_sources ${CMAKE_CURRENT_SOURCE_DIR}/*.*) idf_component_register(SRCS ${app_sources} INCLUDE_DIRS "." - REQUIRES esp_timer tflite-lib jomjol_logfile fatfs sdmmc) + REQUIRES esp_timer esp-tflite-micro jomjol_logfile fatfs sdmmc) diff --git a/code/components/jomjol_mqtt/CMakeLists.txt b/code/components/jomjol_mqtt/CMakeLists.txt index cb31861dc..8aadb832a 100644 --- a/code/components/jomjol_mqtt/CMakeLists.txt +++ b/code/components/jomjol_mqtt/CMakeLists.txt @@ -2,4 +2,4 @@ FILE(GLOB_RECURSE app_sources ${CMAKE_CURRENT_SOURCE_DIR}/*.*) idf_component_register(SRCS ${app_sources} INCLUDE_DIRS "." - REQUIRES esp_timer tflite-lib mqtt jomjol_tfliteclass jomjol_helper jomjol_mqtt jomjol_wlan json) + REQUIRES esp_timer esp-tflite-micro mqtt jomjol_tfliteclass jomjol_helper jomjol_mqtt jomjol_wlan json) diff --git a/code/components/jomjol_time_sntp/CMakeLists.txt b/code/components/jomjol_time_sntp/CMakeLists.txt index 6eade8c30..1be7fbcab 100644 --- a/code/components/jomjol_time_sntp/CMakeLists.txt +++ b/code/components/jomjol_time_sntp/CMakeLists.txt @@ -2,6 +2,6 @@ FILE(GLOB_RECURSE app_sources ${CMAKE_CURRENT_SOURCE_DIR}/*.*) idf_component_register(SRCS ${app_sources} INCLUDE_DIRS "." - REQUIRES tflite-lib jomjol_logfile jomjol_configfile) + REQUIRES esp-tflite-micro jomjol_logfile jomjol_configfile) diff --git a/code/components/tflite-micro-esp-examples b/code/components/tflite-micro-esp-examples deleted file mode 160000 index 1ccd7e14a..000000000 --- a/code/components/tflite-micro-esp-examples +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1ccd7e14ac2ff7540502f1b422eae21bab799355 diff --git a/code/include/defines.h b/code/include/defines.h index 641a06943..127b5a4e8 100644 --- a/code/include/defines.h +++ b/code/include/defines.h @@ -53,7 +53,7 @@ //**************************************** - //compiler optimization for tflite-micro-esp-examples + //compiler optimization for esp-tflite-micro #define XTENSA //#define CONFIG_IDF_TARGET_ARCH_XTENSA //not needed with platformio/espressif32 @ 5.2.0