From 564680da924113789be02d78df54594e8f3acd7a Mon Sep 17 00:00:00 2001 From: Terrence Date: Tue, 4 Feb 2025 00:32:37 +0800 Subject: [PATCH] lichuang c3 use 20px fonts --- main/application.cc | 140 +++++++++--------- .../lichuang-c3-dev/lichuang_c3_dev_board.cc | 10 +- 2 files changed, 77 insertions(+), 73 deletions(-) diff --git a/main/application.cc b/main/application.cc index 53d88892..8197f49d 100644 --- a/main/application.cc +++ b/main/application.cc @@ -77,7 +77,9 @@ void Application::CheckNewVersion() { display->SetStatus("新版本 " + ota_.GetFirmwareVersion()); board.SetPowerSaveMode(false); +#if CONFIG_IDF_TARGET_ESP32S3 wake_word_detect_.StopDetection(); +#endif // 预先关闭音频输出，避免升级过程有音频操作 board.GetAudioCodec()->EnableOutput(false); { @@ -249,74 +251,6 @@ void Application::Start() { /* Wait for the network to be ready */ board.StartNetwork(); - // Check for new firmware version or get the MQTT broker address - xTaskCreate([](void* arg) { - Application* app = (Application*)arg; - app->CheckNewVersion(); - vTaskDelete(NULL); - }, "check_new_version", 4096 * 2, this, 1, nullptr); - -#if CONFIG_IDF_TARGET_ESP32S3 - audio_processor_.Initialize(codec->input_channels(), codec->input_reference()); - audio_processor_.OnOutput([this](std::vector&& data) { - background_task_->Schedule([this, data = std::move(data)]() mutable { - opus_encoder_->Encode(std::move(data), [this](std::vector&& opus) { - Schedule([this, opus = std::move(opus)]() { - protocol_->SendAudio(opus); - }); - }); - }); - }); - - wake_word_detect_.Initialize(codec->input_channels(), codec->input_reference()); - wake_word_detect_.OnVadStateChange([this](bool speaking) { - Schedule([this, speaking]() { - if (device_state_ == kDeviceStateListening) { - if (speaking) { - voice_detected_ = true; - } else { - voice_detected_ = false; - } - auto led = Board::GetInstance().GetLed(); - led->OnStateChanged(); - } - }); - }); - - wake_word_detect_.OnWakeWordDetected([this](const std::string& wake_word) { - Schedule([this, &wake_word]() { - if (device_state_ == kDeviceStateIdle) { - SetDeviceState(kDeviceStateConnecting); - wake_word_detect_.EncodeWakeWordData(); - - if (!protocol_->OpenAudioChannel()) { - ESP_LOGE(TAG, "Failed to open audio channel"); - SetDeviceState(kDeviceStateIdle); - wake_word_detect_.StartDetection(); - return; - } - - std::vector opus; - // Encode and send the wake word data to the server - while (wake_word_detect_.GetWakeWordOpus(opus)) { - protocol_->SendAudio(opus); - } - // Set the chat state to wake word detected - protocol_->SendWakeWordDetected(wake_word); - ESP_LOGI(TAG, "Wake word detected: %s", wake_word.c_str()); - keep_listening_ = true; - SetDeviceState(kDeviceStateListening); - } else if (device_state_ == kDeviceStateSpeaking) { - AbortSpeaking(kAbortReasonWakeWordDetected); - } - - // Resume detection - wake_word_detect_.StartDetection(); - }); - }); - wake_word_detect_.StartDetection(); -#endif - // Initialize the protocol display->SetStatus("初始化协议"); #ifdef CONFIG_CONNECTION_TYPE_WEBSOCKET @@ -413,6 +347,75 @@ void Application::Start() { } }); + // Check for new firmware version or get the MQTT broker address + xTaskCreate([](void* arg) { + Application* app = (Application*)arg; + app->CheckNewVersion(); + vTaskDelete(NULL); + }, "check_new_version", 4096 * 2, this, 1, nullptr); + + +#if CONFIG_IDF_TARGET_ESP32S3 + audio_processor_.Initialize(codec->input_channels(), codec->input_reference()); + audio_processor_.OnOutput([this](std::vector&& data) { + background_task_->Schedule([this, data = std::move(data)]() mutable { + opus_encoder_->Encode(std::move(data), [this](std::vector&& opus) { + Schedule([this, opus = std::move(opus)]() { + protocol_->SendAudio(opus); + }); + }); + }); + }); + + wake_word_detect_.Initialize(codec->input_channels(), codec->input_reference()); + wake_word_detect_.OnVadStateChange([this](bool speaking) { + Schedule([this, speaking]() { + if (device_state_ == kDeviceStateListening) { + if (speaking) { + voice_detected_ = true; + } else { + voice_detected_ = false; + } + auto led = Board::GetInstance().GetLed(); + led->OnStateChanged(); + } + }); + }); + + wake_word_detect_.OnWakeWordDetected([this](const std::string& wake_word) { + Schedule([this, &wake_word]() { + if (device_state_ == kDeviceStateIdle) { + SetDeviceState(kDeviceStateConnecting); + wake_word_detect_.EncodeWakeWordData(); + + if (!protocol_->OpenAudioChannel()) { + ESP_LOGE(TAG, "Failed to open audio channel"); + SetDeviceState(kDeviceStateIdle); + wake_word_detect_.StartDetection(); + return; + } + + std::vector opus; + // Encode and send the wake word data to the server + while (wake_word_detect_.GetWakeWordOpus(opus)) { + protocol_->SendAudio(opus); + } + // Set the chat state to wake word detected + protocol_->SendWakeWordDetected(wake_word); + ESP_LOGI(TAG, "Wake word detected: %s", wake_word.c_str()); + keep_listening_ = true; + SetDeviceState(kDeviceStateListening); + } else if (device_state_ == kDeviceStateSpeaking) { + AbortSpeaking(kAbortReasonWakeWordDetected); + } + + // Resume detection + wake_word_detect_.StartDetection(); + }); + }); + wake_word_detect_.StartDetection(); +#endif + SetDeviceState(kDeviceStateIdle); } @@ -618,6 +621,7 @@ void Application::SetDecodeSampleRate(int sample_rate) { } opus_decode_sample_rate_ = sample_rate; + opus_decoder_.reset(); opus_decoder_ = std::make_unique(opus_decode_sample_rate_, 1); auto codec = Board::GetInstance().GetAudioCodec(); diff --git a/main/boards/lichuang-c3-dev/lichuang_c3_dev_board.cc b/main/boards/lichuang-c3-dev/lichuang_c3_dev_board.cc index 9b14ee49..1b6f4c3d 100644 --- a/main/boards/lichuang-c3-dev/lichuang_c3_dev_board.cc +++ b/main/boards/lichuang-c3-dev/lichuang_c3_dev_board.cc @@ -15,8 +15,8 @@ #define TAG "LichuangC3DevBoard" -LV_FONT_DECLARE(font_puhui_16_4); -LV_FONT_DECLARE(font_awesome_16_4); +LV_FONT_DECLARE(font_puhui_20_4); +LV_FONT_DECLARE(font_awesome_20_4); class LichuangC3DevBoard : public WifiBoard { private: @@ -94,9 +94,9 @@ private: display_ = new LcdDisplay(panel_io, panel, DISPLAY_BACKLIGHT_PIN, DISPLAY_BACKLIGHT_OUTPUT_INVERT, DISPLAY_WIDTH, DISPLAY_HEIGHT, DISPLAY_OFFSET_X, DISPLAY_OFFSET_Y, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y, DISPLAY_SWAP_XY, { - .text_font = &font_puhui_16_4, - .icon_font = &font_awesome_16_4, - .emoji_font = font_emoji_64_init(), + .text_font = &font_puhui_20_4, + .icon_font = &font_awesome_20_4, + .emoji_font = font_emoji_32_init(), }); }