整理宏GD_AREA_MAIN_2020；

dtu/dtu_main_t536/app/Appconfig.c

@@ -228,9 +228,6 @@ const SOE_DEF tAllSOE[]=
 #if defined GD_AREA_ECZD_2020   //潮州局要求合后电流两段处理		
 	{0xD4|SOE_TYPE_DELAY_FHZ,		{EV_PARA_Ia,EV_PARA_Ib,	EV_PARA_Ic},		"合后故障过流I段动作"},	
 	{0xD4|SOE_TYPE_DELAY_FHZ,		{EV_PARA_Ia,EV_PARA_Ib,	EV_PARA_Ic},		"合后故障过流II段动作"},
-#elif defined GD_AREA_MAIN_2020
-    {0xD4|SOE_TYPE_DELAY_FHZ,		{EV_PARA_Ia,EV_PARA_Ib, EV_PARA_Ic},		"合后故障过流动作"},	
-    {0xD4|SOE_TYPE_DELAY_FHZ,		{EV_PARA_Ia,EV_PARA_Ib, EV_PARA_Ic},		"合后故障过流II段动作"},
 #else
 	{0xD4|SOE_TYPE_DELAY_FHZ,		{EV_PARA_Ia,EV_PARA_Ib,	EV_PARA_Ic},		"合后故障过流动作"},	
 #endif
@@ -343,21 +340,12 @@ const SOE_DEF tAllSOE[]=
 	{0x44,		{0, 		0,				0}, 			"电压电流型转供电失败"},	
 #endif
 
-    #ifdef GD_AREA_MAIN_2020
-	{0x44,		{0,			0,				0},				"FA手动合闸"},
-	{0x44,		{0,			0,				0},				"FA手动分闸"},
-	{0x44,		{0,			0,				0},				"FA开关就地合闸"},
-	{0x44,		{0,			0,				0},				"FA开关就地分闸"},
-	{0x44,		{0,			0,				0},				"FA遥控合闸"},
-	{0x44|SOE_TYPE_DELAY_FHZ,		{0,			0,				0},				"FA遥控分闸"},
-	#else
 	{0x44,		{0,			0,				0},				"手动合闸"},
 	{0x44,		{0,			0,				0},				"手动分闸"},
 	{0x44,		{0,			0,				0},				"开关就地合闸"},
 	{0x44,		{0,			0,				0},				"开关就地分闸"},
 	{0x44,		{0,			0,				0},				"遥控合闸"},
 	{0x44|SOE_TYPE_DELAY_FHZ,		{0,			0,				0},				"遥控分闸"},
-	#endif
 
 	{0x44,		{0,			0,				0},				"多次分闸闭锁合闸"},
 	{0x44,		{0, 		0,				0}, 					"上电拒合"},
@@ -391,7 +379,7 @@ const SOE_DEF tAllSOE[]=
 	{0xC4,		{0,	0,0},								"分布式供电恢复成功"},
 	{0xC4,		{0,	0,0},								"分布式供电恢复失败"},
 
-#if defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_MAIN_2020
+#if defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020
 	{0xD4,		{EV_PARA_Ia,EV_PARA_Ib,	EV_PARA_Ic},		"分布式过流I段跳闸"},
 	{0xD4,		{EV_PARA_Ia,EV_PARA_Ib,	EV_PARA_Ic},		"分布式过流II段跳闸"},
 #else
@@ -459,13 +447,9 @@ const SOE_DEF tAllSOE[]=
 
 	{0x04,		{0,				0,			0},			"跳位有流告警"},
 
-#ifdef GD_AREA_MAIN_2020
-    {0x07,		{0,	0,	0},								"停用保护及FA软压板"},
-#else
 	{0x07,		{0,	0,	0},								"保护投入软压板"},
-#endif
 
-#if defined GD_AREA_MAIN_2020 || defined GD_AREA_ECZD_2020
+#if defined GD_AREA_ECZD_2020
 	{0x07,		{0, 0,	0}, 							"重合闸投入软压板"},
 #else
 	{0x07,		{0, 0,	0}, 							"停用重合闸软压板"},
@@ -479,16 +463,9 @@ const SOE_DEF tAllSOE[]=
 	{0x07,		{0,	0,	0},								"远方投入软压板"},
 #endif	
 
-
-#ifdef GD_AREA_MAIN_2020
-    {0x07,		{0, 0,	0}, 							"智能分布式软压板"},
-    {0x07,		{0, 0,	0}, 							"馈线自动化软压板"},
-    {0x07,		{0, 0,	0}, 							"常规保护软压板"},
-#else
 	{0x07,		{0,	0,	0},								"智能分布式软压板"},
 	{0x07,		{0,	0,	0},								"电压电流型软压板"},
 	{0x07,		{0,	0,	0},								"电流型软压板"},
-#endif
 	{0x07,		{0, 0,	0}, 							"集中式软压板"},
     {0x07,		{0, 0,	0}, 							"同期合闸软压板"},
 	{0x07,		{0, 0,	0}, 							"自动解列软压板"},
@@ -573,11 +550,7 @@ const SOE_DEF tAllSOE[]=
 	{0x44,		{0, 			0,			0}, 					"分布式供电恢复未满足"},
 	{0x44,		{0, 			0,			0}, 					"分布式故障闭锁合闸"},
 	{0x44,		{0, 			0,			0}, 					"分布式分闸闭锁合闸"},
-	#ifdef GD_AREA_MAIN_2020
-	{0xC4,		{EV_PARA_U0,	EV_PARA_I0,	0},				"FA合后零序电压告警"},
-	#else
 	{0xC4,		{EV_PARA_U0,	EV_PARA_I0,	0},				"合后零序电压告警"},
-	#endif
 #ifdef FUNC_DRIVE
 	{0x04,		{0, 		0,			0}, 				"不停电传动软压板"},
 	{0x04,		{0, 		0,			0}, 				"传动开始"},

dtu/dtu_main_t536/app/Appconfig.h

@@ -218,7 +218,7 @@ enum
 	EV_U0JS,
 	EV_FSXGL,
 	EV_FA_GL_TZ,	
-#if defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020
+#if defined GD_AREA_ECZD_2020
 	EV_FA_GL_TZ2,
 #endif	
 	EV_FA_LX_TZ,
@@ -339,7 +339,7 @@ enum
 	EV_GOOSE_HZ_OK,		// 供电恢复成功
 	EV_GOOSE_HZ_FAIL,		// 供电恢复失败
 	EV_GOOSE_GL_TZ,			// 过流跳闸
-#if defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_MAIN_2020
+#if defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020
 	EV_GOOSE_GL2_TZ, 		// 过流2段跳闸
 #endif
 	EV_GOOSE_LX_TZ,			// 过流跳闸

dtu/dtu_main_t536/app/FA.c

@@ -797,7 +797,7 @@ void fa_s_Dataset(int sw, DWORD  dStep)
 	int ui_begin;
 	bool xbQD1=false;
 	DWORD U01,U02;
-	#if defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020 
+	#if defined GD_AREA_ECZD_2020 
 	bool xbQD2=false;
 	#endif
 	bool xbAll=false;
@@ -827,7 +827,7 @@ void fa_s_Dataset(int sw, DWORD  dStep)
 	xbQD1 = fa_XBCalc(sw,pSet->toc[FA_GL].dI);
 	RunTR(&g_tRelay[sw].tOC[FA_GL].tXBTime, xbQD1, dStep);//谐波含量
 	//xbQD1 = g_tRelay[sw].tOC[FA_GL].tXBTime.boolTrip;	
-#if defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020 
+#if defined GD_AREA_ECZD_2020 
 	xbQD2 = fa_XBCalc(sw,pSet->toc[FA_GL_II].dI);	
 	RunTR(&g_tRelay[sw].tOC[FA_GL_II].tXBTime, xbQD2, dStep);//谐波含量
 	//xbQD2 = g_tRelay[sw].tOC[FA_GL_II].tXBTime.boolTrip;
@@ -854,7 +854,7 @@ void fa_s_Dataset(int sw, DWORD  dStep)
 	RunTR(&pSW->tGZJYRstGLTime, bgl&&!xbQD1 ,dStep);  //跳闸位置、超过故障记忆过流复归时间，清跳闸次数
 	pSW->uSdhz_S.bFlag.bGL=pSW->uSdhz_L.bFlag.bGL = pSW->tGZJYRstGLTime.boolTrip && !xbQD1;//时间&&谐波含量
 
-#if defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020 
+#if defined GD_AREA_ECZD_2020 
 	//相间II段故障
 	bgl = OverRelay(g_sw[sw].m2_max, pSet->toc[FA_GL_II].dI, pSet->toc[FA_GL_II].dI_fh, pSW->uSdhz_S.bFlag.bGL_II) && (pSet->bTT_fa_Icheck||pSet->toc[FA_GL_II].bTz);//
 	RunTR(&pSW->tGZJYRstGL_II_Time, bgl&&!xbQD2,dStep);  //跳闸位置、超过故障记忆过流复归时间，清跳闸次数
@@ -1240,7 +1240,7 @@ void fa_rstbs_soe(int sw)
 	}
 	if(soe_check(EV_FA_GL_TZ+sw*EV_SW_NUM)==true)
 		soe_record_ev(EV_FA_GL_TZ+sw*EV_SW_NUM, 0, 0,0 ,0 );	
-#if defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020 
+#if defined GD_AREA_ECZD_2020 
 	if(soe_check(EV_FA_GL_TZ2+sw*EV_SW_NUM)==true)
 		soe_record_ev(EV_FA_GL_TZ2+sw*EV_SW_NUM, 0, 0,0 ,0 );	
 #endif
@@ -1450,7 +1450,7 @@ static void fa_sw_opt(int sw,u16 soeCode)
 				poc->sta.bFlag.bGjEvent = true;
 				poc->tQDTime.boolTrip = true; 
 				poc->tQD25ms.boolTrip =true;	
-            #if defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020 
+            #if defined GD_AREA_ECZD_2020 
 				if(soe_check(EV_FA_GL_TZ2+sw*EV_SW_NUM)==false)	 //
 					soe_record_ev(EV_FA_GL_TZ2+sw*EV_SW_NUM, 1, Ia,Ib,Ic );     
 			#endif
@@ -3017,7 +3017,7 @@ static void fa_l_status_run(int sw, DWORD  dStep)
 			}
 			if(soe_check(EV_FA_GL_TZ+sw*EV_SW_NUM)==true)
 				soe_record_ev(EV_FA_GL_TZ+sw*EV_SW_NUM, 0, 0,0 ,0 );	
-        #if defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020 
+        #if defined GD_AREA_ECZD_2020 
 			if(soe_check(EV_FA_GL_TZ2+sw*EV_SW_NUM)==true)
 				soe_record_ev(EV_FA_GL_TZ2+sw*EV_SW_NUM, 0, 0,0 ,0 );	
 		#endif
@@ -3111,7 +3111,7 @@ static void fa_l_status_run(int sw, DWORD  dStep)
 		#endif
 			)
 			ResetTR(&pSW->tOnYLTime);
-	#if defined GD_AREA_MAIN_2020 || defined GD_AREA_ECZD_2020
+	#if defined GD_AREA_ECZD_2020
 		if(soe_check(EV_BS_DB+sw*EV_SW_NUM)==false)
 		{
 			soe_record_ev(EV_BS_DB+sw*EV_SW_NUM, 1, 0,0,0 );
@@ -3125,7 +3125,7 @@ static void fa_l_status_run(int sw, DWORD  dStep)
 			{
 				ResetTR(&pSW->tOnZLTime);
 				fa_l_state_change(sw,L_Y_ZTIME);
-			#if defined GD_AREA_MAIN_2020  || defined GD_AREA_ECZD_2020
+			#if defined GD_AREA_ECZD_2020
 				if(soe_check(EV_BS_DB+sw*EV_SW_NUM))
 				{
 					soe_record_ev(EV_BS_DB+sw*EV_SW_NUM, 0, 0,0,0 );
@@ -3269,7 +3269,7 @@ static void fa_l_status_run(int sw, DWORD  dStep)
 					fa_l_state_change(sw,L_XLTIME);
 				}
 
-			#if defined GD_AREA_MAIN_2020 || defined GD_AREA_ECZD_2020
+			#if defined GD_AREA_ECZD_2020
 				if(soe_check(EV_BS_DB+sw*EV_SW_NUM))
 				{
 					soe_record_ev(EV_BS_DB+sw*EV_SW_NUM, 0, 0,0,0 );
@@ -3280,7 +3280,7 @@ static void fa_l_status_run(int sw, DWORD  dStep)
 			{
 				//pSW->L_Status = L_INIT;					//两侧失压进入初始状态
 				fa_l_state_change(sw,L_INIT);		
-			#if defined GD_AREA_MAIN_2020 || defined GD_AREA_ECZD_2020
+			#if defined GD_AREA_ECZD_2020
 				if(soe_check(EV_BS_DB+sw*EV_SW_NUM))
 				{
 					soe_record_ev(EV_BS_DB+sw*EV_SW_NUM, 0, 0,0,0 );
@@ -3291,7 +3291,7 @@ static void fa_l_status_run(int sw, DWORD  dStep)
 		break;
 
 		case L_XLTIME:
-			#if defined GD_AREA_MAIN_2020 || defined GD_AREA_ECZD_2020
+			#if defined GD_AREA_ECZD_2020
 				if(soe_check(EV_BS_DB+sw*EV_SW_NUM))
 				{
 					soe_record_ev(EV_BS_DB+sw*EV_SW_NUM, 0, 0,0,0 );
@@ -4107,7 +4107,7 @@ static void fa_s_run(int sw, DWORD  dStep)
 				fa_s_state_change(sw,S_YTIME);//pSW->S_Status = S_YTIME;//手合启动Y时限
 				if(soe_check(EV_FA_GL_TZ+sw*EV_SW_NUM)==true)
 					soe_record_ev(EV_FA_GL_TZ+sw*EV_SW_NUM, 0, 0,0 ,0 );	
-           #if defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020 
+           #if defined GD_AREA_ECZD_2020 
 				if(soe_check(EV_FA_GL_TZ2+sw*EV_SW_NUM)==true)
 					soe_record_ev(EV_FA_GL_TZ2+sw*EV_SW_NUM, 0, 0,0 ,0 );	
 			#endif

dtu/dtu_main_t536/app/FA_g.c

@@ -591,7 +591,7 @@ void fa_g_packet(bool bfirst)
 	pug->bFlag.bzx=poc->psta.bFlag.bZX;    						// 本线路正向故障 
 	pug->bFlag.bfx=poc->psta.bFlag.bFX;   						// 本线路反向故障 
 	pug->bFlag.blx=poc->psta.bFlag.bLX;						//本线路无方向故障
-#if defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_MAIN_2020	
+#if defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020	
 	pug->bFlag.bgl=poc->psta.bFlag.bWX||poc->psta2.bFlag.bWX;						// 本线路跳闸失败
 #else
 	pug->bFlag.bgl=poc->psta.bFlag.bWX;						// 本线路跳闸失败
@@ -898,7 +898,7 @@ bool fag_goosecheck_gzqc(int sw)  //
 		}
 		return false;
 	}
-#if defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_MAIN_2020
+#if defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020
  	if(poc->psta.bFlag.bWX||poc->psta2.bFlag.bWX||poc->psta.bFlag.bLX)  //本线路有无方向故障 ，或零序故障
  #else
 	if(poc->psta.bFlag.bWX||poc->psta.bFlag.bLX)  //本线路有无方向故障 ，或零序故障

dtu/dtu_main_t536/app/FA_g.h

@@ -246,7 +246,7 @@ typedef union UGOCFLAG
 		DWORD  bglTzH:1;	  //跳闸保持信号
 		DWORD  bglQDWave:1;
 
-#if defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_MAIN_2020
+#if defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020
 		DWORD  bgl2QD:1;
 		DWORD  bgl2Tz:1;		
 		DWORD  bgl2TzH:1;	  //跳闸保持信号
@@ -318,7 +318,7 @@ enum
 typedef struct  TGOC_T
 {
 	UGOCDIR        psta;			// 公用动作信息
-#if defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_MAIN_2020
+#if defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020
 	UGOCDIR        psta2;			// 过流2段用动作信息
 #endif
 	UGOCFLAG     sta;			// 故障动作信息
@@ -355,7 +355,7 @@ typedef struct  TGOC_T
 	TIMERELAY 	tlxslowTime; 		// 时间继电器
 
 
-#if defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_MAIN_2020
+#if defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020
 
 	TIMERELAY	tgl2Fz25ms;  		// 幅值启动25ms
 	TIMERELAY 	tgl2QDTime; 		// 时间继电器

dtu/dtu_main_t536/app/MmiData.c

@@ -4428,16 +4428,6 @@ static void mmd_GetFtuYxValue(int i,DATA_FIELD_DEF *pF)
 			strcpy(tmpstr,YX_H);
 	#endif
 
-	#ifdef GD_AREA_MAIN_2020   //广东标准2020 停用同期合闸功能软压板
-	if(ecd->owner!=0 && TYTQ_ALL_EN(0))//停用同期压板				
-		strcpy(tmpstr,YX_H);
-	if(ecd->owner!=0 && !JL_ALL_EN(0))//自动解列软压板			
-		strcpy(tmpstr,YX_H);
-	if(SW_DI_BHZTT+1==ecd->type && ecd->owner!=0 && !FUN_ALL_EN(0))//停用保护功能总		
-		strcpy(tmpstr,YX_H);
-		
-	#endif
-
 	#if LCD_SIZE==128	
 		sprintf(pd,"%-13.13s %s",shield_str(ecd),tmpstr);
 	#else

dtu/dtu_main_t536/app/SOE.c

@@ -41,13 +41,13 @@ const u16 ExecuteEventIdTbl[]={EV_GL1TZ,EV_GL2TZ,EV_GL3TZ,
 	                           EV_LX3TZ,			
                             #endif
                                EV_GLJS,EV_LXJS,EV_FA_GL_TZ,	
-                            #if defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020
+                            #if defined GD_AREA_ECZD_2020
 	                           EV_FA_GL_TZ2,
                             #endif 
                                EV_FA_LX_TZ,EV_AR1,EV_AR2,EV_AR3,EV_ARBS,EV_U0TZ,EV_XBBS,EV_BS_ALL,
        	                       EV_BS_FZMORE,EV_TQHZ,EV_GGDY_TZ,EV_GDDY_TZ,EV_GDY_TZ,EV_DDY_TZ,EV_LOWPL_TZ,EV_GPL_TZ,EV_DPL_TZ, 
        	                       EV_GOOSE_QC_QD,EV_GOOSE_GL_QD,EV_GOOSE_HZ_QD,EV_GOOSE_GL_TZ, 
-                            #if defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_MAIN_2020
+                            #if defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020
 	                           EV_GOOSE_GL2_TZ, 		// šýÁ÷2śÎĚřŐ˘
                             #endif
                             #ifdef GD_AREA_ZHONGSHAN_2020

dtu/dtu_main_t536/app/Sys.c

@@ -305,18 +305,14 @@ void app_yb_refresh(void)
 		fresh_set_soe(EV_EDIT_YB, pRunSet->bTT_EDIT_YB, 0,sw); 
 
         //关联硬压板
-#if defined GD_AREA_MAIN_2020 || defined GD_AREA_ECZD_2020
+#if defined GD_AREA_ECZD_2020
         fresh_set_soe(EV_CHZ_YB,CHZ_ALL_EN(sw) , 0,sw);//重合闸投入
 #else
         fresh_set_soe(EV_CHZ_YB,!CHZ_ALL_EN(sw) , 0,sw);//停用重合闸
 #endif
 
         // EV_BH_YB (功能总)
-#ifdef GD_AREA_MAIN_2020
-        fresh_set_soe(EV_BH_YB, !FUN_ALL_EN(sw), 0,sw);   //停用保护和FA
-#else
         fresh_set_soe(EV_BH_YB, FUN_ALL_EN(sw), 0,sw);
-#endif
 
 #if defined BHFAGS_YB_YK || defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_ECZD_2020
         // EV_GOOSE_YBTT/EV_FA_YBTT/EV_BH_YBTT (goose/fa/bh)
@@ -2269,7 +2265,7 @@ bool check_fault(void)
 		}
 
 		bY1|=pR->tgoc.sta.bFlag.bglTz
-		#if defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_MAIN_2020
+		#if defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020
 			||pR->tgoc.sta.bFlag.bgl2Tz
 		#endif
 			||pR->tgoc.sta.bFlag.blxTz

dtu/dtu_main_t536/app/UnitsLib.c

@@ -329,12 +329,8 @@ void ProtectRelayInit(void)
 		InitTR(&pR->tPLJL.thcbs2_0ms_100ms,  0, T_100ms);  		
 		
 		//手合加速
-//#if defined GD_AREA_MAIN_2020 || defined GD_AREA_ECZD_2020  
         InitTR(&pR->tSWST.tTRunST_20s1s, T_1s, T_300ms ); // 2020-07-23 分位持续检测时间改为1s，按照广东标准2020 手合开放检测时间，将3s时间改为0.3s，即分闸持续1S以上，手合0.3秒内可启动后加速
-//#else
-//		InitTR(&pR->tSWST.tTRunST_20s1s, T_1s, T_1s*3 ); // 2020-3-19 分位持续检测时间改为1s，手合开放检测时间按行业标准，将1s时间改为3s，即分闸持续1S以上，手合三秒内可启动后加速
-//#endif
-	#if defined GD_AREA_ECZD_2020 ||defined GD_AREA_MAIN_2020
+	#if defined GD_AREA_ECZD_2020
 		InitTR(&pR->tSWST.tSHz3s10ms,  T_1s, T_10ms);     	
 	#else
 		InitTR(&pR->tSWST.tSHz3s10ms,  T_1s*3, T_10ms); 
@@ -382,17 +378,13 @@ void ProtectRelayInit(void)
 		fresh_set_soe(EV_KZ_YB, pRunSet->bTT_KZ_YB, true,sw); 	
 		fresh_set_soe(EV_EDIT_YB, pRunSet->bTT_EDIT_YB, true,sw); 
 		
-		#if defined GD_AREA_MAIN_2020 || defined GD_AREA_ECZD_2020
+		#if defined GD_AREA_ECZD_2020
 			fresh_set_soe(EV_CHZ_YB,CHZ_ALL_EN(sw) , true,sw);//重合闸投入
 		#else
 			fresh_set_soe(EV_CHZ_YB,!CHZ_ALL_EN(sw) , true,sw);//停用重合闸
 		#endif		
 
-#ifdef GD_AREA_MAIN_2020
-        fresh_set_soe(EV_BH_YB, !FUN_ALL_EN(sw), true,sw);  //停用保护和FA
-#else
-		fresh_set_soe(EV_BH_YB, FUN_ALL_EN(sw), true,sw);		
-#endif
+		fresh_set_soe(EV_BH_YB, FUN_ALL_EN(sw), true,sw);
 	   	
 	#if defined BHFAGS_YB_YK ||	defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_ECZD_2020
 		fresh_set_soe(EV_BH_YBTT, BH_ALL_EN(sw), true,sw);

dtu/dtu_main_t536/app/defineSys.h

@@ -104,7 +104,6 @@
 
 #define AREA_MAIN             // 广东标准版
 #define GD_AREA_ZHONGSHAN     // 中山局要求
-#define GD_AREA_MAIN_2020              // 广东标准版2020
 #define GD_AREA_ECZD_2020              // 2020广东配网终端二次功能指导意见
 #define GD_AREA_ZHONGSHAN_2020         // 中山局2020要求
 #endif
@@ -167,23 +166,6 @@
 	#define RCD_STRAN_M			/*录波传输*/
 	#define RCD_STRAN_S			/*录波传输*/
 
-
-/********************************************************************************************************/
-/****************↓↓↓↓↓↓↓↓↓↓↓以下为广东20年主线宏相关地区(GD_AREA_MAIN_2020)↓↓↓↓↓↓↓↓↓↓↓*******************/
-/********************************************************************************************************/
-#elif defined  (GD_AREA_MAIN_2020)	//广东标准2020
-    #ifdef __IEC61850_GOOSE_FUNC__
-    #define VER_NUM 				    28201			// 版本号28.201	
-    #else
-    #define VER_NUM 				    28101			// 版本号28.101	
-    #endif
-	
-/*！！！！！注意！！！！！：往上↑↑↑↑↑↑↑↑地区版本定义VER_NUM不允许超29101/29201(goose)*/
-
-
-/********************************************************************************************************/
-/**************↓↓↓↓↓↓↓↓↓以下为广东20年二次指导意见宏相关地区(GD_AREA_MAIN_2020)↓↓↓↓↓↓↓↓↓*****************/
-/********************************************************************************************************/
 #elif defined  GD_AREA_ECZD_2020    	//2020广东配网终端二次功能指导意见
 	#ifdef __IEC61850_GOOSE_FUNC__
 		#define VER_NUM 					29201			// 版本号29.201
@@ -233,9 +215,6 @@
 	#if (VER_NUM<29101)
 		#define ADD_FD_GL_FX_BH_FUN          //分段过流段内分相保护功能
 		#define BHFAGS_YB_YK                 //保护、FA合goose软压板定值投退/SOE硬压板关联/遥控
-		#ifndef GD_AREA_MAIN_2020
-			#define GD_AREA_MAIN_2020	//广东2020框架宏
-		#endif
 	#elif ((VER_NUM>=29101) && (VER_NUM<32101))
 		#ifndef GD_AREA_ECZD_2020
 			#define GD_AREA_ECZD_2020	//广东2020二次指导意见框架宏
@@ -243,7 +222,6 @@
 		#define SEC_SETVALUE_7
 		#define FUN_CHZ_TOPEN
 	#elif (VER_NUM>=32101)
-		#define GD_AREA_MAIN_2020	//广东2020框架宏
 		#define ADD_FD_GL_FX_BH_FUN          //分段过流段内分相保护功能
 		#define BHFAGS_YB_YK                 //保护、FA合goose软压板定值投退/SOE硬压板关联/遥控
 		#define FUN_JDXX					//小电流接地功能

dtu/dtu_main_t536/app/led.c

@@ -227,7 +227,7 @@ void _led_update_status(void)
 	#endif
 	}
 
-#if defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020
+#if defined GD_AREA_ECZD_2020
     for(i=0; i<g_sw_num; i++)
     {
         RUN_STU_SW *prun=&g_tRelay[i].run_stu;
@@ -777,7 +777,7 @@ void _led_update_status(void)
 			led_set_sw(i,SW_LED_WCN, LED_OFF);
 		}
 
-#if defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020
+#if defined GD_AREA_ECZD_2020
 		if(JL_ALL_EN(i))
 		{
 			led_set_sw(i,SW_LED_ZDJL, LED_ON);

dtu/dtu_main_t536/app/protect.c

@@ -1156,7 +1156,7 @@ static int _protect_zzfg_check(u32 dStep)
 #endif
 	bY1|=pR->uGLFSX.bFlag.bFXQD;	
 	bY1|=pR->tgoc.sta.bFlag.bglQD
-	#if defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_MAIN_2020
+	#if defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020
 		||pR->tgoc.sta.bFlag.bgl2QD
 	#endif
 		||pR->tgoc.sta.bFlag.blxQD
@@ -1550,7 +1550,7 @@ void sw_op_fail(DWORD     dStep)
 #ifdef  CUSTOMIZE_BZT //备自投
     UBZT *uBZT   = &pR->tBzt.uBZT;
 #endif
-#if defined GD_AREA_MAIN_2020 || defined SW_FAIL_SINGLE_OUT   //开关拒动发送失灵信号
+#if defined SW_FAIL_SINGLE_OUT   //开关拒动发送失灵信号
     static int status=0;
 #endif
 
@@ -1839,7 +1839,7 @@ void sw_op_fail(DWORD     dStep)
     }
 
 
-#if defined GD_AREA_MAIN_2020 || defined SW_FAIL_SINGLE_OUT   //开关拒动发送失灵信号
+#if defined SW_FAIL_SINGLE_OUT   //开关拒动发送失灵信号
     if(soe_check(EV_SWFAIL+sw*EV_SW_NUM)==true)
     {
         sw_do(sw,SW_DO_UNSTUCK_SINGLE,SW_DO_TYPE_ON);
@@ -2164,7 +2164,7 @@ static bool _protect_check_fault(int sw)
 	}	
 
 	bY1|=pR->tgoc.sta.bFlag.bglTz
-	#if defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_MAIN_2020
+	#if defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020
 		||pR->tgoc.sta.bFlag.bgl2Tz
 	#endif
 		||pR->tgoc.sta.bFlag.blxTz
@@ -2333,7 +2333,7 @@ bool bh_yb_enable(int sw)
 #endif
 
 //#ifdef GD_AREA_ZHONGSHAN_2020  //中山要求通信异常，全系统均异常
-#if defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_MAIN_2020 || defined YB_AUTO_SELECT
+#if defined GD_AREA_ZHONGSHAN_2020 || defined YB_AUTO_SELECT
 bool fa_fun_true(int sw)
 {
 	bool bY1=false,bY2=false,bY3=false;
@@ -2365,14 +2365,6 @@ bool fa_fun_true(int sw)
 	{
 		bY3=pRunSet->bTT_SOFT_FA_YB;	// FA
 	}
-
-#elif defined GD_AREA_MAIN_2020
-
-    bY1=g_tRelay[sw].run_stu.fa_g_tt&&pRunSet->bTT_SOFT_GOOSE_YB;  // 智能分布式把手
-
-    bY2=g_tRelay[sw].run_stu.bhtt&&pRunSet->bTT_SOFT_BH_YB;	// 保护
-
-    bY3=g_tRelay[sw].run_stu.fatt&&pRunSet->bTT_SOFT_FA_YB;	// FA
     
 #else
 	bY1=g_tRelay[sw].run_stu.fa_g_tt&&pRunSet->bTT_SOFT_GOOSE_YB  // 智能分布式把手

dtu/dtu_main_t536/app/protect.h

@@ -22,7 +22,7 @@
 // 保护总投退
 #if defined YB_AUTO_SELECT && !defined GD_AREA_ECZD_2020
 	#define 	FUN_ALL_EN(sw)		(pRunSet->bTT_BH_YB&&fa_fun_true(sw))
-#elif defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_MAIN_2020
+#elif defined GD_AREA_ZHONGSHAN_2020
 	#define 	FUN_ALL_EN(sw)		(g_run_stu.bhall&&pRunSet->bTT_BH_YB&&g_tRelay[sw].run_stu.bhztt&&fa_fun_true(sw))
 #else
     #define 	FUN_ALL_EN(sw)		(g_run_stu.bhall&&pRunSet->bTT_BH_YB&&g_tRelay[sw].run_stu.bhztt)
@@ -291,7 +291,7 @@ bool bh_yb_enable(int sw);
 #endif
 
 //#ifdef GD_AREA_ZHONGSHAN_2020  //中山要求硬压板和软压板要一一对应
-#if defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_MAIN_2020 || defined YB_AUTO_SELECT
+#if defined GD_AREA_ZHONGSHAN_2020 || defined YB_AUTO_SELECT
 bool fa_fun_true(int sw);
 #endif
 

dtu/dtu_main_t536/app/run_status.c

@@ -730,7 +730,7 @@ int  run_status_check(u32 dStep)
 			ecd = &g_equ_config_di[g_sw[sw].di_cfg_index[SW_DI_BHZTT]];
 			prun->bhztt = dido_di_is_on(ecd->slot,ecd->index);
 			//#ifdef GD_AREA_ECZD_2020//2020指导意见使用停用FA及保护
-			#if defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020
+			#if defined GD_AREA_ECZD_2020
 				prun->bhztt= !prun->bhztt;
 			#endif	
 		}

dtu/dtu_main_t536/app/set.c

@@ -763,13 +763,8 @@ const  TSETTABLE tPubSetTable[]=
     {SETTYPE_UINT,  SET_NULL,   "定值区号",                 0.0,        4.0,                0,      0,          0,              GROUP_SET_EQPPARA,0x5001, UINT_R},
     {SETTYPE_F,     SET_A,      "保护CT额定一次值",     0.0,        2000.0,         600.0,  0,          0,              GROUP_SET_EQPPARA,0x5002, FLOAT_R},
     {SETTYPE_F,     SET_A,      "保护CT额定二次值",     0.0,        10.0,           5.0 ,       0,          0,              GROUP_SET_EQPPARA,0x5003, FLOAT_R},
-    #ifdef GD_AREA_MAIN_2020
-	    {SETTYPE_F,     SET_A,      "零序CT额定一次值",     0.0,        2000.0,         100.0,   0,          0,              GROUP_SET_EQPPARA,0x5004, FLOAT_R},
-	    {SETTYPE_F,     SET_A,      "零序CT额定二次值",     0.0,        10.0,           5.0 ,       0,          0,              GROUP_SET_EQPPARA,0x5005, FLOAT_R},
-    #else
-	    {SETTYPE_F,     SET_A,      "零序CT额定一次值",     0.0,        2000.0,         20.0,   0,          0,              GROUP_SET_EQPPARA,0x5004, FLOAT_R},
-	    {SETTYPE_F,     SET_A,      "零序CT额定二次值",     0.0,        10.0,           1.0 ,       0,          0,              GROUP_SET_EQPPARA,0x5005, FLOAT_R},
-    #endif
+    {SETTYPE_F,     SET_A,      "零序CT额定一次值",     0.0,        2000.0,         20.0,   0,          0,              GROUP_SET_EQPPARA,0x5004, FLOAT_R},
+    {SETTYPE_F,     SET_A,      "零序CT额定二次值",     0.0,        10.0,           1.0 ,       0,          0,              GROUP_SET_EQPPARA,0x5005, FLOAT_R},
     {SETTYPE_F,     SET_A,      "测量CT额定一次值",     0.0,        2000.0,         600.0,  0,          0,              GROUP_SET_EQPPARA,0x5006, FLOAT_R},
     {SETTYPE_F,     SET_A,      "测量CT额定二次值",     0.0,        10.0,           5.0 ,       0,          0,              GROUP_SET_EQPPARA,0x5007, FLOAT_R},
 #endif
@@ -934,7 +929,7 @@ const  TSETTABLE tSwSetTable[]=
 {
 	
 	{SETTYPE_LABEL,	SET_NULL,	"保护控制字", 				0 , 		0,				0 ,		0,			0,				GROUP_SET_BHTT,0X0000, NULL_R},
-#if defined GD_AREA_MAIN_2020 || defined GD_AREA_ECZD_2020  //珠海局要求告警+跳闸两个选项     广东标准2020要求告警+跳闸两个选项
+#if defined GD_AREA_ECZD_2020  //珠海局要求告警+跳闸两个选项     广东标准2020要求告警+跳闸两个选项
     {SETTYPE_LIST,	SET_NULL,	"过流Ⅰ段投入", 			0 , 		TZListNum-1,		0,		TZList,		TZListNum,		GROUP_SET_BHTT,0X500B, BOOL_R},
     {SETTYPE_LIST,	SET_NULL,	"过流Ⅱ段投入", 			0 , 		TZListNum-1,		0,		TZList,		TZListNum,		GROUP_SET_BHTT,0X500C, BOOL_R},
 #else
@@ -958,7 +953,7 @@ const  TSETTABLE tSwSetTable[]=
 	#endif	
 #endif
 
-#if defined GD_AREA_MAIN_2020 || defined GD_AREA_ECZD_2020 //广东标准2020要求增加零序过电压保护和后加速保护
+#if defined GD_AREA_ECZD_2020 //广东标准2020要求增加零序过电压保护和后加速保护
 	#if defined GD_AREA_ECZD_YUNFU_2021_2021
 		{SETTYPE_LIST,	SET_NULL,	"零序过电压保护",			0 , 	TZCKListNum-1,	    0,		TZCKList,	TZCKListNum,		GROUP_SET_BHTT,0, UINT_R},
 	#else
@@ -1192,11 +1187,7 @@ const  TSETTABLE tSwSetTable[]=
 		{SETTYPE_LIST,	SET_NULL,	"合到故障快速分闸", 		0 , 		TTListNum-1,		0,		TTList,		TTListNum,		GROUP_SET_FATT,0x5014, BOOL_R},
 		{SETTYPE_LIST,	SET_NULL,	"合闸成功闭锁失压分", 	0 , 		TTListNum-1,		0,		TTList,		TTListNum,		GROUP_SET_FATT,0x5015, BOOL_R},		
     {SETTYPE_LIST,	SET_NULL,	"残压闭锁", 			0 , 		TTListNum-1,		1,		TTList,		TTListNum,		GROUP_SET_FATT,0, BOOL_R},	
-    #if defined GD_AREA_MAIN_2020
-        {SETTYPE_LIST,  SET_NULL,   "涌流识别",             0 ,         TTListNum-1,        0,      TTList,     TTListNum,      GROUP_SET_FATT,0, BOOL_R},
-    #else
-        {SETTYPE_LIST,  SET_NULL,   "涌流识别投入",             0 ,         TTListNum-1,        0,      TTList,     TTListNum,      GROUP_SET_FATT,0, BOOL_R},
-    #endif
+    {SETTYPE_LIST,  SET_NULL,   "涌流识别投入",             0 ,         TTListNum-1,        0,      TTList,     TTListNum,      GROUP_SET_FATT,0, BOOL_R},
     {SETTYPE_LIST,  SET_NULL,   "零序电压保护",         0 ,         TZCKListNum-1,  0,      TZCKList,   TZCKListNum,        GROUP_SET_FATT,0x5018, UINT_R},
     {SETTYPE_LIST,  SET_NULL,   "非遮断电流保护",       0 ,         TTListNum-1,        0,      TTList,     TTListNum,      GROUP_SET_FATT,0x5019, BOOL_R},
     {SETTYPE_LIST,  SET_NULL,   "PT断线告警",           0 ,         TTListNum-1,        0,      TTList,     TTListNum,      GROUP_SET_FATT,0x501A, BOOL_R},
@@ -1205,11 +1196,7 @@ const  TSETTABLE tSwSetTable[]=
     {SETTYPE_LIST,  SET_NULL,   "接地告警投入", 0 ,         TTListNum-1,        0,      TTList,     TTListNum,      GROUP_SET_FATT,0x5015, BOOL_R},
     {SETTYPE_LIST,  SET_NULL,   "双侧有压闭锁合闸",     0 ,         TTListNum-1,        1,      TTList,     TTListNum,      GROUP_SET_FATT,0x5015, BOOL_R},
     {SETTYPE_LIST,  SET_NULL,   "手动/遥控分闸闭锁得电合",  0 ,         TTListNum-1,        1,      TTList,     TTListNum,      GROUP_SET_FATT,0x5015, BOOL_R},
-    #ifdef GD_AREA_MAIN_2020
-	    {SETTYPE_LIST,  SET_NULL,   "手合无压分闸", 0 ,         TTListNum-1,        0,      TTList,     TTListNum,      GROUP_SET_FATT,0x5015, BOOL_R},
-    #else
-	    {SETTYPE_LIST,    SET_NULL,   "手合无压分闸", 0 ,         TTListNum-1,        1,      TTList,     TTListNum,      GROUP_SET_FATT,0x5015, BOOL_R},
-    #endif
+    {SETTYPE_LIST,  SET_NULL,   "手合无压分闸", 0 ,         TTListNum-1,        1,      TTList,     TTListNum,      GROUP_SET_FATT,0x5015, BOOL_R},
     {SETTYPE_LIST,  SET_NULL,   "连续分闸闭锁投退",         0 ,         TTListNum-1,    0,      TTList, TTListNum,GROUP_SET_FATT,0x0000, BOOL_R},
 	#ifdef	FA_OC_COUNT
 		{SETTYPE_LIST,	SET_NULL,	"过流脉冲计数投退", 		0 , 		TTListNum-1,	0,		TTList, TTListNum,GROUP_SET_FATT,0x0000, BOOL_R},
@@ -1291,22 +1278,12 @@ const  TSETTABLE tSwSetTable[]=
 	{SETTYPE_F,		SET_S,		"失压合闸延时(XL时限)",						0 , 		999,				7 ,		0,			0,				GROUP_SET_FADZ,0x5021, FLOAT_R},
 	{SETTYPE_F,		SET_S,		"失电分闸延时(Z时限)",			0 , 		99,				3.5 ,		0,			0,				GROUP_SET_FADZ,0x5022, FLOAT_R},
     {SETTYPE_F, 	SET_S,		"合闸成功闭锁失压分延时", 	0 , 		600,				300 ,	0,			0,				GROUP_SET_FADZ,0x5023, FLOAT_R},//FOS
-	#ifdef GD_AREA_MAIN_2020
-	    {SETTYPE_F, 	SET_A,		"相间故障电流定值", 	0.0 ,	100.0,			100.0 , 	0,			0,				GROUP_SET_FADZ,0x5024, FLOAT_R},
-	    {SETTYPE_F,     SET_A,      "接地故障电流定值",     0.0 ,    100.0,          100.0 ,     0,          0,              GROUP_SET_FADZ,0x5025, FLOAT_R},
-
-	    {SETTYPE_F, 	SET_A,		"相间故障电流II段定值",	 0.0 ,	 100.0, 		 100.0 ,	 0, 		 0, 			 GROUP_SET_FADZ,0x5025, FLOAT_R},
-	    {SETTYPE_F,     SET_S,      "相间故障电流I段时间",      0 ,         99,         0 ,        0,          0,              GROUP_SET_FADZ,0x5026, FLOAT_R},
-	    {SETTYPE_F,     SET_S,      "相间故障电流II段时间",         0 ,         99,        0 ,        0,          0,              GROUP_SET_FADZ,0x5026, FLOAT_R},
-	    {SETTYPE_F,     SET_S,      "接地故障电流时间",         0 , 99,             0 ,        0,          0,              GROUP_SET_FADZ,0x5026, FLOAT_R},
-	#else
-        {SETTYPE_F,     SET_A,      "相间故障电流I段定值",      0.0 ,   100.0,          100.0 ,     0,          0,              GROUP_SET_FADZ,0x5024, FLOAT_R},
-        {SETTYPE_F,     SET_S,      "相间故障电流I段时间",      0 ,         99,         99 ,        0,          0,              GROUP_SET_FADZ,0x5026, FLOAT_R},
-        {SETTYPE_F,     SET_A,      "相间故障电流II段定值",     0.0 ,   100.0,          100.0 ,     0,          0,              GROUP_SET_FADZ,0x5025, FLOAT_R},
-        {SETTYPE_F,     SET_S,      "相间故障电流II段时间",         0 ,         99,         99 ,        0,          0,              GROUP_SET_FADZ,0x5026, FLOAT_R},
-        {SETTYPE_F,     SET_A,      "相间故障电流定值",     0.0 ,   100.0,          100.0 ,     0,          0,              GROUP_SET_FADZ,0x5024, FLOAT_R},
-        {SETTYPE_F,     SET_A,      "接地故障电流定值",     0.0 ,   100.0,          100.0 ,     0,          0,              GROUP_SET_FADZ,0x5025, FLOAT_R},
-	#endif
+    {SETTYPE_F,     SET_A,      "相间故障电流I段定值",      0.0 ,   100.0,          100.0 ,     0,          0,              GROUP_SET_FADZ,0x5024, FLOAT_R},
+    {SETTYPE_F,     SET_S,      "相间故障电流I段时间",      0 ,         99,         99 ,        0,          0,              GROUP_SET_FADZ,0x5026, FLOAT_R},
+    {SETTYPE_F,     SET_A,      "相间故障电流II段定值",     0.0 ,   100.0,          100.0 ,     0,          0,              GROUP_SET_FADZ,0x5025, FLOAT_R},
+    {SETTYPE_F,     SET_S,      "相间故障电流II段时间",         0 ,         99,         99 ,        0,          0,              GROUP_SET_FADZ,0x5026, FLOAT_R},
+    {SETTYPE_F,     SET_A,      "相间故障电流定值",     0.0 ,   100.0,          100.0 ,     0,          0,              GROUP_SET_FADZ,0x5024, FLOAT_R},
+    {SETTYPE_F,     SET_A,      "接地故障电流定值",     0.0 ,   100.0,          100.0 ,     0,          0,              GROUP_SET_FADZ,0x5025, FLOAT_R},
 	{SETTYPE_F,		SET_U,		"零序过压定值", 			0.0 , 	100.0,			20.0 ,	0,			0,				GROUP_SET_FADZ,0x0000, FLOAT_R},
 	{SETTYPE_F,		SET_S,		"零序过压时间",			0.0 , 	99.0,			0.6 ,		0,			0,				GROUP_SET_FADZ,0X0000, FLOAT_R},
     {SETTYPE_F, 	SET_A,		"相间过流告警电流定值",		0.0 ,	100.0,			100.0 , 	0,			0,				GROUP_SET_FADZ,0x5024, FLOAT_R},
@@ -1330,7 +1307,7 @@ const  TSETTABLE tSwSetTable[]=
 	#endif
 #endif
 
-#if defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020
+#if defined GD_AREA_ECZD_2020
     {SETTYPE_LABEL, SET_NULL,   "分布式FA控制字",           0 ,         0,              0 ,     0,          0,              GROUP_SET_GOOSETT,0X0000, NULL_R},
     {SETTYPE_LIST,  SET_NULL,   "缓动型FA方式",     0 ,         TGooseFANum-1,  0,      TGooseFA,   TGooseFANum,    GROUP_SET_GOOSETT,0X0000, BOOL_R},
     {SETTYPE_LIST,  SET_NULL,   "首开关失压跳闸保护投入",       0 ,         TTListNum-1,        0,      TTList,     TTListNum,      GROUP_SET_GOOSETT,0X0000, BOOL_R},
@@ -1346,7 +1323,7 @@ const  TSETTABLE tSwSetTable[]=
 
     {SETTYPE_LABEL, SET_NULL,   "分布式FA定值",             0 ,         0,              0 ,     0,          0,              GROUP_SET_GOOSEDZ,0X0000, NULL_R},
     //#ifdef GD_AREA_ZHONGSHAN_2020
-	#if defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_MAIN_2020 
+	#if defined GD_AREA_ZHONGSHAN_2020 
 	    {SETTYPE_F,     SET_A,      "故障切除相电流I段",    0.05 ,  100.0,          50.0 ,  0,          0,              GROUP_SET_GOOSEDZ,0X0000, FLOAT_R},
 	    {SETTYPE_F,     SET_S,      "相电流I段跳闸延时",            0.0 ,   100.0,          100.0 , 0,          0,              GROUP_SET_GOOSEDZ,0X0000, FLOAT_R},
 	    {SETTYPE_F,     SET_A,      "故障切除相电流II段",   0.05 ,  100.0,          50.0 ,  0,          0,              GROUP_SET_GOOSEDZ,0X0000, FLOAT_R},
@@ -1448,12 +1425,8 @@ const  TSETTABLE tSwSetTable[]=
 		{SETTYPE_LIST,	SET_NULL,	"保护投入软压板",	0 , 		TTListNum-1,		1,		TTList, 	TTListNum,		GROUP_SET_YB,0X5026, BOOL_R},
 	#else
         {SETTYPE_LIST,	SET_NULL,	"远方投入软压板",		0 , 		TTListNum-1,		1,		TTList,		TTListNum,		GROUP_SET_YB,0X5025, BOOL_R},
-        #ifdef GD_AREA_MAIN_2020  //广东标准2020要求重合闸投入软压板   和停用FA和保护软压板
-            {SETTYPE_LIST,  SET_NULL,   "停用保护及FA功能软压板",   0 ,         TTListNum-1,        0,      TTList,     TTListNum,      GROUP_SET_YB,0X5026, BOOL_R},
-        #else
-            {SETTYPE_LIST,  SET_NULL,   "保护投入软压板",   0 ,         TTListNum-1,        1,      TTList,     TTListNum,      GROUP_SET_YB,0X5026, BOOL_R},
-            {SETTYPE_LIST,  SET_NULL,   "停用重合闸软压板", 0 ,         TTListNum-1,        0,      TTList,     TTListNum,      GROUP_SET_YB,0X5024, BOOL_R},
-        #endif
+        {SETTYPE_LIST,  SET_NULL,   "保护投入软压板",   0 ,         TTListNum-1,        1,      TTList,     TTListNum,      GROUP_SET_YB,0X5026, BOOL_R},
+        {SETTYPE_LIST,  SET_NULL,   "停用重合闸软压板", 0 ,         TTListNum-1,        0,      TTList,     TTListNum,      GROUP_SET_YB,0X5024, BOOL_R},
         {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
@@ -1473,9 +1446,7 @@ const  TSETTABLE tSwSetTable[]=
 		#ifdef YK_SOFT_YB
 		    {SETTYPE_LIST,  SET_NULL,   "遥控软压板",       0 ,         TTListNum-1,        1,      TTList,     TTListNum,      GROUP_SET_YB,0X5025, BOOL_R},
 		#endif
-		#ifdef GD_AREA_MAIN_2020       //广东标准2020增加自动解列软压板
-            {SETTYPE_LIST,  SET_NULL,   "自动解列软压板",     0 ,         TTListNum-1,        0,      TTList,     TTListNum,      GROUP_SET_YB,0X5025, BOOL_R},
-		#endif
+        {SETTYPE_LIST,  SET_NULL,   "自动解列软压板",     0 ,         TTListNum-1,        0,      TTList,     TTListNum,      GROUP_SET_YB,0X5025, BOOL_R},
 	#endif
 #endif //2020二次指导意见将各种模式软压板分开显示 2020-9-8
 
@@ -1514,11 +1485,7 @@ const  TSETTABLE tSwSetTable[]=
 	#endif	
 #endif
 
-#ifdef GD_AREA_MAIN_2020
-    {SETTYPE_LIST,	SET_NULL,	"气压低闭锁分合闸", 		0 , 		TTListNum-1,		1,		TTList, 		TTListNum,		GROUP_SET_SWSET,0X0000, BOOL_R},
-#else
     {SETTYPE_LIST,  SET_NULL,   "气压低闭锁分合闸",         0 ,         TTListNum-1,        1,      TTList,         TTListNum,      GROUP_SET_SWSET,0X0000, BOOL_R},
-#endif
 
 #ifdef FUN_JDXX
     {SETTYPE_LIST,	SET_NULL,	"系统接地方式", 	0 , 		JDTYPENum-1,	0,	JDTYPE,		JDTYPENum,	GROUP_SET_SWSET, 0X0000, UINT_R},
@@ -1533,10 +1500,8 @@ const  TSETTABLE tSwSetTable[]=
     {SETTYPE_LIST,  SET_NULL,   "备自投2#进线电流",     0 ,         TISelListNum-1,     0,      TISelList,      TISelListNum, GROUP_SET_SWSET, UINT_R},
 #endif
 
-#ifdef GD_AREA_MAIN_2020
     {SETTYPE_LIST,	SET_NULL,	"PT1断线检查投退",			  0 ,		  TTListNum-1,		  1,	  TTList,	  TTListNum,	  GROUP_SET_SWSET,0X0000, BOOL_R},
     {SETTYPE_LIST,	SET_NULL,	"PT2断线检查投退",			  0 ,		  TTListNum-1,		  1,	  TTList,	  TTListNum,	  GROUP_SET_SWSET,0X0000, BOOL_R},
-#endif
 
 #if defined BH_FA_INONE_SW && !defined YF_TQ_JL_TY_PUBLIC
 	{SETTYPE_LABEL, SET_NULL,	"控制字", 			0 , 				0,		0,				  0,				 0,				GROUP_SET_MODE,0X0000, NULL_R},
@@ -1687,12 +1652,7 @@ const  TSETTABLE tCstSetTable[]=   	// min       max        default
 	{SETTYPE_LIST,	SET_NULL,	"现场运行模式",	0 , 	TTListNum-1,	0,		TTList,	TTListNum,	GROUP_CSTSET_OTHERS,0x0000, BOOL_R},
 	{SETTYPE_LIST,	SET_NULL,	"101文件传输确认帧",	0 , 	TTListNum-1,	1,		TTList,	TTListNum,	GROUP_CSTSET_OTHERS,0x0000, BOOL_R},
 	{SETTYPE_UINT,	SET_NULL,	"测量差值",	              0,   2000,		0 ,	0,		0,			GROUP_CSTSET_OTHERS,0x0000, UINT_R},
-#ifdef GD_AREA_MAIN_2020
-    {SETTYPE_F, 	SET_U,		"直流电压定值", 0,   150, 	  48 ,	  0,	  0,		  GROUP_CSTSET_OTHERS,0x0000, FLOAT_R},
-#else
     {SETTYPE_F,     SET_U,      "直流电压定值", 0,   150,       48 ,    0,      0,          GROUP_CSTSET_OTHERS,0x0000, FLOAT_R},
-#endif
-
 	{SETTYPE_UINT,	SET_NULL,	"直流通道数",	1, 2,		1 , 0,		0,			GROUP_CSTSET_OTHERS,0x0000, UINT_R},
 	{SETTYPE_LIST,	SET_NULL,	"负荷侧电压选择",	0 , 	TPT_UNum-1,	0,		PUList,	TPT_UNum,	GROUP_CSTSET_OTHERS,0x0000, UINT_R},
 
@@ -1829,14 +1789,7 @@ const  TSETTABLE tEquipParaTable[]=     			// min 	max 			default
 #else
     {SETTYPE_F, 	SET_NULL,	"遥测死区", 		0.0 ,	0.3,				0.01 ,	0,				0,				GROUP_PARA_RMT,0x0000,	FLOAT_R},
 #endif
-#ifdef GD_AREA_MAIN_2020
-    {SETTYPE_F,		SET_NULL,	"电流死区",			0.0 , 	0.3,				0.01 ,	0,				0,				GROUP_PARA_RMT,0x0000,	FLOAT_R},
-    {SETTYPE_F,		SET_NULL,	"交流电压死区",		0.0 , 	0.3,				0.01 ,	0,				0,				GROUP_PARA_RMT,0x0000,	FLOAT_R},
-    {SETTYPE_F,		SET_NULL,	"直流电压死区",		0.0 , 	0.3,				0.01 ,	0,				0,				GROUP_PARA_RMT,0x0000,	FLOAT_R},
-    {SETTYPE_F,		SET_NULL,	"功率死区",			0.0 , 	0.3,				0.01 ,	0,				0,				GROUP_PARA_RMT,0x0000,	FLOAT_R},
-    {SETTYPE_F,		SET_NULL,	"频率死区",			0.0 , 	0.3,				0.05 ,	0,				0,				GROUP_PARA_RMT,0x0000,	FLOAT_R},
-    {SETTYPE_F,		SET_NULL,	"功率因数死区",		0.0 , 	0.3,				0.01 ,	0,				0,				GROUP_PARA_RMT,0x0000,	FLOAT_R},
-#else
+
     #ifndef  PARAM_DEAD_PER
     {SETTYPE_F,		SET_PER,	"电流死区",			0.0 , 	0.3,				0.01 ,	0,				0,				GROUP_PARA_RMT,0x0000,	FLOAT_R},
     {SETTYPE_F,		SET_PER,	"交流电压死区",		0.0 , 	0.3,				0.01 ,	0,				0,				GROUP_PARA_RMT,0x0000,	FLOAT_R},
@@ -1852,7 +1805,6 @@ const  TSETTABLE tEquipParaTable[]=     			// min 	max 			default
     {SETTYPE_F,		SET_PER,	"频率死区",			0.0 , 	100.0,				1.0 ,	0,				0,				GROUP_PARA_RMT,0x0000,	FLOAT_R},
     {SETTYPE_F,		SET_PER,	"功率因数死区",		0.0 , 	100.0,				1.0 ,	0,				0,				GROUP_PARA_RMT,0x0000,	FLOAT_R},
     #endif
-#endif
 	{SETTYPE_LINT,	SET_MS,		"遥信防抖时间",		0.0 , 	60000.0,			20.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_LINT,	SET_MS,		"合闸脉冲",			0.0 , 	50000.0,			200.0 ,	0,				0,				GROUP_PARA_RMT,0x0000,	FLOAT_R},
@@ -1870,11 +1822,7 @@ const  TSETTABLE tEquipParaTable[]=     			// min 	max 			default
     {SETTYPE_LABEL, SET_NULL,   "其它",             0 ,     0,                  0 ,     0,              0,              GROUP_PARA_OTHERS,0x0000, NULL_R},
     {SETTYPE_LINT,  SET_MS,     "合分闸脉冲",           0.0 ,   50000.0,            200.0 , 0,              0,              GROUP_PARA_OTHERS,0x0000, FLOAT_R},
     {SETTYPE_LIST,  SET_NULL,   "信号自动复归投退", 0 ,     TTListNum-1,        1,      TTList,         TTListNum,      GROUP_PARA_OTHERS,0x0000, BOOL_R},
-#ifdef GD_AREA_MAIN_2020
-    {SETTYPE_5INT,  SET_MIN,        "信号自动复归时间", 0,      3000,           2880,   0,              0,              GROUP_PARA_OTHERS,0x0000, FLOAT_R},
-#else
-    {SETTYPE_5INT,    SET_MIN,        "信号自动复归时间", 0,      3000,               2880,    0,              0,              GROUP_PARA_OTHERS,0x0000, FLOAT_R},
-#endif
+    {SETTYPE_5INT,  SET_MIN,    "信号自动复归时间", 0,      3000,               2880,    0,              0,              GROUP_PARA_OTHERS,0x0000, FLOAT_R},
 
 #ifdef YX_RESET_TIME
 	{SETTYPE_F,	SET_S,		"故障遥信保持时间", 0,		6000,				5,	0,				0,				GROUP_PARA_OTHERS,0x0000, FLOAT_R},
@@ -3024,10 +2972,7 @@ bool MakeRunSet(bool bFirst)
 		// 过流类定值
 		{
 			poc= &ptSet->tSwSet[sw].toc[BH_GL1];
-#if defined GD_AREA_MAIN_2020//珠海局要求告警+跳闸两个选项
-			poc->bTz=(((WORD)psetbuf[SET_GL1_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false);
-			poc->bGj=(((WORD)psetbuf[SET_GL1_TT+sw*SW_SET_NUMBER ].ff==0 )?true:false);
-#elif defined GD_AREA_ECZD_2020
+#if defined GD_AREA_ECZD_2020
 			poc->bTz=(((WORD)psetbuf[SET_GL1_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false); 
 			poc->bGj=(((WORD)psetbuf[SET_GL1_TT+sw*SW_SET_NUMBER ].ff==0 )?true:false);
 #else
@@ -3048,10 +2993,7 @@ bool MakeRunSet(bool bFirst)
 			poc->dI_fh= _Mul_Div_U(poc->dI,	96, 100);		//0.96=0.98*0.98;        		//过流定值返回值
 
 			poc = &ptSet->tSwSet[sw].toc[BH_GL2];
-#if defined GD_AREA_MAIN_2020//珠海局要求告警+跳闸两个选项
-			poc->bTz=(((WORD)psetbuf[SET_GL2_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false);
-			poc->bGj=(((WORD)psetbuf[SET_GL2_TT+sw*SW_SET_NUMBER ].ff==0 )?true:false);
-#elif defined GD_AREA_ECZD_2020//广东标准2020要求告警+跳闸两个选项 跳闸包含跳闸和告警
+#if defined GD_AREA_ECZD_2020//广东标准2020要求告警+跳闸两个选项 跳闸包含跳闸和告警
 			poc->bTz=(((WORD)psetbuf[SET_GL2_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false); 
 			poc->bGj=(((WORD)psetbuf[SET_GL2_TT+sw*SW_SET_NUMBER ].ff==0 )?true:false);
 #else
@@ -3175,13 +3117,13 @@ bool MakeRunSet(bool bFirst)
 			poc->bKg_mainloop=false;
 
             //#ifdef GD_AREA_ECZD_2020
-#if defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020
+#if defined GD_AREA_ECZD_2020
             poc->bTT_gooseFA=true; // 默认智能分布式投入
             ptSet->tSwSet[sw].bTT_goose_xbbs    = false;
             poc->bTT_DIR=false; // 合环运行
 
             poc->bFA_slow=(((WORD)psetbuf[SET_GOOSE_FA_TYPE+sw*SW_SET_NUMBER ].ff==1 )?true:false);   // 速动/缓动
-#if defined GD_AREA_ZHONGSHAN || defined GD_AREA_MAIN_2020  //中山要求联络开关固定
+#if defined GD_AREA_ZHONGSHAN  //中山要求联络开关固定
             poc->bsw_sd=(((WORD)psetbuf[SET_GOOSE_FTU_TYPE+sw*SW_SET_NUMBER ].ff==0 )?true:false);    // 首端
             poc->bsw_fz=(((WORD)psetbuf[SET_GOOSE_FTU_TYPE+sw*SW_SET_NUMBER ].ff==2 )?true:false);    // 末端
             poc->bsw_ll=(((WORD)psetbuf[SET_GOOSE_FTU_TYPE+sw*SW_SET_NUMBER ].ff==3 )?true:false);    // 联络
@@ -3202,7 +3144,7 @@ bool MakeRunSet(bool bFirst)
 			poc->dTlx=GetSetTIME(psetbuf[SET_GOOSET_GL_T+sw*SW_SET_NUMBER ].ff);	//2020指导意见默认只有一个时限,共用 "故障跳闸时限"
 
             //#ifdef GD_AREA_ZHONGSHAN_2020
-#if defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_MAIN_2020
+#if defined GD_AREA_ZHONGSHAN_2020
             poc->dIgl2=GetSetSQR(psetbuf[SET_GOOSET_GL2_I+sw*SW_SET_NUMBER ].ff,fKI);                   //过流2定值
             poc->dIgl2_fh= _Mul_Div_U(poc->dIgl2,   96, 100);       //0.96=0.98*0.98;                   //过流2定值返回值
             poc->dTgl2=GetSetTIME(psetbuf[SET_GOOSET_GL2_T+sw*SW_SET_NUMBER ].ff);
@@ -3569,9 +3511,7 @@ bool MakeRunSet(bool bFirst)
 		//#endif
 			poc->bDir=false;
 			poc->bGj=false;
-			#if defined GD_AREA_MAIN_2020 //汕头局要求合后电流两段处理(I+t) 广东标准2020与汕头局保持一致
-				poc->dT=GetSetTIME(psetbuf[SET_FA_GLI_T+sw*SW_SET_NUMBER ].ff)+GetSetTIME(psetbuf[SET_FA_GZTZ_T+sw*SW_SET_NUMBER ].ff);
-			#elif defined GD_AREA_ECZD_2020
+			#if defined GD_AREA_ECZD_2020
 				poc->dT=GetSetTIME(psetbuf[SET_FA_GLI_T+sw*SW_SET_NUMBER ].ff);
 			#else
 				poc->dT=GetSetTIME(psetbuf[SET_FA_GZTZ_T+sw*SW_SET_NUMBER ].ff);
@@ -3592,9 +3532,7 @@ bool MakeRunSet(bool bFirst)
 		//#endif
 			poc->bDir=false;
 			poc->bGj=false;
-		#if defined GD_AREA_MAIN_2020 //汕头局要求合后电流两段处理(I+t) 广东标准2020与汕头局保持一致
-			poc->dT=GetSetTIME(psetbuf[SET_FA_GLII_T+sw*SW_SET_NUMBER ].ff)+GetSetTIME(psetbuf[SET_FA_GZTZ_T+sw*SW_SET_NUMBER ].ff);
-		#elif defined GD_AREA_ECZD_2020 
+		#if defined GD_AREA_ECZD_2020 
 			 #ifdef GD_AREA_ZHONGSHAN_2020
 				if(ptSet->tSwSet[sw].bTT_fa_hjs)
 				{
@@ -3612,7 +3550,7 @@ bool MakeRunSet(bool bFirst)
 			poc->dT=GetSetTIME(psetbuf[SET_FA_GZTZ_T+sw*SW_SET_NUMBER ].ff);
 		#endif 
 			if(poc->dT<T_FA_TZ_MIN_TIME) poc->dT= T_FA_TZ_MIN_TIME;//不小于20ms
-		#if defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020 //潮州局要求合后电流两段处理   
+		#if defined GD_AREA_ECZD_2020 // 合后电流两段处理   
 			poc->dI=GetSetSQR(psetbuf[SET_FA_GL_II+sw*SW_SET_NUMBER ].ff,fKI);
 		#else
 			poc->bTz=false; 
@@ -3652,9 +3590,7 @@ bool MakeRunSet(bool bFirst)
 		//#endif
 			poc->bDir=false;
 			poc->bGj=false;
-		#if defined GD_AREA_MAIN_2020 //汕头局要求合后电流两段处理(I+t) 广东标准2020与汕头局保持一致
-			poc->dT=GetSetTIME(psetbuf[SET_FA_LX_T+sw*SW_SET_NUMBER ].ff) + GetSetTIME(psetbuf[SET_FA_GZTZ_T+sw*SW_SET_NUMBER ].ff);
-		#elif defined GD_AREA_ECZD_2020
+		#if defined GD_AREA_ECZD_2020
 		    #ifdef GD_AREA_ZHONGSHAN_2020
 				if(ptSet->tSwSet[sw].bTT_fa_hjs)
 				{
@@ -3686,7 +3622,7 @@ bool MakeRunSet(bool bFirst)
 
 		//零序过电压投入
 		{
-        #if defined GD_AREA_MAIN_2020 || defined GD_AREA_ECZD_2020  // be modified by Jack.Liu on 2020/07/23--14:4:47
+        #if defined GD_AREA_ECZD_2020  // be modified by Jack.Liu on 2020/07/23--14:4:47
         	#if defined GD_AREA_ECZD_YUNFU_2021_2021
         		ptSet->tSwSet[sw].bTT_3U0Tz = (((WORD)psetbuf[SET_3U0_TT+sw*SW_SET_NUMBER ].ff==2 )?true:false);
 		    	ptSet->tSwSet[sw].bTT_3U0Gj = (((WORD)psetbuf[SET_3U0_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false);
@@ -3720,19 +3656,10 @@ bool MakeRunSet(bool bFirst)
             ptSet->bTT_JL_YB =true;
 			//装置软压板配置			
 			ptSet->bTT_EDIT_YB=((WORD)psetbuf[SET_EDIT_PAR_YB+sw*SW_SET_NUMBER ].ff==1 )?true:false;
-#ifdef GD_AREA_MAIN_2020
-            ptSet->bTT_BH_YB=((WORD)psetbuf[SET_BH_YB].ff==0 )?true:false;   //！！！！停用保护功能总压板
-#else
             ptSet->bTT_BH_YB=((WORD)psetbuf[SET_BH_YB].ff==1 )?true:false;
-#endif
             ptSet->bTT_KZ_YB=((WORD)psetbuf[SET_KZ_OUT_YB+sw*SW_SET_NUMBER ].ff==1 )?true:false;
 
-#if defined GD_AREA_MAIN_2020
             ptSet->bTT_CHZ_YB=((WORD)psetbuf[SET_CHZ_YB+sw*SW_SET_NUMBER ].ff==1 )?true:false;   //重合闸投入软压板
-#else
-            ptSet->bTT_CHZ_YB=((WORD)psetbuf[SET_CHZ_YB+sw*SW_SET_NUMBER ].ff==0 )?true:false;   //停用重合闸压板
-#endif
-
             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
@@ -3760,11 +3687,8 @@ bool MakeRunSet(bool bFirst)
 			#ifdef YK_SOFT_YB //遥控压板
 				ptSet->bTT_SOFT_YK_YB = ((WORD)psetbuf[SET_YK_YBTT+sw*SW_SET_NUMBER ].ff==1 )?true:false;
 			#endif
-			
-#ifdef GD_AREA_MAIN_2020
-			ptSet->bTT_JL_YB =((WORD)psetbuf[SET_JL_YB].ff== 1) ? true:false;  // 
-#endif
 
+			ptSet->bTT_JL_YB =((WORD)psetbuf[SET_JL_YB].ff== 1) ? true:false;  // 
         }
 #endif
 
@@ -3848,11 +3772,8 @@ bool MakeRunSet(bool bFirst)
 #endif
 		}
 
-
-#ifdef GD_AREA_MAIN_2020
-			ptSet->tSwSet[sw].bTT_PT1_ll_check	 =((WORD)psetbuf[SET_PT1_LL_CHECK_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false;
-			ptSet->tSwSet[sw].bTT_PT2_ll_check	 =((WORD)psetbuf[SET_PT2_LL_CHECK_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false;
-#endif
+        ptSet->tSwSet[sw].bTT_PT1_ll_check	 =((WORD)psetbuf[SET_PT1_LL_CHECK_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false;
+        ptSet->tSwSet[sw].bTT_PT2_ll_check	 =((WORD)psetbuf[SET_PT2_LL_CHECK_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false;
 
 	#if defined BH_FA_INONE_SW
 		//功能模块配置项目表

dtu/dtu_main_t536/app/set.h

@@ -586,24 +586,14 @@ enum
 	SET_FA_Y_T,
 	SET_FA_XL_T,
 	SET_FA_Z_T,
-	SET_FA_BSTZ_T,			//广东标准: 闭锁分闸复归延时//佛山标准: 合闸成功闭锁失压分延时		
-	#ifdef GD_AREA_MAIN_2020
-        SET_FA_GL_I,			//相间故障定值(I段)
-        SET_FA_LX_I,            //接地故障定值
-
-        SET_FA_GL_II,			//相间故障II段定值
-        SET_FA_GLI_T,           //相间故障时间(I段)
-        SET_FA_GLII_T,          //相间故障II时间
-     	SET_FA_LX_T,			//接地故障时间
-	#else
-        SET_FA_GL_I,			//相间故障定值
-        SET_FA_GLI_T,           //相间故障I时间
-        SET_FA_GL_II,			//相间二段定值
-        SET_FA_GLII_T,          //相间故障II时间
-
-        SET_FA_LX_I,            //零序故障定值
-        SET_FA_LX_T,            //零序故障时间
-	#endif
+	SET_FA_BSTZ_T,			//广东标准: 闭锁分闸复归延时//佛山标准: 合闸成功闭锁失压分延时	
+    SET_FA_GL_I,			//相间故障定值
+    SET_FA_GLI_T,           //相间故障I时间
+    SET_FA_GL_II,			//相间二段定值
+    SET_FA_GLII_T,          //相间故障II时间
+
+    SET_FA_LX_I,            //零序故障定值
+    SET_FA_LX_T,            //零序故障时间
 	SET_FA_U0_U,			//零序电压定值
 	SET_FA_U0_T,			//零序电压时间
     SET_FA_GZTZ_T,			//快速跳闸延时
@@ -626,7 +616,7 @@ enum
 
 	SET_LABLE_GOOSETT,		//列表名	
 //#ifdef GD_AREA_ECZD_2020 //2020二次指导意见 2020-9-11
-#if defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020 
+#if defined GD_AREA_ECZD_2020 
 	SET_GOOSE_FA_TYPE,  	// 缓动型FA方式
 	SET_GOOSE_SDLOSTVOL_TT, // 首开关失压跳闸保护投入
 	SET_GOOSE_LL_TT,		// 本节点供电恢复保护投入
@@ -641,7 +631,7 @@ enum
 	
 	SET_LABLE_GOOSEDZ,		//列表名
 	//#ifdef GD_AREA_ZHONGSHAN_2020
-	#if defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_MAIN_2020
+	#if defined GD_AREA_ZHONGSHAN_2020
 		SET_GOOSET_GL_I,		//故障切除相电流I段
 		SET_GOOSET_GL_T,		//相电流I段跳闸延时
 		SET_GOOSET_GL2_I,		//故障切除相电流II段
@@ -748,9 +738,7 @@ enum
 		#ifdef YK_SOFT_YB
 			SET_YK_YBTT,		//遥控软压板
 		#endif
-        #ifdef GD_AREA_MAIN_2020
-            SET_JL_YB, 			// 自动解列软压板
-        #endif	
+        SET_JL_YB, 			// 自动解列软压板
 	#endif
 #endif
 
@@ -797,10 +785,8 @@ enum
 	SET_BZT_DL1_I,				// 1#进线电流
 	SET_BZT_DL2_I,				// 2#进线电流		
 #endif
-#ifdef GD_AREA_MAIN_2020
     SET_PT1_LL_CHECK_TT,
     SET_PT2_LL_CHECK_TT,
-#endif
 
 #if defined BH_FA_INONE_SW
 	SET_LABLE_MODE,		//列表名
@@ -1370,7 +1356,7 @@ typedef struct OC_SET
 	DWORD   dI;        			//越限定值
 	DWORD   dI_fh;        		//越限定值返回值
 //#ifdef GD_AREA_ECZD_2020
-#if defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020
+#if defined GD_AREA_ECZD_2020
 	DWORD   dU;                 //低电压定值
 	DWORD   dU_fh;        		//越限定值返回值
 	DWORD   dU2;                //负序电压值
@@ -1411,7 +1397,7 @@ typedef struct GOC_SET                //
 	bool         bTT_mxTfz;			//母线故障跳分支
 	bool        bKg_mainloop;			//主环开关
 //#ifdef GD_AREA_ZHONGSHAN_2020
-#if  defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_MAIN_2020
+#if  defined GD_AREA_ZHONGSHAN_2020
 	OC_SET	 tOc[FAG_BHNUMBER];	// 手合故障跳闸 goose
 #endif
 }GOC_SET;
@@ -1669,10 +1655,8 @@ typedef struct TSETSW
 	u8          bzt_dl2_ct;	
 #endif
 
-#ifdef GD_AREA_MAIN_2020
     bool  bTT_PT1_ll_check;    //pt1断线检查投退
     bool  bTT_PT2_ll_check;    //pt2断线检查投退
-#endif
 
 #ifdef PRO_AL_LOCK_HZ
 	DWORD	dU_reclose_gdy_fh;				// 用于解列后重合闸时判电压高值

dtu/dtu_main_t536/app/switch.c

@@ -140,7 +140,7 @@ const s8 * g_sw_do_name[SW_DO_NUM] =
 	"备自投-进线2失压分闸",
 #endif
 
-#if defined GD_AREA_MAIN_2020 || defined SW_FAIL_SINGLE_OUT
+#if defined SW_FAIL_SINGLE_OUT
     "开关失灵",
 #endif
 
@@ -165,16 +165,12 @@ const s8 * g_sw_led_name[SW_LED_NUM]=
 	"联络灯",
 	"分段灯",
 	"重合+FA闭锁灯",
-#ifdef GD_AREA_MAIN_2020
-    "常规保护模式灯",
-#else
-	"保护模式灯",	
-#endif	
+	"保护模式灯",
 	"就地FA模式灯",
 	"分布式模式灯",
 	"X+Y灯",
 	"故障告警灯",
-#if defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020
+#if defined GD_AREA_ECZD_2020
 	"自动解列功能灯",
 	"同期合闸功能灯",
 	"停用保护及FA灯",
@@ -430,7 +426,7 @@ const s8 * g_pub_do_name[PUB_DO_NUM] =
 	"重合软压板分",
 #if defined BHFA_YB_YK || defined BHFAGS_YB_YK
 	//#ifdef GD_AREA_ECZD_2020
-	#if defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020
+	#if defined GD_AREA_ECZD_2020
 	"停用保护总软压板合",
 	"停用保护总软压板分",
 	#else
@@ -451,7 +447,7 @@ const s8 * g_pub_do_name[PUB_DO_NUM] =
 	#endif
 #else
     //#ifdef GD_AREA_ECZD_2020
-    #if defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020
+    #if defined GD_AREA_ECZD_2020
 	"停用保护总软压板合",
 	"停用保护总软压板分",
 	#else
@@ -515,7 +511,7 @@ const s8 * g_pub_led_name[PUB_LED_NUM]=
 	"电池灯",
 	"异常灯",
 //#ifdef GD_AREA_ECZD_2020	
-#if defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020
+#if defined GD_AREA_ECZD_2020
 	"运行告警灯",
 #endif
 	"动作灯",

dtu/dtu_main_t536/app/switch.h

@@ -135,7 +135,7 @@ enum
 	SW_DO_JX2_SY,	//备自投-进线2失压分闸
 #endif	
 
-#if defined GD_AREA_MAIN_2020 || defined SW_FAIL_SINGLE_OUT
+#if defined SW_FAIL_SINGLE_OUT
 	SW_DO_UNSTUCK_SINGLE,
 #endif
 
@@ -169,8 +169,7 @@ enum
 	SW_LED_X_YT,
 
 	SW_LED_FAULT_GJ,//故障告警灯
-//#ifdef GD_AREA_ECZD_2020
-#if defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020
+#if defined GD_AREA_ECZD_2020
 	SW_LED_ZDJL,	//"自动解列功能",
 	SW_LED_TYBHTT,	//"停用保护及FA",
 	SW_LED_TYZDJL,	//"停用自动解列",
@@ -483,7 +482,7 @@ enum
 	PUB_LED_BAT,		// 电池灯
 	PUB_LED_ERR,		// 异常灯
 //#ifdef GD_AREA_ECZD_2020	
-#if defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020
+#if defined GD_AREA_ECZD_2020
 	PUB_LED_RUN_GJ,		// 运行告警，PT断线、气压低、GOOSE通信异常
 #endif
 	PUB_LED_DZ,			// 动作灯,例如电压类动作

dtu/dtu_main_t536/app/vol.c

@@ -968,10 +968,8 @@ void PT_Check(DWORD  dStep)
 					||(FA_ALL_EN(sw)&&pRunSet->tSwSet[sw].bTT_fa_ptdx));
 			bpt1check|=bptdx;
 			bpt2check|=(bptdx&&(pRunSet->a_side_pt_type));// pt2 vv½ÓÏß
-#ifdef GD_AREA_MAIN_2020
             bpt1check&=pRunSet->tSwSet[sw].bTT_PT1_ll_check;
             bpt2check&=pRunSet->tSwSet[sw].bTT_PT2_ll_check;
-#endif
 #ifdef GD_AREA_ECZD_CHAOZHOU_2022
 			if(Umin_tmp < pRunSet->tSwSet[sw].dU_fa_YY)
 			{