enhanced code inherence

comtool-plugin-duifei.py

@@ -0,0 +1,388 @@
+'''
+    @brief This is an example plugin, can receive and send data
+    @author
+    @date
+    @license LGPL-3.0
+'''
+from PyQt5.QtWidgets import QWidget, QVBoxLayout, QHBoxLayout, QTextEdit, QPushButton, QLabel, QScrollArea, QSplitter
+from PyQt5.QtCore import Qt, pyqtSignal
+from PyQt5.QtGui import QFont, QTextCursor
+from struct import Struct
+try:
+    import utils_ui
+    from plugins.base import Plugin_Base
+    from conn import ConnectionStatus
+    from i18n import _
+    from widgets import statusBar
+except ImportError:
+    from COMTool import utils_ui
+    from COMTool.plugins.base import Plugin_Base
+    from COMTool.i18n import _
+    from COMTool.conn import  ConnectionStatus
+    from COMTool.widgets import statusBar
+
+class Plugin(Plugin_Base):
+    id = "DEIFEI"
+    name = _("DUIFEI")
+    showReceiveDataSignal = pyqtSignal(str)
+
+    def onInit(self, config):
+        '''
+            init params
+        '''
+        default = {
+            "version": 1,
+            "customSendItems": [
+                {
+                    "caption": "Self Test",
+                    "icon": "fa5.question-circle",
+                    "data": "5A 54 E1 DD 00 BE 02 5A FE"
+                },
+                {
+                    "caption": "Config - FLJ Low Power",
+                    "icon": "fa5.play-circle",
+                    "data": "5A 54 E3 DD 88 11 00 00 00 59 06 5A FE"
+                },{
+                    "caption": "Config - FLJ Full Power",
+                    "icon": "fa5.play-circle",
+                    "data": "5A 54 E3 DD 66 11 00 00 00 37 06 5A FE"
+                }, {
+                    "caption": "Config - FLJ Silent",
+                    "icon": "fa5.play-circle",
+                    "data": "5A 54 E3 DD 00 11 00 00 00 D1 06 5A FE"
+                },{
+                    "caption": "Config - LJ Low Power",
+                    "icon": "fa5.play-circle",
+                    "data": "5A 54 E3 DD 88 00 00 00 00 48 06 5A FE"
+                },{
+                    "caption": "Config - LJ Full Power",
+                    "icon": "fa5.play-circle",
+                    "data": "5A 54 E3 DD 66 00 00 00 00 26 06 5A FE"
+                },{
+                    "caption": "Config - LJ Silent",
+                    "icon": "fa5.play-circle",
+                    "data": "5A 54 E3 DD 00 00 00 00 00 C0 06 5A FE"
+                },{
+                    "caption": "StatusCheck - FLJ",
+                    "icon": "fa5.play-circle",
+                    "data": "5A 54 E6 DD 99 00 5C 03 5A FE"
+                },{
+                    "caption": "StatusCheck - LJ",
+                    "icon": "fa5.play-circle",
+                    "data": "5A 54 F6 DD 99 00 6C 03 5A FE"
+                },{
+                    "caption": "DataRetrieve - FLJ",
+                    "icon": "fa5.play-circle",
+                    "data": "5A 54 E5 DD 77 00 39 03 5A FE"
+                },{
+                    "caption": "DataRetrieve - LJ",
+                    "icon": "fa5.play-circle",
+                    "data": "5A 54 F5 DD 77 00 49 03 5A FE"
+                }
+            ]
+        }
+        self.config = config
+        for k in default:
+            if not k in self.config:
+                self.config[k] = default[k]
+
+    def onConnChanged(self, status:ConnectionStatus, msg:str):
+        print("-- connection changed: {}, msg: {}".format(status, msg))
+
+    def onWidgetMain(self, parent):
+        '''
+            main widget, just return a QWidget object
+        '''
+        self.mainWidget = QSplitter(Qt.Vertical)
+        # receive widget
+        self.receiveWidget = QTextEdit("")
+        font = QFont('Menlo, Consolas, Bitstream Vera Sans Mono, Courier New, monospace, Microsoft YaHei', 10)
+        self.receiveWidget.setFont(font)
+        self.receiveWidget.setLineWrapMode(QTextEdit.NoWrap)
+        # clear button
+        self.clearBtn = QPushButton("")
+        utils_ui.setButtonIcon(self.clearBtn, "mdi6.broom")
+        # send scroll
+        self.customSendScroll = QScrollArea()
+        self.customSendScroll.setMinimumHeight(20)
+        self.customSendScroll.setWidgetResizable(True)
+        self.customSendScroll.setVerticalScrollBarPolicy(Qt.ScrollBarAsNeeded)
+        self.customSendScroll.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
+        cutomSendItemsWraper = QWidget()
+        self.customSendScroll.setWidget(cutomSendItemsWraper)
+
+        # -- wrapper widget
+        cutomSendItemsWraper0 = QWidget()
+        cutomSendItemsWraper0.setProperty("class", "scrollbar2")
+        layout0 = QVBoxLayout()
+        layout0.setContentsMargins(0,8,0,0)
+        cutomSendItemsWraper0.setLayout(layout0)
+        layout0.addWidget(self.customSendScroll)
+        customSendItemsLayoutWrapper = QVBoxLayout()
+        customSendItemsLayoutWrapper.setContentsMargins(0,0,0,0)
+        cutomSendItemsWraper.setLayout(customSendItemsLayoutWrapper)
+
+        # -- items container
+        self.customItems = QWidget()
+        self.customSendItemsLayout = QVBoxLayout()
+        self.customSendItemsLayout.setContentsMargins(0,0,0,0)
+        self.customItems.setLayout(self.customSendItemsLayout)
+        customSendItemsLayoutWrapper.addWidget(self.customItems)
+        customSendItemsLayoutWrapper.addStretch(0)
+
+        # add widgets
+        self.mainWidget.addWidget(self.receiveWidget)
+        self.mainWidget.addWidget(self.clearBtn)
+        self.mainWidget.addWidget(cutomSendItemsWraper0)
+        self.mainWidget.setStretchFactor(0, 2)
+        self.mainWidget.setStretchFactor(1, 1)
+        self.mainWidget.setStretchFactor(2, 11)
+
+        # event
+        def clearReceived():
+            self.receiveWidget.clear();self.statusBar.clear()
+        self.clearBtn.clicked.connect(clearReceived)
+        return self.mainWidget
+
+    def onWidgetStatusBar(self, parent):
+        self.statusBar = statusBar(rxTxCount=True)
+        return self.statusBar
+
+    def onUiInitDone(self):
+        '''
+            UI init done, you can update your widget here
+            this method runs in UI thread, do not block too long
+        '''
+        newItems = []
+        print(self.config["customSendItems"])
+        for item in self.config["customSendItems"]:
+            print(item)
+            item = self.insertSendItem(item, load=True)
+            newItems.append(item)
+        self.config["customSendItems"] = newItems
+        self.showReceiveDataSignal.connect(self.showReceivedData)
+        # frame struct
+        self.structSelfTestRsp = Struct("<BB B BBBbbb BbBBB H")
+        self.structStatusCheckRsp = Struct("<BB Q      HIII      IBBBBI BBHH HHHIIIIII i II I      IIII d Q dBB dB H I      BBBbbb BbBBB H")
+
+    def insertSendItem(self, item = None, load = False):
+        caption = item["caption"]
+        itemWidget = QWidget()
+        layout = QHBoxLayout()
+        layout.setContentsMargins(0,0,0,0)
+        itemWidget.setLayout(layout)
+        send = QPushButton("")
+        label = QLabel(caption)
+        if (not "icon" in item) or not item["icon"]:
+            item["icon"] = "fa.send"
+        utils_ui.setButtonIcon(send, item["icon"])
+        send.setProperty("class", "smallBtn")
+        def sendCustomData(idx):
+            self.sendCustomItem(self.config["customSendItems"][idx])
+        send.clicked.connect(lambda: sendCustomData(self.customSendItemsLayout.indexOf(itemWidget)))
+        layout.addWidget(label)
+        layout.addWidget(send)
+        self.customSendItemsLayout.addWidget(itemWidget)
+        if not load:
+            self.config["customSendItems"].append(item)
+        return item
+
+    def showReceivedData(self, text: str):
+        curScrollValue = self.receiveWidget.verticalScrollBar().value()
+        self.receiveWidget.moveCursor(QTextCursor.End)
+        endScrollValue = self.receiveWidget.verticalScrollBar().value()
+        self.receiveWidget.insertPlainText(text)
+        if curScrollValue < endScrollValue:
+            self.receiveWidget.verticalScrollBar().setValue(curScrollValue)
+        else:
+            self.receiveWidget.moveCursor(QTextCursor.End)
+
+    def onReceived(self, data : bytes):
+        '''
+            call in receive thread, not UI thread
+        '''
+        self.statusBar.addRx(len(data))
+        ## Apply data validation check
+        if len(data) < 7:
+            self.showReceiveDataSignal.emit("\n### Wrong data format: wrong frame header/tail\n")
+            return
+
+        dataLen = data[-3]
+        if data[0] != 0x5A or data[1] != 0x54 or data[-1] != 0xFE or data[-2] != 0x5A:
+            self.showReceiveDataSignal.emit("\n### Wrong data format: wrong length\n")
+
+        checkSum = 0
+        for i in data[2:-4]:
+            checkSum += i
+        if checkSum & 0xFF != data[-4]:
+            self.showReceiveDataSignal.emit("\n### Wrong data format: wrong check sum\n")
+
+        ## Eval data
+        data = data[2:-5].replace(b'\x00\x54\xFE', b'\x54\xFE')
+        # self.printFrame(data)
+        if data[0] == 0xE1:
+            # eval self test
+            self.showReceiveDataSignal.emit(self.evalSelfTestRsp(data) + "\n")
+        elif data[0] == 0xE6 or data[0] == 0xF6:
+            self.showReceiveDataSignal.emit(self.evalStatusCheckRsp(data) + "\n")
+        else:
+            self.showReceiveDataSignal.emit(f"\n### Unexpected response code 0x{data[0]:02x}.\n")
+
+    def evalSelfTestRsp(self, data: bytes):
+        try:
+            payload = self.structSelfTestRsp.unpack(data)
+        except :
+            return f"\n### evalSelfTestRsp:: Failed to unpack data (data length {len(data)} byte).\n"
+
+        ret = "----------- 自检回令 -----------\n"
+        ret += "节点类型: "
+        ret += "K频段(0xDD)\n" if payload[1] == 0xDD else "S频段(0xDD)\n"
+
+        ret += "自检结果: "
+        ret += "正常(0xAA)\n" if payload[2] == 0xAA else "异常(0x55 or other)\n"
+
+        hwOffset = 3
+
+        ret += f"FPGA 电压监测: {bin(payload[hwOffset+0])[2:].zfill(8)}\n"
+        ret += f"时钟锁定状态:   {bin(payload[hwOffset+1])[2:].zfill(8)}\n"
+        ret += f"AD 锁定状态:   {bin(payload[hwOffset+2])[2:].zfill(8)}\n"
+        ret += f"AD 温度 1: {payload[hwOffset+3]:>4d}\n"
+        ret += f"AD 温度 2: {payload[hwOffset+4]:>4d}\n"
+        ret += f"FPGA 温度: {payload[hwOffset+5]:>4d}\n"
+        ret += f"电压监测: {bin(payload[hwOffset+6])[2:].zfill(8)}\n"
+        ret += f"射频温度: {payload[hwOffset+7]:>4d}\n"
+        ret += f"锁定指示: {bin(payload[hwOffset+8])[2:].zfill(8)}\n"
+        ret += f"MGC 1~2: {payload[hwOffset+9] & 0x0f:>2d} - {payload[hwOffset+9] >> 4:>2d}\n"
+        ret += f"MGC 3~4: {payload[hwOffset+10] & 0x0f:>2d} - {payload[hwOffset+10] >> 4:>2d}\n"
+        ret += "--------------------------------\n"
+
+        return ret
+
+    def printFrame(self, data: bytes):
+        ret = ''
+        for i in data:
+            ret += f'{i:02X} '
+        print(ret)
+
+    def evalStatusCheckRsp(self, data: bytes):
+        try:
+            payload = self.structStatusCheckRsp.unpack(data)
+        except :
+            return f"\n### evalStatusCheckRsp:: Failed to unpack data (data length {len(data)} byte).\n"
+
+        ret = "----------- 遥测回令 -----------\n"
+        ret += "节点类型: "
+        ret += "K频段(0xDD)\n" if payload[1] == 0xDD else "S频段(0xDD)\n"
+
+        ret += f"时间戳: {payload[2]/1e2:.2f} us\n"
+
+        sysbusOffset = 3
+        linkOffset = 7
+        phyOffset = 30
+        hwOffset = 43
+
+        ret += "\n  -- 总线状态\n"
+        ret += f"配置装订:    {payload[sysbusOffset + 0]:04X}\n"
+        ret += f"装置点名计数: {payload[sysbusOffset + 1]:>6d}\n"
+        ret += f"业务下发计数: {payload[sysbusOffset + 2]:>6d}\n"
+        ret += f"遥测请求计数: {payload[sysbusOffset + 3]:>6d}\n"
+
+        ret += "\n  -- 链路层状态\n"
+        ret += f"帧号:   {payload[linkOffset + 0]:>6d}\n"
+        ret += f"时隙号: {payload[linkOffset + 1]:>3d}\n"
+
+        ret += "当前角色: "
+        if payload[linkOffset + 2] == 0xAA:
+            ret += f"反拦截 (0x{payload[linkOffset + 2]:02X})\n"
+        elif payload[linkOffset + 2] == 0xCC:
+            ret += f"拦截 (0x{payload[linkOffset + 2]:02X})\n"
+        else:
+            ret += f"【未知错误】(0x{payload[linkOffset + 2]:02X})\n"
+
+        ret += "网络连接状态: "
+        if payload[linkOffset + 3] == 0x11:
+            ret += f"已连接 (0x{payload[linkOffset + 3]:02X})\n"
+        elif payload[linkOffset + 3] == 0x00:
+            ret += f"未连接 (0x{payload[linkOffset + 3]:02X})\n"
+        else:
+            ret += f"【未知错误】(0x{payload[linkOffset + 3]:02X})\n"
+
+        ret += "网络运行阶段: "
+        if payload[linkOffset + 4] == 0x11:
+            ret += f"扫描建网 (0x{payload[linkOffset + 4]:02X})\n"
+        elif payload[linkOffset + 4] == 0x22:
+            ret += f"业务通信 (0x{payload[linkOffset + 4]:02X})\n"
+        else:
+            ret += f"【未知错误】(0x{payload[linkOffset + 4]:02X})\n"
+
+        ret += f"重建/入网计数: {payload[linkOffset + 5]:>6d}\n"
+        ret += f"通信波位号:  {payload[linkOffset + 6]:>2d}\n"
+
+        ret += "通信波束宽度: "
+        if payload[linkOffset + 7] == 0x00:
+            ret += f"8° 窄波束 (0x{payload[linkOffset + 7]:02X})\n"
+        elif payload[linkOffset + 7] == 0x10:
+            ret += f"25° 次波束 (0x{payload[linkOffset + 7]:02X})\n"
+        elif payload[linkOffset + 7] == 0x20:
+            ret += f"60° 次波束 (0x{payload[linkOffset + 7]:02X})\n"
+        elif payload[linkOffset + 7] == 0x30:
+            ret += f"120° 宽波束 (0x{payload[linkOffset + 7]:02X})\n"
+        else:
+            ret += f"【未知错误】(0x{payload[linkOffset + 7]:02X})\n"
+
+        ret += f"离轴角: {payload[linkOffset + 8]*0.1:.2f}°\n"
+        ret += f"偏航角: {payload[linkOffset + 9]*0.1:.2f}°\n"
+        ret += f"基准帧发送计数: {payload[linkOffset + 10]:>6d}\n"
+        ret += f"基准帧接收计数: {payload[linkOffset + 11]:>6d}\n"
+        ret += f"基准帧正确计数: {payload[linkOffset + 12]:>6d}\n"
+        ret += f"双向握手帧发送计数: {payload[linkOffset + 13]:>6d}\n"
+        ret += f"双向握手帧接收计数: {payload[linkOffset + 14]:>6d}\n"
+        ret += f"双向握手帧正确计数: {payload[linkOffset + 15]:>6d}\n"
+        ret += f"业务帧发送计数: {payload[linkOffset + 16]:>6d}\n"
+        ret += f"业务帧接收计数: {payload[linkOffset + 17]:>6d}\n"
+        ret += f"业务帧正确计数: {payload[linkOffset + 18]:>6d}\n"
+        ret += f"时间偏差记录: {payload[linkOffset + 19]/1e2:.2f} us\n"
+        ret += f"发送数据 ID: {payload[linkOffset + 20]:>6d}\n"
+        ret += f"接收数据 ID: {payload[linkOffset + 21]:>6d}\n"
+
+        ret += "\n  -- 物理层状态\n"
+        ret += f"捕获计数:    {payload[phyOffset + 0]:>6d}\n"
+        ret += f"帧同步计数:  {payload[phyOffset + 1]:>6d}\n"
+        ret += f"译码计数:    {payload[phyOffset + 2]:>6d}\n"
+        ret += f"CRC 正确计数:{payload[phyOffset + 3]:>6d}\n"
+        ret += f"多普勒估计:  {payload[phyOffset + 4]:.2f} Hz\n"
+        ret += f"正确接收时刻: {payload[phyOffset + 5]/1e2:.2f} us\n"
+        ret += f"捕获峰均比:  {payload[phyOffset + 6]:.2f}\n"
+        ret += f"捕获相位值:  {payload[phyOffset + 7]:>3d}\n"
+        ret += f"捕获频偏通道: {payload[phyOffset + 8]:>3d}\n"
+        ret += f"帧同步峰均比:   {payload[phyOffset + 9]:.2f}\n"
+        ret += f"帧同步频偏通道: {payload[phyOffset + 10]:>3d}\n"
+        ret += f"交织输入数据幅度统计:\t0x{payload[phyOffset + 11]:04X}\n"
+
+        ret += "\n  -- 硬件状态\n"
+        ret += f"FPGA 电压监测: {bin(payload[hwOffset+0])[2:].zfill(8)}\n"
+        ret += f"时钟锁定状态:   {bin(payload[hwOffset+1])[2:].zfill(8)}\n"
+        ret += f"AD 锁定状态:   {bin(payload[hwOffset+2])[2:].zfill(8)}\n"
+        ret += f"AD 温度 1: {payload[hwOffset+3]:>4d}\n"
+        ret += f"AD 温度 2: {payload[hwOffset+4]:>4d}\n"
+        ret += f"FPGA 温度: {payload[hwOffset+5]:>4d}\n"
+        ret += f"电压监测: {bin(payload[hwOffset+6])[2:].zfill(8)}\n"
+        ret += f"射频温度: {payload[hwOffset+7]:>4d}\n"
+        ret += f"锁定指示: {bin(payload[hwOffset+8])[2:].zfill(8)}\n"
+        ret += f"MGC 1~2: {payload[hwOffset+9] & 0x0f:>2d} - {payload[hwOffset+9] >> 4:>2d}\n"
+        ret += f"MGC 3~4: {payload[hwOffset+10] & 0x0f:>2d} - {payload[hwOffset+10] >> 4:>2d}\n"
+
+        ret += "--------------------------------\n"
+        return ret
+
+    def onSent(self, ok, msg, length, path):
+        if ok:
+            self.statusBar.addTx(length)
+        else:
+            self.hintSignal.emit("error", _("Error"), _("Send data failed!") + " " + msg)
+
+    def sendCustomItem(self, item):
+        data = item["data"]
+        dateBytes = self.parseSendData(data, encoding = self.configGlobal["encoding"], isHexStr = True)
+        if dateBytes:
+            self.send(dateBytes, callback=self.onSent)

df_datalink_ge/src/config/app_config.h

@@ -93,9 +93,6 @@
 #if !defined(DATALINK_ENABLE_AUTOTIMESYNC)
 	#warning To enbale bit error rate test, auto time-sync should be enabled...
 #endif
-#if defined(DATALINK_ENABLE_AUTORECONNECT)
-	#error Do not support auto reconnnect in bit error rate test mode...
-#endif
 #endif
 
 #endif

df_datalink_ge/src/hardware/headless.h

@@ -1,7 +1,7 @@
 /*
  * headless.h
  *
- *  Created on: 2021Äê6ÔÂ8ÈÕ
+ *  Created on: 2021��6��8��
  *      Author: Josh
  */
 
@@ -30,7 +30,8 @@
 /**************************** Type Definitions *******************************/
 
 /***************** Macros (Inline Functions) Definitions *********************/
-
+#define HW_PRINT(...)  __asm__("nop")
+// #define HW_PRINT(...)  printf(__VA_ARGS__)
 /************************** Variable Definitions *****************************/
 
 /************************** Function Prototypes ******************************/

df_datalink_ge/src/main.c

@@ -51,33 +51,39 @@ void ScuTimer_IntrHandler(void *context);
 void Systembus_RxIntrHandler(void *context);
 void Systembus_TxIntrHandler(void *context);
 /************************** Constant Definitions *****************************/
