dev: enable auto linklayer start

.gitignore

@@ -54,4 +54,7 @@ dkms.conf
 
 # MacOS .DS_Store file
 **/.DS_Store
-**/._.DS_Store
+**/._.DS_Store
+
+# Ignore handout files
+handout/

Makefile

@@ -1,10 +1,14 @@
 DIR := $(shell pwd)
 
 compile_test:
+	cd $(DIR)/df_datalink_sp/bsp && make all
 	cd $(DIR)/df_datalink_sp/build && make all
+	cd $(DIR)/df_datalink_ge/bsp && make all
 	cd $(DIR)/df_datalink_ge/build && make all
 
 clean:
+	cd $(DIR)/df_datalink_sp/bsp && make clean
 	cd $(DIR)/df_datalink_sp/build && make clean
+	cd $(DIR)/df_datalink_ge/bsp && make clean
 	cd $(DIR)/df_datalink_ge/build && make clean
 .PHONY: clean compile_test

df_datalink_ge/src/config/app_config.h

@@ -39,7 +39,7 @@
 #define APP_EMULATE_DATA
 #define DATALINK_ENABLE_AUTORECONNECT
 #define DATALINK_ENABLE_AUTOTIMESYNC
-//#define DATALINK_ENABLE_BERTEST
+#define DATALINK_ENABLE_BERTEST	10
 
 
 /************ Hardware Configs ************/

df_datalink_sp/src/config/app_config.h

@@ -38,7 +38,7 @@
 
 #define DATALINK_ENABLE_AUTORECONNECT
 #define DATALINK_ENABLE_AUTOTIMESYNC
-// #define DATALINK_ENABLE_BERTEST
+#define DATALINK_ENABLE_BERTEST	10
 
 /************ Hardware Configs ************/
 #define CPU_CLK_HZ XPAR_CPU_CORTEXA9_0_CPU_CLK_FREQ_HZ
@@ -52,7 +52,7 @@
 #define SCUTIMER_INTR_ID XPAR_SCUTIMER_INTR
 
 // Physical Layer Configs
-#define PHY_DEVICE_ID 0X00
+#define PHY_DEVICE_ID 0
 #define PHY_BASEADDR XPAR_PHYC_BASEADDR
 #define PHY_BEAM_FORMING_ENABLE
 // -- Antenna Bram Configs

df_datalink_sp/src/main.c

@@ -482,7 +482,7 @@ int main(void)
 	DBG_PRINT("Physical started...\n");
 	Phy_Start(phyInstPtr);
 
-	// Linklayer_Start(linkInstPtr);
+	Linklayer_Start(linkInstPtr);
 
 	while (true)
 	{

df_datalink_sp/src/networking/link_layer/link_layer.c

@@ -163,7 +163,7 @@ static void L2_FrameStateUpdate(L2_INST *instPtr)
 #ifndef DATALINK_ENABLE_BERTEST
 			isValid = L2_CrcCheck(instPtr->recvPktData, L2_SVC_PACK_LEN, L2_CRC16_1021);
 #else
-			isValid = true;
+			isValid = L2_Service_PktCheck(instPtr, instPtr->recvPktData);
 #endif
 			instPtr->log.svcRecvCnt++;
 			instPtr->log.svcCorrectCnt = isValid ? instPtr->log.svcCorrectCnt + 1 : instPtr->log.svcCorrectCnt;
@@ -420,10 +420,14 @@ L1_FRAME_TYPE L2_L2frame2L1frame(L2_FRAME_TYPE l2Frame)
 	case L2_SCAN_FRAME:
 		return L1_10KBPS_10MS_FRAME;
 	case L2_ADV_FRAME:
-		return L1_10KBPS_20MS_FRAME;
 	case L2_CFM_FRAME:
+		return L1_10KBPS_20MS_FRAME;
 	case L2_SVC_FRAME:
+#if DATALINK_ENABLE_BERTEST == 10
+		return L1_10KBPS_20MS_FRAME;
+#else
 		return L1_40KBPS_20MS_FRAME;
+#endif
 	default:
 		return L1_NONE_FRAME;
 	}

df_datalink_sp/src/networking/link_layer/link_layer.h

@@ -173,6 +173,7 @@ int32_t L2_Scan_Routine(L2_INST *instPtr, const L2_RTNE_TABLE_ENTRY *schedEntry)
 int32_t L2_Service_Init(L2_SVC_FSM **svcFSMPtr);
 void L2_Service_Reset(L2_SVC_FSM *svcFSMPtr);
 void L2_Service_Destroy(L2_SVC_FSM *svcFSMPtr);
+bool L2_Service_PktCheck(L2_INST *instPtr, uint8_t *msg);
 int32_t L2_Service_PktHandler(L2_INST *instPtr, uint8_t *msg);
 int32_t L2_Service_Proc(L2_INST *instPtr);
 int32_t L2_Service_Routine(L2_INST *instPtr, const L2_RTNE_TABLE_ENTRY *schedEntry);

df_datalink_sp/src/networking/link_layer/msg_def.h

@@ -26,7 +26,7 @@
 #define L2_PACK_LEN_MAX 512 // bytes
 
 #define L2_ADV_PACK_LEN 28  // bytes
-#define L2_CMF_PACK_LEN 268 // bytes
+#define L2_CMF_PACK_LEN 28  // bytes
 #define L2_SVC_PACK_LEN 268 // bytes
 
 // Common structure:
@@ -81,17 +81,7 @@
 #define L2_MSG_CFM_SRC_POSY_LEN 4
 #define L2_MSG_CFM_SRC_POSZ 16
 #define L2_MSG_CFM_SRC_POSZ_LEN 4
-#define L2_MSG_CFM_SRC_SPEEDX 20
+#define L2_MSG_CFM_CRC 26
-#define L2_MSG_CFM_SRC_SPEEDX_LEN 4
-#define L2_MSG_CFM_SRC_SPEEDY 24
-#define L2_MSG_CFM_SRC_SPEEDY_LEN 4
-#define L2_MSG_CFM_SRC_SPEEDZ 28
-#define L2_MSG_CFM_SRC_SPEEDZ_LEN 4
-#define L2_MSG_CFM_PAYLOAD_ID 32
-#define L2_MSG_CFM_PAYLOAD_ID_LEN 4
-#define L2_MSG_CFM_PAYLOAD 36
-#define L2_MSG_CFM_PAYLOAD_LEN 230
-#define L2_MSG_CFM_CRC 266
 #define L2_MSG_CFM_CRC_LEN 2
 
 // service payload structure:
@@ -127,4 +117,4 @@
 
 /** @} LinkLayer_MSG_Constants*/
 
-/** @} LinkLayer*/
+/** @} LinkLayer*/

df_datalink_sp/src/networking/link_layer/scan.c

@@ -409,27 +409,6 @@ static int32_t ScanMsg_Packing(L2_INST *instPtr, L2_FRAME_TYPE type, uint8_t dst
 		L2_FrameInsertChunk(buff, L2_MSG_CFM_SRC_POSX, L2_MSG_CFM_SRC_POSX_LEN, &(instPtr->sysInfo.posX));
 		L2_FrameInsertChunk(buff, L2_MSG_CFM_SRC_POSY, L2_MSG_CFM_SRC_POSY_LEN, &(instPtr->sysInfo.posY));
 		L2_FrameInsertChunk(buff, L2_MSG_CFM_SRC_POSZ, L2_MSG_CFM_SRC_POSZ_LEN, &(instPtr->sysInfo.posZ));
-		L2_FrameInsertChunk(buff, L2_MSG_CFM_SRC_SPEEDX, L2_MSG_CFM_SRC_SPEEDX_LEN, &(instPtr->sysInfo.vX));
-		L2_FrameInsertChunk(buff, L2_MSG_CFM_SRC_SPEEDY, L2_MSG_CFM_SRC_SPEEDY_LEN, &(instPtr->sysInfo.vY));
-		L2_FrameInsertChunk(buff, L2_MSG_CFM_SRC_SPEEDZ, L2_MSG_CFM_SRC_SPEEDZ_LEN, &(instPtr->sysInfo.vZ));
-
-		// Packing extra payload
-		uint32_t dataId;
-		if (L2_GetNodeType(instPtr) == L2_NODE_HEAD)
-		{
-			SysMonitor_GetSendPayload(buff + L2_MSG_CFM_PAYLOAD, &dataId, PAYLOAD_LEN_FLJ_TX);
-		}
-		else
-		{
-			SysMonitor_GetSendPayload(buff + L2_MSG_CFM_PAYLOAD, &dataId, PAYLOAD_LEN_LJ_TX);
-		}
-
-		L2_FrameInsertChunk(buff, L2_MSG_CFM_PAYLOAD_ID, L2_MSG_CFM_PAYLOAD_ID_LEN, &dataId);
-		if (dataId == DATA_ID_NONE)
-		{
-			memset(buff + L2_MSG_CFM_PAYLOAD, 0xAA, L2_MSG_CFM_PAYLOAD_LEN);
-		}
-
 		// Append CRC
 		Status = L2_CrcAppend(buff, L2_CMF_PACK_LEN - L2_MSG_CFM_CRC_LEN, L2_MSG_CFM_CRC, L2_CRC16_1021);
 		if (Status != SUCCESS)
@@ -437,10 +416,6 @@ static int32_t ScanMsg_Packing(L2_INST *instPtr, L2_FRAME_TYPE type, uint8_t dst
 			DBG_ERROR("Fail to append CRC, error code: %" PRId32 ".\n", Status);
 			return Status;
 		}
-
-		// Logging...
-		memcpy(instPtr->log.txLog.data, buff, L2_CMF_PACK_LEN);
-		instPtr->log.txLog.dataId = dataId;
 		break;
 	}
 	default:
@@ -564,13 +539,6 @@ int32_t L2_Scan_PktHandler(L2_INST *instPtr, uint8_t *msg)
 		node->nodeInfo.pos.y = (double)nodePos;
 		L2_FrameGetChunk(msg, L2_MSG_CFM_SRC_POSZ, L2_MSG_CFM_SRC_POSZ_LEN, &nodePos);
 		node->nodeInfo.pos.z = (double)nodePos;
-		float nodeSpeed;
-		L2_FrameGetChunk(msg, L2_MSG_CFM_SRC_SPEEDX, L2_MSG_CFM_SRC_SPEEDX_LEN, &nodeSpeed);
-		node->nodeInfo.speed.x = (double)nodePos;
-		L2_FrameGetChunk(msg, L2_MSG_CFM_SRC_SPEEDY, L2_MSG_CFM_SRC_SPEEDY_LEN, &nodeSpeed);
-		node->nodeInfo.speed.y = (double)nodePos;
-		L2_FrameGetChunk(msg, L2_MSG_CFM_SRC_SPEEDZ, L2_MSG_CFM_SRC_SPEEDZ_LEN, &nodeSpeed);
-		node->nodeInfo.speed.z = (double)nodePos;
 
 		// Reset node ttl
 		node->ttlCnt = 0;
@@ -626,23 +594,6 @@ int32_t L2_Scan_PktHandler(L2_INST *instPtr, uint8_t *msg)
 			}
 		}
 
-		// Get data payload
-		uint32_t dataId;
-		L2_FrameGetChunk(msg, L2_MSG_CFM_PAYLOAD_ID, L2_MSG_CFM_PAYLOAD_ID_LEN, &dataId);
-
-		if (L2_GetNodeType(instPtr) == L2_NODE_HEAD)
-		{
-			SysMonitor_UpdateRecvPayload(msg + L2_MSG_CFM_PAYLOAD, dataId, PAYLOAD_LEN_FLJ_RX);
-		}
-		else
-		{
-			SysMonitor_UpdateRecvPayload(msg + L2_MSG_CFM_PAYLOAD, dataId, PAYLOAD_LEN_LJ_RX);
-		}
-
-		// Logging...
-		memcpy(instPtr->log.rxLog.data, msg, L2_CMF_PACK_LEN);
-		instPtr->log.rxLog.dataId = dataId;
-
 		Status = SUCCESS;
 		break;
 	}

df_datalink_sp/src/networking/link_layer/service.c

@@ -155,8 +155,9 @@ static int32_t Service_Packing(L2_INST *instPtr, L2_FRAME_TYPE type, uint8_t dst
 	}
 	return SUCCESS;
 #else
-	DBG_ERROR("Unexpected call of Service_Packing in BER test mode.\n");
+	size_t packLen = Phy_GetFrameLen(L2_L2frame2L1frame(L2_SVC_FRAME));
-	return EUNEXP;
+	memcpy(instPtr->sendPktData, testData, packLen);
+	return SUCCESS;
 #endif
 }
 
@@ -260,33 +261,63 @@ int32_t L2_Service_PktHandler(L2_INST *instPtr, uint8_t *msg)
 	}
 	return Status;
 #else
