这是一次长久的提交:
1. 应用界面增加了返回主页的按钮 2. 修复了gif渲染内存泄漏的严重bug 3. 将PetDao当中的cJSON API替换为cpp_json,完美通过测试 4. 整合已经实现的各种上层建筑,实现了一个宠物对话基本业务应用,用于样品测试展示用 5. 重构了音频播放类,使其更modern,更加便于移植和拓展
This commit is contained in:
+11
-4
@@ -1,10 +1,9 @@
|
||||
#include <stdio.h>
|
||||
|
||||
|
||||
#include <esp_log.h>
|
||||
#include <nvs.h>
|
||||
#include <nvs_flash.h>
|
||||
|
||||
#include "err_handle.h"
|
||||
|
||||
#include "drivers_test.h"
|
||||
#include "CppHandle.h"
|
||||
|
||||
@@ -34,9 +33,17 @@ void app_main(void)
|
||||
|
||||
// mic_speech_and_gif_and_music_test();
|
||||
|
||||
// 初始化NVS
|
||||
esp_err_t ret = nvs_flash_init();
|
||||
if (ret == ESP_ERR_NVS_NO_FREE_PAGES || ret == ESP_ERR_NVS_NEW_VERSION_FOUND) {
|
||||
ESP_ERROR_CHECK(nvs_flash_erase());
|
||||
ret = nvs_flash_init();
|
||||
}
|
||||
ESP_ERROR_CHECK(ret);
|
||||
|
||||
Cpp_Hand();
|
||||
|
||||
ESP_GOTO(err);
|
||||
err:
|
||||
ESP_LOGI("app_main", "app_main error");
|
||||
ESP_LOGE("app_main", "app_main error");
|
||||
}
|
||||
|
||||
@@ -38,10 +38,13 @@ idf_component_register(SRCS "Bionic_sphere.c"
|
||||
"../Bionic_Core/ToolsClass/ToolsClass.cpp" # 工具类库
|
||||
"../Bionic_Core/ToolsClass/AudioOutput/AudioOutput.cpp" # 音频输出类库
|
||||
"../Bionic_Core/ToolsClass/LVGL_Render/LVGLRender.cpp" # LVGL渲染类库
|
||||
"../Bionic_Core/ToolsClass/LVGL_Render/LvppApp/BaseApp.cpp"
|
||||
"../Bionic_Core/ToolsClass/LVGL_Render/Lvpp/SiYuanHeiTiGoogleBan.c" # 中文字体库
|
||||
"../Bionic_Core/ToolsClass/LVGL_Render/Lvpp/lvpp.cpp"
|
||||
"../Bionic_Core/ToolsClass/SDFileManager/SDFileManager.cpp" # SD文件管理类库
|
||||
"../Bionic_Core/ToolsClass/SpeechRecognizer/SpeechRecognizer.cpp" # 语音识别类库
|
||||
"../Bionic_Core/ToolsClass/SpeechRecognizer/VadSlidingWindow.cpp"
|
||||
"../Bionic_Core/ToolsClass/SpeechRecognizer/SimpleI2SForwarder.cpp"
|
||||
"../Bionic_Core/ToolsClass/WifiConnectors/WifiConnectors.cpp" # WIFI连接类库
|
||||
"../Bionic_Core/ToolsClass/ThreadManager/ThreadManager.cpp" # 线程管理类库
|
||||
"../Bionic_Core/ToolsClass/Sys_Config/sys_conf_singleton.cpp" # 系统配置类库
|
||||
@@ -78,6 +81,7 @@ idf_component_register(SRCS "Bionic_sphere.c"
|
||||
"../Bionic_Core/ToolsClass"
|
||||
"../Bionic_Core/ToolsClass/AudioOutput"
|
||||
"../Bionic_Core/ToolsClass/LVGL_Render"
|
||||
"../Bionic_Core/ToolsClass/LVGL_Render/LvppApp"
|
||||
"../Bionic_Core/ToolsClass/LVGL_Render/Lvpp"
|
||||
"../Bionic_Core/ToolsClass/SDFileManager"
|
||||
"../Bionic_Core/ToolsClass/SpeechRecognizer"
|
||||
|
||||
Reference in New Issue
Block a user