From: snickersun Date: Fri, 15 May 2026 10:01:29 +0000 (+0800) Subject: 1、添加马达,开机200ms X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=32d141654ee3f570cf9c7dcb26e0abb1e077c6e5;p=mirrors%2FASR1603_G5.git 1、添加马达,开机200ms 2、重构ai状态机,把之前的枚举变量都转到状态机基础上执行。 3、VC_BOT_ID, VC_WORKFLOW_ID 放到default_config.py里进行配置 4、添加protocol里的音量调节协议 5、led显示逻辑根据新的 需求规格书 做了调整。 --- diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/ai_VC.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/ai_VC.py index 5c5dffac..6211982e 100644 --- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/ai_VC.py +++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/ai_VC.py @@ -110,17 +110,13 @@ class AI_led(Abstract): self._st_signal = "normal" # normal/weak self._timer = osTimer() - self._mode = "off" # off/red_on/green_on/blue_blink/red_blink/bg_alt + self._mode = "off" # off/red_on/green_on/green_blink/blue_blink/red_blink/bg_alt self._blink_on = 0 self._bg_phase = 0 self._period_ms = 1000 EventMesh.subscribe("set_led_state", self.set_led_state) EventMesh.subscribe("get_led_debug_state", self.get_led_debug_state) - try: - self._set_off() - except Exception: - pass # LED 电平极性:有些板子是低电平点亮(active-low),也可能仅某一路反相 self._inv_r = 0 self._inv_g = 0 @@ -139,6 +135,13 @@ class AI_led(Abstract): self._inv_b = all_inv except Exception: pass + try: + self._apply_by_table() + except Exception: + try: + self._set_off() + except Exception: + pass def _timer_stop(self): try: @@ -178,6 +181,21 @@ class AI_led(Abstract): self._timer_stop() self._set_rgb(0, 1, 0) + def _set_green_blink(self, period_ms=1000): + """待机/空闲:绿灯慢闪(替代呼吸灯,数字 GPIO 整颗亮灭)。""" + period_ms = period_ms or 1000 + try: + if self._mode == "green_blink" and int(self._period_ms) == int(period_ms): + return + except Exception: + pass + self._mode = "green_blink" + self._period_ms = period_ms + self._blink_on = 1 + self._timer_stop() + self._set_rgb(0, 1, 0) + self._timer.start(self._period_ms, 1, self._timer_cb) + def _set_blue_blink(self, period_ms=1000): self._mode = "blue_blink" self._period_ms = period_ms or 1000 @@ -206,6 +224,10 @@ class AI_led(Abstract): EventMesh.publish("publish_AI_btnInfo", {"func": self._timer_cb_}) def _timer_cb_(self): + if self._mode == "green_blink": + self._blink_on = 0 if self._blink_on else 1 + self._set_rgb(0, 1 if self._blink_on else 0, 0) + return if self._mode == "blue_blink": self._blink_on = 0 if self._blink_on else 1 self._set_rgb(0, 0, 1 if self._blink_on else 0) @@ -246,30 +268,56 @@ class AI_led(Abstract): self._set_green_on() return if self._st_ai == "thinking": - self._set_bg_alt(1000) + # 蓝绿「交替」:约 0.5 s 换一色(`period_ms` 为换色间隔) + self._set_bg_alt(500) return if self._st_ai == "listening": + # 「慢闪」:整颗亮灭整周期约 2×period_ms → period_ms=1000 约 2 s 一亮灭 self._set_blue_blink(1000) return except Exception: pass + # AI 会话或流播放中:ai_state 短暂 idle 时仍不让充电红/充满绿抢占(低电/弱网仍走后面分支) + _skip_charge_led = 0 + try: + if EventMesh.publish("get_VC_satrt_flag") == 1: + _skip_charge_led = 1 + except Exception: + pass + if not _skip_charge_led: + try: + if EventMesh.publish("get_vc_stream_active") == 1: + _skip_charge_led = 1 + except Exception: + pass # 基础态:充电/电量/信号 try: - if self._st_charging == "full": - self._set_green_on() - return - if self._st_charging == "charging": - self._set_red_on() - return + if not _skip_charge_led: + if self._st_charging == "full": + self._set_green_on() + return + if self._st_charging == "charging": + self._set_red_on() + return if self._st_battery in ("empty", "low"): self._set_red_blink(1000) return if self._st_signal == "weak": - self._set_bg_alt(2000) + # 弱网:蓝绿「慢交替」,与 thinking 同节拍定义(约 1 s 换一色) + self._set_bg_alt(1000) return except Exception: pass - self._set_off() + # 空闲待机:绿灯慢闪(整周期约 2×idle_ms,默认对齐「慢闪 ≈2 s 一亮灭」) + try: + idle_ms = 1000 + if "vc_config" in globals() and vc_config: + idle_ms = int(vc_config.get_int("LED_IDLE_GREEN_BLINK_MS", 1000)) + if idle_ms < 400: + idle_ms = 400 + self._set_green_blink(idle_ms) + except Exception: + self._set_green_blink(1000) def get_led_debug_state(self, event=None, msg=None): # 供按键/状态机打印当前 LED 聚合状态与最终模式 @@ -1897,7 +1945,11 @@ class AI_dev(Abstract): self.KeyAI_long_press = 1 #EventMesh.publish("AI_key_long_press") EventMesh.publish("publish_AI_btnInfo",{"func":self.AI_key_long_press}) - if self.KeyAI_timer_count >= 10*3 : #长按3s 上一次是短按则拨打sos紧急联系人 + try: + _sos_on = vc_config.get_bool("SOS_ENABLED", True) + except Exception: + _sos_on = True + if _sos_on and self.KeyAI_timer_count >= 10*3 : #长按3s 上一次是短按则拨打sos紧急联系人 print("long sos phone:{}".format(self.KeySOS_timer_flag)) if self.KeySOS_timer_flag == 1: @@ -1937,7 +1989,11 @@ class AI_dev(Abstract): print("KeySOS_timer_flag!!!!!!!!!!!!!!!") #短按两次需要清除标识 if self.KeyAI_long_press == 0: - if self.KeySOS_timer_flag == 0: + try: + _sos_on = vc_config.get_bool("SOS_ENABLED", True) + except Exception: + _sos_on = True + if _sos_on and self.KeySOS_timer_flag == 0: self.KeySOS_timer_flag = 1 self.KeySos_long_press = 0 self.KeySOS_timer.start(5000, 0, self.KeySos_timer_cb) #短按开启5s定时器 5s之内没有长按3s则清除标识 长按3s拨打sos紧急联系人 @@ -2923,22 +2979,7 @@ class OTA(): usys.print_exception(e) if response != None: response.close() -#阿里VC状态枚举 -VC_State_None=0 -VC_State_Listening=1#听 -VC_State_SpeechStart=2#说开始 -VC_State_SpeechIng=3#正在说 -VC_State_SpeechEnd=4#说结束 -VC_State_RequestToRespond=5 #TTS请求或者chat请求 -VC_State_Thinking=6#想(chat) -VC_State_Responding=7#音频播放 -VC_State_TTSStart=8 -VC_State_TTSData=9 -VC_State_TTSFinish=10 -VC_State_TTSEnd=11 -VC_State_TTSError=12 -VC_State_DialogError=13 -VC_State_End=14 +# 原 VC_State_* 整型已移除;会话/轮次见 VCTurnState / VCStateMachine(含 tts_rx_phase、speech_uplink_open)。 VC_record_TYPE_PCM = 0 VC_record_TYPE_AMR = 1 @@ -2971,6 +3012,12 @@ class VCTurnState: AwaitPlayedAck = 7 +class VC_TtsRxPhase: + Idle = 0 + Started = 1 + ServerCompleted = 2 + + class VCMode: Realtime = 0 # VAD on(长对话,协议:无需 audio.create/completed) PushToTalk = 1 # VAD off(单对话,协议:必须 audio.create/completed 包裹音频帧) @@ -2993,6 +3040,20 @@ class VCStateMachine: self.last_tts_pending_ms = 0 self.await_played = False self.last_tts_completed_ms = 0 + self.tts_rx_phase = VC_TtsRxPhase.Idle + self.speech_uplink_open = 0 + + def reset_rx_phases(self): + self.tts_rx_phase = VC_TtsRxPhase.Idle + self.speech_uplink_open = 0 + + def mark_tts_rx_idle(self): + self.tts_rx_phase = VC_TtsRxPhase.Idle + + def on_server_asr_started(self): + if self.session == VCSessionState.Started: + self.speech_uplink_open = 1 + self.log("server.asr.started") def _turn_name(self, t): try: @@ -3023,11 +3084,13 @@ class VCStateMachine: def log(self, reason=""): # 只用于关键节点的单行状态日志,便于串口快速定位状态漂移 try: - print("[FSM] {} session={} turn={} await_played={}".format( + print("[FSM] {} session={} turn={} await_played={} tts_rx={} speech_up={}".format( reason, self._session_name(self.session), self._turn_name(self.turn), 1 if self.await_played else 0, + int(self.tts_rx_phase), + 1 if self.speech_uplink_open else 0, )) except Exception: pass @@ -3046,8 +3109,10 @@ class VCStateMachine: self.await_played = False self.last_tts_completed_ms = 0 self.last_llm_ms = 0 + self.reset_rx_phases() def on_server_started(self): + self.reset_rx_phases() self.session = VCSessionState.Started # 新会话 started:确保进入 Listening,且清理上轮播放门控 self.await_played = False @@ -3073,12 +3138,14 @@ class VCStateMachine: def on_server_tts_started(self): if self.session == VCSessionState.Started: self.turn = VCTurnState.TtsReceiving + self.tts_rx_phase = VC_TtsRxPhase.Started self.log("server.tts.started") def on_server_tts_completed(self): if self.session == VCSessionState.Started: # tts.completed 只表示服务端音频下发结束,本地可能仍在播放;保持 Playing,由 await_played 门控播完上报 self.await_played = True + self.tts_rx_phase = VC_TtsRxPhase.ServerCompleted try: self.last_tts_completed_ms = utime.ticks_ms() except Exception: @@ -3088,6 +3155,7 @@ class VCStateMachine: def on_server_canceled(self): if self.session == VCSessionState.Started: self.turn = VCTurnState.Listening + self.reset_rx_phases() self.log("server.canceled") def on_server_completed(self): @@ -3165,6 +3233,7 @@ class VCStateMachine: self.turn = VCTurnState.Listening self.await_played = False self.last_tts_completed_ms = 0 + self.mark_tts_rx_idle() self.log("local.audio_played") def on_local_play_start(self): @@ -3217,9 +3286,14 @@ class AI_VC(Abstract): return 1 except Exception: pass + try: + if getattr(self.fsm, "tts_rx_phase", VC_TtsRxPhase.Idle) != VC_TtsRxPhase.Idle: + return 1 + except Exception: + pass try: t = getattr(self.fsm, "turn", VCTurnState.Idle) - if t in (VCTurnState.TtsReceiving, VCTurnState.Playing): + if t in (VCTurnState.TtsReceiving, VCTurnState.Playing, VCTurnState.AwaitPlayedAck): return 1 except Exception: pass @@ -3230,6 +3304,54 @@ class AI_VC(Abstract): pass return 0 + def _vc_fsm_log_snip(self): + try: + f = self.fsm + return "sess={} turn={} tts_rx={} await={} sp_up={}".format( + int(getattr(f, "session", -1)), + int(getattr(f, "turn", -1)), + int(getattr(f, "tts_rx_phase", -1)), + 1 if getattr(f, "await_played", False) else 0, + 1 if getattr(f, "speech_uplink_open", 0) else 0, + ) + except Exception: + return "fsm=?" + + def _vc_tts_pipeline_busy(self): + try: + if getattr(self.fsm, "await_played", False): + return True + if getattr(self.fsm, "tts_rx_phase", VC_TtsRxPhase.Idle) != VC_TtsRxPhase.Idle: + return True + t = getattr(self.fsm, "turn", VCTurnState.Idle) + if t in (VCTurnState.TtsReceiving, VCTurnState.Playing, VCTurnState.AwaitPlayedAck): + return True + if getattr(self, "_tts_pending", 0) == 1: + return True + if getattr(self, "VC_Play_flag", 0) == 1: + return True + except Exception: + pass + return False + + def _vc_vad_uplink_stop_eligible(self): + # 对应旧 VC_state >= SpeechStart + try: + if getattr(self.fsm, "speech_uplink_open", 0): + return True + t = getattr(self.fsm, "turn", VCTurnState.Idle) + return t not in (VCTurnState.Idle, VCTurnState.Listening) + except Exception: + return False + + def _vc_long_idle_active_speech_or_later(self): + # 对应旧 VC_state >= SpeechIng + try: + t = getattr(self.fsm, "turn", VCTurnState.Idle) + return t not in (VCTurnState.Idle, VCTurnState.Listening) + except Exception: + return False + # ===== Push-To-Talk(单对话模式)===== # 语义: # - 长按:无论当前处于 TTS/Thinking/任何中间态,立即打断并进入新一轮录音上行 @@ -3401,8 +3523,19 @@ class AI_VC(Abstract): self._server_vad_silence = 1 if getattr(self, "VC_record_state_flag", 0) == 0: + try: + if getattr(self, "VC_mode", 0) != 1: + print("[VC][long_idle] _uplink_request_stop skip (record_state==0) reason={}".format(reason)) + except Exception: + pass return + try: + if getattr(self, "VC_mode", 0) != 1: + print("[VC][long_idle] step=uplink_stop_exec reason={} VC_record_state_flag={}".format( + reason, getattr(self, "VC_record_state_flag", -1))) + except Exception: + pass print("[VC][uplink_ctrl] Request STOP by {}".format(reason)) self.VC_Speech_End() @@ -3413,8 +3546,8 @@ class AI_VC(Abstract): self._uplink_active = 1 self._uplink_bytes = 0 self._uplink_start_ms = utime.ticks_ms() - print("[VC][uplink] START len={} VC_state={} VC_record_state_flag={}".format( - first_len, self.VC_state, self.VC_record_state_flag)) + print("[VC][uplink] START len={} {} VC_record_state_flag={}".format( + first_len, self._vc_fsm_log_snip(), self.VC_record_state_flag)) except Exception: pass @@ -3423,8 +3556,8 @@ class AI_VC(Abstract): if self._uplink_active != 1: return dur = utime.ticks_diff(utime.ticks_ms(), self._uplink_start_ms) if self._uplink_start_ms else -1 - print("[VC][uplink] END reason={} bytes={} dur_ms={} VC_state={} VC_record_state_flag={}".format( - reason, self._uplink_bytes, dur, self.VC_state, self.VC_record_state_flag)) + print("[VC][uplink] END reason={} bytes={} dur_ms={} {} VC_record_state_flag={}".format( + reason, self._uplink_bytes, dur, self._vc_fsm_log_snip(), self.VC_record_state_flag)) except Exception: pass self._uplink_active = 0 @@ -3807,7 +3940,6 @@ class AI_VC(Abstract): # if self.AI_VC_send_data_queue_thread_id == 0: # self.AI_VC_send_data_queue_thread_id = _thread.start_new_thread(self.AI_VC_send_data_queue_thread, ()) - self.VC_state = VC_State_None #阿里ai VC状态 self.VC_dialog_id = ""# self.VC_message_id=None self.VC_task_id =None @@ -3817,7 +3949,7 @@ class AI_VC(Abstract): self.AI_client_VC_isconnect =0 self.AI_client_VC_debug =0 - self.asr_state = VC_State_None #阿里VC_ASR VC状态 + self.asr_state = 0 # 预留:ASR 侧状态(当前未参与分支) self.key_state = 0 self.AI_client_asr = None @@ -3861,6 +3993,7 @@ class AI_VC(Abstract): self.play_flag = 0 self.VC_record_state_flag = 0 self.AI_key_long_press_flag = 0 + self._asr_completed_tone_done = 0 # asr.completed 本地 think 提示每轮仅一次 self.websocket_error_count = 0 self.AI_new_voice_url = "" #未读语音地址/音乐播放地址/闹钟播放标志 self.music_play_flag = 0 #音乐播放标志 @@ -4279,8 +4412,8 @@ class AI_VC(Abstract): t = getattr(self.fsm, "turn", None) except Exception: t = None - print("[KEY] AI_key_press VC_mode={} VC_state={} turn={} led={}".format( - getattr(self, "VC_mode", -1), getattr(self, "VC_state", -1), t, led)) + print("[KEY] AI_key_press VC_mode={} {} turn={} led={}".format( + getattr(self, "VC_mode", -1), self._vc_fsm_log_snip(), t, led)) except Exception: pass # 按键提示音(设备差异由 default_config.py 控制) @@ -4306,7 +4439,7 @@ class AI_VC(Abstract): playing = (t in (VCTurnState.TtsReceiving, VCTurnState.Playing)) except Exception: playing = False - if playing or (self.VC_state >= VC_State_TTSStart and self.VC_state <= VC_State_TTSEnd) or getattr(self, "VC_Play_flag", 0) == 1: + if playing or self._vc_tts_pipeline_busy(): self._ptt_short_press_stop = 1 try: cancel = {"event": "cancel", "payload": {}} @@ -4334,7 +4467,7 @@ class AI_VC(Abstract): pass # 长对话播放态:短按打断并续聊(复用 dialog_id) - if self.VC_state >= VC_State_TTSStart and self.VC_state <= VC_State_TTSEnd: + if self._vc_tts_pipeline_busy(): print("【打断播放】设备正在说话,仅中断播放,不发起新对话") self.is_ruppt_tts = 1 EventMesh.publish("publish_AI_btnInfo",{"func":self.AI_client_VC_RequestToSpeak})#打断 @@ -4395,7 +4528,6 @@ class AI_VC(Abstract): self.AI_TTS_str = ""#"你好,有什么吩咐" self.AI_ASR_str = "" self.AI_ASR_str_tmp = "" - self.VC_state = VC_State_None # if self.VC_state != VC_State_None: # EventMesh.publish("publish_AI_btnInfo",{"func":self.Close}) # EventMesh.publish("publish_AI_btnInfo",{"func":utime.sleep_ms,'data':(10)}) @@ -4447,7 +4579,6 @@ class AI_VC(Abstract): self.AI_TTS_str = ""#"你好,有什么吩咐" self.AI_ASR_str = "" self.AI_ASR_str_tmp = "" - self.VC_state = VC_State_None # if self.VC_state != VC_State_None: # EventMesh.publish("publish_AI_btnInfo",{"func":self.Close}) # EventMesh.publish("publish_AI_btnInfo",{"func":utime.sleep_ms,'data':(10)}) @@ -4490,8 +4621,8 @@ class AI_VC(Abstract): t = getattr(self.fsm, "turn", None) except Exception: t = None - print("[KEY] AI_key_release VC_mode={} VC_state={} turn={} led={}".format( - getattr(self, "VC_mode", -1), getattr(self, "VC_state", -1), t, led)) + print("[KEY] AI_key_release VC_mode={} {} turn={} led={}".format( + getattr(self, "VC_mode", -1), self._vc_fsm_log_snip(), t, led)) except Exception: pass print("AI_key_release123") @@ -4509,18 +4640,28 @@ class AI_VC(Abstract): self.voice_flag=0 EventMesh.publish("play_tts",[tts_play_str,1]) return - if self.AI_key_long_press_flag == 1 :#有长按 - #self.AI_client_VC_end_speech() - #EventMesh.publish("publish_AI_btnInfo",{"func":utime.sleep_ms,'data':(1000)}) - #EventMesh.publish("publish_AI_btnInfo",{"func":self.AI_client_asr_StopTranscription_requset}) - #self.AI_client_asr_StopTranscription_requset()#请求停止 + if self.AI_key_long_press_flag == 1 :#有长按(或上一轮未清干净的残留) if self.VC_mode == 1 :#长按单次问答模式 - # if self.AI_ASR_str_tmp != "": - print("AI_key_release:asr_str:{}".format(self.AI_ASR_str)) - # EventMesh.publish("publish_AI_btnInfo",{"func":self.AI_VC_start}) - self.AI_client_VC_end_speech() - pass - + # 仅在本轮确实仍在录音上行时发 audio.completed;否则视为短按「提示音」路径 + if getattr(self, "VC_record_state_flag", 0) != 0: + print("AI_key_release:asr_str:{}".format(self.AI_ASR_str)) + self.AI_client_VC_end_speech() + else: + self.AI_key_long_press_flag = 0 + try: + if getattr(self, "_ptt_short_press_stop", 0) == 1: + self._ptt_short_press_stop = 0 + return + except Exception: + pass + try: + if "vc_config" in globals() and vc_config: + self.AI_TTS_str = vc_config.get_attr("PTT_HINT", None) + except Exception: + pass + if not self.AI_TTS_str: + self.AI_TTS_str = "请您按住圆形的按钮开始讲话,讲完松开即可 " + EventMesh.publish("publish_AI_btnInfo",{"func":self.AI_VC_start}) else : if self.VC_mode == 1 :#长按单次问答模式 # 若刚刚短按用于“停止播报”,则不再触发提示音 TTS,直接回到 idle @@ -4586,8 +4727,8 @@ class AI_VC(Abstract): t = getattr(self.fsm, "turn", None) except Exception: t = None - print("[KEY] AI_key_long_press VC_mode={} VC_state={} turn={} led={}".format( - getattr(self, "VC_mode", -1), getattr(self, "VC_state", -1), t, led)) + print("[KEY] AI_key_long_press VC_mode={} {} turn={} led={}".format( + getattr(self, "VC_mode", -1), self._vc_fsm_log_snip(), t, led)) except Exception: pass print("AI_key_long_press") @@ -4739,6 +4880,12 @@ class AI_VC(Abstract): self.AI_record_tmp_queue.clear() self.VC_record_state_flag = 0 + # PTT 一轮录音结束:清长按语义,避免后续短按松手误走 end_speech 而不播提示音 + try: + if getattr(self, "VC_mode", -1) == 1: + self.AI_key_long_press_flag = 0 + except Exception: + pass # 录音停止:关闭聆听灯(恢复 base) try: EventMesh.publish("set_led_state", {"ai_state": "idle"}) @@ -4880,7 +5027,7 @@ class AI_VC(Abstract): if self.VAD_count != 0: EventMesh.publish("publish_AI_btnInfo",{"func":self.VC_Play_Pause,"data":0})#恢复音频播放 self.VAD_count = 0 - if self.VC_state >= VC_State_TTSStart: + if self._vc_tts_pipeline_busy(): pass if vad_state == 1: self.AI_record_tmp_queue.put(read_buf)#入缓存队列 @@ -4968,8 +5115,8 @@ class AI_VC(Abstract): # 创建VC客户端 try: signal = net.csqQueryPoll() - if signal == -1 or sim.getStatus() != 1:#网络正常 - self.websocket_error() + if signal == -1 or sim.getStatus() != 1:#无蜂窝/无卡等:弱网提示 + self.websocket_error(play_weak_signal_tone=True) return req_str = "" @@ -4978,7 +5125,7 @@ class AI_VC(Abstract): ack = "ack=1" lang = "lang=zh-cn"#普通话测试环境 try: - if "loang" in self.VC_TTS_voice_type[self.VC_TTS_voice_key]: + if "lang" in self.VC_TTS_voice_type[self.VC_TTS_voice_key]: lang = self.VC_TTS_voice_type[self.VC_TTS_voice_key]["lang"] else: print("not lang!!!!!!!!!!!!!!!!!!!!!!") @@ -5015,30 +5162,34 @@ class AI_VC(Abstract): if VC_WS_IO_LOG: print("[VC] ws url {}".format(url)) - self.AI_client_VC = uwebsocket.Client.connect(url, debug=True) + self.AI_client_VC = uwebsocket.Client.connect(url, debug=False) #self.AI_WS_connect_Queue.put(self.AI_client_VC) print("[VC] websocket_connect ok") - except Exception as e: #网络连接异常 + except Exception as e: #网络连接异常(已通过 CSQ/SIM,多为 URL/握手/服务端问题,勿播「信号弱」) usys.print_exception(e) print("websocket_connect_VC error!!!\r\n") + try: + print("[VC] ws connect exc: {}".format(e)) + except Exception: + pass str_error = str(e) if str_error.find("[Errno 22] EINVAL")!= -1: print("[VC] websocket EINVAL: {}".format(str_error)) - self.websocket_error() + self.websocket_error(play_weak_signal_tone=False) EventMesh.publish("set_storage_config",["powerRestart",1])#调试临时关闭 utime.sleep_ms(1000) self.aud.stopPlayStream() self.aud.stopAll() Power.powerRestart() - self.websocket_error() + self.websocket_error(play_weak_signal_tone=False) return #print("AI_client_VC:{}".format(self.AI_client_VC)) if self.AI_client_VC == None: EventMesh.publish("update_dev_token")#获取token - self.websocket_error() + self.websocket_error(play_weak_signal_tone=False) return self.AI_client_VC_debug+=1 utime.sleep_ms(10) @@ -5057,7 +5208,14 @@ class AI_VC(Abstract): self.AI_client_VC_isconnect = 1 print("websocket_connect_VC end") - def websocket_error(self,TTS_str=None): + def websocket_error(self, TTS_str=None, play_weak_signal_tone=False): + """play_weak_signal_tone=True 时播 xinhaoruo1(弱网/无卡类);连接/协议失败请传 False,避免误报「信号弱」。""" + try: + if getattr(self, "VC_mode", 0) != 1: + print("[VC][long_idle] websocket_error enter VC_mode={} TTS_str={} weak_hint={} -> Close then uplink_stop(async)".format( + getattr(self, "VC_mode", -1), TTS_str, play_weak_signal_tone)) + except Exception: + pass print("websocket_error1!!!!") utime.sleep_ms(800) self.Close() @@ -5071,15 +5229,19 @@ class AI_VC(Abstract): self.AI_ASR_str_tmp = "" self.AI_ASR_flag = 0 # 可能由收包线程/其它线程触发:统一切回主线程执行 stop,避免“异常→重试→再异常”的循环 + try: + if getattr(self, "VC_mode", 0) != 1: + print("[VC][long_idle] websocket_error schedule uplink_stop reason=websocket_error + set_led_idle") + except Exception: + pass EventMesh.publish("publish_AI_btnInfo",{"func":self._uplink_request_stop, "data":"websocket_error"}) EventMesh.publish("set_led_state", {"ai_state": "idle"}) if TTS_str == None: self.websocket_error_count+=1 # if self.websocket_error_count <=3: # EventMesh.publish("audio_montage_play",["xinhaoruo1.mp3"]) - if self.websocket_error_count <10 : - - EventMesh.publish("audio_montage_play",["xinhaoruo1.mp3"]) + if play_weak_signal_tone and self.websocket_error_count < 10: + EventMesh.publish("audio_montage_play", ["xinhaoruo1.mp3"]) elif self.websocket_error_count >=10: EventMesh.publish("paly_iccid_imei") @@ -5133,6 +5295,7 @@ class AI_VC(Abstract): self.fsm.await_played = False self.fsm.last_tts_completed_ms = 0 self.fsm.last_llm_ms = 0 + self.fsm.reset_rx_phases() except Exception: pass self.AI_client_VC_recv_thread_close()#关闭读线程 @@ -5348,10 +5511,10 @@ class AI_VC(Abstract): self.AI_client_VC_recv_lock = 0 count+=1 - if self.VC_state >= VC_State_TTSStart and (self.tts_in_data_len - self.tts_out_data_len > 64*1024 or count>5): + if self._vc_tts_pipeline_busy() and (self.tts_in_data_len - self.tts_out_data_len > 64*1024 or count>5): count = 0 utime.sleep_ms(1) - if self.VC_state < VC_State_TTSStart: + if not self._vc_tts_pipeline_busy(): utime.sleep_ms(1) recv_data = cli.recv() if self.AI_client_VC_recv_lock == 2: @@ -5501,18 +5664,27 @@ class AI_VC(Abstract): # if self.AI_new_voice_url != "": # EventMesh.publish("publish_AI_btnInfo",{"func":self.AI_client_new_voice}) - self.VC_state = VC_State_None elif jsload_data["event"] == "config.update" :#配置更新中,需要停止录音 - self.VC_state = VC_State_End + try: + self.fsm.reset_rx_phases() + except Exception: + pass self.request_uplink_stop("config.update") elif jsload_data["event"] == "asr.started" :#asr开始 - self.VC_state = VC_State_SpeechStart + try: + self.fsm.on_server_asr_started() + except Exception: + pass self._server_vad_silence = 0 self._turn_has_asr_completed = 0 self._turn_has_vad_silence = 0 self._turn_has_tts_started = 0 self._llm_completed_ms = 0 + try: + self._asr_completed_tone_done = 0 + except Exception: + pass try: self._drop_tts_audio = 0 except Exception: @@ -5526,10 +5698,25 @@ class AI_VC(Abstract): self.AI_TTS_str = "我没听清,请再说一遍" elif jsload_data["event"] == "asr.completed" :#asr 终止的标识 self._turn_has_asr_completed = 1 - # 抢占规则:本地提示音不可打断流播放 + # 本地 think 提示:每轮 ASR 最多一次,且不得与流式 TTS/PCM 播放竞态(避免长对话偶发连播「滴」) try: - if EventMesh.publish("get_vc_stream_active") != 1: - self.aud.play(1, 1, 'U:/static/think.mp3') #播放按键音 + if getattr(self, "_asr_completed_tone_done", 0) == 1: + pass + else: + stream_on = False + try: + stream_on = EventMesh.publish("get_vc_stream_active") == 1 + except Exception: + stream_on = False + pcm_busy = getattr(self, "play_pcm", None) is not None + playing = getattr(self, "VC_Play_flag", 0) == 1 + try: + thinking = getattr(self.fsm, "turn", VCTurnState.Idle) == VCTurnState.Thinking + except Exception: + thinking = False + if (not stream_on) and (not pcm_busy) and (not playing) and (not thinking): + self.aud.play(1, 1, 'U:/static/think.mp3') + self._asr_completed_tone_done = 1 except Exception: pass print("self.commands_mode:{}".format(self.commands_mode)) @@ -5576,14 +5763,13 @@ class AI_VC(Abstract): self._turn_has_vad_silence = 1 self._uplink_mark_end("vad.silence") if self.record_data_save_flag == 0: - if self.VC_record_state_flag != 0 and self.VC_state >= VC_State_SpeechStart: + if self.VC_record_state_flag != 0 and self._vc_vad_uplink_stop_eligible(): self.request_uplink_stop("vad.silence") elif jsload_data["event"] == "llm.created" :#思考(LLM) try: EventMesh.publish("set_led_state", {"ai_state": "thinking"}) except Exception: pass - self.VC_state = VC_State_Thinking self._llm_completed_ms = 0 # EventMesh.publish("publish_AI_btnInfo",{"func":self.VC_Play_Start}) pass @@ -5607,7 +5793,6 @@ class AI_VC(Abstract): if self.VC_record_state_flag == 1:#llm返回数据还没停止,就先停止 self.request_uplink_stop("llm.delta") elif jsload_data["event"] == "tts.started" :#tts开始 - self.VC_state = VC_State_TTSStart self._server_vad_silence = 1 self._turn_has_tts_started = 1 self._tts_pending = 0 @@ -5646,7 +5831,6 @@ class AI_VC(Abstract): # 播放灯由阶段事件控制 elif jsload_data["event"] == "tts.completed" :#tts结束 # tts.completed 仅表示下发结束,本地可能仍在播放;绿灯关闭在本地播放结束时处理 - self.VC_state = VC_State_TTSEnd try: # server event 已在统一入口 on_server_event 触发 FSM,这里避免重复驱动 pass @@ -5684,18 +5868,20 @@ class AI_VC(Abstract): print("AI_VC_start :AI_audio_queue_thread_id :{} ".format(self.AI_audio_queue_thread_id)) else: print("AI_VC_start :AI_audio_queue_thread_id != 0 ") - self.VC_state = VC_State_None elif jsload_data["event"] == "completed" :#会话结束(可能无 TTS,如 ASR 空) # 重要:服务端常在 tts.completed 后紧跟 completed。 # 若本轮存在 TTS/待发 audio.played,则不能在此清零 LocalRespondingEnded_timerout/_need_audio_played_ack, # 否则会掐断「播完→audio.played→下一轮录音」链路,表现为最多 1~2 轮就停。 - if self._need_audio_played_ack == 1 or self.VC_state >= VC_State_TTSStart or self.VC_Play_flag == 1: + if self._need_audio_played_ack == 1 or self._vc_tts_pipeline_busy() or self.VC_Play_flag == 1: pass else: # 无 TTS 的 completed:清状态并按需进入下一轮(见下方条件) self.LocalRespondingEnded_timerout = 0 self._need_audio_played_ack = 0 - self.VC_state = VC_State_None + try: + self.fsm.reset_rx_phases() + except Exception: + pass # 连续对话:若本轮没有 TTS(或服务端直接 completed),需要立刻回到聆听状态 # 否则会出现“有时 1 è½®/2 轮后就停住”的现象(服务端 completed 但端侧未重新开录音上行)。 if self.VC_mode == 0 and self.Close_flag == 0: @@ -5789,7 +5975,10 @@ class AI_VC(Abstract): self.recv_voice = 0 print("不开启定时器标志位置0") self.LocalRespondingEnded_timerout = 8 - self.VC_state = VC_State_End + try: + self.fsm.reset_rx_phases() + except Exception: + pass pass elif jsload_data["event"] == "audio.convert.failed": #音频转换失败了 @@ -6769,7 +6958,10 @@ class AI_VC(Abstract): self._tts_pending = 0 self._tts_pending_ms = 0 if self.VC_mode == 0 and self.Close_flag == 0: - self.VC_state = VC_State_None + try: + self.fsm.reset_rx_phases() + except Exception: + pass EventMesh.publish("publish_AI_btnInfo", {"func": self.AI_VC_start}) except Exception: pass @@ -6797,7 +6989,10 @@ class AI_VC(Abstract): self._fb_last_thinking_restart_ms = now_ms self._llm_completed_ms = 0 self._server_vad_silence = 0 - self.VC_state = VC_State_None + try: + self.fsm.reset_rx_phases() + except Exception: + pass try: print("[VC][thinking_timeout] AI_VC_start age_ms={} thr={}".format( age_ms, restart_threshold_ms)) @@ -6813,12 +7008,18 @@ class AI_VC(Abstract): EventMesh.publish("system_sleep_rest")#防止黑屏 self.close_timerout += 1 if self.close_timerout > 20 and self.VC_mode != 1 :#:#20秒没数据就close 长按单次问答模式不关 - - if self.VC_state >= VC_State_SpeechIng: + try: + print("[VC][long_idle] timeout_20s_gate close_timerout={} VC_mode={} {} (thr=SpeechIng)".format( + self.close_timerout, self.VC_mode, self._vc_fsm_log_snip())) + except Exception: + pass + if self._vc_long_idle_active_speech_or_later(): + print("[VC][long_idle] branch=speech_no_rsp -> websocket_error + ud_error") print("接口无响应,超时退出") EventMesh.publish("publish_AI_btnInfo",{"func":self.websocket_error,"data":"接口超时了。请重试"}) self.ud_error(["VC",self.VC_taskid]) else: + print("[VC][long_idle] branch=idle_timeout -> Close") EventMesh.publish("publish_AI_btnInfo",{"func":self.Close}) #EventMesh.publish("sleep_BT")#休眠蓝牙 @@ -6866,7 +7067,10 @@ class AI_VC(Abstract): if (is_pcm_empty and drained) or too_long: EventMesh.publish("publish_AI_btnInfo", {"func": self.VC_Play_End}) self._fsm_apply_actions(self.fsm.on_local_play_end()) - self.VC_state = VC_State_None + try: + self.fsm.reset_rx_phases() + except Exception: + pass except Exception: pass if self.online_kws == 1: @@ -6874,10 +7078,16 @@ class AI_VC(Abstract): pass # thinking/llm→tts 等兜底已在 _fsm_timeout_table_tick 内统一处理 - self.VC_pingping_timerout+=1 - if self.VC_pingping_timerout>3: - self.VC_pingping_timerout=0 - self.AI_client_VC_ping() + # VC WebSocket 文本 ping:间隔由 default_config 的 VC_WS_PING_INTERVAL_SEC 控制(秒),<=0 表示关闭 ping + try: + _ping_iv = int(vc_config.get_int("VC_WS_PING_INTERVAL_SEC", 4)) + except Exception: + _ping_iv = 4 + if _ping_iv > 0: + self.VC_pingping_timerout += 1 + if self.VC_pingping_timerout >= _ping_iv: + self.VC_pingping_timerout = 0 + self.AI_client_VC_ping() # self.asr_pingping_timerout += 1 # if self.asr_pingping_timerout>3: # self.asr_pingping_timerout=0 @@ -6919,7 +7129,7 @@ class AI_VC(Abstract): #utime.sleep_ms(50) else: - print("self.VC_state :{}".format(self.VC_state )) + print("AI_VC_start2 (already connected) {}".format(self._vc_fsm_log_snip())) EventMesh.publish(constants.EVENT.SYSTEM_UP)#唤醒休眠 if self.AI_client_VC_isconnect == 0: #self.Close() @@ -6929,7 +7139,6 @@ class AI_VC(Abstract): self.AI_client_VC_start_requset() print("AI_VC_start3") - self.VC_state = VC_State_None if self.AI_TTS_str == "" and self.AI_new_voice_url == "":#没有tts要播放的时候才开始录音 并音频路径为空 #开始asr录音 self._uplink_request_start("AI_VC_start")#开启线程获取录音数据(统一入口) @@ -6971,6 +7180,21 @@ class AI_VC(Abstract): token = EventMesh.publish("get_dev_token") if token ==None: token = "" + # bot_option:优先从 default_config(usr 可覆盖)读取 VC_BOT_ID / VC_WORKFLOW_ID,允许空字符串 + _def_bot_id = "7462617881076351002" + _def_workflow_id = "7462621757327196187" + try: + if "vc_config" in globals() and vc_config: + _vc_bot_id = vc_config.get_attr("VC_BOT_ID", _def_bot_id) + _vc_workflow_id = vc_config.get_attr("VC_WORKFLOW_ID", _def_workflow_id) + if _vc_bot_id is None: + _vc_bot_id = "" + if _vc_workflow_id is None: + _vc_workflow_id = "" + else: + _vc_bot_id, _vc_workflow_id = _def_bot_id, _def_workflow_id + except Exception: + _vc_bot_id, _vc_workflow_id = _def_bot_id, _def_workflow_id json_data = \ { "header": { @@ -7002,8 +7226,8 @@ class AI_VC(Abstract): "bot_option": { "use_workflow": True, #"input_format": "text", - "bot_id":"7462617881076351002",#语言助手 - "workflow_id":"7462621757327196187", + "bot_id": _vc_bot_id, + "workflow_id": _vc_workflow_id, } } @@ -7076,8 +7300,8 @@ class AI_VC(Abstract): if "vc_config" in globals() and vc_config: opt = vc_config.get_attr("DIALOG_BOT_OPTION", None) if isinstance(opt, dict): - if "bot_id" in opt and opt["bot_id"]: - json_data["payload"]["dialog_attributes"]["cfg"]["bot_option"]["bot_id"] = opt["bot_id"] + if "bot_id" in opt: + json_data["payload"]["dialog_attributes"]["cfg"]["bot_option"]["bot_id"] = opt.get("bot_id") or "" if "workflow_id" in opt: json_data["payload"]["dialog_attributes"]["cfg"]["bot_option"]["workflow_id"] = opt.get("workflow_id") or "" if "use_workflow" in opt: @@ -7093,13 +7317,17 @@ class AI_VC(Abstract): json_data["payload"]["dialog_attributes"]["cfg"]["bot_option"]["bot_id"] = cur.get("bot_id") if "workflow_id" in cur: json_data["payload"]["dialog_attributes"]["cfg"]["bot_option"]["workflow_id"] = cur.get("workflow_id") or "" - if json_data["payload"]["dialog_attributes"]["cfg"]["bot_option"].get("workflow_id", "") == "": - json_data["payload"]["dialog_attributes"]["cfg"]["bot_option"]["use_workflow"] = False if cur.get("openai_option"): json_data["payload"]["dialog_attributes"]["cfg"]["openai_option"] = cur.get("openai_option") except Exception: pass + try: + _bo = json_data["payload"]["dialog_attributes"]["cfg"]["bot_option"] + if not _bo.get("bot_id", "") or not _bo.get("workflow_id", ""): + _bo["use_workflow"] = False + except Exception: + pass try: if "vc_config" in globals() and vc_config: p = vc_config.get_attr("DIALOG_PROVIDER_DEFAULT", None) @@ -7122,7 +7350,6 @@ class AI_VC(Abstract): json_data["payload"]["commands"] = [] if self.VC_mode == 0 :#and dev_type != "7PIN_BK_coze":#长对话模式打开vad json_data["payload"]["inbound_attributes"]["disable_vad"] = False - self.VC_state = VC_State_None # 新会话开始:在收到服务端 started 前,禁止发送音频帧(避免 session not initialized) self._vc_session_started = 0 try: @@ -7152,7 +7379,10 @@ class AI_VC(Abstract): - self.VC_state = VC_State_SpeechStart + try: + self.fsm.on_server_asr_started() + except Exception: + pass #结束上传语音 def AI_client_VC_end_speech(self): json_data = \ @@ -7186,7 +7416,10 @@ class AI_VC(Abstract): EventMesh.publish("publish_AI_btnInfo",{"func":self.VC_init}) EventMesh.publish("publish_AI_btnInfo",{"func":self.AI_client_VC_send,"data":ujson.dumps(json_data)}) utime.sleep_ms(1) - self.VC_state = VC_State_None + try: + self.fsm.reset_rx_phases() + except Exception: + pass # #self.Close() # self.AI_VC_start() #TTS播放 @@ -7260,7 +7493,6 @@ class AI_VC(Abstract): self.AI_TTS_str = ""#"你好,有什么吩咐" self.AI_ASR_str = "" self.AI_ASR_str_tmp = "" - self.VC_state = VC_State_None self._uplink_request_stop("kws_even_cb") self._uplink_request_start("kws_even_cb") self.AI_VC_start() @@ -7726,6 +7958,14 @@ class AI_VC(Abstract): utime.sleep_ms(2) else: break + # 打断后 PCM 偶发未打开:加重试,避免「队列有数据、play_pcm=None、无声」 + if self.VC_play_TYPE == VC_play_TYPE_PCM and self.play_pcm is None and self.VC_stop_play_audio_flag == 1: + for j in range(4): + if self.VC_Play_flag == 0: + self.VC_Play_Start() + utime.sleep_ms(30 + j * 35) + if self.play_pcm is not None: + break try: if self.VC_play_TYPE == VC_play_TYPE_PCM: # if self.VC_play_samplerate == 8000: @@ -7799,7 +8039,18 @@ class AI_VC(Abstract): def Close_VC(self,event,msg): EventMesh.publish("publish_AI_btnInfo",{"func":self.Close}) def Close(self): + try: + if getattr(self, "VC_mode", 0) != 1: + print("[VC][long_idle] Close() enter VC_mode={} {} VC_satrt_flag={} VC_record_state_flag={}".format( + getattr(self, "VC_mode", -1), self._vc_fsm_log_snip(), + getattr(self, "VC_satrt_flag", -1), getattr(self, "VC_record_state_flag", -1))) + except Exception: + pass self.VC_stop_play_audio_flag = 0 + try: + self.AI_key_long_press_flag = 0 + except Exception: + pass self.VC_Thinking_timerout = 0 self.AI_ASR_timer.stop() self._1S_timer.stop() @@ -7827,6 +8078,11 @@ class AI_VC(Abstract): pass self.is_ruppt_tts = 0#打断标志位清零 print("ai_VC Close1!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!") + try: + if getattr(self, "VC_mode", 0) != 1: + print("[VC][long_idle] step=set_led_state_idle (first)") + except Exception: + pass EventMesh.publish("set_led_state", {"ai_state": "idle"}) self.tts_in_data_len = 0 self.tts_out_data_len = 0 @@ -7842,12 +8098,22 @@ class AI_VC(Abstract): usys.print_exception(e) # Close 可能被不同线程触发:统一切回主线程执行 stop + try: + if getattr(self, "VC_mode", 0) != 1: + print("[VC][long_idle] step=schedule_uplink_stop reason=Close (async publish_AI_btnInfo)") + except Exception: + pass EventMesh.publish("publish_AI_btnInfo",{"func":self._uplink_request_stop, "data":"Close"}) print("ai_VC Close1.1!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!") print("ai_VC Close1.2!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!") + try: + if getattr(self, "VC_mode", 0) != 1: + print("[VC][long_idle] step=websocket_deconnect_VC") + except Exception: + pass try: self.websocket_deconnect_VC() except Exception as e: @@ -7877,12 +8143,18 @@ class AI_VC(Abstract): if self.AI_VC_send_data_queue.empty()!=True: self.AI_VC_send_data_queue.clear() self.play_new_voice_flag = 0 #语音消息播放状态 - if self.voice_choose_flag == 0:#如果没有未读语音 - self.AI_new_voice_url ="" #语音播放地址 + if self.voice_choose_flag == 0: # 如果没有未读语音 + self.AI_new_voice_url = "" # 语音播放地址 print("关闭并重置语音标志位") - print("关闭但是没有重置语音标志位") + else: + print("关闭但是没有重置语音标志位") self.AI_ASR_send_buf_len = 0 #self.AI_WS_connect_Queue.put(self.AI_client_VC) + try: + if getattr(self, "VC_mode", 0) != 1: + print("[VC][long_idle] step=set_led_state_idle (second) -> VC_init VC_satrt_flag=0") + except Exception: + pass EventMesh.publish("set_led_state", {"ai_state": "idle"}) self.VC_init() self.VC_satrt_flag = 0 diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py index 21799702..e289ba3d 100644 --- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py +++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py @@ -25,6 +25,36 @@ import _thread import usys import sms from Gsensor import SC7A20 +def _sos_feature_enabled(): + try: + import vc_config + return vc_config.get_bool("SOS_ENABLED", True) + except Exception: + return True + + +def _btn_cfg(): + try: + import vc_config + return vc_config + except Exception: + return None + + +def _btn_int(name, default): + c = _btn_cfg() + return c.get_int(name, default) if c else default + + +def _btn_bool(name, default): + c = _btn_cfg() + return c.get_bool(name, default) if c else default + + +def _btn_device_enabled(): + return _btn_bool("BTN_DEVICE_ENABLED", True) + + if EventMesh.model == "D10" : audio_buf = ['audio_find_haixiu', 'R_ALARM_NEW', 'R_BLOOD_SUGAR', 'R_CALL_mp3', 'R_CHARGE_FULL', 'R_CHARGE_IN', 'R_CHARGE_OUT', 'R_CUR_BATTERY_LEVEL', 'R_DRINK_ALARM', 'R_FALL_ALARM', 'R_HOME_ALARM', 'R_HSENSOR_RESULT_FAILE', 'R_HSENSOR_RESULT_HR_TITLE', 'R_HSENSOR_RESULT_OK', 'R_HSENSOR_SPO2_TITLE', 'R_HSENSOR_TEMP_TITLE', 'R_MEDICINE_ALARM', 'R_NO_SET_SOS_DIAL', 'R_NO_SET_VIDOE', 'R_NO_SIM', 'R_POWER_OFF_1', 'R_READ_STEP_0', 'R_READ_STEP_1', 'R_READ_STEP_2', 'R_READ_STEP_3', 'R_READ_STEP_4', 'R_READ_TIME_0', 'R_READ_TIME_1', 'R_READ_TIME_2', 'R_READ_TIME_3', 'R_READ_TIME_4', 'R_READ_TIME_5', 'R_READ_TIME_6', 'R_READ_TIME_7', 'R_READ_TIME_8', 'R_READ_TIME_9', 'R_READ_TIME_MIN', 'R_READ_TIME_ZHENG', 'R_RESET_ALARM', 'R_RESET_END_ALARM', 'R_SIM_CONNECT', 'R_SIM_FAILE', 'R_SLEEP_ALARM', 'R_SOS_ALERT', 'R_TSENSOR_RESULT_VALUE_DOT', 'R_UNREAD_WECHAT', 'R_VIDEO_ANSWER', 'R_VIDEO_ANSWERING', 'R_VIDEO_CALL_CONNECT', 'R_VIDEO_CALL_ENDING', 'R_VIDEO_CALL_IN', 'R_VIDEO_VOICE_IN', 'R_VIDEO_WAITING', 'R_WAKEUP_ALARM', 'R_WECHAT_RECV'] @@ -1690,6 +1720,8 @@ if EventMesh.model == "D10" : pass def dial_sos_phone(self, event, msg): #拨打紧急求助电话 + if not _sos_feature_enabled(): + return flag = EventMesh.publish("get_call_state") if flag == 0: @@ -2180,10 +2212,25 @@ if EventMesh.model == "D10" : self.pk = PowerKey() self.__pwk_timer = osTimer() self.aud = audio.Audio(0) - self.aud.set_pa(Pin.GPIO29) - self.aud.setVolume(11) + vc = _btn_cfg() + pa_gpio = vc.pin_gpio_attr("BTN_AUDIO_PA_GPIO", "GPIO29", Pin) if vc else Pin.GPIO29 + if pa_gpio is not None: + self.aud.set_pa(pa_gpio) + else: + self.aud.set_pa(Pin.GPIO29) + self.aud.setVolume(_btn_int("BTN_AUDIO_VOLUME", 11)) # self.keypad = machine.KeyPad(1, 2) - self.__PowerDownTimeOut = 3000 + self.__PowerDownTimeOut = _btn_int("BTN_POWER_DOWN_TIMEOUT_MS", 3000) + self.__btn_poll_ms = _btn_int("BTN_POLL_MS", 100) + self.__btn_release_timeout_ms = _btn_int("BTN_RELEASE_TIMEOUT_MS", 500) + self.__pwk_led_on_ticks = _btn_int("BTN_PWK_LED_ON_TICKS", 5) + self.__pwk_power_off_ticks = _btn_int("BTN_PWK_POWER_OFF_TICKS", 100) + self.__pwk_power_off_no_sim_ticks = _btn_int("BTN_PWK_POWER_OFF_NO_SIM_TICKS", 30) + self.__pwk_release_debounce_ticks = _btn_int("BTN_PWK_RELEASE_DEBOUNCE_TICKS", 1) + self.__sos_long_press_ticks = _btn_int("BTN_SOS_LONG_PRESS_TICKS", 30) + self.__sos_release_debounce_ticks = _btn_int("BTN_SOS_RELEASE_DEBOUNCE_TICKS", 1) + self.__wechat_long_press_ticks = _btn_int("BTN_WECHAT_LONG_PRESS_TICKS", 15) + self.__wechat_release_debounce_ticks = _btn_int("BTN_WECHAT_RELEASE_DEBOUNCE_TICKS", 1) self.__tp = tp self.pwk_press = 0 self.pwk_count = 0 @@ -2262,17 +2309,33 @@ if EventMesh.model == "D10" : # self.keypad.set_callback(self.key_callback) self.pk.powerKeyEventRegister(self.powerKey_callback) - - self.extint = ExtInt(ExtInt.GPIO26, ExtInt.IRQ_RISING_FALLING, ExtInt.PULL_DISABLE, self.pwk_extint_cb) - self.extint.enable() - - self.sosKey = ExtInt(ExtInt.GPIO22, ExtInt.IRQ_RISING_FALLING, ExtInt.PULL_PU, self.sosKey_extint_cb) - self.sosKey.enable() - - self.wechatKey = ExtInt(ExtInt.GPIO20, ExtInt.IRQ_RISING_FALLING, ExtInt.PULL_PU, self.wechatKey_extint_cb) - self.wechatKey.enable() + if not _btn_device_enabled(): + return - key19 = Pin(Pin.GPIO19, Pin.OUT, Pin.PULL_PU, 0) + vc = _btn_cfg() + pwk_gpio = vc.extint_gpio_attr("BTN_PWK_GPIO", "GPIO26", ExtInt) if vc else ExtInt.GPIO26 + if pwk_gpio is not None: + pwk_pull = vc.extint_pull_attr("BTN_PWK_PULL", "PULL_DISABLE", ExtInt) if vc else ExtInt.PULL_DISABLE + self.extint = ExtInt(pwk_gpio, ExtInt.IRQ_RISING_FALLING, pwk_pull, self.pwk_extint_cb) + self.extint.enable() + + sos_gpio = vc.extint_gpio_attr("BTN_SOS_GPIO", "GPIO22", ExtInt) if vc else ExtInt.GPIO22 + if sos_gpio is not None: + sos_pull = vc.extint_pull_attr("BTN_SOS_PULL", "PULL_PU", ExtInt) if vc else ExtInt.PULL_PU + self.sosKey = ExtInt(sos_gpio, ExtInt.IRQ_RISING_FALLING, sos_pull, self.sosKey_extint_cb) + self.sosKey.enable() + + wechat_gpio = vc.extint_gpio_attr("BTN_WECHAT_GPIO", "GPIO20", ExtInt) if vc else ExtInt.GPIO20 + if wechat_gpio is not None: + wechat_pull = vc.extint_pull_attr("BTN_WECHAT_PULL", "PULL_PU", ExtInt) if vc else ExtInt.PULL_PU + self.wechatKey = ExtInt(wechat_gpio, ExtInt.IRQ_RISING_FALLING, wechat_pull, self.wechatKey_extint_cb) + self.wechatKey.enable() + + aux_gpio = vc.get_attr("BTN_AUX_OUT_GPIO", "GPIO19") if vc else "GPIO19" + if aux_gpio: + aux_init = _btn_int("BTN_AUX_OUT_INIT", 0) + aux_pull = vc.pin_pull_attr("BTN_AUX_OUT_PULL", "PULL_PU", Pin) if vc else Pin.PULL_PU + Pin(getattr(Pin, aux_gpio), Pin.OUT, aux_pull, aux_init) def pwk_extint_cb(self,args):#侧边按键 # self.GPIO26_status = self.extint.read_level() @@ -2315,7 +2378,7 @@ if EventMesh.model == "D10" : self.pwkey_press = 1 self.pwkey_count = 0 self.led_state = 0 - self.pwkey_timer.start(100, 1, self.publish_pwkKey_btn_event_cb) + self.pwkey_timer.start(self.__btn_poll_ms, 1, self.publish_pwkKey_btn_event_cb) # EventMesh.debug_log("key22_extint_cb:self.key22_timer.start!!!!\n") def pwKey_press_cb(self, data): @@ -2333,11 +2396,11 @@ if EventMesh.model == "D10" : self.GPIO26_status = self.extint.read_level() if self.pwkey_press == 1 : self.pwkey_count += 1 - if self.pwkey_count > 5: + if self.pwkey_count > self.__pwk_led_on_ticks: if self.led_state == 0: self.led_state = 1 EventMesh.publish("set_led_time_arg",[1,1,330,led_mode.LONG_LIGHT_GREEN,2,1,led_mode.OTHER_MEASURE_MODE])#測量成功 - if self.pwkey_count >= 10*10: + if self.pwkey_count >= self.__pwk_power_off_ticks: EventMesh.publish("stop_led_timer")#设置参数 self.pwkey_timer.stop() self.pwkey_count = 0 @@ -2350,7 +2413,7 @@ if EventMesh.model == "D10" : EventMesh.publish("open_power_on", 3)# return - if self.pwkey_count >= 3*10 : + if self.pwkey_count >= self.__pwk_power_off_no_sim_ticks: if EventMesh.publish("get_sim_Status") != 1: EventMesh.debug_log("长3秒关机") EventMesh.publish("stop_led_timer")#设置参数 @@ -2364,14 +2427,14 @@ if EventMesh.model == "D10" : if self.GPIO26_status == 1:#松开 - if self.pwkey_count >= 1: #防抖100ms + if self.pwkey_count >= self.__pwk_release_debounce_ticks: #防抖 # EventMesh.debug_log("self.GPIO26_status == 1") self.pwkey_timer.stop() self.pwkey_count = 0 self.pwkey_press = 0 self.led_state = 0 self.pwKey_press_count+=1 - self.pwkey_timer.start(500, 0, self.publish_pwKey_timeout_cb_do)#松手超时1s判断 + self.pwkey_timer.start(self.__btn_release_timeout_ms, 0, self.publish_pwKey_timeout_cb_do)#松手超时判断 def hsensorTest_timer_cb(self,e): EventMesh.publish("system_sleep_rest")#防止黑屏 @@ -2509,7 +2572,7 @@ if EventMesh.model == "D10" : self.sosKey_long_press = 0 self.sosKey_count = 0 self.sosKey_press = 1 - self.sosKey_timer.start(100, 1, self.publish_soskey_btn_event_cb) + self.sosKey_timer.start(self.__btn_poll_ms, 1, self.publish_soskey_btn_event_cb) # EventMesh.debug_log("key22_extint_cb:self.key22_timer.start!!!!\n") def sosKey_press_cb(self, data): @@ -2532,7 +2595,7 @@ if EventMesh.model == "D10" : # else: # EventMesh.publish("set_led_time_arg",[1000,200,1,led_mode.FLASH_LIGHT_RED,led_mode.DEFAULT_LONG_LIGHT_MODE,led_mode.OTHER_MEASURE_MODE])#设置参数 self.sosKey_count += 1 - if self.sosKey_count >= 10*3: #长按3s sos拨号 + if self.sosKey_count >= self.__sos_long_press_ticks: #长按 sos拨号 if self.sosKey_long_press == 0: self.sosKey_long_press = 1 flag = EventMesh.publish("get_call_state")#在通话或者电话拨进 或者拨出不允许寻找设备 @@ -2551,13 +2614,13 @@ if EventMesh.model == "D10" : # EventMesh.debug_log("self.sosKey_count {}",self.sosKey_count) if self.sosKey_status == 1:#松开 - if self.sosKey_count >= 1: #防抖100ms + if self.sosKey_count >= self.__sos_release_debounce_ticks: #防抖 self.sosKey_timer.stop() self.sosKey_count = 0 self.sosKey_press = 0 self.sosKey_long_press = 0 self.sosKey_press_count+=1 - self.sosKey_timer.start(500, 0, self.publish_sosKey_timeout_cb_do)#松手超时1s判断 + self.sosKey_timer.start(self.__btn_release_timeout_ms, 0, self.publish_sosKey_timeout_cb_do)#松手超时判断 def publish_sosKey_timeout_cb_do(self, *args, **kwargs): EventMesh.publish("publish_message_event_btnInfo",{"func":self.sosKey_timeout_cb,"data":0}) @@ -2731,7 +2794,7 @@ if EventMesh.model == "D10" : self.led_state = 0 self.wechatKey_count = 0 self.wechat_state = 0 - self.wechatKey_timer.start(100, 1, self.publish_wechat_btn_event_cb) + self.wechatKey_timer.start(self.__btn_poll_ms, 1, self.publish_wechat_btn_event_cb) else: # EventMesh.debug_log('### wechatKey_extint_cb end') EventMesh.publish("close_wechat_btn_timer") @@ -2786,7 +2849,7 @@ if EventMesh.model == "D10" : if self.wechatKey_press == 1 :#是否按下 tmp = EventMesh.publish("get_wechat_time")#获取微聊时间戳 self.wechatKey_count += 1 - if self.wechatKey_count >= 15: #长按1s进入微聊录音 + if self.wechatKey_count >= self.__wechat_long_press_ticks: #长按进入微聊录音 flag = EventMesh.publish("get_call_state") fall_down = EventMesh.publish("get_fall_down_state")#跌倒报警标识 if flag != None: @@ -2849,14 +2912,14 @@ if EventMesh.model == "D10" : self.wechatKey_press_count=0 return if self.WeChatKey_status == 1:#松开 - if self.wechatKey_count >= 1: #防抖100ms + if self.wechatKey_count >= self.__wechat_release_debounce_ticks: #防抖 # EventMesh.debug_log("WeChat time!!!!!!!!!!!!!!") self.wechatKey_timer.stop() self.wechatKey_count = 0 self.wechatKey_press = 0 self.wechat_state = 0 self.wechatKey_press_count+=1 - self.wechatKey_timer.start(500, 0, self.publish_wechatKey_btn_event_cb)#松手超时1s判断 + self.wechatKey_timer.start(self.__btn_release_timeout_ms, 0, self.publish_wechatKey_btn_event_cb)#松手超时判断 def publish_wechatKey_btn_event_cb(self, *args, **kwargs): EventMesh.publish("publish_message_event_btnInfo",{"func":self.wechatKey_timeout_cb,"data":0}) 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 424c7b79..4d1e3f63 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 @@ -7,6 +7,13 @@ # 当前设备类型(编译期间确定;现场仅可用 usr/default_config.py 覆盖) DEV_TYPE = "7PIN" +# 是否加载 quecgnss 并在定位管理器初始化时调用 gnssEnable(0)。 +# 无 GNSS 硬件的机型(如部分吊坠)可置 False,避免 import quecgnss 或底层驱动异常/阻塞。 +GNSS_ENABLED = False + +# 为 True 时,protocol 模块 import 过程会打印 [proto.import] 阶段标记(配合 qp 日志口排查卡点)。 +PROTOCOL_IMPORT_TRACE = True + # 当前设备配置(仅保留“设备差异项”,不要放运行态变量) # led_gpio 使用 Pin 属性名(字符串),由 vc_config.py 转成 Pin.GPIOxx 常量。 LED_GPIO = ("GPIO36", "GPIO44", "GPIO43") # (R, G, B) @@ -19,6 +26,9 @@ LED_ACTIVE_LOW = False LED_ACTIVE_LOW_RGB = None # 例如 (True, False, False) 表示仅红灯反相 # LED_ACTIVE_LOW_RGB = (True, False, False) +# 待机空闲绿灯慢闪半周期(ms) +LED_IDLE_GREEN_BLINK_MS = 1000 + # 是否支持 UART 相关能力(例如 7PIN_1_5 才允许走串口) UART_SUPPORTED = False @@ -35,14 +45,23 @@ HW_STATUS_DEBUG = True # 是否需要初始化蓝牙电源/马达/音频IIS配置等(原先仅 7PIN_1_5) BT_POWER_MOTOR_ENABLED = False PIN_BT_ON_GPIO = None # 例如 "GPIO31" -PIN_MOT_GPIO = None # 例如 "GPIO36" - +PIN_MOT_GPIO = None # audio.set_qdai_cfg(...) 参数;若为 None 则不调用 AUDIO_QDAI_CFG = None # 例如 (1,0,0,2,0,1,1,1) +# motor.py(motorEventManager):马达输出脚与节拍。MOTOR_GPIO 为 None 时依次尝试 PIN_MOT_GPIO、默认 GPIO36。 +MOTOR_PIN_GPIO = "GPIO20" # 例如 "GPIO36";无马达硬件可保持 None +MOTOR_TICK_MS = 100 +MOTOR_ACTIVE_LOW = False + # AI 按键中断与电源键中断引脚(ExtInt.GPIOxx) -EXTINT_AI_GPIO = "GPIO22" -PWK_KEY_GPIO = "GPIO26" +EXTINT_AI_GPIO = "GPIO22" # ai按键 +PWK_KEY_GPIO = "GPIO26" # ä¾§è¾¹power按键 , 模式切换 + +#btn_device_ec800m.py +BTN_WECHAT_GPIO = None +BTN_SOS_GPIO = None + # 蓝牙唤醒 4G/4G 唤醒蓝牙相关(原先仅 7PIN_1_5) BT_WAKEUP_4G_ENABLED = False @@ -59,6 +78,12 @@ KEY_RELEASE_DEBOUNCE_COUNT = 5 # 是否允许 AI 键长按 8 秒触发关机逻辑(原 jswm/jswm_BOX) AI_LONG_PRESS_POWER_OFF_ENABLED = False +# 是否启用 SOS:False 时禁用 AI 键长按 3s 拨紧急号、以及按键板上的 SOS 长按拨号入口 +SOS_ENABLED = False + +# VC WebSocket 文本保活 ping 间隔(秒)。原逻辑约每 4 秒一次,空闲功耗偏高;拉大间隔可降低唤醒与发包频率 +VC_WS_PING_INTERVAL_SEC = 55 + # -------------------- # 开机提示/语音参数默认值(与具体产品绑定,编译期决定) # -------------------- @@ -107,6 +132,11 @@ KWS_PTT_HINT = "请您按住圆形的按钮开始讲话,讲完松开即可 " # DIALOG_BOT_OPTION = {"bot_id":"...", "workflow_id":"...", "use_workflow":True} DIALOG_BOT_OPTION = None +# VC Start 请求里 dialog_attributes.cfg.bot_option(与 DIALOG_BOT_OPTION 二选一或叠加:后者可再覆盖) +# 允许空字符串 "";未定义键时沿用下方默认值;若两者都为空则自动 use_workflow=False +VC_BOT_ID = "7462617881076351002" +VC_WORKFLOW_ID = "7462621757327196187" + # dialog_attributes.provider 覆盖(None 表示沿用存储配置 dialog_attributes_provider) DIALOG_PROVIDER_DEFAULT = None diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/main_init.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/main_init.py index aafb6486..ccb2a211 100644 --- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/main_init.py +++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/main_init.py @@ -193,6 +193,7 @@ def main_init(): try: app.append_manager(_ai.device_res_author()) + print("device_res_author:{}".format(utime.localtime())) except Exception as e: usys.print_exception(e) @@ -200,12 +201,12 @@ def main_init(): # from iot_websocket import TSockManager,LK_ProtoCol,IOTProtoColResolver,IOTWebsocketProtoCol,IOTWebsocketMang,IOTSendCmdManager,IotProtoColResolver,IOTWeb_HRProtoCol # import protocol try: - from usr.motor import motorEventManager - app.append_manager(motorEventManager()) + from usr.motor import motorEventManager + app.append_manager(motorEventManager()) except Exception as e: - usys.print_exception(e) - from motor import motorEventManager - app.append_manager(motorEventManager()) + usys.print_exception(e) + from motor import motorEventManager + app.append_manager(motorEventManager()) try: from usr.voice_record import VOICE_RECORD @@ -214,11 +215,22 @@ def main_init(): usys.print_exception(e) from voice_record import VOICE_RECORD app.append_manager(VOICE_RECORD()) + print("VOICE_RECORD:{}".format(utime.localtime())) + # protocol:freeze 内 `protocol.py` 先加载。部分环境 `usr.protocol` 会在 import 阶段长时间阻塞, + # 若仍优先 usr 则永远打不到后面的日志;业务定制请放在 usr 下独立模块再 EventMesh 扩展,勿替换整块 protocol import。 + print("[init] protocol import begin {}".format(utime.localtime())) + pro = None try: import usr.protocol as pro + print("[init] protocol(usr) ok {}".format(utime.localtime())) except Exception as e: - usys.print_exception(e) - import protocol as pro + usys.print_exception(e) + try: + import protocol as pro + print("[init] protocol(frozen) ok {}".format(utime.localtime())) + except Exception as e2: + usys.print_exception(e2) + raise try: app.append_manager(pro.IOTSendCmdManager()) app.append_manager(pro.IOTWebLocationManager()) @@ -284,6 +296,7 @@ def main_init(): try: app.append_manager(_ai.AI_VC()) + print("AI_VC:{}".format(utime.localtime())) except Exception as e: usys.print_exception(e) @@ -291,6 +304,7 @@ def main_init(): import ai_alarm app.append_manager(ai_alarm.AI_alarm()) app.append_manager(ai_alarm.schedule()) + print("AI_alarm:{}".format(utime.localtime())) except Exception as e: usys.print_exception(e) diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/motor.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/motor.py index 9f4c0026..c155c5cf 100644 --- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/motor.py +++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/motor.py @@ -13,17 +13,90 @@ import _thread import usys -motor_pin = Pin(Pin.GPIO36, Pin.OUT, Pin.PULL_PD, 0) -def open_motor():#开马达 - motor_pin.write(1) - -def close_motor():#关闭马达 - motor_pin.write(0) - - - -MOTOR_TIME = 100 -class motorEventManager(Abstract):#马达事件 +try: + import vc_config +except Exception: + vc_config = None + +motor_pin = None +_motor_active_low = 0 + + +def _cfg_motor_gpio_name(): + if vc_config: + n = vc_config.get_attr("MOTOR_PIN_GPIO", None) + if not n: + n = vc_config.get_attr("PIN_MOT_GPIO", None) + if n: + return str(n) + return "GPIO36" + + +def _cfg_boot_vibrate_ms(): + if vc_config: + try: + ms = int(vc_config.get_int("MOTOR_BOOT_VIBRATE_MS", 500)) + return ms if ms > 0 else 0 + except Exception: + pass + return 500 + + +def _motor_vibrate_ticks(ms): + tick = _cfg_motor_tick_ms() + return max(1, int((ms + tick - 1) // tick)) + + +def _cfg_motor_tick_ms(): + if vc_config: + try: + ms = int(vc_config.get_int("MOTOR_TICK_MS", 100)) + return ms if ms >= 10 else 100 + except Exception: + pass + return 100 + + +def _read_motor_active_low(): + if vc_config: + try: + return 1 if vc_config.get_bool("MOTOR_ACTIVE_LOW", False) else 0 + except Exception: + pass + return 0 + + +def _ensure_motor_pin(): + global motor_pin, _motor_active_low + if motor_pin is not None: + return motor_pin + _motor_active_low = _read_motor_active_low() + name = _cfg_motor_gpio_name() + try: + gid = getattr(Pin, name) + except Exception: + try: + gid = Pin.GPIO36 + except Exception: + gid = 36 + init_v = 1 if _motor_active_low else 0 + motor_pin = Pin(gid, Pin.OUT, Pin.PULL_PD, init_v) + if _motor_active_low == 0: + motor_pin.write(0) + return motor_pin + + +def open_motor(): + _ensure_motor_pin() + motor_pin.write(0 if _motor_active_low else 1) + + +def close_motor(): + _ensure_motor_pin() + motor_pin.write(1 if _motor_active_low else 0) + + +class motorEventManager(Abstract): def __init__(self): self.motor_timer = osTimer() self.motorInfo_queue = Queue() @@ -39,7 +112,7 @@ class motorEventManager(Abstract):#马达事件 EventMesh.subscribe("set_motor_time", self.set_motor_time)#设置参数 EventMesh.subscribe("close_motor_infor", self.close_motor_infor)#关闭马达和定时器 EventMesh.subscribe("get_motor_enable", self.get_motor_enable)#关闭马达和定时器 - pass + def get_motor_enable(self,event=None,msg=None): return self.motor_enable @@ -60,7 +133,12 @@ class motorEventManager(Abstract):#马达事件 EventMesh.publish("publish_message_event_motorInfo",{"func":self.motor_fun_cb,"data":0}) def post_processor_after_instantiation(self): - pass + ms = _cfg_boot_vibrate_ms() + if ms <= 0: + return + ticks = _motor_vibrate_ticks(ms) + self.motor_count_tmp = 0 + self.set_motor_time(None, [1, 1, ticks, 0, 0]) # msg 0马达使能 1 马达振动时间100ms单位 2 震动次数 3 间隔时间振动 4 是否需要长振 5 长振时间 6间隔时间长振 7长振次数1一次 要为200ms的倍数 def set_motor_time(self,event,msg): @@ -80,7 +158,7 @@ class motorEventManager(Abstract):#马达事件 self.motor_timer.stop() print("motor msg:{} len:{} self.motor_count:{}".format(msg,len(msg),self.motor_count)) close_motor() - self.motor_timer.start(MOTOR_TIME,1,self.publish_motor_event_cb) + self.motor_timer.start(_cfg_motor_tick_ms(), 1, self.publish_motor_event_cb) def motor_fun_cb(self, data): if self.motor_mode == 0 or self.motor_enable == 0: @@ -109,7 +187,6 @@ class motorEventManager(Abstract):#马达事件 self.motor_total_time_tmp=self.motor_total_time self.motor_count_tmp+=1 - pass elif self.motor_mode == 2:# 间隔振动 # print("self.motor_count",self.motor_count,self.motor_open_time,self.motor_close_time,self.motor_total_time) if self.motor_count % (self.motor_open_time) < self.motor_close_time: # 4 4 2 1%4 = 1 2%4 = 2 3%4 = 3 diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/7PIN/default_config.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/7PIN/default_config.py index 424c7b79..ac30ac67 100644 --- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/7PIN/default_config.py +++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/7PIN/default_config.py @@ -7,6 +7,13 @@ # 当前设备类型(编译期间确定;现场仅可用 usr/default_config.py 覆盖) DEV_TYPE = "7PIN" +# 是否加载 quecgnss 并在定位管理器初始化时调用 gnssEnable(0)。 +# 无 GNSS 硬件的机型(如部分吊坠)可置 False,避免 import quecgnss 或底层驱动异常/阻塞。 +GNSS_ENABLED = False + +# 为 True 时,protocol 模块 import 过程会打印 [proto.import] 阶段标记(配合 qp 日志口排查卡点)。 +PROTOCOL_IMPORT_TRACE = True + # 当前设备配置(仅保留“设备差异项”,不要放运行态变量) # led_gpio 使用 Pin 属性名(字符串),由 vc_config.py 转成 Pin.GPIOxx 常量。 LED_GPIO = ("GPIO36", "GPIO44", "GPIO43") # (R, G, B) @@ -19,6 +26,9 @@ LED_ACTIVE_LOW = False LED_ACTIVE_LOW_RGB = None # 例如 (True, False, False) 表示仅红灯反相 # LED_ACTIVE_LOW_RGB = (True, False, False) +# 待机空闲绿灯慢闪半周期(ms) +LED_IDLE_GREEN_BLINK_MS = 1000 + # 是否支持 UART 相关能力(例如 7PIN_1_5 才允许走串口) UART_SUPPORTED = False @@ -35,14 +45,25 @@ HW_STATUS_DEBUG = True # 是否需要初始化蓝牙电源/马达/音频IIS配置等(原先仅 7PIN_1_5) BT_POWER_MOTOR_ENABLED = False PIN_BT_ON_GPIO = None # 例如 "GPIO31" -PIN_MOT_GPIO = None # 例如 "GPIO36" - +PIN_MOT_GPIO = None # audio.set_qdai_cfg(...) 参数;若为 None 则不调用 AUDIO_QDAI_CFG = None # 例如 (1,0,0,2,0,1,1,1) +# motor.py(motorEventManager):马达输出脚与节拍。MOTOR_GPIO 为 None 时依次尝试 PIN_MOT_GPIO、默认 GPIO36。 +MOTOR_PIN_GPIO = "GPIO20" # 例如 "GPIO36";无马达硬件可保持 None +MOTOR_TICK_MS = 100 +MOTOR_ACTIVE_LOW = False +MOTOR_BOOT_VIBRATE_MS = 200 # 马达开机震动时间 200ms + + # AI 按键中断与电源键中断引脚(ExtInt.GPIOxx) -EXTINT_AI_GPIO = "GPIO22" -PWK_KEY_GPIO = "GPIO26" +EXTINT_AI_GPIO = "GPIO22" # ai按键 +PWK_KEY_GPIO = "GPIO26" # ä¾§è¾¹power按键 , 模式切换 + +#btn_device_ec800m.py +BTN_WECHAT_GPIO = None +BTN_SOS_GPIO = None + # 蓝牙唤醒 4G/4G 唤醒蓝牙相关(原先仅 7PIN_1_5) BT_WAKEUP_4G_ENABLED = False @@ -59,6 +80,12 @@ KEY_RELEASE_DEBOUNCE_COUNT = 5 # 是否允许 AI 键长按 8 秒触发关机逻辑(原 jswm/jswm_BOX) AI_LONG_PRESS_POWER_OFF_ENABLED = False +# 是否启用 SOS:False 时禁用 AI 键长按 3s 拨紧急号、以及按键板上的 SOS 长按拨号入口 +SOS_ENABLED = False + +# VC WebSocket 文本保活 ping 间隔(秒)。原逻辑约每 4 秒一次,空闲功耗偏高;拉大间隔可降低唤醒与发包频率 +VC_WS_PING_INTERVAL_SEC = 55 + # -------------------- # 开机提示/语音参数默认值(与具体产品绑定,编译期决定) # -------------------- @@ -107,6 +134,11 @@ KWS_PTT_HINT = "请您按住圆形的按钮开始讲话,讲完松开即可 " # DIALOG_BOT_OPTION = {"bot_id":"...", "workflow_id":"...", "use_workflow":True} DIALOG_BOT_OPTION = None +# VC Start 请求里 dialog_attributes.cfg.bot_option(与 DIALOG_BOT_OPTION 二选一或叠加:后者可再覆盖) +# 允许空字符串 "";未定义键时沿用下方默认值;若两者都为空则自动 use_workflow=False +VC_BOT_ID = "7462617881076351002" +VC_WORKFLOW_ID = "7462621757327196187" + # dialog_attributes.provider 覆盖(None 表示沿用存储配置 dialog_attributes_provider) DIALOG_PROVIDER_DEFAULT = None diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/7PIN_1_5/default_config.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/7PIN_1_5/default_config.py index 5a8b2341..188c750e 100644 --- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/7PIN_1_5/default_config.py +++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/7PIN_1_5/default_config.py @@ -10,6 +10,8 @@ LANG = "zh" BT_POWER_MOTOR_ENABLED = True PIN_BT_ON_GPIO = "GPIO31" PIN_MOT_GPIO = "GPIO36" +MOTOR_PIN_GPIO = "GPIO36" +MOTOR_BOOT_VIBRATE_MS = 500 AUDIO_QDAI_CFG = (1, 0, 0, 2, 0, 1, 1, 1) EXTINT_AI_GPIO = "GPIO43" diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/protocol.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/protocol.py index 0100b8e5..8c633707 100644 --- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/protocol.py +++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/protocol.py @@ -4284,6 +4284,43 @@ class IOTWeb_disconnect_btProtoCol(ProtoCol): EventMesh.publish("send_disconnect_bt_mac",mac) print("recv disconnect_bt{}".format(msg)) EventMesh.publish(WEB_CMD_ENUM.DISCONNECT_BT_S) +class IOTWeb_get_chat_configProtoCol(ProtoCol): + """get_chat_config""" + TYPE = "get_chat_config" + + def send(self, event, msg): + # print("send get_chat_config{}".format(msg)) + # 通过websocket发送到服务器端 + date_tmp = utime.localtime() + time_tmp = utime.mktime(date_tmp) + get_chat_config = { + "cmd":"get_chat_config", + "ts":time_tmp, + "msg":"获取AI对话配置", + "data":None + } + send_data = b'' + send_data = protocol_send_total_data(get_chat_config) + print("send_data get_chat_config{}".format(send_data)) + EventMesh.publish("CHANNEL_IOT_WEB_SEND", send_data) + + def recv(self, event, msg): + """ + + @param event:上行下发get_chat_config + @param msg: 接收到的下行数据 + """ + # { + # "cmd":"post_rest", + # "ts":1738283829, + # "msg":"消息收到响应", + # "data":{ + # "cmd":"get_chat_config", + # "rest":"success|error", + # "msg":"收到获取AI对话配置请求" + # } + # } + print("RECV get_chat_config{}".format(msg)) #IOT金三 #接收小程序控制查找设备 class IOTWeb_find_deviceProtoCol(ProtoCol): @@ -4387,6 +4424,36 @@ class IOTWeb_switch_volumeProtoCol(ProtoCol): print("音量修改为:{}".format(volume-100)) EventMesh.publish("change_volume",volume) +#接收小程序控制设置音量 +class IOTWeb_switch_volumeProtoCol(ProtoCol): + """switch_volume""" + TYPE = "switch_volume" + + def send(self, event, msg): + # print("c{}".format(msg)) + # 通过websocket发送到服务器端 + date_tmp = utime.localtime() + time_tmp = utime.mktime(date_tmp) + come_trans = { + "msg": "设置音量", + "data": None, + "cmd": "switch_volume", + "ts": time_tmp + } + send_data = b'' + send_data = protocol_send_total_data(come_trans) + print("send_data switch_volume{}".format(send_data)) + EventMesh.publish("CHANNEL_IOT_WEB_SEND", send_data) + + def recv(self, event, msg): + """ + @param event:switch_volume + @param msg: 接收到的下行数据 + """ + volume = int(msg["data"]["target"]) + 100 + print("音量修改为:{}".format(volume-100)) + EventMesh.publish("change_volume",volume) + class LK_ProtoCol(ProtoCol): """链路保持""" TYPE = "LK" diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_config.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_config.py index 68479bc2..d8d7d76c 100644 --- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_config.py +++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_config.py @@ -112,3 +112,76 @@ def get_bool(name, default=False): except Exception: return bool(default) + +def _gpio_name_attr(name, default_name, gpio_cls): + s = get_attr(name, default_name) + if s is None or s == "": + return None + try: + return getattr(gpio_cls, s) + except Exception: + if default_name: + try: + return getattr(gpio_cls, default_name) + except Exception: + pass + return None + + +def pin_gpio_attr(name, default_name, Pin=None): + if Pin is None: + try: + from machine import Pin as _Pin + Pin = _Pin + except Exception: + return None + return _gpio_name_attr(name, default_name, Pin) + + +def extint_gpio_attr(name, default_name, ExtInt=None): + if ExtInt is None: + try: + from machine import ExtInt as _ExtInt + ExtInt = _ExtInt + except Exception: + return None + return _gpio_name_attr(name, default_name, ExtInt) + + +def extint_pull_attr(name, default_name, ExtInt=None): + if ExtInt is None: + try: + from machine import ExtInt as _ExtInt + ExtInt = _ExtInt + except Exception: + return None + s = get_attr(name, default_name) + if s is None or s == "": + s = default_name + try: + return getattr(ExtInt, s) + except Exception: + try: + return getattr(ExtInt, default_name) + except Exception: + return None + + +def pin_pull_attr(name, default_name, Pin=None): + if Pin is None: + try: + from machine import Pin as _Pin + Pin = _Pin + except Exception: + return None + s = get_attr(name, default_name) + if s is None or s == "": + s = default_name + try: + return getattr(Pin, s) + except Exception: + try: + return getattr(Pin, default_name) + except Exception: + return None + diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/versions.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/versions.py index 5b301140..5b1185e2 100644 --- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/versions.py +++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/versions.py @@ -1,2 +1,2 @@ Version="V1.2" -Build_Time="2026-05-15 15:13:48" +Build_Time="2026-05-15 17:45:06" diff --git a/2.sdk/project/7PIN_1_5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/config/autoconf.h b/2.sdk/project/7PIN_1_5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/config/autoconf.h index bde76821..e4f54790 100644 --- a/2.sdk/project/7PIN_1_5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/config/autoconf.h +++ b/2.sdk/project/7PIN_1_5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/config/autoconf.h @@ -6,7 +6,7 @@ */ -#define PROJECT_NAME_G3_7PIN 1 //椤圭洰瀹忓畾涔? +#define PROJECT_NAME_G3_7PIN 1 //濠电姷鏁告慨鐑藉极閸涘﹥鍙忛柣鎴f閺嬩線鏌涘☉姗堟敾闁告瑥绻橀弻锝夊箣閿濆棭妫勯梺鍝勵儎缁舵岸寮诲☉妯锋婵鐗婇弫楣冩⒑閸涘﹦鎳冪紒缁橈耿瀵鏁愭径濠勵吅闂佹寧绻傚Λ顓炍涢崟顖涒拺闁告繂瀚烽崕搴g磼閼搁潧鍝虹€殿喛顕ч埥澶娢熼柨瀣垫綌婵犳鍠楅〃鍛存偋婵犲洤鏋佸Δ锝呭暞閳锋垿鏌涘☉姗堝姛闁瑰啿鍟扮槐鎺旂磼濮楀牐鈧法鈧鍠栭…鐑藉极閹邦厼绶炲┑鐘插閸氬懏绻濋悽闈浶㈤柣蹇斿哺瀹曟繈寮介銈囶槸濠德板€曢幊蹇涘煕閹达附鈷戞い鎰╁€曟禒婊堟煠濞茶鐏¢柡鍛埣椤㈡岸鍩€椤掑嫬钃熸繛鎴炵懅缁♀偓闂佺鏈粙鎴炵閹绢喗鈷戦梻鍫熺⊕椤ユ瑧绱掗埀顒佺瑹閳ь剟宕洪姀鈩冨劅闁靛鍎抽鎺楁⒑閸濆嫷妲归柛銊у枛瀹曟垿骞樼紒妯煎弳闁诲函绲婚崝瀣姳婵犳碍鈷戦柛锔诲幖閸斿鏌涢埡浣哄閸楅亶鏌涢敂璇插箻缁惧墽鏅埀顒€绠嶉崕鍗炍涢鐐╂灁婵犲﹤瀚崣蹇撯攽閻樻彃顏悽顖涚洴閺岀喎鐣¢悧鍫濇畻閻庤娲忛崝宥囨崲濠靛绀冮柕濞垮劚椤ユ帗绻濋悽闈浶ラ柡浣规倐瀹曟垵鈽夐姀鈥冲壋婵炴潙鍚嬪娆撳垂閸岀偞鐓㈡俊顖欒濡叉椽鏌¢崱顓烆洭闁瑰弶鎮傞幃褔宕煎┑鍫㈡噯闂備礁婀遍、濠囧春閺嶎厼桅闁告洦鍨扮粻濠氭偣閸濆嫭鎯堝鐟邦槸閳规垿鍩ラ崱妞剧凹缂備緡鍠栫粔鍫曞箲閵忕姭鏀介悗锝庡亜娴犳椽姊婚崒姘卞闁告巻鍋撻梺鎸庣箓濞层劌螞椤栫偞鐓涘璺哄绾爼寮崼銉︹拺閻犲洠鈧櫕鐏€闂侀€炲苯澧柡瀣偢瀵憡鎯旈妸锔惧幍闂佽鍨庨崪鍐濠德板€楁慨鏉懨洪鐑嗘綎婵炲樊浜滅粈鍫ユ煙缂佹ê绗傜紒銊ㄥ亹缁辨挻鎷呯粵瀣闂佺锕ゅ鈥崇暦閸濆嫧妲堥柕蹇曞Х閻嫰姊洪崜鎻掍簽闁哥姵鎹囧畷銏$鐎n偀鎷洪梺鍦焾濞撮绮婚幘缁樼厽婵°倐鍋撻柟铏悾鐑藉Ψ閳哄﹥鏅濋梺鎸庢⒒閺咁偊宕㈡禒瀣拺闂傚牊渚楀Ο鍫ユ煕閻樿櫕绀嬮柡灞芥喘椤㈡稑鈽夋潏顭戝晬闂備胶绮崝鏇烆嚕閸泙澶愬焺閸愶缚绨婚梺鎸庢磵閸嬫挻銇勯弴銊ュ箻婵″弶鍔欓獮鎺楀箻瀹曞洨鐛梺璇插嚱缂嶅棝宕戞担鍦浄闁靛繈鍊栭埛鎴︽煕濠靛棗顏╂い锔诲墴閺屽秷顧侀柛鎾寸懅婢规洟顢橀姀鐘宠緢闂佺硶鍓濈粙鎺楀磹閻㈠憡鐓ユ繝闈涙椤庢顭胯閸楁娊寮婚敐澶嬫櫇闁逞屽墴閹囧箻鐠囪尙鐣哄┑掳鍊曢崯顖炲窗閸℃稒鐓曢柡鍥ュ妼婢х増銇勯敂鍝勫姦婵﹨娅g槐鎺懳熼悡搴樺悅闂備線娼ч悧蹇涒€﹂崼銉﹀仼鐎瑰嫭鍣村ú顏嶆晜闁告洦鍘兼慨鍫曟⒒娴e憡鍟為柛鏂跨箻瀵彃鈽夐姀鈺傛櫅闂佽鍎虫晶搴e閽樺褰掓晲閸涱収妫岄梺绋垮閸旀牠濡甸崟顖氱闁绘劕鐏氶崳褔鏌ч懡銈呬槐妤犵偞鐗曡彁妞ゆ巻鍋撳┑鈥茬矙閺屽秹鏌ㄧ€n亝璇為梺鍝勬湰缁嬫挻绂掗敃鍌氱鐟滃酣宕抽纰辨富闁靛牆绻楅铏圭磼閻樿櫕宕岀€殿喛顕ч埥澶婎潨閸℃ê鍏婃俊鐐€栫敮鎺椝囬鐐茬闁哄顑欏〒濠氭煏閸繈顎楁鐐寸墵閺岋綀绠涢弮鍌滅暰闂佽绻戠敮妤冩崲濞戙垹绠婚柡澶嬪灥濮e牓姊洪幖鐐插濠电偛锕ら悾宄扳攽鐎n偄鈧鏌ら幁鎺戝姉闁归攱妞介弻锝夋偐閸忓懓鍩呴梺鍛婃煥閻倸顕i幖浣告閹煎瓨鎸婚弬鈧俊鐐€栧Λ浣规叏閵堝洣鐒婇柨鏇炲€归悡娆撴⒑閸噮鍎忛柣蹇旀尦閺岀喖顢欓崫鍕紙閻庤娲﹂崑濠冧繆閻ゎ垼妾ㄩ梺鍝ュ枎闁帮絽顫忕紒妯诲闁绘垶锚濞堝苯顪冮妶鍡樺闁告瑥鍟悾鐑藉即閵忕姷鐤€闂佺粯顨呴悧鍡涘焵椤掆偓濞硷繝寮婚悢鍏尖拻閻庣數顭堟俊浠嬫⒑缂佹ɑ灏伴柣鈺婂灦瀵鈽夐姀鐘电杸闂佸疇妗ㄧ粈渚€鈥栫€n偆绡€闁冲皝鍋撻柛鏇ㄥ墰椤︻厾绱撴担浠嬪摵閻㈩垽绻濆畷娲焵椤掍降浜滈柟鐑樺灥椤忊晝绱掗埀顒勫礃閳瑰じ绨婚棅顐㈡处閹稿宕宠ぐ鎺撶厸閻庯綆鍋勯悘瀛樹繆椤愩垺鍤囨い銏℃礋婵偓闁炽儲鍓氬Σ杈╃磽閸屾瑧顦︽い鎴濇閺侇噣鏁撻悩鍙夋К濠电偞鍨崹鍦不閹惰姤鐓欓柟顖嗗啰绉紓浣靛妼椤嘲顫忓ú顏勪紶闁告洦鍘滈悩缁樼厱闁哄倽娉曢悞鎼佹煙椤旀儳浠╅柕鍥ㄥ姍楠炴帡骞樼捄鍝勭闂傚倷绶氶埀顒傚仜閼活垱鏅堕婊呯<闁稿本绋戠粭褔鏌嶈閸撱劎绱為崱娑樼;闁糕剝绋戦崒銊ッ归悩宸剱闁抽攱鍨归幉鎼佹偋閸繄鐟ㄦ繛瀛樼矆閸楁娊寮诲☉銏犵閻庨潧鎲¢崳顕€姊哄Ч鍥у姶濞存粣缍佽棟鐟滅増甯楅悡娑㈡倶閻愬灚娅曢懖鏍磽娴d粙鍝洪悽顖涘笩閻忔帡姊洪悡搴綗闁稿鍊曞嵄妞ゆ帒瀚埛鎺楁煕鐏炲墽顣查柟鍏煎姈閵囧嫰鏁傞挊澶樻闂佺懓绠嶉崹褰掑煘閹达箑鐐婇柍鍝勫暟濡插洭姊绘担渚劸闁哄牜鍓熷畷娆戞喆閸曨偒鍤ら梺閫炲苯澧存慨濠勭帛閹峰懐鎲撮崟鈺€鎴烽梻浣告啞閿氶柕鍫熸倐楠炲棙寰勯幇顓炴異闂佸啿鎼崑鍡楊焽閻斿吋鈷戦柛锔诲幖閸斿銇勯妸銉х鐎殿噮鍋呯换婵嬪礋椤撶噦绱¢梻浣烘嚀閸㈠弶绺介弮鍫濊Е妞ゆ劧闄勯悡鏇熸叏濮楀棗澧婚柛搴㈠姉缁辨帞绱掑Ο鑲╃暭闂佸摜濮撮敃銉ヮ嚗閸曨偆鏆嗛柍褜鍓熼弫宥夋偄閸忓皷鎷虹紓浣割儓濞夋洜绮婚弻銉︾叆闁哄洦锚閻忊晜銇勯弴顏嗙М妞ゃ垺娲熼弫鍐焵椤掑倸顥氶柛蹇氬亹缁犻箖鏌熺€电浠ч柟鍐插暞閵囧嫰顢曢鍌滅槇濠殿喖锕ㄥ▍锝夊箟閹绢喖绀嬮梻鍫熺⊕濞呮盯姊绘担鍛婃喐濠殿喚鏁婚幊婵囥偅閸愩劎鍘洪梺鍝勫暙閻楀棝鏌ㄩ妶鍡曠箚闁靛牆瀚澶愭煙瀹勯偊鐓兼慨濠呮缁瑩骞愭惔銏″闂備浇宕甸崯娆撳炊娴e憡鍠橀柡浣稿暣瀹曟帒鈽夊顒€绠ョ紓鍌欒兌閸嬫挸顭垮Ο铏规殾妞ゆ帊鑳堕々鏌ユ煙濞堝灝鏋撻柛瀣尵閹叉挳宕熼鈧ˇ鈺呮⒑閹肩偛濡奸柣鏍с偢婵″瓨绗熼埀顒€顕i幘顔碱潊闁斥晛鍟悵鏍⒒娓氣偓閳ь剛鍋涢懟顖涙櫠閺夋鐔嗛悷娆忓缁€瀣偓瑙勬礈閸忔﹢銆佸鈧幃銏ゆ煥鐎n兘鍋撴ィ鍐┾拻濞达綀娅g敮娑欍亜閵娿儲鍤囬柟顔ㄥ洤骞㈡繛鍡樺灩閻e爼姊洪崷顓炲妺妞ゃ劌妫濋幃锟犲即閻旂寮垮┑顔筋殔濡鏅堕幍顔剧<濠㈣泛顑嗛妵婵嬫煛瀹€瀣?濞寸媴绠撻幃鍓т沪濠靛嫬鍔滈柕鍥у椤﹁京绱掗懜闈涘摵鐎殿喛顕ч埥澶愬閻樻鍟嬮梺璇插缁嬫帡鈥﹂崶褉鏋旈柕鍫濐槹閳锋垿鏌i悢绋款棆闁伙綆鍙冮弻娑㈠Ω閵壯呅ㄩ梺绯曟杺閸庢彃顕ラ崟顒傜瘈閹兼番鍨归崗濠囨⒒娴g懓顕滅紒璇插€块獮濠傤吋閸℃瑧褰鹃梺鍝勬川閸嬫劙寮ㄦ禒瀣厽闁归偊鍘界紞鎴︽煟韫囥儳鐣甸柡宀嬬秮閹倖鎷呴崫銉ゆ闂備浇顕栭崰姘跺磻閻愮數鐭夐柟鐑樻煛閸嬫捇鏁愭惔鈥茬敖闂佸憡顭堝Λ鍕€旈崘顔嘉ч柛鈩兠弳妤呮⒑閸濄儱孝婵炴挳顥撻崚鎺楊敇閳藉棙鞋缂傚倷娴囨ご鍝ユ暜濡も偓椤洩绠涘☉妯溾晠鏌曟径娑氱暢闁谎傜窔濮婄粯鎷呯粵瀣異闂佸摜濮电敮鈥愁嚕閹绘巻妲堥柕蹇娾偓鍏呮偅闂備胶绮崹鐓幬涢崟顖涘€峰┑鐘插閸犳劕顭块懜闈涘缂佺媭鍨伴湁闁绘挸娴烽幗鐘绘煟閹捐泛鏋涙鐐寸墪鑿愭い鎺嗗亾闁绘帗妞介弻娑㈡偄妞嬪海顔掗梺鍝勬湰閻╊垶骞冮埡浣烘殾闁搞儜鈧幏浼存⒒娴e搫浠洪柛搴ゅ吹缁骞樼拠鑼暫濠电姴锕ら悧濠勨偓鐢靛Т椤法鎹勬笟顖氬壋闂侀€炲苯澧婚柛鎾跺枎椤繑銈︾憗銈勬睏闂佸湱鍎ら崹鎶藉窗婵犲洦鈷戦柛娑橆煬閻掗箖鏌涚€n偄濮囬柍璇查叄婵偓闁靛牆妫楅埀顒傚厴閺岋綁骞嬮悘娲讳邯閸┾偓妞ゆ帒鍊归弳顒勬煛鐏炶濡奸柍瑙勫灴瀹曞崬鈻庤箛鎾寸槗缂傚倸鍊烽梽宥夊礉閹次诲骞橀懜娈挎綗闂佸湱鍎ら〃鍛劔闂備線娼ч…鍫ュ磿闁秴绠氶柣鎰暩绾捐棄霉閿濆嫮鐭欓柛婵囨そ閺岀喖鎮烽悧鍫熸倷闂佷紮绲块崗姗€鐛幒妤€绠i柡鍐e亾闁诲骸顭峰铏规喆閸曨剙鍓归梺鍛娒埀顒傚暱閸欏搫鈹戦悩娈挎殰缂佽鲸娲熷畷鎴﹀箣閿曗偓绾惧綊鏌″搴″箹闁搞劌鍊垮濠氬醇閻斿嘲骞忓┑鐐村灦鑿ら柡鈧禒瀣€甸柨婵嗗暙婵$兘鏌涚€n偅灏扮紒妤冨枛閸┾偓妞ゆ巻鍋撴い鏇秮瀹曟劙鎮ゆ担鍓愩儵姊绘担鍛婃儓妞ゆ垵鎳庨湁闁绘垼妫勯悞鍨亜閹烘垵鈧綊寮抽鍕厱閻庯綆浜烽煬顒傗偓瑙勬礃閸ㄥ灝鐣烽妸褉鍋撳☉娅亪宕滈纰辨富闁靛牆妫涙晶顒佹叏濡濮傜€殿喗濞婇弫鍐磼濞戞艾骞堟繝寰锋澘鈧洟宕锝囶洸鐟滅増甯楅悡娑㈡倵閿濆簼閭柛娆忓閺屸€崇暆閳ь剟宕伴幘璇茬劦妞ゆ帒鍊归弳鈺傘亜椤撶偟澧︽い銏℃崌楠炴﹢宕滄担鐚寸床闂備礁鎲¢〃鍫ュ磻濞戙垹姹查梺顒€绉甸悡鍐偡濞嗗繐顏╅柣蹇旀尦閺岀喖顢欓悾灞惧櫚闂佺娅曠划鎾澄涢崘銊㈡婵炲棙鎸婚弳妯肩磽閸屾艾鈧悂宕愬畡鎳婂綊宕惰閸ゆ洟鏌熼幑鎰【闁搞劍绻冪换娑㈠幢濡鏆楅悗瑙勬尫缁舵岸寮婚垾鎰佸悑閹肩补鈧啿顒滈梻浣芥〃缁€渚€宕幘顔艰摕闁哄浄绱曢悿鈧柣搴秵娴滅偞绂掓ィ鍐┾拺濞村吋鐟╁顕€鏌熼悷鐗堟悙妞ゎ偄绻戠换婵嗩潩椤掑偊绱叉繝娈垮枟閿曗晠宕楀鈧畷鎴﹀箻閹碱厽效闁硅壈鎻徊鍧楁倿閸忚偐绠鹃柟鐐綑閻掑綊鏌涚€n偅灏版い銊e劦閹瑥顔忛瑙f瀰闂備浇妗ㄩ悞锕傚箲閸ヮ剙绠栭柍鍝勬媼閺佸﹪鏌i悢纰辨殥濠㈣娲熷娲川婵犲倸袝闂佸摜濮甸悧鐘绘偘椤曗偓婵偓闁炽儴灏欑粻姘渻閵堝棛澧紒璇插€圭粋宥囨喆閸曗晙绨婚梺鍝勫暊閸嬫挻绻涢崣澶樼劷闁瑰箍鍨归埞鎴犫偓锝庡亜娴犳椽姊婚崒姘卞闁告巻鍋撻梺闈涚箞閸婃牠鎮¢弴銏″€甸柨婵嗙凹缁ㄥ吋銇勯妷锝呯伄闁逞屽墲椤煤濠婂牆鏋侀悹鍥ф▕閸ゆ洟鏌熺紒銏犳灍闁稿﹦鍏橀弻宥夊传閸曨偀鍋撹ぐ鎺戠骇闁归棿鐒﹂埛鎺懨归敐鍫燁仩閻㈩垱鐩弻銊ヮ潩鏉堚晜锛忕紓鍌欓檷閸ㄧ懓顕i鈧弻鏇㈠幢濡も偓閳ь剙鐏濋锝嗙節濮橆儵銊╂煥閺冣偓閸庢娊鐛幇鐗堚拻濞达絽鎲¢崯鐐层€掑顓ф疁鐎规洑鍗冲浠嬵敃閵忋垻鐡樼紓鍌氬€烽悞锕佸綘婵炲瓨绮嶇划宥夊Φ閸曨垰绠绘い鏍ㄨ壘閳峰绱掔紒銏犲箹闁绘牕銈稿濠氭偄閸忕厧浠梺鍝勵槹椤戞瑦绂掗崜褏纾藉ù锝堫嚃濞堟﹢鏌涢悩宕囧⒌闁靛棔绀侀埥澶婎潨閸℃ê鍏婃俊鐐€栧濠氬磻閹炬番浜滈柕澶堝劦椤庢鏌嶇憴鍕伌闁诡喒鏅犲畷褰掝敃閿濆棛妲戦梻鍌欒兌椤牓顢栭崱娑欏剮妞ゆ牜鍋熷畵浣糕攽閻樺弶鍣介柣銈傚亾闂備礁鎼ú銊╁磻濞戙垺鍊跺┑鐘叉处閳锋垿鏌涢敂璇插箹濞存粓绠栭弻娑㈠箻绾惧顥濆銈庡幖濞差厼顕f禒瀣╃憸蹇涱敊閺囥垺鍊甸柣鐔告緲椤ュ繘鏌涢悩铏闁兼椽浜堕幊锟犲Χ閸モ晪绱查梻浣虹帛椤牏浜稿▎鎴犵煋婵炲樊浜濋悡娑氣偓鍏夊亾閻庯綆鍓涜ⅵ婵°倗濮烽崑娑樏洪顫偓浣割潨閳ь剟骞冨▎鎾村仺闁绘劗鎳撴禒顓炩攽閻樺灚鏆╁┑顔惧厴閵嗗倿鎳為妷锕€寮块悗骞垮劚椤︻垶鎮欐繝鍥ㄧ厪濠电偛鐏濋悘顏堟倵濮樺啿浜圭紒杈ㄦ崌瀹曟帒鈻庨幋顓熜滄俊鐐€栭崹闈浳涘☉銏犵劦妞ゆ帒鍊婚幊妤呮煕閹邦垰鍔甸柍褜鍓欓悘婵嬫箒闂佺粯鎸稿ù鐑藉箺閻樼粯鐓熼柟鎯х摠缁€瀣煛瀹€鈧崰鎾诲焵椤掑倹鏆╂い顓炵墛閻楀酣姊绘担瑙勫仩闁稿﹥鍔欏畷鎴﹀箻缂佹ǚ鎷洪梺纭咁潐閸旀洟宕ヨぐ鎺撶厱閻庯綆鍓欐禒褔鏌熼獮鍨仼闁宠鍨垮畷鍫曞煛閸愵亝顫岄梻鍌欒兌椤牓寮甸鍌滅煓闁瑰瓨绺鹃弸宥囨喐韫囨洘顫? // #define CONFIG_LVGL_SPAN 1 @@ -46,5 +46,6 @@ //#define CONFIG_JPEG 1 #define CONFIG_CAMERA_SAVEPHOTOS 1 #define CONFIG_VAD 1 -//鑿婇瑙嗛閫氳瘽 +#define CONFIG_QP_LOG 1 +//闂傚倸鍊搁崐鎼佸磹閹间礁纾归柟闂寸绾惧綊鏌熼梻瀵割槮缁炬儳缍婇弻鐔兼⒒鐎靛壊妲紒鐐劤缂嶅﹪寮婚悢鍏尖拻閻庨潧澹婂Σ顔剧磼閻愵剙鍔ょ紓宥咃躬瀵鎮㈤崗灏栨嫽闁诲酣娼ф竟濠偽i鍓х<闁绘劦鍓欓崝銈囩磽瀹ュ拑韬€殿喖顭烽幃銏ゅ礂鐏忔牗瀚介梺璇查叄濞佳勭珶婵犲伣锝夘敊閸撗咃紲闂佺粯鍔﹂崜娆撳礉閵堝洨纾界€广儱鎷戦煬顒傗偓娈垮枛椤兘骞冮姀銈呯閻忓繑鐗楃€氫粙姊虹拠鏌ュ弰婵炰匠鍕彾濠电姴浼i敐澶樻晩闁告挆鍜冪床闂備胶绮崝锕傚礈濞嗘挸绀夐柕鍫濇川绾剧晫鈧箍鍎遍幏鎴︾叕椤掑倵鍋撳▓鍨灈妞ゎ厾鍏樺顐﹀箛椤撶偟绐炴繝鐢靛Т鐎氱兘宕ラ崨瀛樷拻濞达絿鎳撻婊呯磼鐠囨彃鈧潡鐛径濞炬闁靛繒濮烽鎺旂磽閸屾瑧鍔嶆い顓炴喘瀹曘垽鏌嗗鍡忔嫼闂傚倸鐗婄粙鎾存櫠閺囥垺鐓欓柛鎰叀閸欏嫭銇勯姀鈩冾棃妞ゃ垺锕㈡慨鈧柨娑樺楠炴劙姊虹拠鑼闁稿绋掗弲鍫曟寠婢规繆娅i埀顒佺⊕鑿уù婊勭矒閺屾洝绠涙繝鍌氣拤缂備讲鍋撻悗锝庡枟閻撴稑霉閿濆洦鍤€濠殿喖绉堕埀顒冾潐濞叉牕鐣烽鍕厺閹肩补鍨鹃悢鐓庣畳鐎广儱妫楅崫鐑樻叏婵犲偆鐓肩€规洘甯掗埢搴ㄥ箳閹存繂鑵愬┑锛勫亼閸娿倝宕㈡總鍛婂亱闊洦绋戠粻鏍ㄣ亜閺囨浜惧銈冨灪濞茬喖寮崘顔肩劦妞ゆ帒鍊婚惌鍡楊熆閼搁潧濮囩紒鐘侯潐缁绘盯鏁愭惔鈥愁潻婵犲痉銈呬汗缂佽鲸甯¢幃鈺呮濞戞瑧浜梻浣告惈閻ジ宕伴弽褜娼栭柤濮愬€愰崑鎾绘濞戞﹩妫屽┑鈥虫▕閸犳氨妲愰幘瀵哥懝闁搞儜鍌滅泿缂傚倷绀侀ˇ顖滅礊婵犲偆鍤曢悹鍥ㄧゴ濡插牓鏌曡箛濠冩珕闁哄懏绻堝娲箰鎼达絿鐣靛┑鐐茬湴閸旀垿骞冮悙顒傞檮闁告稑艌閹风儤绻涢弶鎴濇倯闁荤啙鍥х濞寸厧鐡ㄩ悡娆戠棯閺夊灝鑸瑰ù婊€鍗抽弻娑㈠煛閸愩劋妲愬Δ鐘靛仜椤戝寮崘顔肩劦妞ゆ帒瀚崑鍌炴煥閻斿搫校闁绘挻娲熼弻宥夊煛娴e憡鐏撳┑鐐茬墛閿氶棁澶愭煟濡寧鐝悘蹇ラ檮閹便劍绻濋崘鈹夸虎濠碘槅鍋勯崯顐﹀煡婢跺ň鏋庢俊顖涙た濡捇姊婚崒娆掑厡妞ゎ厼鐗撻、鏍幢濞戞顔夐梺鎼炲劀鐏炲墽绋侀梻浣瑰劤缁绘锝炴径鎰;婵せ鍋撻柡灞界Ч婵$兘濡烽妷銉ь儓濠电姰鍨奸~澶娒洪弽顓炵厴闁硅揪闄勯崐椋庘偓鐟板閸犳牕鈻撻懜鐢电瘈婵炲牆鐏濋弸鐔兼煙閸涘﹤鈻曢柕鍡曠窔瀵粙顢橀悙鑼垛偓鍨攽閻愭潙鐏︽い顓炴喘閺佸秴鈻庨幘绮规嫼濠殿喚鎳撳ú銈夋倶閳哄懏鐓欓悹鍥囧懐鐦堥梺璇″櫙缁绘繃淇婇悜鑺ユ櫆闁告挆鍛潓闂傚倸鍊搁崐鎼佹偋婵犲嫮鐭欓柟鐑橆檪婢舵劕顫呴幒铏濠婂牆绠规繛锝庡墮閻掔儤绻涢崼鐔割棃婵☆偂鐒﹀鍕偓锝庡墰閻﹀牊绻濋悽闈浶㈤柛濠冩倐椤㈡棃顢曢妶鍥╋紲闂佺粯锚绾绢厽鏅舵潏鈺冪<閺夊牄鍔岀粭褏绱掓潏銊ョ瑨閾伙綁鏌涜箛鏇炲付闁搞劑浜堕弻锝嗘償閵堝孩缍堝┑鐐村絻缁绘ê鐣峰┑瀣闁挎棁銆€閸嬫挻鎷呴崜鍙夊缓闂侀€炲苯澧存鐐插暣婵偓闁靛牆鎳庣粣娑欑節閻㈤潧孝闁稿﹦鏁诲畷鎴﹀箻缂佹鍙嗛柣搴岛閺呮繄绮诲鑸碘拺缂備焦锚婵箑霉濠婂嫮鐭掗柛鈹惧亾濡炪倖鍨堕崕鎶藉焵椤掍胶澧辩紒顔碱儏椤撳ジ宕担鍝勫汲闂備礁澹婇崑鍛崲閸曨垰钃熼柛顐犲劜閻撶喖骞栧ǎ顒€鐏柍顖涙礋閹洦寰勫畝鈧壕濂告偣閸パ冪骇妞ゃ儯鍨介弻锛勪沪閸撗勫垱濡炪們鍨哄ú鐔煎极閹版澘骞㈡繛鍡樕戣ⅲ闂備浇顕уù鐑藉箠閹捐绠熼柨娑樺瀹曟煡鏌涢幇闈涙灈濡楀懘姊洪崨濠冨闁搞劋鍗冲畷姗€鍩€椤掑嫭鈷戦梻鍫熶腹濞戙垹宸濇い鏍ㄨ壘缁犲姊婚崒姘偓椋庣矆娓氣偓楠炴顭ㄩ崼婵堬紱濠电偞鍨崹娲磻婢舵劖鐓熼柟鎯у暱閻︺劍绻涢崗鑲╁⒈缂佽鲸鎸婚幏鍛存嚃閳╁啫鐏﹂柛鎺戯躬楠炴﹢顢欓悾灞藉及闂傚鍋勫ú锕€煤濮椻偓瀹曠敻鍩€椤掑倻纾藉ù锝堫嚃濞堬絿绱掔紒妯肩畵妞ゎ偄绻愮叅妞ゅ繐瀚畵宥咁渻閵堝棙瀵欓柛娑卞幖姝囧┑鐘垫暩婵參骞忛崘顔肩<婵犲﹤鎳愰崢顖炴煟鎼淬値娼愭繛鍙壝悾婵嬪箹娴e搫绁﹂梺鍦劋閸わ箓寮埀顒傛崲濠靛绀冮柍鍝勫€昏ぐ銊︾節閻㈤潧校妞ゆ梹鐗犲畷鏉课旈崨顏佸亾閿曞倸鐐婃い鎺嗗亾闁稿被鍔庨幉绋款吋婢跺﹦鍘洪梺鍦亾濡炲潡寮崘顔界叆闁哄啫娉﹂幒妤€绠繛宸簼閳锋垿鏌涘☉姗堝姛闁宠棄顦甸弻銊╁即濡搫濮曢悗鍨緲鐎氭澘鐣烽悢纰辨晬婵炴垶鑹鹃獮鍫ユ⒒娓氣偓濞佳団€﹂鐘典笉闁规璇差槺閳ь剨缍嗛崜娑氬閸忕浜滈柡鍐e亾妞ゆ垶鐟╁畷闈涒枎閹惧鍘撻梺鑺ッˇ钘壩i幖浣圭厓閻犲洦鐓¢妤併亜閹剧偨鍋㈢€规洜鍠栭、姗€鎮╅搹顐g彜闂傚倸鍊搁崐鎼佸磹妞嬪海鐭嗗ù锝夋交閼板潡姊洪鈧粔瀵稿閸ф鐓忛柛顐g箥濡叉悂鏌涢妸銉モ偓鍧楀蓟濞戔懇鈧箓骞嬪┑鍛晼婵$偑鍊愰弲婊堟偂閿熺姴钃熼柨婵嗩槸缁犳稒銇勯弮鍌氬付濠碘剝妞藉铏圭磼濡闉嶅┑鐐跺皺閸犳牕顕f繝姘櫜濠㈣泛锕ラˉ婵嗏攽閻愬弶顥犻柛瀣崌閹潡宕堕浣叉嫼缂備礁顑呴悘婵嬵敆閵忊剝鍙忓┑鐘插€荤粔鐑橆殽閻愯尙澧﹀┑鈩冩倐閺佸倿宕滆濡插洭姊绘担鍛婂暈婵炶绠撳畷銏ゆ嚃閳哄啰鐣堕梺璺ㄥ枔婵敻鍩涢幋锔界厽闁绘柨鎲$欢鍙変繆閹绘帩鐓奸柡宀€鍠栭幖褰掝敃閵忕媭娼曢梻浣告啞鐢鏁幒妤€鐓濋幖娣妼缁犺崵鈧娲栧ù鍌炲船閸洘鈷戠痪顓炴噹娴滃綊鎮跺☉鏍у姎妞ゎ剙锕ㄩˇ鍦偓瑙勬礃閸ㄥ潡鐛Ο濂借櫣绱掑Ο缁樼彨闂傚倷鑳剁划顖炲礉濡ゅ啯鍋橀柕澶嗘櫅缁狀垱绻涘顔荤凹闁绘挾鍠栭弻锝呂熼崫鍕獓缂備讲鍋撶€光偓閸曨剛鍘撻悷婊勭矒瀹曟粌鈹戦崱蹇旂€洪梺鍝勬储閸ㄦ椽宕愰崼鏇熺厱妞ゆ劗濮撮崝婊堟煃闁垮鐏╃紒杈ㄥ笧閳ь剨缍嗘禍婊堟儍閿熺姵鐓涢柍褜鍓氱换婵嗩潩椤撶姴骞嶆俊鐐€栧濠氬储瑜旈崺鈧い鎺嗗亾婵炲皷鈧磭鏆﹂悷娆忓閸嬪懘鏌涢幇銊︽珕婵炲懎娲铏圭矙閹稿孩鎷卞┑顔角滈崝鎴濈暦閹扮増鍊风€瑰壊鍠楃€靛矂姊洪棃娑氬闁硅櫕鍔楃划濠氬箥椤斿墽锛滄繝銏f硾閺堫剟寮抽鍕厱闁崇懓鐏濋悘鈺呮煟閿濆棛绠炵€规洜鍠栭、妤呭磼濮橆剛顔戦梻鍌欒兌閹虫捇宕ョ€n喗鍋╂い蹇撶墕閺勩儵鏌涢弴銊ョ仩闁汇値鍣i悡顐﹀炊閵娧€濮囬梺缁樻尰濞茬喖寮婚敐鍛傜喓鎷犻幓鎺濇浇婵犵數鍋涢悧濠勫垝瀹ュ鈧啴濡烽埡鍌氣偓鐑芥煙缂佹ê绗氭繛鍫濐煼閹鎲撮崟顒傤槰闁汇埄鍨辩敮锟犳晲閻愭祴鏀介柛銉e妿缁夊爼姊洪棃娑辩叚閻庨潧鐭傚畷顖涙償閵婏腹鎷婚梺绋挎湰閻熝囁囬敂鐣岀瘈闁逞屽墴閺屽棗顓奸崨顖ょ吹闂備線娼ч悧鍡浰囬銏犵劦妞ゆ巻鍋撻柛鐔告綑閻g兘宕¢悙鈺傤潔濠碘槅鍨抽妴瀣椤斿皷鏀介柨娑樺娴犳粍銇勯幋婵囧櫣闂囧顪冪€n亪顎楁い銉﹀哺閺屾稖绠涢弴銊ュ妴婵炲瓨绮嶇划鎾诲蓟閿熺姴绀冮柨婵嗘噸婢规洘淇婇悙顏勨偓鏍垂閸洘鍋¢柕澶嗘杹閳ь剨绠撳畷鍫曨敆閳ь剛绮诲☉銏$厽婵°倐鍋撻柣妤€妫濋崺鈧い鎺嗗亾闁诲繑宀搁獮鍫ュΩ閵夊海鍠栧畷顐﹀礋椤掍胶妲繝鐢靛仜閻°劎鍒掔仦鏂よ€块弶鍫氭櫆椤洟鏌熼悜妯诲鞍缂傚秴娲弻鏇熺節韫囨洜鏆犵紒鍓у亾婵炲﹪骞冨Δ鍐╁枂闁告洦鍓涢ˇ銊╂煟閵忊晛鐏¢悽顖ょ節瀹曟椽濮€閳╁啫鍔呴梺闈涱焾閸庢娊顢樺ú顏呪拺闁圭娴风粻鎾寸箾鐏炲倸濡奸柣锝囧厴瀹曞ジ寮撮悢鍙夊闂備胶顭堥張顒勬偡瑜斿畷婵嗩吋婢跺鍘靛銈嗘閸嬫劙宕洪敐鍥e亾鐟欏嫭绀冪紒璇插缁傛帡鏁冮崒娑樹患闁诲繒鍋熼崑鎾活敊閺囩喍绻嗛柣鎰典簻閳ь剚鐗滈弫顕€骞掑Δ鈧壕鍦磼鐎n偒鍎ラ柛銈嗘礋閺岋紕浠︾拠鎻掑闂佹娊鏀辩敮鎺楁箒闂佹寧绻傞幊蹇涘疮閻愮儤鐓欐い鏍ㄦ皑婢с垻绱掓潏銊ョ瑲鐎垫澘瀚埀顒婄秵閸撴瑥顕i妸鈺傚€甸悷娆忓缁€鍐磼鐠囨彃鈧潡銆佸Ο鑽ら檮缂佸鐏濈粣娑橆渻閵堝懐绠伴柟铏姍閸┾偓妞ゆ帊鐒﹂妵婵囨叏婵犲懏顏犵紒杈ㄥ笒椤粓宕卞▎蹇撔ㄧ紓鍌氬€风欢锟犲闯椤曗偓瀹曞綊宕奸弴鐐电暫闂佺偨鍎查弸濂稿几鎼淬劍鐓欓悗鐢殿焾鍟搁梺鎸庣⊕缁诲啰鎹㈠☉娆愮秶闁告挆鍐ㄧ厒婵$偑鍊ら崑鍛存偋閻樻眹鈧線寮崼婵嗚€垮┑鐐叉缁绘劗鎲撮敃鈧埞鎴炲箠闁稿ě鍛筏濞寸姴顑呴悿顔姐亜閺嶎偄浠﹂柛瀣€块弻娑㈠箛閸忓摜鍑归梺鍝ュУ閸旀牜鎹㈠┑鍥╃瘈闁稿本绮岄。铏圭磽娴f彃浜鹃梺鍓插亞閸犳劙宕h箛鏂剧箚妞ゆ牗纰嶉崑銉╂煕濠靛洦銇濋柡宀嬬節瀹曞崬螣閼测晝鍘滈梻浣告惈閻ジ宕伴弽顓炵畺婵犲﹤鍠氬銊╂煕閳╁喛渚涢柛姘噽缁辨捇宕掑顑藉亾閸濄儳鐭撻柣銏犳啞閸嬪淇婇妶鍛殲鐎规洖寮剁换婵嬫濞戝崬鍓卞銈冨劚閻楀﹦鎹㈠☉銏犵婵犻潧妫滈崺鐐烘⒑閸涘﹥宕岀紒鐘崇墪椤繘鎮滃Ο璇差潯闂佽顔栭崳顔嘉i灏栨斀闁绘劘灏欏﹢鎾煕閺冣偓閸ㄥ潡鎮伴钘夌窞闁归偊鍓欑粣娑欑節閻㈤潧孝闁哥噥鍋婂畷婵嬪川鐎涙ǚ鎷洪梻鍌氱墛娓氭鎮¢鐘电<闁绘ê鍟块悘锔剧磼閸屾稑娴柟顔界懇椤㈡宕掑搴℃櫗闂傚倷绀佸﹢閬嶅磻閹炬剚鐒芥繛鍡樻尰閸婅法鎲搁悧鍫濈瑲闁绘挻娲熼幃妤呮晲鎼粹€茬凹閻庤娲栭惌鍌炲蓟閳ュ磭鏆嗛柍褜鍓熷畷浼村冀椤撴壕鍋撴担绯曟瀻闁瑰濞€閳瑰繘鏌f惔顖滅У闁稿妫濆鎶藉Ψ閳哄倵鎷绘繛杈剧到閹芥粓鏁嶅鍥╃<妞ゆ洖鎳庨悘锔筋殽閻愭潙鐏寸€规洘鍎奸ˇ鎾煛閸☆厼顩柟鍙夋倐閹囧醇濠靛懎鍨旈梻浣芥〃缁€渚€鏁冮鍫濊摕闁挎繂顦伴弲鏌ユ煕濞戝崬寮炬繛鍫弮濮婅櫣娑甸崨顓犳闂佺顑嗛幐楣冨箲閵忕姭鏀介悗锝庡亜娴犳椽姊婚崒姘卞闁告巻鍋撻梺闈涱槴閺呮粓鎮″☉妯忓綊鏁愰崼顐g秷闂佺锕ラ崝妤呭焵椤掑喚娼愭繛鍙夛耿瀹曞綊鎮界粙璺ㄥ弨婵犮垼鍩栭崝鏇綖閸涘瓨鐓冮柍杞扮閺嗙偤鏌e┑鍥╁⒌婵﹦绮粭鐔煎焵椤掆偓椤洩顦圭弧鎾绘煃瑜滈崜娆撳煘閹达箑鐏抽柧蹇e亜閺嬬娀姊虹化鏇熸珖闁稿鐩、妯荤附缁嬪灝绐涘銈呯箰閹冲繘寮堕幖浣光拻濞达綀娅g敮娑㈡煥濮樻墎鍋撳▓鍨灕闁糕晜鐗曢銉╁礋椤栨氨顦板銈嗙墬缁嬫捇宕㈡潏銊х瘈闁汇垽娼у瓭闂佺顑呭Λ婵嬪箖閳╁啰闄勯柛娑橈功閸樻悂鎮楅崗澶婁壕闁诲函缍嗛崜娑㈠汲閻樼粯鐓eù鍏肩懅閸掍即鏌曢崱妯虹瑨妞ゎ偅绻堥幃鈩冩償閿濆嫮鏁炬繝寰锋澘鈧牕螞閸愵煈娼栫紓浣股戞刊鎾煕濞戞﹫宸ラ柡鍡楃墦閺岋箓宕橀缁樺枤闂佸搫鐬奸崰鏍€佸▎鎾村亗閹煎瓨锚娴滈箖鏌熼梻瀵哥瓘缂傚秵鐗犻悡顐﹀炊閵娧€濮囬梺璇″灣閸嬨倝寮诲☉銏℃櫆閻犲洦褰冪粻濠氭⒑缂佹ɑ灏伴柟鐟版搐椤繐煤椤忓嫭宓嶅銈嗘寙閸涱厼歇闂備浇顕х€涒晝绮欓崼銉ョ柧闁绘宕靛畵渚€鐓崶銊р槈缁绢厸鍋撻梻浣虹帛閸ㄩ潧螞濞嗘垟鍋撻棃娑氱劯婵﹥妞藉Λ鍐ㄢ槈濮橆剦鏆梻浣告憸閸c儵宕戦崨顔锯攳濠电姴娲ょ粈鍌炴⒒閸屾凹鍤熺紒鐘宠壘椤啴濡堕崱妤€衼缂備焦褰冮悘婵堝弲闂佸湱铏庨崰妤呮偂閺囥垺鐓冮悷娆忓閸斻倕霉濠婂懎浜惧ǎ鍥э躬閹瑩顢旈崟銊ヤ壕闁哄稁鍋呴弳婊冣攽閻樿弓绱栫憸鐗堝笒閻愬﹪鏌曟繛褍鎳庢鍕節濞堝灝鏋熼柕鍥ㄧ洴瀹曟垿骞樼紒妯煎幐闁诲繒鍋涙晶浠嬪煡婢跺浜滄い鎰剁悼缁犵偞銇勯姀鈽嗘畷鐎垫澘瀚换婵嬪磼濮樺吋顥忕紓鍌氬€搁崐鎼佸磹妞嬪海鐭嗗〒姘e亾闁诡垰鏈幏鍛寸嵁婢跺摜鐭掗梻浣告啞缁哄潡宕曢幓鎺旀殾闁告瑥顦辩弧鈧梻鍌氱墛娓氭宕曡箛娑欑厽闁归偊鍓ㄩ煬顒勬煛鐏炵偓绀冪紒缁樼洴瀹曞綊顢欓悡搴綍闂傚倷鑳堕…鍫ヮ敄閸℃稑绠查柛銉墮閽冪喖鏌曟繛褉鍋撻柛瀣崌閺佹劙宕橀妸銉€辩紓鍌欓檷閸斿矂鈥﹀畡鎷旀盯宕ㄩ幖顓熸櫇闂侀潧绻嗛埀顒佸墯濡查亶姊绘担鐑樺殌闁硅绻濋獮鍐磼閻愵亖鍋撴笟鈧顕€宕煎顎板喚鐔嗛悹杞拌閸庢垿鏌涘鈧禍鍫曞蓟閿濆棙鍎熸い鏍ㄧ矌鏍¢梻浣侯焾椤戝懘骞婃惔銊﹀仼鐎瑰嫭澹嗛弳鍡涙煃瑜滈崜鐔煎春閳ь剚銇勯幒宥囪窗闁哥喎绻橀弻娑㈡偐閾忣偆顦梺鍛婂笚鐢帡鍩㈡惔銊ョ闁瑰吀绀佹禍鎯归敐鍛棌婵炵鍔戦弻宥堫檨闁告挾鍠栭悰顕€宕橀妸銏$€婚棅顐㈡搐閿曘儵鎮樻笟鈧娲捶椤撗呭姼閻庡湱纭堕弲鐘充繆閻戣棄鐓涢柛灞绢殕鐎氬ジ姊绘担鍝勫付妞ゎ偅娲熷畷鎰板即閵忕姴鍤戦梺鐟邦嚟婵澹曢崗绗轰簻闁哄啫娲ゆ禍褰掓煟韫囨稐鎲鹃柡宀€鍠栭悰顕€宕归鍙ョ礄婵°倗濮烽崑娑樏洪銏犺摕闁搞儺鍓氶弲婊堟煠閹帒鍔滈柣婵勫姂濮婂宕掑▎鎴犵崲濠电偘鍖犻崵韬插姂閸┾偓妞ゆ巻鍋撻柍瑙勫灴閸ㄩ箖鎼归銏㈢崺闁诲孩顔栭崯顐﹀炊瑜忛崝锕€顪冮妶鍡楃瑨閻庢凹鍙冮崺娑㈠箣閿旂晫鍘甸梺鍏肩ゴ閺呮稒绂掑鍫熺厱闁哄倸鎼禍楣冩⒒閸屾瑧顦﹂柟璇х磿閸掓帡宕奸妷锕€鈧潡鏌ㄩ弴姘愁唹闁告瑩绠栧濠氬磼濮橆兘鍋撻幖浣哥9闁归棿绀佺壕鐟邦渻鐎n亝鎹i柣顓炴閵嗘帒顫濋敐鍛闁诲氦顫夊ú蹇涘磿閹惰棄鐒垫い鎺戯功缁夌敻鏌涢幘瀵告创闁诡垰鐭傚畷濂稿Ψ閿旀儳骞嶇紓鍌氬€烽梽宥夊垂瑜版帒鍑犳繛鎴欏灪閻撶喖鏌曢崼婵愭Ш闁伙絾妞介弻锛勪沪閻e睗锝嗙箾绾板彉閭柟顔ㄥ洤閱囨慨姗嗗厸婢规洟姊洪棃娑辨Ф闁稿骸绉寸叅妞ゅ繐绉甸弲婊堟⒑閸涘﹥澶勯柛娆忛叄瀹曨垶宕惰閺€浠嬫煟閹邦垰鐓愮憸鎶婂懐纾奸棅顐幘閻瑧鈧娲忛崹褰掆€﹂妸鈺侀唶婵犻潧鐗滈崬鍨節閻㈤潧浠滄俊顖氾攻缁傚秴鈹戠€n亞鍘遍梺鍦劋椤ㄥ棝鎮¢弴銏″€堕柣鎰版涧娴滈箖鏌i妸锕€鐏ユい顓″劵椤﹀磭绱掔€n偅灏垫俊鍙夊姍楠炴帡寮崫鍕闂佹寧绻傛鍛婄濠靛鍊堕煫鍥ㄦ礃閺嗏晝绱掓潏銊ユ诞妞ゃ垺鐟ч崰濠冩綇閳轰焦鍊梻鍌欐祰椤曟牠宕板Δ鍛仭闁冲搫鎳庣粻鏍ㄧ節婵犲倸鎮╅柣鏂垮悑閸嬪倿骞栨潏鍓х?闁汇倕瀚埞鎴︽偐閸偅姣勬繝娈垮枤閸忔ê顕i锕€宸濆┑鐘插暙瀵潡姊洪崷顓℃闁哥姵鐗犻幃鍧楊敋閳ь剟寮婚敐鍛傛棃鍩€椤掑嫭鍋嬪┑鐘插€甸弸宥夋煟濡偐甯涢柣鎾跺枛閺屾洝绠涢弴鐐愶綁鏌涢悢鍝勪槐闁? //#define CONFIG_juphoon 1 diff --git a/2.sdk/project/7PIN_1_5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/config/config.mk b/2.sdk/project/7PIN_1_5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/config/config.mk index fa64f50d..c24cd2eb 100644 --- a/2.sdk/project/7PIN_1_5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/config/config.mk +++ b/2.sdk/project/7PIN_1_5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/config/config.mk @@ -63,5 +63,5 @@ CONFIG_VIOCE_CALL=y #CONFIG_HX3918=y #CONFIG_SC7A20=y CONFIG_VAD=y -# CONFIG_QP_LOG is not set +CONFIG_QP_LOG=y #CONFIG_juphoon=y diff --git a/2.sdk/project/7PIN_1_5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip b/2.sdk/project/7PIN_1_5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip index 54bf2e18..34d643b3 100644 Binary files a/2.sdk/project/7PIN_1_5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip and b/2.sdk/project/7PIN_1_5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip differ