diff --git a/CMakeLists.txt b/CMakeLists.txt index 5175bf95..404aef04 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ # CMakeLists in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(PROJECT_VER "1.8.4") +set(PROJECT_VER "1.8.5") # Add this line to disable the specific warning add_compile_options(-Wno-missing-field-initializers) diff --git a/main/application.cc b/main/application.cc index 3c7dea2f..0a11bd15 100644 --- a/main/application.cc +++ b/main/application.cc @@ -504,9 +504,6 @@ void Application::Start() { // Print heap stats SystemInfo::PrintHeapStats(); - - // Enter the main event loop - MainEventLoop(); } void Application::OnClockTimer() { diff --git a/main/application.h b/main/application.h index 83b2ff3c..6997f1c5 100644 --- a/main/application.h +++ b/main/application.h @@ -41,6 +41,7 @@ public: Application& operator=(const Application&) = delete; void Start(); + void MainEventLoop(); DeviceState GetDeviceState() const { return device_state_; } bool IsVoiceDetected() const { return audio_service_.IsVoiceDetected(); } void Schedule(std::function callback); @@ -80,7 +81,6 @@ private: int clock_ticks_ = 0; TaskHandle_t check_new_version_task_handle_ = nullptr; - void MainEventLoop(); void OnWakeWordDetected(); void CheckNewVersion(Ota& ota); void ShowActivationCode(const std::string& code, const std::string& message); diff --git a/main/idf_component.yml b/main/idf_component.yml index 31a759ab..f0577152 100644 --- a/main/idf_component.yml +++ b/main/idf_component.yml @@ -15,11 +15,11 @@ dependencies: 78/esp_lcd_nv3023: ~1.0.0 78/esp-wifi-connect: ~2.4.3 78/esp-opus-encoder: ~2.4.0 - 78/esp-ml307: ~3.2.4 + 78/esp-ml307: ~3.2.5 78/xiaozhi-fonts: ~1.3.2 espressif/led_strip: ^2.5.5 espressif/esp_codec_dev: ~1.3.6 - espressif/esp-sr: ~2.1.1 + espressif/esp-sr: ~2.1.4 espressif/button: ~4.1.3 espressif/knob: ^1.0.0 espressif/esp32-camera: ^2.0.15 diff --git a/main/main.cc b/main/main.cc index cc03cbd7..c4bce23d 100755 --- a/main/main.cc +++ b/main/main.cc @@ -25,5 +25,7 @@ extern "C" void app_main(void) ESP_ERROR_CHECK(ret); // Launch the application - Application::GetInstance().Start(); + auto& app = Application::GetInstance(); + app.Start(); + app.MainEventLoop(); }