Compare commits
2 Commits
3e709577f5
...
2458c4e8bc
| Author | SHA1 | Date | |
|---|---|---|---|
| 2458c4e8bc | |||
| 70f0cdd07a |
@ -555,10 +555,25 @@ void Application::ToggleChatState() {
|
||||
Board::GetInstance().SetPowerSaveMode(false);// 关闭低功耗模式
|
||||
if (!protocol_->OpenAudioChannel()) {
|
||||
auto ac = Board::GetInstance().GetAudioCodec();
|
||||
ESP_LOGW(TAG, "打开音频通道失败，将在2秒后重试");
|
||||
audio_channel_retry_count_++;
|
||||
ESP_LOGW(TAG, "打开音频通道失败 (第 %d 次), 将在2秒后重试", audio_channel_retry_count_);
|
||||
if (ac) {
|
||||
ESP_LOGW(TAG, "Diag: codec out_channels=%d in_channels=%d out_sr=%d in_sr=%d", ac->output_channels(), ac->input_channels(), ac->output_sample_rate(), ac->input_sample_rate());
|
||||
}
|
||||
// 方案 B: 连续失败 3 次后销毁 + 重建 RTC engine
|
||||
// 原因: SDK 内部状态污染 (lwIP socket fd 残留 / 内部缓存错乱) 单纯重试无效,
|
||||
// 必须重建 engine 清理. 触发 Phase 6 的 rtc_handle_=nullptr → Start() 重建路径
|
||||
if (audio_channel_retry_count_ >= 3) {
|
||||
ESP_LOGW(TAG, "🔄 连续失败 3 次, 触发 RTC engine 重建 (清理 SDK 状态)");
|
||||
// protocol_ 是基类 unique_ptr<Protocol>, 需 dynamic_cast 到 VolcRtcProtocol
|
||||
// ESP-IDF 默认 -fno-rtti, 不能用 dynamic_cast.
|
||||
// protocol_ 在 Init 时只赋值为 VolcRtcProtocol (line 932), 用 static_cast 安全
|
||||
auto* volc_rtc = static_cast<VolcRtcProtocol*>(protocol_.get());
|
||||
if (volc_rtc) {
|
||||
volc_rtc->ForceRebuildEngine();
|
||||
}
|
||||
audio_channel_retry_count_ = 0; // 重置计数, 重建后从 0 开始计
|
||||
}
|
||||
SetDeviceState(kDeviceStateIdle);
|
||||
Schedule([this]() {
|
||||
vTaskDelay(pdMS_TO_TICKS(2000));
|
||||
@ -567,6 +582,8 @@ void Application::ToggleChatState() {
|
||||
});
|
||||
return;
|
||||
}
|
||||
// 连接成功重置重试计数
|
||||
audio_channel_retry_count_ = 0;
|
||||
|
||||
listening_mode_ = kListeningModeRealtime;// 设置监听模式为实时监听
|
||||
SetDeviceState(kDeviceStateDialog);// 设置设备状态为对话模式
|
||||
@ -783,6 +800,8 @@ void Application::Start() {
|
||||
|
||||
if (provisioning_mode_) {
|
||||
// 配网模式：跳过编码器、输入重采样器，仅启用扬声器输出
|
||||
// ⚠️ 不要改成完整 codec->Start(): 配网模式下 BLE 需要 ~15KB DRAM,
|
||||
// duplex codec 会让 BLE gatt_init malloc failed → reboot loop
|
||||
ESP_LOGI(TAG, "配网模式：跳过 Opus 编码器、输入重采样器、麦克风输入");
|
||||
codec->StartOutputOnly();
|
||||
} else {
|
||||
|
||||
@ -167,6 +167,7 @@ private:
|
||||
std::atomic<bool> https_playback_active_{false};// HTTPS音频播放进行中标志
|
||||
std::atomic<bool> https_playback_abort_{false};// HTTPS音频播放中止标志
|
||||
std::atomic<int> post_abort_debug_frames_{0};// HTTPS中止后诊断日志计数（追踪前N帧音频）
|
||||
int audio_channel_retry_count_ = 0;// RTC 偶发连接失败重试计数 (方案 B: 失败 3 次后销毁 + 重建 engine)
|
||||
bool aborted_ = false;
|
||||
bool voice_detected_ = false;
|
||||
bool audio_paused_ = false; // 音频暂停状态标志
|
||||
|
||||
@ -352,22 +352,34 @@ void WifiBoard::SetPowerSaveMode(bool enabled) {
|
||||
// 重置WiFi配置，设备将重启进入配网模式
|
||||
void WifiBoard::ResetWifiConfiguration() {
|
||||
ESP_LOGI(TAG, "🔄 重置WiFi配置，设备将重启进入配网模式");
|
||||
// 设置WiFi配网标志位，确保重启后能正确进入配网模式
|
||||
{
|
||||
Settings settings("wifi", true);// 创建WiFi配置设置对象，第二个参数true表示立即保存到NVS存储
|
||||
settings.SetInt("force_ap", 1);// 设置force_ap标志为1，这个标志会在设备重启后被检查，如果为1则启动WiFi配网服务，启动时强制进入AP配网模式
|
||||
}
|
||||
|
||||
// 获取显示设备对象并显示配网提示信息
|
||||
auto display = GetDisplay();
|
||||
if (display) {
|
||||
// 在屏幕上显示"进入WiFi配置模式"的多语言提示信息
|
||||
// 让用户知道设备即将重启并进入配网模式
|
||||
display->ShowNotification(Lang::Strings::ENTERING_WIFI_CONFIG_MODE);
|
||||
// ⚠️ ResetWifiConfiguration 由 BOOT 按键 OnClick 调用, 跑在 esp_timer task 上下文.
|
||||
// CLAUDE.md 警告: iot_button 回调在 esp_timer task 中执行, 不能 vTaskDelay
|
||||
// (4000ms vTaskDelay 实测只等了 1100ms 就被唤醒, 音效没播完就 esp_restart).
|
||||
// 修复: 派发整个"播音效 + 等待 + 重启"逻辑到独立 task 跑.
|
||||
xTaskCreate([](void* /*arg*/) {
|
||||
ESP_LOGI("WifiBoard", "🔄 [reset_task] 开始播放配网音效...");
|
||||
auto& application = Application::GetInstance();
|
||||
if (strcmp(CONFIG_DEVICE_ROLE, "KAKA") == 0) {
|
||||
application.PlaySound(Lang::Sounds::P3_KAKA_WIFICONFIG);
|
||||
} else if (strcmp(CONFIG_DEVICE_ROLE, "RTC_Test") == 0) {
|
||||
application.PlaySound(Lang::Sounds::P3_LALA_WIFICONFIG);
|
||||
}
|
||||
vTaskDelay(pdMS_TO_TICKS(500)); // 等待500ms，确保NVS配置保存完成，如果有屏幕显示，可以增加到1000ms让用户看清提示
|
||||
ESP_LOGI(TAG, "🔄 正在重启设备...");
|
||||
esp_restart(); // 重启设备，重启后会进入配网模式
|
||||
// 等 4 秒让音效完整播完 (在独立 task 中 vTaskDelay 正常工作)
|
||||
// 覆盖: 入队 + audio_loop 出队 + background_task 解码 + I2S DMA + 功放尾音
|
||||
vTaskDelay(pdMS_TO_TICKS(4000));
|
||||
ESP_LOGI("WifiBoard", "🔄 [reset_task] 配网音效播放完成");
|
||||
|
||||
// 设置 force_ap 标志, 让设备重启后进入配网模式
|
||||
{
|
||||
Settings settings("wifi", true);
|
||||
settings.SetInt("force_ap", 1);
|
||||
}
|
||||
ESP_LOGI("WifiBoard", "🔄 [reset_task] 正在重启设备...");
|
||||
esp_restart();
|
||||
vTaskDelete(NULL); // 不应执行到这里
|
||||
}, "wifi_reset", 4096, NULL, 5, NULL);
|
||||
// ResetWifiConfiguration 立刻 return, 不阻塞 BOOT 按键回调
|
||||
}
|
||||
|
||||
// 启动BLE配网服务
|
||||
|
||||
@ -1582,6 +1582,8 @@ public:
|
||||
init_attempted = true; // 标记为已尝试初始化
|
||||
|
||||
// 配网模式：仅创建 TX 通道，跳过 RX DMA（~11.5KB）和 ES7210（~2-4KB）
|
||||
// ⚠️ 不要改成 false: 配网模式下 BLE Bluedroid stack 需要这 15KB DRAM,
|
||||
// 强制 duplex 会让 BLE gatt_init 时 malloc failed → assert reboot loop
|
||||
bool output_only = WifiBoard::NeedsProvisioning();
|
||||
|
||||
ESP_LOGI(TAG, "Initializing audio codec (%s)...", output_only ? "output only" : "duplex");
|
||||
|
||||
@ -21,6 +21,29 @@
|
||||
|
||||
static const char* TAG = "VolcRtcProtocol";
|
||||
|
||||
// ============================================================
|
||||
// 方案 C: RTC bind 失败诊断埋点 (一键关闭, 零运行时开销)
|
||||
// 验证完成后改 0 关闭, 编译器消除 #if 块, 不占 Flash/CPU
|
||||
// 排查 "Cache.c:273 status=0x9 + SocketConnection-Lite.c:191 bind failed" 偶发问题
|
||||
// ============================================================
|
||||
#ifndef DIAG_RTC_BIND_ENABLE
|
||||
#define DIAG_RTC_BIND_ENABLE 1
|
||||
#endif
|
||||
|
||||
#if DIAG_RTC_BIND_ENABLE
|
||||
#include "esp_wifi.h"
|
||||
#include "lwip/sockets.h" // LWIP_SOCKET_OFFSET
|
||||
// 统计当前 lwIP socket fd 使用量 (在 LWIP_SOCKET_OFFSET 偏移之上扫描)
|
||||
static int diag_count_used_sockets(void) {
|
||||
int used = 0;
|
||||
for (int fd = LWIP_SOCKET_OFFSET; fd < LWIP_SOCKET_OFFSET + CONFIG_LWIP_MAX_SOCKETS; fd++) {
|
||||
struct stat st;
|
||||
if (fstat(fd, &st) == 0) used++;
|
||||
}
|
||||
return used;
|
||||
}
|
||||
#endif
|
||||
|
||||
VolcRtcProtocol::VolcRtcProtocol() {
|
||||
event_group_handle_ = xEventGroupCreate();
|
||||
}
|
||||
@ -364,6 +387,18 @@ bool VolcRtcProtocol::OpenAudioChannel() {
|
||||
xEventGroupClearBits(event_group_handle_, 0x1 | 0x2);
|
||||
// 新增：extra_params 用于传递额外的AgentConfig配置参数
|
||||
ESP_LOGI(TAG, "Join RTC: handle=%p bot=%s iot_ready=%d free_heap=%u", rtc_handle_, CONFIG_VOLC_BOT_ID, (int)iot_ready_, (unsigned)heap_caps_get_free_size(MALLOC_CAP_DEFAULT));
|
||||
#if DIAG_RTC_BIND_ENABLE
|
||||
{
|
||||
int sockets_used = diag_count_used_sockets();
|
||||
wifi_ap_record_t ap_info = {};
|
||||
int rssi = (esp_wifi_sta_get_ap_info(&ap_info) == ESP_OK) ? ap_info.rssi : -127;
|
||||
ESP_LOGW("DIAG-RTC", "Pre-Join: sockets=%d/%d heap=%u psram=%u rssi=%d",
|
||||
sockets_used, CONFIG_LWIP_MAX_SOCKETS,
|
||||
(unsigned)heap_caps_get_free_size(MALLOC_CAP_DEFAULT),
|
||||
(unsigned)heap_caps_get_free_size(MALLOC_CAP_SPIRAM),
|
||||
rssi);
|
||||
}
|
||||
#endif
|
||||
int ret = volc_rtc_start(rtc_handle_, CONFIG_VOLC_BOT_ID, &iot_info_, extra_params_.empty() ? NULL : extra_params_.c_str());
|
||||
if (ret != 0) {
|
||||
ESP_LOGE(TAG, "RTC启动失败：%d", ret);// RTC启动失败：%d
|
||||
@ -375,6 +410,16 @@ bool VolcRtcProtocol::OpenAudioChannel() {
|
||||
if ((bits & 0x1) == 0) {
|
||||
ESP_LOGE(TAG, "RTC连接超时");// RTC连接超时
|
||||
ESP_LOGW(TAG, "Diag: check Wi-Fi, SNTP time sync, IoT creds, RTC server availability");// 诊断：检查Wi-Fi、SNTP时间同步、IoT凭证、RTC服务器可用性
|
||||
#if DIAG_RTC_BIND_ENABLE
|
||||
{
|
||||
int sockets_used = diag_count_used_sockets();
|
||||
ESP_LOGW("DIAG-RTC", "Post-Fail: sockets=%d/%d heap=%u psram=%u errno=%d(%s)",
|
||||
sockets_used, CONFIG_LWIP_MAX_SOCKETS,
|
||||
(unsigned)heap_caps_get_free_size(MALLOC_CAP_DEFAULT),
|
||||
(unsigned)heap_caps_get_free_size(MALLOC_CAP_SPIRAM),
|
||||
errno, strerror(errno));
|
||||
}
|
||||
#endif
|
||||
return false;
|
||||
}
|
||||
// Do not block audio readiness on remote user join; enable subscribe immediately
|
||||
@ -452,6 +497,38 @@ void VolcRtcProtocol::LeaveRoom(bool notify_closed) {
|
||||
}
|
||||
}
|
||||
|
||||
// 方案 B: 强制销毁并重建 RTC engine
|
||||
// 用途: OpenAudioChannel 连续失败 N 次后调用, 清理 SDK 内部错乱状态
|
||||
// 实现: 销毁 rtc_handle_ + 触发 Phase 6 重建路径
|
||||
// 下次 OpenAudioChannel 看到 rtc_handle_=nullptr → Start() 异步重建
|
||||
void VolcRtcProtocol::ForceRebuildEngine() {
|
||||
ESP_LOGW(TAG, "🔄 ForceRebuildEngine: 销毁 RTC engine 以清理 SDK 状态");
|
||||
#if DIAG_RTC_BIND_ENABLE
|
||||
ESP_LOGW("DIAG-RTC", "Pre-Rebuild: sockets=%d/%d heap=%u",
|
||||
diag_count_used_sockets(), CONFIG_LWIP_MAX_SOCKETS,
|
||||
(unsigned)heap_caps_get_free_size(MALLOC_CAP_DEFAULT));
|
||||
#endif
|
||||
if (rtc_handle_) {
|
||||
if (is_connected_) {
|
||||
volc_rtc_stop(rtc_handle_);
|
||||
is_connected_ = false;
|
||||
}
|
||||
volc_rtc_destroy(rtc_handle_);
|
||||
rtc_handle_ = nullptr;
|
||||
}
|
||||
is_audio_channel_opened_ = false;
|
||||
downlink_is_pcm_ = false;
|
||||
first_downlink_logged_ = false;
|
||||
// 等 2 秒让 lwIP 释放残留 socket fd (TIME_WAIT 状态)
|
||||
vTaskDelay(pdMS_TO_TICKS(2000));
|
||||
#if DIAG_RTC_BIND_ENABLE
|
||||
ESP_LOGW("DIAG-RTC", "Post-Rebuild-Wait: sockets=%d/%d heap=%u",
|
||||
diag_count_used_sockets(), CONFIG_LWIP_MAX_SOCKETS,
|
||||
(unsigned)heap_caps_get_free_size(MALLOC_CAP_DEFAULT));
|
||||
#endif
|
||||
ESP_LOGI(TAG, "🔄 engine 已销毁, 下次 OpenAudioChannel 触发 Phase 6 重建");
|
||||
}
|
||||
|
||||
// 🔊 检查音频通道是否已打开
|
||||
bool VolcRtcProtocol::IsAudioChannelOpened() const {
|
||||
return is_audio_channel_opened_;
|
||||
|
||||
@ -26,6 +26,11 @@ public:
|
||||
// 与 CloseAudioChannel 区别：CloseAudioChannel 只停媒体流，房间仍占用
|
||||
void LeaveRoom(bool notify_closed = true) override;
|
||||
|
||||
// 方案 B: 强制销毁并重建 RTC engine. 当 OpenAudioChannel 连续失败 N 次时调用,
|
||||
// 清理 SDK 内部错乱状态 (如 lwIP socket fd 残留 / 内部缓存污染),
|
||||
// 触发 Phase 6 的 rtc_handle_=nullptr → Start() 重建路径
|
||||
void ForceRebuildEngine();
|
||||
|
||||
bool IsAudioChannelOpened() const override;// 🔊 检查音频通道是否已打开
|
||||
void SendAbortSpeaking(AbortReason reason) override;// 🔊 发送中止通话请求
|
||||
void SendStartListening(ListeningMode mode) override;// 🔊 发送开始监听请求
|
||||
|
||||
@ -1038,12 +1038,7 @@ CONFIG_BT_SMP_MAX_BONDS=15
|
||||
# CONFIG_BT_BLE_ACT_SCAN_REP_ADV_SCAN is not set
|
||||
CONFIG_BT_MAX_DEVICE_NAME_LEN=32
|
||||
CONFIG_BT_BLE_RPA_TIMEOUT=900
|
||||
CONFIG_BT_BLE_50_FEATURES_SUPPORTED=y
|
||||
CONFIG_BT_BLE_50_EXTEND_ADV_EN=y
|
||||
CONFIG_BT_BLE_50_PERIODIC_ADV_EN=y
|
||||
CONFIG_BT_BLE_50_EXTEND_SCAN_EN=y
|
||||
CONFIG_BT_BLE_50_EXTEND_SYNC_EN=y
|
||||
CONFIG_BT_BLE_50_DTM_TEST_EN=y
|
||||
# CONFIG_BT_BLE_50_FEATURES_SUPPORTED is not set
|
||||
CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
|
||||
CONFIG_BT_BLE_42_DTM_TEST_EN=y
|
||||
CONFIG_BT_BLE_42_ADV_EN=y
|
||||
@ -2106,7 +2101,7 @@ CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES=y
|
||||
CONFIG_LWIP_TIMERS_ONDEMAND=y
|
||||
CONFIG_LWIP_ND6=y
|
||||
# CONFIG_LWIP_FORCE_ROUTER_FORWARDING is not set
|
||||
CONFIG_LWIP_MAX_SOCKETS=10
|
||||
CONFIG_LWIP_MAX_SOCKETS=20
|
||||
# CONFIG_LWIP_USE_ONLY_LWIP_SELECT is not set
|
||||
# CONFIG_LWIP_SO_LINGER is not set
|
||||
CONFIG_LWIP_SO_REUSE=y
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user