josh/hj_datalink
1
0
Fork 0
forked from gatsby/df_datalink
Code Issues Pull Requests Releases Activity

feat: 按照演示验证修改,完成演示验证

Browse Source
This commit is contained in:
josh
2025-08-12 16:52:00 +08:00
parent 9c24f66aae
commit 76b49097c1
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/comtool-plugin-hsjl.py
+4 -4
View File
@@ -94,7 +94,7 @@ class Plugin(Plugin_Base):
{ {
"caption": "装订 - 【从 - 0x02】静默", "caption": "装订 - 【从 - 0x02】静默",
"icon": "fa5.play-circle", "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", "caption": "装订 - 【从 - 0x03】128 kbps，时隙表 0",
@@ -104,17 +104,17 @@ class Plugin(Plugin_Base):
{ {
"caption": "装订 - 【从 - 0x03】512 kbps，时隙表 1", "caption": "装订 - 【从 - 0x03】512 kbps，时隙表 1",
"icon": "fa5.play-circle", "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", "caption": "装订 - 【从 - 0x03】2 Mbps，时隙表 2",
"icon": "fa5.play-circle", "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】静默", "caption": "装订 - 【从 - 0x03】静默",
"icon": "fa5.play-circle", "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": "遥测", "caption": "遥测",
src/networking/link_layer/link_layer.c
+4 -4
View File
@@ -883,14 +883,14 @@ int32_t Linklayer_EventHandler(L2_INST *instPtr, const L2_EVENT *l2Event)
// Reset scan net FMS for next scan process. // Reset scan net FMS for next scan process.
L2_Scan_Reset(instPtr->scanFSM); L2_Scan_Reset(instPtr->scanFSM);
UpdateMainSate(instPtr, L2_INIT_STATE); UpdateMainSate(instPtr, L2_INIT_STATE);
instPtr->rtneConfig.rtneTable = initTable; // instPtr->rtneConfig.rtneTable = initTable;
instPtr->rtneConfig.rtnePrd = ARRAY_SIZE(initTable); // instPtr->rtneConfig.rtnePrd = ARRAY_SIZE(initTable);
} }
else if (instPtr->nextState == L2_NORMAL_STATE) else if (instPtr->nextState == L2_NORMAL_STATE)
{ {
UpdateMainSate(instPtr, L2_NORMAL_STATE); UpdateMainSate(instPtr, L2_NORMAL_STATE);
instPtr->rtneConfig.rtneTable = normalTable0; // instPtr->rtneConfig.rtneTable = normalTable0;
instPtr->rtneConfig.rtnePrd = ARRAY_SIZE(normalTable0); // instPtr->rtneConfig.rtnePrd = ARRAY_SIZE(normalTable0);
} }
else else
{ {
src/networking/link_layer/service.c
+3 -3
View File
@@ -211,7 +211,7 @@ static int32_t Service_Packing128K(L2_INST *instPtr, L2_FRAME_TYPE type, uint8_t
} }
else else
{ {
message->common.dst = sendPayload->nodeId; // message->common.dst = sendPayload->nodeId;
message->dataId = sendPayload->dataId; message->dataId = sendPayload->dataId;
message->dataLen = sendPayload->dataLen; message->dataLen = sendPayload->dataLen;
memset(message->data, 0xAA, maxDataLen); memset(message->data, 0xAA, maxDataLen);
@@ -289,7 +289,7 @@ static int32_t Service_Packing512K(L2_INST *instPtr, L2_FRAME_TYPE type, uint8_t
} }
else else
{ {
message->common.dst = sendPayload->nodeId; // message->common.dst = sendPayload->nodeId;
message->dataId = sendPayload->dataId; message->dataId = sendPayload->dataId;
message->dataLen = sendPayload->dataLen; message->dataLen = sendPayload->dataLen;
memset(message->data, 0xAA, maxDataLen); 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 else
{ {
message->common.dst = sendPayload->nodeId; // message->common.dst = sendPayload->nodeId;
message->dataId = sendPayload->dataId; message->dataId = sendPayload->dataId;
message->dataLen = sendPayload->dataLen; message->dataLen = sendPayload->dataLen;
memset(message->data, 0xAA, maxDataLen); memset(message->data, 0xAA, maxDataLen);