-struct callback_desc phy_callback_desc = {
+struct callback_desc phy_callback_desc =
+{
 	.callback = Phy_IntrHandler,
 	.ctx = NULL
 };
 
-struct callback_desc periodicpull_callback_desc = {
+struct callback_desc periodicpull_callback_desc =
+{
 	.callback = PeriodicPull_Handler,
 	.ctx = NULL
 };
 
 
-struct callback_desc sysbus_rx_callback_desc = {
+struct callback_desc sysbus_rx_callback_desc =
+{
 	.callback = Systembus_RxIntrHandler,
 	.ctx = NULL
 };
 
-struct callback_desc sysbus_tx_callback_desc = {
+struct callback_desc sysbus_tx_callback_desc =
+{
 	.callback = Systembus_TxIntrHandler,
 	.ctx = NULL
 };
 
-struct callback_desc scutm_callback_desc = {
+struct callback_desc scutm_callback_desc =
+{
 	.callback = ScuTimer_IntrHandler,
 	.ctx = NULL
 };
 
-L2_CONFIG linkConfig = {
+L2_CONFIG linkConfig =
+{
 	.myType = L2_NODE_HEAD,
 	.clustId = 1,
 	.myId = 1,
@@ -99,16 +105,23 @@ L2_CONFIG linkConfig = {
 // 	.tmcInstPtr = NULL
 // };
 
-static PHY_CONFIG phyConfig = {
+static PHY_CONFIG phyConfig =
+{
 	.devId = 0,
 	.baseAddr = PHY_BASEADDR,
 	.antBramId = PHY_ANTCONFIG_BRAM_DEVICE_ID,
+	.antInfoBramId = -1,
 	.txBramId = PHY_TXBUFF_BRAM_DEVICE_ID,
 	.rxBramId = PHY_RXBUFF_BRAM_DEVICE_ID,
-	.hwXadcId = PHY_HW_XADC_DEVICE_ID
+	.hwXadcId = PHY_HW_XADC_DEVICE_ID,
+	.get_clk_state = NULL,
+	.get_ad_lock_state = NULL,
+	.get_ad0_temp = NULL,
+	.get_ad1_temp = NULL
 };
 
-TMC_CONFIG tmcConfig = {
+TMC_CONFIG tmcConfig =
+{
 	.baseAddr = TIME_CONTROLLER_BASEADDR,
 	.reset = 10
 };
@@ -359,8 +372,8 @@ void ScuTimer_IntrHandler(void *context)
 	xdesc = (struct xil_timer_desc *)(logTmPtr->extra);
 	if (XScuTimer_IsExpired((XScuTimer *)xdesc->instance))
 	{
-		// Update log
+		// Refresh log
-		Phy_UpdateHwSate(phyInstPtr);
+		Phy_RefreshHwSate(phyInstPtr);
 		XScuTimer_ClearInterruptStatus((XScuTimer *)xdesc->instance);
 	}
 	else

df_datalink_sp/bsp/ps7_cortexa9_0/include/xparameters.h

@@ -42,10 +42,28 @@
  
 /******************************************************************/
 /* Definitions for driver BRAM */
-#define XPAR_XBRAM_NUM_INSTANCES 3U
+#define XPAR_XBRAM_NUM_INSTANCES 4U
+
+/* Definitions for peripheral PHY_DATA_INTERFACE_ANT_BEAM_BRAM_CTRL */
+#define XPAR_PHY_DATA_INTERFACE_ANT_BEAM_BRAM_CTRL_DEVICE_ID 0U
+#define XPAR_PHY_DATA_INTERFACE_ANT_BEAM_BRAM_CTRL_DATA_WIDTH 32U
+#define XPAR_PHY_DATA_INTERFACE_ANT_BEAM_BRAM_CTRL_ECC 0U
+#define XPAR_PHY_DATA_INTERFACE_ANT_BEAM_BRAM_CTRL_FAULT_INJECT 0U
+#define XPAR_PHY_DATA_INTERFACE_ANT_BEAM_BRAM_CTRL_CE_FAILING_REGISTERS 0U
+#define XPAR_PHY_DATA_INTERFACE_ANT_BEAM_BRAM_CTRL_UE_FAILING_REGISTERS 0U
+#define XPAR_PHY_DATA_INTERFACE_ANT_BEAM_BRAM_CTRL_ECC_STATUS_REGISTERS 0U
+#define XPAR_PHY_DATA_INTERFACE_ANT_BEAM_BRAM_CTRL_CE_COUNTER_WIDTH 0U
+#define XPAR_PHY_DATA_INTERFACE_ANT_BEAM_BRAM_CTRL_ECC_ONOFF_REGISTER 0U
+#define XPAR_PHY_DATA_INTERFACE_ANT_BEAM_BRAM_CTRL_ECC_ONOFF_RESET_VALUE 0U
+#define XPAR_PHY_DATA_INTERFACE_ANT_BEAM_BRAM_CTRL_WRITE_ACCESS 0U
+#define XPAR_PHY_DATA_INTERFACE_ANT_BEAM_BRAM_CTRL_S_AXI_BASEADDR 0x42000000U
+#define XPAR_PHY_DATA_INTERFACE_ANT_BEAM_BRAM_CTRL_S_AXI_HIGHADDR 0x42000FFFU
+#define XPAR_PHY_DATA_INTERFACE_ANT_BEAM_BRAM_CTRL_S_AXI_CTRL_BASEADDR 0xFFFFFFFFU  
+#define XPAR_PHY_DATA_INTERFACE_ANT_BEAM_BRAM_CTRL_S_AXI_CTRL_HIGHADDR 0xFFFFFFFFU  
+
 
 /* Definitions for peripheral PHY_DATA_INTERFACE_ANT_INFO_BRAM_CTRL */
-#define XPAR_PHY_DATA_INTERFACE_ANT_INFO_BRAM_CTRL_DEVICE_ID 0U
+#define XPAR_PHY_DATA_INTERFACE_ANT_INFO_BRAM_CTRL_DEVICE_ID 1U
 #define XPAR_PHY_DATA_INTERFACE_ANT_INFO_BRAM_CTRL_DATA_WIDTH 32U
 #define XPAR_PHY_DATA_INTERFACE_ANT_INFO_BRAM_CTRL_ECC 0U
 #define XPAR_PHY_DATA_INTERFACE_ANT_INFO_BRAM_CTRL_FAULT_INJECT 0U
@@ -63,7 +81,7 @@
 
 
 /* Definitions for peripheral PHY_DATA_INTERFACE_RX_FRAME_BRAM_CTRL */
-#define XPAR_PHY_DATA_INTERFACE_RX_FRAME_BRAM_CTRL_DEVICE_ID 1U
+#define XPAR_PHY_DATA_INTERFACE_RX_FRAME_BRAM_CTRL_DEVICE_ID 2U
 #define XPAR_PHY_DATA_INTERFACE_RX_FRAME_BRAM_CTRL_DATA_WIDTH 32U
 #define XPAR_PHY_DATA_INTERFACE_RX_FRAME_BRAM_CTRL_ECC 0U
 #define XPAR_PHY_DATA_INTERFACE_RX_FRAME_BRAM_CTRL_FAULT_INJECT 0U
@@ -81,7 +99,7 @@
 
 
 /* Definitions for peripheral PHY_DATA_INTERFACE_TX_FRAME_BRAM_CTRL */
-#define XPAR_PHY_DATA_INTERFACE_TX_FRAME_BRAM_CTRL_DEVICE_ID 2U
+#define XPAR_PHY_DATA_INTERFACE_TX_FRAME_BRAM_CTRL_DEVICE_ID 3U
 #define XPAR_PHY_DATA_INTERFACE_TX_FRAME_BRAM_CTRL_DATA_WIDTH 32U
 #define XPAR_PHY_DATA_INTERFACE_TX_FRAME_BRAM_CTRL_ECC 0U
 #define XPAR_PHY_DATA_INTERFACE_TX_FRAME_BRAM_CTRL_FAULT_INJECT 0U
@@ -100,8 +118,8 @@
 
 /******************************************************************/
 
-/* Canonical definitions for peripheral PHY_DATA_INTERFACE_ANT_INFO_BRAM_CTRL */
+/* Canonical definitions for peripheral PHY_DATA_INTERFACE_ANT_BEAM_BRAM_CTRL */
-#define XPAR_BRAM_0_DEVICE_ID XPAR_PHY_DATA_INTERFACE_ANT_INFO_BRAM_CTRL_DEVICE_ID
+#define XPAR_BRAM_0_DEVICE_ID XPAR_PHY_DATA_INTERFACE_ANT_BEAM_BRAM_CTRL_DEVICE_ID
 #define XPAR_BRAM_0_DATA_WIDTH 32U
 #define XPAR_BRAM_0_ECC 0U
 #define XPAR_BRAM_0_FAULT_INJECT 0U
@@ -112,13 +130,13 @@
 #define XPAR_BRAM_0_ECC_ONOFF_REGISTER 0U
 #define XPAR_BRAM_0_ECC_ONOFF_RESET_VALUE 0U
 #define XPAR_BRAM_0_WRITE_ACCESS 0U
-#define XPAR_BRAM_0_BASEADDR 0x40004000U
+#define XPAR_BRAM_0_BASEADDR 0x42000000U
-#define XPAR_BRAM_0_HIGHADDR 0x40005FFFU
+#define XPAR_BRAM_0_HIGHADDR 0x42000FFFU
 #define XPAR_BRAM_0_CTRL_BASEADDR 0xFFFFFFFFU  
 #define XPAR_BRAM_0_CTRL_HIGHADDR 0xFFFFFFFEU  
 
-/* Canonical definitions for peripheral PHY_DATA_INTERFACE_RX_FRAME_BRAM_CTRL */
+/* Canonical definitions for peripheral PHY_DATA_INTERFACE_ANT_INFO_BRAM_CTRL */
-#define XPAR_BRAM_1_DEVICE_ID XPAR_PHY_DATA_INTERFACE_RX_FRAME_BRAM_CTRL_DEVICE_ID
+#define XPAR_BRAM_1_DEVICE_ID XPAR_PHY_DATA_INTERFACE_ANT_INFO_BRAM_CTRL_DEVICE_ID
 #define XPAR_BRAM_1_DATA_WIDTH 32U
 #define XPAR_BRAM_1_ECC 0U
 #define XPAR_BRAM_1_FAULT_INJECT 0U
@@ -129,13 +147,13 @@
 #define XPAR_BRAM_1_ECC_ONOFF_REGISTER 0U
 #define XPAR_BRAM_1_ECC_ONOFF_RESET_VALUE 0U
 #define XPAR_BRAM_1_WRITE_ACCESS 0U
-#define XPAR_BRAM_1_BASEADDR 0x40000000U
+#define XPAR_BRAM_1_BASEADDR 0x40004000U
-#define XPAR_BRAM_1_HIGHADDR 0x40001FFFU
+#define XPAR_BRAM_1_HIGHADDR 0x40005FFFU
 #define XPAR_BRAM_1_CTRL_BASEADDR 0xFFFFFFFFU  
 #define XPAR_BRAM_1_CTRL_HIGHADDR 0xFFFFFFFEU  
 
-/* Canonical definitions for peripheral PHY_DATA_INTERFACE_TX_FRAME_BRAM_CTRL */
+/* Canonical definitions for peripheral PHY_DATA_INTERFACE_RX_FRAME_BRAM_CTRL */
-#define XPAR_BRAM_2_DEVICE_ID XPAR_PHY_DATA_INTERFACE_TX_FRAME_BRAM_CTRL_DEVICE_ID
+#define XPAR_BRAM_2_DEVICE_ID XPAR_PHY_DATA_INTERFACE_RX_FRAME_BRAM_CTRL_DEVICE_ID
 #define XPAR_BRAM_2_DATA_WIDTH 32U
 #define XPAR_BRAM_2_ECC 0U
 #define XPAR_BRAM_2_FAULT_INJECT 0U
@@ -146,11 +164,28 @@
 #define XPAR_BRAM_2_ECC_ONOFF_REGISTER 0U
 #define XPAR_BRAM_2_ECC_ONOFF_RESET_VALUE 0U
 #define XPAR_BRAM_2_WRITE_ACCESS 0U
-#define XPAR_BRAM_2_BASEADDR 0x40002000U
+#define XPAR_BRAM_2_BASEADDR 0x40000000U
-#define XPAR_BRAM_2_HIGHADDR 0x40003FFFU
+#define XPAR_BRAM_2_HIGHADDR 0x40001FFFU
 #define XPAR_BRAM_2_CTRL_BASEADDR 0xFFFFFFFFU  
 #define XPAR_BRAM_2_CTRL_HIGHADDR 0xFFFFFFFEU  
 
+/* Canonical definitions for peripheral PHY_DATA_INTERFACE_TX_FRAME_BRAM_CTRL */
+#define XPAR_BRAM_3_DEVICE_ID XPAR_PHY_DATA_INTERFACE_TX_FRAME_BRAM_CTRL_DEVICE_ID
+#define XPAR_BRAM_3_DATA_WIDTH 32U
+#define XPAR_BRAM_3_ECC 0U
+#define XPAR_BRAM_3_FAULT_INJECT 0U
+#define XPAR_BRAM_3_CE_FAILING_REGISTERS 0U
+#define XPAR_BRAM_3_UE_FAILING_REGISTERS 0U
+#define XPAR_BRAM_3_ECC_STATUS_REGISTERS 0U
+#define XPAR_BRAM_3_CE_COUNTER_WIDTH 0U
+#define XPAR_BRAM_3_ECC_ONOFF_REGISTER 0U
+#define XPAR_BRAM_3_ECC_ONOFF_RESET_VALUE 0U
+#define XPAR_BRAM_3_WRITE_ACCESS 0U
+#define XPAR_BRAM_3_BASEADDR 0x40002000U
+#define XPAR_BRAM_3_HIGHADDR 0x40003FFFU
+#define XPAR_BRAM_3_CTRL_BASEADDR 0xFFFFFFFFU  
+#define XPAR_BRAM_3_CTRL_HIGHADDR 0xFFFFFFFEU  
+
 
 /******************************************************************/
 

df_datalink_sp/bsp/ps7_cortexa9_0/libsrc/bram_v4_3/src/xbram_g.c

@@ -42,6 +42,25 @@
 
 XBram_Config XBram_ConfigTable[] =
 {
+	{
+		XPAR_PHY_DATA_INTERFACE_ANT_BEAM_BRAM_CTRL_DEVICE_ID,
+		XPAR_PHY_DATA_INTERFACE_ANT_BEAM_BRAM_CTRL_DATA_WIDTH,
+		XPAR_PHY_DATA_INTERFACE_ANT_BEAM_BRAM_CTRL_ECC,
+		XPAR_PHY_DATA_INTERFACE_ANT_BEAM_BRAM_CTRL_FAULT_INJECT,
+		XPAR_PHY_DATA_INTERFACE_ANT_BEAM_BRAM_CTRL_CE_FAILING_REGISTERS,
+		0,
+		XPAR_PHY_DATA_INTERFACE_ANT_BEAM_BRAM_CTRL_UE_FAILING_REGISTERS,
+		0,
+		XPAR_PHY_DATA_INTERFACE_ANT_BEAM_BRAM_CTRL_ECC_STATUS_REGISTERS,
+		XPAR_PHY_DATA_INTERFACE_ANT_BEAM_BRAM_CTRL_CE_COUNTER_WIDTH,
+		XPAR_PHY_DATA_INTERFACE_ANT_BEAM_BRAM_CTRL_ECC_ONOFF_REGISTER,
+		XPAR_PHY_DATA_INTERFACE_ANT_BEAM_BRAM_CTRL_ECC_ONOFF_RESET_VALUE,
+		XPAR_PHY_DATA_INTERFACE_ANT_BEAM_BRAM_CTRL_WRITE_ACCESS,
+		XPAR_PHY_DATA_INTERFACE_ANT_BEAM_BRAM_CTRL_S_AXI_BASEADDR,
+		XPAR_PHY_DATA_INTERFACE_ANT_BEAM_BRAM_CTRL_S_AXI_HIGHADDR,
+		XPAR_PHY_DATA_INTERFACE_ANT_BEAM_BRAM_CTRL_S_AXI_CTRL_BASEADDR,
+		XPAR_PHY_DATA_INTERFACE_ANT_BEAM_BRAM_CTRL_S_AXI_CTRL_HIGHADDR
+	},
 	{
 		XPAR_PHY_DATA_INTERFACE_ANT_INFO_BRAM_CTRL_DEVICE_ID,
 		XPAR_PHY_DATA_INTERFACE_ANT_INFO_BRAM_CTRL_DATA_WIDTH,

df_datalink_sp/bsp/system.mss

@@ -24,6 +24,12 @@ BEGIN DRIVER
  PARAMETER HW_INSTANCE = axi_spi_engine_axi_spi_engine
 END
 
+BEGIN DRIVER
+ PARAMETER DRIVER_NAME = bram
+ PARAMETER DRIVER_VER = 4.3
+ PARAMETER HW_INSTANCE = phy_data_interface_ant_beam_bram_ctrl
+END
+
 BEGIN DRIVER
  PARAMETER DRIVER_NAME = bram
  PARAMETER DRIVER_VER = 4.3

df_datalink_sp/build/src/subdir.mk

@@ -8,15 +8,18 @@ LD_SRCS += \
 
 C_SRCS += \
 ../src/main.c \
-../src/system_monitor.c 
+../src/system_monitor.c \
+../src/hwconfig.c
 
 OBJS += \
 ./src/main.o \
-./src/system_monitor.o 
+./src/system_monitor.o \
+./src/hwconfig.o
 
 C_DEPS += \
 ./src/main.d \
-./src/system_monitor.d 
+./src/system_monitor.d \
+./src/hwconfig.d
 
 
 # Each subdirectory must supply rules for building sources it contributes

df_datalink_sp/src/config/app_config.h

@@ -58,6 +58,7 @@
 #define PHY_BEAM_FORMING_ENABLE
 // -- Antenna Bram Configs
 #define PHY_ANTCONFIG_BRAM_DEVICE_ID XPAR_PHY_DATA_INTERFACE_ANT_INFO_BRAM_CTRL_DEVICE_ID
+#define PHY_ANTINFO_BRAM_DEVICE_ID XPAR_PHY_DATA_INTERFACE_ANT_BEAM_BRAM_CTRL_DEVICE_ID
 // -- Buffers
 #define PHY_TXBUFF_BRAM_DEVICE_ID XPAR_PHY_DATA_INTERFACE_TX_FRAME_BRAM_CTRL_DEVICE_ID
 #define PHY_RXBUFF_BRAM_DEVICE_ID XPAR_PHY_DATA_INTERFACE_RX_FRAME_BRAM_CTRL_DEVICE_ID
@@ -190,9 +191,6 @@ typedef enum
 #if !defined(DATALINK_ENABLE_AUTOTIMESYNC)
 	#warning To enbale bit error rate test, auto time-sync should be enabled...
 #endif
-#if defined(DATALINK_ENABLE_AUTORECONNECT)
-	#error Do not support auto reconnnect in bit error rate test mode...
-#endif
 #endif
 
 #endif //__APP_CONFIG_H_

df_datalink_sp/src/hwconfig.c

@@ -0,0 +1,464 @@
+/*****************************************************************************/
+/**
+ * Description: hwconfig.h
+ *
+
+ * Date: 2024-02-20 13:19
+ * Last Edit Time: [2024-02-20 13:19]
+ *
+ * Revisions: Rev 0.0
+ * History:
+ * [2023-05-07]: Initial edition.
+ *
+ * Copyright(c) 2024 Beijing Institute of Technology.
+ *
+ ******************************************************************************/
+
+/***************************** Include Files *********************************/
+// Standard
+#include <stdint.h>
+#include <stdbool.h>
+// Xilinx
+#include "xgpiops.h"
+#include "drivers/rf-transceiver/ad9361_reg/ad9361_reg.h"
+#include "drivers/rf-transceiver/ad9361/ad9361_api.h"
+#include "drivers/axi_core/spi_engine/spi_engine.h"
+// App
+#include "common.h"
+#include "error.h"
+#include "delay.h"
+#include "system_monitor.h"
+#include "hwconfig.h"
+#include "config/app_config.h"
+#include "dev_profile/dev_profile.h"
+
+/************************** Function Prototypes ******************************/
+/*********************** Driver Instance Definitions **************************/
+static struct hmc7044_dev *hmc7044_inst;
+static struct ad9361_reg_dev *ad9361_1_reg_inst;
+static struct ad9361_reg_dev *ad9361_2_reg_inst;
+// static struct ad9361_rf_phy *ad9361_phy;
+// static struct ad9361_rf_phy *ad9361_2_phy;
+
+/*****************************************************************************/
+/**
+ * @brief   Hardware_Init
+ *
+ * @param   none.
+ *
+ * @return  None.
+ *
+ ******************************************************************************/
+int32_t Hardware_Init(void)
+{
+	int32_t Status;
+	XGpioPs Gpio;
+	XGpioPs_Config *ConfigPtr;
+	ConfigPtr = XGpioPs_LookupConfig(AD9361_GPIO_DEVICE_ID);
+	Status = XGpioPs_CfgInitialize(&Gpio, ConfigPtr, ConfigPtr->BaseAddr);
+	if (Status != SUCCESS)
+	{
+		return FAILURE;
+	}
+
+	/**********************************************************/
+	/****************** HMC7044 Configuration *****************/
+	/**********************************************************/
+	Status = hmc7044_init(&hmc7044_inst, &hmc7044_default_init_param);
+	if (Status != SUCCESS)
+	{
+		DBG_ERROR("hmc7044_init() error: %" PRId32 "\n", Status);
+		return FAILURE;
+	}
+
+	/**********************************************************/
+	/***************** AD9361-1 Configuration *****************/
+	/**********************************************************/
+	XGpioPs_SetDirectionPin(&Gpio, AD9361_1_TXNRX, AD9361_GPIO_OUTPUT);
+	XGpioPs_SetDirectionPin(&Gpio, AD9361_1_ENABLE, AD9361_GPIO_OUTPUT);
+	XGpioPs_SetDirectionPin(&Gpio, AD9361_1_EN_AGC, AD9361_GPIO_OUTPUT);
+	XGpioPs_SetDirectionPin(&Gpio, AD9361_1_RESET_B, AD9361_GPIO_OUTPUT);
+
+	ad9361_reg_init(&ad9361_1_reg_inst, &ad9361_1_reg_default_init_param);
+	XGpioPs_WritePin(&Gpio, AD9361_1_ENABLE, 0);
+	ad9361_reg_config(ad9361_1_reg_inst);
+	XGpioPs_WritePin(&Gpio, AD9361_1_ENABLE, 1);
+
+	//	Status = ad9361_init(&ad9361_phy, &ad9361_default_init_param);
+	//	if (Status != XST_SUCCESS){
+	//		return XST_FAILURE;
+	//	}else{
+	//		printf("Configurate AD9361 Completely!\n");
+	//	}
+	//	ad9361_set_tx_fir_config(ad9361_phy, tx_fir_config);
+	//	ad9361_set_rx_fir_config(ad9361_phy, rx_fir_config);
+
+	/**********************************************************/
+	/***************** AD9361-2 Configuration *****************/
+	/**********************************************************/
+	XGpioPs_SetDirectionPin(&Gpio, AD9361_2_TXNRX, AD9361_GPIO_OUTPUT);
+	XGpioPs_SetDirectionPin(&Gpio, AD9361_2_ENABLE, AD9361_GPIO_OUTPUT);
+	XGpioPs_SetDirectionPin(&Gpio, AD9361_2_EN_AGC, AD9361_GPIO_OUTPUT);
+	XGpioPs_SetDirectionPin(&Gpio, AD9361_2_RESET_B, AD9361_GPIO_OUTPUT);
+
+	ad9361_reg_init(&ad9361_2_reg_inst, &ad9361_2_reg_default_init_param);
+	XGpioPs_WritePin(&Gpio, AD9361_2_ENABLE, 0);
+	ad9361_reg_config(ad9361_2_reg_inst);
+	XGpioPs_WritePin(&Gpio, AD9361_2_ENABLE, 1);
+
+	//	uint8_t rd_back;
+	//	Status = ad9361_reg_read(ad9361_1_reg_inst, 0x0002, &rd_back);
+	//	Status = ad9361_reg_read(ad9361_2_reg_inst, 0x0002, &rd_back);
+
+	/**********************************************************/
+	/******* AD9361 Baseband Multichip Synchronization ********/
+	/**********************************************************/
+	XGpioPs_SetDirectionPin(&Gpio, AD9361_SYNC, AD9361_GPIO_OUTPUT);
+	XGpioPs_SetDirectionPin(&Gpio, AD9361_RX_FIFO_RST, AD9361_GPIO_OUTPUT);
+
+	// SYNC BBPLL and DIGITAL SAMPLING CLOCKS
+	ad9361_reg_write(ad9361_1_reg_inst, 0x0001, 0x0D); // MCS RF Enable; MCS BBPLL Enable; MCS BB Enable
+	ad9361_reg_write(ad9361_2_reg_inst, 0x0001, 0x0D);
+	ad9361_reg_write(ad9361_1_reg_inst, 0x0047, 0x80); // MCS refclk Scale Enable
+	ad9361_reg_write(ad9361_2_reg_inst, 0x0047, 0x80);
+	XGpioPs_WritePin(&Gpio, AD9361_SYNC, 0);
+	mdelay(20);
+	XGpioPs_WritePin(&Gpio, AD9361_SYNC, 1); // Input a rising-edge pulse to the SYNC_IN pin
+	mdelay(500);
+	XGpioPs_WritePin(&Gpio, AD9361_SYNC, 0);
+	mdelay(2000);
+	ad9361_reg_write(ad9361_1_reg_inst, 0x0001, 0x0B); // MCS RF Enable; MCS Digital CLK Enable ; MCS BB Enable
+	ad9361_reg_write(ad9361_2_reg_inst, 0x0001, 0x0B);
+	XGpioPs_WritePin(&Gpio, AD9361_SYNC, 1); // Input another rising-edge pulse to the SYNC_IN pin
+	mdelay(500);
+	XGpioPs_WritePin(&Gpio, AD9361_SYNC, 0);
+	ad9361_reg_write(ad9361_1_reg_inst, 0x0001, 0x08); // clear MCS bits
+	ad9361_reg_write(ad9361_2_reg_inst, 0x0001, 0x08);
+
+	XGpioPs_WritePin(&Gpio, AD9361_RX_FIFO_RST, 0);
+	mdelay(20);
+	XGpioPs_WritePin(&Gpio, AD9361_RX_FIFO_RST, 1);
+	mdelay(20);
+	XGpioPs_WritePin(&Gpio, AD9361_RX_FIFO_RST, 0);
+
+	/**********************************************************/
+	/********* AD9361 Multichip Rx Phase Calibration **********/
+	/**********************************************************/
+	XGpioPs_SetDirectionPin(&Gpio, AD9361_TX_SWITCH, AD9361_GPIO_OUTPUT);
+	XGpioPs_SetDirectionPin(&Gpio, AD9361_1_CAL_START, AD9361_GPIO_OUTPUT);
+	XGpioPs_SetDirectionPin(&Gpio, AD9361_1_CAL_DONE, AD9361_GPIO_INPUT);
+	XGpioPs_SetDirectionPin(&Gpio, AD9361_2_CAL_START, AD9361_GPIO_OUTPUT);
+	XGpioPs_SetDirectionPin(&Gpio, AD9361_2_CAL_DONE, AD9361_GPIO_INPUT);
+
+	// switch to lower frequency
+	Status = Hardware_SwitchFreq(ad9361_1_reg_inst, TX_FREQ_126);
+	XGpioPs_WritePin(&Gpio, AD9361_TX_SWITCH, 1);
+	mdelay(20);
+
+	// switch rx channel
+	Status = ad9361_reg_write(ad9361_1_reg_inst, 0x0004, 0x30);
+	Status = ad9361_reg_write(ad9361_2_reg_inst, 0x0004, 0x30);
+
+	// enable dual ad9361 tx channels
+	Status = ad9361_reg_write(ad9361_1_reg_inst, 0x0002, 0xE4); // Setup Tx Digital Filters/ Channels
+
+	// switch ad9361 tx channel
+	Status = ad9361_reg_write(ad9361_1_reg_inst, 0x0004, 0x70); // Select Rx input pin(A,B,C)/ Tx out pin (A,B)
+	mdelay(20);
+
+	// begin to calibrate the 1st ad9361
+	XGpioPs_WritePin(&Gpio, AD9361_1_CAL_START, 0);
+	XGpioPs_WritePin(&Gpio, AD9361_1_CAL_START, 1);
+	mdelay(1);
+	XGpioPs_WritePin(&Gpio, AD9361_1_CAL_START, 0);
+
+	// read calibration status
+	int32_t time_out_cnt = 0;
+	do
+	{
+		mdelay(1); // Wait 1ms
+		time_out_cnt++;
+	} while (((XGpioPs_ReadPin(&Gpio, AD9361_1_CAL_DONE) == 0) && time_out_cnt <= AD9361_TIMEOUT_TH));
+
+	if (time_out_cnt == AD9361_TIMEOUT_TH)
+	{
+		return FAILURE;
+	}
+
+	// begin to calibrate the 2nd ad9361
+	XGpioPs_WritePin(&Gpio, AD9361_2_CAL_START, 1);
+	mdelay(1);
+	XGpioPs_WritePin(&Gpio, AD9361_2_CAL_START, 0);
+
+	// read calibration status
+	time_out_cnt = 0;
+	do
+	{
+		mdelay(1); // Wait 1ms
+		time_out_cnt++;
+	} while (((XGpioPs_ReadPin(&Gpio, AD9361_2_CAL_DONE) == 0) && time_out_cnt <= AD9361_TIMEOUT_TH));
+
+	if (time_out_cnt == AD9361_TIMEOUT_TH)
+	{
+		return FAILURE;
+	}
+
+	// enable single ad9361 tx channels
+	Status = ad9361_reg_write(ad9361_1_reg_inst, 0x0002, 0xA4); // Setup Tx Digital Filters/ Channels
+
+	// switch ad9361 tx & rx channel
+	Status = ad9361_reg_write(ad9361_1_reg_inst, 0x0004, 0x03);
+	Status = ad9361_reg_write(ad9361_2_reg_inst, 0x0004, 0x03);
+
+	// switch to higher frequency
+	Status = Hardware_SwitchFreq(ad9361_1_reg_inst, TX_FREQ_4125);
+	XGpioPs_WritePin(&Gpio, AD9361_TX_SWITCH, 0);
+
+	DBG_PRINT("Done.\n");
+
+	return SUCCESS;
+}
+
+/*****************************************************************************/
+/**
+ * @brief   Hardware_SwitchFreq
+ *
+ * @param   devSysMonitor_UpdateHardwareStatus(newHwState);
+ * @param   freq
+ *
+ * @return  None.
+ *
+ ******************************************************************************/
+int32_t Hardware_SwitchFreq(struct ad9361_reg_dev *dev, ad9361TxFreq freq)
+{
+	int32_t status = 0;
+	uint8_t value = 0;
+	int32_t time_out_cnt = 0;
+
+	switch (freq)
+	{
+	case TX_FREQ_125:
+	{
+		//************************************************************
+		// Setup Tx Frequency-Dependent Syntheisizer Registers
+		//************************************************************
+		status = ad9361_reg_write(dev, 0x027A, 0x4A); // Set VCO Output level[3:0]
+		status = ad9361_reg_write(dev, 0x0279, 0xC1); // Set Init ALC Value[3:0] and VCO Varactor[3:0]
+		status = ad9361_reg_write(dev, 0x0282, 0x0E); // Set VCO Bias Tcf[1:0] and VCO Bias Ref[2:0]
+		status = ad9361_reg_write(dev, 0x0278, 0x78); // Set VCO Cal Offset[3:0]
+		status = ad9361_reg_write(dev, 0x0285, 0x00); // Set VCO Cal Ref Tcf[2:0]
+		status = ad9361_reg_write(dev, 0x0291, 0x0B); // Set VCO Varactor Reference[3:0]
+		status = ad9361_reg_write(dev, 0x0290, 0x70); // Set VCO Varactor Ref Tcf[2:0] and VCO Varactor Offset[3:0]
+		status = ad9361_reg_write(dev, 0x027B, 0x94); // Set Synth Loop Filter charge pump current (Icp)
+		status = ad9361_reg_write(dev, 0x027E, 0xF4); // Set Synth Loop Filter C2 and C1
+		status = ad9361_reg_write(dev, 0x027F, 0xDF); // Set Synth Loop Filter  R1 and C3
+		status = ad9361_reg_write(dev, 0x0280, 0x0A); // Set Synth Loop Filter R3
+
+		//************************************************************
+		// Write Tx Frequency Words
+		//************************************************************
+		status = ad9361_reg_write(dev, 0x0273, 0x00); // Write Tx Synth Fractional Freq Word[7:0]
+		status = ad9361_reg_write(dev, 0x0274, 0x00); // Write Tx Synth Fractional Freq Word[15:8]
+		status = ad9361_reg_write(dev, 0x0275, 0x00); // Write Tx Synth Fractional Freq Word[22:16]
+		status = ad9361_reg_write(dev, 0x0272, 0x00); // Write Tx Synth Integer Freq Word[10:8]
+		status = ad9361_reg_write(dev, 0x0271, 0xA0); // Write Tx Synth Integer Freq Word[7:0] (starts VCO cal)
+		status = ad9361_reg_write(dev, 0x0005, 0x57); // Set LO divider setting
+
+		//************************************************************
+		// Tx Quadrature Calibration Settings
+		//************************************************************
+		status = ad9361_reg_write(dev, 0x00A0, 0x75); // Set TxQuadcal NCO frequency
+		status = ad9361_reg_write(dev, 0x00A3, 0xC0); // Set TxQuadcal NCO frequency (Only update bits [7:6])
+		status = ad9361_reg_write(dev, 0x00A1, 0x7B); // Tx Quad Cal Configuration, Phase and Gain Cal Enable
+		status = ad9361_reg_write(dev, 0x00A9, 0xFF); // Set Tx Quad Cal Count
+		status = ad9361_reg_write(dev, 0x00A2, 0x7F); // Set Tx Quad Cal Kexp
+		status = ad9361_reg_write(dev, 0x00A5, 0x01); // Set Tx Quad Cal Magnitude Threshhold
+		status = ad9361_reg_write(dev, 0x00A6, 0x01); // Set Tx Quad Cal Magnitude Threshhold
+		status = ad9361_reg_write(dev, 0x00AA, 0x22); // Set Tx Quad Cal Gain Table index
+		status = ad9361_reg_write(dev, 0x00A4, 0xF0); // Set Tx Quad Cal Settle Count
+		status = ad9361_reg_write(dev, 0x00AE, 0x00); // Set Tx Quad Cal LPF Gain index incase Split table mode used
+
+		status = ad9361_reg_write(dev, 0x0169, 0xC0); // Disable Rx Quadrature Calibration before Running Tx Quadrature Calibration
+		status = ad9361_reg_write(dev, 0x0016, 0x10); // Start Tx Quad cal
+
+		break;
+	}
+	case TX_FREQ_126:
+	{
+		//************************************************************
+		// Setup Tx Frequency-Dependent Syntheisizer Registers
+		//************************************************************
+		status = ad9361_reg_write(dev, 0x027A, 0x4A); // Set VCO Output level[3:0]
+		status = ad9361_reg_write(dev, 0x0279, 0xC1); // Set Init ALC Value[3:0] and VCO Varactor[3:0]
+		status = ad9361_reg_write(dev, 0x0282, 0x0E); // Set VCO Bias Tcf[1:0] and VCO Bias Ref[2:0]
+		status = ad9361_reg_write(dev, 0x0278, 0x78); // Set VCO Cal Offset[3:0]
+		status = ad9361_reg_write(dev, 0x0285, 0x00); // Set VCO Cal Ref Tcf[2:0]
+		status = ad9361_reg_write(dev, 0x0291, 0x0B); // Set VCO Varactor Reference[3:0]
+		status = ad9361_reg_write(dev, 0x0290, 0x70); // Set VCO Varactor Ref Tcf[2:0] and VCO Varactor Offset[3:0]
+		status = ad9361_reg_write(dev, 0x027B, 0x93); // Set Synth Loop Filter charge pump current (Icp)
+		status = ad9361_reg_write(dev, 0x027E, 0xF4); // Set Synth Loop Filter C2 and C1
+		status = ad9361_reg_write(dev, 0x027F, 0xDF); // Set Synth Loop Filter  R1 and C3
+		status = ad9361_reg_write(dev, 0x0280, 0x0A); // Set Synth Loop Filter R3
+
+		//************************************************************
+		// Write Tx Frequency Words
+		//************************************************************
+		status = ad9361_reg_write(dev, 0x0273, 0x06); // Write Tx Synth Fractional Freq Word[7:0]
+		status = ad9361_reg_write(dev, 0x0274, 0xD7); // Write Tx Synth Fractional Freq Word[15:8]
+		status = ad9361_reg_write(dev, 0x0275, 0x23); // Write Tx Synth Fractional Freq Word[22:16]
+		status = ad9361_reg_write(dev, 0x0272, 0x00); // Write Tx Synth Integer Freq Word[10:8]
+		status = ad9361_reg_write(dev, 0x0271, 0xA1); // Write Tx Synth Integer Freq Word[7:0] (starts VCO cal)
+		status = ad9361_reg_write(dev, 0x0005, 0x57); // Set LO divider setting
+
+		//************************************************************
+		// Tx Quadrature Calibration Settings
+		//************************************************************
+		status = ad9361_reg_write(dev, 0x00A0, 0x75); // Set TxQuadcal NCO frequency
+		status = ad9361_reg_write(dev, 0x00A3, 0xC0); // Set TxQuadcal NCO frequency (Only update bits [7:6])
+		status = ad9361_reg_write(dev, 0x00A1, 0x7B); // Tx Quad Cal Configuration, Phase and Gain Cal Enable
+		status = ad9361_reg_write(dev, 0x00A9, 0xFF); // Set Tx Quad Cal Count
+		status = ad9361_reg_write(dev, 0x00A2, 0x7F); // Set Tx Quad Cal Kexp
+		status = ad9361_reg_write(dev, 0x00A5, 0x01); // Set Tx Quad Cal Magnitude Threshhold
+		status = ad9361_reg_write(dev, 0x00A6, 0x01); // Set Tx Quad Cal Magnitude Threshhold
+		status = ad9361_reg_write(dev, 0x00AA, 0x22); // Set Tx Quad Cal Gain Table index
+		status = ad9361_reg_write(dev, 0x00A4, 0xF0); // Set Tx Quad Cal Settle Count
+		status = ad9361_reg_write(dev, 0x00AE, 0x00); // Set Tx Quad Cal LPF Gain index incase Split table mode used
+
+		status = ad9361_reg_write(dev, 0x0169, 0xC0); // Disable Rx Quadrature Calibration before Running Tx Quadrature Calibration
+		status = ad9361_reg_write(dev, 0x0016, 0x10); // Start Tx Quad cal
+
+		break;
+	}
+	case TX_FREQ_4125:
+	{
+		//************************************************************
+		// Setup Tx Frequency-Dependent Syntheisizer Registers
+		//************************************************************
+		status = ad9361_reg_write(dev, 0x027A, 0x4A); // Set VCO Output level[3:0]
+		status = ad9361_reg_write(dev, 0x0279, 0xC1); // Set Init ALC Value[3:0] and VCO Varactor[3:0]
+		status = ad9361_reg_write(dev, 0x0282, 0x0E); // Set VCO Bias Tcf[1:0] and VCO Bias Ref[2:0]
+		status = ad9361_reg_write(dev, 0x0278, 0x78); // Set VCO Cal Offset[3:0]
+		status = ad9361_reg_write(dev, 0x0285, 0x00); // Set VCO Cal Ref Tcf[2:0]
+		status = ad9361_reg_write(dev, 0x0291, 0x0B); // Set VCO Varactor Reference[3:0]
+		status = ad9361_reg_write(dev, 0x0290, 0x70); // Set VCO Varactor Ref Tcf[2:0] and VCO Varactor Offset[3:0]
+		status = ad9361_reg_write(dev, 0x027B, 0x93); // Set Synth Loop Filter charge pump current (Icp)
+		status = ad9361_reg_write(dev, 0x027E, 0xF4); // Set Synth Loop Filter C2 and C1
+		status = ad9361_reg_write(dev, 0x027F, 0xDF); // Set Synth Loop Filter  R1 and C3
+		status = ad9361_reg_write(dev, 0x0280, 0x0A); // Set Synth Loop Filter R3
+
+		//************************************************************
+		// Write Rx Frequency Words
+		//************************************************************
+		status = ad9361_reg_write(dev, 0x0273, 0x00); // Write Tx Synth Fractional Freq Word[7:0]
+		status = ad9361_reg_write(dev, 0x0274, 0x00); // Write Tx Synth Fractional Freq Word[15:8]
+		status = ad9361_reg_write(dev, 0x0275, 0x00); // Write Tx Synth Fractional Freq Word[22:16]
+		status = ad9361_reg_write(dev, 0x0272, 0x00); // Write Tx Synth Integer Freq Word[10:8]
+		status = ad9361_reg_write(dev, 0x0271, 0xA5); // Write Tx Synth Integer Freq Word[7:0] (starts VCO cal)
+		status = ad9361_reg_write(dev, 0x0005, 0x07); // Set LO divider setting
+
+		//************************************************************
+		// Tx Quadrature Calibration Settings
+		//************************************************************
+		status = ad9361_reg_write(dev, 0x00A0, 0x75); // Set TxQuadcal NCO frequency
+		status = ad9361_reg_write(dev, 0x00A3, 0xC0); // Set TxQuadcal NCO frequency (Only update bits [7:6])
+		status = ad9361_reg_write(dev, 0x00A1, 0x7B); // Tx Quad Cal Configuration, Phase and Gain Cal Enable
+		status = ad9361_reg_write(dev, 0x00A9, 0xFF); // Set Tx Quad Cal Count
+		status = ad9361_reg_write(dev, 0x00A2, 0x7F); // Set Tx Quad Cal Kexp
+		status = ad9361_reg_write(dev, 0x00A5, 0x01); // Set Tx Quad Cal Magnitude Threshhold
+		status = ad9361_reg_write(dev, 0x00A6, 0x01); // Set Tx Quad Cal Magnitude Threshhold
+		status = ad9361_reg_write(dev, 0x00AA, 0x28); // Set Tx Quad Cal Gain Table index
+		status = ad9361_reg_write(dev, 0x00A4, 0xF0); // Set Tx Quad Cal Settle Count
+		status = ad9361_reg_write(dev, 0x00AE, 0x04); // Set Tx Quad Cal LPF Gain index incase Split table mode used
+
+		status = ad9361_reg_write(dev, 0x0169, 0xC0); // Disable Rx Quadrature Calibration before Running Tx Quadrature Calibration
+		status = ad9361_reg_write(dev, 0x0016, 0x10); // Start Tx Quad cal
+
+		break;
+	}
+
+		// Wait for cal to complete (Done when 0x016[4]==0)
+		time_out_cnt = 0;
+		do
+		{
+			status |= ad9361_reg_read(dev, 0x0016, &value);
+			mdelay(1); // Wait 1ms
+			time_out_cnt++;
+		} while ((value & 0x10) != 0x00 && time_out_cnt <= AD9361_TIMEOUT_TH);
+	}
+
+	return status;
+}
+
+// @ Get AD9361 - 1 temperature (Celsius Degree)
+/**
+ * Read corresponding register to get AD9361 - 1 current temperature.
+ */
+int8_t Hardware_GetAD9361Temp_1(void)
+{
+	int8_t scaleTemp;
+
+	ad9361_reg_write(ad9361_1_reg_inst, 0x001D, 0x01); // disable aux adc
+	ad9361_reg_read(ad9361_1_reg_inst, 0x000E, (uint8_t*)&scaleTemp);
+	ad9361_reg_write(ad9361_1_reg_inst, 0x001D, 0x00); // enable aux adc
+
+	return (int8_t) scaleTemp/1.16;
+}
+
+// @ Get AD9361 - 2 temperature (Celsius Degree)
+/**
+ * Read corresponding register to get AD9361 - 2 current temperature.
+ */
+int8_t Hardware_GetAD9361Temp_2(void)
+{
+	int8_t scaleTemp;
+
+	ad9361_reg_write(ad9361_2_reg_inst, 0x001D, 0x01); // disable aux adc
+	ad9361_reg_read(ad9361_2_reg_inst, 0x000E, (uint8_t*)&scaleTemp);
+	ad9361_reg_write(ad9361_2_reg_inst, 0x001D, 0x00); // enable aux adc
+
+	return (int8_t) scaleTemp/1.16;
+}
+
+// @ Determine AD9361 lock state
+/**
+ * Read corresponding register to determine AD9361(both) lock state.
+ */
+uint8_t Hardware_GetAD9361LockStatus(void)
+{
+	uint8_t ret = 0;
+	uint8_t regVal;
+
+	// bbpll
+	ad9361_reg_read(ad9361_1_reg_inst, 0x005E, &regVal); // [D7] is lock indicator
+	ret |= ((regVal & 0x80) == 0x80) ? CLK_AD0_BBPLL_LOCK : 0;
+	ad9361_reg_read(ad9361_2_reg_inst, 0x005E, &regVal); // [D7] is lock indicator
+	ret |= ((regVal & 0x80) == 0x80) ? CLK_AD1_BBPLL_LOCK : 0;
+
+	// rfpll
+	ad9361_reg_read(ad9361_1_reg_inst, 0x0287, &regVal); // [D1] is lock indicator
+	ret |= ((regVal & 0x02) == 0x02) ? CLK_AD0_RFPLL_LOCK : 0;
+	ad9361_reg_read(ad9361_2_reg_inst, 0x0287, &regVal); // [D1] is lock indicator
+	ret |= ((regVal & 0x02) == 0x02) ? CLK_AD1_RFPLL_LOCK : 0;
+
+	return ret;
+}
+
+// @ Determine HMC7044 lock state
+/**
+ * Read corresponding register to determine clock lock state.
+ */
+uint8_t Hardware_GetHMC7044LockStatus(void)
+{
+	uint8_t ret = 0;
+	uint8_t regVal;
+
+	// pll1
+	hmc7044_read(hmc7044_inst, 0x007C, &regVal); // [D5] is lock indicator
+	ret |= ((regVal & 0xE0) != 0x00) ? CLK_SP_PLL0_LOCK : 0;
+
+	// pll2
+	hmc7044_read(hmc7044_inst, 0x007D, &regVal); // [D0] is lock indicator
+	ret |= ((regVal & 0x01) == 0x01) ? CLK_SP_PLL1_LOCK : 0;
+
+	return ret;
+}

df_datalink_sp/src/hwconfig.h

@@ -0,0 +1,32 @@
+/*****************************************************************************/
+/**
+ * Description: hwconfig.h
+ *
+
+ * Date: 2024-02-20 13:19
+ * Last Edit Time: [2024-02-20 13:19]
+ *
+ * Revisions: Rev 0.0
+ * History:
+ * [2023-05-07]: Initial edition.
+ *
+ * Copyright(c) 2024 Beijing Institute of Technology.
+ *
+ ******************************************************************************/
+
+/***************************** Include Files *********************************/
+// Standard
+#include <stdint.h>
+#include "config/app_config.h"
+#include "drivers/rf-transceiver/ad9361_reg/ad9361_reg.h"
+#include "drivers/rf-transceiver/ad9361/ad9361_api.h"
+
+/************************** Function Prototypes ******************************/
+int32_t Hardware_Init(void);
+int32_t Hardware_SwitchFreq(struct ad9361_reg_dev *dev, ad9361TxFreq freq);
+int8_t Hardware_GetAD9361Temp_1(void);
+int8_t Hardware_GetAD9361Temp_2(void);
+uint8_t Hardware_GetAD9361LockStatus(void);
+uint8_t Hardware_GetHMC7044LockStatus(void);
+
+

df_datalink_sp/src/lscript.ld

@@ -26,6 +26,7 @@ MEMORY
    phy_data_interface_rx_frame_bram_ctrl_Mem0 : ORIGIN = 0x40000000, LENGTH = 0x2000
    phy_data_interface_tx_frame_bram_ctrl_Mem0 : ORIGIN = 0x40002000, LENGTH = 0x2000
    phy_data_interface_ant_info_bram_ctrl_Mem0 : ORIGIN = 0x40004000, LENGTH = 0x2000
+   phy_data_interface_ant_beam_bram_ctrl_Mem0 : ORIGIN = 0x42000000, LENGTH = 0x1000
    ps7_ddr_0 : ORIGIN = 0x100000, LENGTH = 0x1FF00000
    ps7_qspi_linear_0 : ORIGIN = 0xFC000000, LENGTH = 0x1000000
    ps7_ram_0 : ORIGIN = 0x0, LENGTH = 0x30000

df_datalink_sp/src/main.c

@@ -20,19 +20,15 @@
 #include <stdint.h>
 #include <stdbool.h>
 // Xilinx
-#include "sleep.h"
-#include "xil_cache.h"
 #include "xscugic.h"
-#include "xscutimer.h"
-#include "xgpiops.h"
 #include "drivers/platform/xilinx_irq.h"
 #include "drivers/platform/xilinx_timer.h"
-#include "drivers/rf-transceiver/ad9361/ad9361_api.h"
-#include "drivers/axi_core/spi_engine/spi_engine.h"
 // App
 #include "common.h"
 #include "error.h"
 #include "timer.h"
+#include "hwconfig.h"
+#include "system_monitor.h"
 #include "config/app_config.h"
 #include "dev_profile/dev_profile.h"
 #include "systembus/systembus.h"
@@ -46,6 +42,7 @@ void PeriodicPull_Handler(void *callBackRef);
 void ScuTimer_IntrHandler(void *context);
 void Systembus_RxIntrHandler(void *context);
 void Systembus_TxIntrHandler(void *context);
+
 /************************** Constant Definitions *****************************/
 struct callback_desc phy_callback_desc = {
 	.callback = Phy_IntrHandler,
@@ -99,9 +96,14 @@ static PHY_CONFIG phyConfig = {
 	.devId = 0,
 	.baseAddr = PHY_BASEADDR,
 	.antBramId = PHY_ANTCONFIG_BRAM_DEVICE_ID,
+	.antInfoBramId = PHY_ANTINFO_BRAM_DEVICE_ID,
 	.txBramId = PHY_TXBUFF_BRAM_DEVICE_ID,
 	.rxBramId = PHY_RXBUFF_BRAM_DEVICE_ID,
-	.hwXadcId = PHY_HW_XADC_DEVICE_ID
+	.hwXadcId = PHY_HW_XADC_DEVICE_ID,
+	.get_clk_state = Hardware_GetHMC7044LockStatus,
+	.get_ad_lock_state = Hardware_GetAD9361LockStatus,
+	.get_ad0_temp = Hardware_GetAD9361Temp_1,
+	.get_ad1_temp = Hardware_GetAD9361Temp_2
 };
 
 TMC_CONFIG tmcConfig = {
@@ -122,11 +124,7 @@ static PHY_INST *phyInstPtr;
 static TMC_INST *tmcInstPtr = NULL;
 L2_INST *linkInstPtr;
 
-static struct hmc7044_dev *hmc7044_inst;
+
-static struct ad9361_reg_dev *ad9361_1_reg_inst;
-static struct ad9361_reg_dev *ad9361_2_reg_inst;
-// static struct ad9361_rf_phy *ad9361_phy;
-// static struct ad9361_rf_phy *ad9361_2_phy;
 /****************************************************************************/
 /**
  * This function is responsible for initializing the SCUGIC instance, looking
@@ -360,8 +358,8 @@ void ScuTimer_IntrHandler(void *context)
 	xdesc = (struct xil_timer_desc *)(logTmPtr->extra);
 	if (XScuTimer_IsExpired((XScuTimer *)xdesc->instance))
 	{
-		// Update log
+		// Refresh log
-		Phy_UpdateHwSate(phyInstPtr);
+		Phy_RefreshHwSate(phyInstPtr);
 		XScuTimer_ClearInterruptStatus((XScuTimer *)xdesc->instance);
 	}
 	else
@@ -370,355 +368,6 @@ void ScuTimer_IntrHandler(void *context)
 	}
 }
 
-/*****************************************************************************/
-/**
- * @brief   Hardware_SwitchFreq
- *
- * @param   dev
- * @param   freq
- *
- * @return  None.
- *
- ******************************************************************************/
-int Hardware_SwitchFreq(struct ad9361_reg_dev *dev, ad9361TxFreq freq)
-{
-	int32_t status = 0;
-	uint8_t value = 0;
-	int32_t time_out_cnt = 0;
-
-	switch (freq)
-	{
-	case TX_FREQ_125:
-	{
-		//************************************************************
-		// Setup Tx Frequency-Dependent Syntheisizer Registers
-		//************************************************************
-		status = ad9361_reg_write(dev, 0x027A, 0x4A); // Set VCO Output level[3:0]
-		status = ad9361_reg_write(dev, 0x0279, 0xC1); // Set Init ALC Value[3:0] and VCO Varactor[3:0]
-		status = ad9361_reg_write(dev, 0x0282, 0x0E); // Set VCO Bias Tcf[1:0] and VCO Bias Ref[2:0]
-		status = ad9361_reg_write(dev, 0x0278, 0x78); // Set VCO Cal Offset[3:0]
-		status = ad9361_reg_write(dev, 0x0285, 0x00); // Set VCO Cal Ref Tcf[2:0]
-		status = ad9361_reg_write(dev, 0x0291, 0x0B); // Set VCO Varactor Reference[3:0]
-		status = ad9361_reg_write(dev, 0x0290, 0x70); // Set VCO Varactor Ref Tcf[2:0] and VCO Varactor Offset[3:0]
-		status = ad9361_reg_write(dev, 0x027B, 0x94); // Set Synth Loop Filter charge pump current (Icp)
-		status = ad9361_reg_write(dev, 0x027E, 0xF4); // Set Synth Loop Filter C2 and C1
-		status = ad9361_reg_write(dev, 0x027F, 0xDF); // Set Synth Loop Filter  R1 and C3
-		status = ad9361_reg_write(dev, 0x0280, 0x0A); // Set Synth Loop Filter R3
-
-		//************************************************************
-		// Write Tx Frequency Words
-		//************************************************************
-		status = ad9361_reg_write(dev, 0x0273, 0x00); // Write Tx Synth Fractional Freq Word[7:0]
-		status = ad9361_reg_write(dev, 0x0274, 0x00); // Write Tx Synth Fractional Freq Word[15:8]
-		status = ad9361_reg_write(dev, 0x0275, 0x00); // Write Tx Synth Fractional Freq Word[22:16]
-		status = ad9361_reg_write(dev, 0x0272, 0x00); // Write Tx Synth Integer Freq Word[10:8]
-		status = ad9361_reg_write(dev, 0x0271, 0xA0); // Write Tx Synth Integer Freq Word[7:0] (starts VCO cal)
-		status = ad9361_reg_write(dev, 0x0005, 0x57); // Set LO divider setting
-
-		//************************************************************
-		// Tx Quadrature Calibration Settings
-		//************************************************************
-		status = ad9361_reg_write(dev, 0x00A0, 0x75); // Set TxQuadcal NCO frequency
-		status = ad9361_reg_write(dev, 0x00A3, 0xC0); // Set TxQuadcal NCO frequency (Only update bits [7:6])
-		status = ad9361_reg_write(dev, 0x00A1, 0x7B); // Tx Quad Cal Configuration, Phase and Gain Cal Enable
-		status = ad9361_reg_write(dev, 0x00A9, 0xFF); // Set Tx Quad Cal Count
-		status = ad9361_reg_write(dev, 0x00A2, 0x7F); // Set Tx Quad Cal Kexp
-		status = ad9361_reg_write(dev, 0x00A5, 0x01); // Set Tx Quad Cal Magnitude Threshhold
-		status = ad9361_reg_write(dev, 0x00A6, 0x01); // Set Tx Quad Cal Magnitude Threshhold
-		status = ad9361_reg_write(dev, 0x00AA, 0x22); // Set Tx Quad Cal Gain Table index
-		status = ad9361_reg_write(dev, 0x00A4, 0xF0); // Set Tx Quad Cal Settle Count
-		status = ad9361_reg_write(dev, 0x00AE, 0x00); // Set Tx Quad Cal LPF Gain index incase Split table mode used
-
-		status = ad9361_reg_write(dev, 0x0169, 0xC0); // Disable Rx Quadrature Calibration before Running Tx Quadrature Calibration
-		status = ad9361_reg_write(dev, 0x0016, 0x10); // Start Tx Quad cal
-
-		break;
-	}
-	case TX_FREQ_126:
-	{
-		//************************************************************
-		// Setup Tx Frequency-Dependent Syntheisizer Registers
-		//************************************************************
-		status = ad9361_reg_write(dev, 0x027A, 0x4A); // Set VCO Output level[3:0]
-		status = ad9361_reg_write(dev, 0x0279, 0xC1); // Set Init ALC Value[3:0] and VCO Varactor[3:0]
-		status = ad9361_reg_write(dev, 0x0282, 0x0E); // Set VCO Bias Tcf[1:0] and VCO Bias Ref[2:0]
-		status = ad9361_reg_write(dev, 0x0278, 0x78); // Set VCO Cal Offset[3:0]
-		status = ad9361_reg_write(dev, 0x0285, 0x00); // Set VCO Cal Ref Tcf[2:0]
-		status = ad9361_reg_write(dev, 0x0291, 0x0B); // Set VCO Varactor Reference[3:0]
-		status = ad9361_reg_write(dev, 0x0290, 0x70); // Set VCO Varactor Ref Tcf[2:0] and VCO Varactor Offset[3:0]
-		status = ad9361_reg_write(dev, 0x027B, 0x93); // Set Synth Loop Filter charge pump current (Icp)
-		status = ad9361_reg_write(dev, 0x027E, 0xF4); // Set Synth Loop Filter C2 and C1
-		status = ad9361_reg_write(dev, 0x027F, 0xDF); // Set Synth Loop Filter  R1 and C3
-		status = ad9361_reg_write(dev, 0x0280, 0x0A); // Set Synth Loop Filter R3
-
-		//************************************************************
-		// Write Tx Frequency Words
-		//************************************************************
-		status = ad9361_reg_write(dev, 0x0273, 0x06); // Write Tx Synth Fractional Freq Word[7:0]
-		status = ad9361_reg_write(dev, 0x0274, 0xD7); // Write Tx Synth Fractional Freq Word[15:8]
-		status = ad9361_reg_write(dev, 0x0275, 0x23); // Write Tx Synth Fractional Freq Word[22:16]
-		status = ad9361_reg_write(dev, 0x0272, 0x00); // Write Tx Synth Integer Freq Word[10:8]
-		status = ad9361_reg_write(dev, 0x0271, 0xA1); // Write Tx Synth Integer Freq Word[7:0] (starts VCO cal)
-		status = ad9361_reg_write(dev, 0x0005, 0x57); // Set LO divider setting
-
-		//************************************************************
-		// Tx Quadrature Calibration Settings
-		//************************************************************
-		status = ad9361_reg_write(dev, 0x00A0, 0x75); // Set TxQuadcal NCO frequency
-		status = ad9361_reg_write(dev, 0x00A3, 0xC0); // Set TxQuadcal NCO frequency (Only update bits [7:6])
-		status = ad9361_reg_write(dev, 0x00A1, 0x7B); // Tx Quad Cal Configuration, Phase and Gain Cal Enable
-		status = ad9361_reg_write(dev, 0x00A9, 0xFF); // Set Tx Quad Cal Count
-		status = ad9361_reg_write(dev, 0x00A2, 0x7F); // Set Tx Quad Cal Kexp
-		status = ad9361_reg_write(dev, 0x00A5, 0x01); // Set Tx Quad Cal Magnitude Threshhold
-		status = ad9361_reg_write(dev, 0x00A6, 0x01); // Set Tx Quad Cal Magnitude Threshhold
-		status = ad9361_reg_write(dev, 0x00AA, 0x22); // Set Tx Quad Cal Gain Table index
-		status = ad9361_reg_write(dev, 0x00A4, 0xF0); // Set Tx Quad Cal Settle Count
-		status = ad9361_reg_write(dev, 0x00AE, 0x00); // Set Tx Quad Cal LPF Gain index incase Split table mode used
-
-		status = ad9361_reg_write(dev, 0x0169, 0xC0); // Disable Rx Quadrature Calibration before Running Tx Quadrature Calibration
-		status = ad9361_reg_write(dev, 0x0016, 0x10); // Start Tx Quad cal
-
-		break;
-	}
-	case TX_FREQ_4125:
-	{
-		//************************************************************
-		// Setup Tx Frequency-Dependent Syntheisizer Registers
-		//************************************************************
-		status = ad9361_reg_write(dev, 0x027A, 0x4A); // Set VCO Output level[3:0]
-		status = ad9361_reg_write(dev, 0x0279, 0xC1); // Set Init ALC Value[3:0] and VCO Varactor[3:0]
-		status = ad9361_reg_write(dev, 0x0282, 0x0E); // Set VCO Bias Tcf[1:0] and VCO Bias Ref[2:0]
-		status = ad9361_reg_write(dev, 0x0278, 0x78); // Set VCO Cal Offset[3:0]
-		status = ad9361_reg_write(dev, 0x0285, 0x00); // Set VCO Cal Ref Tcf[2:0]
-		status = ad9361_reg_write(dev, 0x0291, 0x0B); // Set VCO Varactor Reference[3:0]
-		status = ad9361_reg_write(dev, 0x0290, 0x70); // Set VCO Varactor Ref Tcf[2:0] and VCO Varactor Offset[3:0]
-		status = ad9361_reg_write(dev, 0x027B, 0x93); // Set Synth Loop Filter charge pump current (Icp)
-		status = ad9361_reg_write(dev, 0x027E, 0xF4); // Set Synth Loop Filter C2 and C1
-		status = ad9361_reg_write(dev, 0x027F, 0xDF); // Set Synth Loop Filter  R1 and C3
-		status = ad9361_reg_write(dev, 0x0280, 0x0A); // Set Synth Loop Filter R3
-
-		//************************************************************
-		// Write Rx Frequency Words
-		//************************************************************
-		status = ad9361_reg_write(dev, 0x0273, 0x00); // Write Tx Synth Fractional Freq Word[7:0]
-		status = ad9361_reg_write(dev, 0x0274, 0x00); // Write Tx Synth Fractional Freq Word[15:8]
-		status = ad9361_reg_write(dev, 0x0275, 0x00); // Write Tx Synth Fractional Freq Word[22:16]
-		status = ad9361_reg_write(dev, 0x0272, 0x00); // Write Tx Synth Integer Freq Word[10:8]
-		status = ad9361_reg_write(dev, 0x0271, 0xA5); // Write Tx Synth Integer Freq Word[7:0] (starts VCO cal)
-		status = ad9361_reg_write(dev, 0x0005, 0x07); // Set LO divider setting
-
-		//************************************************************
-		// Tx Quadrature Calibration Settings
-		//************************************************************
-		status = ad9361_reg_write(dev, 0x00A0, 0x75); // Set TxQuadcal NCO frequency
-		status = ad9361_reg_write(dev, 0x00A3, 0xC0); // Set TxQuadcal NCO frequency (Only update bits [7:6])
-		status = ad9361_reg_write(dev, 0x00A1, 0x7B); // Tx Quad Cal Configuration, Phase and Gain Cal Enable
-		status = ad9361_reg_write(dev, 0x00A9, 0xFF); // Set Tx Quad Cal Count
-		status = ad9361_reg_write(dev, 0x00A2, 0x7F); // Set Tx Quad Cal Kexp
-		status = ad9361_reg_write(dev, 0x00A5, 0x01); // Set Tx Quad Cal Magnitude Threshhold
-		status = ad9361_reg_write(dev, 0x00A6, 0x01); // Set Tx Quad Cal Magnitude Threshhold
-		status = ad9361_reg_write(dev, 0x00AA, 0x28); // Set Tx Quad Cal Gain Table index
-		status = ad9361_reg_write(dev, 0x00A4, 0xF0); // Set Tx Quad Cal Settle Count
-		status = ad9361_reg_write(dev, 0x00AE, 0x04); // Set Tx Quad Cal LPF Gain index incase Split table mode used
-
-		status = ad9361_reg_write(dev, 0x0169, 0xC0); // Disable Rx Quadrature Calibration before Running Tx Quadrature Calibration
-		status = ad9361_reg_write(dev, 0x0016, 0x10); // Start Tx Quad cal
-
-		break;
-	}
-
-		// Wait for cal to complete (Done when 0x016[4]==0)
-		time_out_cnt = 0;
-		do
-		{
-			status |= ad9361_reg_read(dev, 0x0016, &value);
-			mdelay(1); // Wait 1ms
-			time_out_cnt++;
-		} while ((value & 0x10) != 0x00 && time_out_cnt <= AD9361_TIMEOUT_TH);
-	}
-
-	return status;
-}
-
-/*****************************************************************************/
-/**
- * @brief   Hardware_Init
- *
- * @param   none.
- *
- * @return  None.
- *
- ******************************************************************************/
-int Hardware_Init(void)
-{
-	int32_t Status;
-	XGpioPs Gpio;
-	XGpioPs_Config *ConfigPtr;
-	ConfigPtr = XGpioPs_LookupConfig(AD9361_GPIO_DEVICE_ID);
-	Status = XGpioPs_CfgInitialize(&Gpio, ConfigPtr, ConfigPtr->BaseAddr);
-	if (Status != SUCCESS)
-	{
-		return FAILURE;
-	}
-
-	/**********************************************************/
-	/****************** HMC7044 Configuration *****************/
-	/**********************************************************/
-	Status = hmc7044_init(&hmc7044_inst, &hmc7044_default_init_param);
-	if (Status != SUCCESS)
-	{
-		DBG_ERROR("hmc7044_init() error: %" PRId32 "\n", Status);
-		return FAILURE;
-	}
-
-	/**********************************************************/
-	/***************** AD9361-1 Configuration *****************/
-	/**********************************************************/
-	XGpioPs_SetDirectionPin(&Gpio, AD9361_1_TXNRX, AD9361_GPIO_OUTPUT);
-	XGpioPs_SetDirectionPin(&Gpio, AD9361_1_ENABLE, AD9361_GPIO_OUTPUT);
-	XGpioPs_SetDirectionPin(&Gpio, AD9361_1_EN_AGC, AD9361_GPIO_OUTPUT);
-	XGpioPs_SetDirectionPin(&Gpio, AD9361_1_RESET_B, AD9361_GPIO_OUTPUT);
-
-	ad9361_reg_init(&ad9361_1_reg_inst, &ad9361_1_reg_default_init_param);
-	XGpioPs_WritePin(&Gpio, AD9361_1_ENABLE, 0);
-	ad9361_reg_config(ad9361_1_reg_inst);
-	XGpioPs_WritePin(&Gpio, AD9361_1_ENABLE, 1);
-
-	//	Status = ad9361_init(&ad9361_phy, &ad9361_default_init_param);
-	//	if (Status != XST_SUCCESS){
-	//		return XST_FAILURE;
-	//	}else{
-	//		printf("Configurate AD9361 Completely!\n");
-	//	}
-	//	ad9361_set_tx_fir_config(ad9361_phy, tx_fir_config);
-	//	ad9361_set_rx_fir_config(ad9361_phy, rx_fir_config);
-
-	/**********************************************************/
-	/***************** AD9361-2 Configuration *****************/
-	/**********************************************************/
-	XGpioPs_SetDirectionPin(&Gpio, AD9361_2_TXNRX, AD9361_GPIO_OUTPUT);
-	XGpioPs_SetDirectionPin(&Gpio, AD9361_2_ENABLE, AD9361_GPIO_OUTPUT);
-	XGpioPs_SetDirectionPin(&Gpio, AD9361_2_EN_AGC, AD9361_GPIO_OUTPUT);
-	XGpioPs_SetDirectionPin(&Gpio, AD9361_2_RESET_B, AD9361_GPIO_OUTPUT);
-
-	ad9361_reg_init(&ad9361_2_reg_inst, &ad9361_2_reg_default_init_param);
-	XGpioPs_WritePin(&Gpio, AD9361_2_ENABLE, 0);
-	ad9361_reg_config(ad9361_2_reg_inst);
-	XGpioPs_WritePin(&Gpio, AD9361_2_ENABLE, 1);
-
-	//	uint8_t rd_back;
-	//	Status = ad9361_reg_read(ad9361_1_reg_inst, 0x0002, &rd_back);
-	//	Status = ad9361_reg_read(ad9361_2_reg_inst, 0x0002, &rd_back);
-
-	/**********************************************************/
-	/******* AD9361 Baseband Multichip Synchronization ********/
-	/**********************************************************/
-	XGpioPs_SetDirectionPin(&Gpio, AD9361_SYNC, AD9361_GPIO_OUTPUT);
-	XGpioPs_SetDirectionPin(&Gpio, AD9361_RX_FIFO_RST, AD9361_GPIO_OUTPUT);
-
-	// SYNC BBPLL and DIGITAL SAMPLING CLOCKS
-	ad9361_reg_write(ad9361_1_reg_inst, 0x0001, 0x0D); // MCS RF Enable; MCS BBPLL Enable; MCS BB Enable
-	ad9361_reg_write(ad9361_2_reg_inst, 0x0001, 0x0D);
-	ad9361_reg_write(ad9361_1_reg_inst, 0x0047, 0x80); // MCS refclk Scale Enable
-	ad9361_reg_write(ad9361_2_reg_inst, 0x0047, 0x80);
-	XGpioPs_WritePin(&Gpio, AD9361_SYNC, 0);
-	mdelay(20);
-	XGpioPs_WritePin(&Gpio, AD9361_SYNC, 1); // Input a rising-edge pulse to the SYNC_IN pin
-	mdelay(500);
-	XGpioPs_WritePin(&Gpio, AD9361_SYNC, 0);
-	mdelay(2000);
-	ad9361_reg_write(ad9361_1_reg_inst, 0x0001, 0x0B); // MCS RF Enable; MCS Digital CLK Enable ; MCS BB Enable
-	ad9361_reg_write(ad9361_2_reg_inst, 0x0001, 0x0B);
-	XGpioPs_WritePin(&Gpio, AD9361_SYNC, 1); // Input another rising-edge pulse to the SYNC_IN pin
-	mdelay(500);
-	XGpioPs_WritePin(&Gpio, AD9361_SYNC, 0);
-	ad9361_reg_write(ad9361_1_reg_inst, 0x0001, 0x08); // clear MCS bits
-	ad9361_reg_write(ad9361_2_reg_inst, 0x0001, 0x08);
-
-	XGpioPs_WritePin(&Gpio, AD9361_RX_FIFO_RST, 0);
-	mdelay(20);
-	XGpioPs_WritePin(&Gpio, AD9361_RX_FIFO_RST, 1);
-	mdelay(20);
-	XGpioPs_WritePin(&Gpio, AD9361_RX_FIFO_RST, 0);
-
-	/**********************************************************/
-	/********* AD9361 Multichip Rx Phase Calibration **********/
-	/**********************************************************/
-	XGpioPs_SetDirectionPin(&Gpio, AD9361_TX_SWITCH, AD9361_GPIO_OUTPUT);
-	XGpioPs_SetDirectionPin(&Gpio, AD9361_1_CAL_START, AD9361_GPIO_OUTPUT);
-	XGpioPs_SetDirectionPin(&Gpio, AD9361_1_CAL_DONE, AD9361_GPIO_INPUT);
-	XGpioPs_SetDirectionPin(&Gpio, AD9361_2_CAL_START, AD9361_GPIO_OUTPUT);
-	XGpioPs_SetDirectionPin(&Gpio, AD9361_2_CAL_DONE, AD9361_GPIO_INPUT);
-
-	// switch to lower frequency
-	Status = Hardware_SwitchFreq(ad9361_1_reg_inst, TX_FREQ_126);
-	XGpioPs_WritePin(&Gpio, AD9361_TX_SWITCH, 1);
-	mdelay(20);
-
-	// switch rx channel
-	Status = ad9361_reg_write(ad9361_1_reg_inst, 0x0004, 0x30);
-	Status = ad9361_reg_write(ad9361_2_reg_inst, 0x0004, 0x30);
-
-	// enable dual ad9361 tx channels
-	Status = ad9361_reg_write(ad9361_1_reg_inst, 0x0002, 0xE4); // Setup Tx Digital Filters/ Channels
-
-	// switch ad9361 tx channel
-	Status = ad9361_reg_write(ad9361_1_reg_inst, 0x0004, 0x70); // Select Rx input pin(A,B,C)/ Tx out pin (A,B)
-	mdelay(20);
-
-	// begin to calibrate the 1st ad9361
-	XGpioPs_WritePin(&Gpio, AD9361_1_CAL_START, 0);
-	XGpioPs_WritePin(&Gpio, AD9361_1_CAL_START, 1);
-	mdelay(1);
-	XGpioPs_WritePin(&Gpio, AD9361_1_CAL_START, 0);
-
-	// read calibration status
-	int32_t time_out_cnt = 0;
-	do
-	{
-		mdelay(1); // Wait 1ms
-		time_out_cnt++;
-	} while (((XGpioPs_ReadPin(&Gpio, AD9361_1_CAL_DONE) == 0) && time_out_cnt <= AD9361_TIMEOUT_TH));
-
-	if (time_out_cnt == AD9361_TIMEOUT_TH)
-	{
-		return FAILURE;
-	}
-
-	// begin to calibrate the 2nd ad9361
-	XGpioPs_WritePin(&Gpio, AD9361_2_CAL_START, 1);
-	mdelay(1);
-	XGpioPs_WritePin(&Gpio, AD9361_2_CAL_START, 0);
-
-	// read calibration status
-	time_out_cnt = 0;
-	do
-	{
-		mdelay(1); // Wait 1ms
-		time_out_cnt++;
-	} while (((XGpioPs_ReadPin(&Gpio, AD9361_2_CAL_DONE) == 0) && time_out_cnt <= AD9361_TIMEOUT_TH));
-
-	if (time_out_cnt == AD9361_TIMEOUT_TH)
-	{
-		return FAILURE;
-	}
-
-	// enable single ad9361 tx channels
-	Status = ad9361_reg_write(ad9361_1_reg_inst, 0x0002, 0xA4); // Setup Tx Digital Filters/ Channels
-
-	// switch ad9361 tx & rx channel
-	Status = ad9361_reg_write(ad9361_1_reg_inst, 0x0004, 0x03);
-	Status = ad9361_reg_write(ad9361_2_reg_inst, 0x0004, 0x03);
-
-	// switch to higher frequency
-	Status = Hardware_SwitchFreq(ad9361_1_reg_inst, TX_FREQ_4125);
-	XGpioPs_WritePin(&Gpio, AD9361_TX_SWITCH, 0);
-
-	DBG_PRINT("Done.\n");
-
-	return 0;
-}
-
 /*****************************************************************************/
 /**
  * @brief	Main function, initialize all the device needed, initialize

df_datalink_sp/src/networking/link_layer/link_layer.c

@@ -333,7 +333,6 @@ void L2_FrameStateUpdate(L2_INST *instPtr)
 	PHY_INST *phyRef = instPtr->config.phyInstPtr;
 	bool isValid;
 	L2_FRAME_TYPE recvType = L2_GetLastOptFrameType(instPtr);
-	L2_FRAME_TYPE sendType = L2_GetNextFrameType(instPtr);
 	// Update frame state.
 	if (Phy_IsFrameValid(phyRef) == false)
 	{
@@ -347,7 +346,6 @@ void L2_FrameStateUpdate(L2_INST *instPtr)
 	instPtr->log.frameRecv++;
 
 	// Update frame state.
-	// FIXME: add log
 	switch (recvType)
 	{
 	case L2_SCAN_FRAME:
@@ -385,54 +383,6 @@ void L2_FrameStateUpdate(L2_INST *instPtr)
 		L2_DataAvailUpdate(instPtr, false);
 	}
 	}
-
-	// Logging status.
-	// -- send slot status
-	if (instPtr->tor.curr == L2_TOR_RX)
-	{
-		instPtr->rxSlotLog.tuNo = L2_GetCurrentFrameNum(instPtr);
-		instPtr->rxSlotLog.slotNo = L2_GetCurrentSlotNum(instPtr);
-		instPtr->rxSlotLog.frameType = recvType;
-		memset(instPtr->rxSlotLog.payload, 0x00, sizeof(instPtr->rxSlotLog.payload));
-		if (isValid == true)
-		{
-			memcpy(instPtr->rxSlotLog.payload,
-					instPtr->recvPktData,
-					Phy_GetFrameLen(L2_L2frame2L1frame(recvType)));
-			TIME_WORD timeWrod;
-			Phy_GetLastReceivedFrameSyncTimeStamp(phyRef, &timeWrod);
-			instPtr->rxSlotLog.tmStamp = timeWrod.frac_part;
-			instPtr->rxSlotLog.tmStamp += (uint64_t)timeWrod.int_part * TIME_FRAC_MAX;
-
-			// Log time deviation.
-			instPtr->txSlotLog.tmDevi = 0; // TODO:
-			// Log frequency deviation
-			instPtr->rxSlotLog.freqDevi = (uint32_t)Phy_GetFreqEst(phyRef);
-		}
-		else
-		{
-			instPtr->rxSlotLog.tmStamp = 0;
-			instPtr->rxSlotLog.tmDevi = 0;
-			instPtr->rxSlotLog.freqDevi = 0;
-			memset(instPtr->rxSlotLog.payload, 0x00, sizeof(instPtr->rxSlotLog.payload));
-		}
-		SysMonitor_UpdateRecvSlotLog(&(instPtr->rxSlotLog));
-	}
-	// -- send slot status
-	if (instPtr->tor.next == L2_TOR_TX)
-	{
-		instPtr->txSlotLog.tuNo = L2_GetCurrentFrameNum(instPtr);
-		instPtr->txSlotLog.slotNo = L2_GetCurrentSlotNum(instPtr);
-		instPtr->txSlotLog.frameType = sendType;
-		memset(instPtr->rxSlotLog.payload, 0x00, sizeof(instPtr->txSlotLog.payload));
-		memcpy(instPtr->txSlotLog.payload,
-			   instPtr->sendPktData,
-			   Phy_GetFrameLen(L2_L2frame2L1frame(sendType)));
-		instPtr->txSlotLog.tmStamp = 0;
-		instPtr->txSlotLog.tmDevi = 0;
-		instPtr->txSlotLog.freqDevi = 0;
-		SysMonitor_UpdateSendSlotLog(&(instPtr->txSlotLog));
-	}
 }
 
 /*****************************************************************************/
@@ -712,6 +662,8 @@ int32_t Linklayer_Init(L2_INST **instPtr, const L2_CONFIG *config)
 	}
 	memset(*instPtr, 0x00, sizeof(L2_INST));
 	memcpy(&((*instPtr)->config), config, sizeof(L2_CONFIG));
+	// Clear log
+	memset(&((*instPtr)->log), 0x00, sizeof((*instPtr)->log));
 
 	// Packet buffer
 	(*instPtr)->sendPktData = calloc(L2_PACK_LEN_MAX / sizeof(uint64_t), sizeof(uint64_t));
@@ -1004,6 +956,7 @@ int32_t Linklayer_EventHandler(L2_INST *instPtr, const L2_EVENT *l2Event)
 		L2_Service_Reset(instPtr->serviceFSM);
 		instPtr->cxn2Net = false;
 		UpdateMainSate(instPtr, L2_INIT_STATE);
+		instPtr->log.reconnectCnt++;
 		break;
 	}
 	case L2_EV_LOST_NODE:
@@ -1012,6 +965,8 @@ int32_t Linklayer_EventHandler(L2_INST *instPtr, const L2_EVENT *l2Event)
 		L2_Scan_Reset(instPtr->scanFSM);
 		L2_Service_Reset(instPtr->serviceFSM);
 		UpdateMainSate(instPtr, L2_INIT_STATE);
+		// Log reconnect 
+		instPtr->log.reconnectCnt++;
 		break;
 	}
 	case L2_ROUTINE_FINISH:
@@ -1276,25 +1231,34 @@ int32_t Linklayer_Proc(L2_INST *instPtr)
 	// Check and execute scheduled event.
 	L2_EventPoolHandler(instPtr);
 
-	PHY_INST* phyRef = instPtr->config.phyInstPtr;
-	TMC_INST* tmcRef = instPtr->config.tmcInstPtr;
-
-	TIME_WORD timeWord;
-	// Update Protocol log
-	instPtr->prtcLog.tmSys = instPtr->frameNum.last * L2_SLOTS_PER_FRAME + instPtr->slotNum.last;
-	instPtr->prtcLog.phySt = 0; // TODO: Update physical state.
-	TimeCtrl_GetCurrentTime(tmcRef, &timeWord);
-	instPtr->prtcLog.tmLocal = timeWord.frac_part; // us
-	instPtr->prtcLog.tmLocal += (uint64_t)timeWord.int_part * TIME_FRAC_MAX; // us
-	instPtr->prtcLog.beamNo = phyRef->beamNo.last;
-	instPtr->prtcLog.beamNo = phyRef->beamWd.last;
-	instPtr->prtcLog.stage = instPtr->mainState;
-	instPtr->prtcLog.recvCnt = instPtr->log.frameRecv;
-	instPtr->prtcLog.recvCorrect = instPtr->log.frameCorrect;
-	SysMonitor_UpdateProtocolLog(&(instPtr->prtcLog));
-
-
 	// Update link layer state.
 	instPtr->mainState = instPtr->nextState;
+
+	instPtr->linkLog.tuNum = instPtr->frameNum.curr;
+	instPtr->linkLog.slotNum = (uint8_t)instPtr->slotNum.curr;
+	instPtr->linkLog.nodeType = (instPtr->config.myType == L2_NODE_HEAD) ? 0xAA : 0xCC;
+	instPtr->linkLog.cxnStatus = (instPtr->cxn2Net) ? 0x11 : 0x00;
+	instPtr->linkLog.linkStage = (instPtr->mainState == L2_INIT_STATE) ? 0x11 : 0x22;
+	instPtr->linkLog.recxnCnt = instPtr->log.reconnectCnt;
+	instPtr->linkLog.beamNo = instPtr->log.scanBeamNo;
+	instPtr->linkLog.beamWidth = instPtr->log.lastBeamWidth;
+	instPtr->linkLog.beamAz = antSubnrrwPattern[instPtr->log.scanBeamNo].oaxis;
+	instPtr->linkLog.beamEl = antSubnrrwPattern[instPtr->log.scanBeamNo].raxis;
+	instPtr->linkLog.advTxCnt = (uint16_t)instPtr->log.advTxCnt;
+	instPtr->linkLog.advRecvCnt = (uint16_t)instPtr->log.advRecvCnt;
+	instPtr->linkLog.advCorrectCnt = (uint16_t)instPtr->log.advCorrectCnt;
+	instPtr->linkLog.cfmTxCnt = instPtr->log.cfmTxCnt;
+	instPtr->linkLog.cfmRecvCnt = instPtr->log.cfmRecvCnt;
+	instPtr->linkLog.cfmCorrectCnt = instPtr->log.cfmCorrectCnt;
+	instPtr->linkLog.svcTxCnt = instPtr->log.svcTxCnt;
+	instPtr->linkLog.svcRecvCnt = instPtr->log.svcRecvCnt;
+	instPtr->linkLog.svcCorrectCnt = instPtr->log.svcCorrectCnt;
+	instPtr->linkLog.timeDev = (instPtr->log.timeDev > INT32_MAX) ?
+								INT32_MAX :
+								((instPtr->log.timeDev < INT32_MIN) ? INT32_MIN : (int32_t) instPtr->log.timeDev);
+	instPtr->linkLog.sendId = instPtr->serviceFSM->txLog.dataId;
+	instPtr->linkLog.recvId = instPtr->serviceFSM->rxLog.dataId;
+
+	SysMonitor_UpdateLinklayerLog(&(instPtr->linkLog));
 	return SUCCESS;
 }

df_datalink_sp/src/networking/link_layer/link_layer.h

@@ -64,6 +64,11 @@ typedef struct
 	uint32_t svcTxCnt;
 	uint32_t svcRecvCnt;
 	uint32_t svcCorrectCnt;
+
+	int64_t timeDev;
+	uint8_t scanBeamNo;
+	uint8_t lastBeamWidth;
+	uint32_t reconnectCnt;
 } L2_LOG;
 
 typedef struct
@@ -90,9 +95,7 @@ typedef struct
 	L2_LOG log;
 	// for system log
 	SYSINFO sysInfo;
-	SLOTLOG txSlotLog;
+	LINKLOG linkLog;
-	SLOTLOG rxSlotLog;
-	PRTCLLOG prtcLog;
 } L2_INST;
 
 /************************** Variable Definitions *****************************/
@@ -166,7 +169,8 @@ L2_FRAME_TYPE L2_GetNextFrameType(L2_INST *instPtr);
 L2_TOR_TYPE L2_GetNextTor(L2_INST *instPtr);
 
 // Time syncronization
-int32_t L2_TimeAlign(L2_INST *instPtr, uint32_t frameNum, uint32_t slotNum, bool relative);
+int32_t L2_GetTimeDeviation(L2_INST *instPtr, uint32_t frameNum, uint32_t slotNum, bool relative, int64_t* timeDev);
+void L2_TimeAdjust(L2_INST *instPtr, const int64_t *timeDev);
 
 
 #endif /* __LINK_LAYER_H_ */

df_datalink_sp/src/networking/link_layer/link_layer_types.h

@@ -22,6 +22,9 @@
 #include "geometry/coord.h"
 #include "geometry/quaternion.h"
 #include "../phy_layer/phy_layer.h"
+#ifndef EMULATION
+#include "../config/app_config.h"
+#endif
 /************************** Constant Definitions *****************************/
 // Common node ID definition
 #define L2_BROADCAST_ID 0xFF
@@ -210,6 +213,8 @@ typedef struct
 #ifdef DATALINK_ENABLE_BERTEST
 	uint32_t bitTotal;
 	uint32_t bitError;
+	double lossRate;
+	double errorRate;
 #endif
 } L2_SVC_FSM;
 

df_datalink_sp/src/networking/link_layer/routine_table.c

@@ -16,6 +16,9 @@
 #include "link_layer.h"
 #include "link_layer_types.h"
 
+#define LINKLAYER_INSERT_EXTRGAP
+
+#ifndef LINKLAYER_INSERT_EXTRGAP
 L2_RTNE_TABLE_ENTRY intraScanSubT[L2_SLOTS_PER_FRAME] = {
 // SubFrame 0
 	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
@@ -38,6 +41,7 @@ L2_RTNE_TABLE_ENTRY intraScanSubT[L2_SLOTS_PER_FRAME] = {
 	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
 	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
 	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+
 // SubFrame 1
 	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
 	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
@@ -59,6 +63,7 @@ L2_RTNE_TABLE_ENTRY intraScanSubT[L2_SLOTS_PER_FRAME] = {
 	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
 	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
 	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+
 // SubFrame 2
 	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
 	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
@@ -80,6 +85,7 @@ L2_RTNE_TABLE_ENTRY intraScanSubT[L2_SLOTS_PER_FRAME] = {
 	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
 	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
 	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+
 // SubFrame 3
 	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
 	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
@@ -122,6 +128,7 @@ L2_RTNE_TABLE_ENTRY intraScanSubT[L2_SLOTS_PER_FRAME] = {
 	{L2_SLOT_CONFIRM, 0x01, 0x01, 0xFF},
 	{L2_SLOT_CONFIRM, 0x02, 0x01, 0xFF},
 	{L2_SLOT_CONFIRM, 0x03, 0x01, 0xFF},
+
 // SubFrame 5
 	{L2_SLOT_CONFIRM, 0x00, 0x01, 0xFF},
 	{L2_SLOT_CONFIRM, 0x01, 0x01, 0xFF},
@@ -143,6 +150,7 @@ L2_RTNE_TABLE_ENTRY intraScanSubT[L2_SLOTS_PER_FRAME] = {
 	{L2_SLOT_CONFIRM, 0x01, 0x01, 0xFF},
 	{L2_SLOT_CONFIRM, 0x02, 0x01, 0xFF},
 	{L2_SLOT_CONFIRM, 0x03, 0x01, 0xFF},
+
 // SubFrame 6
 	{L2_SLOT_CONFIRM, 0x00, 0xFF, 0x01},
 	{L2_SLOT_CONFIRM, 0x01, 0xFF, 0x01},
@@ -164,6 +172,7 @@ L2_RTNE_TABLE_ENTRY intraScanSubT[L2_SLOTS_PER_FRAME] = {
 	{L2_SLOT_CONFIRM, 0x01, 0xFF, 0x01},
 	{L2_SLOT_CONFIRM, 0x02, 0xFF, 0x01},
 	{L2_SLOT_CONFIRM, 0x03, 0xFF, 0x01},
+
 // SubFrame 7
 	{L2_SLOT_CONFIRM, 0x00, 0xFF, 0x01},
 	{L2_SLOT_CONFIRM, 0x01, 0xFF, 0x01},
@@ -185,6 +194,7 @@ L2_RTNE_TABLE_ENTRY intraScanSubT[L2_SLOTS_PER_FRAME] = {
 	{L2_SLOT_CONFIRM, 0x01, 0xFF, 0x01},
 	{L2_SLOT_CONFIRM, 0x02, 0xFF, 0x01},
 	{L2_SLOT_CONFIRM, 0x03, 0xFF, 0x01},
+
 // SubFrame 8
 	{L2_SLOT_CONFIRM, 0x00, 0x01, 0xFF},
 	{L2_SLOT_CONFIRM, 0x01, 0x01, 0xFF},
@@ -206,6 +216,7 @@ L2_RTNE_TABLE_ENTRY intraScanSubT[L2_SLOTS_PER_FRAME] = {
 	{L2_SLOT_CONFIRM, 0x01, 0x01, 0xFF},
 	{L2_SLOT_CONFIRM, 0x02, 0x01, 0xFF},
 	{L2_SLOT_CONFIRM, 0x03, 0x01, 0xFF},
+
 // SubFrame 9
 	{L2_SLOT_CONFIRM, 0x00, 0x01, 0xFF},
 	{L2_SLOT_CONFIRM, 0x01, 0x01, 0xFF},
@@ -450,6 +461,451 @@ L2_RTNE_TABLE_ENTRY normalSub[L2_SLOTS_PER_FRAME] = {
 	{L2_SLOT_SERVICE, 0x02, 0x02, 0x01},
 	{L2_SLOT_SERVICE, 0x03, 0x02, 0x01},
 };
+#else
+L2_RTNE_TABLE_ENTRY intraScanSubT[L2_SLOTS_PER_FRAME] = {
+// SubFrame 0
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+
+// SubFrame 1
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+
+// SubFrame 2
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+
+// SubFrame 3
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_ADVERTISE, 0x00, 0x01, 0xFF},
+	{L2_SLOT_ADVERTISE, 0x01, 0x01, 0xFF},
+	{L2_SLOT_ADVERTISE, 0x02, 0x01, 0xFF},
+	{L2_SLOT_ADVERTISE, 0x03, 0x01, 0xFF},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+
+// SubFrame 4
+	{L2_SLOT_CONFIRM, 0x00, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x01, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x02, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x03, 0x01, 0xFF},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_CONFIRM, 0x00, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x01, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x02, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x03, 0x01, 0xFF},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_CONFIRM, 0x00, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x01, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x02, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x03, 0xFF, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_CONFIRM, 0x00, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x01, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x02, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x03, 0xFF, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+
+// SubFrame 5
+	{L2_SLOT_CONFIRM, 0x00, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x01, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x02, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x03, 0x01, 0xFF},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_CONFIRM, 0x00, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x01, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x02, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x03, 0x01, 0xFF},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_CONFIRM, 0x00, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x01, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x02, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x03, 0xFF, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_CONFIRM, 0x00, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x01, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x02, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x03, 0xFF, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+
+// SubFrame 6
+	{L2_SLOT_CONFIRM, 0x00, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x01, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x02, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x03, 0x01, 0xFF},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_CONFIRM, 0x00, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x01, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x02, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x03, 0x01, 0xFF},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_CONFIRM, 0x00, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x01, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x02, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x03, 0xFF, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_CONFIRM, 0x00, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x01, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x02, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x03, 0xFF, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+
+// SubFrame 7
+	{L2_SLOT_CONFIRM, 0x00, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x01, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x02, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x03, 0x01, 0xFF},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_CONFIRM, 0x00, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x01, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x02, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x03, 0x01, 0xFF},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_CONFIRM, 0x00, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x01, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x02, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x03, 0xFF, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_CONFIRM, 0x00, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x01, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x02, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x03, 0xFF, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+
+// SubFrame 8
+	{L2_SLOT_CONFIRM, 0x00, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x01, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x02, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x03, 0x01, 0xFF},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_CONFIRM, 0x00, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x01, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x02, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x03, 0x01, 0xFF},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_CONFIRM, 0x00, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x01, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x02, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x03, 0xFF, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_CONFIRM, 0x00, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x01, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x02, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x03, 0xFF, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+
+// SubFrame 9
+	{L2_SLOT_CONFIRM, 0x00, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x01, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x02, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x03, 0x01, 0xFF},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_CONFIRM, 0x00, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x01, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x02, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x03, 0x01, 0xFF},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_CONFIRM, 0x00, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x01, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x02, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x03, 0xFF, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_CONFIRM, 0x00, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x01, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x02, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x03, 0xFF, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+};
+
+L2_RTNE_TABLE_ENTRY normalSub[L2_SLOTS_PER_FRAME] = {
+// SubFrame 0
+	{L2_SLOT_SERVICE, 0x00, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x01, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x02, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x03, 0x01, 0x02},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x01, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x02, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x03, 0x02, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x01, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x02, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x03, 0x01, 0x02},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x01, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x02, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x03, 0x02, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+
+// SubFrame 1
+	{L2_SLOT_SERVICE, 0x00, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x01, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x02, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x03, 0x01, 0x02},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x01, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x02, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x03, 0x02, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x01, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x02, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x03, 0x01, 0x02},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x01, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x02, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x03, 0x02, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+
+// SubFrame 2
+	{L2_SLOT_SERVICE, 0x00, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x01, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x02, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x03, 0x01, 0x02},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x01, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x02, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x03, 0x02, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x01, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x02, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x03, 0x01, 0x02},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x01, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x02, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x03, 0x02, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+
+// SubFrame 3
+	{L2_SLOT_SERVICE, 0x00, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x01, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x02, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x03, 0x01, 0x02},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x01, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x02, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x03, 0x02, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x01, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x02, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x03, 0x01, 0x02},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x01, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x02, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x03, 0x02, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+
+// SubFrame 4
+	{L2_SLOT_SERVICE, 0x00, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x01, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x02, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x03, 0x01, 0x02},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x01, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x02, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x03, 0x02, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x01, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x02, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x03, 0x01, 0x02},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x01, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x02, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x03, 0x02, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+
+// SubFrame 5
+	{L2_SLOT_SERVICE, 0x00, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x01, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x02, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x03, 0x01, 0x02},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x01, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x02, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x03, 0x02, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x01, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x02, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x03, 0x01, 0x02},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x01, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x02, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x03, 0x02, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+
+// SubFrame 6
+	{L2_SLOT_SERVICE, 0x00, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x01, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x02, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x03, 0x01, 0x02},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x01, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x02, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x03, 0x02, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x01, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x02, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x03, 0x01, 0x02},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x01, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x02, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x03, 0x02, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+
+// SubFrame 7
+	{L2_SLOT_SERVICE, 0x00, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x01, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x02, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x03, 0x01, 0x02},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x01, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x02, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x03, 0x02, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x01, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x02, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x03, 0x01, 0x02},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x01, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x02, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x03, 0x02, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+
+// SubFrame 8
+	{L2_SLOT_SERVICE, 0x00, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x01, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x02, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x03, 0x01, 0x02},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x01, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x02, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x03, 0x02, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x01, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x02, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x03, 0x01, 0x02},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x01, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x02, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x03, 0x02, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+
+// SubFrame 9
+	{L2_SLOT_SERVICE, 0x00, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x01, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x02, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x03, 0x01, 0x02},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x01, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x02, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x03, 0x02, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x01, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x02, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x03, 0x01, 0x02},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x01, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x02, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x03, 0x02, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+};
+#endif
 
 L2_RTNE_TABLE_ENTRY *initTable[L2_INIT_RTNE_PERIOD] =
 {

df_datalink_sp/src/networking/link_layer/scan.c

@@ -405,26 +405,36 @@ int32_t L2_Scan_PktHandler(L2_INST *instPtr, uint8_t *msg)
 		node->nodeInfo.pos.y = (double) nodePos;
 		L2_FrameGetChunk(msg, L2_MSG_ADV_SRC_POSZ, L2_MSG_ADV_SRC_POSZ_LEN, &nodePos);
 		node->nodeInfo.pos.z = (double) nodePos;
+		node->nodeInfo.beamNo = Phy_LastScanBeamNo(instPtr->config.phyInstPtr);
+
+		// log last scan beam number
+		instPtr->log.scanBeamNo = node->nodeInfo.beamNo;
 
 		// Reset node ttl
 		node->ttlCnt = 0;
 
-		if (L2_isCxn2Net(instPtr) == false)
+		uint32_t netstartTime;
-		{
+		// Update net start time.
-			uint32_t netstartTime, frameNum, slotNum = 0;
+		L2_FrameGetChunk(msg, L2_MSG_ADV_SRC_NETSTART_TIME, L2_MSG_ADV_SRC_NETSTART_TIME_LEN, &netstartTime);
-			// Update net start time.
+		L2_EVENT netSetupDoneEvent = {
-			L2_FrameGetChunk(msg, L2_MSG_ADV_SRC_NETSTART_TIME, L2_MSG_ADV_SRC_NETSTART_TIME_LEN, &netstartTime);
+			.event = L2_EV_NET_ADV_UPDATE,
-			L2_EVENT netSetupDoneEvent = {
+			.msg = &netstartTime};
-				.event = L2_EV_NET_ADV_UPDATE,
+		AssertL2Event(instPtr, &netSetupDoneEvent);
-				.msg = &netstartTime};
-			AssertL2Event(instPtr, &netSetupDoneEvent);
 
-			// Time sync.
+		// Calculate time deviation
-			L2_FrameGetChunk(msg, L2_MSG_FRAME_NUM, L2_MSG_FRAME_NUM_LEN, &frameNum);
+		uint32_t frameNum, slotNum = 0;
-			L2_FrameGetChunk(msg, L2_MSG_SLOT_NUM, L2_MSG_SLOT_NUM_LEN, &slotNum);
+		L2_FrameGetChunk(msg, L2_MSG_FRAME_NUM, L2_MSG_FRAME_NUM_LEN, &frameNum);
-			// TODO: Check
+		L2_FrameGetChunk(msg, L2_MSG_SLOT_NUM, L2_MSG_SLOT_NUM_LEN, &slotNum);
-			L2_TimeAlign(instPtr, frameNum, slotNum, true);
+		Status = L2_GetTimeDeviation(instPtr, frameNum, slotNum, true, &(instPtr->log.timeDev));
+		if (Status != SUCCESS)
+		{
+			DBG_ERROR("Failed to compute time deviation.\n")
+			break;
 		}
+
+		// Time sync.
+		L2_TimeAdjust(instPtr, &(instPtr->log.timeDev));
+
 		// trigger flag
 		AdvRecvStateUpdate(scanFsmPtr, true);
 		Status = SUCCESS;
@@ -465,6 +475,17 @@ int32_t L2_Scan_PktHandler(L2_INST *instPtr, uint8_t *msg)
 		// Reset node ttl
 		node->ttlCnt = 0;
 
+		// Calculate time deviation
+		uint32_t frameNum, slotNum = 0;
+		L2_FrameGetChunk(msg, L2_MSG_FRAME_NUM, L2_MSG_FRAME_NUM_LEN, &frameNum);
+		L2_FrameGetChunk(msg, L2_MSG_SLOT_NUM, L2_MSG_SLOT_NUM_LEN, &slotNum);
+		Status = L2_GetTimeDeviation(instPtr, frameNum, slotNum, true, &(instPtr->log.timeDev));
+		if (Status != SUCCESS)
+		{
+			DBG_ERROR("Failed to compute time deviation.\n")
+			break;
+		}
+
 		if (L2_GetNodeType(instPtr) != L2_NODE_HEAD)
 		{
 			// check if net setup finished.
@@ -501,6 +522,8 @@ int32_t L2_Scan_PktHandler(L2_INST *instPtr, uint8_t *msg)
 				l2Event.msg = &newState;
 				AssertL2Event(instPtr, &l2Event);
 			}
+			// Time sync.
+			L2_TimeAdjust(instPtr, &(instPtr->log.timeDev));
 		}
 		Status = SUCCESS;
 		break;
@@ -572,6 +595,7 @@ int32_t L2_Scan_Routine(L2_INST *instPtr, const L2_RTNE_TABLE_ENTRY *rtneEntry)
 	ASSERT(instPtr != NULL);
 	L2_TOR_TYPE torState;
 	int32_t Status;
+	const NODE_ENTRY* commNode;
 	DBG_INFO("-------- Scan Routine --------\n");
 
 	if (rtneEntry->slotSeq != 0)
@@ -584,15 +608,24 @@ int32_t L2_Scan_Routine(L2_INST *instPtr, const L2_RTNE_TABLE_ENTRY *rtneEntry)
 		if (rtneEntry->dst == L2_GetNodeId(instPtr) || rtneEntry->dst == L2_BROADCAST_ID)
 		{
 			torState = L2_TOR_RX;
+			commNode = L2_GetNodeById(instPtr->nodeList, rtneEntry->dst);
 		}
 		else if (rtneEntry->src == L2_GetNodeId(instPtr) || rtneEntry->src == L2_BROADCAST_ID)
 		{
 			torState = L2_TOR_TX;
+			commNode = L2_GetNodeById(instPtr->nodeList, rtneEntry->src);
 		}
 		else
 		{
 			torState = L2_TOR_SUSPEND;
 		}
+
+		Phy_SetBeamWidth(instPtr->config.phyInstPtr, PHY_ANT_BEAM_25);
+		instPtr->log.lastBeamWidth = PHY_ANT_BEAM_25;
+		if (commNode != NULL)
+		{
+			Phy_SetBeamNo(instPtr->config.phyInstPtr, commNode->nodeInfo.beamNo);
+		}
 	}
 	else
 	{
@@ -608,6 +641,8 @@ int32_t L2_Scan_Routine(L2_INST *instPtr, const L2_RTNE_TABLE_ENTRY *rtneEntry)
 		{
 			torState = L2_TOR_SUSPEND;
 		}
+		Phy_SetBeamWidth(instPtr->config.phyInstPtr, PHY_ANT_BEAM_120);
+		instPtr->log.lastBeamWidth = PHY_ANT_BEAM_120;
 	}
 
 	switch (rtneEntry->slotType)

