整理宏GD_TEST_2021；

dtu/dtu_main_t536/app/Appconfig.c

@@ -143,13 +143,13 @@ const SOE_DEF tAllSOE[]=
 	{0x04,		{0,			0,					0},				"故障总"},
 	{0x04,		{0,			0,					0},				"短路故障"},
 	{0x04,		{0,			0,					0},				"接地故障"},
-  	{0x14,		{EV_PARA_Ia,	0,					0},				"A相短路故障"},
-  	{0x14,		{EV_PARA_Ib,	0,					0},				"B相短路故障"},
- 	{0x14,		{EV_PARA_Ic,	0,					0},				"C相短路故障"},
-	{0x14,		{EV_PARA_Ia,	EV_PARA_Ib,			0},				"AB相短路故障"},
-  	{0x14,		{EV_PARA_Ib,	EV_PARA_Ic,			0},				"BC相短路故障"},
- 	{0x14,		{EV_PARA_Ia,	EV_PARA_Ic,			0},				"AC相短路故障"},
- 	{0x14,		{EV_PARA_Ia,	EV_PARA_Ib,	EV_PARA_Ic},				"ABC相短路故障"},
+  	{0x14,		{EV_PARA_Ia,	0,					0},         "A相短路故障"},
+  	{0x14,		{EV_PARA_Ib,	0,					0},         "B相短路故障"},
+ 	{0x14,		{EV_PARA_Ic,	0,					0},         "C相短路故障"},
+	{0x14,		{EV_PARA_Ia,	EV_PARA_Ib,			0},         "AB相短路故障"},
+  	{0x14,		{EV_PARA_Ib,	EV_PARA_Ic,			0},         "BC相短路故障"},
+ 	{0x14,		{EV_PARA_Ia,	EV_PARA_Ic,			0},         "AC相短路故障"},
+ 	{0x14,		{EV_PARA_Ia,	EV_PARA_Ib,	EV_PARA_Ic},        "ABC相短路故障"},
  	
 	{0x04,		{0,			0,					0},				"分段模式"},
 	{0x04,		{0,			0,					0},				"联络模式"},
@@ -261,22 +261,12 @@ const SOE_DEF tAllSOE[]=
 	{0x04,		{EV_PARA_Us1,	EV_PARA_Us2,0},				"母线侧有压"},
 	{0x04,		{EV_PARA_Us1,	EV_PARA_Us2,0},				"线路侧有压"},
 	{0x04,		{EV_PARA_Us1,	EV_PARA_Us2,0},				"双侧失压"},
-
-	#ifdef GD_TEST_2021
-		{0x44,		{0,				0,			0},				"A侧X闭锁"},
-		{0x44,		{0,				0,			0},				"B侧X闭锁"},
-		{0x44,		{0,				0,			0},				"A侧Y闭锁"},
-		{0x44,		{0,				0,			0},				"B侧Y闭锁"},
-		{0x44,		{0,				0,			0},				"A侧残压闭锁"},
-		{0x44,		{0,				0,			0},				"B侧残压闭锁"},
-	#else
-		{0x44,		{0,				0,			0},				"母线侧X闭锁"},
-		{0x44,		{0,				0,			0},				"线路侧X闭锁"},
-		{0x44,		{0,				0,			0},				"母线侧Y闭锁"},
-		{0x44,		{0,				0,			0},				"线路侧Y闭锁"},
-		{0x44,		{0,				0,			0},				"母线侧残压闭锁"},
-		{0x44,		{0,				0,			0},				"线路侧残压闭锁"},
-	#endif
+    {0x44,		{0,				0,			0},				"母线侧X闭锁"},
+    {0x44,		{0,				0,			0},				"线路侧X闭锁"},
+    {0x44,		{0,				0,			0},				"母线侧Y闭锁"},
+    {0x44,		{0,				0,			0},				"线路侧Y闭锁"},
+    {0x44,		{0,				0,			0},				"母线侧残压闭锁"},
+    {0x44,		{0,				0,			0},				"线路侧残压闭锁"},
 
 	{0x54|SOE_TYPE_DELAY_FHZ,		{EV_PARA_U0,	EV_PARA_I0,	0},				"合后零压动作"},
 	{0x44,		{EV_PARA_U0,				0,			0},				"合前零压闭锁"},
@@ -289,32 +279,20 @@ const SOE_DEF tAllSOE[]=
 	{0x44,		{0,				0,			0},				"双电源闭锁合闸"},	
 	{0x04|SOE_TYPE_DELAY_FHZ,		{0,				0,			0},				"合后故障"},	
 
-#ifdef GD_TEST_2021
-    {0x44,		{0,				0,			0},			"A侧合后故障"},	
-    {0x44,		{0,				0,			0},			"B侧合后故障"},	
-#else
     {0x44,		{0,				0,			0},			"母线侧合后故障"},	
     {0x44,		{0,				0,			0},			"线路侧合后故障"},	
-#endif
 
 	{0x44,		{0,				0,			0},				"闭锁失压分闸"},	
 
 	{0x04,		{0,				0,			0},				"合闸解锁"},
 	{0x04,		{0,				0,			0},				"人工解锁"},
 	{0x04,		{0,				0,			0},				"单侧来电解锁"},
-
 	{0x04,		{0,				0,			0},				"联络有压解锁"},
-
-	
-
 	{0x04,		{0,			0,				0},				"联络单侧失压时间到"},
-
-	#ifdef GD_TEST_2021
-		{0x04,		{0,			0,				0},				"联络A侧失压告警"},
-		{0x04,		{0,			0,				0},				"联络B侧失压告警"},
-		{0x04,		{0,			0,				0},				"联络A侧失压合闸"},
-		{0x04,		{0,			0,				0},				"联络B侧失压合闸"},
-	#endif
+    {0x04,		{0,			0,				0},				"联络A侧失压告警"},
+    {0x04,		{0,			0,				0},				"联络B侧失压告警"},
+    {0x04,		{0,			0,				0},				"联络A侧失压合闸"},
+    {0x04,		{0,			0,				0},				"联络B侧失压合闸"},
 	{0x44|SOE_TYPE_DELAY_FHZ,		{EV_PARA_Us1,	EV_PARA_Us2,0},				"得电合闸"},
 	{0x04,		{EV_PARA_Us1,	EV_PARA_Us2,0}, 			"母线侧得电合闸"},
 	{0x04,		{EV_PARA_Us1,	EV_PARA_Us2,0},				"线路侧得电合闸"},

dtu/dtu_main_t536/app/Appconfig.h

@@ -275,12 +275,10 @@ enum
 	EV_JS_POWER,				// 对侧来电解锁
 	EV_JS_L,						// 联络有压解锁
 	EV_L_LST_T,					//联络单侧失压时间到
-#ifdef GD_TEST_2021
 	EV_L_A_LST_ALA,             // 联络A侧失压告警
 	EV_L_B_LST_ALA,				// 联络B侧失压告警
 	EV_L_A_LST_HZ,				// 联络A侧失压合闸
 	EV_L_B_LST_HZ,     			// 联络B侧失压合闸
-#endif
 	EV_FA_HZ,					// 得电合闸	
 	EV_FA_HZ_L,					// 电源侧得电合闸	
 	EV_FA_HZ_P,					// 负荷侧得电合闸

dtu/dtu_main_t536/app/FA.c

@@ -3080,7 +3080,6 @@ static void fa_l_status_run(int sw, DWORD  dStep)
 				fa_l_state_change(sw,L_YL_TIME);
 			}	
 
-		#ifdef GD_TEST_2021
 			if(soe_check(EV_L_A_LST_ALA+sw*EV_SW_NUM))
 				soe_record_ev(EV_L_A_LST_ALA+sw*EV_SW_NUM, 0, 0,0,0 );
 
@@ -3092,7 +3091,6 @@ static void fa_l_status_run(int sw, DWORD  dStep)
 
 			if(soe_check(EV_L_B_LST_HZ+sw*EV_SW_NUM))
 				soe_record_ev(EV_L_B_LST_HZ+sw*EV_SW_NUM, 0, 0,0,0 );
-		#endif		
 		break;
 
 		case L_BS_STATE:
@@ -3359,7 +3357,6 @@ static void fa_l_status_run(int sw, DWORD  dStep)
 				else
 			#endif
 				{
-				#ifdef GD_TEST_2021
 					if(pSW->uSdhz_L.bFlag.bUABYY){
 						if(pSet->bTT_fa_lineoff == 1){
 							if(!soe_check(EV_L_B_LST_ALA+sw*EV_SW_NUM))
@@ -3379,10 +3376,8 @@ static void fa_l_status_run(int sw, DWORD  dStep)
 								soe_record_ev(EV_L_A_LST_HZ+sw*EV_SW_NUM, 1, 0,0,0 );
 						}
 					}
-				#else
 					pSW->uSdhz_L.bFlag.bRLONFLAG = TRUE;
 					soe_record_ev(EV_L_LST_T+sw*EV_SW_NUM, 1, 0,0,0 );  //联络单侧失压时间到	
-				#endif		
 					//pSW->L_Status = L_RELAYON;					//进入合闸状态			
 					ResetTR(&pSW->tOnYLTime);
 

dtu/dtu_main_t536/app/LcdComm.c

@@ -870,7 +870,6 @@ static void _hmi_call(void)
 	}
 }
 
-#ifdef GD_TEST_2021  // 处理复归按键
 void lcd_FG_key(BYTE cmd,BYTE key)
 {
 	static DWORD dTKeyRst=0;	
@@ -911,7 +910,6 @@ void lcd_FG_key(BYTE cmd,BYTE key)
 		}
 	}
 }
-#endif
 
 /**************************************************************************
 函数名称：Put_Key
@@ -1034,9 +1032,7 @@ static void _hmi_comm_recv(BYTE *ps)
 		break;
 	}
 
-#ifdef GD_TEST_2021  // 处理复归按键
 	lcd_FG_key((pd[4+offset]&0x1f),pd[5+offset]);
-#endif	
 }
 
 /**************************************************************************

dtu/dtu_main_t536/app/MmiDrv.c

@@ -1823,18 +1823,8 @@ void  mmi_Menu_Task(void)
 		break;
 		}
 	case HA_KEY_RST:
-	#ifdef GD_TEST_2021
 		ResetHzLed(0);
-		SignalReset(0,true);
-	#else
-		ResetHzLed(0);
-		SignalReset(0,true);
-		g_run_stu.button_on=true;
-		if(pRunSet->bTT_RstUnlock)  //¸´¹é°´Å¥½âËø±ÕËø
-		{
-			g_run_stu.rmtjs=true;
-		}	
-	#endif		
+		SignalReset(0,true);	
 		break;	
 	case HA_KEY_YUK:
 		//if(g_run_stu.mb_yuk!=INDEX_INVALLID)

dtu/dtu_main_t536/app/Sys.c

@@ -642,10 +642,8 @@ void SignalReset(int rstsw,bool blnk)
 			TOC_T *poc = &g_tRelay[sw].tOC[i];
 			if(poc->sta.bFlag.bGj||poc->sta.bFlag.bTz)
 			{
-			#ifdef GD_TEST_2021	
 				if(poc->sta.bFlag.bGj)
 					bGJRst = false;
-			#endif
 				bRst=false;
 				if(i==BH_GL1||i==BH_GL2||i==BH_GL3||i==BH_GLJS||i==FA_GL||i==FA_GL2||i==FA_DLBS||i==FA_GL_II)
 				{
@@ -877,10 +875,8 @@ void SignalReset(int rstsw,bool blnk)
 			}
 		}
 
-	#ifdef GD_TEST_2021
 		if(bGJRst)
 			led_set_sw(sw,SW_LED_FAULT_GJ, LED_OFF);
-	#endif	
 
 		pR->run_stu.fgbs=0;
 	}

dtu/dtu_main_t536/app/oc.c

@@ -886,7 +886,7 @@ void Pro_Accheck(int sw,u32  dStep,int oc,int soe_no)
 		//poc->sta.bFlag.bDzLed = true;		
 	}
 
-#ifdef GD_TEST_2021
+#ifdef YX_RESET_TIME
 	// 故障遥信延时复归
 	bY1=(!poc->sta.bFlag.bTz)&&poc->sta.bFlag.bTzEvent;
 	RunTR(&poc->tTzEvRstTime, bY1, dStep);	
@@ -896,7 +896,7 @@ void Pro_Accheck(int sw,u32  dStep,int oc,int soe_no)
 	// 出口记录及出口
 	if(oc==BH_GLJS||oc==FA_GL)
 	{
-	#ifdef GD_TEST_2021
+	#ifdef YX_RESET_TIME
 		if(poc->sta.bFlag.bTzEvent)
 	#else
 		if(poc->sta.bFlag.bTz) 
@@ -931,7 +931,7 @@ void Pro_Accheck(int sw,u32  dStep,int oc,int soe_no)
 	else  // 零序加速
 	{
 		// 出口记录及出口
-	#ifdef GD_TEST_2021
+	#ifdef YX_RESET_TIME
 		if(poc->sta.bFlag.bTzEvent) 
 	#else	
 		if(poc->sta.bFlag.bTz) 
@@ -1077,7 +1077,7 @@ void  Pro_over_i(int sw,u32  dStep,int oc,int soe_no)
 	int ui_begin;
 	DWORD Ia,Ib,Ic;
 
-#ifdef GD_TEST_2021
+#ifdef YX_RESET_TIME
 	bool by1;
 #endif
 
@@ -1091,7 +1091,7 @@ void  Pro_over_i(int sw,u32  dStep,int oc,int soe_no)
 	bTrip=poc->tQDTime.boolTrip;  // 告警	
 	poc->sta.bFlag.bGj = bTrip;  // 告警
 
-#ifdef GD_TEST_2021
+#ifdef YX_RESET_TIME
 	// 故障遥信延时复归
 	by1 = (!poc->sta.bFlag.bGj) && poc->sta.bFlag.bGjEvent;
 	RunTR(&poc->tGjEvRstTime, by1, dStep);
@@ -1129,7 +1129,7 @@ void  Pro_over_i0(int sw,u32  dStep,int oc,int soe_no)
 {
 	bool bQDD,bTrip; 	
 
-#ifdef GD_TEST_2021
+#ifdef YX_RESET_TIME
 	bool by1;
 #endif
 
@@ -1143,7 +1143,7 @@ void  Pro_over_i0(int sw,u32  dStep,int oc,int soe_no)
 	bTrip=poc->tQDTime.boolTrip;  // 告警	
 	poc->sta.bFlag.bGj=bTrip;  // 告警
 
-#ifdef GD_TEST_2021
+#ifdef YX_RESET_TIME
 	// 故障遥信延时复归
 	by1 = (!poc->sta.bFlag.bGj) && poc->sta.bFlag.bGjEvent;
 	RunTR(&poc->tGjEvRstTime, by1, dStep);
@@ -1174,6 +1174,7 @@ void  Pro_over_i0(int sw,u32  dStep,int oc,int soe_no)
 		}
 	} 
 }
+
 #ifdef EV_GL_STATR
 void gl_start_soe_set(u8 set_clr, int sw,u16 soe_no)
 {
@@ -1189,6 +1190,7 @@ void gl_start_soe_set(u8 set_clr, int sw,u16 soe_no)
 		soe_record_ev(soe_no, set_clr, Ia,Ib,Ic );       
 	}
 }
+
 void lx_start_soe_set(u8 set_clr, int sw,u16 soe_no)
 {
 	int ui_begin;
@@ -1202,6 +1204,7 @@ void lx_start_soe_set(u8 set_clr, int sw,u16 soe_no)
 	}
 }
 #endif
+
 /******************************************************************************
 函数名称：	gl_soe_set_clr
 函数版本：	01.01

dtu/dtu_main_t536/app/oc.h

@@ -47,9 +47,7 @@ typedef union UOCFLAG
 		DWORD    bQDWave:1; // 幅值启动时，启动录波标志
 		DWORD    bddyQD:1;      //低电压启动
 		DWORD    bGjEvent:1;
-	#ifdef YX_RESET_TIME
 		DWORD    bTzEvent:1;	//
-	#endif
 	}bFlag;
 }UOCFLAG;
 

dtu/dtu_main_t536/app/reclose.c

@@ -381,11 +381,7 @@ static void AR_Start(int sw,DWORD  dStep)
 	bCQD1 = pSW->tTCHQDHW0ms50ms.boolTrip;                              
 
 	// 偷跳条件准备  
-#ifdef GD_TEST_2021
 	bCQD2 = pSet->bTT_TTCH_TT && bCQD1 && (!pR->tSWST.uSWST.bFlag.bHZWZ);
-#else
-	bCQD2 = false;                                
-#endif
 
 	// 保护启动	                           
 	// 保护动作后至保护动作返回，保留50ms展宽

dtu/dtu_main_t536/app/set.c

@@ -228,16 +228,14 @@ const  SET_LIST XDLQDList[]=
 };
 #define XDLQDListNum	sizeof(XDLQDList)/sizeof(SET_LIST)
 
-#ifdef GD_TEST_2021
 //告警合闸投退列表
 const  SET_LIST GJHZList[]=
 {
 	{"退 出", 0,},	
-	{"告 警", 1,},	
-	{"合 闸", 2,},	
+	{"合 闸", 1,},	
+	// {"告 警", 2,},	
 };
 #define GJTZListNum	sizeof(GJHZList)/sizeof(SET_LIST)
-#endif
 
 //告警跳闸投退列表
 const  SET_LIST TZList[]=
@@ -612,15 +610,13 @@ const  SET_LIST GOOSE_NET_List[]=
 };
 #define GOOSE_NET_ListNum	sizeof(GOOSE_NET_List)/sizeof(SET_LIST)
 
-#ifdef GD_TEST_2021
-	const SET_LIST TFGKEY_Type[]=
-	{
-		{"复归",    0,},
-		{"解锁",    1,},
-		{"复位",    2,},	
-	};
-	#define TFGKEY_TYPE_TOTAL	sizeof(TFGKEY_Type)/sizeof(SET_LIST)
-#endif
+const SET_LIST TFGKEY_Type[]=
+{
+    {"复归",    0,},
+    {"解锁",    1,},
+    {"复位",    2,},	
+};
+#define TFGKEY_TYPE_TOTAL	sizeof(TFGKEY_Type)/sizeof(SET_LIST)
 
 const  SET_LIST UYY_List[]=
 {
@@ -935,11 +931,7 @@ const  TSETTABLE tSwSetTable[]=
 	{SETTYPE_LIST,	SET_NULL,	"零序过流Ⅱ段投入", 0 , 				TZListNum-1,		0,		TZList,		TZListNum,		GROUP_SET_BHTT,0X5011, BOOL_R},
 
 #ifdef DISP_SET_LX3 
-	#ifdef GD_TEST_2021
-		{SETTYPE_LIST,	SET_NULL,	"零序过流Ⅲ段投入", 0 , 				TZGJListNum-1,		0,		TZGJList, 	TZGJListNum,		GROUP_SET_BHTT,0X0000, UINT_R},
-	#else
-		{SETTYPE_LIST,	SET_NULL,	"零序过流Ⅲ段投入", 0 , 				TZListNum-1,		0,		TZList, 	TZListNum,		GROUP_SET_BHTT,0X0000, BOOL_R},
-	#endif	
+    {SETTYPE_LIST,	SET_NULL,	"零序过流Ⅲ段投入", 0 , 				TZListNum-1,		0,		TZList, 	TZListNum,		GROUP_SET_BHTT,0X0000, BOOL_R},
 #endif
 
 #if defined GD_AREA_ECZD_2020 //广东标准2020要求增加零序过电压保护和后加速保护
@@ -972,9 +964,7 @@ const  TSETTABLE tSwSetTable[]=
 	{SETTYPE_LIST,	SET_NULL,	"重合闸检无压", 			0 , 		TTListNum-1,		0,		TTList,		TTListNum,		GROUP_SET_BHTT,0X5016, BOOL_R},
 #endif
 
-#ifdef GD_TEST_2021
 	{SETTYPE_LIST,	SET_NULL,	"偷跳启动重合", 			0 , 		TTListNum-1,		0,		TTList,		TTListNum,		GROUP_SET_BHTT,0x0000, BOOL_R},
-#endif
 
 #ifdef	XDL_ZT //小电流接地
     {SETTYPE_LIST,	SET_NULL,	"小电流接地告警",	0 , 	TTListNum-1,	0,		TTList, TTListNum,		GROUP_SET_BHTT,0X0000, BOOL_R},
@@ -1027,16 +1017,8 @@ const  TSETTABLE tSwSetTable[]=
 
 //扩展
 #ifdef DISP_CHZOKCHR_2_SW
-    #ifdef GD_TEST_2021
-        {SETTYPE_F, 		SET_S,		"重合充电时间",	0.0 ,	300.0,			15.0 ,	0,		0,			GROUP_SET_BHDZ,0X0000, FLOAT_R},
-    #else
-        {SETTYPE_F, 		SET_S,		"重合充电时间",	1.0 ,	300.0,			15.0 ,	0,		0,			GROUP_SET_BHDZ,0X0000, FLOAT_R},
-    #endif	
-    #if defined GD_TEST_2021
-        {SETTYPE_F, 		SET_S,		"重合闸确认时间", 	0 ,	999.0,			180.0 ,	0,		0,			GROUP_SET_BHDZ,0X0000, FLOAT_R},
-    #else
-        {SETTYPE_F, 		SET_S,		"重合闸确认时间", 	0.3 ,	999.0,			180.0 ,	0,		0,			GROUP_SET_BHDZ,0X0000, FLOAT_R},
-    #endif
+    {SETTYPE_F, 		SET_S,		"重合充电时间",	1.0 ,	300.0,			15.0 ,	0,		0,			GROUP_SET_BHDZ,0X0000, FLOAT_R},
+    {SETTYPE_F, 		SET_S,		"重合闸确认时间", 	0.3 ,	999.0,			180.0 ,	0,		0,			GROUP_SET_BHDZ,0X0000, FLOAT_R},
 #endif
 
 #ifdef	XDL_ZT //小电流接地
@@ -1158,13 +1140,8 @@ const  TSETTABLE tSwSetTable[]=
 	#else	
 		{SETTYPE_LIST,	SET_NULL,	"A侧得电延时合闸", 		0 , 		TTListNum-1,		0,		TTList,		TTListNum,		GROUP_SET_FATT,0x500D, BOOL_R},
 		{SETTYPE_LIST,	SET_NULL,	"B侧得电延时合闸", 		0 , 		TTListNum-1,		0,		TTList,		TTListNum,		GROUP_SET_FATT,0x500E, BOOL_R},
-		#ifdef GD_TEST_2021
-			{SETTYPE_LIST,	SET_NULL,	"A侧失电延时选择", 		0 , 		GJTZListNum-1,		0,		GJHZList,		GJTZListNum,		GROUP_SET_FATT,0x500F, UINT_R},
-			{SETTYPE_LIST,	SET_NULL,	"B侧失电延时选择", 		0 , 		GJTZListNum-1,		0,		GJHZList,		GJTZListNum,		GROUP_SET_FATT,0x5010, UINT_R},
-		#else
-			{SETTYPE_LIST,	SET_NULL,	"A侧失电延时合闸", 		0 , 		TTListNum-1,		0,		TTList,		TTListNum,		GROUP_SET_FATT,0x500F, BOOL_R},
-			{SETTYPE_LIST,	SET_NULL,	"B侧失电延时合闸", 		0 , 		TTListNum-1,		0,		TTList,		TTListNum,		GROUP_SET_FATT,0x5010, BOOL_R},
-		#endif
+        {SETTYPE_LIST,	SET_NULL,	"A侧失电延时选择", 		0 , 		GJTZListNum-1,		0,		GJHZList,		GJTZListNum,		GROUP_SET_FATT,0x500F, UINT_R},
+        {SETTYPE_LIST,	SET_NULL,	"B侧失电延时选择", 		0 , 		GJTZListNum-1,		0,		GJHZList,		GJTZListNum,		GROUP_SET_FATT,0x5010, UINT_R},
 	#endif
 		{SETTYPE_LIST,	SET_NULL,	"合到故障闭锁合闸", 		0 , 		TTListNum-1,		1,		TTList,		TTListNum,		GROUP_SET_FATT,0, BOOL_R},
 		{SETTYPE_LIST,	SET_NULL,	"失电延时分闸", 			0 , 		TTListNum-1,		0,		TTList,		TTListNum,		GROUP_SET_FATT,0x5012, BOOL_R},
@@ -1415,15 +1392,9 @@ const  TSETTABLE tSwSetTable[]=
         {SETTYPE_LIST,  SET_NULL,   "保护出口投入软压板",       0 ,         TTListNum-1,        1,      TTList,     TTListNum,      GROUP_SET_YB,0X5023, BOOL_R},
         {SETTYPE_LIST,  SET_NULL,   "同期合闸软压板", 0 ,         TTListNum-1,       0,      TTList,     TTListNum,      GROUP_SET_YB,0X5025, BOOL_R},
 		#if defined BHFAGS_YB_YK && !defined BH_FA_INONE_SW
-			#ifdef GD_TEST_2021
-				{SETTYPE_LIST,  SET_NULL,   "常规继电保护投入软压板",   0 ,         TTListNum-1,        0,      TTList,     TTListNum,      GROUP_SET_YB,0X5025, BOOL_R},
-				{SETTYPE_LIST,  SET_NULL,   "馈线自动化投入软压板",     0 ,         TTListNum-1,        0,      TTList,     TTListNum,      GROUP_SET_YB,0X5025, BOOL_R},
-				{SETTYPE_LIST,  SET_NULL,   "智能分布式软压板",    	    0 ,         TTListNum-1,        0,      TTList,     TTListNum,      GROUP_SET_YB,0X5025, BOOL_R},
-			#else
-				{SETTYPE_LIST,  SET_NULL,   "常规继电保护投入软压板",   0 ,         TTListNum-1,        1,      TTList,     TTListNum,      GROUP_SET_YB,0X5025, BOOL_R},
-				{SETTYPE_LIST,  SET_NULL,   "馈线自动化投入软压板",     0 ,         TTListNum-1,        1,      TTList,     TTListNum,      GROUP_SET_YB,0X5025, BOOL_R},
-				{SETTYPE_LIST,  SET_NULL,   "智能分布式软压板",     0 ,         TTListNum-1,        1,      TTList,     TTListNum,      GROUP_SET_YB,0X5025, BOOL_R},
-			#endif	
+            {SETTYPE_LIST,  SET_NULL,   "常规继电保护投入软压板",   0 ,         TTListNum-1,        1,      TTList,     TTListNum,      GROUP_SET_YB,0X5025, BOOL_R},
+            {SETTYPE_LIST,  SET_NULL,   "馈线自动化投入软压板",     0 ,         TTListNum-1,        1,      TTList,     TTListNum,      GROUP_SET_YB,0X5025, BOOL_R},
+            {SETTYPE_LIST,  SET_NULL,   "智能分布式软压板",     0 ,         TTListNum-1,        1,      TTList,     TTListNum,      GROUP_SET_YB,0X5025, BOOL_R},
 		#endif
 		#ifdef JZS_FUNCTION
 		    {SETTYPE_LIST,  SET_NULL,   "集中式压板",       0 ,         TTListNum-1,        0,      TTList,     TTListNum,      GROUP_SET_YB,0X5025, BOOL_R},
@@ -1626,12 +1597,8 @@ const  TSETTABLE tCstSetTable[]=   	// min       max        default
 	{SETTYPE_F,		SET_HOUR,	"电池充满维持", 	0, 		100.0,			0.5,	0,		0,			GROUP_CSTSET_OTHERS,0x0000, FLOAT_R},
 	{SETTYPE_LIST,	SET_NULL,	"记录文件投退", 	0 , 	TTListNum-1,	0,		TTList,	TTListNum,	GROUP_CSTSET_OTHERS,0x0000, BOOL_R},
 	{SETTYPE_LIST,	SET_NULL,	"记录文件格式",		 0 , 	HisFileFormatListNum-1,	0,		HisFileFormatList,	HisFileFormatListNum,	GROUP_CSTSET_OTHERS,0x0000,UTINY_R},
-#ifdef GD_TEST_2021
 	{SETTYPE_LIST, SET_NULL,    "复归按键复用功能选择",0,  TFGKEY_TYPE_TOTAL-1, 1,   TFGKEY_Type,TFGKEY_TYPE_TOTAL,GROUP_CSTSET_OTHERS,0x0000, UINT_R},
 	{SETTYPE_UINT, SET_S,       "复归按键复用功能防抖时间", 0,        60,        3,    0,      0,          GROUP_CSTSET_OTHERS,0x0000, UINT_R},
-#else
-	{SETTYPE_LIST,	SET_NULL,	"复归按钮解锁", 	0 , 	TTListNum-1,	0,		TTList,	TTListNum,	GROUP_CSTSET_OTHERS,0x0000, BOOL_R},
-#endif	
 
 	{SETTYPE_LIST,	SET_NULL,	"远动参数有效", 	0 , 	TTListNum-1,	0,		TTList,	TTListNum,	GROUP_CSTSET_OTHERS,0x0000, BOOL_R},
 	{SETTYPE_LIST,	SET_NULL,	"现场运行模式",	0 , 	TTListNum-1,	0,		TTList,	TTListNum,	GROUP_CSTSET_OTHERS,0x0000, BOOL_R},
@@ -1794,12 +1761,8 @@ const  TSETTABLE tEquipParaTable[]=     			// min 	max 			default
 	{SETTYPE_LINT,	SET_MS,		"分闸脉冲",			0.0 , 	50000.0,			200.0 ,	0,				0,				GROUP_PARA_RMT,0x0000,	FLOAT_R},
 	{SETTYPE_LINT,	SET_MS,		"合闸脉冲",			0.0 , 	50000.0,			200.0 ,	0,				0,				GROUP_PARA_RMT,0x0000,	FLOAT_R},
 	{SETTYPE_F,		SET_U,		"电压零漂",			0.0 , 	20.0,				5 ,	    0,				0,				GROUP_PARA_RMT,0x0000,	FLOAT_R},
-#ifdef GD_TEST_2021
 	{SETTYPE_F,		SET_A,		"相电流零漂",		0.0 , 	1.0,				0.25 ,	0,				0,				GROUP_PARA_RMT,0x0000,	FLOAT_R},
 	{SETTYPE_F,		SET_A,		"零序电流零漂",		 0.0 , 	1.0,				0.04 ,	0,				0,				GROUP_PARA_RMT,0x0000,	FLOAT_R},
-#else
-	{SETTYPE_F,		SET_A,		"电流零漂",		   0.0 , 	1.0,				0.005 ,	0,				0,				GROUP_PARA_RMT,0x0000,	FLOAT_R},
-#endif
 #ifdef CPU_FUXI
 	{SETTYPE_F, 	SET_U,		"直流电压零漂",			0.0 ,	20.0,				1 , 	0,				0,				GROUP_PARA_RMT,0x0000,FLOAT_R},
 #endif
@@ -2413,11 +2376,8 @@ bool MakeRunSet(bool bFirst)
 #endif	
 #ifdef	CUSTOMIZE_BZT //备自投	
 	int dw = 0;
-#endif	
-
-#ifdef GD_TEST_2021
-	BYTE mode_total;
 #endif
+	BYTE mode_total;
 
 	bRet=true;
 	// 检查定值个数
@@ -2620,12 +2580,8 @@ bool MakeRunSet(bool bFirst)
 
 	}
 	
-#ifdef GD_TEST_2021
 	ptSet->resReuseFuncSelect = (BYTE)psetbuf[CSSET_RST_REUSE_FUNC].ff;
 	ptSet->resReuseFuncFilterTime = (WORD)psetbuf[CSSET_RST_REUSE_FILTER_TIME].ff;
-#else
-	ptSet->bTT_RstUnlock= (((WORD)psetbuf[CSSET_RST_UNLOCK_TT].ff==1 )?true:false); // 复归按钮可解锁闭锁信号
-#endif	
 	ptSet->bTT_LogPrintf = (((WORD)psetbuf[CSSET_LOG_PRINTF_TT].ff==1 )?true:false); 
 	ptSet->bTT_101Transsure= (((WORD)psetbuf[CSSET_101_TRANSSURE_TT].ff==1 )?true:false); 
 	ptSet->dSmoothZero=(DWORD)(psetbuf[CSSET_ZERO].ff);							// 零漂值 
@@ -2854,7 +2810,7 @@ bool MakeRunSet(bool bFirst)
 		{
 			fKU1 = fKU[PUB_AC_UCA2];
 		}
-	#ifdef GD_TEST_2021  // 计算PT1、PT2定值
+	#if (0)  // 计算PT1、PT2定值
 		else if(i == VOL_YY_POW1 || i == VOL_WY_POW1 ){
 			fKU1 = fKU[PUB_AC_US1];
 		}else if(i == VOL_YY_POW2 || i == VOL_WY_POW2){
@@ -3063,13 +3019,8 @@ bool MakeRunSet(bool bFirst)
 			poc->dI_fh= _Mul_Div_U(poc->dI,	96, 100);		//0.96=0.98*0.98;        		
 #ifdef DISP_SET_LX3	
 			poc= &ptSet->tSwSet[sw].toc[BH_LX3];
-		#ifdef GD_TEST_2021
-			poc->bTz = (((WORD)psetbuf[SET_LX3_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false)||(((WORD)psetbuf[SET_LX3_TT+sw*SW_SET_NUMBER ].ff==3 )?true:false); 
-			poc->bGj = (((WORD)psetbuf[SET_LX3_TT+sw*SW_SET_NUMBER ].ff==2 )?true:false)||(((WORD)psetbuf[SET_LX3_TT+sw*SW_SET_NUMBER ].ff==3 )?true:false);  
-		#else	
 			poc->bTz=(((WORD)psetbuf[SET_LX3_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false); 
-			poc->bGj=(((WORD)psetbuf[SET_LX3_TT+sw*SW_SET_NUMBER ].ff==0 )?true:false);  
-		#endif
+			poc->bGj=(((WORD)psetbuf[SET_LX3_TT+sw*SW_SET_NUMBER ].ff==0 )?true:false); 
 			poc->bDir=false;
 			poc->dT=GetSetTIME(psetbuf[SET_LX3_T+sw*SW_SET_NUMBER ].ff);
 			poc->dI=GetSetSQR(psetbuf[SET_LX3_I+sw*SW_SET_NUMBER ].ff,fKI0);		     			
@@ -3205,10 +3156,7 @@ bool MakeRunSet(bool bFirst)
 			ptSet->tSwSet[sw].bTT_chz_wy=(((WORD)psetbuf[SET_CH_WY+sw*SW_SET_NUMBER].ff==1 )?true:false);//无压重合闸
 		#endif	
 
-		#ifdef GD_TEST_2021
 			ptSet->tSwSet[sw].bTT_TTCH_TT = (((WORD)psetbuf[SET_TTCH_TT+sw*SW_SET_NUMBER].ff==1)?true:false); // 偷跳启动重合
-		#endif	
-
 			ptSet->tSwSet[sw].dT_chz[0]	= GetSetTIME(psetbuf[SET_CH_T1+sw*SW_SET_NUMBER ].ff);
 			ptSet->tSwSet[sw].dT_chz[1]	= GetSetTIME(psetbuf[SET_CH_T2+sw*SW_SET_NUMBER ].ff);
 			ptSet->tSwSet[sw].dT_chz[2] =0;
@@ -3369,13 +3317,8 @@ bool MakeRunSet(bool bFirst)
         {
             ptSet->tSwSet[sw].bTT_fa_poweron    = ((DWORD)psetbuf[SET_P_YY_TT+sw*SW_SET_NUMBER ].ff==1)?true:false;
             ptSet->tSwSet[sw].bTT_fa_lineon     = ((DWORD)psetbuf[SET_L_YY_TT+sw*SW_SET_NUMBER ].ff==1)?true:false;
-		#ifdef GD_TEST_2021
 			ptSet->tSwSet[sw].bTT_fa_poweroff   = (BYTE)psetbuf[SET_P_WY_TT+sw*SW_SET_NUMBER ].ff;
             ptSet->tSwSet[sw].bTT_fa_lineoff    = (BYTE)psetbuf[SET_L_WY_TT+sw*SW_SET_NUMBER ].ff;
-		#else	
-            ptSet->tSwSet[sw].bTT_fa_poweroff   = ((DWORD)psetbuf[SET_P_WY_TT+sw*SW_SET_NUMBER ].ff==1)?true:false;
-            ptSet->tSwSet[sw].bTT_fa_lineoff    = ((DWORD)psetbuf[SET_L_WY_TT+sw*SW_SET_NUMBER ].ff==1)?true:false;
-		#endif
             ptSet->tSwSet[sw].bTT_fa_Lostfz= ((DWORD)psetbuf[SET_LOSTFZ_TT+sw*SW_SET_NUMBER ].ff==1)?true:false;
             ptSet->tSwSet[sw].bTT_fa_Icheck = ((DWORD)psetbuf[SET_GZCHECK_TT+sw*SW_SET_NUMBER ].ff==1)?true:false;
 #ifdef GD_AREA_ZHONGSHAN_2020
@@ -3648,23 +3591,16 @@ bool MakeRunSet(bool bFirst)
             ptSet->bTT_TQ_YB =((WORD)psetbuf[SET_TQ_YB+sw*SW_SET_NUMBER ].ff==1 )?true:false;	 //同期合闸软压板
 
 			#if (defined BHFAGS_YB_YK || defined GD_AREA_ZHONGSHAN) && !defined BH_FA_INONE_SW
-				#ifdef GD_TEST_2021
-					mode_total = (BYTE)(psetbuf[SET_BH_YBTT+sw*SW_SET_NUMBER ].ff + psetbuf[SET_FA_YBTT+sw*SW_SET_NUMBER ].ff + psetbuf[SET_GOOSE_YBTT+sw*SW_SET_NUMBER ].ff);
-					if(mode_total > 1){ 	 // 当前只允许一种功能模式投入运行
-						ptSet->bTT_SOFT_BH_YB = false;
-						ptSet->bTT_SOFT_FA_YB = false;
-						ptSet->bTT_SOFT_GOOSE_YB = false;
-					}else{
-						ptSet->bTT_SOFT_BH_YB = ((WORD)psetbuf[SET_BH_YBTT+sw*SW_SET_NUMBER ].ff==1 )?true:false;
-						ptSet->bTT_SOFT_FA_YB = ((WORD)psetbuf[SET_FA_YBTT+sw*SW_SET_NUMBER ].ff==1 )?true:false;				
-						ptSet->bTT_SOFT_GOOSE_YB = ((WORD)psetbuf[SET_GOOSE_YBTT+sw*SW_SET_NUMBER ].ff==1 )?true:false; 
+                mode_total = (BYTE)(psetbuf[SET_BH_YBTT+sw*SW_SET_NUMBER ].ff + psetbuf[SET_FA_YBTT+sw*SW_SET_NUMBER ].ff + psetbuf[SET_GOOSE_YBTT+sw*SW_SET_NUMBER ].ff);
+                if(mode_total > 1){ 	 // 当前只允许一种功能模式投入运行
+                    ptSet->bTT_SOFT_BH_YB = false;
+                    ptSet->bTT_SOFT_FA_YB = false;
+                    ptSet->bTT_SOFT_GOOSE_YB = false;
+                }else{
+                    ptSet->bTT_SOFT_BH_YB = ((WORD)psetbuf[SET_BH_YBTT+sw*SW_SET_NUMBER ].ff==1 )?true:false;
+                    ptSet->bTT_SOFT_FA_YB = ((WORD)psetbuf[SET_FA_YBTT+sw*SW_SET_NUMBER ].ff==1 )?true:false;				
+                    ptSet->bTT_SOFT_GOOSE_YB = ((WORD)psetbuf[SET_GOOSE_YBTT+sw*SW_SET_NUMBER ].ff==1 )?true:false; 
 					}
-				#else
-					//EV_GOOSE_YBTT/EV_FA_YBTT/EV_BH_YBTT:关联硬压板等,实时refresh SOE
-					ptSet->bTT_SOFT_BH_YB = ((WORD)psetbuf[SET_BH_YBTT+sw*SW_SET_NUMBER ].ff==1 )?true:false;
-					ptSet->bTT_SOFT_FA_YB = ((WORD)psetbuf[SET_FA_YBTT+sw*SW_SET_NUMBER ].ff==1 )?true:false;				
-					ptSet->bTT_SOFT_GOOSE_YB = ((WORD)psetbuf[SET_GOOSE_YBTT+sw*SW_SET_NUMBER ].ff==1 )?true:false; 
-				#endif
 			#endif
 
             ptSet->bTT_SOFT_JZS_YB = ((WORD)psetbuf[SET_MODE_JZS_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false; 
@@ -4178,10 +4114,6 @@ void MakeRunPara(bool bFirstInit, bool bUboot)
 	bool b_ll_file;
 #endif
 
-	#ifdef GD_TEST_2021  // 将电流零漂分开成相电流零漂和零序电流零漂
-		s32 phase_i_zero,zero_i_zero;
-	#endif
-
 	if(!ReadPara((void*)psetbuf,EEP_EQUIP_PARA_ADDR,EQUIP_PARA_NUMBER,&tEquipParaTable[0]))
 	{
 		rt_err_set(ERR_CODE_EQU_PARA,0);
@@ -4627,37 +4559,27 @@ void MakeRunPara(bool bFirstInit, bool bUboot)
 	/************零漂处理*******************/
 	{
 		s32 uzero;
-	#ifndef GD_TEST_2021
-		s32 izero;
-	#endif
+		s32 phase_i_zero, zero_i_zero;
 	
 		uzero = (s32)(psetbuf[PARA_U_ZERO].ff*65536);	// 电压零漂
-	#ifdef GD_TEST_2021  // 将电流零漂分开成相电流零漂和零序电流零漂
+	    // 将电流零漂分开成相电流零漂和零序电流零漂
 		phase_i_zero = (s32)(psetbuf[PARA_PHASE_I_ZERO].ff*65536);
 		zero_i_zero = (s32)(psetbuf[PARA_ZERO_I_ZERO].ff*65536);
-	#else
-		izero= (s32)(psetbuf[PARA_I_ZERO].ff*65536);	// 电流零漂
-	#endif	
 		for(i=0;i<UNIT_NUM;i++)
 		{
 			if(i==UNIT_V100||i==UNIT_V220)
 			{
 				g_unit[i].zero=uzero;
 			}
-
-		#ifdef GD_TEST_2021
-			if(i==UNIT_A1 || i==UNIT_A5 || i==UNIT_BIA){
-				g_unit[i].zero = phase_i_zero;
-			}else if(i == UNIT_I0A){
-				g_unit[i].zero = zero_i_zero;	
-			}
-		#else
-			if(i==UNIT_A1||i==UNIT_A5||i==UNIT_BIA)
-			{
-				g_unit[i].zero=izero;
-			}	
-		#endif		
-		}
+            if (i == UNIT_A1 || i == UNIT_A5 || i == UNIT_BIA)
+            {
+                g_unit[i].zero = phase_i_zero;
+            }
+            else if (i == UNIT_I0A)
+            {
+                g_unit[i].zero = zero_i_zero;
+            }
+        }
 	}
 #ifdef CPU_FUXI
 	pRunPara->wDC_ZERO = psetbuf[PARA_DC_ZERO].ff;
