From: snickersun Date: Fri, 5 Jun 2026 10:48:49 +0000 (+0800) Subject: 1、修复充电一直充不满问题 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=90d1117983f3e026d2f024d2b33607ed37bf877c;p=mirrors%2FASR1603_G5.git 1、修复充电一直充不满问题 2、修复25s强停时漏发 audio.complete造成的asr fail。 3、修复休眠后,对话没反应。状态自死锁问题。 --- 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 9605280f..bcf5e801 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 @@ -103,12 +103,13 @@ BATTERY_EMPTY_FLASH_PERIOD_MS = 500 # 空电红快闪约 2 次/秒 # - 放电表 BATTERY_OCV_MAP:cycle1 step3,0.5C 恒流放电端电压→SoC;放电逻辑沿用此表插值 # - 充电表 BATTERY_CHARGE_OCV_MAP:cycle2 step5,0.5C CCCV 充电端电压→SoC # * 仅当配置了充电表时,充电(插 USB)期间才按充电电压实时映射 SoC 上报;未配置则沿用“冻结插入前 SoC” -# * CV 恒压段(>~4300mV)电压饱和,高 SoC 段电压不可区分、估值偏高属正常;充满以 charging=full 灯态为准 +# * CV 恒压段(>~4296mV)电压饱和;100% 锚定 4300mV(实测 CV 顶约 4.35V,量产能差,统一按 4.30V 满) +# * 充满灯态 charging=full 仍以 VBATT_CHARGE_FULL_MV + 平台检测为准 # 重新标定:同型电池做“满充→0.5C 放空→0.5C 充满”,按每 5% SoC 取端电压覆盖下表即可 # ============================================================================= # 电压门限(mV):充满 / 低电 / 空电(与 get_battery、simple 模式共用) USE_SIMPLE_VBATT_THRESH = False # True 时忽略 BATTERY_OCV_MAP,仅用三档电压 -VBATT_CHARGE_FULL_MV = 4320 # 充满判断电压门限(mV):进入 CV 平台约 85%→100% +VBATT_CHARGE_FULL_MV = 4300 # 充满判断电压门限(mV):CV 平台顶按 4.30V,与充电表 100% 锚点对齐 VBATT_LOW_MV = 3630 # 0.5C 放电约 35%(带载门限,沿用旧值不动) VBATT_EMPTY_MV = 3400 # 未充电:滑动平均电压 < 此值 → 低电关机(唯一关机条件) # 充满判断:电压达阈值 + 平台稳定 + 最短充电时间(三条件同时满足才 latch full) @@ -125,15 +126,14 @@ BATTERY_OCV_MAP = { 3529: 20, 3484: 15, 3430: 10, 3400: 0, } -# 充电曲线表(mV→SoC,降序):502631-510 0.5C CCCV 充电端电压实测 -# 0% 锚定 3640mV(由放电 3400mV + 低 SoC 段充放压差约 240mV 估算得到) -# 3640mV 以下条目已去除(设备关机后才开始充电,充电电压不会低于此值) -# CV 恒压段(>~4300mV)电压饱和,90%/95% 不可区分,以 charging=full 灯态为准 +# 充电曲线表(mV→SoC,降序):502631-510 cycle2 step5 0.5C CCCV 充电端电压实测(每 5% 容量取点) +# 0% 锚定 3640mV(设备关机后才开始充电);3640mV 以下已去除 +# 100% 锚定 4300mV(量产能差,不用实验室 CV é¡¶ 4353mV);85~100% CV 段补 4297/4298 插值点 # ç½® None/删除此变量则充电期间不实时更新 SoC,沿用插 USB 前冻结值 BATTERY_CHARGE_OCV_MAP = { - 4353: 100, 4296: 85, 4235: 80, 4171: 75, 4108: 70, 4059: 65, 4016: 60, 3981: 55, - 3955: 50, 3935: 45, 3919: 40, 3904: 35, 3889: 30, 3869: 25, 3807: 20, 3726: 15, - 3660: 10, 3640: 0, + 4300: 100, 4298: 95, 4297: 90, 4296: 85, 4237: 80, 4176: 75, 4105: 70, 4058: 65, + 4015: 60, 3981: 55, 3956: 50, 3936: 45, 3918: 40, 3904: 35, 3889: 30, 3870: 25, + 3811: 20, 3731: 15, 3656: 10, 3640: 0, } # 录音麦克增益:record.gain_set(codec_gain, dsp_gain) @@ -188,7 +188,8 @@ VC_WELCOME_SERVER_ENABLED = 0 # VC_WELCOME_SERVER_MESSAGE = "" # VC_WELCOME_SERVER_ENABLED=1 时可选文案 # 协议 failed / websocket_error 是否 synthesis 播报错误原文(联调=1,量产=0) -VC_ERROR_TTS_ENABLED = 1 +# =1 会绕过技术错误过滤、把"ASR error/转写错误/idle too long"等原文整段朗读,量产须为 0 +VC_ERROR_TTS_ENABLED = 0 # 是否累积并打印 AI 回复文本(llm.delta):联调=1 可在日志看到回复;量产=0 省 recv 线程开销 VC_LLM_DELTA_LOG = 0 # V3 start.output_mode:audio=仅下发 TTS 音频(默认);both/text=服务端额外下发 llm.delta 文本, 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 9605280f..bcf5e801 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 @@ -103,12 +103,13 @@ BATTERY_EMPTY_FLASH_PERIOD_MS = 500 # 空电红快闪约 2 次/秒 # - 放电表 BATTERY_OCV_MAP:cycle1 step3,0.5C 恒流放电端电压→SoC;放电逻辑沿用此表插值 # - 充电表 BATTERY_CHARGE_OCV_MAP:cycle2 step5,0.5C CCCV 充电端电压→SoC # * 仅当配置了充电表时,充电(插 USB)期间才按充电电压实时映射 SoC 上报;未配置则沿用“冻结插入前 SoC” -# * CV 恒压段(>~4300mV)电压饱和,高 SoC 段电压不可区分、估值偏高属正常;充满以 charging=full 灯态为准 +# * CV 恒压段(>~4296mV)电压饱和;100% 锚定 4300mV(实测 CV 顶约 4.35V,量产能差,统一按 4.30V 满) +# * 充满灯态 charging=full 仍以 VBATT_CHARGE_FULL_MV + 平台检测为准 # 重新标定:同型电池做“满充→0.5C 放空→0.5C 充满”,按每 5% SoC 取端电压覆盖下表即可 # ============================================================================= # 电压门限(mV):充满 / 低电 / 空电(与 get_battery、simple 模式共用) USE_SIMPLE_VBATT_THRESH = False # True 时忽略 BATTERY_OCV_MAP,仅用三档电压 -VBATT_CHARGE_FULL_MV = 4320 # 充满判断电压门限(mV):进入 CV 平台约 85%→100% +VBATT_CHARGE_FULL_MV = 4300 # 充满判断电压门限(mV):CV 平台顶按 4.30V,与充电表 100% 锚点对齐 VBATT_LOW_MV = 3630 # 0.5C 放电约 35%(带载门限,沿用旧值不动) VBATT_EMPTY_MV = 3400 # 未充电:滑动平均电压 < 此值 → 低电关机(唯一关机条件) # 充满判断:电压达阈值 + 平台稳定 + 最短充电时间(三条件同时满足才 latch full) @@ -125,15 +126,14 @@ BATTERY_OCV_MAP = { 3529: 20, 3484: 15, 3430: 10, 3400: 0, } -# 充电曲线表(mV→SoC,降序):502631-510 0.5C CCCV 充电端电压实测 -# 0% 锚定 3640mV(由放电 3400mV + 低 SoC 段充放压差约 240mV 估算得到) -# 3640mV 以下条目已去除(设备关机后才开始充电,充电电压不会低于此值) -# CV 恒压段(>~4300mV)电压饱和,90%/95% 不可区分,以 charging=full 灯态为准 +# 充电曲线表(mV→SoC,降序):502631-510 cycle2 step5 0.5C CCCV 充电端电压实测(每 5% 容量取点) +# 0% 锚定 3640mV(设备关机后才开始充电);3640mV 以下已去除 +# 100% 锚定 4300mV(量产能差,不用实验室 CV é¡¶ 4353mV);85~100% CV 段补 4297/4298 插值点 # ç½® None/删除此变量则充电期间不实时更新 SoC,沿用插 USB 前冻结值 BATTERY_CHARGE_OCV_MAP = { - 4353: 100, 4296: 85, 4235: 80, 4171: 75, 4108: 70, 4059: 65, 4016: 60, 3981: 55, - 3955: 50, 3935: 45, 3919: 40, 3904: 35, 3889: 30, 3869: 25, 3807: 20, 3726: 15, - 3660: 10, 3640: 0, + 4300: 100, 4298: 95, 4297: 90, 4296: 85, 4237: 80, 4176: 75, 4105: 70, 4058: 65, + 4015: 60, 3981: 55, 3956: 50, 3936: 45, 3918: 40, 3904: 35, 3889: 30, 3870: 25, + 3811: 20, 3731: 15, 3656: 10, 3640: 0, } # 录音麦克增益:record.gain_set(codec_gain, dsp_gain) @@ -188,7 +188,8 @@ VC_WELCOME_SERVER_ENABLED = 0 # VC_WELCOME_SERVER_MESSAGE = "" # VC_WELCOME_SERVER_ENABLED=1 时可选文案 # 协议 failed / websocket_error 是否 synthesis 播报错误原文(联调=1,量产=0) -VC_ERROR_TTS_ENABLED = 1 +# =1 会绕过技术错误过滤、把"ASR error/转写错误/idle too long"等原文整段朗读,量产须为 0 +VC_ERROR_TTS_ENABLED = 0 # 是否累积并打印 AI 回复文本(llm.delta):联调=1 可在日志看到回复;量产=0 省 recv 线程开销 VC_LLM_DELTA_LOG = 0 # V3 start.output_mode:audio=仅下发 TTS 音频(默认);both/text=服务端额外下发 llm.delta 文本, 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 bd48f6f5..7b2ffe77 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 @@ -583,6 +583,14 @@ class AI_VC(VCSessionIoMixin, VCSessionMediaMixin, Abstract): self._uplink_mark_end("max_turn_ms") except Exception: pass + # 强停必须发 audio.completed 提交本轮:服务端 disable_vad,仅靠客户端 audio.completed 收尾。 + # 否则云端 ASR 一直空闲到 180s idle 超时报 transcribe error,端侧也收不到 LLM/TTS(会话悬挂)。 + try: + if (getattr(self, "_ptt_audio_created", 0) == 1 + and hasattr(self, "_vc_local_vad_send_audio_completed")): + self._vc_local_vad_send_audio_completed(defer_stop=True) + except Exception: + pass self.request_uplink_stop("max_turn_ms") if hasattr(self, "_vc_ld_force_commit_turn"): self._vc_ld_force_commit_turn("max_turn_ms") @@ -2474,6 +2482,7 @@ class AI_VC(VCSessionIoMixin, VCSessionMediaMixin, Abstract): # 叠加态 / 模式切换(vc_overlay,兼容 _vc_ms_phase) self._vc_overlay = OVERLAY_IDLE self._vc_ms_phase = 0 + self._vc_ms_phase_ms = 0 self._intr = InterruptContext() self._led_override = None self._vc_pending_key_press_tone = 0 @@ -3418,6 +3427,7 @@ class AI_VC(VCSessionIoMixin, VCSessionMediaMixin, Abstract): print("[VC][ms] coalesce interrupt gen={} active={}".format(gen, active)) self._vc_ms_active_gen = gen self._vc_ms_phase = 1 + self._vc_ms_phase_ms = utime.ticks_ms() try: self._vc_mode_switch_prep(gen) except Exception as e: @@ -3435,6 +3445,7 @@ class AI_VC(VCSessionIoMixin, VCSessionMediaMixin, Abstract): try: self._vc_ms_play_gen = gen self._vc_ms_phase = 2 + self._vc_ms_phase_ms = utime.ticks_ms() except Exception: pass tts_str = getattr(self, "_vc_ms_pending_tts_str", "") or "" @@ -3896,10 +3907,20 @@ class AI_VC(VCSessionIoMixin, VCSessionMediaMixin, Abstract): pass try: ms_phase = int(getattr(self, "_vc_ms_phase", 0)) - if ms_phase in (1, 2, 3) and getattr(self, "_vc_close_reason", "") != "mode_switch_play_end": - print("[VC][ms] Close blocked phase={} reason={}".format( - ms_phase, getattr(self, "_vc_close_reason", ""))) - return + if ms_phase in (1, 2, 3): + _reason = getattr(self, "_vc_close_reason", "") + # mode_switch_play_end=切换提示正常收尾;power_short=用户显式停止/休眠,必须放行 + _allow = _reason in ("mode_switch_play_end", "power_short") + # 看门狗:phase 卡住超时(切换提示音最多数秒)强制放行, + # 避免 power_short/打断打断切换提示后 phase 永久停在 2 → Close 被永久阻塞的自死锁 + if not _allow: + _ph_ms = int(getattr(self, "_vc_ms_phase_ms", 0)) + if _ph_ms and utime.ticks_diff(utime.ticks_ms(), _ph_ms) >= cfg_int("VC_MS_PHASE_STUCK_MS", 8000): + print("[VC][ms] phase stuck -> force close phase={}".format(ms_phase)) + _allow = True + if not _allow: + print("[VC][ms] Close blocked phase={} reason={}".format(ms_phase, _reason)) + return except Exception: pass try: 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 5a2b7cfe..3215d3d4 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 @@ -41,7 +41,10 @@ class VCSessionIoMixin: # 传输/连接/识别类技术错误:多为端侧断开或会话空闲超时所致, # 属“非远端业务原因”,不朗读原文(避免把英文报错读给用户) "idle timeout", + "idle too long", "transcribe_error", + "asr error", + "qwen asr", "转写错误", "读取消息失败", "websocket: close", 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 d4606ac4..53b98d74 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 @@ -1731,6 +1731,7 @@ class VCSessionMediaMixin: k = getattr(self, "_pending_tts_kind", "") or "" if k in ("mode_switch_long", "mode_switch_ptt"): self._vc_ms_phase = 2 + self._vc_ms_phase_ms = utime.ticks_ms() self._vc_ms_play_gen = int(getattr(self, "_vc_ms_active_gen", 0)) except Exception: pass