df_datalink_sp/src/networking/link_layer/service.c

@@ -115,11 +115,11 @@ static int32_t Service_Packing(L2_INST *instPtr, L2_FRAME_TYPE type, uint8_t dst
 		uint32_t dataId;
 		if(L2_GetNodeType(instPtr) == L2_NODE_HEAD)
 		{
-			SysMonitor_GetSendPayloadFLJRaw(buff + L2_MSG_SVC_PAYLOAD, &dataId);
+			SysMonitor_GetSendPayload(buff + L2_MSG_SVC_PAYLOAD, &dataId, PAYLOAD_LEN_FLJ_TX);
 		}
 		else
 		{
-			SysMonitor_GetSendPayloadLJRaw(buff + L2_MSG_SVC_PAYLOAD, &dataId);
+			SysMonitor_GetSendPayload(buff + L2_MSG_SVC_PAYLOAD, &dataId, PAYLOAD_LEN_LJ_TX);
 		}
 
 		L2_FrameInsertChunk(buff, L2_MSG_SVC_PAYLOAD_ID, L2_MSG_SVC_PAYLOAD_ID_LEN, &dataId);
@@ -141,6 +141,9 @@ static int32_t Service_Packing(L2_INST *instPtr, L2_FRAME_TYPE type, uint8_t dst
 			DBG_ERROR("Fail to append CRC...\n");
 			return Status;
 		}
+
+		memcpy(instPtr->serviceFSM->txLog.data, buff, L2_SVC_PACK_LEN);
+		instPtr->serviceFSM->txLog.dataId = dataId;
 		break;
 	}
 	default:
