From 42605292da4748ed1f698e6d1021f8d1e7b79d61 Mon Sep 17 00:00:00 2001 From: XiaochaoGONG Date: Mon, 1 Apr 2019 20:23:29 +0800 Subject: [PATCH] add cmake --- components/esp-face | 2 +- components/recorder_engine/CMakeLists.txt | 10 +++++++++ components/recorder_engine/a.c | 0 .../camera_web_server/CMakeLists.txt | 3 +++ .../camera_web_server/main/CMakeLists.txt | 9 +++++++- .../camera_web_server/main/app_httpd.c | 1 + .../CMakeLists.txt | 7 ++++++ .../main/CMakeLists.txt | 16 ++++++++++++++ .../main/app_facenet.c | 1 + .../recognition_solution/CMakeLists.txt | 6 +++++ .../recognition_solution/main/CMakeLists.txt | 22 +++++++++++++++++++ .../recognition_wechat/CMakeLists.txt | 6 +++++ .../components/network_blufi/CMakeLists.txt | 14 ++++++++++++ .../recognition_wechat/main/CMakeLists.txt | 19 ++++++++++++++++ .../CMakeLists.txt | 6 +++++ .../main/CMakeLists.txt | 14 ++++++++++++ 16 files changed, 134 insertions(+), 2 deletions(-) create mode 100644 components/recorder_engine/CMakeLists.txt create mode 100644 components/recorder_engine/a.c create mode 100644 examples/single_chip/detection_with_command_line/CMakeLists.txt create mode 100644 examples/single_chip/detection_with_command_line/main/CMakeLists.txt create mode 100644 examples/single_chip/recognition_solution/CMakeLists.txt create mode 100644 examples/single_chip/recognition_solution/main/CMakeLists.txt create mode 100644 examples/single_chip/recognition_wechat/CMakeLists.txt create mode 100644 examples/single_chip/recognition_wechat/components/network_blufi/CMakeLists.txt create mode 100644 examples/single_chip/recognition_wechat/main/CMakeLists.txt create mode 100644 examples/single_chip/recognition_with_command_line/CMakeLists.txt create mode 100644 examples/single_chip/recognition_with_command_line/main/CMakeLists.txt diff --git a/components/esp-face b/components/esp-face index d59d9c9..4ddff6f 160000 --- a/components/esp-face +++ b/components/esp-face @@ -1 +1 @@ -Subproject commit d59d9c9a81e28fc762cb3e85fead00b11bb8722e +Subproject commit 4ddff6f6f600a7ea6037398b069a65d2316a42ee diff --git a/components/recorder_engine/CMakeLists.txt b/components/recorder_engine/CMakeLists.txt new file mode 100644 index 0000000..69d21f6 --- /dev/null +++ b/components/recorder_engine/CMakeLists.txt @@ -0,0 +1,10 @@ +set(COMPONENT_SRCS a.c) +set(COMPONENT_ADD_INCLUDEDIRS include) + +register_component() + +target_link_libraries(recorder_engine "-L ${CMAKE_CURRENT_SOURCE_DIR}") +target_link_libraries(recorder_engine + esp_wakenet + nn_model + ) diff --git a/components/recorder_engine/a.c b/components/recorder_engine/a.c new file mode 100644 index 0000000..e69de29 diff --git a/examples/single_chip/camera_web_server/CMakeLists.txt b/examples/single_chip/camera_web_server/CMakeLists.txt index d93efcd..fbceb7b 100644 --- a/examples/single_chip/camera_web_server/CMakeLists.txt +++ b/examples/single_chip/camera_web_server/CMakeLists.txt @@ -1,5 +1,8 @@ # The following lines of boilerplate have to be in your project's # CMakeLists in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.5) + +set(EXTRA_COMPONENT_DIRS ../../../components) + include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(camera_web_server) diff --git a/examples/single_chip/camera_web_server/main/CMakeLists.txt b/examples/single_chip/camera_web_server/main/CMakeLists.txt index e6de5e6..622cf2a 100644 --- a/examples/single_chip/camera_web_server/main/CMakeLists.txt +++ b/examples/single_chip/camera_web_server/main/CMakeLists.txt @@ -1,3 +1,10 @@ set(COMPONENT_SRCS "app_main.c" "app_wifi.c" "app_camera.c" "app_httpd.c") set(COMPONENT_ADD_INCLUDEDIRS "include") -register_component() \ No newline at end of file +set(COMPONENT_REQUIRES + esp32-camera + esp-face + nvs_flash + esp_http_server + fb_gfx + ) +register_component() diff --git a/examples/single_chip/camera_web_server/main/app_httpd.c b/examples/single_chip/camera_web_server/main/app_httpd.c index 7e2ce3b..b4ecbb8 100644 --- a/examples/single_chip/camera_web_server/main/app_httpd.c +++ b/examples/single_chip/camera_web_server/main/app_httpd.c @@ -682,6 +682,7 @@ void app_httpd_main(){ mtmn_config.pyramid = 0.7; mtmn_config.p_threshold.score = 0.6; mtmn_config.p_threshold.nms = 0.7; + mtmn_config.p_threshold.candidate_number = 100; mtmn_config.r_threshold.score = 0.7; mtmn_config.r_threshold.nms = 0.7; mtmn_config.r_threshold.candidate_number = 4; diff --git a/examples/single_chip/detection_with_command_line/CMakeLists.txt b/examples/single_chip/detection_with_command_line/CMakeLists.txt new file mode 100644 index 0000000..f60740d --- /dev/null +++ b/examples/single_chip/detection_with_command_line/CMakeLists.txt @@ -0,0 +1,7 @@ +cmake_minimum_required(VERSION 3.5) + +set(EXTRA_COMPONENT_DIRS ../../../components) + +include($ENV{IDF_PATH}/tools/cmake/project.cmake) + +project(detection_with_command_line) diff --git a/examples/single_chip/detection_with_command_line/main/CMakeLists.txt b/examples/single_chip/detection_with_command_line/main/CMakeLists.txt new file mode 100644 index 0000000..625c7ca --- /dev/null +++ b/examples/single_chip/detection_with_command_line/main/CMakeLists.txt @@ -0,0 +1,16 @@ +set(COMPONENT_SRCS + app_main.cpp + app_facenet.c + app_camera.cpp + ) + +set(COMPONENT_ADD_INCLUDEDIRS + include + ) + +set(COMPONENT_REQUIRES + esp32-camera + esp-face + ) + +register_component() diff --git a/examples/single_chip/detection_with_command_line/main/app_facenet.c b/examples/single_chip/detection_with_command_line/main/app_facenet.c index 95e2f60..3804d7e 100644 --- a/examples/single_chip/detection_with_command_line/main/app_facenet.c +++ b/examples/single_chip/detection_with_command_line/main/app_facenet.c @@ -38,6 +38,7 @@ mtmn_config_t init_config() mtmn_config.pyramid = 0.7; mtmn_config.p_threshold.score = 0.6; mtmn_config.p_threshold.nms = 0.7; + mtmn_config.p_threshold.candidate_number = 100; mtmn_config.r_threshold.score = 0.7; mtmn_config.r_threshold.nms = 0.7; mtmn_config.r_threshold.candidate_number = 4; diff --git a/examples/single_chip/recognition_solution/CMakeLists.txt b/examples/single_chip/recognition_solution/CMakeLists.txt new file mode 100644 index 0000000..f723c65 --- /dev/null +++ b/examples/single_chip/recognition_solution/CMakeLists.txt @@ -0,0 +1,6 @@ +cmake_minimum_required(VERSION 3.5) + +set(EXTRA_COMPONENT_DIRS ../../../components) + +include($ENV{IDF_PATH}/tools/cmake/project.cmake) +project(recognition_solution) diff --git a/examples/single_chip/recognition_solution/main/CMakeLists.txt b/examples/single_chip/recognition_solution/main/CMakeLists.txt new file mode 100644 index 0000000..73a4851 --- /dev/null +++ b/examples/single_chip/recognition_solution/main/CMakeLists.txt @@ -0,0 +1,22 @@ +set(COMPONENT_SRCS + app_main.c + app_camera.c + app_httpserver.c + app_speech_recsrc.c + app_speech_wakeup.c + app_wifi.c + ) + +set(COMPONENT_ADD_INCLUDEDIRS include) + +set(COMPONENT_REQUIRES + esp32-camera + esp-face + nvs_flash + esp_http_server + fb_gfx + recorder_engine + spiffs + ) + +register_component() diff --git a/examples/single_chip/recognition_wechat/CMakeLists.txt b/examples/single_chip/recognition_wechat/CMakeLists.txt new file mode 100644 index 0000000..f6b8e81 --- /dev/null +++ b/examples/single_chip/recognition_wechat/CMakeLists.txt @@ -0,0 +1,6 @@ +cmake_minimum_required(VERSION 3.5) + +set(EXTRA_COMPONENT_DIRS ../../../components) + +include($ENV{IDF_PATH}/tools/cmake/project.cmake) +project(recognition_wechat) diff --git a/examples/single_chip/recognition_wechat/components/network_blufi/CMakeLists.txt b/examples/single_chip/recognition_wechat/components/network_blufi/CMakeLists.txt new file mode 100644 index 0000000..95e921a --- /dev/null +++ b/examples/single_chip/recognition_wechat/components/network_blufi/CMakeLists.txt @@ -0,0 +1,14 @@ +set(COMPONENT_SRCS + wechat_blufi.c + wechat_security.c + ) + +set(COMPONENT_ADD_INCLUDEDIRS include) + +set(COMPONENT_REQUIRES + bt + nvs_flash + mdns + ) + +register_component() diff --git a/examples/single_chip/recognition_wechat/main/CMakeLists.txt b/examples/single_chip/recognition_wechat/main/CMakeLists.txt new file mode 100644 index 0000000..1b5186b --- /dev/null +++ b/examples/single_chip/recognition_wechat/main/CMakeLists.txt @@ -0,0 +1,19 @@ +set(COMPONENT_SRCS + app_camera.c + app_facenet.c + app_httpserver.c + app_main.c + app_wifi.c + ) + +set(COMPONENT_ADD_INCLUDEDIRS include) + +set(COMPONENT_REQUIRES + esp32-camera + esp-face + esp_http_server + fb_gfx + network_blufi + ) + +register_component() diff --git a/examples/single_chip/recognition_with_command_line/CMakeLists.txt b/examples/single_chip/recognition_with_command_line/CMakeLists.txt new file mode 100644 index 0000000..54f9020 --- /dev/null +++ b/examples/single_chip/recognition_with_command_line/CMakeLists.txt @@ -0,0 +1,6 @@ +cmake_minimum_required(VERSION 3.5) + +set(EXTRA_COMPONENT_DIRS ../../../components) + +include($ENV{IDF_PATH}/tools/cmake/project.cmake) +project(recognition_command_line) diff --git a/examples/single_chip/recognition_with_command_line/main/CMakeLists.txt b/examples/single_chip/recognition_with_command_line/main/CMakeLists.txt new file mode 100644 index 0000000..cd96a8e --- /dev/null +++ b/examples/single_chip/recognition_with_command_line/main/CMakeLists.txt @@ -0,0 +1,14 @@ +set(COMPONENT_SRCS + app_main.cpp + app_facenet.c + app_camera.cpp + ) + +set(COMPONENT_ADD_INCLUDEDIRS include) + +set(COMPONENT_REQUIRES + esp32-camera + esp-face + ) + +register_component()