From 74be47ece57fcf834325d5068707db745930aa13 Mon Sep 17 00:00:00 2001
From: zwsd <zwsdtjl@zwsd.com>
Date: Sun, 25 Sep 2022 14:37:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=81=E8=A3=85=E7=9B=B8=E6=9C=BA=E9=83=A8?=
 =?UTF-8?q?=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vscode/settings.json      |  3 ++-
 main/CMakeLists.txt        |  1 +
 main/app_main.cpp          | 21 ++++++++-------------
 main/ble_spp_server_demo.c |  2 +-
 main/ble_spp_server_demo.h |  2 +-
 main/camera.cpp            | 17 +++++++++++++++++
 main/camera.h              |  2 ++
 7 files changed, 32 insertions(+), 16 deletions(-)
 create mode 100644 main/camera.cpp
 create mode 100644 main/camera.h

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 01cb6eb..2b14e21 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -8,6 +8,7 @@
         "bitset": "c",
         "ble_spp_server_demo.h": "c",
         "esp_bt_main.h": "c",
-        "esp_bt_defs.h": "c"
+        "esp_bt_defs.h": "c",
+        "camera.h": "c"
     }
 }
\ No newline at end of file
diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
index 66c3a5a..9aae90a 100644
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@@ -1,5 +1,6 @@
 set(srcs "app_main.cpp" #
     "ble_spp_server_demo.c"
+    "camera.cpp"
 )
 
 idf_component_register(SRCS "${srcs}"#
diff --git a/main/app_main.cpp b/main/app_main.cpp
index 6d7f93b..05131e3 100644
--- a/main/app_main.cpp
+++ b/main/app_main.cpp
@@ -1,22 +1,17 @@
-#include "who_camera.h"
-#include "who_motion_detection.hpp"
-#include "who_lcd.h"
+#include "camera.h"
 //
 extern "C"
 {
 #include "ble_spp_server_demo.h"
 }
 
-static QueueHandle_t xQueueAIFrame = NULL;
-static QueueHandle_t xQueueLCDFrame = NULL;
-
-extern "C" void app_main()
+extern "C" void app_main(void)
 {
-    ble_spp_server_demo_app_main();
-    xQueueAIFrame = xQueueCreate(2, sizeof(camera_fb_t *));
-    xQueueLCDFrame = xQueueCreate(2, sizeof(camera_fb_t *));
+    ble_spp_server_init();
+    camera_init();
 
-    register_camera(PIXFORMAT_RGB565, FRAMESIZE_240X240, 2, xQueueAIFrame);
-    register_motion_detection(xQueueAIFrame, NULL, NULL, xQueueLCDFrame);
-    register_lcd(xQueueLCDFrame, NULL, true);
+    while (true)
+    {
+        /* code */
+    }
 }
\ No newline at end of file
diff --git a/main/ble_spp_server_demo.c b/main/ble_spp_server_demo.c
index f64a0a1..718ca14 100644
--- a/main/ble_spp_server_demo.c
+++ b/main/ble_spp_server_demo.c
@@ -652,7 +652,7 @@ static void gatts_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_
     } while (0);
 }
 
-void ble_spp_server_demo_app_main()
+void ble_spp_server_init()
 {
     esp_err_t ret;
     esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT();
diff --git a/main/ble_spp_server_demo.h b/main/ble_spp_server_demo.h
index af3328a..1832ccb 100644
--- a/main/ble_spp_server_demo.h
+++ b/main/ble_spp_server_demo.h
@@ -50,4 +50,4 @@ enum
   SPP_IDX_NB,
 };
 
-void ble_spp_server_demo_app_main();
+void ble_spp_server_init();
diff --git a/main/camera.cpp b/main/camera.cpp
new file mode 100644
index 0000000..7c198af
--- /dev/null
+++ b/main/camera.cpp
@@ -0,0 +1,17 @@
+#include "camera.h"
+#include "who_camera.h"
+#include "who_motion_detection.hpp"
+#include "who_lcd.h"
+
+static QueueHandle_t xQueueAIFrame = NULL;
+static QueueHandle_t xQueueLCDFrame = NULL;
+
+void camera_init(void)
+{
+    xQueueAIFrame = xQueueCreate(2, sizeof(camera_fb_t *));
+    xQueueLCDFrame = xQueueCreate(2, sizeof(camera_fb_t *));
+
+    register_camera(PIXFORMAT_RGB565, FRAMESIZE_240X240, 2, xQueueAIFrame);
+    register_motion_detection(xQueueAIFrame, NULL, NULL, xQueueLCDFrame);
+    register_lcd(xQueueLCDFrame, NULL, true);
+}
\ No newline at end of file
diff --git a/main/camera.h b/main/camera.h
new file mode 100644
index 0000000..91b5a71
--- /dev/null
+++ b/main/camera.h
@@ -0,0 +1,2 @@
+#pragma once
+void camera_init(void);
\ No newline at end of file