forked from 0xha0/df_datalink
feat: 增加上位机消息发送队列
This commit is contained in:
@@ -601,8 +601,8 @@ int32_t Linklayer_Init(L2_INST **instPtr, const L2_CONFIG *config)
|
||||
(*instPtr)->tor.last = L2_TOR_SUSPEND;
|
||||
(*instPtr)->tor.curr = L2_TOR_SUSPEND;
|
||||
(*instPtr)->tor.next = L2_TOR_SUSPEND;
|
||||
(*instPtr)->rtneConfig.rtneTable = initTable;
|
||||
(*instPtr)->rtneConfig.rtnePrd = ARRAY_SIZE(initTable);
|
||||
(*instPtr)->rtneConfig.rtneTable = (*instPtr)->config.initTable;
|
||||
(*instPtr)->rtneConfig.rtnePrd = ARRAY_SIZE(initRoutTable);
|
||||
(*instPtr)->mainState = L2_INIT_STATE;
|
||||
(*instPtr)->nextState = L2_INIT_STATE;
|
||||
(*instPtr)->myInfo.nodeId = config->myId;
|
||||
@@ -698,8 +698,8 @@ int32_t Linklayer_Reconfig(L2_INST *instPtr, const L2_CONFIG *config)
|
||||
instPtr->tor.last = L2_TOR_SUSPEND;
|
||||
instPtr->tor.curr = L2_TOR_SUSPEND;
|
||||
instPtr->tor.next = L2_TOR_SUSPEND;
|
||||
instPtr->rtneConfig.rtneTable = initTable;
|
||||
instPtr->rtneConfig.rtnePrd = ARRAY_SIZE(initTable);
|
||||
instPtr->rtneConfig.rtneTable = instPtr->config.initTable;
|
||||
instPtr->rtneConfig.rtnePrd = ARRAY_SIZE(initRoutTable);
|
||||
instPtr->mainState = L2_INIT_STATE;
|
||||
instPtr->nextState = L2_INIT_STATE;
|
||||
instPtr->myInfo.nodeId = config->myId;
|
||||
@@ -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 = instPtr->config.initTable;
|
||||
instPtr->rtneConfig.rtnePrd = ARRAY_SIZE(initRoutTable);
|
||||
}
|
||||
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 = instPtr->config.normalTable;
|
||||
instPtr->rtneConfig.rtnePrd = ARRAY_SIZE(normalRoutTable0);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user