From 76b49097c171156b7318bdcd5b7f20068ec34e77 Mon Sep 17 00:00:00 2001 From: Josh Gao Date: Tue, 12 Aug 2025 16:52:00 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8C=89=E7=85=A7=E6=BC=94=E7=A4=BA?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E4=BF=AE=E6=94=B9,=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E6=BC=94=E7=A4=BA=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/comtool-plugin-hsjl.py | 8 ++++---- src/networking/link_layer/link_layer.c | 8 ++++---- src/networking/link_layer/service.c | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/comtool-plugin-hsjl.py b/doc/comtool-plugin-hsjl.py index b73a5dc..2a313fd 100644 --- a/doc/comtool-plugin-hsjl.py +++ b/doc/comtool-plugin-hsjl.py @@ -94,7 +94,7 @@ class Plugin(Plugin_Base): { "caption": "装订 - 【从 - 0x02】静默", "icon": "fa5.play-circle", - "data": "5A 54 E3 EE 55 02 22 00 00 0C 06 5A FE" + "data": "5A 54 E3 EE 55 02 22 00 00 4A 06 5A FE" }, { "caption": "装订 - 【从 - 0x03】128 kbps，时隙表 0", @@ -104,17 +104,17 @@ class Plugin(Plugin_Base): { "caption": "装订 - 【从 - 0x03】512 kbps，时隙表 1", "icon": "fa5.play-circle", - "data": "5A 54 E3 EE AA 03 33 02 00 B2 06 5A FE" + "data": "5A 54 E3 EE AA 03 33 01 00 B2 06 5A FE" }, { "caption": "装订 - 【从 - 0x03】2 Mbps，时隙表 2", "icon": "fa5.play-circle", - "data": "5A 54 E3 EE AA 03 44 01 00 C4 06 5A FE" + "data": "5A 54 E3 EE AA 03 44 02 00 C4 06 5A FE" }, { "caption": "装订 - 【从 - 0x03】静默", "icon": "fa5.play-circle", - "data": "5A 54 E3 EE 55 03 22 00 00 0D 06 5A FE" + "data": "5A 54 E3 EE 55 03 22 00 00 4B 06 5A FE" }, { "caption": "遥测", diff --git a/src/networking/link_layer/link_layer.c b/src/networking/link_layer/link_layer.c index c16568c..f06b0e0 100644 --- a/src/networking/link_layer/link_layer.c +++ b/src/networking/link_layer/link_layer.c @@ -883,14 +883,14 @@ int32_t Linklayer_EventHandler(L2_INST *instPtr, const L2_EVENT *l2Event) // Reset scan net FMS for next scan process. L2_Scan_Reset(instPtr->scanFSM); UpdateMainSate(instPtr, L2_INIT_STATE); - instPtr->rtneConfig.rtneTable = initTable; - instPtr->rtneConfig.rtnePrd = ARRAY_SIZE(initTable); +// instPtr->rtneConfig.rtneTable = initTable; +// instPtr->rtneConfig.rtnePrd = ARRAY_SIZE(initTable); } else if (instPtr->nextState == L2_NORMAL_STATE) { UpdateMainSate(instPtr, L2_NORMAL_STATE); - instPtr->rtneConfig.rtneTable = normalTable0; - instPtr->rtneConfig.rtnePrd = ARRAY_SIZE(normalTable0); +// instPtr->rtneConfig.rtneTable = normalTable0; +// instPtr->rtneConfig.rtnePrd = ARRAY_SIZE(normalTable0); } else { diff --git a/src/networking/link_layer/service.c b/src/networking/link_layer/service.c index fb1130c..5516b06 100644 --- a/src/networking/link_layer/service.c +++ b/src/networking/link_layer/service.c @@ -211,7 +211,7 @@ static int32_t Service_Packing128K(L2_INST *instPtr, L2_FRAME_TYPE type, uint8_t } else { - message->common.dst = sendPayload->nodeId; +// message->common.dst = sendPayload->nodeId; message->dataId = sendPayload->dataId; message->dataLen = sendPayload->dataLen; memset(message->data, 0xAA, maxDataLen); @@ -289,7 +289,7 @@ static int32_t Service_Packing512K(L2_INST *instPtr, L2_FRAME_TYPE type, uint8_t } else { - message->common.dst = sendPayload->nodeId; +// message->common.dst = sendPayload->nodeId; message->dataId = sendPayload->dataId; message->dataLen = sendPayload->dataLen; memset(message->data, 0xAA, maxDataLen); @@ -359,7 +359,7 @@ static int32_t Service_Packing2M(L2_INST *instPtr, L2_FRAME_TYPE type, uint8_t d } else { - message->common.dst = sendPayload->nodeId; +// message->common.dst = sendPayload->nodeId; message->dataId = sendPayload->dataId; message->dataLen = sendPayload->dataLen; memset(message->data, 0xAA, maxDataLen);