整理宏GD_AREA_HEYUAN_2021；

dtu/dtu_main_t536/app/FA.c

@@ -811,6 +811,7 @@ void run_vol_refersh(int sw, DWORD  dStep)
 		soe_record_ev(EV_Z_TIME+sw*EV_SW_NUM, pSW->uSdhz_S.bFlag.bPowerZ, Us1,Us2,0 ); 
 		
 }
+
 void fa_s_Dataset(int sw, DWORD  dStep)
 {
 	bool bY1;//, bY2, bY3,bQDD1,bQDD2;	
@@ -957,23 +958,22 @@ void fa_s_Dataset(int sw, DWORD  dStep)
 	pR->tU0TZ.bU0GjLed = 0;
 	if(pSet->bTT_fa_U0Gj)
 		pR->tU0TZ.bU0GjLed = pSW->uSdhz_S.bFlag.bOverU0;
-	if((soe_check(EV_FA_U0GJ+sw*EV_SW_NUM)!=pSW->uSdhz_S.bFlag.bOverU0) && pSet->bTT_fa_U0Gj &&(pSW->S_Status==S_YTIME || pSW->L_Status==L_YL_TIME
-	#ifdef GD_AREA_HEYUAN_2021
-		|| ((pSW->S_Status==S_USUAL) && pSW->uSdhz_S.bFlag.bYtOn) || ((pSW->L_Status==L_RELAYON) && pSW->uSdhz_L.bFlag.bYtOn)
-	#endif
-	) )
-	{
-		soe_record_ev(EV_FA_U0GJ+sw*EV_SW_NUM, pSW->uSdhz_S.bFlag.bOverU0 ,  U01>U02?U01:U02,I0,0 );	
-	}
-	if(soe_check(EV_BE_UO+sw*EV_SW_NUM) && !pSW->uSdhz_S.bFlag.bOverU0)   // 合前零压返回
+    if ((soe_check(EV_FA_U0GJ + sw * EV_SW_NUM) != pSW->uSdhz_S.bFlag.bOverU0) &&
+        pSet->bTT_fa_U0Gj &&
+        (pSW->S_Status == S_YTIME || pSW->L_Status == L_YL_TIME ||
+         ((pSW->S_Status == S_USUAL) && pSW->uSdhz_S.bFlag.bYtOn) ||
+         ((pSW->L_Status == L_RELAYON) && pSW->uSdhz_L.bFlag.bYtOn)))
+    {
+        soe_record_ev(EV_FA_U0GJ + sw * EV_SW_NUM, pSW->uSdhz_S.bFlag.bOverU0, U01 > U02 ? U01 : U02, I0, 0);
+    }
+    if(soe_check(EV_BE_UO+sw*EV_SW_NUM) && !pSW->uSdhz_S.bFlag.bOverU0)   // 合前零压返回
 		soe_record_ev(EV_BE_UO+sw*EV_SW_NUM, 0, 0,0,0 );
-#ifdef GD_AREA_HEYUAN_2021
+
 	if(pR->tSWST.uSWST.bFlag.bDITW)
 	{
 		pSW->uSdhz_L.bFlag.bYtOn = false;
 		pSW->uSdhz_S.bFlag.bYtOn = false;
 	}
-#endif
 	
 	//残压检测
 	fa_uf_set(sw, pR->run_stu.fa_ls>0, dStep);
@@ -2433,10 +2433,8 @@ static void fa_s_status_run(int sw, DWORD  dStep)
 				fa_sw_opt(sw, EV_FA_FZ);
 			}
 			else if ( pSW->tOnYSTime.boolTrip)//如果Y计时完毕