+	NODE_ENTRY *node;
+	uint8_t nodeId = (L2_GetNodeType(instPtr) == L2_NODE_HEAD) ? 0x02 : 0x01;
+	node = L2_GetNodeById(instPtr->nodeList, nodeId);
+	if (node == NULL)
+	{
+		node = L2_AppendNode(instPtr->nodeList, nodeId, L2_NODE_MEMBER);
+		if (node == NULL)
+		{
+			DBG_ERROR("Failed to append new node [id: %" PRIu8 "]", nodeId);
+			return ENOMEM;
+		}
+	}
+	// Reset node ttl
+	node->ttlCnt = 0;
+
+	// Calculate time deviation
+	uint32_t frameNum = L2_GetCurrentFrameNum(instPtr);
+	uint32_t slotNum = L2_GetCurrentSlotNum(instPtr);
+
+	// //NOTE: Service frame length is 20ms with 5ms idle
+	// if(slotNum < 5)
+	// {
+	// 	slotNum = L2_SLOTS_PER_FRAME - 5;
+	// 	frameNum = frameNum - 1;
+	// }
+	// else
+	// {
+	// 	slotNum = slotNum / 5 * 5 - 5;
+	// }
+	// 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)
+	// {
+	// 	// Time sync.
+	// 	L2_TimeAdjust(instPtr, &(instPtr->log.timeDev));
+	// }
+	return SUCCESS;
+#endif
+}
+
+bool L2_Service_PktCheck(L2_INST *instPtr, uint8_t *msg)
+{
+	size_t packLen = Phy_GetFrameLen(L2_L2frame2L1frame(L2_SVC_FRAME)) & 0xFFFFFFFE;
 	uint32_t errorBits = 0;
-	for (int i = 0; i < L2_SVC_PACK_LEN; i++)
+	for (int i = 0; i < packLen; i++)
 	{
 		errorBits += count_ones(msg[i] ^ testData[i]);
 	}
 
 	instPtr->serviceFSM->bitError += errorBits;
-	instPtr->serviceFSM->bitTotal += L2_SVC_PACK_LEN * 8;
+	instPtr->serviceFSM->bitTotal += packLen * 8;
-
+	return (errorBits == 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")
-		return Status;
-	}
-	// Implement a auto time sync.
-	if (L2_GetNodeType(instPtr) != L2_NODE_HEAD)
-	{
-		// Time sync.
-		L2_TimeAdjust(instPtr, &(instPtr->log.timeDev));
-	}
-	return SUCCESS;
-#endif
 }
 
 /*****************************************************************************/
@@ -406,12 +437,7 @@ int32_t L2_Service_Routine(L2_INST *instPtr, const L2_RTNE_TABLE_ENTRY *rtneEntr
 		if (torState == L2_TOR_TX)
 		{
 			svcFSMPtr->txCnt++;
-#ifndef DATALINK_ENABLE_BERTEST
-			// Packing service data
 			Service_Packing(instPtr, L2_SVC_FRAME, rtneEntry->dst);
-#else
-			memcpy(instPtr->sendPktData, testData, L2_SVC_PACK_LEN);
-#endif
 		}
 		else
 		{
@@ -435,4 +461,4 @@ int32_t L2_Service_Routine(L2_INST *instPtr, const L2_RTNE_TABLE_ENTRY *rtneEntr
 }
 
 /** @} LinkLayer_Service*/
-/** @} LinkLayer*/
+/** @} LinkLayer*/

makecopy

@@ -4,9 +4,13 @@
 GE_TXATT=0
 GE_RXATT=25
 
-DST_DIR=`pwd`
+DST_DIR="$(pwd)/handout"
 PROJECT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
+echo ${DST_DIR}
+
+mkdir -p ${DST_DIR}
+
 echo "Creating <df_datalink_ge>..."
 cp -rL $PROJECT_DIR/df_datalink_ge/src $DST_DIR/df_datalink_ge
 sed -i'' -e "s/antConfig->rfTxMgc = 0;/antConfig->rfTxMgc = $GE_TXATT;/g" $DST_DIR/df_datalink_ge/networking/phy_layer/phy_antenna.c
@@ -38,4 +42,4 @@ for key in ${!calMap[*]};do
     /\};/!b table
     s/=.*\};/=\n\/\/Antenna-$key\n${calMap[$key]}/
     }" $DST_DIR/$projName/networking/phy_layer/phy_antenna.c
-done
+done