From 9ab74eacc814571bdf65aa4a12147458372e303c Mon Sep 17 00:00:00 2001 From: CaCO3 Date: Thu, 28 Dec 2023 09:50:39 +0100 Subject: [PATCH 01/10] update esp-nn to v1.0.2 --- code/components/esp-nn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From a7b4ec29c786c09eb628647ee33dab85e25b8a9d Mon Sep 17 00:00:00 2001 From: CaCO3 Date: Thu, 28 Dec 2023 09:55:33 +0100 Subject: [PATCH 02/10] Update esp32-camera to v2.0.6 --- code/components/esp32-camera | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 2518a0ed13bfeec2e1f84444d2d3ede41934abed Mon Sep 17 00:00:00 2001 From: CaCO3 Date: Thu, 28 Dec 2023 10:24:55 +0100 Subject: [PATCH 03/10] update tflite-micro-esp-examples --- code/components/tflite-micro-esp-examples | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/components/tflite-micro-esp-examples b/code/components/tflite-micro-esp-examples index 1ccd7e14a..fd5c138d2 160000 --- a/code/components/tflite-micro-esp-examples +++ b/code/components/tflite-micro-esp-examples @@ -1 +1 @@ -Subproject commit 1ccd7e14ac2ff7540502f1b422eae21bab799355 +Subproject commit fd5c138d2bf924eabcbcd3f83024e5b34eac058b From 4c00402e31719003cd4d4f65a73c9f366a27ad38 Mon Sep 17 00:00:00 2001 From: CaCO3 Date: Thu, 28 Dec 2023 10:42:09 +0100 Subject: [PATCH 04/10] update tflite-micro-esp-examples --- code/components/tflite-micro-esp-examples | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/components/tflite-micro-esp-examples b/code/components/tflite-micro-esp-examples index fd5c138d2..9d106889b 160000 --- a/code/components/tflite-micro-esp-examples +++ b/code/components/tflite-micro-esp-examples @@ -1 +1 @@ -Subproject commit fd5c138d2bf924eabcbcd3f83024e5b34eac058b +Subproject commit 9d106889b60dc71aabce26c359e30d9047a3389f From 61cffc6825e5b3d5dd57638b76a459f3abf55745 Mon Sep 17 00:00:00 2001 From: CaCO3 Date: Thu, 28 Dec 2023 10:55:57 +0100 Subject: [PATCH 05/10] update tflite-micro-esp-examples (folder got renamed) --- code/CMakeLists.txt | 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 | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index e866557f8..95dfec64a 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/tflite-micro-esp-examples/components/esp-tflite-micro) ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version.cpp 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 index 9d106889b..3dbba4a5b 160000 --- a/code/components/tflite-micro-esp-examples +++ b/code/components/tflite-micro-esp-examples @@ -1 +1 @@ -Subproject commit 9d106889b60dc71aabce26c359e30d9047a3389f +Subproject commit 3dbba4a5b2f1bf9d80da2b2102033e435e4d123d From 62adef3cb53604322381bb195c4d7b7dfc16e81c Mon Sep 17 00:00:00 2001 From: CaCO3 Date: Thu, 28 Dec 2023 11:12:18 +0100 Subject: [PATCH 06/10] update tflite-micro-esp-examples --- code/components/tflite-micro-esp-examples | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/components/tflite-micro-esp-examples b/code/components/tflite-micro-esp-examples index 3dbba4a5b..a976ee0b0 160000 --- a/code/components/tflite-micro-esp-examples +++ b/code/components/tflite-micro-esp-examples @@ -1 +1 @@ -Subproject commit 3dbba4a5b2f1bf9d80da2b2102033e435e4d123d +Subproject commit a976ee0b0466bef0fce7bb737d31a0ee90835645 From fa1b8da7208d2450d281673555697ac2b1736ac4 Mon Sep 17 00:00:00 2001 From: CaCO3 Date: Thu, 28 Dec 2023 11:24:19 +0100 Subject: [PATCH 07/10] update tflite-micro-esp-examples --- code/components/tflite-micro-esp-examples | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/components/tflite-micro-esp-examples b/code/components/tflite-micro-esp-examples index a976ee0b0..6680c8b0e 160000 --- a/code/components/tflite-micro-esp-examples +++ b/code/components/tflite-micro-esp-examples @@ -1 +1 @@ -Subproject commit a976ee0b0466bef0fce7bb737d31a0ee90835645 +Subproject commit 6680c8b0ea6c388067fc787a3445e1f8deffff29 From 0504d5e27647f2246d9d8b9e1f7cc675767efd19 Mon Sep 17 00:00:00 2001 From: CaCO3 Date: Thu, 28 Dec 2023 11:31:00 +0100 Subject: [PATCH 08/10] update tflite-micro-esp-examples --- code/components/tflite-micro-esp-examples | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/components/tflite-micro-esp-examples b/code/components/tflite-micro-esp-examples index 6680c8b0e..2d95a9c37 160000 --- a/code/components/tflite-micro-esp-examples +++ b/code/components/tflite-micro-esp-examples @@ -1 +1 @@ -Subproject commit 6680c8b0ea6c388067fc787a3445e1f8deffff29 +Subproject commit 2d95a9c37fa6937720859e8a497b69837f7d6982 From b5065bc72a3f554410fc30d8625d14ae50590bfb Mon Sep 17 00:00:00 2001 From: CaCO3 Date: Thu, 28 Dec 2023 11:54:54 +0100 Subject: [PATCH 09/10] updated/moved submodule --- .gitmodules | 6 +++--- code/CMakeLists.txt | 2 +- code/components/tflite-micro-esp-examples | 1 - code/include/defines.h | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) 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 95dfec64a..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/esp-tflite-micro) +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/tflite-micro-esp-examples b/code/components/tflite-micro-esp-examples deleted file mode 160000 index 2d95a9c37..000000000 --- a/code/components/tflite-micro-esp-examples +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2d95a9c37fa6937720859e8a497b69837f7d6982 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 From 761f20ba64e6c7891cfbb69fe993048e578f4372 Mon Sep 17 00:00:00 2001 From: CaCO3 Date: Thu, 28 Dec 2023 12:00:04 +0100 Subject: [PATCH 10/10] added new submodule --- code/components/esp-tflite-micro | 1 + 1 file changed, 1 insertion(+) create mode 160000 code/components/esp-tflite-micro 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