Updated AudioService to prevent input task termination on read timeout, introducing a delay instead. (#1810)

* Enhance Otto Robot camera support by adding configuration for OV3660. Updated config.h to define camera types and GPIO settings, modified config.json to include new camera options, and refactored otto_robot.cc for improved camera detection and initialization logic.

* fix: 移除 OttoEmojiDisplay 构造函数中的 SetTheme 调用以修复 LoadProhibited 崩溃

Made-with: Cursor

* refactor: improve audio service error handling and codec timeout management

- Updated AudioService to prevent input task termination on read timeout, introducing a delay instead.
- Enhanced NoAudioCodec to implement a read timeout for I2S channel reads.
- Adjusted WebSocketControlServer to set a control port for improved socket management.
- Added manufacturer information to the config.json for waveshare ESP32-Touch-LCD-3.5.
This commit is contained in:
小鹏
2026-03-06 06:50:03 +08:00
committed by GitHub
parent e37a24bea8
commit 443a3ba120
4 changed files with 10 additions and 5 deletions

View File

@ -280,8 +280,8 @@ void AudioService::AudioInputTask() {
} }
} }
ESP_LOGE(TAG, "Should not be here, bits: %lx", bits); // Read timeout/error should not terminate the input task.
break; vTaskDelay(pdMS_TO_TICKS(10));
} }
ESP_LOGW(TAG, "Audio input task stopped"); ESP_LOGW(TAG, "Audio input task stopped");
@ -687,7 +687,10 @@ void AudioService::CheckAndUpdateAudioPowerState() {
codec_->EnableInput(false); codec_->EnableInput(false);
} }
if (output_elapsed > AUDIO_POWER_TIMEOUT_MS && codec_->output_enabled()) { if (output_elapsed > AUDIO_POWER_TIMEOUT_MS && codec_->output_enabled()) {
codec_->EnableOutput(false); // Keep TX clock when duplex RX is active; otherwise RX may stall on some boards.
if (!(codec_->duplex() && codec_->input_enabled())) {
codec_->EnableOutput(false);
}
} }
if (!codec_->input_enabled() && !codec_->output_enabled()) { if (!codec_->input_enabled() && !codec_->output_enabled()) {
esp_timer_stop(audio_power_timer_); esp_timer_stop(audio_power_timer_);

View File

@ -239,10 +239,10 @@ int NoAudioCodec::Write(const int16_t* data, int samples) {
int NoAudioCodec::Read(int16_t* dest, int samples) { int NoAudioCodec::Read(int16_t* dest, int samples) {
size_t bytes_read; size_t bytes_read;
constexpr TickType_t kReadTimeoutTicks = pdMS_TO_TICKS(200);
std::vector<int32_t> bit32_buffer(samples); std::vector<int32_t> bit32_buffer(samples);
if (i2s_channel_read(rx_handle_, bit32_buffer.data(), samples * sizeof(int32_t), &bytes_read, portMAX_DELAY) != ESP_OK) { if (i2s_channel_read(rx_handle_, bit32_buffer.data(), samples * sizeof(int32_t), &bytes_read, kReadTimeoutTicks) != ESP_OK) {
ESP_LOGE(TAG, "Read Failed!");
return 0; return 0;
} }

View File

@ -88,6 +88,7 @@ bool WebSocketControlServer::Start(int port) {
httpd_config_t config = HTTPD_DEFAULT_CONFIG(); httpd_config_t config = HTTPD_DEFAULT_CONFIG();
config.server_port = port; config.server_port = port;
config.max_open_sockets = 7; config.max_open_sockets = 7;
config.ctrl_port = 32769;
httpd_uri_t ws_uri = { httpd_uri_t ws_uri = {
.uri = "/ws", .uri = "/ws",

View File

@ -1,4 +1,5 @@
{ {
"manufacturer": "waveshare",
"target": "esp32", "target": "esp32",
"builds": [ "builds": [
{ {