From 1e5f8052e57ec1f0a5c18d232ea74ffe8e434e02 Mon Sep 17 00:00:00 2001
From: Gatsby Van <gatsby_van@e163.com>
Date: Wed, 6 Mar 2024 20:08:33 +0800
Subject: [PATCH] plugin update: new lowpower and silient command

---
 comtool-plugin-duifei.py | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/comtool-plugin-duifei.py b/comtool-plugin-duifei.py
index a90f8c6..f6964fc 100644
--- a/comtool-plugin-duifei.py
+++ b/comtool-plugin-duifei.py
@@ -41,7 +41,7 @@ class Plugin(Plugin_Base):
                 {
                     "caption": "Config - FLJ Low Power",
                     "icon": "fa5.play-circle",
-                    "data": "5A 54 E3 DD 88 11 00 00 00 59 06 5A FE"
+                    "data": "5A 54 E3 DD 77 11 00 00 00 48 06 5A FE"
                 },{
                     "caption": "Config - FLJ Full Power",
                     "icon": "fa5.play-circle",
@@ -49,11 +49,11 @@ class Plugin(Plugin_Base):
                 }, {
                     "caption": "Config - FLJ Silent",
                     "icon": "fa5.play-circle",
-                    "data": "5A 54 E3 DD 00 11 00 00 00 D1 06 5A FE"
+                    "data": "5A 54 E3 DD 88 11 00 00 00 59 06 5A FE"
                 },{
                     "caption": "Config - LJ Low Power",
                     "icon": "fa5.play-circle",
-                    "data": "5A 54 E3 DD 88 00 00 00 00 48 06 5A FE"
+                    "data": "5A 54 E3 DD 77 00 00 00 00 37 06 5A FE"
                 },{
                     "caption": "Config - LJ Full Power",
                     "icon": "fa5.play-circle",
@@ -61,7 +61,7 @@ class Plugin(Plugin_Base):
                 },{
                     "caption": "Config - LJ Silent",
                     "icon": "fa5.play-circle",
-                    "data": "5A 54 E3 DD 00 00 00 00 00 C0 06 5A FE"
+                    "data": "5A 54 E3 DD 88 00 00 00 00 48 06 5A FE"
                 },{
                     "caption": "StatusCheck - FLJ",
                     "icon": "fa5.play-circle",
@@ -226,7 +226,7 @@ class Plugin(Plugin_Base):
         elif data[0] == 0xE6 or data[0] == 0xF6:
             self.showReceiveDataSignal.emit(self.evalStatusCheckRsp(data) + "\n")
         elif data[0] == 0xE5 or data[0] == 0xF5:
-            self.showReceiveDataSignal.emit(self.printFrame(data) + "\n")
+            self.showReceiveDataSignal.emit('Retrieved Data Frame:\n' + self.printFrame(data) + "\n")
         else:
             self.showReceiveDataSignal.emit(f"\n### Unexpected response code 0x{data[0]:02x}.\n")
 
@@ -258,10 +258,10 @@ class Plugin(Plugin_Base):
         ret += f"MGC 3~4: {payload[hwOffset+10] & 0x0f:>2d} - {payload[hwOffset+10] >> 4:>2d}\n"
         ret += "--------------------------------\n"
 
-        return ret
+        return ret + '\n' + printFrame(data)
 
     def printFrame(self, data: bytes):
-        ret = 'Retrieved Data Frame:\n'
+        ret = ''
         for i in range(len(data)):
             ret += f'{data[i]:02X}'
             ret += '\n' if i%16 == 15 else ' '
@@ -323,13 +323,13 @@ class Plugin(Plugin_Base):
         ret += f"通信波位号:  {payload[linkOffset + 6]:>2d}\n"
 
         ret += "通信波束宽度: "
-        if payload[linkOffset + 7] == 0x00:
+        if payload[linkOffset + 7] == 0x04:
             ret += f"8° 窄波束 (0x{payload[linkOffset + 7]:02X})\n"
-        elif payload[linkOffset + 7] == 0x10:
+        elif payload[linkOffset + 7] == 0x03:
             ret += f"25° 次波束 (0x{payload[linkOffset + 7]:02X})\n"
-        elif payload[linkOffset + 7] == 0x20:
+        elif payload[linkOffset + 7] == 0x02:
             ret += f"60° 次波束 (0x{payload[linkOffset + 7]:02X})\n"
-        elif payload[linkOffset + 7] == 0x30:
+        elif payload[linkOffset + 7] == 0x01:
             ret += f"120° 宽波束 (0x{payload[linkOffset + 7]:02X})\n"
         else:
             ret += f"【未知错误】(0x{payload[linkOffset + 7]:02X})\n"
@@ -377,7 +377,7 @@ class Plugin(Plugin_Base):
         ret += f"MGC 3~4: {payload[hwOffset+10] & 0x0f:>2d} - {payload[hwOffset+10] >> 4:>2d}\n"
 
         ret += "--------------------------------\n"
-        return ret
+        return ret + '\n' + printFrame(data)
 
     def onSent(self, ok, msg, length, path):
         if ok: