统一信号获取接口
authorsnickersun <snickersun@163.com>
Mon, 8 Jun 2026 08:24:50 +0000 (16:24 +0800)
committersnickersun <snickersun@163.com>
Mon, 8 Jun 2026 08:24:50 +0000 (16:24 +0800)
2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/default_config.py
2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/protocol.py
2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_auth.py
2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_hw.py
2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_ota.py
2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_session.py
2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_session_io.py
2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_utils.py

index 24f55eb..c26d9ba 100644 (file)
@@ -215,7 +215,7 @@ LOCAL_VAD_ENDPOINT_HANGOVER_MS = 200
 # 现场若本地 VAD 不出 speech start/end(全靠 asr_silence_fallback 收尾),调低(如 6000)
 VAD_ENERGY_THRESHOLD = 10000
 # 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
+VAD_DMP_SERVER_ADDR = 1
 
 # 长对话:单轮最长录音(ms)、asr.completed 后续说 merge 窗(ms);0=不限制
 # 说明:MAX_TURN_MS 解决"场景②一直说话太久"——强制提交截断输入;
index 98b11d4..b1ca6c6 100644 (file)
@@ -34,6 +34,7 @@ try:
     _NLP_EXTENDED_CMDS = _vc_cfg.get_bool("NLP_EXTENDED_CMDS", False)
 except Exception:
     _NLP_EXTENDED_CMDS = False
+from vc_utils import net_csq_wifi_rssi_gradient
 
 from queue import Queue
 def unicode_to_utf8(src):
@@ -4116,7 +4117,7 @@ class IOTWeb_get_device_stateProtoCol(ProtoCol):
                     "charge":battery_state,#0表示未充电,1表示充电中
                     "currentRoleName":"",#当前音色的name
                     "volume":str(VC_TTS_volume),#百分比数值
