From 9fcfcce584113a417a2311dc086f6fda10ff2c25 Mon Sep 17 00:00:00 2001
From: Gatsby Van <mail.gatsby.icu>
Date: Wed, 31 Jan 2024 19:40:39 +0800
Subject: [PATCH] update logging content

---
 df_datalink_sp/src/system_monitor.c | 35 +++++++-------
 df_datalink_sp/src/system_monitor.h | 73 +++++++++++++++++------------
 2 files changed, 58 insertions(+), 50 deletions(-)

diff --git a/df_datalink_sp/src/system_monitor.c b/df_datalink_sp/src/system_monitor.c
index d7f88ad..4942ff5 100644
--- a/df_datalink_sp/src/system_monitor.c
+++ b/df_datalink_sp/src/system_monitor.c
@@ -23,18 +23,16 @@ typedef struct
 
 typedef struct
 {
-	PINGPONG recvPLCtrl;
-	PAYLOAD recvPL[2];
-	PINGPONG sendPLCtrl;
-	PAYLOAD sendPL[2];
+	PINGPONG recvCtrl;
+	PAYLOAD recv[2];
+	PINGPONG sendCtrl;
+	PAYLOAD send[2];
 	PINGPONG sysInfoCtrl;
 	SYSINFO sysInfo[2];
-	PINGPONG sendLogCtrl;
-	SLOTLOG sendLog[2];
-	PINGPONG recvLogCtrl;
-	SLOTLOG recvLog[2];
-	PINGPONG protocolLogCtrl;
-	PRTCLLOG protocolLog[2];
+	PINGPONG linkLogCtrl;
+	LINKLOG linkLog[2];
+	PINGPONG phyLogCtrl;
+	PHYLOG phyLog[2];
 	PINGPONG hwStateCtrl;
 	HWSTATE hwState[2];
 } SYSMONITOR;
@@ -70,18 +68,17 @@ int32_t SysMonitor_Init(void)
 	{
 		return ENOMEM;
 	}
-	memset(&(sysMonitorInst->recvPLCtrl), BUFF_NONE, sizeof(PINGPONG));
-	memset(&(sysMonitorInst->sendPLCtrl), BUFF_NONE, sizeof(PINGPONG));
+	memset(&(sysMonitorInst->recvCtrl), BUFF_NONE, sizeof(PINGPONG));
+	memset(&(sysMonitorInst->sendCtrl), BUFF_NONE, sizeof(PINGPONG));
 	memset(&(sysMonitorInst->sysInfoCtrl), BUFF_NONE, sizeof(PINGPONG));
-	memset(&(sysMonitorInst->sendLogCtrl), BUFF_NONE, sizeof(PINGPONG));
-	memset(&(sysMonitorInst->recvLogCtrl), BUFF_NONE, sizeof(PINGPONG));
-	memset(&(sysMonitorInst->protocolLogCtrl), BUFF_NONE, sizeof(PINGPONG));
+	memset(&(sysMonitorInst->linkLogCtrl), BUFF_NONE, sizeof(PINGPONG));
+	memset(&(sysMonitorInst->phyLogCtrl), BUFF_NONE, sizeof(PINGPONG));
 	memset(&(sysMonitorInst->hwStateCtrl), BUFF_NONE, sizeof(PINGPONG));
 	
-	sysMonitorInst->recvPL[0].dataId = DATA_ID_NONE;
-	sysMonitorInst->recvPL[1].dataId = DATA_ID_NONE;
-	sysMonitorInst->sendPL[0].dataId = DATA_ID_NONE;
-	sysMonitorInst->sendPL[1].dataId = DATA_ID_NONE;
+	sysMonitorInst->recv[0].dataId = DATA_ID_NONE;
+	sysMonitorInst->recv[1].dataId = DATA_ID_NONE;
+	sysMonitorInst->send[0].dataId = DATA_ID_NONE;
+	sysMonitorInst->send[1].dataId = DATA_ID_NONE;
 	return SUCCESS;
 }
 
diff --git a/df_datalink_sp/src/system_monitor.h b/df_datalink_sp/src/system_monitor.h
index ca57863..8460ada 100644
--- a/df_datalink_sp/src/system_monitor.h
+++ b/df_datalink_sp/src/system_monitor.h
@@ -75,33 +75,47 @@ typedef struct
 typedef struct
 {
 	// Network log
-	uint32_t tuNo;
-	uint8_t slotNo;
-	uint8_t frameType;
-	// Payload
-	uint8_t payload[PAYLOAD_LEN_MAX];
-	// Time sync info
-	uint64_t tmStamp;
-	uint32_t tmDevi;
-	uint32_t freqDevi;
-} SLOTLOG;
+	uint32_t tuNum;
+	uint8_t slotNum;
+	uint8_t nodeType;
+	uint8_t cxnStatus;
+	uint8_t linkStage;
+	uint32_t recxnCnt;
+	uint8_t beamNo;
+	uint16_t beamAz;
+	uint16_t beamEl;
+	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
 {
-	// Protocol log
-	// -- System time
-	uint32_t tmSys;
-	// -- Physical layer status
-	uint8_t phySt;
-	// -- Link layer status
-	uint64_t tmLocal;
-	uint16_t beamNo;
-	uint8_t beamWidth;
-	// -- Network layer status
-	uint8_t stage;
-	uint32_t recvCnt;
-	uint32_t recvCorrect;
-} PRTCLLOG;
+	uint32_t acqCnt;
+	uint32_t fsyncCnt;
+	uint32_t decodeCnt;
+	uint32_t crcCnt;
+	double doppler;
+	uint64_t recvStamp;
+	uint64_t acqPeak;
+	uint64_t acqMean;
+	uint8_t acqPhase;
+	uint8_t acqFreqCh;
+	uint8_t fsyncPeak;
+	uint8_t fsyncMean;
+	uint8_t fsyncFreqCh;
+	uint16_t deintlvAmpEst;
+	uint16_t reserve;
+} PHYLOG;
 
 typedef struct
 {
@@ -126,14 +140,11 @@ typedef struct
 
 typedef struct
 {
-	// Send slot log
-	SLOTLOG sendLog;
+	// Link layer log
+	LINKLOG linkLog;
 
-	// Receive slot log
-	SLOTLOG recvLog;
-
-	// Protocol log
-	PRTCLLOG protocolLog;
+	// Physical layer log
+	PHYLOG phyLog;
 
 	// Hardware status
 	HWSTATE hwSate;