add antenna power mode print

comtool-plugin-duifei.py

@@ -34,48 +34,67 @@ class Plugin(Plugin_Base):
             "version": 1,
             "customSendItems": [
                 {
-                    "caption": "Self Test",
+                    "caption": "自检",
                     "icon": "fa5.question-circle",
                     "data": "5A 54 E1 DD 00 BE 02 5A FE"
                 },
+                # {
+                #     "caption": "数据发送测试 - 1",
+                #     "icon": "fa5.play-circle",
+                #     "data": ""
+                # },
+                # {
+                #     "caption": "数据发送测试 - 2",
+                #     "icon": "fa5.play-circle",
+                #     "data": ""
+                # },
                 {
-                    "caption": "Config - FLJ Low Power",
+                    "caption": "装订 - 【主】反拦截小功率",
-                    "icon": "fa5.play-circle",
-                    "data": "5A 54 E3 DD 77 11 00 00 00 48 06 5A FE"
-                },{
-                    "caption": "Config - FLJ Full Power",
-                    "icon": "fa5.play-circle",
-                    "data": "5A 54 E3 DD 66 11 00 00 00 37 06 5A FE"
-                }, {
-                    "caption": "Config - FLJ Silent",
                     "icon": "fa5.play-circle",
                     "data": "5A 54 E3 DD 88 11 00 00 00 59 06 5A FE"
-                },{
+                },
-                    "caption": "Config - LJ Low Power",
+                {
+                    "caption": "装订 - 【主】反拦截全功率",
                     "icon": "fa5.play-circle",
-                    "data": "5A 54 E3 DD 77 00 00 00 00 37 06 5A FE"
+                    "data": "5A 54 E3 DD 66 11 00 00 00 37 06 5A FE"
-                },{
+                },
-                    "caption": "Config - LJ Full Power",
+                {
+                    "caption": "装订 - 【主】反拦截静默",
                     "icon": "fa5.play-circle",
-                    "data": "5A 54 E3 DD 66 00 00 00 00 26 06 5A FE"
+                    "data": "5A 54 E3 DD 00 11 00 00 00 D1 06 5A FE"
-                },{
+                },
-                    "caption": "Config - LJ Silent",
+                {
-                    "icon": "fa5.play-circle",
+                    "caption": "遥测 - 【主】反拦截",
-                    "data": "5A 54 E3 DD 88 00 00 00 00 48 06 5A FE"
-                },{
-                    "caption": "StatusCheck - FLJ",
                     "icon": "fa5.play-circle",
                     "data": "5A 54 E6 DD 99 00 5C 03 5A FE"
-                },{
+                },
-                    "caption": "StatusCheck - LJ",
+                {
-                    "icon": "fa5.play-circle",
+                    "caption": "点名 - 【主】反拦截",
-                    "data": "5A 54 F6 DD 99 00 6C 03 5A FE"
-                },{
-                    "caption": "DataRetrieve - FLJ",
                     "icon": "fa5.play-circle",
                     "data": "5A 54 E5 DD 77 00 39 03 5A FE"
-                },{
+                },
-                    "caption": "DataRetrieve - LJ",
+                {
+                    "caption": "装订 - 【从】拦截小功率",
+                    "icon": "fa5.play-circle",
+                    "data": "5A 54 E3 DD 88 00 00 00 00 48 06 5A FE"
+                },
+                {
+                    "caption": "装订 - 【从】拦截大功率",
+                    "icon": "fa5.play-circle",
+                    "data": "5A 54 E3 DD 66 00 00 00 00 26 06 5A FE"
+                },
+                {
+                    "caption": "装订 - 【从】拦截静默",
+                    "icon": "fa5.play-circle",
+                    "data": "5A 54 E3 DD 00 00 00 00 00 C0 06 5A FE"
+                },
+                {
+                    "caption": "遥测 - 【从】拦截",
+                    "icon": "fa5.play-circle",
+                    "data": "5A 54 F6 DD 99 00 6C 03 5A FE"
+                },
+                {
+                    "caption": "点名 - 【从】拦截",
                     "icon": "fa5.play-circle",
                     "data": "5A 54 F5 DD 77 00 49 03 5A FE"
                 }
@@ -163,7 +182,10 @@ class Plugin(Plugin_Base):
         self.showReceiveDataSignal.connect(self.showReceivedData)
         # frame struct
         self.structSelfTestRsp = Struct("<BB B BBBbbb BbBBB H")
-        self.structStatusCheckRsp = Struct("<BB Q      HIII      IBBBBI BBHH HHHIIIIII i II I      IIII d Q dBB dB H I      BBBbbb BbBBB H")
+        self.structStatusCheckRsp = Struct("<BB Q      HIII      IBBBBI BBHH HHHIIIIII i II 4s      IIII d Q dBB dB H B 3s      BBBbbb BbBBB 2s")
+        self.structFljData = Struct("<dddd IHI fff fff")
+        self.structLjData = Struct("<IHI ffff IHI fff fff fff IHI fff fff fff IHI fff fff fff I")
+        self.structSysInfo = Struct("<IHI H B I B fff fff fff")
 
     def insertSendItem(self, item = None, load = False):
         caption = item["caption"]
@@ -237,11 +259,22 @@ class Plugin(Plugin_Base):
             return f"\n### evalSelfTestRsp:: Failed to unpack data (data length {len(data)} byte).\n"
 
         ret = "----------- 自检回令 -----------\n"
+
         ret += "节点类型: "
-        ret += "K频段(0xDD)\n" if payload[1] == 0xDD else "S频段(0xDD)\n"
+        if payload[1] == 0xDD:
+            ret += f"K频段 (0x{payload[1]:02X})\n"
+        elif payload[1] == 0xEE:
+            ret += f"S频段 (0x{payload[1]:02X})\n"
+        else:
+            ret += f"【未知错误】(0x{payload[1]:02X})\n"
 
         ret += "自检结果: "
-        ret += "正常(0xAA)\n" if payload[2] == 0xAA else "异常(0x55 or other)\n"
+        if payload[2] == 0xAA:
+            ret += f"正常 (0x{payload[2]:02X})\n"
+        elif payload[2] == 0x55:
+            ret += f"异常 (0x{payload[2]:02X})\n"
+        else:
+            ret += f"【未知错误】(0x{payload[2]:02X})\n"
 
         hwOffset = 3
 
@@ -275,15 +308,21 @@ class Plugin(Plugin_Base):
             return f"\n### evalStatusCheckRsp:: Failed to unpack data (data length {len(data)} byte).\n"
 
         ret = "----------- 遥测回令 -----------\n"
-        ret += "节点类型: "
-        ret += "K频段(0xDD)\n" if payload[1] == 0xDD else "S频段(0xDD)\n"
 
-        ret += f"时间戳: {payload[2]/1e2:.2f} us\n"
+        ret += "节点类型: "
+        if payload[1] == 0xDD:
+            ret += f"K频段 (0x{payload[1]:02X})\n"
+        elif payload[1] == 0xEE:
+            ret += f"S频段 (0x{payload[1]:02X})\n"
+        else:
+            ret += f"【未知错误】(0x{payload[1]:02X})\n"
+
+        ret += f"时间戳: {payload[2]/1e5:.2f} ms\n"
 
         sysbusOffset = 3
         linkOffset = 7
         phyOffset = 30
-        hwOffset = 43
+        hwOffset = 44
 
         ret += "\n  -- 总线状态\n"
         ret += f"配置装订:    {payload[sysbusOffset + 0]:04X}\n"
@@ -323,14 +362,14 @@ class Plugin(Plugin_Base):
         ret += f"通信波位号:  {payload[linkOffset + 6]:>2d}\n"
 
         ret += "通信波束宽度: "
-        if payload[linkOffset + 7] == 0x04:
+        if payload[linkOffset + 7] == 0x01:
-            ret += f"8° 窄波束 (0x{payload[linkOffset + 7]:02X})\n"
+            ret += f"120° 宽波束 (0x{payload[linkOffset + 7]:02X})\n"
-        elif payload[linkOffset + 7] == 0x03:
-            ret += f"25° 次波束 (0x{payload[linkOffset + 7]:02X})\n"
         elif payload[linkOffset + 7] == 0x02:
             ret += f"60° 次波束 (0x{payload[linkOffset + 7]:02X})\n"
-        elif payload[linkOffset + 7] == 0x01:
+        elif payload[linkOffset + 7] == 0x03:
-            ret += f"120° 宽波束 (0x{payload[linkOffset + 7]:02X})\n"
+            ret += f"25° 次波束 (0x{payload[linkOffset + 7]:02X})\n"
+        elif payload[linkOffset + 7] == 0x04:
+            ret += f"8° 窄波束 (0x{payload[linkOffset + 7]:02X})\n"
         else:
             ret += f"【未知错误】(0x{payload[linkOffset + 7]:02X})\n"
 
@@ -362,6 +401,15 @@ class Plugin(Plugin_Base):
         ret += f"帧同步峰均比:   {payload[phyOffset + 9]:.2f}\n"
         ret += f"帧同步频偏通道: {payload[phyOffset + 10]:>3d}\n"
         ret += f"交织输入数据幅度统计:\t0x{payload[phyOffset + 11]:04X}\n"
+        ret += "天线工作模式: "
+        if payload[phyOffset + 12] == 0x01:
+            ret += f"静默模式 (0x{payload[phyOffset + 12]:02X})\n"
+        elif payload[phyOffset + 12] == 0x02:
+            ret += f"低功率模式 (0x{payload[phyOffset + 12]:02X})\n"
+        elif payload[phyOffset + 12] == 0x03:
+            ret += f"全功率模式 (0x{payload[phyOffset + 12]:02X})\n"
+        else:
+            ret += f"【未知错误】(0x{payload[phyOffset + 12]:02X})\n"
 
         ret += "\n  -- 硬件状态\n"
         ret += f"FPGA 电压监测: {bin(payload[hwOffset+0])[2:].zfill(8)}\n"