From 330f2d3e07f5f9fed60da930583e7d44d211aa4e Mon Sep 17 00:00:00 2001 From: zwsd Date: Mon, 26 Sep 2022 14:40:11 +0800 Subject: [PATCH] update --- .vscode/settings.json | 3 ++- main/CMakeLists.txt | 2 ++ main/app_main.cpp | 11 ++++++++++- main/camera.cpp | 8 +++++++- main/camera.h | 6 +++++- main/key.c | 17 +++++++++++++++++ main/key.h | 6 ++++++ main/wifi.c | 17 +++++++++++++++++ main/wifi.h | 16 ++++++++++++++++ 9 files changed, 82 insertions(+), 4 deletions(-) create mode 100644 main/key.c create mode 100644 main/key.h create mode 100644 main/wifi.c create mode 100644 main/wifi.h diff --git a/.vscode/settings.json b/.vscode/settings.json index 2b14e21..0856fb1 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -9,6 +9,7 @@ "ble_spp_server_demo.h": "c", "esp_bt_main.h": "c", "esp_bt_defs.h": "c", - "camera.h": "c" + "camera.h": "c", + "key.h": "c" } } \ No newline at end of file diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index e4ee713..8db0980 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -3,6 +3,8 @@ set(srcs "app_main.cpp" # "camera.cpp" "light.c" "port.c" + "key.c" + "wifi.c" ) idf_component_register(SRCS "${srcs}"# diff --git a/main/app_main.cpp b/main/app_main.cpp index cc373c9..764117d 100644 --- a/main/app_main.cpp +++ b/main/app_main.cpp @@ -4,7 +4,10 @@ extern "C" { #include "ble_spp_server_demo.h" #include "light.h" +#include "key.h" +#include "wifi.h" } + power_state_light_structer_t power_state_light_structer = { .state = ShutDown, .change_flag = false, @@ -35,11 +38,17 @@ extern "C" void app_main(void) T_debug_light_init(); T_all_light_init(); ble_spp_server_init(); - camera_motion_detection_init(); + camera_init(); + key_init(); + wifi_init(); + + key_registered_cb(); + wifi_registered_cb(); while (true) { T_debug_light_schedule(); T_light_schedule(); + key_schedule(); } } \ No newline at end of file diff --git a/main/camera.cpp b/main/camera.cpp index 1e6c811..38688b1 100644 --- a/main/camera.cpp +++ b/main/camera.cpp @@ -14,4 +14,10 @@ void camera_motion_detection_init(void) 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 +} + +void camera_init(void) {} + +void camera_registered_cb(void) {} + +void camera_taking_pictures(void) {} \ No newline at end of file diff --git a/main/camera.h b/main/camera.h index e526e9e..f8d8134 100644 --- a/main/camera.h +++ b/main/camera.h @@ -1,2 +1,6 @@ #pragma once -void camera_motion_detection_init(void); \ No newline at end of file + +void camera_motion_detection_init(void); +void camera_init(void); +void camera_registered_cb(void); +void camera_taking_pictures(void); \ No newline at end of file diff --git a/main/key.c b/main/key.c new file mode 100644 index 0000000..035cf89 --- /dev/null +++ b/main/key.c @@ -0,0 +1,17 @@ +#include "key.h" + +void key_init(void) +{ +} + +void key_registered_cb(void) +{ +} + +void key_on_event(void) +{ +} + +void key_schedule(void) +{ +} \ No newline at end of file diff --git a/main/key.h b/main/key.h new file mode 100644 index 0000000..bfb05a7 --- /dev/null +++ b/main/key.h @@ -0,0 +1,6 @@ +#pragma once + +void key_init(void); +void key_registered_cb(void); +void key_on_event(void); +void key_schedule(void); \ No newline at end of file diff --git a/main/wifi.c b/main/wifi.c new file mode 100644 index 0000000..7463f64 --- /dev/null +++ b/main/wifi.c @@ -0,0 +1,17 @@ +#include "wifi.h" + +#define WIFI_SSID 1 +#define WIFI_NAME "ZWSD_ESP32" +#define WIFI_PASSWORD "zwsdzwsd" + +void wifi_init(void) {} + +void wifi_registered_cb(void) {} + +void wifi_start_connect(void) {} + +void wifi_stop_connect(void) {} + +bool wifi_connect_timeout(void) { return true; } + +void wifi_send_data(void) {} \ No newline at end of file diff --git a/main/wifi.h b/main/wifi.h new file mode 100644 index 0000000..c23af05 --- /dev/null +++ b/main/wifi.h @@ -0,0 +1,16 @@ +#pragma once +#include +#include + +typedef struct +{ + bool wifi_connect_flag; + uint8_t wifi_max_connect_num; +} wifi_config_structer_t; + +void wifi_init(void); +void wifi_registered_cb(void); +void wifi_start_connect(void); +void wifi_stop_connect(void); +bool wifi_connect_timeout(void); +void wifi_send_data(void); \ No newline at end of file