@@ -227,8 +230,8 @@ int32_t L2_Service_PktHandler(L2_INST *instPtr, uint8_t *msg)
 {
 	ASSERT(instPtr != NULL);
 	ASSERT(msg != NULL);
-#ifndef DATALINK_ENABLE_BERTEST
 	int32_t Status;
+#ifndef DATALINK_ENABLE_BERTEST
 	uint8_t frameType;
 	L2_FrameGetChunk(msg, L2_MSG_TYPE, L2_MSG_TYPE_LEN, &frameType);
 	switch (frameType)
@@ -269,6 +272,17 @@ int32_t L2_Service_PktHandler(L2_INST *instPtr, uint8_t *msg)
 		// Reset node ttl
 		node->ttlCnt = 0;
 
+		// Calculate time deviation
+		uint32_t frameNum, slotNum = 0;
+		L2_FrameGetChunk(msg, L2_MSG_FRAME_NUM, L2_MSG_FRAME_NUM_LEN, &frameNum);
+		L2_FrameGetChunk(msg, L2_MSG_SLOT_NUM, L2_MSG_SLOT_NUM_LEN, &slotNum);
+		Status = L2_GetTimeDeviation(instPtr, frameNum, slotNum, true, &(instPtr->log.timeDev));
+		if (Status != SUCCESS)
+		{
+			DBG_ERROR("Failed to compute time deviation.\n")
+			break;
+		}
+
 		uint32_t dataId;
 		L2_FrameGetChunk(msg, L2_MSG_SVC_PAYLOAD_ID, L2_MSG_SVC_PAYLOAD_ID_LEN, &dataId);
 
@@ -276,22 +290,24 @@ int32_t L2_Service_PktHandler(L2_INST *instPtr, uint8_t *msg)
 		{
 			if(L2_GetNodeType(instPtr) == L2_NODE_HEAD)
 			{
-				SysMonitor_UpdateRecvPayloadFLJRaw(msg+L2_MSG_SVC_PAYLOAD);
+				SysMonitor_UpdateRecvPayload(msg+L2_MSG_SVC_PAYLOAD, PAYLOAD_LEN_FLJ_RX);
 			}
 			else
 			{
-				SysMonitor_UpdateRecvPayloadLJRaw(msg+L2_MSG_SVC_PAYLOAD);
+				SysMonitor_UpdateRecvPayload(msg+L2_MSG_SVC_PAYLOAD, PAYLOAD_LEN_LJ_RX);
 			}
 		}
 
+		// Logging
+		memcpy(instPtr->serviceFSM->rxLog.data, msg, L2_SVC_PACK_LEN);
+		instPtr->serviceFSM->rxLog.dataId = dataId;
+
 #ifdef DATALINK_ENABLE_AUTOTIMESYNC
 		// Implement a auto time sync.
 		if (L2_GetNodeType(instPtr) != L2_NODE_HEAD)
 		{
-			uint32_t frameNum, slotNum;
+			// Time sync.
-			L2_FrameGetChunk(msg, L2_MSG_FRAME_NUM, L2_MSG_FRAME_NUM_LEN, &frameNum);
+			L2_TimeAdjust(instPtr, &(instPtr->log.timeDev));
-			L2_FrameGetChunk(msg, L2_MSG_SLOT_NUM, L2_MSG_SLOT_NUM_LEN, &slotNum);
-			L2_TimeAlign(instPtr, frameNum, slotNum, true);
 		}
 #endif
 		break;
@@ -303,22 +319,31 @@ int32_t L2_Service_PktHandler(L2_INST *instPtr, uint8_t *msg)
 	return Status;
 #else
 	uint32_t errorBits = 0;
-	for (int i = 0; i < SVC_PACK_LEN; i++)
+	for (int i = 0; i < L2_SVC_PACK_LEN; i++)
 	{
 		errorBits += count_ones(msg[i] ^ testData[i]);
 	}
 
-	instPtr->serviceFsm.bitError += errorBits;
+	instPtr->serviceFSM->bitError += errorBits;
-	instPtr->serviceFsm.bitTotal += SVC_PACK_LEN * 8;
+	instPtr->serviceFSM->bitTotal += L2_SVC_PACK_LEN * 8;
 
+	// Calculate time deviation
+	uint32_t frameNum, slotNum = 0;
+	L2_FrameGetChunk(msg, L2_MSG_FRAME_NUM, L2_MSG_FRAME_NUM_LEN, &frameNum);
+	L2_FrameGetChunk(msg, L2_MSG_SLOT_NUM, L2_MSG_SLOT_NUM_LEN, &slotNum);
+	Status = L2_GetTimeDeviation(instPtr, frameNum, slotNum, true, &(instPtr->log.timeDev));
+	if (Status != SUCCESS)
+	{
+		DBG_ERROR("Failed to compute time deviation.\n")
+		return Status;
+	}
 	// Implement a auto time sync.
 	if (L2_GetNodeType(instPtr) != L2_NODE_HEAD)
 	{
-		uint32_t frameNum, slotNum;
+		// Time sync.
-		L2_FrameGetChunk(msg, L2_MSG_FRAME_NUM, L2_MSG_FRAME_NUM_LEN, &frameNum);
+		L2_TimeAdjust(instPtr, &(instPtr->log.timeDev));
-		L2_FrameGetChunk(msg, L2_MSG_SLOT_NUM, L2_MSG_SLOT_NUM_LEN, &slotNum);
-		L2_TimeAlign(instPtr, frameNum, slotNum, true);
 	}
+	return SUCCESS;
 #endif
 }
 
@@ -344,19 +369,34 @@ int32_t L2_Service_Routine(L2_INST *instPtr, const L2_RTNE_TABLE_ENTRY *rtneEntr
 
 	PHY_INST* phyRef = instPtr->config.phyInstPtr;
 	L2_TOR_TYPE torState;
+	const NODE_ENTRY* commNode;
 	if (rtneEntry->src == L2_GetNodeId(instPtr))
 	{
 		torState = L2_TOR_TX;
+		commNode = L2_GetNodeById(instPtr->nodeList, rtneEntry->src);
 	}
 	else if (rtneEntry->dst == L2_GetNodeId(instPtr))
 	{
 		torState = L2_TOR_RX;
+		commNode = L2_GetNodeById(instPtr->nodeList, rtneEntry->src);
 	}
 	else
 	{
 		torState = L2_TOR_SUSPEND;
 	}
 
+	if (L2_GetNodeType(instPtr) != L2_NODE_HEAD && commNode != NULL)
+	{
+		Phy_SetBeamWidth(phyRef, PHY_ANT_BEAM_25);
+		Phy_SetBeamNo(phyRef, commNode->nodeInfo.beamNo);
+		instPtr->log.lastBeamWidth = PHY_ANT_BEAM_25;
+	}
+	else
+	{
+		Phy_SetBeamWidth(phyRef, PHY_ANT_BEAM_120);
+		instPtr->log.lastBeamWidth = PHY_ANT_BEAM_120;
+	}
+
 	switch (rtneEntry->slotType)
 	{
 	case L2_SLOT_SERVICE:
@@ -366,7 +406,7 @@ int32_t L2_Service_Routine(L2_INST *instPtr, const L2_RTNE_TABLE_ENTRY *rtneEntr
 			// Packing service data
 			Service_Packing(instPtr, L2_SVC_FRAME, rtneEntry->dst);
 #else
-			memcpy(instPtr->sendPktData, testData, SVC_PACK_LEN);
+			memcpy(instPtr->sendPktData, testData, L2_SVC_PACK_LEN);
 #endif
 		}
 		// FIXME: Steer antenna to point to destination.
@@ -380,12 +420,11 @@ int32_t L2_Service_Routine(L2_INST *instPtr, const L2_RTNE_TABLE_ENTRY *rtneEntr
 	}
 #ifdef DATALINK_ENABLE_BERTEST
 	uint32_t pktLoss;
-	double errorRate, lossRate;
 	pktLoss = instPtr->log.svcRecvCnt - instPtr->log.svcCorrectCnt;
-	lossRate = (instPtr->log.svcRecvCnt == 0) ? 0 : (double)pktLoss / (double)instPtr->serviceFsm.pktRecv;
+	instPtr->serviceFSM->lossRate = (instPtr->log.svcRecvCnt == 0) ? 0 : (double)pktLoss / (double)instPtr->serviceFSM->pktRecv;
-	errorRate = (instPtr->serviceFsm.bitTotal == 0) ? 0 : (double)instPtr->serviceFsm.bitError / (double)instPtr->serviceFsm.bitTotal;
+	instPtr->serviceFSM->errorRate = (instPtr->serviceFSM->bitTotal == 0) ? 0 : (double)instPtr->serviceFSM->bitError / (double)instPtr->serviceFSM->bitTotal;
-	DBG_PRINT("Packet Loss Rate -- Total: %lu, Loss: %lu.\n", instPtr->serviceFsm.pktRecv, pktLoss);
+	DBG_PRINT("Packet Loss Rate -- Total: %lu, Loss: %lu.\n", instPtr->serviceFSM->pktRecv, pktLoss);
-	DBG_PRINT("Bit Error Rate -- Total:%lu, Error:%lu.\n", instPtr->serviceFsm.bitTotal, instPtr->serviceFsm.bitError);
+	DBG_PRINT("Bit Error Rate -- Total:%lu, Error:%lu.\n", instPtr->serviceFSM->bitTotal, instPtr->serviceFSM->bitError);
 #endif
 	return SUCCESS;
 }

df_datalink_sp/src/networking/link_layer/time_sync.c

@@ -32,20 +32,22 @@
 
 /*****************************************************************************/
 /**
- * @brief    a slot alignment, base on physical layer information.
+ * @brief    Get time deviation to the specified frame and slot number.
  *
  * @param   instPtr	a pointer to linklayer layer instance
  * @param   frameNum
  * @param   slotNum
+ * @param   relative
+ * @param   timeDev
  *
- * @return  SUCCESS Initialize successfully.
+ * @return  SUCCESS
- *          FAILURE Initialization failed, allocate memory fail or initial
+ * 			EIGNORE there is no received frame
- *          bram controller fail.
  *
  ******************************************************************************/
-// TODO: Check
+int32_t L2_GetTimeDeviation(L2_INST *instPtr, uint32_t frameNum, uint32_t slotNum, bool relative, int64_t *timeDev)
-int32_t L2_TimeAlign(L2_INST *instPtr, uint32_t frameNum, uint32_t slotNum, bool relative)
 {
+	ASSERT(instPtr != NULL);
+	ASSERT(timeDev != NULL);
 	L1_FRAME_TYPE lastRecvdFrame;
 	lastRecvdFrame = Phy_GetLastRecvFrameType(instPtr->config.phyInstPtr);
 	if (lastRecvdFrame == L1_NONE_FRAME)
@@ -57,8 +59,7 @@ int32_t L2_TimeAlign(L2_INST *instPtr, uint32_t frameNum, uint32_t slotNum, bool
 	DBG_INFO("Starting TimeAlign operation...\n");
 	// read nextSendTime from physical layer
 	uint64_t currTime, expectTime;
-	int64_t timeDiff;
+	TIME_WORD timeStamp;
-	TIME_WORD timeStamp, slotTimerAdjmet;
 	expectTime = ((uint64_t)(frameNum * L2_SLOTS_PER_FRAME + slotNum)) * TIME_FRAC_MAX;
 	expectTime += Phy_GetTimeComp(lastRecvdFrame);
 
@@ -71,10 +72,27 @@ int32_t L2_TimeAlign(L2_INST *instPtr, uint32_t frameNum, uint32_t slotNum, bool
 	currTime = (uint64_t)timeStamp.frac_part;
 	currTime += ((uint64_t)timeStamp.int_part) * TIME_FRAC_MAX;
 
-	timeDiff = (int64_t)(expectTime - currTime);
+	*timeDev = (int64_t)(expectTime - currTime);
-
-	slotTimerAdjmet.int_part = (uint32_t)(timeDiff / TIME_FRAC_MAX);
-	slotTimerAdjmet.frac_part = (uint32_t)(timeDiff % TIME_FRAC_MAX);
-	TimeCtrl_TimeAdjust(instPtr->config.tmcInstPtr, &slotTimerAdjmet, TM_ADJ_ADD);
 	return SUCCESS;
 }
+
+
+/*****************************************************************************/
+/**
+ * @brief    Implement time adjustment by applying time deviation.
+ *
+ * @param   instPtr	a pointer to linklayer layer instance
+ * @param   timeDev
+ *
+ * @return  NONE
+ *
+ ******************************************************************************/
+void L2_TimeAdjust(L2_INST *instPtr, const int64_t *timeDev)
+{
+	ASSERT(instPtr != NULL);
+	ASSERT(timeDev != NULL);
+	TIME_WORD slotTimerAdjmet;
+	slotTimerAdjmet.int_part = (uint32_t)(*timeDev / TIME_FRAC_MAX);
+	slotTimerAdjmet.frac_part = (uint32_t)(*timeDev % TIME_FRAC_MAX);
+	TimeCtrl_TimeAdjust(instPtr->config.tmcInstPtr, &slotTimerAdjmet, TM_ADJ_ADD);
+}

df_datalink_sp/src/networking/phy_layer/phy_antenna.c

@@ -86,17 +86,21 @@ uint16_t hopPattern_10KBPS_10MS[L1_FRAME_10KBPS_10MS_HOPS] =
 
 uint16_t hopPattern_10KBPS_20MS[L1_FRAME_10KBPS_20MS_HOPS] = 
 {
-	1500
+	1500, 1600, 1700, 1800, 1900, 1400, 1300, 1200, 
+	1100, 1000, 900
 };
 
 uint16_t hopPattern_40KBPS_10MS[L1_FRAME_40KBPS_10MS_HOPS] = 
 {
-	1600
+	1600, 1650, 1700, 1750, 1800, 1850, 1900, 1550, 
+	1500
 };
 
 uint16_t hopPattern_40KBPS_20MS[L1_FRAME_40KBPS_20MS_HOPS] = 
 {
-	1600
+	1600, 1650, 1700, 1750, 1800, 1850, 1900, 1550, 
+	1500, 1450, 1400, 1350, 1300, 1250, 1200, 1150, 
+	1100, 1050, 1000
 };
 
 uint16_t hopPattern_200KBPS_5MS[L1_FRAME_200KBPS_5MS_HOPS] =
@@ -118,7 +122,7 @@ uint16_t hopPattern_1M2BPS_5MS[L1_FRAME_1M2BPS_5MS_HOPS] =
 #ifdef PHY_BEAM_SET_PRESET
 PHY_ANT_ANGLE antSubnrrwPattern[L1_NUM_ANT_SUBNRRW_PATTERN] = 
 {
-	{.oaxis = 0 , .raxis = 222}, {.oaxis = 10, .raxis = 85 },
+	{.oaxis = 0 , .raxis = 0  }, {.oaxis = 10, .raxis = 85 },
 	{.oaxis = 14, .raxis = 307}, {.oaxis = 17, .raxis = 170},
 	{.oaxis = 19, .raxis = 32 }, {.oaxis = 21, .raxis = 255},
 	{.oaxis = 24, .raxis = 117}, {.oaxis = 25, .raxis = 340},
@@ -140,7 +144,7 @@ PHY_ANT_ANGLE antSubnrrwPattern[L1_NUM_ANT_SUBNRRW_PATTERN] =
 };
 PHY_ANT_ANGLE antNrrwPattern[L1_NUM_ANT_NRRW_PATTERN] = 
 {
-	{.oaxis = 0 , .raxis = 222}, {.oaxis = 7 , .raxis = 85 },
+	{.oaxis = 0 , .raxis = 0  }, {.oaxis = 7 , .raxis = 85 },
 	{.oaxis = 10, .raxis = 307}, {.oaxis = 13, .raxis = 170},
 	{.oaxis = 15, .raxis = 32 }, {.oaxis = 17, .raxis = 255},
 	{.oaxis = 18, .raxis = 117}, {.oaxis = 20, .raxis = 340},
@@ -276,10 +280,10 @@ int32_t Phy_SetBeamNo(PHY_INST *instPtr, int32_t beamNo)
 		else
 		{
 			instPtr->beamNo.next = beamNo;
-			instPtr->antConfig.oaxis[1] = (uint8_t)(antNrrwPattern[beamNo].oaxis);
+			instPtr->antConfig.oaxis[1] = (uint8_t)(antNrrwPattern[beamNo].oaxis >> 8);
-			instPtr->antConfig.oaxis[0] = (uint8_t)((antNrrwPattern[beamNo].oaxis) >> 8);
+			instPtr->antConfig.oaxis[0] = (uint8_t)(antNrrwPattern[beamNo].oaxis);
-			instPtr->antConfig.raxis[1] = (uint8_t)(antNrrwPattern[beamNo].raxis);
+			instPtr->antConfig.raxis[1] = (uint8_t)(antNrrwPattern[beamNo].raxis >> 8);
-			instPtr->antConfig.raxis[0] = (uint8_t)((antNrrwPattern[beamNo].raxis) >> 8);
+			instPtr->antConfig.raxis[0] = (uint8_t)(antNrrwPattern[beamNo].raxis);
 			return SUCCESS;
 		}
 	}
@@ -292,10 +296,10 @@ int32_t Phy_SetBeamNo(PHY_INST *instPtr, int32_t beamNo)
 		else
 		{
 			instPtr->beamNo.next = beamNo;
-			instPtr->antConfig.oaxis[1] = (uint8_t)(antSubnrrwPattern[beamNo].oaxis);
+			instPtr->antConfig.oaxis[1] = (uint8_t)(antSubnrrwPattern[beamNo].oaxis >> 8);
-			instPtr->antConfig.oaxis[0] = (uint8_t)((antSubnrrwPattern[beamNo].oaxis) >> 8);
+			instPtr->antConfig.oaxis[0] = (uint8_t)(antSubnrrwPattern[beamNo].oaxis);
-			instPtr->antConfig.raxis[1] = (uint8_t)(antSubnrrwPattern[beamNo].raxis);
+			instPtr->antConfig.raxis[1] = (uint8_t)(antSubnrrwPattern[beamNo].raxis >> 8);
-			instPtr->antConfig.raxis[0] = (uint8_t)((antSubnrrwPattern[beamNo].raxis) >> 8);
+			instPtr->antConfig.raxis[0] = (uint8_t)(antSubnrrwPattern[beamNo].raxis);
 			return SUCCESS;
 		}
 	}
@@ -334,7 +338,6 @@ int32_t Phy_SetBeamWidth(PHY_INST *instPtr, PHY_ANT_BEAM_WIDTH beamWidth)
 	default:
 		DBG_ERROR("Beam width code: 0x%08X is illegal.\n\r", beamWidth);
 		return EPARAM;
-		break;
 	}
 	instPtr->antConfig.antMode = beamConfig;
 	instPtr->beamWd.next = beamWidth;

df_datalink_sp/src/networking/phy_layer/phy_layer.c

@@ -26,6 +26,7 @@
 #include <stdlib.h>
 #include <math.h>
 #include "phy_layer.h"
+#include "phy_reg.h"
 #include "util.h"
 #include "error.h"
 #ifndef EMULATION
@@ -311,6 +312,30 @@ void Phy_UpdateState(PHY_INST *instPtr)
 	instPtr->recvSlotTime.frac_part = PhyRead(instPtr, TM_TARGET_L);
 	instPtr->recvFsTime.int_part = PhyRead(instPtr, FSTIME_H);
 	instPtr->recvFsTime.frac_part = PhyRead(instPtr, FSTIME_L);
+	instPtr->phyLog.acqCnt = PhyRead(instPtr, PHY_ACQ_CNT);
+	instPtr->phyLog.fsyncCnt = PhyRead(instPtr, PHY_FRAME_SYNC_CNT);
+	instPtr->phyLog.decodeCnt = PhyRead(instPtr, PHY_DECODE_CNT);
+	instPtr->phyLog.crcCnt = PhyRead(instPtr, PHY_CRC_OK_CNT);
+	instPtr->phyLog.doppler = Phy_GetFreqEst(instPtr);
+	instPtr->phyLog.recvStamp = (uint64_t)instPtr->recvFsTime.int_part * TIME_FRAC_MAX + instPtr->recvFsTime.frac_part;
+	uint64_t peak, avg;
+	peak = PhyRead(instPtr, PHY_ACQ_PEAK_L);
+	peak |= ((uint64_t)PhyRead(instPtr, PHY_ACQ_PEAK_H)) << 32;
+	avg = PhyRead(instPtr, PHY_ACQ_MEAN_L);
+	avg |= ((uint64_t)PhyRead(instPtr, PHY_ACQ_MEAN_H)) << 32;
+	instPtr->phyLog.acqPAPR = ((double)peak) / ((double)avg);
+	instPtr->phyLog.acqPhase = (PhyRead(instPtr, PHY_ACQ_FREQEST) & PHY_ACQ_FREQEST_PHASE_MASK) >> PHY_ACQ_FREQEST_PHASE_SHIFT;
+	instPtr->phyLog.acqFreqCh = (PhyRead(instPtr, PHY_ACQ_FREQEST) & PHY_ACQ_FREQEST_CHANNEL_MASK) >> PHY_ACQ_FREQEST_CHANNEL_SHIFT;
+	peak = PhyRead(instPtr, PHY_FRAME_SYNC_PEAK_L);
+	peak |= ((uint64_t)PhyRead(instPtr, PHY_FRAME_SYNC_PEAK_H)) << 32;
+	avg = PhyRead(instPtr, PHY_FRAME_SYNC_MEAN_L);
+	avg |= ((uint64_t)PhyRead(instPtr, PHY_FRAME_SYNC_MEAN_H)) << 32;
+	instPtr->phyLog.fsyncPAPR = ((double)peak) / ((double)avg);
+	instPtr->phyLog.fsyncFreqCh = (PhyRead(instPtr, PHY_FRAME_SYNC_FREQEST) & PHY_FRAME_SYNC_FREQEST_CHANNEL_MASK) >> PHY_FRAME_SYNC_FREQEST_CHANNEL_SHIFT;
+	instPtr->phyLog.deintlvAmpEst = PhyRead(instPtr, PHY_DEINTLV_AMPEST) & PHY_DEINTLV_AMPEST_MASK;
+	memset(instPtr->phyLog.reserve, 0x00, sizeof(instPtr->phyLog.reserve));
+
+	SysMonitor_UpdatePhysicalLayerLog(&(instPtr->phyLog));
 }
 
 /*****************************************************************************/
@@ -357,6 +382,7 @@ int32_t Phy_InstInit(PHY_INST **instPtr, PHY_CONFIG *phyConfig)
 	memset(&((*instPtr)->beamNo), (int32_t)L1_INIT_ANT_NO, sizeof(PHY_RCD));
 	memset(&((*instPtr)->beamWd), (int32_t)L1_INIT_ANT_WD, sizeof(PHY_RCD));
 	memset(&((*instPtr)->hwSate), 0x00, sizeof(HWSTATE));
+	memset(&((*instPtr)->phyLog), 0x00, sizeof(PHYLOG));
 
 #ifndef EMULATION
 	XBram_Config *bramConfigPtr;
@@ -431,6 +457,40 @@ int32_t Phy_InstInit(PHY_INST **instPtr, PHY_CONFIG *phyConfig)
 	(*instPtr)->recvDataAddr = rxDataBram.Config.MemBaseAddress;
 	(*instPtr)->sendDataAddr = txDataBram.Config.MemBaseAddress;
 
+	// Setup antenna presets
+	XBram antInfoBram;
+	if (phyConfig->antInfoBramId != -1)
+	{
+		bramConfigPtr = XBram_LookupConfig(phyConfig->antInfoBramId);
+		if (bramConfigPtr == NULL)
+		{
+			Status = EDCONF;
+			goto init_error;
+		}
+		Status = XBram_CfgInitialize(&antInfoBram, bramConfigPtr,
+									bramConfigPtr->CtrlBaseAddress);
+		if (Status != SUCCESS)
+		{
+			goto init_error;
+		}
+		/*
+		* Execute the BRAM driver selftest.
+		*/
+		Status = XBram_SelfTest(&antConfigBram, 0);
+		if (Status != SUCCESS)
+		{
+			goto init_error;
+		}
+
+		memcpy((void*)antConfigBram.Config.MemBaseAddress,
+				antSubnrrwPattern, sizeof(antSubnrrwPattern));
+		uint32_t phyMainCtrl = PhyRead(*instPtr, PHY_MAIN_CTRL);
+		phyMainCtrl &= ~PHY_MAIN_CTRL_NSCAN_MASK;
+		phyMainCtrl |= PHY_MAIN_CTRL_NSCAN_MASK &
+						(L1_NUM_ANT_SUBNRRW_PATTERN << PHY_MAIN_CTRL_NSCAN_SHIFT);
+		PhyWrite(*instPtr, PHY_MAIN_CTRL, phyMainCtrl);
+	}
+
 	/* Initialize the XAdc driver. */
 	XAdcPs_Config *xadcConfigPtr;
 
@@ -639,8 +699,8 @@ int32_t Phy_SetupNextSlot(PHY_INST *instPtr, PHY_TOR_TYPE txrxMode,
 		break;
 	case L1_10KBPS_10MS_FRAME:
 		phyModeCtrl |= PHY_MODE_CTRL_FRAME_10KBPS_10MS;
-		hopNum = L1_FRAME_10KBPS_10MS_HOPS;
+		hopNum = L1_FRAME_10KBPS_20MS_HOPS;
-		hopPattern = hopPattern_10KBPS_10MS;
+		hopPattern = hopPattern_10KBPS_20MS;
 		break;
 	case L1_10KBPS_20MS_FRAME:
 		phyModeCtrl |= PHY_MODE_CTRL_FRAME_10KBPS_20MS;
@@ -796,6 +856,21 @@ uint32_t Phy_GetTimeComp(L1_FRAME_TYPE frameType)
 	}
 }
 
+/*****************************************************************************/
+/**
+ * @brief   Get the last scan beam number after autoscan.
+ *
+ * @param   instPtr  a pointer to physical instance
+ *
+ * @return  beam number
+ *
+ ******************************************************************************/
+uint8_t Phy_LastScanBeamNo(PHY_INST *instPtr)
+{
+	ASSERT(instPtr != NULL);
+	return (uint8_t)PhyRead(instPtr, BEAM_SELECT_INDEX);
+}
+
 /*****************************************************************************/
 /**
  * @brief   Get frequency estimation of last valid frame.
@@ -827,14 +902,6 @@ double Phy_GetFreqEst(PHY_INST *instPtr)
 	fineReg = PhyRead(instPtr, FINE_FREQEST);
 	estAbs = fineReg & FINE_FREQEST_VAL_MASK;
 	if (frameType >= L1_200KBPS_5MS_FRAME)
-	{
-		// 1.5M Rc
-		coarse = (double)(80 - acqFreqIdx) * (31.25e3 / 4);
-		coarse += (double)syncFreqIdx * 1.5e6 / 64 / 128;
-
-		fine = 12e6/2048*((double)estAbs)/8192.0;
-	}
-	else
 	{
 		// 12M Rc
 		coarse = (double)(8 - acqFreqIdx) * (250e3 / 4);
@@ -842,6 +909,14 @@ double Phy_GetFreqEst(PHY_INST *instPtr)
 
 		fine = 48e6/2048*((double)estAbs)/8192.0;
 	}
+	else
+	{
+		// 1.5M Rc
+		coarse = (double)(80 - acqFreqIdx) * (31.25e3 / 4);
+		coarse += (double)syncFreqIdx * 1.5e6 / 64 / 128;
+
+		fine = 12e6/2048*((double)estAbs)/8192.0;
+	}
 
 	fine = ((fineReg & FINE_FREQEST_SIGN_MASK) == FINE_FREQEST_SIGN_NEG) ?
 			-fine : fine;
@@ -876,17 +951,17 @@ double Phy_GetCoarseFreqEst(PHY_INST *instPtr)
 	acqFreqIdx = (regValue & COASE_FREQEST_ACQ_MASK) >> COASE_FREQEST_ACQ_SHIFT;
 	syncFreqIdx = (regValue & COASE_FREQEST_SYNC_MASK) >> COASE_FREQEST_SYNC_SHIFT;
 	if (frameType >= L1_200KBPS_5MS_FRAME)
-	{
-		// 1.5M Rc
-		freqEst = (double)(80 - acqFreqIdx) * (31.25e3 / 4);
-		freqEst += (double)syncFreqIdx * 1.5e6 / 64 / 128;
-	}
-	else
 	{
 		// 12M Rc
 		freqEst = (double)(8 - acqFreqIdx) * (250e3 / 4);
 		freqEst += (double)syncFreqIdx * 12e6 / 64 / 128;
 	}
+	else
+	{
+		// 1.5M Rc
+		freqEst = (double)(80 - acqFreqIdx) * (31.25e3 / 4);
+		freqEst += (double)syncFreqIdx * 1.5e6 / 64 / 128;
+	}
 
 	return freqEst;
 }
@@ -915,13 +990,13 @@ double Phy_GetFineFreqEst(PHY_INST *instPtr)
 	estAbs = regValue & FINE_FREQEST_VAL_MASK;
 	if (frameType >= L1_200KBPS_5MS_FRAME)
 	{
-		// 1.5M Rc
+		// 12M Rc
-		freqEst = 12e6/2048*((double)estAbs)/8192.0;
+		freqEst = 48e6/2048*((double)estAbs)/8192.0;
 	}
 	else
 	{
-		// 12M Rc
+		// 1.5M Rc
-		freqEst = 48e6/2048*((double)estAbs)/8192.0;
+		freqEst = 12e6/2048*((double)estAbs)/8192.0;
 	}
 	freqEst = ((regValue & FINE_FREQEST_SIGN_MASK) == FINE_FREQEST_SIGN_NEG) ?
 			-freqEst : freqEst;
@@ -1110,64 +1185,140 @@ void Phy_RetrieveRecvData(PHY_INST *instPtr, uint8_t *dataBuff)
  * @param   instPtr	a pointer to hopping pattern buffer
  * @param   patternLen	a integer indicate the length of hopping pattern.
  *
- * @return  SUCCESS
+ * @return  NONE
- * 			FAILURE	pattern length exceeds maximum length.
  *
  ******************************************************************************/
