*bugfix: correct pattern setting.

df_datalink_sp/src/networking/link_layer/link_layer.c

@@ -353,9 +353,13 @@ void L2_FrameStateUpdate(L2_INST *instPtr)
 	case L2_SCAN_FRAME:
 	case L2_ADV_FRAME:
 		isValid = L2_CrcCheck(instPtr->recvPktData, L2_ADV_PACK_LEN, L2_CRC16_1021);
+		instPtr->log.advRecvCnt++;
+		instPtr->log.advCorrectCnt = isValid ? instPtr->log.advCorrectCnt + 1 : instPtr->log.advCorrectCnt;
 		break;
 	case L2_CFM_FRAME:
 		isValid = L2_CrcCheck(instPtr->recvPktData, L2_CMF_PACK_LEN, L2_CRC16_1021);
+		instPtr->log.cfmRecvCnt++;
+		instPtr->log.cfmCorrectCnt = isValid ? instPtr->log.cfmCorrectCnt + 1 : instPtr->log.cfmCorrectCnt;
 		break;
 	case L2_SVC_FRAME:
 #ifndef DATALINK_ENABLE_BERTEST
@@ -363,6 +367,8 @@ void L2_FrameStateUpdate(L2_INST *instPtr)
 #else
 		isValid = true;
 #endif
+		instPtr->log.svcRecvCnt++;
+		instPtr->log.svcCorrectCnt = isValid ? instPtr->log.svcCorrectCnt + 1 : instPtr->log.svcCorrectCnt;
 		break;
 
 	default:

df_datalink_sp/src/networking/link_layer/service.c

