Skip to content
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

Update submodules #2769

Merged
merged 10 commits into from
Dec 28, 2023
+11 −11
Merged

Update submodules #2769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9ab74ea
update esp-nn to v1.0.2
Dec 28, 2023
a7b4ec2
Update esp32-camera to v2.0.6
Dec 28, 2023
2518a0e
update tflite-micro-esp-examples
Dec 28, 2023
4c00402
update tflite-micro-esp-examples
Dec 28, 2023
61cffc6
update tflite-micro-esp-examples (folder got renamed)
Dec 28, 2023
62adef3
update tflite-micro-esp-examples
Dec 28, 2023
fa1b8da
update tflite-micro-esp-examples
Dec 28, 2023
0504d5e
update tflite-micro-esp-examples
Dec 28, 2023
b5065bc
updated/moved submodule
Dec 28, 2023
761f20b
added new submodule
Dec 28, 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 .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion code/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/components/esp-nn
Open in desktop
Submodule esp-nn updated 5 files
+24 −25 src/basic_math/esp_nn_add_s8_esp32s3.S
+11 −6 src/basic_math/esp_nn_mul_s8_esp32s3.S
+1 −1 src/common/common_functions.h
+11 −0 tests/include/test_utils.h
+68 −9 tests/src/basic_math_test.c
1 change: 1 addition & 0 deletions code/components/esp-tflite-micro
Open in desktop
Submodule esp-tflite-micro added at 13f26b
2 changes: 1 addition & 1 deletion code/components/esp32-camera
Open in desktop
Submodule esp32-camera updated 21 files
+3 −6 .github/workflows/build.yml
+20 −14 CMakeLists.txt
+21 −35 README.md
+0 −4 component.mk
+6 −2 driver/cam_hal.c
+0 −11 examples/Makefile
+2 −4 examples/camera_example/CMakeLists.txt
+3 −0 examples/camera_example/main/CMakeLists.txt
+5 −0 examples/camera_example/main/idf_component.yml
+0 −0 examples/camera_example/main/take_picture.c
+0 −0 examples/camera_example/sdkconfig.defaults
+0 −3 examples/main/CMakeLists.txt
+0 −5 examples/main/component.mk
+3 −0 idf_component.yml
+6 −0 sensors/bf20a6.c
+6 −2 sensors/gc0308.c
+117 −3 sensors/private_include/sc031gs_settings.h
+10 −12 sensors/sc031gs.c
+1 −1 target/esp32/ll_cam.c
+1 −1 target/esp32s2/ll_cam.c
+1 −1 target/esp32s3/ll_cam.c
2 changes: 1 addition & 1 deletion code/components/jomjol_helper/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)


2 changes: 1 addition & 1 deletion code/components/jomjol_mqtt/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion code/components/jomjol_time_sntp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)


1 change: 0 additions & 1 deletion code/components/tflite-micro-esp-examples
Open in desktop
Submodule tflite-micro-esp-examples deleted from 1ccd7e
2 changes: 1 addition & 1 deletion code/include/defines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down