From: snickersun Date: Wed, 27 May 2026 09:36:12 +0000 (+0800) Subject: 长对话 VAD defer:立刻止上行 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=0e2b420b61fafd5245a8eb6d90577e5e90227d16;p=mirrors%2FASR1603_G5.git 长对话 VAD defer:立刻止上行 修复问题:只 defer 停麦,未开 silence_gate,云端已 vad.silence 仍上行 PCM。 PTT 松手 await_server:清 drop 标志 修复问题:need_cancel 开录后 _drop_tts_audio=1 残留,松手等 LLM/TTS 时 _ptt_should_drop_inbound_tts() 仍丢下行 → 无声。 播放ws断连,采用本地notifytts进行播报 --- diff --git a/2.sdk/new_clean.bat b/2.sdk/new_clean.bat index 96b9959e..1c0c9961 100644 --- a/2.sdk/new_clean.bat +++ b/2.sdk/new_clean.bat @@ -12,7 +12,7 @@ if /i "%~1"=="/?" goto :show_help if /i "%~1"=="-h" goto :show_help if "%~1"=="" ( - set "PRODUCT_NAME=k8" + set "PRODUCT_NAME=k8v3" ) else ( set "PRODUCT_NAME=%~1" ) @@ -161,9 +161,9 @@ echo 0 / off / n / no echo ¹¤³ÌÃû ¶ÔÓ¦ project\¹¤³ÌÃû\£¬Ä¬ÈÏ 7PIN_1_5 echo. echo ʾÀý: -echo new_clean.bat k8 -echo new_clean.bat k8 1 -echo new_clean.bat k8 0 -echo new_clean.bat k8 1 7PIN_1_5 +echo new_clean.bat k8v3 +echo new_clean.bat k8v3 1 +echo new_clean.bat k8v3 0 +echo new_clean.bat k8v3 1 7PIN_1_5 echo. exit /b 0 diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_session.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_session.py index 469b383a..177cf0d7 100644 --- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_session.py +++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_session.py @@ -1461,8 +1461,20 @@ class AI_VC(VCSessionIoMixin, VCSessionMediaMixin, Abstract): try: self._ptt_interrupt_active = 0 self._vc_play_end_suppress_idle_led = 0 + self._vc_ptt_clear_drop_tts_flags() + except Exception: + pass + + def _vc_ptt_clear_drop_tts_flags(self): + """PTT 允许本轮下行:清打断丢弃标志(勿把上轮 cancel 残留带入 await_server)。""" + if not self._vc_is_ptt_mode(): + return + try: self._drop_tts_audio = 0 self.is_ruppt_tts = 0 + if getattr(self, "_intr", None) is not None: + self._intr.drop_tts = 0 + self._intr.ruppt_tts = 0 except Exception: pass def _ptt_hard_mute_local_playback(self): diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_session_io.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_session_io.py index 7bc733de..225fe9d7 100644 --- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_session_io.py +++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_session_io.py @@ -339,9 +339,8 @@ class VCSessionIoMixin: speak = self._vc_error_tts_speakable(TTS_str) print("websocket_error:tts:{} speakable={}".format(TTS_str, speak)) if speak: - self.AI_TTS_str = speak - EventMesh.publish("publish_AI_btnInfo", {"func": self.AI_VC_start}) - self.Close_flag = 1 + # 断链提示走 notify(本地 play_tts),避免“断链→重连→再走 VC 合成”形成循环 + EventMesh.publish("play_tts", [speak, 1, "prompt"]) else: self.websocket_error_count += 1 if self.websocket_error_count < 3: @@ -637,8 +636,14 @@ class VCSessionIoMixin: EventMesh.publish("publish_AI_btnInfo",{"func":self.websocket_error,"data":"VC连接断开了,请重试"}) self.ud_error(["VC",self.VC_taskid]) break - elif recv_data == "":#客户端关闭连接 - print("VC VC :客户端关闭连接") + elif recv_data == "": # EOF:链路断开/对端关闭 + try: + sid = getattr(self, "_cur_sid", "") or "-" + except Exception: + sid = "-" + print("[VC] ws EOF (link down) VC_mode={} sid={}".format( + getattr(self, "VC_mode", -1), sid + )) EventMesh.publish("publish_AI_btnInfo",{"func":self.websocket_error,"data":"VC连接断开了,请重试"}) self.ud_error(["VC",self.VC_taskid]) break @@ -870,9 +875,15 @@ class VCSessionIoMixin: self._turn_has_vad_silence = 1 try: if hasattr(self, "_vc_long_dialogue_defer_vad_stop") and self._vc_long_dialogue_defer_vad_stop(): + # defer 仅延后 VC_Speech_End;须立刻 silence_gate æ­¢ PCM 上行 self._vc_defer_vad_uplink_stop = 1 + self._server_vad_silence = 1 + try: + self._uplink_mark_end("vad.silence/defer") + except Exception: + pass try: - print("[VC][VAD] silence defer uplink_stop (long_dialogue)") + print("[VC][VAD] silence defer stop_mic_only (silence_gate on)") except Exception: pass else: diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_session_media.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_session_media.py index ef5a26b0..5763b7f5 100644 --- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_session_media.py +++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_session_media.py @@ -1055,6 +1055,8 @@ class VCSessionMediaMixin: self._ptt_led_lock_listening = 0 self._ptt_interrupt_active = 0 self._ptt_await_server = 1 + if hasattr(self, "_vc_ptt_clear_drop_tts_flags"): + self._vc_ptt_clear_drop_tts_flags() self._vc_publish_led("thinking", "VC_Speech_End/ptt") else: self._ptt_await_server = 0