-void Phy_UpdateHwSate(PHY_INST *instPtr)
+void Phy_RefreshHwSate(PHY_INST *instPtr)
 {
 	ASSERT(instPtr != NULL);
 	uint32_t rawData;
 #ifndef EMULATION
-	// -- Update Chip voltage, unit mV
+	float evalData;
+	instPtr->hwSate.isSpOk = true;
+	// -- Update FPGA voltage status;
+	instPtr->hwSate.spFpgaVolt = 0;
 	rawData = XAdcPs_GetAdcData(&(instPtr->hwXadc), XADCPS_CH_VCCPINT);
-	instPtr->hwSate.spVolt = (uint16_t)(XAdcPs_RawToVoltage(rawData) * 1000);
+	evalData = XAdcPs_RawToVoltage(rawData);
+	instPtr->hwSate.spFpgaVolt |= (IS_PS_VALID(evalData)) ? VOLT_PS_OK : 0;
 
-	// -- Update Chip temperature, unit 0.01 deg
+	// -- -- Update Ps aux voltage
+	rawData = XAdcPs_GetAdcData(&(instPtr->hwXadc), XADCPS_CH_VCCPAUX);
+	evalData = XAdcPs_RawToVoltage(rawData);
+	instPtr->hwSate.spFpgaVolt |= (IS_PSAUX_VALID(evalData)) ? VOLT_PSAUX_OK : 0;
+
+	// -- -- Update DDR voltage
+	rawData = XAdcPs_GetAdcData(&(instPtr->hwXadc), XADCPS_CH_VCCPDRO);
+	evalData = XAdcPs_RawToVoltage(rawData);
+	instPtr->hwSate.spFpgaVolt |= (IS_DDR_VALID(evalData)) ? VOLT_DDR_OK : 0;
+
+	// -- -- Update PL voltage
+	rawData = XAdcPs_GetAdcData(&(instPtr->hwXadc), XADCPS_CH_VCCINT);
+	evalData = XAdcPs_RawToVoltage(rawData);
+	instPtr->hwSate.spFpgaVolt |= (IS_PL_VALID(evalData)) ? VOLT_PL_OK : 0;
+
+	// -- -- Update PL aux voltage
+	rawData = XAdcPs_GetAdcData(&(instPtr->hwXadc), XADCPS_CH_VCCAUX);
+	evalData = XAdcPs_RawToVoltage(rawData);
+	instPtr->hwSate.spFpgaVolt |= (IS_PLAUX_VALID(evalData)) ? VOLT_PLAUX_OK : 0;
+
+	// -- -- Update Bram voltage
+	rawData = XAdcPs_GetAdcData(&(instPtr->hwXadc), XADCPS_CH_VBRAM);
+	evalData = XAdcPs_RawToVoltage(rawData);
+	instPtr->hwSate.spFpgaVolt |= (IS_BRAM_VALID(evalData)) ? VOLT_BRAM_OK : 0;
+
+	// -- Update clock lock state
+	if (instPtr->phyCofig.get_clk_state != NULL)
+	{
+		instPtr->hwSate.spClkState = instPtr->phyCofig.get_clk_state();
+	}
+	else
+	{
+		instPtr->hwSate.spClkState = 0;
+	}
+
+	// -- Update AD9361 pll lock state
+	if (instPtr->phyCofig.get_ad_lock_state != NULL)
+	{
+		instPtr->hwSate.spAdLockState = instPtr->phyCofig.get_ad_lock_state();
+	}
+	else
+	{
+		instPtr->hwSate.spAdLockState = 0;
+	}
+
+	// -- Update AD9361-0 temperature, unit 1 Celcius degree
+	if (instPtr->phyCofig.get_ad0_temp != NULL)
+	{
+		instPtr->hwSate.spAdTemp_0 = instPtr->phyCofig.get_ad0_temp();
+	}
+	else
+	{
+		instPtr->hwSate.spAdTemp_0 = 0;
+	}
+
+	// -- Update AD9361-1 temperature, unit 1 Celcius degree
+	if (instPtr->phyCofig.get_ad1_temp != NULL)
+	{
+		instPtr->hwSate.spAdTemp_1 = instPtr->phyCofig.get_ad1_temp();
+	}
+	else
+	{
+		instPtr->hwSate.spAdTemp_1 = 0;
+	}
+
+	// -- Update FPGA Chip temperature, unit 1 deg
 	rawData = XAdcPs_GetAdcData(&(instPtr->hwXadc), XADCPS_CH_TEMP);
-	instPtr->hwSate.spTemp = (uint16_t)(XAdcPs_RawToTemperature(rawData) * 100);
+	evalData = XAdcPs_RawToTemperature(rawData);
-
+	instPtr->hwSate.spFpgaTemp = (evalData > TEMPERATURE_MAX)
-	// FIXME: Chip status determine.
+								? INT8_MAX
-	instPtr->hwSate.chipSt = 0;
+								: ((evalData < TEMPERATURE_MIN) ? INT8_MIN : (int8_t) round(evalData/TEMPERATURE_LSB));
+	instPtr->hwSate.isSpOk = (instPtr->hwSate.spFpgaVolt == (VOLT_PS_OK | VOLT_PSAUX_OK | VOLT_DDR_OK | VOLT_PL_OK | VOLT_PLAUX_OK | VOLT_BRAM_OK))
+						&& (instPtr->hwSate.spClkState == (CLK_SP_PLL0_LOCK | CLK_SP_PLL1_LOCK))
+						&& (instPtr->hwSate.spAdLockState == (CLK_AD0_BBPLL_LOCK | CLK_AD0_RFPLL_LOCK | CLK_AD1_BBPLL_LOCK | CLK_AD1_RFPLL_LOCK));
 #else
-	instPtr->hwSate.spVolt = 0;
+	instPtr->hwSate.isSpOk = true;
-	instPtr->hwSate.spTemp = 0;
-	instPtr->hwSate.chipSt = 0;
 #endif
 	/*** Voltage and Status ***/
 	rawData = PhyRead(instPtr, ANT_STATUS);
-	// -- Update Antenna Status Code: 0xAA - normal, 0x55 - error
-	instPtr->hwSate.antSt = ((rawData & ANT_STATUS_CODE_MASK) == 0) ? 0xAA : 0x55;
 	// -- Update Antenna Voltage Status: 1 - normal, 0 - error
 	//    [0] - ANT voltage status
 	//    [2] - RF voltage status
 	//    [4] - NIL voltage status
-	instPtr->hwSate.antVolt = (rawData & ANT_STATUS_ANT_VOLT_MASK) ? 0x01 : 0x00;
+	//    [6] - Antenna status
-	instPtr->hwSate.antVolt |= (rawData & ANT_STATUS_RF_VOLT_MASK) ? 0x04 : 0x00;
+	instPtr->hwSate.antVolt = ((rawData & ANT_STATUS_ANT_VOLT_MASK) == ANT_STATUS_ANT_VOLT_OK) ? VOLT_ANT_PROC_OK : 0x00;
-	instPtr->hwSate.antVolt |= (rawData & ANT_STATUS_NIL_VOLT_MASK) ? 0x10 : 0x00;
+	instPtr->hwSate.antVolt |= ((rawData & ANT_STATUS_RF_VOLT_MASK) == ANT_STATUS_RF_VOLT_OK) ? VOLT_ANT_RF_OK : 0x00;
+	instPtr->hwSate.antVolt |= ((rawData & ANT_STATUS_NIL_VOLT_MASK) == ANT_STATUS_NIL_VOLT_OK) ? VOLT_ANT_NIL_OK : 0x00;
+	instPtr->hwSate.antVolt |= ((rawData & ANT_STATUS_CODE_MASK) == ANT_STATUS_CODE_OK) ? ANT_STATE_OK : 0x00;
 
 	/*** Temperature and Lock Status ***/
-	rawData = PhyRead(instPtr, RF_STATUS);
+	rawData = PhyRead(instPtr, ANT_RF_STATUS);
 	//-- Update Antenna Temperature (signed 8bit integer, 1 centigrade per LSB)
-	instPtr->hwSate.antTemp = (uint8_t)(rawData & RF_STATUS_TEMP_MASK);
+	instPtr->hwSate.antTemp = (uint8_t)(rawData & ANT_RF_STATUS_TEMP_MASK);
 	// -- Update Antenna PLL Lock Status: 1 - normal, 0 - error
 	//    [0] - BASEBAND lock status
 	//    [2] - PLLA lock status
 	//    [4] - PLLB lock status
-	instPtr->hwSate.antPll = (rawData & RF_STATUS_BDLOCK_MASK) ? 0x01 : 0x00;
+	instPtr->hwSate.antPll = ((rawData & ANT_RF_STATUS_BBLOCK_MASK) == ANT_RF_STATUS_BBLOCK_OK) ? CLK_ANT_BBPLL_LOCK : 0x00;
-	instPtr->hwSate.antPll |= (rawData & RF_STATUS_PLLA_MASK) ? 0x04 : 0x00;
+	instPtr->hwSate.antPll |= ((rawData & ANT_RF_STATUS_PLLA_MASK) == ANT_RF_STATUS_PLLA_OK) ? CLK_ANT_RFPLL0_LOCK : 0x00;
-	instPtr->hwSate.antPll |= (rawData & RF_STATUS_PLLB_MASK) ? 0x10 : 0x00;
+	instPtr->hwSate.antPll |= ((rawData & ANT_RF_STATUS_PLLB_MASK) == ANT_RF_STATUS_PLLB_OK) ? CLK_ANT_RFPLL1_LOCK : 0x00;
 
 	/*** MGCs ***/
-	rawData = PhyRead(instPtr, RF_MGC);
+	rawData = PhyRead(instPtr, ANT_RF_MGC);
 	// -- Update Antenna MGC (0~15 dB)
 	//    [3:0] - Channel 1 MGC
 	//    [7:4] - Channel 2 MGC
 	//    [11:8] - Channel 3 MGC
 	//    [15:12] - Channel 4 MGC
-	instPtr->hwSate.antMgc = (rawData & RF_MGC_CH1_MASK);
+	instPtr->hwSate.antMgc0 = (rawData & ANT_RF_MGC_CH1_MASK);
-	instPtr->hwSate.antMgc |= (rawData & RF_MGC_CH2_MASK) >> 4;
+	instPtr->hwSate.antMgc0 |= (rawData & ANT_RF_MGC_CH2_MASK) >> 4;
-	instPtr->hwSate.antMgc |= (rawData & RF_MGC_CH3_MASK) >> 8;
+	instPtr->hwSate.antMgc1 = (rawData & ANT_RF_MGC_CH3_MASK) >> 16;
-	instPtr->hwSate.antMgc |= (rawData & RF_MGC_CH4_MASK) >> 12;
+	instPtr->hwSate.antMgc1 |= (rawData & ANT_RF_MGC_CH4_MASK) >> 24;
+
+	// Determin if antenna is ok.
+	instPtr->hwSate.isAntOk = (instPtr->hwSate.antVolt == (VOLT_ANT_PROC_OK | VOLT_ANT_RF_OK | VOLT_ANT_NIL_OK | ANT_STATE_OK))
+								&& (instPtr->hwSate.antPll == (CLK_ANT_BBPLL_LOCK | CLK_ANT_RFPLL0_LOCK | CLK_ANT_RFPLL1_LOCK));
+
+	memset(instPtr->hwSate.reserve, 0x00, sizeof(instPtr->hwSate.reserve));
+
 	SysMonitor_UpdateHardwareStatus(&(instPtr->hwSate));
 }

df_datalink_sp/src/networking/phy_layer/phy_layer.h

@@ -26,7 +26,6 @@
 
 /***************************** Include Files *********************************/
 #include <stdint.h>
-#include "phy_reg.h"
 #include "common.h"
 #ifndef EMULATION
 #include "xbram.h"
@@ -181,8 +180,15 @@ typedef struct
 	uint32_t txBramId;
 	uint32_t rxBramId;
 	uint32_t antBramId;
+	uint32_t antInfoBramId;
 	uint32_t hwXadcId;
 	uintptr_t baseAddr;
+#ifndef EMULATION
+	uint8_t (*get_clk_state)(void);
+	uint8_t (*get_ad_lock_state)(void);
+	int8_t (*get_ad0_temp)(void);
+	int8_t (*get_ad1_temp)(void);
+#endif
 } PHY_CONFIG;
 
 typedef struct
@@ -218,6 +224,7 @@ typedef struct
 	XAdcPs hwXadc;
 #endif
 	HWSTATE hwSate;
+	PHYLOG phyLog;
 } PHY_INST;
 
 /************************** Variable Definitions *****************************/
@@ -240,7 +247,7 @@ int32_t Phy_InstInit(PHY_INST **instPtr, PHY_CONFIG *phyConfig);
 void Phy_Destroy(PHY_INST *instPtr);
 
 void Phy_UpdateState(PHY_INST *instPtr);
-void Phy_UpdateHwSate(PHY_INST *instPtr);
+void Phy_RefreshHwSate(PHY_INST *instPtr);
 
 void Phy_Start(PHY_INST *instPtr);
 void Phy_Halt(PHY_INST *instPtr);
@@ -269,6 +276,7 @@ int32_t Phy_SetBeamNo(PHY_INST *instPtr, int32_t beamNo);
 int32_t Phy_SetBeamAngle(PHY_INST *phyInstPtr, double offAx, double rndAx);
 int32_t Phy_SetTimeWord(PHY_INST *instPtr, const TIME_WORD *tmWord, PHY_TIME_WORD_TYPE tmType);
 
+uint8_t Phy_LastScanBeamNo(PHY_INST *instPtr);
 double Phy_GetFreqEst(PHY_INST *instPtr);
 double Phy_GetCoarseFreqEst(PHY_INST *instPtr);
 double Phy_GetFineFreqEst(PHY_INST *instPtr);

df_datalink_sp/src/networking/phy_layer/phy_reg.h

@@ -10,7 +10,7 @@
  * History:
  * [2021-11-16]: Initial version.
  * [2022-06-18]: New branch for glink control purpose:
- *               -Add poll modephysical layer will start Tx/Rx procedure
+ *               -Add poll mode physical layer will start Tx/Rx procedure
  * 				  at specific time stamp.
  * [2023-04-24]: Porting for DUIFEI.
  *
@@ -26,20 +26,23 @@
 #include "util.h"
 
 /***************** Macros (Inline Functions) Definitions *********************/
-#define PhyRead(instPtr, addr) IO_In32(instPtr->phyCofig.baseAddr + addr)
+#define PhyRead(instPtr, addr) IO_In32((instPtr)->phyCofig.baseAddr + addr)
-#define PhyWrite(instPtr, addr, value) IO_Out32(instPtr->phyCofig.baseAddr + addr, value)
+#define PhyWrite(instPtr, addr, value) IO_Out32((instPtr)->phyCofig.baseAddr + addr, value)
 
 /************************** Constant Definitions *****************************/
 /**
  * Register: PHY_MAIN_CTRL
  */
-#define PHY_MAIN_CTRL 0X00000000U
+#define PHY_MAIN_CTRL 0x00000000U
 #define PHY_MAIN_CTRL_EN_SHIFT 0
 #define PHY_MAIN_CTRL_EN_WIDTH 1
 #define PHY_MAIN_CTRL_EN_MASK 0x00000001U
 #define PHY_MAIN_CTRL_MODE_SHIFT 8
 #define PHY_MAIN_CTRL_MODE_WIDTH 8
 #define PHY_MAIN_CTRL_MODE_MASK 0x0000FF00U
+#define PHY_MAIN_CTRL_NSCAN_SHIFT 16
+#define PHY_MAIN_CTRL_NSCAN_WIDTH 8
+#define PHY_MAIN_CTRL_NSCAN_MASK 0x00FF0000U
 
 #define PHY_MAIN_CTRL_EN_EN 0x00000001U
 #define PHY_MAIN_CTRL_EN_DSBL 0x00000000U
@@ -275,70 +278,216 @@
 #define BEAM_AXIS_AZ_MASK 0xFFFF0000U
 
 /**
- * Register: ANT_STATUS_0
+ * Register: ANT_STATUS
  */
-#define ANT_STATUS 0x00000048U
+#define ANT_STATUS 0x00000100U
-#define ANT_STATUS_CODE_SHIFT 0
+#define ANT_STATUS_ANT_VOLT_SHIFT 0
-#define ANT_STATUS_CODE_WIDTH 8
-#define ANT_STATUS_CODE_MASK 0x000000FFU
-#define ANT_STATUS_NIL_VOLT_SHIFT 8
-#define ANT_STATUS_NIL_VOLT_WIDTH 8
-#define ANT_STATUS_NIL_VOLT_MASK 0x0000FF00U
-#define ANT_STATUS_RF_VOLT_SHIFT 16
-#define ANT_STATUS_RF_VOLT_WIDTH 8
-#define ANT_STATUS_RF_VOLT_MASK 0x00FF0000U
-#define ANT_STATUS_ANT_VOLT_SHIFT 24
 #define ANT_STATUS_ANT_VOLT_WIDTH 8
-#define ANT_STATUS_ANT_VOLT_MASK 0xFF000000U
+#define ANT_STATUS_ANT_VOLT_MASK 0x000000FFU
+#define ANT_STATUS_ANT_VOLT_OK 0x00000001U
+
+#define ANT_STATUS_RF_VOLT_SHIFT 8
+#define ANT_STATUS_RF_VOLT_WIDTH 8
+#define ANT_STATUS_RF_VOLT_MASK 0x0000FF00U
+#define ANT_STATUS_RF_VOLT_OK 0x00000100U
+
+#define ANT_STATUS_NIL_VOLT_SHIFT 16
+#define ANT_STATUS_NIL_VOLT_WIDTH 8
+#define ANT_STATUS_NIL_VOLT_MASK 0x00FF0000U
+#define ANT_STATUS_NIL_VOLT_OK 0x00010000U
+
+#define ANT_STATUS_CODE_SHIFT 24
+#define ANT_STATUS_CODE_WIDTH 8
+#define ANT_STATUS_CODE_MASK 0xFF000000U
+#define ANT_STATUS_CODE_OK 0x00000000U
 
 /**
  * Register: ANT_FRAME_CNT
  */
-#define ANT_FRAME_CNT 0x0000004CU
+#define ANT_FRAME_CNT 0x00000104U
 #define ANT_FRAME_CNT_SHIFT 0
 #define ANT_FRAME_CNT_WIDTH 32
 #define ANT_FRAME_CNT_MASK 0xFFFFFFFFU
 
 /**
- * Register: RF_STATUS
+ * Register: ANT_RF_STATUS
  */
-#define RF_STATUS 0x00000050U
+#define ANT_RF_STATUS 0x00000108U
-#define RF_STATUS_TEMP_SHIFT 0
+#define ANT_RF_STATUS_TEMP_SHIFT 0
-#define RF_STATUS_TEMP_WIDTH 8
+#define ANT_RF_STATUS_TEMP_WIDTH 8
-#define RF_STATUS_TEMP_MASK 0x000000FFU
+#define ANT_RF_STATUS_TEMP_MASK 0x000000FFU
-#define RF_STATUS_BDLOCK_SHIFT 8
+
-#define RF_STATUS_BDLOCK_WIDTH 8
+#define ANT_RF_STATUS_BBLOCK_SHIFT 8
-#define RF_STATUS_BDLOCK_MASK 0x0000FF00U
+#define ANT_RF_STATUS_BBLOCK_WIDTH 8
-#define RF_STATUS_PLLA_SHIFT 16
+#define ANT_RF_STATUS_BBLOCK_MASK 0x0000FF00U
-#define RF_STATUS_PLLA_WIDTH 8
+#define ANT_RF_STATUS_BBLOCK_OK 0x00000100U
-#define RF_STATUS_PLLA_MASK 0x00FF0000U
+
-#define RF_STATUS_PLLB_SHIFT 24
+#define ANT_RF_STATUS_PLLA_SHIFT 16
-#define RF_STATUS_PLLB_WIDTH 8
+#define ANT_RF_STATUS_PLLA_WIDTH 8
-#define RF_STATUS_PLLB_MASK 0xFF000000U
+#define ANT_RF_STATUS_PLLA_MASK 0x00FF0000U
+#define ANT_RF_STATUS_PLLA_OK 0x00010000U
+
+#define ANT_RF_STATUS_PLLB_SHIFT 24
+#define ANT_RF_STATUS_PLLB_WIDTH 8
+#define ANT_RF_STATUS_PLLB_MASK 0xFF000000U
+#define ANT_RF_STATUS_PLLB_OK 0x01000000U
 
 /**
- * Register: RF_MGC
+ * Register: ANT_RF_MGC
  */
-#define RF_MGC 0x00000054U
+#define ANT_RF_MGC 0x0000010CU
-#define RF_MGC_CH1_SHIFT 0
+#define ANT_RF_MGC_CH1_SHIFT 0
-#define RF_MGC_CH1_WIDTH 4
+#define ANT_RF_MGC_CH1_WIDTH 4
-#define RF_MGC_CH1_MASK 0x0000000FU
+#define ANT_RF_MGC_CH1_MASK 0x0000000FU
-#define RF_MGC_CH2_SHIFT 8
+#define ANT_RF_MGC_CH2_SHIFT 8
-#define RF_MGC_CH2_WIDTH 4
+#define ANT_RF_MGC_CH2_WIDTH 4
-#define RF_MGC_CH2_MASK 0x00000F00U
+#define ANT_RF_MGC_CH2_MASK 0x00000F00U
-#define RF_MGC_CH3_SHIFT 16
+#define ANT_RF_MGC_CH3_SHIFT 16
-#define RF_MGC_CH3_WIDTH 4
+#define ANT_RF_MGC_CH3_WIDTH 4
-#define RF_MGC_CH3_MASK 0x000F0000U
+#define ANT_RF_MGC_CH3_MASK 0x000F0000U
-#define RF_MGC_CH4_SHIFT 24
+#define ANT_RF_MGC_CH4_SHIFT 24
-#define RF_MGC_CH4_WIDTH 4
+#define ANT_RF_MGC_CH4_WIDTH 4
-#define RF_MGC_CH4_MASK 0x0F000000U
+#define ANT_RF_MGC_CH4_MASK 0x0F000000U
 
 /**
- * Register: RF_FRAME_CNT
+ * Register: ANT_RF_FRAME_CNT
  */
-#define RF_FRAME_CNT 0x00000058U
+#define ANT_RF_FRAME_CNT 0x00000110U
-#define RF_FRAME_CNT_SHIFT 0
+#define ANT_RF_FRAME_CNT_SHIFT 0
-#define RF_FRAME_CNT_WIDTH 32
+#define ANT_RF_FRAME_CNT_WIDTH 32
-#define RF_FRAME_CNT_MASK 0xFFFFFFFFU
+#define ANT_RF_FRAME_CNT_MASK 0xFFFFFFFFU
+
+/**
+ * Register: PHY_ACQ_CNT
+ */
+#define PHY_ACQ_CNT 0x00000114U
+#define PHY_ACQ_CNT_SHIFT 0
+#define PHY_ACQ_CNT_WIDTH 32
+#define PHY_ACQ_CNT_MASK 0xFFFFFFFFU
+
+/**
+ * Register: PHY_FRAME_SYNC_CNT
+ */
+#define PHY_FRAME_SYNC_CNT 0x00000118U
+#define PHY_FRAME_SYNC_CNT_SHIFT 0
+#define PHY_FRAME_SYNC_CNT_WIDTH 32
+#define PHY_FRAME_SYNC_CNT_MASK 0xFFFFFFFFU
+
+/**
+ * Register: PHY_DECODE_CNT
+ */
+#define PHY_DECODE_CNT 0x0000011CU
+#define PHY_DECODE_CNT_SHIFT 0
+#define PHY_DECODE_CNT_WIDTH 32
+#define PHY_DECODE_CNT_MASK 0xFFFFFFFFU
+
+/**
+ * Register: PHY_CRC_OK_CNT
+ */
+#define PHY_CRC_OK_CNT 0x00000120U
+#define PHY_CRC_OK_CNT_SHIFT 0
+#define PHY_CRC_OK_CNT_WIDTH 32
+#define PHY_CRC_OK_CNT_MASK 0xFFFFFFFFU
+
+/**
+ * Register: PHY_ACQ_PEAK_H
+ */
+#define PHY_ACQ_PEAK_H 0x00000124U
+#define PHY_ACQ_PEAK_H_SHIFT 0
+#define PHY_ACQ_PEAK_H_WIDTH 32
+#define PHY_ACQ_PEAK_H_MASK 0xFFFFFFFFU
+
+/**
+ * Register: PHY_ACQ_PEAK_L
+ */
+#define PHY_ACQ_PEAK_L 0x00000128U
+#define PHY_ACQ_PEAK_L_SHIFT 0
+#define PHY_ACQ_PEAK_L_WIDTH 32
+#define PHY_ACQ_PEAK_L_MASK 0xFFFFFFFFU
+
+
+/**
+ * Register: PHY_ACQ_MEAN_H
+ */
+#define PHY_ACQ_MEAN_H 0x0000012CU
+#define PHY_ACQ_MEAN_H_SHIFT 0
+#define PHY_ACQ_MEAN_H_WIDTH 32
+#define PHY_ACQ_MEAN_H_MASK 0xFFFFFFFFU
+
+/**
+ * Register: PHY_ACQ_MEAN_L
+ */
+#define PHY_ACQ_MEAN_L 0x00000130U
+#define PHY_ACQ_MEAN_L_SHIFT 0
+#define PHY_ACQ_MEAN_L_WIDTH 32
+#define PHY_ACQ_MEAN_L_MASK 0xFFFFFFFFU
+
+/**
+ * Register: PHY_ACQ_FREQEST
+ */
+#define PHY_ACQ_FREQEST 0x00000134U
+#define PHY_ACQ_FREQEST_SHIFT 0
+#define PHY_ACQ_FREQEST_WIDTH 32
+#define PHY_ACQ_FREQEST_MASK 0xFFFFFFFFU
+
+#define PHY_ACQ_FREQEST_PHASE_SHIFT 0
+#define PHY_ACQ_FREQEST_PHASE_WIDTH 8
+#define PHY_ACQ_FREQEST_PHASE_MASK 0x000000FFU
+#define PHY_ACQ_FREQEST_CHANNEL_SHIFT 8
+#define PHY_ACQ_FREQEST_CHANNEL_WIDTH 8
+#define PHY_ACQ_FREQEST_CHANNEL_MASK 0x0000FF00U
+
+/**
+ * Register: PHY_FRAME_SYNC_PEAK_H
+ */
+#define PHY_FRAME_SYNC_PEAK_H 0x00000138U
+#define PHY_FRAME_SYNC_PEAK_H_SHIFT 0
+#define PHY_FRAME_SYNC_PEAK_H_WIDTH 32
+#define PHY_FRAME_SYNC_PEAK_H_MASK 0xFFFFFFFFU
+
+/**
+ * Register: PHY_FRAME_SYNC_PEAK_L
+ */
+#define PHY_FRAME_SYNC_PEAK_L 0x0000013CU
+#define PHY_FRAME_SYNC_PEAK_L_SHIFT 0
+#define PHY_FRAME_SYNC_PEAK_L_WIDTH 32
+#define PHY_FRAME_SYNC_PEAK_L_MASK 0xFFFFFFFFU
+
+
+/**
+ * Register: PHY_FRAME_SYNC_MEAN_H
+ */
+#define PHY_FRAME_SYNC_MEAN_H 0x00000140U
+#define PHY_FRAME_SYNC_MEAN_H_SHIFT 0
+#define PHY_FRAME_SYNC_MEAN_H_WIDTH 32
+#define PHY_FRAME_SYNC_MEAN_H_MASK 0xFFFFFFFFU
+
+/**
+ * Register: PHY_FRAME_SYNC_MEAN_L
+ */
+#define PHY_FRAME_SYNC_MEAN_L 0x00000144U
+#define PHY_FRAME_SYNC_MEAN_L_SHIFT 0
+#define PHY_FRAME_SYNC_MEAN_L_WIDTH 32
+#define PHY_FRAME_SYNC_MEAN_L_MASK 0xFFFFFFFFU
+
+/**
+ * Register: PHY_FRAME_SYNC_FREQEST
+ */
+#define PHY_FRAME_SYNC_FREQEST 0x00000148U
+#define PHY_FRAME_SYNC_FREQEST_SHIFT 0
+#define PHY_FRAME_SYNC_FREQEST_WIDTH 32
+#define PHY_FRAME_SYNC_FREQEST_MASK 0xFFFFFFFFU
+
+#define PHY_FRAME_SYNC_FREQEST_CHANNEL_SHIFT 0
+#define PHY_FRAME_SYNC_FREQEST_CHANNEL_WIDTH 8
+#define PHY_FRAME_SYNC_FREQEST_CHANNEL_MASK 0x000000FFU
+
+/**
+ * Register: PHY_DEINTLV_AMPEST
+ */
+#define PHY_DEINTLV_AMPEST 0x0000014CU
+#define PHY_DEINTLV_AMPEST_SHIFT 0
+#define PHY_DEINTLV_AMPEST_WIDTH 16
+#define PHY_DEINTLV_AMPEST_MASK 0x0000FFFFU
 
 #endif /* PHY_REG_H_ */

df_datalink_sp/src/system_monitor.c

@@ -23,18 +23,16 @@ 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;
 	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;
 	HWSTATE hwState[2];
 } SYSMONITOR;
@@ -70,22 +68,17 @@ int32_t SysMonitor_Init(void)
 	{
 		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->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));
 
-	sysMonitorInst->recvPL[0].dataId_flj = DATA_ID_NONE;
+	sysMonitorInst->recv[0].dataId = DATA_ID_NONE;
-	sysMonitorInst->recvPL[0].dataId_lj = DATA_ID_NONE;
+	sysMonitorInst->recv[1].dataId = DATA_ID_NONE;
-	sysMonitorInst->recvPL[1].dataId_flj = DATA_ID_NONE;
+	sysMonitorInst->send[0].dataId = DATA_ID_NONE;
-	sysMonitorInst->recvPL[1].dataId_lj = DATA_ID_NONE;
+	sysMonitorInst->send[1].dataId = 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;
 }
 
@@ -96,7 +89,10 @@ void SysMonitor_Destroy(void)
 }
 
 // @System Info
-void SysMonitor_UpdateSysinfo(SYSINFO *info)
+/**
+ * Update system info.
+ */
+void SysMonitor_UpdateSysinfo(const SYSINFO *info)
 {
 	uint8_t buffIndx;
 	buffIndx = GetWritable(sysMonitorInst->sysInfoCtrl);
@@ -106,49 +102,9 @@ void SysMonitor_UpdateSysinfo(SYSINFO *info)
 	sysMonitorInst->sysInfoCtrl.wBusy = BUFF_NONE;
 }
 
