update logging content

This commit is contained in:
Gatsby Van
2024-01-31 19:40:39 +08:00
parent f8dec485c5
commit 9fcfcce584
2 changed files with 58 additions and 50 deletions
+16 -19
View File
@@ -23,18 +23,16 @@ typedef struct
typedef struct typedef struct
{ {
PINGPONG recvPLCtrl; PINGPONG recvCtrl;
PAYLOAD recvPL[2]; PAYLOAD recv[2];
PINGPONG sendPLCtrl; PINGPONG sendCtrl;
PAYLOAD sendPL[2]; PAYLOAD send[2];
PINGPONG sysInfoCtrl; PINGPONG sysInfoCtrl;
SYSINFO sysInfo[2]; SYSINFO sysInfo[2];
PINGPONG sendLogCtrl; PINGPONG linkLogCtrl;
SLOTLOG sendLog[2]; LINKLOG linkLog[2];
PINGPONG recvLogCtrl; PINGPONG phyLogCtrl;
SLOTLOG recvLog[2]; PHYLOG phyLog[2];
PINGPONG protocolLogCtrl;
PRTCLLOG protocolLog[2];
PINGPONG hwStateCtrl; PINGPONG hwStateCtrl;
HWSTATE hwState[2]; HWSTATE hwState[2];
} SYSMONITOR; } SYSMONITOR;
@@ -70,18 +68,17 @@ int32_t SysMonitor_Init(void)
{ {
return ENOMEM; return ENOMEM;
} }
memset(&(sysMonitorInst->recvPLCtrl), BUFF_NONE, sizeof(PINGPONG)); memset(&(sysMonitorInst->recvCtrl), BUFF_NONE, sizeof(PINGPONG));
memset(&(sysMonitorInst->sendPLCtrl), BUFF_NONE, sizeof(PINGPONG)); memset(&(sysMonitorInst->sendCtrl), BUFF_NONE, sizeof(PINGPONG));
memset(&(sysMonitorInst->sysInfoCtrl), BUFF_NONE, sizeof(PINGPONG)); memset(&(sysMonitorInst->sysInfoCtrl), BUFF_NONE, sizeof(PINGPONG));
memset(&(sysMonitorInst->sendLogCtrl), BUFF_NONE, sizeof(PINGPONG)); memset(&(sysMonitorInst->linkLogCtrl), BUFF_NONE, sizeof(PINGPONG));
memset(&(sysMonitorInst->recvLogCtrl), BUFF_NONE, sizeof(PINGPONG)); memset(&(sysMonitorInst->phyLogCtrl), BUFF_NONE, sizeof(PINGPONG));
memset(&(sysMonitorInst->protocolLogCtrl), BUFF_NONE, sizeof(PINGPONG));
memset(&(sysMonitorInst->hwStateCtrl), BUFF_NONE, sizeof(PINGPONG)); memset(&(sysMonitorInst->hwStateCtrl), BUFF_NONE, sizeof(PINGPONG));
sysMonitorInst->recvPL[0].dataId = DATA_ID_NONE; sysMonitorInst->recv[0].dataId = DATA_ID_NONE;
sysMonitorInst->recvPL[1].dataId = DATA_ID_NONE; sysMonitorInst->recv[1].dataId = DATA_ID_NONE;
sysMonitorInst->sendPL[0].dataId = DATA_ID_NONE; sysMonitorInst->send[0].dataId = DATA_ID_NONE;
sysMonitorInst->sendPL[1].dataId = DATA_ID_NONE; sysMonitorInst->send[1].dataId = DATA_ID_NONE;
return SUCCESS; return SUCCESS;
} }
+42 -31
View File
@@ -75,33 +75,47 @@ typedef struct
typedef struct typedef struct
{ {
// Network log // Network log
uint32_t tuNo; uint32_t tuNum;
uint8_t slotNo; uint8_t slotNum;
uint8_t frameType; uint8_t nodeType;
// Payload uint8_t cxnStatus;
uint8_t payload[PAYLOAD_LEN_MAX]; uint8_t linkStage;
// Time sync info uint32_t recxnCnt;
uint64_t tmStamp; uint8_t beamNo;
uint32_t tmDevi; uint16_t beamAz;
uint32_t freqDevi; uint16_t beamEl;
} SLOTLOG; uint16_t advTxCnt;
uint16_t advRecvCnt;
uint16_t advCorrectCnt;
uint32_t cfmTxCnt;
uint32_t cfmRecvCnt;
uint32_t cfmCorrectCnt;
uint32_t svcTxCnt;
uint32_t svcRecvCnt;
uint32_t svcCorrectCnt;
int64_t timeDev;
uint32_t sendId;
uint32_t recvId;
} LINKLOG;
typedef struct typedef struct
{ {
// Protocol log uint32_t acqCnt;
// -- System time uint32_t fsyncCnt;
uint32_t tmSys; uint32_t decodeCnt;
// -- Physical layer status uint32_t crcCnt;
uint8_t phySt; double doppler;
// -- Link layer status uint64_t recvStamp;
uint64_t tmLocal; uint64_t acqPeak;
uint16_t beamNo; uint64_t acqMean;
uint8_t beamWidth; uint8_t acqPhase;
// -- Network layer status uint8_t acqFreqCh;
uint8_t stage; uint8_t fsyncPeak;
uint32_t recvCnt; uint8_t fsyncMean;
uint32_t recvCorrect; uint8_t fsyncFreqCh;
} PRTCLLOG; uint16_t deintlvAmpEst;
uint16_t reserve;
} PHYLOG;
typedef struct typedef struct
{ {
@@ -126,14 +140,11 @@ typedef struct
typedef struct typedef struct
{ {
// Send slot log // Link layer log
SLOTLOG sendLog; LINKLOG linkLog;
// Receive slot log // Physical layer log
SLOTLOG recvLog; PHYLOG phyLog;
// Protocol log
PRTCLLOG protocolLog;
// Hardware status // Hardware status
HWSTATE hwSate; HWSTATE hwSate;