@@ -5147,9 +5069,7 @@ struct _list_item
 struct _list_item g_list_all[] = 
 {
 	{TTList,sizeof(TTList)/sizeof(SET_LIST),},
-#ifdef GD_TEST_2021
 	{GJHZList,sizeof(GJHZList)/sizeof(SET_LIST),},
-#endif
 	{TZList,sizeof(TZList)/sizeof(SET_LIST),},
 	{FSXList,sizeof(FSXList)/sizeof(SET_LIST),},
 	{CHZList,sizeof(CHZList)/sizeof(SET_LIST),},
@@ -5192,9 +5112,7 @@ struct _list_item g_list_all[] =
     {BZTFSList,sizeof(BZTFSList)/sizeof(SET_LIST),},
     {TISelList,sizeof(TISelList)/sizeof(SET_LIST),},
 #endif
-#ifdef GD_TEST_2021
 	{TFGKEY_Type,sizeof(TFGKEY_Type)/sizeof(SET_LIST),},
-#endif
 	{UYY_List,sizeof(UYY_List)/sizeof(SET_LIST),},
 #ifdef  METERING_ENERGY
 	{DDList,sizeof(DDList)/sizeof(SET_LIST),},

dtu/dtu_main_t536/app/set.h

@@ -362,9 +362,7 @@ enum
 #else
 	SET_CH_WY,				// 重合检无压
 #endif
-#ifdef GD_TEST_2021
 	SET_TTCH_TT,              // 偷跳启动重合闸
-#endif
 #ifdef	XDL_ZT //小电流接地
     SET_XDLGJ_TT,			// 小电流接地告警
     SET_XDLTZ_TT,			// 小电流接地跳闸
@@ -1102,12 +1100,8 @@ enum
 	PARA_FZPULSE,			//"分闸脉冲",	
 	PARA_HZPULSE,			//"合闸脉冲",	
 	PARA_U_ZERO,			//"电压零漂
-#ifdef GD_TEST_2021         
 	PARA_PHASE_I_ZERO,      //"相电流零漂"
 	PARA_ZERO_I_ZERO,       //"零序电流零漂"
-#else
-	PARA_I_ZERO,			//"电流零漂
-#endif
 #ifdef CPU_FUXI
 	PARA_DC_ZERO,			//"直流电压零漂
 #endif
@@ -1266,12 +1260,8 @@ enum
 	CSTSET_CHARGEOK_TIME,	// 电池充满维持时间
 	CSSET_HS_FILE_TT,		//历史记录文件投退
 	CSSET_HS_FILE_FORMAT,	//历史记录文件格式
-#ifdef GD_TEST_2021
 	CSSET_RST_REUSE_FUNC,   // 复归按键复用功能选择
 	CSSET_RST_REUSE_FILTER_TIME, // 复归按键复用功能防抖时长
-#else
-	CSSET_RST_UNLOCK_TT,	
-#endif		
 	CSSET_RMT_PARA_TT,		// 远动修改参数投退
 	CSSET_LOG_PRINTF_TT,	// 调试信息文件记录投退
 	CSSET_101_TRANSSURE_TT,	//  101文件处理，是否需要确认
@@ -1431,10 +1421,7 @@ typedef struct TSETSW
 
 	bool    bTT_chz_tq;				//重合检同期
 	bool    bTT_CHZ;
-#ifdef GD_TEST_2021
 	bool     bTT_TTCH_TT;           // 偷跳启动重合
-#endif
-
 	bool	bTT_3U0;			//零序过电压投退
 	bool 	bTT_3U0Tz;
 	bool 	bTT_3U0Gj;
@@ -1499,17 +1486,10 @@ typedef struct TSETSW
 
 	bool 	bTT_FA;					// 
 	bool        bTT_fa_LL;					//分段联络模式
-	
 	bool        bTT_fa_poweron;		//电源侧上电合闸
 	bool        bTT_fa_lineon;		//负荷侧上电合闸
-
-#ifdef GD_TEST_2021
 	BYTE        bTT_fa_poweroff;	//电源侧失压联络选择
 	BYTE        bTT_fa_lineoff;		//负荷侧失压联络选择
-#else
-	bool        bTT_fa_poweroff;	//电源侧失压联络合闸
-	bool        bTT_fa_lineoff;		//负荷侧失压联络合闸
-#endif
 
 	bool        bTT_fa_gzbshz;			//合到故障闭锁合闸
 
@@ -1777,10 +1757,8 @@ typedef struct TSET
 	bool	bTT_XmlFile;				//历史文件:xml格式
 	WORD	wHSFileFormat;				//历史文件格式
 	bool    bTT_RstUnlock;		  	//复归按钮可解锁
-#ifdef GD_TEST_2021
 	BYTE    resReuseFuncSelect;        // 复归按键复用功能选择
 	DWORD   resReuseFuncFilterTime;    // 复归按键复用功能防抖时间
-#endif
 	bool        bTT_LogPrintf;
 	bool        bTT_101Transsure;       // 101文件传输是否需要确认
 	bool        bTT_SY_Board;

dtu/dtu_main_t536/app/switch.c

@@ -216,11 +216,7 @@ const struct mea_desc g_sw_ac_desc[SW_AC_NUM_ALL] =
 	{"BIA",UNIT_A5,UNIT_ANG},
 	{"BIB",UNIT_A5,UNIT_ANG},
 	{"BIC",UNIT_A5,UNIT_ANG},
-	#ifdef GD_TEST_2021
-		{"I0",UNIT_I0A,UNIT_ANG},
-	#else
-		{"I0",UNIT_A5,UNIT_ANG},
-	#endif
+    {"I0",UNIT_I0A,UNIT_ANG},
 #ifdef SW_AC_I0S_SAMPLE	
 	{"I0s",UNIT_A5,UNIT_ANG},
 #endif