From: snickersun Date: Tue, 16 Jun 2026 14:35:19 +0000 (+0800) Subject: 修复单对话模式下短按ai键偶现无提示音 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=35101ec07dfd4ff1086c683b2f01ccc8339fdb9d;p=mirrors%2FASR1603_G5.git 修复单对话模式下短按ai键偶现无提示音 --- diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/default_config.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/default_config.py index 2bb9a83a..06c8e487 100644 --- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/default_config.py +++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/default_config.py @@ -35,6 +35,8 @@ LED_ACTIVE_LOW_RGB = None # 例 (True, False, False) 仅红灯反相 # --- 2.2 按键 ExtInt --- EXTINT_AI_GPIO = "GPIO22" # AI 键 PWK_KEY_GPIO = "GPIO26" # 电源键(短按/双击切模式等) +#AI Key 按键有效电平是否取反:0=不取反,1=取反 +AI_KEY_PRESS_LEVEL_REVERSE = 1 # btn_device_ec800m:扩展按键(本机型未用) BTN_WECHAT_GPIO = None @@ -211,13 +213,23 @@ VC_IDLE_AUTO_CLOSE_SEC_PTT = 0 # 单对话预留,当前与 idle 统一处理 VC_IDLE_DEEP_SLEEP_SEC = 60 VC_IDLE_DEEP_SLEEP_ENABLE = 1 -# 本地 imsl 断句静音(ms);映射 rule2/3;可被 storage vad_silence 覆盖 -VAD_SILENCE_DEFAULT = 1000 + # conf->sil_threshold = 63; + # conf->energy_threshold = 15000; + # conf->min_speech_length = 240; + # conf->silence_detect_length = 300; + # conf->rule1_min_tailing_silence = 480; + # conf->rule2_min_tailing_silence = 500; + # conf->rule3_min_tailing_silence = 960; +# 本地 imsl 断句静音(ms) —— 映射 silence_detect_length;可被 storage vad_silence 覆盖 +VAD_SILENCE_DEFAULT = 300 +# rule2 尾部静音(ms):0‑10s 最短连续静音判定语音结束(之前跟随 VAD_SILENCE_DEFAULT,现已独立) +VAD_RULE2_SILENCE = 500 +# rule3 尾部静音(ms):10s 以上最短连续静音判定语音结束(之前跟随 VAD_SILENCE_DEFAULT,现已独立) +VAD_RULE3_SILENCE = 960 # 本地 VAD 判句末后追加采集的尾音(ms),到点再发 audio.completed;防句尾渐弱音被关闸截断。0=立即收尾 LOCAL_VAD_ENDPOINT_HANGOVER_MS = 200 -# 本地 imsl VAD 能量阈值:越低越灵敏(易触发说话),越高越钝;imsl 推荐 10000。 -# 现场若本地 VAD 不出 speech start/end(全靠 asr_silence_fallback 收尾),调低(如 6000) -VAD_ENERGY_THRESHOLD = 10000 +# 本地 imsl VAD 能量阈值:越低越灵敏(易触发说话),越高越钝;modVad.c 默认 15000 +VAD_ENERGY_THRESHOLD = 15000 # imsl auth_vad:DMP 区域 0=海外 dmp-global.raisound.com 1=国内正式服务器 dmp.raisound.com 2=国内测试服务器 dmp-dev.raisound.com 3=测试服2 dmp-intl.raisound.com(与 imsl_vad.h AuthInfo.server_addr 一致) VAD_DMP_SERVER_ADDR = 2 # 开机有网时运行 transport HTTP 测试(VAD.transport_test → test_func) @@ -320,7 +332,7 @@ ASR_EMPTY_HINT_TTS = "我没有听清,请再说一遍" # asr.completed 无 RECORD_START_TONE_FILE = "U:/static/start.pcm" # 按键/PTT 开录提示音(PCM èµ° play_pcm 复用) RECORD_START_TONE_GAP_MS = 180 -PTT_MIN_RECORD_MS = 400 +PTT_MIN_RECORD_MS = 1200 # 键按到松手最短时间(ms),从 ptt_begin 算起 PTT_RECORD_TOO_SHORT_TTS = "录音时间太短,请按住圆形按钮说话" # notify PTT_RELEASE_END_SPEECH_DELAY_MS = 200 # 松手后发 audio.completed 前延迟 diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/g3p/default_config.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/g3p/default_config.py index effb6645..156ee434 100644 --- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/g3p/default_config.py +++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/g3p/default_config.py @@ -325,7 +325,7 @@ ASR_EMPTY_HINT_TTS = "我没有听清,请再说一遍" # asr.completed 无 RECORD_START_TONE_FILE = "U:/static/start.pcm" # 按键/PTT 开录提示音(非 server.started 自动开麦) RECORD_START_TONE_GAP_MS = 180 -PTT_MIN_RECORD_MS = 400 +PTT_MIN_RECORD_MS = 1200 # 键按到松手最短时间(ms),从 ptt_begin 算起 PTT_RECORD_TOO_SHORT_TTS = "录音时间太短,请按住圆形按钮说话" # notify PTT_RELEASE_END_SPEECH_DELAY_MS = 200 # 松手后发 audio.completed 前延迟 diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/k8v3/default_config.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/k8v3/default_config.py index e614f23e..06c8e487 100644 --- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/k8v3/default_config.py +++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/k8v3/default_config.py @@ -332,7 +332,7 @@ ASR_EMPTY_HINT_TTS = "我没有听清,请再说一遍" # asr.completed 无 RECORD_START_TONE_FILE = "U:/static/start.pcm" # 按键/PTT 开录提示音(PCM èµ° play_pcm 复用) RECORD_START_TONE_GAP_MS = 180 -PTT_MIN_RECORD_MS = 400 +PTT_MIN_RECORD_MS = 1200 # 键按到松手最短时间(ms),从 ptt_begin 算起 PTT_RECORD_TOO_SHORT_TTS = "录音时间太短,请按住圆形按钮说话" # notify PTT_RELEASE_END_SPEECH_DELAY_MS = 200 # 松手后发 audio.completed 前延迟 diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/product_k8v3.ini b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/product_k8v3.ini index 287162a6..19aa1455 100644 --- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/product_k8v3.ini +++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/product_k8v3.ini @@ -1,3 +1,3 @@ DEV_TYPE=k8v3 SRV_TYPE=beike_dev_v3 -VERSION=V1.9 \ No newline at end of file +VERSION=V1.10 \ No newline at end of file diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_key_router.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_key_router.py index 407bf109..c236c840 100644 --- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_key_router.py +++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_key_router.py @@ -104,9 +104,9 @@ class KeyRouter(object): """PTT 长按松手:录音过短 → notify TTS + idle。""" if getattr(vc, "VC_record_state_flag", 0) == 0: return False - min_ms = cfg_int("PTT_MIN_RECORD_MS", 400) + min_ms = cfg_int("PTT_MIN_RECORD_MS", 1200) tts = cfg_attr("PTT_RECORD_TOO_SHORT_TTS", "录音时间太短,请按住圆形按钮说话") or "录音时间太短,请按住圆形按钮说话" - t_open = int(getattr(vc, "_ptt_record_open_ms", 0) or 0) + t_open = int(getattr(vc, "_ptt_begin_ms", 0) or 0) if not t_open or utime is None: return False try: 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 fbac6d75..f6bcb1fe 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 @@ -60,6 +60,7 @@ class AI_VC(VCSessionIoMixin, VCSessionMediaMixin, Abstract): self._ptt_await_server = 0 self._ptt_await_since_ms = 0 self._ptt_audio_created = 0 + self._ptt_begin_ms = 0 except Exception: pass try: @@ -1436,6 +1437,15 @@ class AI_VC(VCSessionIoMixin, VCSessionMediaMixin, Abstract): self._ptt_await_server = 0 except Exception: pass + # 清空 PTT 打断丢弃标志,否则新 session synthesis TTS 到达时会被 _ptt_should_drop_inbound_tts 静默丢弃 + try: + self._drop_tts_audio = 0 + self.is_ruppt_tts = 0 + self._ptt_interrupt_active = 0 + self._vc_serial_canceling = 0 + self._ptt_pending_arm = 0 + except Exception: + pass try: if tts_str: EventMesh.publish("play_tts", [tts_str, 0, "prompt"]) @@ -1533,6 +1543,15 @@ class AI_VC(VCSessionIoMixin, VCSessionMediaMixin, Abstract): print("[PTT] silent release -> idle (skip empty_hint)") self._vc_publish_led("idle", reason) return + # 清空 PTT 打断丢弃标志,否则新 session synthesis TTS 到达时会被静默丢弃 + try: + self._drop_tts_audio = 0 + self.is_ruppt_tts = 0 + self._ptt_interrupt_active = 0 + self._vc_serial_canceling = 0 + self._ptt_pending_arm = 0 + except Exception: + pass try: EventMesh.publish("play_tts", [hint, 0, "prompt"]) except Exception: @@ -2035,6 +2054,9 @@ class AI_VC(VCSessionIoMixin, VCSessionMediaMixin, Abstract): self._vc_serial_canceling = 0 self._ptt_idle_latch = 1 self._ptt_await_server = 0 + self._drop_tts_audio = 0 + self.is_ruppt_tts = 0 + self._ptt_interrupt_active = 0 except Exception: pass print("[PTT] release no record -> cancel pending + notify") @@ -2449,6 +2471,7 @@ class AI_VC(VCSessionIoMixin, VCSessionMediaMixin, Abstract): t0 = 0 try: t0 = utime.ticks_ms() + self._ptt_begin_ms = t0 # 松手时长兜底:asr.empty 提前清零 _ptt_record_open_ms 时仍可用 except Exception: t0 = 0 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 e476c860..8730b185 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 @@ -155,13 +155,14 @@ class VCSessionIoMixin: except Exception: pass if self._vc_is_ptt_mode(): - try: - self._drop_tts_audio = 1 - if getattr(self, "AI_audio_queue", None) is not None: - if self.AI_audio_queue.empty() != True: - self.AI_audio_queue.clear() - except Exception: - pass + if getattr(self, "VC_record_state_flag", 0) != 0: + try: + self._drop_tts_audio = 1 + if getattr(self, "AI_audio_queue", None) is not None: + if self.AI_audio_queue.empty() != True: + self.AI_audio_queue.clear() + except Exception: + pass else: self._vc_stop_downlink_for_interrupt("canceled") if ev == "tts.completed" and self._vc_ignore_late_tts_completed_event(): @@ -1067,7 +1068,7 @@ class VCSessionIoMixin: # 本地 VAD endpoint 模式下 think.pcm 已由 local 路径播过,不必再播 _skip_think = False try: - _skip_think = self._vc_local_vad_endpoint() + _skip_think = self._vc_local_vad_endpoint() and self._vc_is_long_dialogue_mode() except Exception: pass if _skip_think: 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 9d871f88..4ef1e1ad 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 @@ -2223,6 +2223,13 @@ class VCSessionMediaMixin: pass self.AI_ASR_send_buf_len = 0 self._uplink_request_stop("play_tts_cb") + # 清空 PTT 打断丢弃标志:旧 WS recv 线程可能在 play_tts_cb 执行前 + # 收到 canceled 又把 _drop_tts_audio 设回 1,导致新 session synthesis TTS 被丢弃 + self._drop_tts_audio = 0 + self.is_ruppt_tts = 0 + self._ptt_interrupt_active = 0 + self._vc_serial_canceling = 0 + self._ptt_pending_arm = 0 self.websocket_deconnect_VC() self.AI_VC_start()