-                    "wifiRssi":str(net.csqQueryPoll()//6),#wifi强弱:0,1,2,3,4,5。转成这几个梯度
+                    "wifiRssi": net_csq_wifi_rssi_gradient(),  # CSQ 0~31 → 0~5 梯度
                     "battery":str(battery),#电量
                     "bargein": "0",#不能手动设置打断模式
                     "deviceId":modem.getDevImei(),#设备号
index ce16538..7b6b348 100644 (file)
@@ -21,7 +21,7 @@ import constants
 import ucryptolib
 import urandom as random
 import request
-from vc_utils import cfg_attr
+from vc_utils import cfg_attr, net_csq_rssi, net_csq_invalid
 
 class device_res_author(Abstract):
    
@@ -184,8 +184,8 @@ class device_res_author(Abstract):
         return str(result, 'utf-8')  # 以字符串的形式返回
     #激活接口 没有密码走激活
     def dev_active(self, event=None, msg=None):
-        signal = net.csqQueryPoll()
-        if signal == -1 or self.get_sim_Status() != 1:#网络不正常
+        signal = net_csq_rssi()
+        if net_csq_invalid(signal) or self.get_sim_Status() != 1:#网络不正常
             print("dev_active 无 SIM卡!!!!!!!!\r\n")
             return
         print("dev_active 1\r\n")
@@ -289,8 +289,8 @@ class device_res_author(Abstract):
     def dev_sign_in(self, event=None, msg=None):
     
 
-        signal = net.csqQueryPoll()
-        if signal == -1 or self.get_sim_Status() != 1:#网络不正常
+        signal = net_csq_rssi()
+        if net_csq_invalid(signal) or self.get_sim_Status() != 1:#网络不正常
             print("dev_sign_in 无 SIM卡!!!!!!!!\r\n")
             return
         print("dev_sign_in 1")
index 62ede52..ff3ae0a 100644 (file)
@@ -12,7 +12,7 @@ import net
 import dataCall
 from misc import USB, Power
 from vc_common import dev_type
-from vc_utils import cfg_bool, cfg_int, cfg_attr
+from vc_utils import cfg_bool, cfg_int, cfg_attr, net_csq_rssi, net_csq_invalid
 
 def _default_battery_ocv_map():
     # 无 BATTERY_OCV_MAP 配置时的兜底(502631-510 0.5C 放电端电压实测;0% 锚定 3400mV)
@@ -347,6 +347,7 @@ class AI_hw_status(Abstract):
         self._chg = None
         self._bat = None
         self._sig = None
+        self._last_csq_rssi = -1
         self._usb = None
         self._charge_full_latched = 0
         self._charge_full_streak = 0
@@ -366,6 +367,7 @@ class AI_hw_status(Abstract):
         # 并在 10 秒轮询中再读一次 GET_USB_STATE 作兜底。
         try:
             EventMesh.subscribe("hw_usb_state", self._on_usb_state)
+            EventMesh.subscribe("screen_get_sig", self.get_signal)
         except Exception:
             pass
 
@@ -482,17 +484,13 @@ class AI_hw_status(Abstract):
             pass
 
         # signal
+        csq = None
+        rssi = -1
         try:
-            csq = net.csqQueryPoll()
-            # csqQueryPoll 返回 (rssi, ber) 或 int,按保守取 rssi
-            try:
-                if isinstance(csq, (tuple, list)) and len(csq) > 0:
-                    rssi = csq[0]
-                else:
-                    rssi = csq
-            except Exception:
-                rssi = csq
-            sig = "weak" if (rssi is not None and int(rssi) >= 0 and int(rssi) < int(self._weak_csq)) else "normal"
+            rssi = net_csq_rssi()
+            self._last_csq_rssi = rssi
+            csq = rssi
+            sig = "weak" if (not net_csq_invalid(rssi) and int(rssi) < int(self._weak_csq)) else "normal"
             self._sig = sig
         except Exception:
             pass
@@ -516,6 +514,15 @@ class AI_hw_status(Abstract):
         except Exception:
             pass
 
+    def get_signal(self, event=None, msg=None):
+        """兼容旧 mgr.screen_get_sig:供 IOT/UI 查询当前 CSQ。"""
+        try:
+            r = net_csq_rssi()
+            self._last_csq_rssi = r
+            return r
+        except Exception:
+            return getattr(self, "_last_csq_rssi", -1)
+
     def _soc_from_vbatt(self, volt_mv):
         return self._bcfg.soc_from_vbatt(volt_mv)
 
index 12e99ea..1ab24f0 100644 (file)
@@ -16,6 +16,7 @@ import constants
 import version_util
 from misc import Power
 import _thread
+from vc_utils import net_csq_rssi, net_csq_invalid
 
 def _build_ota_task_url(source_version):
     """OTA 检查任务 URL:default_srv.OTA_TASK_URL_FMT,否则 DMP_BASE + /ota/task。"""
@@ -51,8 +52,8 @@ class OTA():
     #蓝牙升级升级,返回0,没有升级;返回,1有升级,正在执行升级;返回2,电压不够
     def bt_ota(self,event=None,msg=None):
         print("bt_ota_ota")
-        signal = net.csqQueryPoll()
-        if signal == -1 or sim.getStatus()  != 1:#网络不正常
+        signal = net_csq_rssi()
+        if net_csq_invalid(signal) or sim.getStatus()  != 1:#网络不正常
             print("bt_ota 无 SIM卡!!!!!!!!\r\n")
             return 0
         # return 0
@@ -117,8 +118,8 @@ class OTA():
     #小系统升级,返回0,没有升级;返回,1有升级,正在执行升级;返回2,电压不够
     def min_sys_ota(self,event=None,msg=None):
         print("min_sys_ota")
-        signal = net.csqQueryPoll()
-        if signal == -1 or sim.getStatus()  != 1:#网络不正常
+        signal = net_csq_rssi()
+        if net_csq_invalid(signal) or sim.getStatus()  != 1:#网络不正常
             print("min_sys_ota 无 SIM卡!!!!!!!!\r\n")
             return 0
         # return 0
index 75c648d..968255f 100644 (file)
@@ -15,7 +15,11 @@ from vc_notify import (
     OP_PTT_ROUND, OP_UPLOAD_TONE,
 )
 from vc_mode_strategy import strategy_for_mode
-from vc_utils import cfg_bool, cfg_int, cfg_attr, playback_volume_pct_default, playback_volume_pct_clamp
+from vc_utils import (
+    cfg_bool, cfg_int, cfg_attr,
+    playback_volume_pct_default, playback_volume_pct_clamp,
+    net_csq_rssi, net_csq_invalid,
+)
 
 class AI_VC(VCSessionIoMixin, VCSessionMediaMixin, Abstract):
     def _vc_fsm_log_snip(self):
@@ -464,10 +468,10 @@ class AI_VC(VCSessionIoMixin, VCSessionMediaMixin, Abstract):
                 print("[VAD][auth] defer reason={} cause=no_token init_ret={}".format(reason, init_ret))
                 return
             try:
-                csq = net.csqQueryPoll()
+                csq = net_csq_rssi()
             except Exception:
                 csq = -1
-            if csq is None or csq == -1 or csq == 99:
+            if net_csq_invalid(csq):
                 print("[VAD][auth] defer reason={} cause=no_net csq={} init_ret={}".format(
                     reason, csq, init_ret))
                 return
@@ -3927,7 +3931,7 @@ class AI_VC(VCSessionIoMixin, VCSessionMediaMixin, Abstract):
             EventMesh.publish("play_tts",[tts_play_str,0])
             # print("电量!!!!!!!!!!!")
         elif "信号" in msg:
-            signal = net.csqQueryPoll()
+            signal = net_csq_rssi()
             tts_play_str = "当前信号{}".format(signal)
             EventMesh.publish("play_tts",[tts_play_str,0])
             # print("信号!!!!!!!!!!!")
index 533adce..a4e8d4e 100644 (file)
@@ -2,7 +2,7 @@
 """AI_VC mixin:VC WebSocket 建链、收发线程、协议 JSON 分发。"""
 from vc_session_imports import *  # noqa: F401,F403
 from vc_notify import NotifyScheduler
-from vc_utils import cfg_bool, cfg_attr, cfg_int
+from vc_utils import cfg_bool, cfg_attr, cfg_int, net_csq_rssi, net_csq_invalid
 # import * 不导入以下划线开头的符号;_thread 必须显式引入(否则 start_new_thread NameError)
 import _thread
 
@@ -203,8 +203,8 @@ class VCSessionIoMixin:
             return
         # 创建VC客户端
         try:
-            signal = net.csqQueryPoll()
-            if signal == -1 or sim.getStatus() != 1:#无蜂窝/无卡等:弱网提示
+            signal = net_csq_rssi()
+            if net_csq_invalid(signal) or sim.getStatus() != 1:#无蜂窝/无卡等:弱网提示
                 self.websocket_error(play_weak_signal_tone=True)
                 return
             
@@ -1600,7 +1600,7 @@ class VCSessionIoMixin:
             EventMesh.publish("set_storage_config", ["vad_silence", self.vad_silence])
             return 0
         if it == "query_signal":
-            signal = net.csqQueryPoll()
+            signal = net_csq_rssi()
             self.AI_TTS_str = "当前信号{}".format(signal)
             return 0
         if it == "query_battery":
index 5495688..558a40d 100644 (file)
@@ -82,6 +82,44 @@ def apply_aud_volume(aud, volume_pct):
     return lv\r
 \r
 \r
+def net_csq_rssi():\r
+    """csqQueryPoll 可能返回 int 或 (rssi, ber),统一取 rssi;失败返回 -1。"""\r
+    try:\r
+        import net\r
+        csq = net.csqQueryPoll()\r
+    except Exception:\r
+        return -1\r
+    try:\r
+        if isinstance(csq, (tuple, list)) and len(csq) > 0:\r
+            return int(csq[0])\r
+        return int(csq)\r
+    except Exception:\r
+        return -1\r
+\r
+\r
+def net_csq_invalid(rssi):\r
+    """CSQ 无效:无网/未知。"""\r
+    try:\r
+        r = int(rssi)\r
+    except Exception:\r
+        return True\r
+    return r < 0 or r == 99\r
+\r
+\r
+def net_csq_wifi_rssi_gradient(rssi=None):\r
+    """IOT device_info.wifiRssi:CSQ 0~31 映射为 0~5 梯度(//6)。"""\r
+    if rssi is None:\r
+        rssi = net_csq_rssi()\r
+    if net_csq_invalid(rssi):\r
+        return "0"\r
+    g = int(rssi) // 6\r
+    if g < 0:\r
+        g = 0\r
+    elif g > 5:\r
+        g = 5\r
+    return str(g)\r
+\r
+\r
 def num_str_to_chinese(num_str):\r
     num_map = {\r
         '0': '零', '1': '一', '2': '二', '3': '三', '4': '四',\r