-			{	
-			#ifdef GD_AREA_HEYUAN_2021
+			{
 				pSW->uSdhz_S.bFlag.bYtOn = true;
-			#endif
 				if(pR->bBSTZ	//闭锁
 				||(!pR->tSWST.uSWST.bFlag.bFAWL&&pSW->uSdhz_S.bFlag.bPowerZ)//有流且失压
 					)
@@ -3596,9 +3594,7 @@ static void fa_l_status_run(int sw, DWORD  dStep)
 			{
 				TempBSTZ=false;
 				fa_l_state_change(sw,L_RELAYON);
-			#ifdef GD_AREA_HEYUAN_2021
 				pSW->uSdhz_L.bFlag.bYtOn = true;
-			#endif
 
 				//2020-03-17 EV_GOOSE_HZ_OK				
 				if(pR->tSWST.uSWST.bFlag.bHZWZ)//开关合位,SOE转供电成功

dtu/dtu_main_t536/app/FA.h

@@ -201,9 +201,7 @@ typedef union USDHZ_U
 		DDWORD   bUAB_NYY_NWY:1;					//UAB非有压非无压态
 		DDWORD   bUBC_NYY_NWY:1;					//UBC非有压非无压态
 	#endif
-	#ifdef GD_AREA_HEYUAN_2021
-		DDWORD   bYtOn:1;					//进入过Y计时标志
-	#endif
+    DDWORD   bYtOn:1;					//进入过Y计时标志
     }bFlag;
 }USDHZ_U;
 

dtu/dtu_main_t536/app/defineSys.h

@@ -110,7 +110,6 @@
 #define GD_AREA_ECZD_2020              // 2020广东配网终端二次功能指导意见
 #define GD_AREA_ZHONGSHAN_2020         // 中山局2020要求
 #define GD_AREA_FOS_2021               // 佛山21年新标准(针对环网柜)
-#define GD_AREA_HEYUAN_2021            // 广东标准2020分支-河源兼容20年硬件配置及19年非标需求
 #define GD_AREA_ECZD_MAOMING           // 广东标准2020分支-茂名局
 #define GD_AREA_ECZD_MEIZHOU_2021      // 20二次指导意见梅州分支
 #define GD_AREA_PROTECTOR              // 分布式装置用作保护用
@@ -243,15 +242,6 @@
 	#define INRUSH_CURRENT_IN_DECIMALS	//涌流识别定值显示为小数并给主站送小数形式
 	#define OCI_XB_0MS					//过流一段0ms的谐波闭锁
 
-#elif defined  GD_AREA_HEYUAN_2021	//广东标准2020分支-河源
-	#define VER_NUM 				    28106			// 版本号28.106
-	#define SOE_RECORD_DELAY
-	#define IEC_JXYB_DEAL				//“检修压板”此遥信点不受检修功能控制，即任何时刻变位都正常上送。
-	#define YC_QUANTITY			//每间隔遥参数量可通过内部定值设定
-	#define BH_FA_INONE_SW			//功能模块配置定值部分，主要特征为BH/FA/智能FA三合一(在开关定值中)
-	#define FUNC_YT_HARD_YB			//lcd_menu新增关键硬件遥信（如常规保护硬压板、FA硬压板等）
-	#define FUNC_REBOOT_BS_HA_JS_3S		//FA手分/遥分闭锁合闸重新上电后检测到持续合位3S后解锁
-
 #elif defined GD_AREA_LIAONING_2021
 	#ifdef __IEC61850_GOOSE_FUNC__
 		#define VER_NUM 					28210			// 版本号28.210

dtu/dtu_main_t536/app/set.c

@@ -86,7 +86,7 @@ BH_SET_GROUP SetGroups[]=  //
     {SETGROUP_TYPE_BH			,1 ,		0,				GROUP_SET_JDXX, 	"保护定值", 		"接地选线", 			},
 #endif
 
-#if defined GD_AREA_ECZD_2020  || defined GD_AREA_HEYUAN_2021
+#if defined GD_AREA_ECZD_2020
 	{SETGROUP_TYPE_BH			,1 ,		SET_HYB_BH, 	GROUP_SET_BHYB, 	"保护定值", 		"保护软压板",	},		
 #endif
 
@@ -106,7 +106,7 @@ BH_SET_GROUP SetGroups[]=  //
 #endif
 	{SETGROUP_TYPE_BH			,1 ,		SET_HYB_FA, 	GROUP_SET_FATT,		"保护定值", 		"馈线自动化控制字", 	},			
 	{SETGROUP_TYPE_BH			,1 ,		SET_HYB_FA, 	GROUP_SET_FADZ,		"保护定值", 		"馈线自动化定值",		},			
-#if defined GD_AREA_ECZD_2020 ||defined GD_AREA_HEYUAN_2021
+#if defined GD_AREA_ECZD_2020
 	{SETGROUP_TYPE_BH			,1 ,		SET_HYB_FA, 	GROUP_SET_FAYB, 	"保护定值", 		"电压电流型软压板",		},			
 #endif
 
@@ -769,18 +769,9 @@ const  TSETTABLE tPubSetTable[]=
 	{SETTYPE_F, 	SET_A,		"测量CT额定二次值",		0.0,		10.0,			5.0 ,		0,			0,				GROUP_SET_EQPPARA,0x5007, FLOAT_R},
 #else
     {SETTYPE_LABEL, SET_NULL,   "设备参数",                     0 ,         0,              0 ,     0,          0,              GROUP_SET_EQPPARA,0X0000, NULL_R},
-    #if defined GD_AREA_HEYUAN_2021
-		{SETTYPE_UINT,  SET_NULL,   "定值区号",             1.0,        SEC_NUMBER-1,                1,      0,          0,              GROUP_SET_EQPPARA,0x5001, UINT_R},
-	#else
-	    {SETTYPE_UINT,  SET_NULL,   "定值区号",                 0.0,        4.0,                0,      0,          0,              GROUP_SET_EQPPARA,0x5001, UINT_R},
-	#endif
-	#if defined GD_AREA_HEYUAN_2021 
-		{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},
-	#else
-	    {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},
-	#endif
+    {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},
@@ -836,9 +827,6 @@ const  TSETTABLE tPubSetTable[]=
 #elif defined GD_AREA_ZHUHAI_FTU
 	{SETTYPE_F,		SET_U,		"电源侧PT额定二次值",	0.0,		300.0,			100.0,	0,			0,				GROUP_SET_EQPPARA,0x5008, FLOAT_R},
 	{SETTYPE_F,		SET_U,		"负荷侧PT额定二次值", 	0.0, 		300.0,			100.0 ,	0,			0,				GROUP_SET_EQPPARA,0x5009, FLOAT_R},
-#elif defined  GD_AREA_HEYUAN_2021
-	{SETTYPE_F, 	SET_U,		"电源侧PT额定二次值",	0.0,		1000.0,			220.0,	0,			0,				GROUP_SET_EQPPARA,0x5008, FLOAT_R},
-	{SETTYPE_F, 	SET_U,		"负荷侧PT额定二次值",	0.0,		1000.0,			220.0 , 0,			0,				GROUP_SET_EQPPARA,0x5009, FLOAT_R},
 #else	
 	{SETTYPE_F,		SET_U,		"电源侧PT额定二次值",	0.0,		300.0,			100.0,	0,			0,				GROUP_SET_EQPPARA,0x5008, FLOAT_R},
 	{SETTYPE_F,		SET_U,		"负荷侧PT额定二次值", 	0.0, 		300.0,			100.0,	0,			0,				GROUP_SET_EQPPARA,0x5009, FLOAT_R},	
@@ -1062,55 +1050,26 @@ const  TSETTABLE tSwSetTable[]=
 	{SETTYPE_LABEL,	SET_NULL,	"保护定值", 					0 , 		0,				0 ,		0,			0,				GROUP_SET_BHDZ,0X0000, NULL_R},
 
     {SETTYPE_F, 	SET_A,		"过流Ⅰ段定值",			0.0 ,	100.0,			100.0 , 0,			0,				GROUP_SET_BHDZ,0X5017, FLOAT_R},	
-	#if defined GD_AREA_HEYUAN_2021
-		{SETTYPE_F, 	SET_S,		"过流Ⅰ段时间",			0.0 ,	100.0,			100.0 , 0,			0,				GROUP_SET_BHDZ,0X0000, FLOAT_R},
-	#else
-		{SETTYPE_F, 	SET_S,		"过流Ⅰ段时间",			0.0 ,	99.0,			99.0 ,	0,			0,				GROUP_SET_BHDZ,0X5018, FLOAT_R},
-	#endif
-		{SETTYPE_F, 	SET_A,		"过流Ⅱ段定值",			0.0 ,	100.0,			100.0 , 0,			0,				GROUP_SET_BHDZ,0X5019, FLOAT_R},	
-	#if defined GD_AREA_HEYUAN_2021
-		{SETTYPE_F, 	SET_S,		"过流Ⅱ段时间",			0.0 ,	100.0,			100.0 , 0,			0,				GROUP_SET_BHDZ,0X0000, FLOAT_R},
-	#else
-		{SETTYPE_F, 	SET_S,		"过流Ⅱ段时间",			0.0 ,	99.0,			99.0 ,	0,			0,				GROUP_SET_BHDZ,0X501A, FLOAT_R},
-	#endif
+    {SETTYPE_F, 	SET_S,		"过流Ⅰ段时间",			0.0 ,	99.0,			99.0 ,	0,			0,				GROUP_SET_BHDZ,0X5018, FLOAT_R},
+    {SETTYPE_F, 	SET_A,		"过流Ⅱ段定值",			0.0 ,	100.0,			100.0 , 0,			0,				GROUP_SET_BHDZ,0X5019, FLOAT_R},	
+    {SETTYPE_F, 	SET_S,		"过流Ⅱ段时间",			0.0 ,	99.0,			99.0 ,	0,			0,				GROUP_SET_BHDZ,0X501A, FLOAT_R},
     {SETTYPE_F, 	SET_A,		"过流Ⅲ段定值",			0.0 ,	100.0,			100.0 , 0,			0,				GROUP_SET_BHDZ,0X0000, FLOAT_R},	
-    #ifdef GD_AREA_HEYUAN_2021
-        {SETTYPE_F, 	SET_S,		"过流Ⅲ段时间",			0.0 ,	100.0,			100.0 , 0,			0,				GROUP_SET_BHDZ,0X0000, FLOAT_R},
-    #else
-        {SETTYPE_F, 	SET_S,		"过流Ⅲ段时间",			0.0 ,	99.0,			99.0 ,	0,			0,				GROUP_SET_BHDZ,0X0000, FLOAT_R},
-    #endif
+    {SETTYPE_F, 	SET_S,		"过流Ⅲ段时间",			0.0 ,	99.0,			99.0 ,	0,			0,				GROUP_SET_BHDZ,0X0000, FLOAT_R},
 
-#if defined GD_AREA_HEYUAN_2021
-	{SETTYPE_F,		SET_A,		"零序Ⅰ段定值",		0.0 , 	100.0,			100.0 ,	0,			0,				GROUP_SET_BHDZ,0X501B, FLOAT_R},	
-	{SETTYPE_F,		SET_S,		"零序Ⅰ段时间",		0.0 , 	1800.0,			1800.0 ,	0,			0,				GROUP_SET_BHDZ,0X501C, FLOAT_R},
-	{SETTYPE_F,		SET_A,		"零序Ⅱ段定值",		0.0 , 	100.0,			100.0 ,	0,			0,				GROUP_SET_BHDZ,0X501D, FLOAT_R},	
-	{SETTYPE_F,		SET_S,		"零序Ⅱ段时间",		0.0 , 	1800.0,			1800.0 ,	0,			0,				GROUP_SET_BHDZ,0X501E, FLOAT_R},
-	#ifdef DISP_SET_LX3	
-		{SETTYPE_F,		SET_A,		"零序Ⅲ段定值",		0.0 , 	100.0,			100.0 ,	0,			0,				GROUP_SET_BHDZ,0X0000, FLOAT_R},	
-		{SETTYPE_F,		SET_S,		"零序Ⅲ段时间",		0.0 , 	1800.0,			1800.0 ,	0,			0,				GROUP_SET_BHDZ,0X0000, FLOAT_R},
-	#endif
-	{SETTYPE_F,		SET_U,		"零序过电压定值",		0.0 , 	100.0,			100.0 ,	0,			0,				GROUP_SET_BHDZ,0, FLOAT_R},	//
-	{SETTYPE_F,		SET_S,		"零序过电压时间",		0.0 , 	100.0,			100.0 ,	0,			0,				GROUP_SET_BHDZ,0, FLOAT_R},
-	{SETTYPE_F, 	SET_A,		"后加速过流定值",	0.0 ,	100.0,			0 , 0,			0,			GROUP_SET_BHDZ,0, FLOAT_R},
-	{SETTYPE_F, 	SET_S,		"后加速过流时间",	0.0 ,	100.0,			0 ,	0,			0,			GROUP_SET_BHDZ,0, FLOAT_R},
-	{SETTYPE_F, 	SET_A,		"后加速零流定值",	0.0,		100.0,		0 ,	0,			0,			GROUP_SET_BHDZ,0, FLOAT_R},
-	{SETTYPE_F, 	SET_S,		"后加速零流时间",	0.0 ,	100.0,			0.1 ,	0,			0,			GROUP_SET_BHDZ,0, FLOAT_R},
-#else
-	{SETTYPE_F,		SET_A,		"零序过流Ⅰ段定值",		0.0 , 	100.0,			100.0 ,	0,			0,				GROUP_SET_BHDZ,0X501B, FLOAT_R},	
-	{SETTYPE_F,		SET_S,		"零序过流Ⅰ段时间",		0.0 , 	1800.0,			1800.0 ,	0,			0,				GROUP_SET_BHDZ,0X501C, FLOAT_R},
-	{SETTYPE_F,		SET_A,		"零序过流Ⅱ段定值",		0.0 , 	100.0,			100.0 ,	0,			0,				GROUP_SET_BHDZ,0X501D, FLOAT_R},	
-	{SETTYPE_F,		SET_S,		"零序过流Ⅱ段时间",		0.0 , 	1800.0,			1800.0 ,	0,			0,				GROUP_SET_BHDZ,0X501E, FLOAT_R},
-	#ifdef DISP_SET_LX3	
-		{SETTYPE_F,		SET_A,		"零序过流Ⅲ段定值",		0.0 , 	100.0,			100.0 ,	0,			0,				GROUP_SET_BHDZ,0X0000, FLOAT_R},	
-		{SETTYPE_F,		SET_S,		"零序过流Ⅲ段时间",		0.0 , 	1800.0,			1800.0 ,	0,			0,				GROUP_SET_BHDZ,0X0000, FLOAT_R},
-	#endif
-		{SETTYPE_F,		SET_U,		"零序过电压保护定值",		0.0 , 	100.0,			100.0 ,	0,			0,				GROUP_SET_BHDZ,0, FLOAT_R},
-		{SETTYPE_F,		SET_S,		"零序过电压保护时间",		0.0 , 	99.0,			99.0 ,	0,			0,				GROUP_SET_BHDZ,0, FLOAT_R},
-		{SETTYPE_F, 	SET_A,		"后加速过流保护定值",	0.0 ,	100.0,			0 , 0,			0,			GROUP_SET_BHDZ,0, FLOAT_R},
-		{SETTYPE_F, 	SET_S,		"后加速过流保护时间",	0.0 ,	99.0,			0 ,	0,			0,			GROUP_SET_BHDZ,0, FLOAT_R},
-		{SETTYPE_F, 	SET_A,		"后加速零序电流保护定值",	0.0,		100.0,		0 ,	0,			0,			GROUP_SET_BHDZ,0, FLOAT_R},
-		{SETTYPE_F, 	SET_S,		"后加速零序电流保护时间",	0.0 ,	99.0,			0.1 ,	0,			0,			GROUP_SET_BHDZ,0, FLOAT_R},
+    {SETTYPE_F,		SET_A,		"零序过流Ⅰ段定值",		0.0 , 	100.0,			100.0 ,	0,			0,				GROUP_SET_BHDZ,0X501B, FLOAT_R},	
+    {SETTYPE_F,		SET_S,		"零序过流Ⅰ段时间",		0.0 , 	1800.0,			1800.0 ,	0,			0,				GROUP_SET_BHDZ,0X501C, FLOAT_R},
+    {SETTYPE_F,		SET_A,		"零序过流Ⅱ段定值",		0.0 , 	100.0,			100.0 ,	0,			0,				GROUP_SET_BHDZ,0X501D, FLOAT_R},	
+    {SETTYPE_F,		SET_S,		"零序过流Ⅱ段时间",		0.0 , 	1800.0,			1800.0 ,	0,			0,				GROUP_SET_BHDZ,0X501E, FLOAT_R},
+#ifdef DISP_SET_LX3	
+    {SETTYPE_F,		SET_A,		"零序过流Ⅲ段定值",		0.0 , 	100.0,			100.0 ,	0,			0,				GROUP_SET_BHDZ,0X0000, FLOAT_R},	
+    {SETTYPE_F,		SET_S,		"零序过流Ⅲ段时间",		0.0 , 	1800.0,			1800.0 ,	0,			0,				GROUP_SET_BHDZ,0X0000, FLOAT_R},
 #endif
+    {SETTYPE_F,		SET_U,		"零序过电压保护定值",		0.0 , 	100.0,			100.0 ,	0,			0,				GROUP_SET_BHDZ,0, FLOAT_R},
+    {SETTYPE_F,		SET_S,		"零序过电压保护时间",		0.0 , 	99.0,			99.0 ,	0,			0,				GROUP_SET_BHDZ,0, FLOAT_R},
+    {SETTYPE_F, 	SET_A,		"后加速过流保护定值",	0.0 ,	100.0,			0 , 0,			0,			GROUP_SET_BHDZ,0, FLOAT_R},
+    {SETTYPE_F, 	SET_S,		"后加速过流保护时间",	0.0 ,	99.0,			0 ,	0,			0,			GROUP_SET_BHDZ,0, FLOAT_R},
+    {SETTYPE_F, 	SET_A,		"后加速零序电流保护定值",	0.0,		100.0,		0 ,	0,			0,			GROUP_SET_BHDZ,0, FLOAT_R},
+    {SETTYPE_F, 	SET_S,		"后加速零序电流保护时间",	0.0 ,	99.0,			0.1 ,	0,			0,			GROUP_SET_BHDZ,0, FLOAT_R},
 
 #ifdef INRUSH_CURRENT_IN_DECIMALS
 	{SETTYPE_F,		SET_NULL,	"涌流识别定值",			0.0 , 	1.00,			0.15 ,	0,			0,				GROUP_SET_BHDZ,0X501F, FLOAT_R},	
@@ -1124,11 +1083,7 @@ const  TSETTABLE tSwSetTable[]=
 #endif
 
 	{SETTYPE_F, 	SET_S,		"一次重合闸时间",		0.0 ,	300.0,			3.0 ,		0,			0,				GROUP_SET_BHDZ,0X5020, FLOAT_R},
-	#ifdef GD_AREA_HEYUAN_2021
-		{SETTYPE_F, 	SET_S,		"重合闸闭锁时间",		0.0 ,	300.0,			0.0 ,		0,			0,				GROUP_SET_BHDZ,0X5021, FLOAT_R},
-	#else
-		{SETTYPE_F, 	SET_S,		"二次重合闸闭锁时间",		0.0 ,	300.0,			0.0 ,		0,			0,				GROUP_SET_BHDZ,0X5021, FLOAT_R},
-	#endif
+    {SETTYPE_F, 	SET_S,		"二次重合闸闭锁时间",		0.0 ,	300.0,			0.0 ,		0,			0,				GROUP_SET_BHDZ,0X5021, FLOAT_R},
 	{SETTYPE_F, 	SET_S,		"二次重合闸时间",		0.0 ,	300.0,			3.0 ,		0,			0,				GROUP_SET_BHDZ,0X5022, FLOAT_R},
 	#ifdef DISP_SET_CH_T3
 		{SETTYPE_F, 	SET_S,		"三次重合闸时间",		0.0 ,	300.0,			3.0 ,		0,			0,				GROUP_SET_BHDZ,0X0000, FLOAT_R},
@@ -1173,17 +1128,12 @@ const  TSETTABLE tSwSetTable[]=
     {SETTYPE_F, 	SET_S,		"接地选线告警时间",	            0,		1000,			    0 ,	    0,				0,				GROUP_SET_JDXX,0X0000, FLOAT_R},
 #endif
 
-#ifdef GD_AREA_HEYUAN_2021
-	{SETTYPE_LABEL,	SET_NULL,	"保护软压板", 					0 , 		0,				0 ,		0,			0,	GROUP_SET_BHYB,0X0000, NULL_R},
-	{SETTYPE_LIST,	SET_NULL,	"重合闸软压板",	0 , 		TTListNum-1,		1,		TTList,		TTListNum,		GROUP_SET_BHYB,0X5024, BOOL_R},
-#else
-	#ifdef GD_AREA_ECZD_2020	
-		{SETTYPE_LABEL,	SET_NULL,	"保护软压板", 					0 , 		0,				0 ,		0,			0,	GROUP_SET_BHYB,0X0000, NULL_R},
-		#ifdef GD_AREA_ECZD_MAOMING
-			{SETTYPE_LIST,	SET_NULL,	"远方整定投入软压板",	0 , 		TTListNum-1,		0,		TTList,		TTListNum,		GROUP_SET_BHYB,0X5024, BOOL_R},
-		#endif
-		{SETTYPE_LIST,	SET_NULL,	"重合闸投入软压板",	0 , 		TTListNum-1,		0,		TTList,		TTListNum,		GROUP_SET_BHYB,0X5024, BOOL_R},
-	#endif
+#ifdef GD_AREA_ECZD_2020	
+    {SETTYPE_LABEL,	SET_NULL,	"保护软压板", 					0 , 		0,				0 ,		0,			0,	GROUP_SET_BHYB,0X0000, NULL_R},
+    #ifdef GD_AREA_ECZD_MAOMING
+        {SETTYPE_LIST,	SET_NULL,	"远方整定投入软压板",	0 , 		TTListNum-1,		0,		TTList,		TTListNum,		GROUP_SET_BHYB,0X5024, BOOL_R},
+    #endif
+    {SETTYPE_LIST,	SET_NULL,	"重合闸投入软压板",	0 , 		TTListNum-1,		0,		TTList,		TTListNum,		GROUP_SET_BHYB,0X5024, BOOL_R},
 #endif
 
 	{SETTYPE_LABEL,	SET_NULL,	"反时限保护", 					0 , 		0,				0 ,		0,			0,				GROUP_SET_FSX,0X0000, NULL_R},
@@ -1199,17 +1149,10 @@ const  TSETTABLE tSwSetTable[]=
 	{SETTYPE_F, 	SET_ANG,	"同期允许相角差",				0.0 ,	50.0,			30.0 ,	0,			0,				GROUP_SET_TQHZ,0X0000, FLOAT_R},
 	{SETTYPE_F, 	SET_HZ, 	"同期允许频率差",				0.0 ,	5.0,				2.0 ,		0,			0,				GROUP_SET_TQHZ,0X0000, FLOAT_R},
 #else
-	#ifdef GD_AREA_HEYUAN_2021
-		{SETTYPE_LIST,	SET_NULL,	"同期合闸控制字", 			0 , 		TTListNum-1,		0,		TTList,		TTListNum,		GROUP_SET_TQHZ,0X0000, BOOL_R},
-		{SETTYPE_F,		SET_PERUN,	"同期允许电压差", 				0.0 , 	50.0,			20.0 ,	0,			0,				GROUP_SET_TQHZ,0X0000, FLOAT_R},
-		{SETTYPE_F,		SET_ANG,	"同期允许相角差", 				0.0 , 	50.0,			30.0 ,	0,			0,				GROUP_SET_TQHZ,0X0000, FLOAT_R},
-		{SETTYPE_F,		SET_HZ,		"同期允许频率差", 				0.0 , 	5.0,				2.0 ,		0,			0,				GROUP_SET_TQHZ,0X0000, FLOAT_R},
-	#else
-		{SETTYPE_LIST,	SET_NULL,	"同期合闸功能控制字", 			0 , 		TTListNum-1,		0,		TTList,		TTListNum,		GROUP_SET_TQHZ,0X0000, BOOL_R},
-		{SETTYPE_F,		SET_PERUN,	"同期合闸允许电压差", 				0.0 , 	50.0,			25.0 ,	0,			0,				GROUP_SET_TQHZ,0X0000, FLOAT_R},
-		{SETTYPE_F,		SET_ANG,	"同期合闸允许相角差", 				0.0 , 	50.0,			30.0 ,	0,			0,				GROUP_SET_TQHZ,0X0000, FLOAT_R},
-		{SETTYPE_F,		SET_HZ,		"同期合闸允许频率差", 				0.0 , 	5.0,				2.0 ,		0,			0,				GROUP_SET_TQHZ,0X0000, FLOAT_R},
-	#endif
+    {SETTYPE_LIST,	SET_NULL,	"同期合闸功能控制字", 			0 , 		TTListNum-1,		0,		TTList,		TTListNum,		GROUP_SET_TQHZ,0X0000, BOOL_R},
+    {SETTYPE_F,		SET_PERUN,	"同期合闸允许电压差", 				0.0 , 	50.0,			25.0 ,	0,			0,				GROUP_SET_TQHZ,0X0000, FLOAT_R},
+    {SETTYPE_F,		SET_ANG,	"同期合闸允许相角差", 				0.0 , 	50.0,			30.0 ,	0,			0,				GROUP_SET_TQHZ,0X0000, FLOAT_R},
+    {SETTYPE_F,		SET_HZ,		"同期合闸允许频率差", 				0.0 , 	5.0,				2.0 ,		0,			0,				GROUP_SET_TQHZ,0X0000, FLOAT_R},
 #endif
 
 	{SETTYPE_LABEL,	SET_NULL,	"电压解列", 					0 , 		0,				0 ,		0,			0,				GROUP_SET_DYJL,0X0000, NULL_R},
@@ -1256,11 +1199,7 @@ const  TSETTABLE tSwSetTable[]=
 #else
 	{SETTYPE_F,		SET_HZ,		"低频解列fL", 			47.1 , 	49.9,			47.6 ,	0,			0,				GROUP_SET_PLJL,0X0000, FLOAT_R},
 	{SETTYPE_F,		SET_S,		"低频解列延时TfL",			0.0 , 	999.0,			2.0 ,	       0,			0,				GROUP_SET_PLJL,0X0000, FLOAT_R},
-	#ifdef GD_AREA_HEYUAN_2021
-		{SETTYPE_F,		SET_HZ,		"高频解列fH", 			50.0 , 	55.0,			51.0 ,	0,			0,				GROUP_SET_PLJL,0X0000, FLOAT_R},
-	#else
-		{SETTYPE_F,		SET_HZ,		"高频解列fH", 			50.1 , 	55.0,			51.0 ,	0,			0,				GROUP_SET_PLJL,0X0000, FLOAT_R},
-	#endif
+    {SETTYPE_F,		SET_HZ,		"高频解列fH", 			50.1 , 	55.0,			51.0 ,	0,			0,				GROUP_SET_PLJL,0X0000, FLOAT_R},
 	{SETTYPE_F,		SET_S,		"高频解列延时TfH",			0.0 , 	999.0,			2.0 ,	      0,			0,				GROUP_SET_PLJL,0X0000, FLOAT_R},
 #endif
 
@@ -1304,15 +1243,13 @@ const  TSETTABLE tSwSetTable[]=
 		{SETTYPE_LIST,	SET_NULL,	"合到故障主动跳闸", 		0 , 		TTListNum-1,		1,		TTList,		TTListNum,		GROUP_SET_FATT,0, BOOL_R},	
 	#endif
 #else //非2020二次指导意见 2020-9-8
-		{SETTYPE_LIST,	SET_NULL,	"通信模式", 			1 , 		TFA_TypeNum-1,	1,		TFA_Type,	TFA_TypeNum,	GROUP_SET_FATT,0x500B, UINT_R},
-	#ifndef GD_AREA_HEYUAN_2021
-		#if defined GD_AREA_SHANWEI_2021
-		{SETTYPE_LIST,	SET_NULL,	"分段/联络模式", 			0 , 		KGFunListNum-1,	1,		KGFunList,	KGFunListNum,	GROUP_SET_FATT,0x500C, UINT_R},
-		#else
-		{SETTYPE_LIST,	SET_NULL,	"分段/联络模式", 			1 , 		KGFunListNum-1,	1,		KGFunList,	KGFunListNum,	GROUP_SET_FATT,0x500C, UINT_R},
-		#endif
-	#endif
-	#if defined GD_AREA_ZHONGSHAN || defined GD_AREA_HEYUAN_2021
+    {SETTYPE_LIST,	SET_NULL,	"通信模式", 			1 , 		TFA_TypeNum-1,	1,		TFA_Type,	TFA_TypeNum,	GROUP_SET_FATT,0x500B, UINT_R},
+    #if defined GD_AREA_SHANWEI_2021
+    {SETTYPE_LIST,	SET_NULL,	"分段/联络模式", 			0 , 		KGFunListNum-1,	1,		KGFunList,	KGFunListNum,	GROUP_SET_FATT,0x500C, UINT_R},
+    #else
+    {SETTYPE_LIST,	SET_NULL,	"分段/联络模式", 			1 , 		KGFunListNum-1,	1,		KGFunList,	KGFunListNum,	GROUP_SET_FATT,0x500C, UINT_R},
+    #endif
+	#if defined GD_AREA_ZHONGSHAN
 		{SETTYPE_LIST,	SET_NULL,	"母线侧得电延时合闸",		0 , 		TTListNum-1,		0,		TTList, 	TTListNum,		GROUP_SET_FATT,0x500D, BOOL_R},
 		{SETTYPE_LIST,	SET_NULL,	"线路侧得电延时合闸",		0 , 		TTListNum-1,		0,		TTList, 	TTListNum,		GROUP_SET_FATT,0x500E, BOOL_R},
 		{SETTYPE_LIST,	SET_NULL,	"母线侧失电延时合闸",		0 , 		TTListNum-1,		0,		TTList, 	TTListNum,		GROUP_SET_FATT,0x500F, BOOL_R},
@@ -1339,16 +1276,12 @@ 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 && !defined GD_AREA_HEYUAN_2021
+    #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
-    #ifdef GD_AREA_HEYUAN_2021
-        {SETTYPE_LIST,  SET_NULL,   "合到零压保护",         0 ,         TZCKListNum-1,  0,      TZCKList,   TZCKListNum,        GROUP_SET_FATT,0x5018, UINT_R},
-    #else
     {SETTYPE_LIST,  SET_NULL,   "零序电压保护",         0 ,         TZCKListNum-1,  0,      TZCKList,   TZCKListNum,        GROUP_SET_FATT,0x5018, UINT_R},
-    #endif
     {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},
     //广东新标准
@@ -1441,17 +1374,9 @@ const  TSETTABLE tSwSetTable[]=
 	{SETTYPE_F,		SET_PERUN,	"失压定值", 					0.0 , 	100.0,			20.0 ,	0,			0,				GROUP_SET_FADZ,0x501D, FLOAT_R},
 	{SETTYPE_F,		SET_S,		"失压定值时间",			0.0 , 	99.0,			0.1 ,		0,			0,				GROUP_SET_FADZ,0x501E, FLOAT_R},
 	{SETTYPE_F,		SET_S,		"得电合闸延时(X时限)",						0 , 		999,				7 ,		0,			0,				GROUP_SET_FADZ,0x501F, FLOAT_R},
-	#ifdef GD_AREA_HEYUAN_2021
-		{SETTYPE_F,		SET_S,		"故障检测时限(Y时限)",						0 , 		300,			5 ,		0,			0,				GROUP_SET_FADZ,0x5020, FLOAT_R},
-	#else
 	{SETTYPE_F,		SET_S,		"故障检测时限(Y时限)",						0 , 		99,				5 ,		0,			0,				GROUP_SET_FADZ,0x5020, FLOAT_R},
-	#endif
 	{SETTYPE_F,		SET_S,		"失压合闸延时(XL时限)",						0 , 		999,				7 ,		0,			0,				GROUP_SET_FADZ,0x5021, FLOAT_R},
-	#ifdef GD_AREA_HEYUAN_2021
-		{SETTYPE_F,		SET_S,		"失电分闸延时(Z时限)",			0 , 		300,			3.5 ,		0,			0,				GROUP_SET_FADZ,0x5022, FLOAT_R},
-	#else
 	{SETTYPE_F,		SET_S,		"失电分闸延时(Z时限)",			0 , 		99,				3.5 ,		0,			0,				GROUP_SET_FADZ,0x5022, FLOAT_R},
-	#endif
     {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},
@@ -1472,13 +1397,8 @@ const  TSETTABLE tSwSetTable[]=
             {SETTYPE_F,     SET_S,      "接地故障电流时间",         0 , 99,             99 ,        0,          0,              GROUP_SET_FADZ,0x5026, FLOAT_R},
         #endif
 	#endif
-	#ifdef GD_AREA_HEYUAN_2021
-		{SETTYPE_F,		SET_U,		"合到零压保护电压", 			0.0 , 	220.0,			20.0 ,	0,			0,				GROUP_SET_FADZ,0x0000, FLOAT_R},
-		{SETTYPE_F,		SET_S,		"合到零压保护时间",			0.0 , 	100.0,			0.6 ,		0,			0,				GROUP_SET_FADZ,0X0000, FLOAT_R},
-	#else
 	{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},
-	#endif
     {SETTYPE_F, 	SET_A,		"相间过流告警电流定值",		0.0 ,	100.0,			100.0 , 	0,			0,				GROUP_SET_FADZ,0x5024, FLOAT_R},
     {SETTYPE_F, 	SET_S,		"相间过流告警时间定值",			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,0x5025, FLOAT_R},
@@ -1498,10 +1418,6 @@ const  TSETTABLE tSwSetTable[]=
 		{SETTYPE_UINT,	SET_NULL,	"过流脉冲次数",		1,		1000,				3 , 0,		0,			GROUP_SET_FADZ,0x0000, UINT_R},
 		{SETTYPE_F, 	SET_S,		"过流脉冲复归时间",		0.1 ,	65536.0,			300.0 , 	0,			0,			GROUP_SET_FADZ,0x0000, FLOAT_R},
 	#endif
-	#ifdef GD_AREA_HEYUAN_2021
-		{SETTYPE_LABEL, SET_NULL,   "馈线自动化软压板",           0 ,         0,              0 ,     0,          0,              GROUP_SET_FAYB,0X0000, NULL_R},
-		{SETTYPE_LIST,	SET_NULL,	"分段/联络模式软压板", 			0 , 		KGFunListNum-1,	0,		KGFunList,	KGFunListNum,	GROUP_SET_FAYB,0x500C, BOOL_R},
-	#endif
 #endif
 
 #if defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020
@@ -1633,9 +1549,6 @@ const  TSETTABLE tSwSetTable[]=
 		#endif
         #ifdef GD_AREA_MAIN_2020  //广东标准2020要求重合闸投入软压板   和停用FA和保护软压板
             {SETTYPE_LIST,  SET_NULL,   "停用保护及FA功能软压板",   0 ,         TTListNum-1,        0,      TTList,     TTListNum,      GROUP_SET_YB,0X5026, BOOL_R},
-            #ifndef GD_AREA_HEYUAN_2021
-            {SETTYPE_LIST,  SET_NULL,   "重合闸投入软压板", 0 ,         TTListNum-1,        1,      TTList,     TTListNum,      GROUP_SET_YB,0X5024, BOOL_R},
-            #endif
         #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},
@@ -1733,9 +1646,7 @@ const  TSETTABLE tSwSetTable[]=
 	{SETTYPE_LIST,  SET_NULL,   "同期合闸",			0 ,       TTListNum-1,      1,     		 TTList,     	 TTListNum,      		GROUP_SET_MODE,0X0000, BOOL_R},
 	{SETTYPE_LIST,  SET_NULL,   "自动解列",			0 ,       TTListNum-1,      1,      	 TTList,     	 TTListNum,      		GROUP_SET_MODE,0X0000, BOOL_R},
 	{SETTYPE_LABEL, SET_NULL,	"软压板", 			0 , 				0,		0,				  0,				 0,				GROUP_SET_SOFT,0X0000, NULL_R},
-	#ifdef GD_AREA_HEYUAN_2021
-		{SETTYPE_LIST,	SET_NULL,	"远方定值整定投入",			0 ,  	  TTListNum-1,		1,			 TTList,		 TTListNum, 			GROUP_SET_SOFT,0X0000, BOOL_R},
-	#elif defined GD_AREA_ECZD_CHAOZHOU_2022
+	#ifdef  GD_AREA_ECZD_CHAOZHOU_2022
 		{SETTYPE_LIST,	SET_NULL,	"远方修改功能", 		0 , 	  TTListNum-1,		1,			 TTList,		 TTListNum, 			GROUP_SET_SOFT,0X0000, BOOL_R},
 	#else
 	{SETTYPE_LIST,	SET_NULL,	"远方投入",			0 ,  	  TTListNum-1,		1,			 TTList,		 TTListNum, 			GROUP_SET_SOFT,0X0000, BOOL_R},
@@ -3914,9 +3825,7 @@ bool MakeRunSet(bool bFirst)
 		//#endif
 			poc->bDir=false;
 			poc->bGj=false;
-		#if defined GD_AREA_HEYUAN_2021//惠州局要求快速分闸延时相间跟接地延时分开	
-			poc->dT=GetSetTIME(psetbuf[SET_FA_GZTZ_T2+sw*SW_SET_NUMBER ].ff);
-		#elif  defined GD_AREA_SHANTOU || defined GD_AREA_MAIN_2020 //汕头局要求合后电流两段处理(I+t) 广东标准2020与汕头局保持一致
+		#if defined GD_AREA_SHANTOU || 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
 		    #ifdef GD_AREA_ZHONGSHAN_2020
@@ -3956,11 +3865,7 @@ bool MakeRunSet(bool bFirst)
 		    	ptSet->tSwSet[sw].bTT_3U0Gj = (((WORD)psetbuf[SET_3U0_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false);
 		    #else
 				ptSet->tSwSet[sw].bTT_3U0Tz = (((WORD)psetbuf[SET_3U0_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false);
-				#if defined GD_AREA_HEYUAN_2021
-					ptSet->tSwSet[sw].bTT_3U0Gj = (((WORD)psetbuf[SET_3U0_TT+sw*SW_SET_NUMBER ].ff==0 )?true:false);
-				#else
-					ptSet->tSwSet[sw].bTT_3U0Gj = 0;		
-				#endif
+                ptSet->tSwSet[sw].bTT_3U0Gj = 0;
 			#endif
         #else
 		    ptSet->tSwSet[sw].bTT_3U0Tz = (((WORD)psetbuf[SET_3U0_TT+sw*SW_SET_NUMBER ].ff==2 )?true:false);

dtu/dtu_main_t536/app/set.h

@@ -123,7 +123,7 @@ enum
 #ifdef FUN_JDXX
     GROUP_SET_JDXX, 		// 接地选线 
 #endif
-#if defined GD_AREA_ECZD_2020 || defined GD_AREA_HEYUAN_2021
+#if defined GD_AREA_ECZD_2020
 	GROUP_SET_BHYB, 		// 保护软压板
 #endif
 	GROUP_SET_FSX,   			// 反时限定值	
@@ -135,7 +135,7 @@ enum
 #endif
 	GROUP_SET_FATT,			// 就地FA控制字
 	GROUP_SET_FADZ,			// 就地FA定值
-#if defined GD_AREA_ECZD_2020 || defined GD_AREA_HEYUAN_2021
+#if defined GD_AREA_ECZD_2020
 	GROUP_SET_FAYB,			// 就地FA软压板
 #endif
 	GROUP_SET_GOOSETT,			// 分布式FA控制字
@@ -436,17 +436,12 @@ enum
     SET_JDXX_GJ_TIME,	// 小电流接地告警时间
 #endif
 
-#ifdef GD_AREA_HEYUAN_2021
-	SET_LABLE_BHYB,		//列表名
-	SET_CHZ_YB,				//重合闸软压板
-#else
-	#ifdef GD_AREA_ECZD_2020	
-		SET_LABLE_BHYB,		//列表名
-		#ifdef GD_AREA_ECZD_MAOMING
-			SET_EDIT_PAR_YB1,	//远方整定投入软压板
-		#endif
-		SET_CHZ_YB,				//重合闸软压板
-	#endif
+#ifdef GD_AREA_ECZD_2020	
+    SET_LABLE_BHYB,		//列表名
+    #ifdef GD_AREA_ECZD_MAOMING
+        SET_EDIT_PAR_YB1,	//远方整定投入软压板
+    #endif
+    SET_CHZ_YB,				//重合闸软压板
 #endif
 
 	SET_LABLE_FSX,		//列表名
@@ -564,10 +559,7 @@ enum
 	#endif
 	SET_SL_TT,			// 分段、联络
 #else //非2020二次指导意见 2020-9-8
-	SET_FA_TT,				//就地馈线自动化选型	
-	#ifndef GD_AREA_HEYUAN_2021
-		SET_SL_TT,			// 分段、联络
-	#endif
+	SET_FA_TT,				//就地馈线自动化选型
 	SET_P_YY_TT,			//电源侧上电合闸
 	SET_L_YY_TT,			//负荷侧上电合闸	
 	SET_P_WY_TT,			//电源侧失电电合闸
@@ -628,9 +620,6 @@ enum
 	SET_FA_U0_U,			//零序电压定值
 	SET_FA_U0_T,			//零序电压时间
     SET_FA_GZTZ_T,			//快速跳闸延时
-    #if defined GD_AREA_HEYUAN_2021		//惠州局要求快速分闸延时相间跟接地延时分开	
-        SET_FA_GZTZ_T2,			//接地快速跳闸延时
-    #endif
     SET_FA_DLBS_I,			//非遮断电流值
     SET_FA_XBCOE,			//涌流识别定值(谐波含量)
     //FA扩展定值	
@@ -646,10 +635,6 @@ enum
 		SET_FA_OC_COUNT_M,		//过流脉冲计数 M
 		SET_FA_OC_COUNT_T,		//过流脉冲时间
 	#endif
-	#ifdef GD_AREA_HEYUAN_2021
-		SET_LABLE_SOFTYB,		//列表名 
-		SET_SL_TT,			// 分段、联络
-	#endif
 #endif
 
 	SET_LABLE_GOOSETT,		//列表名	
@@ -770,9 +755,6 @@ enum
 	#else
 		SET_EDIT_PAR_YB,	//远程修改定值压板
         SET_BH_YB,	//保护总/停用
-        #ifndef GD_AREA_HEYUAN_2021
-            SET_CHZ_YB, 		//重合闸压板
-        #endif
 		SET_KZ_OUT_YB,		//控制出口压板	
         SET_TQ_YB, 		// 同期合闸软压板
 	    #if defined BHFAGS_YB_YK && !defined BH_FA_INONE_SW