-void SysMonitor_UpdateSysinfoRaw(uint8_t *buff)
+/**
-{
+ * Get system info.
-	ASSERT(sysMonitorInst != NULL);
+ */
-	uint8_t buffIndx;
-	buffIndx = GetWritable(sysMonitorInst->sysInfoCtrl);
-	sysMonitorInst->sysInfoCtrl.wBusy = buffIndx;
-	// Decapsulate Systeminfo
-	SYSINFO *infoEntry = &(sysMonitorInst->sysInfo[buffIndx]);
-	memcpy(&(infoEntry->psBDS), buff, sizeof(infoEntry->psBDS));
-	buff += sizeof(infoEntry->psBDS);
-	memcpy(&(infoEntry->pBDS), buff, sizeof(infoEntry->pBDS));
-	buff += sizeof(infoEntry->pBDS);
-	memcpy(&(infoEntry->psGPS), buff, sizeof(infoEntry->psGPS));
-	buff += sizeof(infoEntry->psGPS);
-	memcpy(&(infoEntry->pGPS), buff, sizeof(infoEntry->pGPS));
-	buff += sizeof(infoEntry->pGPS);
-	memcpy(&(infoEntry->tmInd), buff, sizeof(infoEntry->tmInd));
-	buff += sizeof(infoEntry->tmInd);
-	memcpy(&(infoEntry->tmFly), buff, sizeof(infoEntry->tmFly));
-	buff += sizeof(infoEntry->tmFly);
-	memcpy(&(infoEntry->stFly), buff, sizeof(infoEntry->stFly));
-	buff += sizeof(infoEntry->stFly);
-	memcpy(&(infoEntry->posX), buff, sizeof(infoEntry->posX));
-	buff += sizeof(infoEntry->posX);
-	memcpy(&(infoEntry->posY), buff, sizeof(infoEntry->posY));
-	buff += sizeof(infoEntry->posY);
-	memcpy(&(infoEntry->posZ), buff, sizeof(infoEntry->posZ));
-	buff += sizeof(infoEntry->posZ);
-	memcpy(&(infoEntry->vX), buff, sizeof(infoEntry->vX));
-	buff += sizeof(infoEntry->vX);
-	memcpy(&(infoEntry->vY), buff, sizeof(infoEntry->vY));
-	buff += sizeof(infoEntry->vY);
-	memcpy(&(infoEntry->vZ), buff, sizeof(infoEntry->vZ));
-	buff += sizeof(infoEntry->vZ);
-	memcpy(&(infoEntry->pitch), buff, sizeof(infoEntry->pitch));
-	buff += sizeof(infoEntry->pitch);
-	memcpy(&(infoEntry->yaw), buff, sizeof(infoEntry->yaw));
-	buff += sizeof(infoEntry->yaw);
-	memcpy(&(infoEntry->roll), buff, sizeof(infoEntry->roll));
-	sysMonitorInst->sysInfoCtrl.latest = buffIndx;
-	sysMonitorInst->sysInfoCtrl.wBusy = BUFF_NONE;
-}
-
 void SysMonitor_GetSysinfo(SYSINFO *info)
 {
 	ASSERT(sysMonitorInst != NULL);
@@ -163,395 +119,150 @@ void SysMonitor_GetSysinfo(SYSINFO *info)
 	sysMonitorInst->sysInfoCtrl.rBusy = buffIndex_old;
 }
 
-void SysMonitor_GetSysinfoRaw(uint8_t *buff)
+// @Send Payload
-{
-	uint8_t buffIndx, buffIndex_old;
-	buffIndex_old = sysMonitorInst->sysInfoCtrl.rBusy;
-	if (buffIndex_old != BUFF_NONE)
-		buffIndx = buffIndex_old; // Keep it busy
-	else
-		buffIndx = GetReadable(sysMonitorInst->sysInfoCtrl);
-	sysMonitorInst->sysInfoCtrl.rBusy = buffIndx;
-
-	// Encapsulate Systeminfo
-	SYSINFO *infoEntry = &(sysMonitorInst->sysInfo[buffIndx]);
-	memcpy(buff, &(infoEntry->psBDS), sizeof(infoEntry->psBDS));
-	buff += sizeof(infoEntry->psBDS);
-	memcpy(buff, &(infoEntry->pBDS), sizeof(infoEntry->pBDS));
-	buff += sizeof(infoEntry->pBDS);
-	memcpy(buff, &(infoEntry->psGPS), sizeof(infoEntry->psGPS));
-	buff += sizeof(infoEntry->psGPS);
-	memcpy(buff, &(infoEntry->pGPS), sizeof(infoEntry->pGPS));
-	buff += sizeof(infoEntry->pGPS);
-	memcpy(buff, &(infoEntry->tmInd), sizeof(infoEntry->tmInd));
-	buff += sizeof(infoEntry->tmInd);
-	memcpy(buff, &(infoEntry->tmFly), sizeof(infoEntry->tmFly));
-	buff += sizeof(infoEntry->tmFly);
-	memcpy(buff, &(infoEntry->stFly), sizeof(infoEntry->stFly));
-	buff += sizeof(infoEntry->stFly);
-	memcpy(buff, &(infoEntry->posX), sizeof(infoEntry->posX));
-	buff += sizeof(infoEntry->posX);
-	memcpy(buff, &(infoEntry->posY), sizeof(infoEntry->posY));
-	buff += sizeof(infoEntry->posY);
-	memcpy(buff, &(infoEntry->posZ), sizeof(infoEntry->posZ));
-	buff += sizeof(infoEntry->posZ);
-	memcpy(buff, &(infoEntry->vX), sizeof(infoEntry->vX));
-	buff += sizeof(infoEntry->vX);
-	memcpy(buff, &(infoEntry->vY), sizeof(infoEntry->vY));
-	buff += sizeof(infoEntry->vY);
-	memcpy(buff, &(infoEntry->vZ), sizeof(infoEntry->vZ));
-	buff += sizeof(infoEntry->vZ);
-	memcpy(buff, &(infoEntry->pitch), sizeof(infoEntry->pitch));
-	buff += sizeof(infoEntry->pitch);
-	memcpy(buff, &(infoEntry->yaw), sizeof(infoEntry->yaw));
-	buff += sizeof(infoEntry->yaw);
-	memcpy(buff, &(infoEntry->roll), sizeof(infoEntry->roll));
-	sysMonitorInst->sysInfoCtrl.rBusy = buffIndex_old;
-}
-//  @Send Payload
 /**
- * Update send FLJ payload by raw data.
+ * Update send payload by.
  */
-void SysMonitor_UpdateSendPayloadFLJRaw(uint8_t *buff)
+void SysMonitor_UpdateSendPayload(const uint8_t *buff, size_t len)
 {
 	ASSERT(sysMonitorInst != NULL);
 	uint8_t buffIndx;
-	buffIndx = GetWritable(sysMonitorInst->sendPLCtrl);
+	buffIndx = GetWritable(sysMonitorInst->sendCtrl);
-	sysMonitorInst->sendPLCtrl.wBusy = buffIndx;
+	sysMonitorInst->sendCtrl.wBusy = buffIndx;
-	memcpy(sysMonitorInst->sendPL[buffIndx].data_flj, buff, sizeof(uint8_t) * PAYLOAD_FLJ_TX);
+	memcpy(sysMonitorInst->send[buffIndx].data, buff, len);
-	sysMonitorInst->sendPL[buffIndx].dataId_flj++;
+	sysMonitorInst->send[buffIndx].dataId++;
-	sysMonitorInst->sendPLCtrl.latest = buffIndx;
+	sysMonitorInst->sendCtrl.latest = buffIndx;
-	sysMonitorInst->sendPLCtrl.wBusy = BUFF_NONE;
+	sysMonitorInst->sendCtrl.wBusy = BUFF_NONE;
 }
 
 /**
- * Get send FLJ payload as raw data.
+ * Get the latest send payload.
  */
-void SysMonitor_GetSendPayloadFLJRaw(uint8_t *buff, uint32_t *id)
+void SysMonitor_GetSendPayload(uint8_t *buff, uint32_t *id, size_t len)
 {
 	ASSERT(sysMonitorInst != NULL);
 	uint8_t buffIndx, buffIndex_old;
-	buffIndex_old = sysMonitorInst->sendPLCtrl.rBusy;
+	buffIndex_old = sysMonitorInst->sendCtrl.rBusy;
 	if (buffIndex_old != BUFF_NONE)
 		buffIndx = buffIndex_old; // Keep it busy
 	else
-		buffIndx = GetReadable(sysMonitorInst->sendPLCtrl);
+		buffIndx = GetReadable(sysMonitorInst->sendCtrl);
-	sysMonitorInst->sendPLCtrl.rBusy = buffIndx;
+	sysMonitorInst->sendCtrl.rBusy = buffIndx;
-	if (sysMonitorInst->sendPL[buffIndx].dataId_flj != DATA_ID_NONE)
+	if (sysMonitorInst->send[buffIndx].dataId != DATA_ID_NONE)
 	{
-		memcpy(buff, sysMonitorInst->sendPL[buffIndx].data_flj, sizeof(uint8_t) * PAYLOAD_FLJ_TX);
+		memcpy(buff, sysMonitorInst->send[buffIndx].data, len);
 	}
-	*id = sysMonitorInst->sendPL[buffIndx].dataId_flj;
+	*id = sysMonitorInst->send[buffIndx].dataId;
-	sysMonitorInst->sendPLCtrl.rBusy = buffIndex_old;
+	sysMonitorInst->sendCtrl.rBusy = buffIndex_old;
 }
 
+// @Receive Payload
 /**
- * Update LJ send payload by raw data.
+ * Update receive payload.
  */
-void SysMonitor_UpdateSendPayloadLJRaw(uint8_t *buff)
+void SysMonitor_UpdateRecvPayload(const uint8_t *buff, size_t len)
 {
 	ASSERT(sysMonitorInst != NULL);
 	uint8_t buffIndx;
-	buffIndx = GetWritable(sysMonitorInst->sendPLCtrl);
+	buffIndx = GetWritable(sysMonitorInst->recvCtrl);
-	sysMonitorInst->sendPLCtrl.wBusy = buffIndx;
+	sysMonitorInst->recvCtrl.wBusy = buffIndx;
-	memcpy(sysMonitorInst->sendPL[buffIndx].data_lj, buff, sizeof(uint8_t) * PAYLOAD_LJ_TX);
+	memcpy(sysMonitorInst->recv[buffIndx].data, buff, len);
-	sysMonitorInst->sendPL[buffIndx].dataId_lj++;
+	sysMonitorInst->recv[buffIndx].dataId++;
-	sysMonitorInst->sendPLCtrl.latest = buffIndx;
+	sysMonitorInst->recvCtrl.latest = buffIndx;
-	sysMonitorInst->sendPLCtrl.wBusy = BUFF_NONE;
+	sysMonitorInst->recvCtrl.wBusy = BUFF_NONE;
 }
 
 /**
- * Get send LJ payload as raw data.
+ * Get the latest receive payload.
  */
-void SysMonitor_GetSendPayloadLJRaw(uint8_t *buff, uint32_t *id)
+void SysMonitor_GetRecvPayload(uint8_t *buff, uint32_t *id, size_t len)
 {
 	ASSERT(sysMonitorInst != NULL);
 	uint8_t buffIndx, buffIndex_old;
-	buffIndex_old = sysMonitorInst->sendPLCtrl.rBusy;
+	buffIndex_old = sysMonitorInst->recvCtrl.rBusy;
 	if (buffIndex_old != BUFF_NONE)
 		buffIndx = buffIndex_old; // Keep it busy
 	else
-		buffIndx = GetReadable(sysMonitorInst->sendPLCtrl);
+		buffIndx = GetReadable(sysMonitorInst->recvCtrl);
-	sysMonitorInst->sendPLCtrl.rBusy = buffIndx;
+	sysMonitorInst->recvCtrl.rBusy = buffIndx;
-	if (sysMonitorInst->sendPL[buffIndx].dataId_lj != DATA_ID_NONE) 
+	if (sysMonitorInst->recv[buffIndx].dataId != DATA_ID_NONE)
 	{
-		memcpy(buff, sysMonitorInst->sendPL[buffIndx].data_lj, sizeof(uint8_t) * PAYLOAD_LJ_TX);
+		memcpy(buff, sysMonitorInst->recv[buffIndx].data, len);
 	}
-	*id = sysMonitorInst->sendPL[buffIndx].dataId_lj;
+	*id = sysMonitorInst->recv[buffIndx].dataId;
-	sysMonitorInst->sendPLCtrl.rBusy = buffIndex_old;
+	sysMonitorInst->recvCtrl.rBusy = buffIndex_old;
 }
 
-//  @Receive Payload
+// @Link layer log
 /**
- * Update receive FLJ payload by raw data.
+ * Update link layer log
  */
-void SysMonitor_UpdateRecvPayloadFLJRaw(uint8_t *buff)
+void SysMonitor_UpdateLinklayerLog(const LINKLOG *log)
 {
 	ASSERT(sysMonitorInst != NULL);
 	uint8_t buffIndx;
-	buffIndx = GetWritable(sysMonitorInst->recvPLCtrl);
+	buffIndx = GetWritable(sysMonitorInst->linkLogCtrl);
-	sysMonitorInst->recvPLCtrl.wBusy = buffIndx;
+	sysMonitorInst->linkLogCtrl.wBusy = buffIndx;
-	memcpy(sysMonitorInst->recvPL[buffIndx].data_flj, buff, sizeof(uint8_t) * PAYLOAD_FLJ_RX);
+	memcpy(&(sysMonitorInst->linkLog[buffIndx]), log, sizeof(LINKLOG));
-	sysMonitorInst->recvPL[buffIndx].dataId_flj++;
+	sysMonitorInst->linkLogCtrl.latest = buffIndx;
-	sysMonitorInst->recvPLCtrl.latest = buffIndx;
+	sysMonitorInst->linkLogCtrl.wBusy = BUFF_NONE;
-	sysMonitorInst->recvPLCtrl.wBusy = BUFF_NONE;
 }
 
 /**
- * Get send FLJ payload as raw data.
+ * Get the latest link layer log
  */
-void SysMonitor_GetRecvPayloadFLJRaw(uint8_t *buff, uint32_t *id)
+void SysMonitor_GetLinklayerLog(LINKLOG *log)
 {
 	ASSERT(sysMonitorInst != NULL);
 	uint8_t buffIndx, buffIndex_old;
-	buffIndex_old = sysMonitorInst->recvPLCtrl.rBusy;
+	buffIndex_old = sysMonitorInst->linkLogCtrl.rBusy;
 	if (buffIndex_old != BUFF_NONE)
 		buffIndx = buffIndex_old; // Keep it busy
 	else
-		buffIndx = GetReadable(sysMonitorInst->recvPLCtrl);
+		buffIndx = GetReadable(sysMonitorInst->linkLogCtrl);
-	sysMonitorInst->recvPLCtrl.rBusy = buffIndx;
+	sysMonitorInst->linkLogCtrl.rBusy = buffIndx;
-	if (sysMonitorInst->recvPL[buffIndx].dataId_flj != DATA_ID_NONE)
+	memcpy(log, &(sysMonitorInst->linkLog[buffIndx]), sizeof(LINKLOG));
-	{
+	sysMonitorInst->linkLogCtrl.rBusy = buffIndex_old;
-		memcpy(buff, sysMonitorInst->recvPL[buffIndx].data_flj, sizeof(uint8_t) * PAYLOAD_FLJ_RX);
-	}
-	*id = sysMonitorInst->recvPL[buffIndx].dataId_flj;
-	sysMonitorInst->recvPLCtrl.rBusy = buffIndex_old;
 }
 
+// @Physical layer log
 /**
- * Update receive LJ payload by raw data.
+ * Update physical layer log
  */
-void SysMonitor_UpdateRecvPayloadLJRaw(uint8_t *buff)
+void SysMonitor_UpdatePhysicalLayerLog(const PHYLOG *log)
 {
 	ASSERT(sysMonitorInst != NULL);
 	uint8_t buffIndx;
-	buffIndx = GetWritable(sysMonitorInst->recvPLCtrl);
+	buffIndx = GetWritable(sysMonitorInst->phyLogCtrl);
-	sysMonitorInst->recvPLCtrl.wBusy = buffIndx;
+	sysMonitorInst->phyLogCtrl.wBusy = buffIndx;
-	memcpy(sysMonitorInst->recvPL[buffIndx].data_lj, buff, sizeof(uint8_t) * PAYLOAD_LJ_RX);
+	memcpy(&(sysMonitorInst->phyLog[buffIndx]), log, sizeof(PHYLOG));
-	sysMonitorInst->recvPL[buffIndx].dataId_lj++;
+	sysMonitorInst->phyLogCtrl.latest = buffIndx;
-	sysMonitorInst->recvPLCtrl.latest = buffIndx;
+	sysMonitorInst->phyLogCtrl.wBusy = BUFF_NONE;
-	sysMonitorInst->recvPLCtrl.wBusy = BUFF_NONE;
 }
 
 /**
- * Get send LJ payload as raw data.
+ * Get the latest physical layer log
  */
-void SysMonitor_GetRecvPayloadLJRaw(uint8_t *buff, uint32_t *id)
+void SysMonitor_GetPhysicalLayerLog(PHYLOG *log)
 {
 	ASSERT(sysMonitorInst != NULL);
 	uint8_t buffIndx, buffIndex_old;
-	buffIndex_old = sysMonitorInst->recvPLCtrl.rBusy;
+	buffIndex_old = sysMonitorInst->phyLogCtrl.rBusy;
 	if (buffIndex_old != BUFF_NONE)
 		buffIndx = buffIndex_old; // Keep it busy
 	else
-		buffIndx = GetReadable(sysMonitorInst->recvPLCtrl);
+		buffIndx = GetReadable(sysMonitorInst->phyLogCtrl);
-	sysMonitorInst->recvPLCtrl.rBusy = buffIndx;
+	sysMonitorInst->phyLogCtrl.rBusy = buffIndx;
-	if (sysMonitorInst->recvPL[buffIndx].dataId_lj != DATA_ID_NONE) 
+	memcpy(log, &(sysMonitorInst->phyLog[buffIndx]), sizeof(PHYLOG));
-	{
+	sysMonitorInst->phyLogCtrl.rBusy = buffIndex_old;
-		memcpy(buff, sysMonitorInst->recvPL[buffIndx].data_lj, sizeof(uint8_t) * PAYLOAD_LJ_RX);
-	}
-	*id = sysMonitorInst->recvPL[buffIndx].dataId_lj;
-	sysMonitorInst->recvPLCtrl.rBusy = buffIndex_old;
 }
 
-//  @Send Slot log
-/**
- * Log send slot information
- */
-void SysMonitor_UpdateSendSlotLog(SLOTLOG *log)
-{
-	ASSERT(sysMonitorInst != NULL);
-	uint8_t buffIndx;
-	buffIndx = GetWritable(sysMonitorInst->sendLogCtrl);
-	sysMonitorInst->sendLogCtrl.wBusy = buffIndx;
-	memcpy(&(sysMonitorInst->sendLog[buffIndx]), log, sizeof(SLOTLOG));
-	sysMonitorInst->sendLogCtrl.latest = buffIndx;
-	sysMonitorInst->sendLogCtrl.wBusy = BUFF_NONE;
-}
-
-/**
- * Get the latest send slot log
- */
-void SysMonitor_GetSendSlotLog(SLOTLOG *log)
-{
-	ASSERT(sysMonitorInst != NULL);
-	uint8_t buffIndx, buffIndex_old;
-	buffIndex_old = sysMonitorInst->sendLogCtrl.rBusy;
-	if (buffIndex_old != BUFF_NONE)
-		buffIndx = buffIndex_old; // Keep it busy
-	else
-		buffIndx = GetReadable(sysMonitorInst->sendLogCtrl);
-	sysMonitorInst->sendLogCtrl.rBusy = buffIndx;
-	memcpy(log, &(sysMonitorInst->sendLog[buffIndx]), sizeof(SLOTLOG));
-	sysMonitorInst->sendLogCtrl.rBusy = buffIndex_old;
-}
-
-/**
- * Get the latest send slot log as raw data
- */
-void SysMonitor_GetSendSlotLogRaw(uint8_t *buff)
-{
-	ASSERT(sysMonitorInst != NULL);
-	uint8_t buffIndx, buffIndex_old;
-	buffIndex_old = sysMonitorInst->sendLogCtrl.rBusy;
-	if (buffIndex_old != BUFF_NONE)
-		buffIndx = buffIndex_old; // Keep it busy
-	else
-		buffIndx = GetReadable(sysMonitorInst->sendLogCtrl);
-	sysMonitorInst->sendLogCtrl.rBusy = buffIndx;
-
-	// Encapsulate log
-	SLOTLOG *logEntry = &(sysMonitorInst->sendLog[buffIndx]);
-	memcpy(buff, &(logEntry->tuNo), sizeof(logEntry->tuNo));
-	buff += sizeof(logEntry->tuNo);
-	memcpy(buff, &(logEntry->slotNo), sizeof(logEntry->slotNo));
-	buff += sizeof(logEntry->slotNo);
-	memcpy(buff, &(logEntry->frameType), sizeof(logEntry->frameType));
-	buff += sizeof(logEntry->frameType);
-	memcpy(buff, &(logEntry->payload), sizeof(logEntry->payload));
-	buff += sizeof(logEntry->payload);
-	memcpy(buff, &(logEntry->tmStamp), sizeof(logEntry->tmStamp));
-	buff += sizeof(logEntry->tmStamp);
-	memcpy(buff, &(logEntry->tmDevi), sizeof(logEntry->tmDevi));
-	buff += sizeof(logEntry->tmDevi);
-	memcpy(buff, &(logEntry->freqDevi), sizeof(logEntry->freqDevi));
-	sysMonitorInst->sendLogCtrl.rBusy = buffIndex_old;
-}
-
-// @Receive Slot log
-/**
- * Log receive slot information
- */
-void SysMonitor_UpdateRecvSlotLog(SLOTLOG *log)
-{
-	ASSERT(sysMonitorInst != NULL);
-	uint8_t buffIndx;
-	buffIndx = GetWritable(sysMonitorInst->recvLogCtrl);
-	sysMonitorInst->recvLogCtrl.wBusy = buffIndx;
-	memcpy(&(sysMonitorInst->recvLog[buffIndx]), log, sizeof(SLOTLOG));
-	sysMonitorInst->recvLogCtrl.latest = buffIndx;
-	sysMonitorInst->recvLogCtrl.wBusy = BUFF_NONE;
-}
-
-/**
- * Get the latest receive slot information
- */
-void SysMonitor_GetRecvSlotLog(SLOTLOG *log)
-{
-	ASSERT(sysMonitorInst != NULL);
-	uint8_t buffIndx, buffIndex_old;
-	buffIndex_old = sysMonitorInst->recvLogCtrl.rBusy;
-	if (buffIndex_old != BUFF_NONE)
-		buffIndx = buffIndex_old; // Keep it busy
-	else
-		buffIndx = GetReadable(sysMonitorInst->recvLogCtrl);
-	sysMonitorInst->recvLogCtrl.rBusy = buffIndx;
-	memcpy(log, &(sysMonitorInst->recvLog[buffIndx]), sizeof(SLOTLOG));
-	sysMonitorInst->recvLogCtrl.rBusy = buffIndex_old;
-}
-
-/**
- * Get the latest receive slot information as raw data
- */
-void SysMonitor_GetRecvSlotLogRaw(uint8_t *buff)
-{
-	ASSERT(sysMonitorInst != NULL);
-	uint8_t buffIndx, buffIndex_old;
-	buffIndex_old = sysMonitorInst->recvLogCtrl.rBusy;
-	if (buffIndex_old != BUFF_NONE)
-		buffIndx = buffIndex_old; // Keep it busy
-	else
-		buffIndx = GetReadable(sysMonitorInst->recvLogCtrl);
-	sysMonitorInst->recvLogCtrl.rBusy = buffIndx;
-
-	// Encapsulate log
-	SLOTLOG *logEntry = &(sysMonitorInst->recvLog[buffIndx]);
-	memcpy(buff, &(logEntry->tuNo), sizeof(logEntry->tuNo));
-	buff += sizeof(logEntry->tuNo);
-	memcpy(buff, &(logEntry->slotNo), sizeof(logEntry->slotNo));
-	buff += sizeof(logEntry->slotNo);
-	memcpy(buff, &(logEntry->frameType), sizeof(logEntry->frameType));
-	buff += sizeof(logEntry->frameType);
-	memcpy(buff, &(logEntry->payload), sizeof(logEntry->payload));
-	buff += sizeof(logEntry->payload);
-	memcpy(buff, &(logEntry->tmStamp), sizeof(logEntry->tmStamp));
-	buff += sizeof(logEntry->tmStamp);
-	memcpy(buff, &(logEntry->tmDevi), sizeof(logEntry->tmDevi));
-	buff += sizeof(logEntry->tmDevi);
-	memcpy(buff, &(logEntry->freqDevi), sizeof(logEntry->freqDevi));
-	sysMonitorInst->recvLogCtrl.rBusy = buffIndex_old;
-}
-
-// @Protocol log
-/**
- * Log protocol running status.
- */
-void SysMonitor_UpdateProtocolLog(PRTCLLOG *log)
-{
-	ASSERT(sysMonitorInst != NULL);
-	uint8_t buffIndx;
-	buffIndx = GetWritable(sysMonitorInst->protocolLogCtrl);
-	sysMonitorInst->protocolLogCtrl.wBusy = buffIndx;
-	memcpy(&(sysMonitorInst->protocolLog[buffIndx]), log, sizeof(PRTCLLOG));
-	sysMonitorInst->protocolLogCtrl.latest = buffIndx;
-	sysMonitorInst->protocolLogCtrl.wBusy = BUFF_NONE;
-}
-
-/**
- * Get the protocol running log.
- */
-void SysMonitor_GetProtocolLog(PRTCLLOG *log)
-{
-	ASSERT(sysMonitorInst != NULL);
-	uint8_t buffIndx, buffIndex_old;
-	buffIndex_old = sysMonitorInst->protocolLogCtrl.rBusy;
-	if (buffIndex_old != BUFF_NONE)
-		buffIndx = buffIndex_old; // Keep it busy
-	else
-		buffIndx = GetReadable(sysMonitorInst->protocolLogCtrl);
-	sysMonitorInst->protocolLogCtrl.rBusy = buffIndx;
-	memcpy(log, &(sysMonitorInst->protocolLog[buffIndx]), sizeof(PRTCLLOG));
-	sysMonitorInst->protocolLogCtrl.rBusy = buffIndex_old;
-}
-
-/**
- * Get the protocol running log as raw data.
- */
-void SysMonitor_GetProtocolLogRaw(uint8_t *buff)
-{
-	ASSERT(sysMonitorInst != NULL);
-	uint8_t buffIndx, buffIndex_old;
-	buffIndex_old = sysMonitorInst->protocolLogCtrl.rBusy;
-	if (buffIndex_old != BUFF_NONE)
-		buffIndx = buffIndex_old; // Keep it busy
-	else
-		buffIndx = GetReadable(sysMonitorInst->protocolLogCtrl);
-	sysMonitorInst->protocolLogCtrl.rBusy = buffIndx;
-
-	// Encapsulate log
-	PRTCLLOG *logEntry = &(sysMonitorInst->protocolLog[buffIndx]);
-	memcpy(buff, &(logEntry->tmSys), sizeof(logEntry->tmSys));
-	buff += sizeof(logEntry->tmSys);
-	memcpy(buff, &(logEntry->phySt), sizeof(logEntry->phySt));
-	buff += sizeof(logEntry->phySt);
-	memcpy(buff, &(logEntry->tmLocal), sizeof(logEntry->tmLocal));
-	buff += sizeof(logEntry->tmLocal);
-	memcpy(buff, &(logEntry->beamNo), sizeof(logEntry->beamNo));
-	buff += sizeof(logEntry->beamNo);
-	memcpy(buff, &(logEntry->beamWidth), sizeof(logEntry->beamWidth));
-	buff += sizeof(logEntry->beamWidth);
-	memcpy(buff, &(logEntry->stage), sizeof(logEntry->stage));
-	buff += sizeof(logEntry->stage);
-	memcpy(buff, &(logEntry->recvCnt), sizeof(logEntry->recvCnt));
-	buff += sizeof(logEntry->recvCnt);
-	sysMonitorInst->protocolLogCtrl.rBusy = buffIndex_old;
-}
 
 // @Hardware state
 /**
  * Log hardware running status.
  */
-void SysMonitor_UpdateHardwareStatus(HWSTATE *state)
+void SysMonitor_UpdateHardwareStatus(const HWSTATE *state)
 {
 	ASSERT(sysMonitorInst != NULL);
 	uint8_t buffIndx;
@@ -578,65 +289,3 @@ void SysMonitor_GetHardwareStatus(HWSTATE *state)
 	memcpy(state, &(sysMonitorInst->hwState[buffIndx]), sizeof(HWSTATE));
 	sysMonitorInst->hwStateCtrl.rBusy = buffIndex_old;
 }
-
-/**
- * Get the latest hardware running status as raw data.
- */
-void SysMonitor_GetHardwareStatusRaw(uint8_t *buff)
-{
-	ASSERT(sysMonitorInst != NULL);
-	uint8_t buffIndx, buffIndex_old;
-	buffIndex_old = sysMonitorInst->hwStateCtrl.rBusy;
-	if (buffIndex_old != BUFF_NONE)
-		buffIndx = buffIndex_old; // Keep it busy
-	else
-		buffIndx = GetReadable(sysMonitorInst->hwStateCtrl);
-	sysMonitorInst->hwStateCtrl.rBusy = buffIndx;
-
-	// Encapsulate state
-	HWSTATE *stateEntry = &(sysMonitorInst->hwState[buffIndx]);
-	memcpy(buff, &(stateEntry->spVolt), sizeof(stateEntry->spVolt));
-	buff += sizeof(stateEntry->spVolt);
-	memcpy(buff, &(stateEntry->spTemp), sizeof(stateEntry->spTemp));
-	buff += sizeof(stateEntry->spTemp);
-	memcpy(buff, &(stateEntry->chipSt), sizeof(stateEntry->chipSt));
-	buff += sizeof(stateEntry->chipSt);
-	memcpy(buff, &(stateEntry->antVolt), sizeof(stateEntry->antVolt));
-	buff += sizeof(stateEntry->antVolt);
-	memcpy(buff, &(stateEntry->antTemp), sizeof(stateEntry->antTemp));
-	buff += sizeof(stateEntry->antTemp);
-	memcpy(buff, &(stateEntry->antPll), sizeof(stateEntry->antPll));
-	buff += sizeof(stateEntry->antPll);
-	memcpy(buff, &(stateEntry->antMgc), sizeof(stateEntry->antMgc));
-	buff += sizeof(stateEntry->antMgc);
-	memcpy(buff, &(stateEntry->antSt), sizeof(stateEntry->antSt));
-	sysMonitorInst->hwStateCtrl.rBusy = buffIndex_old;
-}
-
-// @System log
-/**
- * Get the latest system running log.
- */
-void SysMonitor_GetSyslog(SYSLOG *log)
-{
-	ASSERT(sysMonitorInst != NULL);
-	SysMonitor_GetSendSlotLog(&(log->sendLog));
-	SysMonitor_GetRecvSlotLog(&(log->recvLog));
-	SysMonitor_GetProtocolLog(&(log->protocolLog));
-	SysMonitor_GetHardwareStatus(&(log->hwSate));
-}
-
-/**
- * Get the latest system running log as raw data.
- */
-void SysMonitor_GetSyslogRaw(uint8_t *buff)
-{
-	ASSERT(sysMonitorInst != NULL);
-	SysMonitor_GetSendSlotLogRaw(buff);
-	buff += SLOTLOG_PACK_LEN;
-	SysMonitor_GetRecvSlotLogRaw(buff);
-	buff += SLOTLOG_PACK_LEN;
-	SysMonitor_GetProtocolLogRaw(buff);
-	buff += PRTCLLOG_PACK_ELN;
-	SysMonitor_GetHardwareStatusRaw(buff);
-}

