From 1b1790657a383462878072a82b79a3070c023ada Mon Sep 17 00:00:00 2001 From: Gatsby Van Date: Wed, 31 Jan 2024 00:33:34 +0800 Subject: [PATCH] *bugfix: add test data mode --- .../src/networking/link_layer/service.c | 38 +++++++++---------- df_datalink_sp/src/system_monitor.c | 9 +++++ df_datalink_sp/src/system_monitor.h | 1 + 3 files changed, 29 insertions(+), 19 deletions(-) diff --git a/df_datalink_sp/src/networking/link_layer/service.c b/df_datalink_sp/src/networking/link_layer/service.c index 2301bbd..4d54c67 100644 --- a/df_datalink_sp/src/networking/link_layer/service.c +++ b/df_datalink_sp/src/networking/link_layer/service.c @@ -112,27 +112,27 @@ static int32_t Service_Packing(L2_INST *instPtr, L2_FRAME_TYPE type, uint8_t dst L2_FrameInsertChunk(buff, L2_MSG_SVC_SRC_SPEEDY, L2_MSG_SVC_SRC_SPEEDY_LEN, &(instPtr->sysInfo.vY)); L2_FrameInsertChunk(buff, L2_MSG_SVC_SRC_SPEEDZ, L2_MSG_SVC_SRC_SPEEDZ_LEN, &(instPtr->sysInfo.vZ)); - // uint32_t dataId; - // if(L2_GetNodeType(instPtr) == L2_NODE_HEAD) - // { - // SysMonitor_GetSendPayloadFLJRaw(buff+L2_MSG_SVC_PAYLOAD, &dataId); - // } - // else - // { - // SysMonitor_GetSendPayloadLJRaw(buff+L2_MSG_SVC_PAYLOAD, &dataId); - // } - - // L2_FrameInsertChunk(buff, L2_MSG_SVC_PAYLOAD_ID, L2_MSG_SVC_PAYLOAD_ID_LEN, &dataId); - // if (dataId == DATA_ID_NONE) - // { - // L2_FrameInsertChunk(buff, L2_MSG_SVC_PAYLOAD, L2_MSG_SVC_PAYLOAD_LEN, testData); - // } - - // packing payload uint32_t dataId; - dataId = DATA_ID_NONE; + if(L2_GetNodeType(instPtr) == L2_NODE_HEAD) + { + SysMonitor_GetSendPayloadFLJRaw(buff + L2_MSG_SVC_PAYLOAD, &dataId); + } + else + { + SysMonitor_GetSendPayloadLJRaw(buff + L2_MSG_SVC_PAYLOAD, &dataId); + } + L2_FrameInsertChunk(buff, L2_MSG_SVC_PAYLOAD_ID, L2_MSG_SVC_PAYLOAD_ID_LEN, &dataId); - L2_FrameInsertChunk(buff, L2_MSG_SVC_PAYLOAD, L2_MSG_SVC_PAYLOAD_LEN, testData); + if (dataId == DATA_ID_NONE) + { + L2_FrameInsertChunk(buff, L2_MSG_SVC_PAYLOAD, L2_MSG_SVC_PAYLOAD_LEN, testData); + } + + // // packing payload + // uint32_t dataId; + // dataId = DATA_ID_TEST; + // L2_FrameInsertChunk(buff, L2_MSG_SVC_PAYLOAD_ID, L2_MSG_SVC_PAYLOAD_ID_LEN, &dataId); + // L2_FrameInsertChunk(buff, L2_MSG_SVC_PAYLOAD, L2_MSG_SVC_PAYLOAD_LEN, testData); Status = L2_CrcAppend(buff, L2_SVC_PACK_LEN - L2_MSG_SVC_CRC_LEN, L2_MSG_SVC_CRC, L2_CRC16_1021); diff --git a/df_datalink_sp/src/system_monitor.c b/df_datalink_sp/src/system_monitor.c index 9ee449e..1cd7769 100644 --- a/df_datalink_sp/src/system_monitor.c +++ b/df_datalink_sp/src/system_monitor.c @@ -77,6 +77,15 @@ int32_t SysMonitor_Init(void) memset(&(sysMonitorInst->recvLogCtrl), BUFF_NONE, sizeof(PINGPONG)); memset(&(sysMonitorInst->protocolLogCtrl), BUFF_NONE, sizeof(PINGPONG)); memset(&(sysMonitorInst->hwStateCtrl), BUFF_NONE, sizeof(PINGPONG)); + + sysMonitorInst->recvPL[0].dataId_flj = DATA_ID_NONE; + sysMonitorInst->recvPL[0].dataId_lj = DATA_ID_NONE; + sysMonitorInst->recvPL[1].dataId_flj = DATA_ID_NONE; + sysMonitorInst->recvPL[1].dataId_lj = DATA_ID_NONE; + sysMonitorInst->sendPL[0].dataId_flj = DATA_ID_NONE; + sysMonitorInst->sendPL[0].dataId_lj = DATA_ID_NONE; + sysMonitorInst->sendPL[1].dataId_flj = DATA_ID_NONE; + sysMonitorInst->sendPL[1].dataId_lj = DATA_ID_NONE; return SUCCESS; } diff --git a/df_datalink_sp/src/system_monitor.h b/df_datalink_sp/src/system_monitor.h index 63dc0c4..483a075 100644 --- a/df_datalink_sp/src/system_monitor.h +++ b/df_datalink_sp/src/system_monitor.h @@ -11,6 +11,7 @@ #define PAYLOAD_LJ_TX 168 #define DATA_ID_NONE UINT32_MAX +#define DATA_ID_TEST 0x02030203 typedef struct {