From: snickersun Date: Wed, 10 Jun 2026 10:34:50 +0000 (+0800) Subject: 修复蓝灯常亮问题 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=fee1e679f5b60152c2cb10e7b1e79ba87ddf694c;p=mirrors%2FASR1603_G5.git 修复蓝灯常亮问题 --- diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_led.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_led.py index 89bc9e0f..42e6c00e 100644 --- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_led.py +++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_led.py @@ -42,6 +42,7 @@ class AI_led(Abstract): self._gb_on_ms = 1000 self._gb_off_ms = 1000 self._prefer_off = 0 + self._alert_started_ms = 0 EventMesh.subscribe("set_led_state", self.set_led_state) EventMesh.subscribe("get_led_debug_state", self.get_led_debug_state) @@ -187,10 +188,26 @@ class AI_led(Abstract): self._alert_period_ms = period_ms self._alert_steps_left = cycles * 2 self._alert_rb_phase = 0 + self._alert_started_ms = utime.ticks_ms() self._timer_stop() self._set_rgb(1, 0, 0) self._timer.start(self._alert_period_ms, 0, self._timer_cb) + def _exit_alert_mode(self): + """退出红蓝/红闪告警,恢复按业务表点灯。""" + if self._mode not in ("alert_rb", "red_flash_n"): + return False + self._st_alert = None + self._alert_steps_left = 0 + self._alert_started_ms = 0 + try: + self._red_flash_steps_left = 0 + except Exception: + pass + self._timer_stop() + self._mode = "off" + return True + def _set_red_flash_limited(self, flashes=3, period_ms=500): """REQ-BAT-03:红快闪若干次后熄灭(约 2 次/秒)。""" try: @@ -209,11 +226,16 @@ class AI_led(Abstract): self._red_flash_steps_left = flashes * 2 self._alert_period_ms = period_ms self._blink_on = 1 + self._alert_started_ms = utime.ticks_ms() self._timer_stop() self._set_rgb(1, 0, 0) self._timer.start(self._alert_period_ms, 0, self._timer_cb) def _timer_cb(self, *args, **kwargs): + # 告警快闪周期短、须可靠结束;勿经 btn 队列,避免 VC 忙时队列堵塞卡死在 alert_rb + if self._mode in ("alert_rb", "red_flash_n"): + self._timer_cb_() + return EventMesh.publish("publish_AI_btnInfo", {"func": self._timer_cb_}) def _timer_cb_(self): @@ -298,6 +320,7 @@ class AI_led(Abstract): return if aval in (None, "", "none", "clear"): self._st_alert = None + self._exit_alert_mode() if "ai_state" in msg: new_ai = msg.get("ai_state") or "idle" if EventMesh.publish("get_ptt_should_force_idle_led") == 1: @@ -322,7 +345,20 @@ class AI_led(Abstract): except Exception: pass if self._mode in ("alert_rb", "red_flash_n"): - return + force_exit = False + try: + if getattr(self, "_prefer_off", 0): + force_exit = True + elif getattr(self, "_alert_started_ms", 0): + # 2 次红蓝闪正常约 1s;超时仍卡在告警则强制恢复业务灯态 + if utime.ticks_diff(utime.ticks_ms(), self._alert_started_ms) > 1500: + force_exit = True + except Exception: + pass + if force_exit: + self._exit_alert_mode() + else: + return if self._led_state_debug_enabled() and isinstance(msg, dict): print("[LED] set_led_state in={}".format(msg)) self._apply_by_table(msg)