df_datalink_sp/src/system_monitor.h

@@ -3,23 +3,63 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+#include "util.h"
 
-#define PAYLOAD_LEN 256
+#define PAYLOAD_LEN_MAX 256
-#define PAYLOAD_FLJ_RX 168
+#define PAYLOAD_LEN_FLJ_RX 168
-#define PAYLOAD_FLJ_TX 66
+#define PAYLOAD_LEN_FLJ_TX 66
-#define PAYLOAD_LJ_RX 66
+#define PAYLOAD_LEN_LJ_RX 66
-#define PAYLOAD_LJ_TX 168
+#define PAYLOAD_LEN_LJ_TX 168
 
 #define DATA_ID_NONE UINT32_MAX
 #define DATA_ID_TEST 0x02030203
 
-typedef struct
+#define VOLTAGE_LSB 0.01 // volt
-{
+#define VOLTAGE_MAX 2.55 // volt
-	// FIXME: To Complete
-	uint8_t dummy;
-} SYSCONFIG;
 
-typedef struct
+#define VOLT_PS_STD 1.0
+#define VOLT_PSAUX_STD 1.8
+#define VOLT_DDR_STD 1.5
+#define VOLT_PL_STD 1.0
+#define VOLT_PLAUX_STD 1.8
+#define VOLT_BRAM_STD 1.0
+
+#define VOLT_PS_OK BIT(0)
+#define VOLT_PSAUX_OK BIT(1)
+#define VOLT_DDR_OK BIT(2)
+#define VOLT_PL_OK BIT(3)
+#define VOLT_PLAUX_OK BIT(4)
+#define VOLT_BRAM_OK BIT(5)
+
+#define VOLT_ANT_PROC_OK BIT(0)
+#define VOLT_ANT_RF_OK BIT(2)
+#define VOLT_ANT_NIL_OK BIT(4)
+#define ANT_STATE_OK BIT(6)
+
+#define IS_PS_VALID(x) (x <= 1.05 && x >= 0.95)
+#define IS_PSAUX_VALID(x) (x <= 1.89 && x >= 1.71)
+#define IS_DDR_VALID(x) (x <= 1.89 && x >= 1.14)
+#define IS_PL_VALID(x) (x <= 1.03 && x >= 0.97)
+#define IS_PLAUX_VALID(x) (x <= 1.89 && x >= 1.71)
+#define IS_BRAM_VALID(x) (x <= 1.03 && x >= 0.97)
+
+#define CLK_SP_PLL0_LOCK BIT(0)
+#define CLK_SP_PLL1_LOCK BIT(2)
+
+#define CLK_AD0_BBPLL_LOCK BIT(0)
+#define CLK_AD0_RFPLL_LOCK BIT(2)
+#define CLK_AD1_BBPLL_LOCK BIT(4)
+#define CLK_AD1_RFPLL_LOCK BIT(6)
+
+#define CLK_ANT_BBPLL_LOCK BIT(0)
+#define CLK_ANT_RFPLL0_LOCK BIT(2)
+#define CLK_ANT_RFPLL1_LOCK BIT(4)
+
+#define TEMPERATURE_LSB 1.0	   // Celsius degree
+#define TEMPERATURE_MAX 127.0  // Celsius degree
+#define TEMPERATURE_MIN -128.0 // Celsius degree
+
+typedef struct __attribute__((packed))
 {
 	// -- unit: ms, 0~604799999
 	uint32_t psBDS;
@@ -58,107 +98,106 @@ typedef struct
 	float roll;
 } SYSINFO;
 
-typedef struct
+typedef struct __attribute__((packed))
 {
-	uint32_t dataId_lj;
+	// SystemBus log
-	uint8_t data_lj[PAYLOAD_LEN];
+	// -- last valid config
-	uint32_t dataId_flj;
+	//    byte 0: 0x11 FLJ, 0x00 LJ
-	uint8_t data_flj[PAYLOAD_LEN];
+	//    byte 1: 0x66 Full Power, 0x88 Low Power
-} PAYLOAD;
+	uint8_t lastConfig[2];
+	uint32_t pollCnt;
+	uint32_t svcCnt;
+	uint32_t remoteCnt;
+} SYSBUSLOG;
 
-typedef struct
+typedef struct __attribute__((packed))
 {
 	// 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];
+	uint8_t linkStage;
-	// Time sync info
+	uint32_t recxnCnt;
-	uint64_t tmStamp;
+	uint8_t beamNo;
-	uint32_t tmDevi;
-	uint32_t freqDevi;
-} SLOTLOG;
-
-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
+	uint16_t beamAz;
-	uint8_t stage;
+	uint16_t beamEl;
-	uint32_t recvCnt;
+	uint16_t advTxCnt;
-	uint32_t recvCorrect;
+	uint16_t advRecvCnt;
-} PRTCLLOG;
+	uint16_t advCorrectCnt;
+	uint32_t cfmTxCnt;
+	uint32_t cfmRecvCnt;
+	uint32_t cfmCorrectCnt;
+	uint32_t svcTxCnt;
+	uint32_t svcRecvCnt;
+	uint32_t svcCorrectCnt;
+	int32_t timeDev;
+	uint32_t sendId;
+	uint32_t recvId;
+	uint8_t reserve[4];
+} LINKLOG;
 
-typedef struct
+typedef struct __attribute__((packed))
 {
-	// Hardware log
+	uint32_t acqCnt;
+	uint32_t fsyncCnt;
+	uint32_t decodeCnt;
+	uint32_t crcCnt;
+	double doppler;
+	uint64_t recvStamp;
+	double acqPAPR;
+	uint8_t acqPhase;
+	uint8_t acqFreqCh;
+	double fsyncPAPR;
+	uint8_t fsyncFreqCh;
+	uint16_t deintlvAmpEst;
+	uint8_t reserve[4];
+} PHYLOG;
+
+typedef struct __attribute__((packed))
+{
+	// Hardware status
+	bool isSpOk;
+	bool isAntOk;
 	// -- Signal processor status
-	uint16_t spVolt;
+	uint8_t spFpgaVolt;
-	uint16_t spTemp;
+	uint8_t spClkState;
-	uint8_t chipSt;
+	uint8_t spAdLockState;
+	uint8_t spAdTemp_0;
+	uint8_t spAdTemp_1;
+	uint8_t spFpgaTemp;
 	// -- Antenna status
 	uint8_t antVolt;
 	uint8_t antTemp;
 	uint8_t antPll;
-	uint16_t antMgc;
+	uint8_t antMgc0;
-	uint8_t antSt;
+	uint8_t antMgc1;
+	uint8_t reserve[2];
 } HWSTATE;
 
 typedef struct
 {
-	// Send slot log
+	uint32_t dataId;
-	SLOTLOG sendLog;
+	uint8_t data[PAYLOAD_LEN_MAX];
-
+} PAYLOAD;
-	// Receive slot log
-	SLOTLOG recvLog;
-
-	// Protocol log
-	PRTCLLOG protocolLog;
-
-	// Hardware status
-	HWSTATE hwSate;
-} SYSLOG;
 
 int32_t SysMonitor_Init(void);
 void SysMonitor_Destroy(void);
 
-void SysMonitor_UpdateSysinfo(SYSINFO *info);
+void SysMonitor_UpdateSysinfo(const SYSINFO *info);
-void SysMonitor_UpdateSysinfoRaw(uint8_t *buff);
 void SysMonitor_GetSysinfo(SYSINFO *info);
-void SysMonitor_GetSysinfoRaw(uint8_t *buff);
 
-void SysMonitor_UpdateSendPayloadFLJRaw(uint8_t *buff);
+void SysMonitor_UpdateSendPayload(const uint8_t *buff, size_t len);
-void SysMonitor_UpdateRecvPayloadFLJRaw(uint8_t *buff);
+void SysMonitor_UpdateRecvPayload(const uint8_t *buff, size_t len);
-void SysMonitor_UpdateSendPayloadLJRaw(uint8_t *buff);
+void SysMonitor_GetSendPayload(uint8_t *buff, uint32_t *id, size_t len);
-void SysMonitor_UpdateRecvPayloadLJRaw(uint8_t *buff);
+void SysMonitor_GetRecvPayload(uint8_t *buff, uint32_t *id, size_t len);
-void SysMonitor_GetSendPayloadFLJRaw(uint8_t *buff, uint32_t *id);
-void SysMonitor_GetRecvPayloadFLJRaw(uint8_t *buff, uint32_t *id);
-void SysMonitor_GetSendPayloadLJRaw(uint8_t *buff, uint32_t *id);
-void SysMonitor_GetRecvPayloadLJRaw(uint8_t *buff, uint32_t *id);
 
-void SysMonitor_UpdateSendSlotLog(SLOTLOG *log);
+void SysMonitor_UpdateLinklayerLog(const LINKLOG *log);
-void SysMonitor_UpdateRecvSlotLog(SLOTLOG *log);
+void SysMonitor_UpdatePhysicalLayerLog(const PHYLOG *log);
-void SysMonitor_UpdateProtocolLog(PRTCLLOG *log);
+void SysMonitor_UpdateHardwareStatus(const HWSTATE *state);
-void SysMonitor_GetSendSlotLog(SLOTLOG *log);
+void SysMonitor_GetLinklayerLog(LINKLOG *log);
-void SysMonitor_GetRecvSlotLog(SLOTLOG *log);
+void SysMonitor_GetPhysicalLayerLog(PHYLOG *log);
-void SysMonitor_GetProtocolLog(PRTCLLOG *log);
-void SysMonitor_GetSendSlotLogRaw(uint8_t *buff);
-void SysMonitor_GetRecvSlotLogRaw(uint8_t *buff);
-void SysMonitor_GetProtocolLogRaw(uint8_t *buff);
-
-void SysMonitor_UpdateHardwareStatus(HWSTATE *state);
 void SysMonitor_GetHardwareStatus(HWSTATE *state);
-void SysMonitor_GetHardwareStatusRaw(uint8_t *buff);
-
-void SysMonitor_GetSyslog(SYSLOG *log);
-void SysMonitor_GetSyslogRaw(uint8_t *buff);
 
 #endif //__SYSTEM_MONITOR_H_

df_datalink_sp/src/systembus/systembus.c

@@ -51,25 +51,32 @@
 #define WD_ST_RET 0x02
 #define ST_RET_OK 0xAA
 #define ST_RET_ERROR 0x55
-// -- -- Signal processor voltage
+#define ST_RET_INFO_LEN 13
-#define WD_SP_VOLT 0x03
+// -- -- Signal processor PS voltage
-// -- -- Signal processor temperature
+#define WD_SP_FPGA_VOLT 0x03
-#define WD_SP_TEMP 0x04
+// -- -- Signal processor PS AUX voltage
-// -- -- Signal processor chip status
+#define WD_SP_CLK_STATE 0x04
-#define WD_SP_CS 0x05
+// -- -- Signal processor DDR voltage
-// -- -- Signal processor antenna voltage
+#define WD_SP_AD_LOCK_STATE 0x05
-#define WD_ANT_VOLT 0x06
+// -- -- Signal processor PL voltage
-// -- -- Signal processor antenna temperature
+#define WD_SP_AD_TEMP_0 0x06
-#define WD_ANT_TEMP 0x07
+// -- -- Signal processor PL AUX voltage
+#define WD_SP_AD_TEMP_1 0x07
+// -- -- Signal processor Bram voltage
+#define WD_SP_FPGA_TEMP 0x08
+
+// -- -- Signal processor antenna voltage status
+#define WD_ANT_VOLT 0x09
+
+// -- -- Signal processor antenna RF temperature
+#define WD_ANT_RF_TEMP 0x0A
 // -- -- Signal processor antenna PLL lock status
-#define WD_ANT_PLL 0x08
+#define WD_ANT_RF_PLL 0x0B
 // -- -- Signal processor antenna MGC
-#define WD_ANT_MGC_L 0x09
+#define WD_ANT_MGC_0 0x0C
-#define WD_ANT_MGC_H 0x0A
+#define WD_ANT_MGC_1 0x0D
-// -- -- Signal processor antenna status
+// -- -- Reserved
-#define WD_ANT_ST 0x0B
+#define WD_ANT_RESERVE 0x0E
-// -- -- Dummy must be 0x00
-#define WD_ST_DUMMY 0x0C
 
 // Data Send Test Command
 #define CMD_DATA_TEST_A 0xE2
@@ -150,6 +157,17 @@
 #define WD_FLJ_RM_TEST 0x02
 #define FLJ_RM_TEST_CODE 0x99
 // -- Response
+#define WD_FLJ_TIME_STAMP 0x02
+#define WD_FLJ_TIME_STAMP_LEN 8
+#define WD_FLJ_SYSBUS_LOG 0x0A
+#define WD_FLJ_SYSBUS_LOG_LEN 14
+#define WD_FLJ_LINK_LOG 0x18
+#define WD_FLJ_LINK_LOG_LEN 64
+#define WD_FLJ_PHY_LOG 0x58
+#define WD_FLJ_PHY_LOG_LEN 57
+#define WD_FLJ_HARDWARE_ST 0x91
+#define WD_FLJ_HARDWARE_ST_LEN 13
+
 #define FLJ_RM_TEST_RESP_LEN 158
 
 // Remote Test LJ
@@ -158,6 +176,17 @@
 #define WD_LJ_RM_TEST 0x02
 #define LJ_RM_TEST_CODE 0x99
 // -- Response
+#define WD_LJ_TIME_STAMP 0x02
+#define WD_LJ_TIME_STAMP_LEN 8
+#define WD_LJ_SYSBUS_LOG 0x0A
+#define WD_LJ_SYSBUS_LOG_LEN 14
+#define WD_LJ_LINK_LOG 0x18
+#define WD_LJ_LINK_LOG_LEN 64
+#define WD_LJ_PHY_LOG 0x58
+#define WD_LJ_PHY_LOG_LEN 57
+#define WD_LJ_HARDWARE_ST 0x91
+#define WD_LJ_HARDWARE_ST_LEN 13
+
 #define LJ_RM_TEST_RESP_LEN 158
 
 
@@ -221,6 +250,10 @@ int32_t SystemBus_Init(SYSBUS **instPtr, SYSBUS_CONFIG *config)
 	(*instPtr)->txQueue = NULL;
 	(*instPtr)->uartInst = NULL;
 	memcpy(&((*instPtr)->config), config, sizeof(SYSBUS_CONFIG));
+	memset(&((*instPtr)->sysbusLog), 0x00, sizeof(SYSBUSLOG));
+	memset(&((*instPtr)->linkLog), 0x00, sizeof(LINKLOG));
+	memset(&((*instPtr)->phyLog), 0x00, sizeof(PHYLOG));
+	memset(&((*instPtr)->hwState), 0x00, sizeof(HWSTATE));
 	uartConfig.baseAddr = config->baseAddr;
 	Status = SysbusUart_Init(&((*instPtr)->uartInst), &uartConfig);
 	if (Status != SUCCESS)
@@ -277,10 +310,12 @@ int32_t SystemBus_HandleCmd(SYSBUS *instPtr)
 		DBG_WARNING("SystemBus::Production code mismatch!\n");
 		return EIGNORE;
 	}
+
 	switch (data[WD_CMD])
 	{
 	case CMD_SELF_TEST:
 	{
+		HWSTATE *hwStatsPtr = &(instPtr->hwState);
 		sysbusRsp = malloc(sizeof(SYSBUS_UART_FRAME));
 		if (sysbusRsp == NULL) {
 			DBG_ERROR("Failed to allocate memory for SELF TEST Response!\n");
@@ -291,9 +326,18 @@ int32_t SystemBus_HandleCmd(SYSBUS *instPtr)
 		memset(sysbusRsp->data, 0x00, ST_RSP_LEN);
 		sysbusRsp->data[WD_CMD] = CMD_SELF_TEST;
 		sysbusRsp->data[WD_PRD] = MY_PRD_ID;
+		SysMonitor_GetHardwareStatus(hwStatsPtr);
+		if (linkInstPtr->isEnable == false)
+		{
+			sysbusRsp->data[WD_ST_RET] = (hwStatsPtr->isSpOk) ? ST_RET_OK : ST_RET_ERROR;
+		}
+		else
+		{
+			sysbusRsp->data[WD_ST_RET] = (hwStatsPtr->isSpOk && hwStatsPtr->isAntOk) ? ST_RET_OK : ST_RET_ERROR;
+		}
+		// apply status and omit 2 bytes of overhead.
+		memcpy(sysbusRsp->data + WD_SP_FPGA_VOLT, &(hwStatsPtr->spFpgaVolt), ST_RET_INFO_LEN);
 
-		// FIXME: run self-test and insert result
-		sysbusRsp->data[WD_ST_RET] = ST_RET_OK;
 		if (CircQueuePush(instPtr->txQueue, (void *)sysbusRsp) == false)
 		{
 			free(sysbusRsp);
@@ -351,43 +395,52 @@ int32_t SystemBus_HandleCmd(SYSBUS *instPtr)
 
 		if (data[WD_MODE_CMD] == MODE_CMD_HEAD)
 		{
-			// head node config
+			// omit unnecessary reconfiguration
-			linkConfig.myType = L2_NODE_HEAD;
+			if (L2_GetNodeType(linkInstPtr) != L2_NODE_HEAD)
-			linkConfig.myId = 1;
+			{
-			Linklayer_Reconfig(linkInstPtr, &linkConfig);
+				// head node config
+				linkConfig.myType = L2_NODE_HEAD;
+				linkConfig.myId = 1;
+				Linklayer_Reconfig(linkInstPtr, &linkConfig);
+			}
 		}
-		else if (data[WD_MODE_CMD] == MODE_CMD_MEMBER) 
+
+		else if (data[WD_MODE_CMD] == MODE_CMD_MEMBER )
 		{
-			// member node config
+			// omit unnecessary reconfiguration
-			linkConfig.myType = L2_NODE_MEMBER;
+			if (L2_GetNodeType(linkInstPtr) != L2_NODE_MEMBER)
-			linkConfig.myId = 2;
+			{
-			Linklayer_Reconfig(linkInstPtr, &linkConfig);
+				// member node config
+				linkConfig.myType = L2_NODE_MEMBER;
+				linkConfig.myId = 2;
+				Linklayer_Reconfig(linkInstPtr, &linkConfig);
+			}
 		}
 		else
 		{
-			// FIXME: 
+			// FIXME: to confirm
 			// Halt linklayer
 			Linklayer_Halt(linkInstPtr);
 			DBG_ERROR("Unexpected config command 0x%02X:0x%02X",
 				WD_MODE_CMD, data[WD_MODE_CMD]);
+			Status = EPARAM;
+			break;
 		}
 
 		if(data[WD_EN_CMD] == EN_CMD_ON_HIGH_POWER)
 		{
 			// high power config
 			Phy_AntConfigMode(phyRef, PHY_ANT_MODE_HIGH_POWER);
-			Linklayer_Start(linkInstPtr);
-
 		}
 		else if(data[WD_EN_CMD] == EN_CMD_ON_LOW_POWER)
 		{
 			// low power config
 			Phy_AntConfigMode(phyRef, PHY_ANT_MODE_LOW_POWER);
-			Linklayer_Start(linkInstPtr);
 		}
 		else
 		{
 			// silence config
+			// FIXME: confirm
 			// TODO: better approach?
 			Linklayer_Halt(linkInstPtr);
 			Phy_AntConfigMode(phyRef, PHY_ANT_MODE_SILENT);
@@ -399,27 +452,34 @@ int32_t SystemBus_HandleCmd(SYSBUS *instPtr)
 				DBG_ERROR("Physical set pull time failed, with error code: %" PRId32 ".\n", Status);
 			}
 			Phy_SetupNextSlot(phyRef, PHY_TOR_RX, L1_10KBPS_10MS_FRAME, NULL);
+			break;
 		}
 
-		_nop_(); // for debug
+		Linklayer_Start(linkInstPtr);
+		instPtr->sysbusLog.lastConfig[0] = data[WD_MODE_CMD];
+		instPtr->sysbusLog.lastConfig[1] = data[WD_EN_CMD];
 		Status = SUCCESS;
 		break;
 	}
 	case CMD_SYS_INFO:
 	{
-		SysMonitor_UpdateSysinfoRaw(data + SYS_INFO_OFFSET);
+		SysMonitor_UpdateSysinfo((SYSINFO *)(data + SYS_INFO_OFFSET));
 		Status = SUCCESS;
 		break;
 	}
 	// TODO
 	case CMD_FLJ_SEND:
 	{
-		SysMonitor_UpdateSendPayloadFLJRaw(data + FLJ_DATA_OFFSET); // omit control info
+		SysMonitor_UpdateSendPayload(data + FLJ_DATA_OFFSET, PAYLOAD_LEN_FLJ_TX); // omit control info
+		instPtr->sysbusLog.svcCnt++;
+		Status = SUCCESS;
 		break;
 	}
 	case CMD_LJ_SEND:
 	{
-		SysMonitor_UpdateSendPayloadLJRaw(data + LJ_DATA_OFFSET); // omit control info
+		SysMonitor_UpdateSendPayload(data + LJ_DATA_OFFSET, PAYLOAD_LEN_LJ_TX); // omit control info
+		instPtr->sysbusLog.svcCnt++;
+		Status = SUCCESS;
 		break;
 	}
 	case CMD_FLJ_POLL:
@@ -440,7 +500,7 @@ int32_t SystemBus_HandleCmd(SYSBUS *instPtr)
 		sysbusRsp->data[WD_CMD] = CMD_FLJ_POLL;
 		sysbusRsp->data[WD_PRD] = MY_PRD_ID;
 		uint32_t dataId;
-		SysMonitor_GetRecvPayloadFLJRaw(sysbusRsp->data + FLJ_DATA_OFFSET, &dataId); // omit control info
+		SysMonitor_GetRecvPayload(sysbusRsp->data + FLJ_DATA_OFFSET, &dataId, PAYLOAD_LEN_FLJ_RX); // omit control info
 		if (dataId == DATA_ID_NONE)
 		{
 			free(sysbusRsp);
@@ -455,6 +515,7 @@ int32_t SystemBus_HandleCmd(SYSBUS *instPtr)
 			Status = EQUEUE;
 			break;
 		}
+		instPtr->sysbusLog.pollCnt++;
 		Status = SUCCESS;
 		break;
 	}
@@ -476,7 +537,7 @@ int32_t SystemBus_HandleCmd(SYSBUS *instPtr)
 		sysbusRsp->data[WD_CMD] = CMD_LJ_POLL;
 		sysbusRsp->data[WD_PRD] = MY_PRD_ID;
 		uint32_t dataId;
-		SysMonitor_GetRecvPayloadLJRaw(sysbusRsp->data + LJ_DATA_OFFSET, &dataId); // omit control info
+		SysMonitor_GetRecvPayload(sysbusRsp->data + LJ_DATA_OFFSET, &dataId, PAYLOAD_LEN_LJ_RX); // omit control info
 		if (dataId == DATA_ID_NONE)
 		{
 			free(sysbusRsp);
@@ -491,6 +552,7 @@ int32_t SystemBus_HandleCmd(SYSBUS *instPtr)
 			Status = EQUEUE;
 			break;
 		}
+		instPtr->sysbusLog.pollCnt++;
 		Status = SUCCESS;
 		break;
 	}
@@ -514,12 +576,26 @@ int32_t SystemBus_HandleCmd(SYSBUS *instPtr)
 		sysbusRsp->data[WD_CMD] = CMD_FLJ_RM_TEST;
 		sysbusRsp->data[WD_PRD] = MY_PRD_ID;
 
+		TIME_WORD tmWord;
+		uint64_t time;
+		TimeCtrl_GetCurrentTime(linkInstPtr->config.tmcInstPtr, &tmWord);
+		time = tmWord.int_part * TIME_FRAC_MAX + tmWord.frac_part;
+		memcpy(sysbusRsp->data + WD_FLJ_TIME_STAMP, &time, WD_FLJ_TIME_STAMP_LEN);
+		SysMonitor_GetLinklayerLog(&(instPtr->linkLog));
+		SysMonitor_GetPhysicalLayerLog(&(instPtr->phyLog));
+		SysMonitor_GetHardwareStatus(&(instPtr->hwState));
+		memcpy(sysbusRsp->data + WD_FLJ_SYSBUS_LOG, &(instPtr->sysbusLog), WD_FLJ_SYSBUS_LOG_LEN);
+		memcpy(sysbusRsp->data + WD_FLJ_LINK_LOG, &(instPtr->linkLog), WD_FLJ_LINK_LOG_LEN);
+		memcpy(sysbusRsp->data + WD_FLJ_PHY_LOG, &(instPtr->phyLog), WD_FLJ_PHY_LOG_LEN);
+		memcpy(sysbusRsp->data + WD_FLJ_HARDWARE_ST, &(instPtr->hwState.spFpgaVolt), WD_FLJ_HARDWARE_ST_LEN);
+
 		if (CircQueuePush(instPtr->txQueue, (void *)sysbusRsp) == false){
 			free(sysbusRsp);
 			DBG_WARNING("SystemBus::TX Queue overflowed!\n");
 			Status = EQUEUE;
 			break;
 		}
+		instPtr->sysbusLog.remoteCnt++;
 		Status = SUCCESS;
 		break;
 	}
@@ -543,18 +619,33 @@ int32_t SystemBus_HandleCmd(SYSBUS *instPtr)
 		sysbusRsp->data[WD_CMD] = CMD_LJ_RM_TEST;
 		sysbusRsp->data[WD_PRD] = MY_PRD_ID;
 
+		TIME_WORD tmWord;
+		uint64_t time;
+		TimeCtrl_GetCurrentTime(linkInstPtr->config.tmcInstPtr, &tmWord);
+		time = tmWord.int_part * TIME_FRAC_MAX + tmWord.frac_part;
+		memcpy(sysbusRsp->data + WD_LJ_TIME_STAMP, &time, WD_LJ_TIME_STAMP_LEN);
+		SysMonitor_GetLinklayerLog(&(instPtr->linkLog));
+		SysMonitor_GetPhysicalLayerLog(&(instPtr->phyLog));
+		SysMonitor_GetHardwareStatus(&(instPtr->hwState));
+		memcpy(sysbusRsp->data + WD_LJ_SYSBUS_LOG, &(instPtr->sysbusLog), WD_LJ_SYSBUS_LOG_LEN);
+		memcpy(sysbusRsp->data + WD_LJ_LINK_LOG, &(instPtr->linkLog), WD_LJ_LINK_LOG_LEN);
+		memcpy(sysbusRsp->data + WD_LJ_PHY_LOG, &(instPtr->phyLog), WD_LJ_PHY_LOG_LEN);
+		memcpy(sysbusRsp->data + WD_LJ_HARDWARE_ST, &(instPtr->hwState.spFpgaVolt), WD_LJ_HARDWARE_ST_LEN);
+
 		if (CircQueuePush(instPtr->txQueue, (void *)sysbusRsp) == false){
 			free(sysbusRsp);
 			DBG_WARNING("SystemBus::TX Queue overflowed!\n");
 			Status = EQUEUE;
 			break;
 		}
+		instPtr->sysbusLog.remoteCnt++;
 		Status = SUCCESS;
 		break;
 	}
 	default:
 	{
 		DBG_ERROR("SystemBus::Unknown command code!\n");
+		Status = FAILURE;
 		break;
 	}
 	}
@@ -562,18 +653,6 @@ int32_t SystemBus_HandleCmd(SYSBUS *instPtr)
 	return Status;
 }
 
-int32_t SystemBus_FLJ_PeriodUpdate(SYSBUS *instPtr)
-{
-	// TODO
-	return SUCCESS;
-}
-
-int32_t SystemBus_LJ_PeriodUpdate(SYSBUS *instPtr)
-{
-	// TODO
-	return SUCCESS;
-}
-
 /*****************************************************************************/
 /**
  * @brief   This function send a repose frame from system bus tx queue.

df_datalink_sp/src/systembus/systembus.h

@@ -17,10 +17,11 @@
 #define __SYSTEMBUS_H_
 
 /***************************** Include Files *********************************/
-#include "systembus_uart.h" // SystemBus UART driver
-#include "circ_queue.h"
 #include <stdint.h>
 #include <stdbool.h>
+#include "systembus_uart.h" // SystemBus UART driver
+#include "circ_queue.h"
+#include "../system_monitor.h"
 
 /************************** Constant Definitions *****************************/
 /************************** Data Type Definitions ****************************/
@@ -35,6 +36,10 @@ typedef struct
 typedef struct
 {
     SYSBUS_CONFIG config;
+    SYSBUSLOG sysbusLog; // systembus log
+	LINKLOG linkLog; // Link layer log
+	PHYLOG phyLog; // Physical layer log
+	HWSTATE hwState; // Hardware status
     SYSBUS_UART *uartInst;
     CIRC_QUEUE *txQueue;
     CIRC_QUEUE *rxQueue;
@@ -47,10 +52,6 @@ typedef struct
 int32_t SystemBus_Init(SYSBUS **instPtr, SYSBUS_CONFIG *config);
 
 int32_t SystemBus_HandleCmd(SYSBUS *instPtr);
-
-int32_t SystemBus_FLJ_PeriodUpdate(SYSBUS *instPtr);
-int32_t SystemBus_LJ_PeriodUpdate(SYSBUS *instPtr);
-
 int32_t SystemBus_MakeResp(SYSBUS *instPtr);
 
 int32_t SystemBus_TxIntrHandler(SYSBUS *instPtr);

df_datalink_sp/src/util/clist.c

@@ -56,7 +56,6 @@ clist_new(void)
 
 void clist_clear(clist_t *self)
 {
-  uint32_t len = self->len;
   clist_node_t *next;
   clist_node_t *curr = self->head;
 

makecopy

@@ -10,5 +10,5 @@ cp -rL $PROJECT_DIR/df_datalink_sp/src $DST_DIR/df_datalink_sp
 cp -rL $PROJECT_DIR/df_datalink_ge/src $DST_DIR/df_datalink_ge
 
 cd $DST_DIR/df_datalink_ge/networking/phy_layer
-sed -i "s/antConfig->rfTxMgc = 0;/antConfig->rfTxMgc = $GE_TXATT;/g" ./phy_antenna.c
+sed -i'' -e "s/antConfig->rfTxMgc = 0;/antConfig->rfTxMgc = $GE_TXATT;/g" ./phy_antenna.c
-sed -i "s/antConfig->rcvMgc = 0;/antConfig->rcvMgc = $GE_RXATT;/g" ./phy_antenna.c
+sed -i'' -e "s/antConfig->rcvMgc = 0;/antConfig->rcvMgc = $GE_RXATT;/g" ./phy_antenna.c