@@ -318,6 +318,12 @@ int32_t L2_Service_Routine(L2_INST *instPtr, const L2_RTNE_TABLE_ENTRY *rtneEntr
 {
 	ASSERT(instPtr != NULL);
 	DBG_INFO("-------- ServiceNet Routine --------\n");
+
+	if (rtneEntry->slotSeq != 0)
+	{
+		return SUCCESS; // skip
+	}
+
 	PHY_INST* phyRef = instPtr->config.phyInstPtr;
 	L2_TOR_TYPE torState;
 	if (rtneEntry->src == L2_GetNodeId(instPtr))

df_datalink_sp/src/networking/phy_layer/phy_layer.c

@@ -35,10 +35,29 @@
 
 
 /************************** Constant Definitions *****************************/
-#define TOR_BUFF_MAX_SIZE 1024 // 8192bits
+#define L1_FRAME_LEN_MAX (8192 / 8)			// byte
+#define L1_FRAME_2KBPS_20MS_LEN 0			// byte
+#define L1_FRAME_2KBPS_100MS_LEN (312 / 8)	// byte
+#define L1_FRAME_10KBPS_10MS_LEN 0			// byte
+#define L1_FRAME_10KBPS_20MS_LEN (232 / 8)	// byte
+#define L1_FRAME_40KBPS_20MS_LEN (2152 / 8) // byte
+#define L1_FRAME_40KBPS_10MS_LEN (712 / 8)	// byte
+#define L1_FRAME_200KBPS_5MS_LEN (2040 / 8) // byte
+#define L1_FRAME_1M2BPS_5MS_LEN (8176 / 8)	// byte
+
+#define L1_FRAME_2KBPS_20MS_COMP 1841158  // *10ns(Timer_L)
+#define L1_FRAME_2KBPS_100MS_COMP 1841158 // *10ns(Timer_L)
+#define L1_FRAME_10KBPS_10MS_COMP 850950  // *10ns(Timer_L)
+#define L1_FRAME_10KBPS_20MS_COMP 850950  // *10ns(Timer_L)
+#define L1_FRAME_40KBPS_20MS_COMP 111485  // *10ns(Timer_L)
+#define L1_FRAME_40KBPS_10MS_COMP 111485  // *10ns(Timer_L)
+#define L1_FRAME_200KBPS_5MS_COMP 22493	  // *10ns(Timer_L)
+#define L1_FRAME_1M2BPS_5MS_COMP 22493	  // *10ns(Timer_L)
+
+#define L1_ANTCONFIG_MAX_LEN 8192
+#define L1_TXRXDATA_MAX_LEN 2048
+
 #define ANT_COINFO_LEN 32 // bytes
-#define ANTCONFIG_MAX_LEN (8192 / 2)
-#define PAYLOAD_MAX_LEN (4096 / 2)
 
 /***************** Macros (Inline Functions) Definitions *********************/
 /************************** Function Prototypes ******************************/
@@ -611,7 +630,7 @@ int32_t Phy_SetupNextSlot(PHY_INST *instPtr, PHY_TOR_TYPE txrxMode,
 	case L1_2KBPS_20MS_FRAME:
 		phyModeCtrl |= PHY_MODE_CTRL_FRAME_2KBPS_20MS;
 		hopNum = L1_FRAME_2KBPS_20MS_HOPS;
-		hopPattern = hopPattern_10KBPS_10MS;
+		hopPattern = hopPattern_2KBPS_20MS;
 		break;
 	case L1_2KBPS_100MS_FRAME:
 		phyModeCtrl |= PHY_MODE_CTRL_FRAME_2KBPS_100MS;
@@ -630,8 +649,8 @@ int32_t Phy_SetupNextSlot(PHY_INST *instPtr, PHY_TOR_TYPE txrxMode,
 		break;
 	case L1_40KBPS_20MS_FRAME:
 		phyModeCtrl |= PHY_MODE_CTRL_FRAME_40KBPS_20MS;
-		hopNum = L1_FRAME_200KBPS_5MS_HOPS;
+		hopNum = L1_FRAME_40KBPS_20MS_HOPS;
-		hopPattern = hopPattern_200KBPS_5MS;
+		hopPattern = hopPattern_40KBPS_20MS;
 		break;
 	case L1_40KBPS_10MS_FRAME:
 		phyModeCtrl |= PHY_MODE_CTRL_FRAME_40KBPS_10MS;

df_datalink_sp/src/networking/phy_layer/phy_layer.h

@@ -35,15 +35,14 @@
 #include "../../system_monitor.h"
 #include "../../time_ctrl/time_ctrl.h"
 /************************** Constant Definitions *****************************/
-#define L1_TMWORD_FRAC_MAX 500000
-#define L1_ANTCONFIG_MAX_LEN 8192
-#define L1_TXRXDATA_MAX_LEN 2048
 #define L1_NUM_ANT_SUBNRRW_PATTERN 37
 #define L1_NUM_ANT_NRRW_PATTERN 61
 #define L1_INIT_BEAM_NO 0
 #define L1_INIT_ANT_WD PHY_ANT_BEAM_120
 #define L1_INIT_ANT_NO 0
 
+#define L1_FRAME_NONE_LEN UINT32_MAX		// byte
+#define L1_FRAME_NONE_COMP UINT32_MAX	  // *10ns(Timer_L)
 #define L1_FRAME_NONE_HOPS UINT32_MAX
 #define L1_FRAME_MAX_HOPS 81
 #define L1_FRAME_2KBPS_20MS_HOPS 1
@@ -55,27 +54,6 @@
 #define L1_FRAME_200KBPS_5MS_HOPS 20
 #define L1_FRAME_1M2BPS_5MS_HOPS 20
 
-#define L1_FRAME_NONE_LEN UINT32_MAX		// byte
-#define L1_FRAME_LEN_MAX (8192 / 8)			// byte
-#define L1_FRAME_2KBPS_20MS_LEN 1			// byte
-#define L1_FRAME_2KBPS_100MS_LEN 312 / 8	// byte
-#define L1_FRAME_10KBPS_10MS_LEN 1			// byte
-#define L1_FRAME_10KBPS_20MS_LEN (232 / 8)	// byte
-#define L1_FRAME_40KBPS_20MS_LEN (2152 / 8) // byte
-#define L1_FRAME_40KBPS_10MS_LEN (712 / 8)	// byte
-#define L1_FRAME_200KBPS_5MS_LEN (2040 / 8) // byte
-#define L1_FRAME_1M2BPS_5MS_LEN (8176 / 8)	// byte
-
-#define L1_FRAME_NONE_COMP UINT32_MAX	  // *10ns(Timer_L)
-#define L1_FRAME_2KBPS_20MS_COMP 1841158  // *10ns(Timer_L)
-#define L1_FRAME_2KBPS_100MS_COMP 1841158 // *10ns(Timer_L)
-#define L1_FRAME_10KBPS_10MS_COMP 850950  // *10ns(Timer_L)
-#define L1_FRAME_10KBPS_20MS_COMP 850950  // *10ns(Timer_L)
-#define L1_FRAME_40KBPS_20MS_COMP 110667  // *10ns(Timer_L)
-#define L1_FRAME_40KBPS_10MS_COMP 110667  // *10ns(Timer_L)
-#define L1_FRAME_200KBPS_5MS_COMP 22493	  // *10ns(Timer_L)
-#define L1_FRAME_1M2BPS_5MS_COMP 22493	  // *10ns(Timer_L)
-
 #define PHY_TIME_WORD_H_MAX UINT32_MAX
 #define PHY_TIME_WORD_L_MAX 0x0007A120 // 5ms/10ns
 /***************** Macros (Inline Functions) Definitions *********************/

makecopy

@@ -0,0 +1,14 @@
+#! /bin/sh
+
+GE_TXATT=8
+GE_RXATT=56
+
+DST_DIR=`pwd`
+PROJECT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+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 "s/antConfig->rcvMgc = 0;/antConfig->rcvMgc = $GE_RXATT;/g" ./phy_antenna.c