整理GD_AREA_ECZD_SHAOGUAN_2021宏；

dtu/dtu_main_t536/app/Appconfig.c

@@ -260,11 +260,7 @@ const SOE_DEF tAllSOE[]=
 	{0xD4,		{EV_PARA_Ia,EV_PARA_Ib,	EV_PARA_Ic},		"相间过流告警"},	
 	{0xD4,		{EV_PARA_I0,	EV_PARA_U0,	0},				"接地告警"},
 #else
-	#ifdef GD_AREA_ECZD_SHAOGUAN_2021
-	{0x94,		{EV_PARA_Ia,EV_PARA_Ib, EV_PARA_Ic},		"相间过流I段告警"},
-	#else
-	{0x94,		{EV_PARA_Ia,EV_PARA_Ib, EV_PARA_Ic},		"相间过流告警"},	
-	#endif
+	{0x94,		{EV_PARA_Ia,EV_PARA_Ib, EV_PARA_Ic},		"相间过流告警"},
 
 	{0x94,		{EV_PARA_I0,	EV_PARA_U0, 0}, 			"接地告警"},
 #endif
@@ -765,12 +761,6 @@ const SOE_DEF tAllSOE[]=
 	{0x04,		{0, 		0,			0}, 				"传动跳闸失败"},
 	{0x04,		{0, 		0,			0}, 				"传动合闸失败"},
 #endif
-#ifdef GD_AREA_ECZD_SHAOGUAN_2021
-	{0x04,		{0, 		0,			0}, 				"停用保护及FA定值"},
-	{0x04,		{0, 		0,			0}, 				"重合闸投入定值"},
-	{0x04,		{0, 		0,			0}, 				"停用自动解列定值"},
-	{0x04,		{0, 		0,			0}, 				"停用同期合闸定值"},
-#endif
 
 #ifdef FUNC_DRIVE_JY
 	{0x04,		{0, 		0,			0}, 				"不停电传动启动失败"},

dtu/dtu_main_t536/app/Appconfig.h

@@ -459,12 +459,6 @@ enum
 	EV_DRIVE_TZ_FAIL,		//不停电传动跳闸失败
 	EV_DRIVE_HZ_FAIL,		//不停电传动合闸失败
 #endif
-#ifdef GD_AREA_ECZD_SHAOGUAN_2021
-	EV_TY_SOFT_YB,		//停用保护及FA功能软压板
-	EV_CHZ_SOFT_YB, 	//重合闸功能投入软压板
-	EV_JL_SOFT_YB,		//自动解列软压板
-	EV_TQ_SOFT_YB,		//停用同期功能软压板
-#endif
 
 #ifdef FUNC_DRIVE_JY
 	EV_DRIVE_FAIL,		//不停电传动启动失败

dtu/dtu_main_t536/app/IECComm.c

@@ -3533,11 +3533,6 @@ bool selectRunParId(WORD sw, WORD parId, BYTE *pbuf)
 		|| parId==0x5501 || parId==0x5502 || parId==0x5503 || parId==0x5504 || parId==0x5505
 		|| parId==0x5506 || parId==0x5507 || parId==0x5508 || parId==0x5509 || parId==0x550a)
 		return false;
-/*#elif defined GD_AREA_ECZD_SHAOGUAN_2021
-	if(parId==0x5001 || parId==0x5002 || parId==0x5003 || parId==0x5004 || parId==0x5005 || parId==0x5006)
-	{//5001：保护/FA，5002：同期合闸，5003：自动解列，5004：停用，5005：远方投入，5006：定值区号
-		return false;
-	}*/
 #elif defined GD_AREA_DONGGUAN_2021
 		if(parId==0x500C || parId==0x5065)
 		{
@@ -3709,11 +3704,6 @@ bool wirteRunParId(WORD sw, WORD parId, BYTE *pbuf,u8 ti)
 		|| parId==0x5501 || parId==0x5502 || parId==0x5503 || parId==0x5504 || parId==0x5505
 		|| parId==0x5506 || parId==0x5507 || parId==0x5508 || parId==0x5509 || parId==0x550a)
 		return false;
-/*#elif defined GD_AREA_ECZD_SHAOGUAN_2021
-	if(parId==0x5001 || parId==0x5002 || parId==0x5003 || parId==0x5004 || parId==0x5005 || parId==0x5006)
-	{//5001：保护/FA，5002：同期合闸，5003：自动解列，5004：停用，5005：远方投入，5006：定值区号
-		return false;
-	}*/
 #elif defined GD_AREA_DONGGUAN_2021
 	if(parId==0x500C || parId==0x5065)
 	{

dtu/dtu_main_t536/app/Sys.c

@@ -974,9 +974,6 @@ char * const g_RmtCtrl_ErrCode[]=
 	"遥控压板退出",					// 26
 	"开关未储能，禁止合闸",				// 27
 	"检修状态!",				// 28
-#ifdef GD_AREA_ECZD_SHAOGUAN_2021
-	"非电压电流模式下,不允许遥控预置分段/联络开关",				// 29
-#endif
 };
 #define ERRCODE_NUM	(sizeof(g_RmtCtrl_ErrCode)/sizeof(g_RmtCtrl_ErrCode[0]))
 
@@ -1171,12 +1168,6 @@ int _RemoteCtrl(BYTE yktype,BYTE index,BYTE ykval,WORD wID)
 					// 超范围
 					return -6;
 				}
-#ifdef GD_AREA_ECZD_SHAOGUAN_2021
-                else if( (!(FA_ALL_EN(owner))) && (no ==PUB_YK_FA_S_L_HZ+1||no ==PUB_YK_FA_S_L_FZ+1))
-				{	//非电压电流型模式下，不允许遥控预置分段/联络开关
-					return -29;
-				}
-#endif
 				else if(no==PUB_DO_RST+1)
 				{
 					// 远方复归

dtu/dtu_main_t536/app/defineSys.h

@@ -145,7 +145,6 @@
 #define GD_AREA_ECZD_CHAOZHOU_2021     ////潮州20二次指导意见分支
 #define GD_AREA_ECZD_FOS_2021          // 二次指导意见框架新增佛山分支		//暂未用，下次可直接借用，借用后将此注释删除
 #define GD_ECZD_FOS_FTU_2021           // 佛山21年新标准(针对柱上开关)
-#define GD_AREA_ECZD_SHAOGUAN_2021     // 韶关20二次指导意见分支
 #endif
 
 #if defined (CPU_AM335X) || defined (CPU_FUXI)
@@ -541,20 +540,6 @@
 	#define VOLT_ADAPTIVE_FACTOR	//电压系数自适应
 	#define INRUSH_CURRENT_IN_DECIMALS	//涌流识别定值显示为小数并给主站送小数形式
 
-#elif defined  GD_AREA_ECZD_SHAOGUAN_2021	//韶关20二次指导意见分支
-	#ifdef __IEC61850_GOOSE_FUNC__
-		#define VER_NUM 					31204			// 版本号31.204
-	#else
-		#define VER_NUM 				31104			// 版本号31.104
-	#endif
-	#define GEN_QUEUE	
-	#define RCD_STRAN_M				/*录波传输*/
-	#define RCD_STRAN_S				/*录波传输*/
-	#define DISP_LIST_NUM		//列表类型定值显示定值选项的序号(如:"0:退出"、"1:投入")
-	#define BH_FA_INONE_SW			//功能模块配置定值部分，主要特征为BH/FA/智能FA三合一(在开关定值中)
-	#define FUNC_GET_RD_ONLY		//lcd_menu可配置只读定值
-	#define FUNC_DRIVE					//不停电传动功能
-
 #elif defined  GD_AREA_ECZD_FOS_2021		//佛山21年新标准(针对分布式)			//暂未用，下次可直接借用，借用后将此注释删除
 	#ifdef __IEC61850_GOOSE_FUNC__
 		#define VER_NUM 					31205			// 版本号31.205

dtu/dtu_main_t536/app/set.c

@@ -147,7 +147,7 @@ BH_SET_GROUP SetGroups[]=  //
 	{SETGROUP_TYPE_BH			,1 ,		0,				GROUP_SET_DRIVE,	"保护定值", 		"传动功能", 	},
 #endif
 
-#if defined GD_AREA_ECZD_2020 && !defined GD_AREA_ECZD_SHAOGUAN_2021 //2020二次指导意见 2020-9-13
+#if defined GD_AREA_ECZD_2020 //2020二次指导意见 2020-9-13
 	{SETGROUP_TYPE_PUB			,1 ,		0,				GROUP_SET_SCT,		"公共定值", 		"定值区", 			},
 #endif
 	{SETGROUP_TYPE_PUB			,1 ,		0,				GROUP_SET_EQPPARA,	"公共定值", 		"设备参数", 		},
@@ -764,26 +764,18 @@ int g_goose_net_type=0;
 const  TSETTABLE tPubSetTable[]=                                               	 // min 	 max 		     default....parID
 {
 #ifdef GD_AREA_ECZD_2020 //2020二次指导意见 2020-9-9
-	#ifndef GD_AREA_ECZD_SHAOGUAN_2021
-		{SETTYPE_LABEL, SET_NULL,	"定值区", 					0 , 		0,				0 , 	0,			0,				GROUP_SET_SCT,0X0000, NULL_R},
-		#ifdef GD_AREA_ECZD_MAOMING
-			{SETTYPE_UINT,	   SET_NULL,	  "当前定值区号", 				0.0,		SEC_NUMBER-1,				0,		0,			0,				GROUP_SET_SCT,0x5001, UINT_R},
-			{SETTYPE_UINT,     SET_NULL,      "待召唤定值区号",     0.0,        SEC_NUMBER-1,      0,      0,          0,              GROUP_SET_SCT,0x0000, UINT_R},
-		  	{SETTYPE_UINT,     SET_NULL,      "待执行定值区号",     0.0,        SEC_NUMBER-1,      0,      0,          0,              GROUP_SET_SCT,0x0000, UINT_R},
-	  	#else
-		  	{SETTYPE_UINT,	SET_NULL,	"定值区号", 				0.0,		SEC_NUMBER-1,				0,		0,			0,				GROUP_SET_SCT,0x5001, UINT_R},
-	  	#endif
-  	#endif
+    {SETTYPE_LABEL, SET_NULL,	"定值区", 					0 , 		0,				0 , 	0,			0,				GROUP_SET_SCT,0X0000, NULL_R},
+    #ifdef GD_AREA_ECZD_MAOMING
+        {SETTYPE_UINT,	   SET_NULL,	  "当前定值区号", 				0.0,		SEC_NUMBER-1,				0,		0,			0,				GROUP_SET_SCT,0x5001, UINT_R},
+        {SETTYPE_UINT,     SET_NULL,      "待召唤定值区号",     0.0,        SEC_NUMBER-1,      0,      0,          0,              GROUP_SET_SCT,0x0000, UINT_R},
+        {SETTYPE_UINT,     SET_NULL,      "待执行定值区号",     0.0,        SEC_NUMBER-1,      0,      0,          0,              GROUP_SET_SCT,0x0000, UINT_R},
+    #else
+        {SETTYPE_UINT,	SET_NULL,	"定值区号", 				0.0,		SEC_NUMBER-1,				0,		0,			0,				GROUP_SET_SCT,0x5001, UINT_R},
+    #endif
 	
 	{SETTYPE_LABEL, SET_NULL,	"设备参数", 					0 , 		0,				0 , 	0,			0,				GROUP_SET_EQPPARA,0X0000, NULL_R},
-	#ifdef GD_AREA_ECZD_SHAOGUAN_2021
-		{SETTYPE_UINT,	SET_NULL,	"定值区号", 				0.0,		SEC_NUMBER-1,		1,		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},
-	#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_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},
 	{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},
 	{SETTYPE_F, 	SET_A,		"测量CT额定一次值",		0.0,		2000.0, 		600.0,	0,			0,				GROUP_SET_EQPPARA,0x5006, FLOAT_R},
@@ -1022,22 +1014,13 @@ const  TSETTABLE tSwSetTable[]=
 
 #if defined GD_AREA_ZHUHAI || defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_CHAOZHOU || defined GD_AREA_MEIZHOU_FTU || defined GD_AREA_ZHONGSHAN_FTU ||defined GD_AREA_HEYUAN_KL || defined  GD_AREA_JIEYANG_FTU
     {SETTYPE_LIST,	SET_NULL,	"过流Ⅲ段投入", 			0 , 		TZGJListNum-1,		0,		TZGJList,	TZGJListNum,		GROUP_SET_BHTT,0X0000, UINT_R},
-#elif defined GD_AREA_ECZD_SHAOGUAN_2021
-    {SETTYPE_LIST,	SET_NULL,	"过流Ⅲ段投入", 			0 , 		TZListNum-1,		0,		TZList,	TZListNum,		GROUP_SET_BHTT,0X0000, BOOL_R},	
 #else
     {SETTYPE_LIST,	SET_NULL,	"过流Ⅲ段投入", 			0 , 		TTListNum-1,		0,		TTList,		TTListNum,		GROUP_SET_BHTT,0X0000, BOOL_R},
 #endif
-
-#ifdef GD_AREA_ECZD_SHAOGUAN_2021
-    {SETTYPE_LIST,	SET_NULL,	"过负荷告警",				0 , 		TTListNum-1,		0,		TTList, 	TTListNum,		GROUP_SET_BHTT,0X0000, BOOL_R},
-#endif
 	{SETTYPE_LIST,	SET_NULL,	"过流Ⅰ段投方向", 		0 , 		TTListNum-1,		0,		TTList,		TTListNum,		GROUP_SET_BHTT,0X500D, BOOL_R},
 	{SETTYPE_LIST,	SET_NULL,	"过流Ⅱ段投方向", 		0 , 		TTListNum-1,		0,		TTList,		TTListNum,		GROUP_SET_BHTT,0X500E, BOOL_R},		
     {SETTYPE_LIST,	SET_NULL,	"过流Ⅲ段投方向", 		0 , 		TTListNum-1,		0,		TTList,		TTListNum,		GROUP_SET_BHTT,0X0000, BOOL_R},
 	{SETTYPE_LIST,	SET_NULL,	"PT断线检测投入", 			0 , 		TTListNum-1,		0,		TTList,		TTListNum,		GROUP_SET_BHTT,0X500F, BOOL_R},
-#ifdef GD_AREA_ECZD_SHAOGUAN_2021
-	{SETTYPE_LIST,	SET_NULL,	"控制回路断线告警",			0 , 		TTListNum-1,		0,		TTList, 	TTListNum,		GROUP_SET_BHTT,0X0000, BOOL_R},
-#endif
 
 #if defined GD_AREA_ZHUHAI || defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_CHAOZHOU || defined GD_AREA_MEIZHOU_FTU || defined GD_AREA_ZHONGSHAN_FTU ||defined GD_AREA_HEYUAN_KL || defined  GD_AREA_JIEYANG_FTU
 	{SETTYPE_LIST,	SET_NULL,	"零序过流Ⅰ段投入", 		0 , 		TZGJListNum-1,		0,		TZGJList, 	TZGJListNum,		GROUP_SET_BHTT,0X5010, UINT_R},
@@ -1103,14 +1086,7 @@ const  TSETTABLE tSwSetTable[]=
     {SETTYPE_LIST,	SET_NULL,	"大电流闭锁重合闸投入",			0 , 		TTListNum-1,		0,		TTList, 	TTListNum,		GROUP_SET_BHTT,0X5016, BOOL_R},
 
 	{SETTYPE_LABEL,	SET_NULL,	"保护定值", 					0 , 		0,				0 ,		0,			0,				GROUP_SET_BHDZ,0X0000, NULL_R},
-#ifdef 	GD_AREA_ECZD_SHAOGUAN_2021
-	{SETTYPE_F, 	SET_A,		"过流Ⅰ段定值",			0.0 ,	600.0,			100.0 , 0,			0,				GROUP_SET_BHDZ,0X5017, FLOAT_R},	
-	{SETTYPE_F, 	SET_S,		"过流Ⅰ段时间",			0.0 ,	600.0,			100.0 , 0,			0,				GROUP_SET_BHDZ,0X0000, FLOAT_R},
-	{SETTYPE_F, 	SET_A,		"过流Ⅱ段定值",			0.0 ,	600.0,			100.0 , 0,			0,				GROUP_SET_BHDZ,0X5019, FLOAT_R},	
-	{SETTYPE_F, 	SET_S,		"过流Ⅱ段时间",			0.0 ,	600.0,			100.0 , 0,			0,				GROUP_SET_BHDZ,0X0000, FLOAT_R},	
-    {SETTYPE_F, 	SET_A,		"过流Ⅲ段定值",			0.0 ,	600.0,			100.0 , 0,			0,				GROUP_SET_BHDZ,0X0000, FLOAT_R},	
-    {SETTYPE_F, 	SET_S,		"过流Ⅲ段时间",			0.0 ,	600.0,			100.0 , 0,			0,				GROUP_SET_BHDZ,0X0000, FLOAT_R},
-#else
+
     {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},
@@ -1129,12 +1105,6 @@ const  TSETTABLE tSwSetTable[]=
     #else
         {SETTYPE_F, 	SET_S,		"过流Ⅲ段时间",			0.0 ,	99.0,			99.0 ,	0,			0,				GROUP_SET_BHDZ,0X0000, FLOAT_R},
     #endif
-#endif
-
-#ifdef GD_AREA_ECZD_SHAOGUAN_2021
-    {SETTYPE_F,		SET_A,		"过负荷定值", 			0.1 , 	10.0,			5.0 ,		0,			0,				GROUP_SET_BHDZ,0X0000, FLOAT_R},
-	{SETTYPE_F,		SET_S,		"过负荷定时",			0.0 , 	10000.0,			3600 ,	0,			0,				GROUP_SET_BHDZ,0X0000, FLOAT_R},
-#endif
 
 #if defined GD_AREA_HEYUAN_2021
 	{SETTYPE_F,		SET_A,		"零序Ⅰ段定值",		0.0 , 	100.0,			100.0 ,	0,			0,				GROUP_SET_BHDZ,0X501B, FLOAT_R},	
@@ -1151,21 +1121,6 @@ const  TSETTABLE tSwSetTable[]=
 	{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},
-#elif defined GD_AREA_ECZD_SHAOGUAN_2021
-	{SETTYPE_F, 	SET_A,		"零序过流Ⅰ段定值", 	0.0 ,	600.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 ,	600.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 ,	600.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 ,	600.0,			99.0 ,	0,			0,				GROUP_SET_BHDZ,0, FLOAT_R},
-	{SETTYPE_F, 	SET_A,		"后加速过流保护定值",	0.0 ,	600.0,			0 , 0,			0,			GROUP_SET_BHDZ,0, FLOAT_R},
-	{SETTYPE_F, 	SET_S,		"后加速过流保护时间",	0.0 ,	600.0,			0 , 0,			0,			GROUP_SET_BHDZ,0, FLOAT_R},
-	{SETTYPE_F, 	SET_A,		"后加速零序电流保护定值",	0.0,		600.0,		0 , 0,			0,			GROUP_SET_BHDZ,0, FLOAT_R},
-	{SETTYPE_F, 	SET_S,		"后加速零序电流保护时间",	0.0 ,	600.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},
@@ -1194,14 +1149,6 @@ const  TSETTABLE tSwSetTable[]=
 	{SETTYPE_F, 	SET_S,		"重合闸充电时间",	0.0 ,	300.0,			15.0 ,	0,		0,			GROUP_SET_BHDZ,0X0000, FLOAT_R},
 #endif
 
-#ifdef GD_AREA_ECZD_SHAOGUAN_2021
-	{SETTYPE_F, 	SET_S,		"一次重合闸时间",		0.0 ,	600.0,			15.0 ,		0,			0,				GROUP_SET_BHDZ,0X5020, FLOAT_R},
-	{SETTYPE_F, 	SET_S,		"二次重合闸闭锁时间",		0.0 ,	600.0,			0.0 ,		0,			0,				GROUP_SET_BHDZ,0X5021, FLOAT_R},
-	{SETTYPE_F, 	SET_S,		"二次重合闸时间",		0.0 ,	600.0,			3.0 ,		0,			0,				GROUP_SET_BHDZ,0X5022, FLOAT_R},
-	#ifdef DISP_SET_CH_T3
-		{SETTYPE_F, 	SET_S,		"三次重合闸时间",		0.0 ,	600.0,			3.0 ,		0,			0,				GROUP_SET_BHDZ,0X0000, FLOAT_R},
-	#endif
-#else
 	{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},
@@ -1212,7 +1159,6 @@ const  TSETTABLE tSwSetTable[]=
 	#ifdef DISP_SET_CH_T3
 		{SETTYPE_F, 	SET_S,		"三次重合闸时间",		0.0 ,	300.0,			3.0 ,		0,			0,				GROUP_SET_BHDZ,0X0000, FLOAT_R},
 	#endif
-#endif
 
 //扩展
 #ifdef DISP_CHZOKCHR_2_SW
@@ -1311,11 +1257,6 @@ const  TSETTABLE tSwSetTable[]=
 	{SETTYPE_F, 	SET_S,		"低电压解列延时TUL", 		0.0 ,	999.0,			95.0 ,	0,			0,				GROUP_SET_DYJL,0X0000, FLOAT_R},
 	{SETTYPE_F, 	SET_PERUN,	"高电压解列UH",			110.0 , 	134.0,			120.0 , 0,			0,				GROUP_SET_DYJL,0X0000, FLOAT_R},
 	{SETTYPE_F, 	SET_S,		"高电压解列延时TUH", 		0.0 ,	999.0,			2.0 ,		   0,			0,				GROUP_SET_DYJL,0X0000, FLOAT_R},
-#elif defined GD_AREA_ECZD_SHAOGUAN_2021
-	{SETTYPE_F, 	SET_PERUN,	"低电压解列UL",			51.0 ,	99.0,			80.0 ,	0,			0,				GROUP_SET_DYJL,0X0000, FLOAT_R},
-	{SETTYPE_F, 	SET_S,		"低电压解列延时TUL", 		0.0 ,	6000.0, 		95.0 ,	0,			0,				GROUP_SET_DYJL,0X0000, FLOAT_R},
-	{SETTYPE_F, 	SET_PERUN,	"高电压解列UH",			101.0 , 	134.0,			120.0 , 0,			0,				GROUP_SET_DYJL,0X0000, FLOAT_R},
-	{SETTYPE_F, 	SET_S,		"高电压解列延时TUH", 		0.0 ,	6000.0, 		2.0 ,		   0,			0,				GROUP_SET_DYJL,0X0000, FLOAT_R},
 #else
 	{SETTYPE_F,		SET_PERUN,	"低电压解列UL", 			51.0 , 	99.0,			80.0 ,	0,			0,				GROUP_SET_DYJL,0X0000, FLOAT_R},
 	{SETTYPE_F,		SET_S,		"低电压解列延时TUL",			0.0 , 	999.0,			95.0 ,	0,			0,				GROUP_SET_DYJL,0X0000, FLOAT_R},
@@ -1386,9 +1327,6 @@ const  TSETTABLE tSwSetTable[]=
 	{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},
-	#ifdef GD_AREA_ECZD_SHAOGUAN_2021
-		{SETTYPE_LIST,	SET_NULL,	"控制回路断线告警",			0 , 		TTListNum-1,		0,		TTList, 	TTListNum,		GROUP_SET_FATT,0X0000, BOOL_R},
-	#endif
 	{SETTYPE_LIST,	SET_NULL,	"多次失压分闸闭锁", 		0 , 		TTListNum-1,	0,		TTList, TTListNum,GROUP_SET_FATT,0x0000, BOOL_R},
     {SETTYPE_LIST,	SET_NULL,	"涌流识别投入", 			0 , 		TTListNum-1,		0,		TTList,		TTListNum,		GROUP_SET_FATT,0, BOOL_R},
 	//扩展
@@ -1481,76 +1419,49 @@ 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},
-	#if defined GD_AREA_ECZD_SHAOGUAN_2021
-		{SETTYPE_F, 	SET_S,		"故障检测时限(Y时限)",						0 , 		999,				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,		"故障检测时限(Y时限)",						0 , 		99, 			5 , 	0,			0,				GROUP_SET_FADZ,0x5020, FLOAT_R},
     {SETTYPE_F, 	SET_S,		"失压合闸延时(XL时限)", 					0 , 		999,				7 , 	0,			0,				GROUP_SET_FADZ,0x5021, FLOAT_R},
 	#ifdef GD_AREA_ZHONGSHAN_2020
 		{SETTYPE_F, 	SET_S,		"联络充电时限(YL时限)", 					0 , 		99, 			6 , 	0,			0,				GROUP_SET_FADZ,0x5020, FLOAT_R},
 	#endif
-	#if defined GD_AREA_ECZD_SHAOGUAN_2021
-		{SETTYPE_F, 	SET_S,		"失电分闸延时(Z时限)",			0 , 		999,				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},
-
-	#ifdef GD_AREA_ECZD_SHAOGUAN_2021
-		{SETTYPE_F, 	SET_A,		"相间故障电流I段定值", 	0.0 ,	600.0,			100.0 , 	0,			0,				GROUP_SET_FADZ,0x5024, FLOAT_R},
-		{SETTYPE_F, 	SET_S,		"相间故障电流I段时间", 		0 , 		600,		99 ,		0,			0,				GROUP_SET_FADZ,0x5026, FLOAT_R}, 
-		{SETTYPE_F, 	SET_A,		"相间故障电流II段定值",		0.0 ,	600.0,			100.0 , 	0,			0,				GROUP_SET_FADZ,0x5025, FLOAT_R},
-		{SETTYPE_F, 	SET_S,		"相间故障电流II段时间",		0 , 		600,		99 ,		0,			0,				GROUP_SET_FADZ,0x5026, FLOAT_R}, 
-		{SETTYPE_F, 	SET_A,		"接地故障电流定值", 	0.0 ,	600.0,			100,		0,			0,				GROUP_SET_FADZ,0x5025, FLOAT_R},
-		{SETTYPE_F, 	SET_S,		"接地故障时间定值", 		0 , 		600,			99 ,		0,			0,				GROUP_SET_FADZ,0x0000, FLOAT_R},
-		{SETTYPE_F, 	SET_U,		"复合电压低电压定值",			0.0 ,	600.0,			20.0 ,	0,			0,				GROUP_SET_FADZ,0x0000, FLOAT_R},
-		{SETTYPE_F, 	SET_U,		"复合电压负序电压定值",			0.0 ,	600.0,			20.0 ,	0,			0,				GROUP_SET_FADZ,0x0000, FLOAT_R},
-		{SETTYPE_F, 	SET_A,		"相间过流告警电流I段定值",		0.0 ,	600.0,			100.0 , 	0,			0,				GROUP_SET_FADZ,0x5024, FLOAT_R},
-		{SETTYPE_F, 	SET_S,		"相间过流告警I段时间", 		0 , 		600,			99 ,		0,			0,				GROUP_SET_FADZ,0x5026, FLOAT_R},
-		{SETTYPE_F, 	SET_A,		"接地告警电流定值", 	0.0 ,	600.0,			100.0 , 	0,			0,				GROUP_SET_FADZ,0x5025, FLOAT_R},
-		{SETTYPE_F, 	SET_S,		"接地告警时间定值", 		0 , 		600,				99 ,		0,			0,				GROUP_SET_FADZ,0x0000, FLOAT_R},
-		{SETTYPE_F, 	SET_U,		"零序电压保护电压定值",			0.0 ,	1000.0, 		20.0 ,	0,			0,				GROUP_SET_FADZ,0x0000, FLOAT_R},
-		{SETTYPE_F, 	SET_S,		"零序电压保护时间定值",			0.0 ,	600.0,			0.6 ,		0,			0,				GROUP_SET_FADZ,0X0000, FLOAT_R},
-		{SETTYPE_F, 	SET_A,		"无流定值", 	0.0 ,	600.0,			0.04 ,	0,			0,				GROUP_SET_FADZ,0x5025, FLOAT_R},
-		{SETTYPE_F, 	SET_A,		"非遮断电流值",			0.0 ,	600.0,			5 , 	0,			0,				GROUP_SET_FADZ,0x5027, 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,				GROUP_SET_FADZ,0x5025, FLOAT_R},
-        {SETTYPE_F, 	SET_S,		"接地故障时间定值", 		0 , 		99, 			99 ,		0,			0,				GROUP_SET_FADZ,0x0000, FLOAT_R},
-        {SETTYPE_F, 	SET_U,		"复合电压低电压定值",			0.0 ,	100.0,			20.0 ,	0,			0,				GROUP_SET_FADZ,0x0000, FLOAT_R},
-        {SETTYPE_F, 	SET_U,		"复合电压负序电压定值",			0.0 ,	100.0,			20.0 ,	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},
-        {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},
-        {SETTYPE_F, 	SET_S,		"接地告警时间定值", 		0 , 		99, 			99 ,		0,			0,				GROUP_SET_FADZ,0x0000, FLOAT_R},
-		#ifdef GD_AREA_ZHONGSHAN_2020
-			{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},
-		#else
-			#if defined GD_AREA_ECZD_2020 || defined GD_AREA_ECZD_MAOMING
-				#ifdef GD_AREA_ECZD_CHAOZHOU_2022
-					{SETTYPE_F, 	SET_U,		"合到零压保护电压定值",			0.0 ,	1000.0, 		20.0 ,	0,			0,				GROUP_SET_FADZ,0x0000, FLOAT_R},
-				#else
-					{SETTYPE_F, 	SET_U,		"零序电压保护电压定值",			0.0 ,	1000.0, 		20.0 ,	0,			0,				GROUP_SET_FADZ,0x0000, FLOAT_R},
-				#endif
-			#else
-				{SETTYPE_F, 	SET_U,		"零序电压保护电压定值",			0.0 ,	100.0,			20.0 ,	0,			0,				GROUP_SET_FADZ,0x0000, FLOAT_R},
-			#endif
-			
-			#ifdef GD_AREA_ECZD_CHAOZHOU_2022
-				{SETTYPE_F, 	SET_S,		"合到零压保护时间定值",			0.0 ,	99.0,			0.6 ,		0,			0,				GROUP_SET_FADZ,0X0000, FLOAT_R},
-			#else
-				{SETTYPE_F, 	SET_S,		"零序电压保护时间定值",			0.0 ,	99.0,			0.6 ,		0,			0,				GROUP_SET_FADZ,0X0000, FLOAT_R},
-			#endif
-		#endif
-		
-		{SETTYPE_F, 	SET_A,		"无流定值", 	0.0 ,	100.0,			0.05 ,	0,			0,				GROUP_SET_FADZ,0x5025, FLOAT_R},
-		{SETTYPE_F, 	SET_A,		"非遮断电流值",			0.0 ,	100.0,			5 , 	0,			0,				GROUP_SET_FADZ,0x5027, FLOAT_R},
-	#endif
+    {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},
+
+    {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,				GROUP_SET_FADZ,0x5025, FLOAT_R},
+    {SETTYPE_F, 	SET_S,		"接地故障时间定值", 		0 , 		99, 			99 ,		0,			0,				GROUP_SET_FADZ,0x0000, FLOAT_R},
+    {SETTYPE_F, 	SET_U,		"复合电压低电压定值",			0.0 ,	100.0,			20.0 ,	0,			0,				GROUP_SET_FADZ,0x0000, FLOAT_R},
+    {SETTYPE_F, 	SET_U,		"复合电压负序电压定值",			0.0 ,	100.0,			20.0 ,	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},
+    {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},
+    {SETTYPE_F, 	SET_S,		"接地告警时间定值", 		0 , 		99, 			99 ,		0,			0,				GROUP_SET_FADZ,0x0000, FLOAT_R},
+    #ifdef GD_AREA_ZHONGSHAN_2020
+        {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},
+    #else
+        #if defined GD_AREA_ECZD_2020 || defined GD_AREA_ECZD_MAOMING
+            #ifdef GD_AREA_ECZD_CHAOZHOU_2022
+                {SETTYPE_F, 	SET_U,		"合到零压保护电压定值",			0.0 ,	1000.0, 		20.0 ,	0,			0,				GROUP_SET_FADZ,0x0000, FLOAT_R},
+            #else
+                {SETTYPE_F, 	SET_U,		"零序电压保护电压定值",			0.0 ,	1000.0, 		20.0 ,	0,			0,				GROUP_SET_FADZ,0x0000, FLOAT_R},
+            #endif
+        #else
+            {SETTYPE_F, 	SET_U,		"零序电压保护电压定值",			0.0 ,	100.0,			20.0 ,	0,			0,				GROUP_SET_FADZ,0x0000, FLOAT_R},
+        #endif
+        
+        #ifdef GD_AREA_ECZD_CHAOZHOU_2022
+            {SETTYPE_F, 	SET_S,		"合到零压保护时间定值",			0.0 ,	99.0,			0.6 ,		0,			0,				GROUP_SET_FADZ,0X0000, FLOAT_R},
+        #else
+            {SETTYPE_F, 	SET_S,		"零序电压保护时间定值",			0.0 ,	99.0,			0.6 ,		0,			0,				GROUP_SET_FADZ,0X0000, FLOAT_R},
+        #endif
+    #endif
+    
+    {SETTYPE_F, 	SET_A,		"无流定值", 	0.0 ,	100.0,			0.05 ,	0,			0,				GROUP_SET_FADZ,0x5025, FLOAT_R},
+    {SETTYPE_F, 	SET_A,		"非遮断电流值",			0.0 ,	100.0,			5 , 	0,			0,				GROUP_SET_FADZ,0x5027, FLOAT_R},
 	
 	#ifdef INRUSH_CURRENT_IN_DECIMALS
         {SETTYPE_F, 	SET_NULL,	"涌流识别定值",			0.0 ,	1.00,			0.15 ,		0,			0,				GROUP_SET_FADZ,0x0000, FLOAT_R},
@@ -1840,11 +1751,9 @@ const  TSETTABLE tSwSetTable[]=
 	{SETTYPE_F, 	SET_A,		"零序电流越限定值", 			0.1 ,		10.0,				5.0,	0,			0,				GROUP_SET_SWSET,0X0000, FLOAT_R},
 	{SETTYPE_F, 	SET_S,		"零序电流越限时间", 			0.0 ,		10000.0,			3600 ,	0,			0,				GROUP_SET_SWSET,0X0000, FLOAT_R},	
 #else
-	#if !defined GD_AREA_ECZD_SHAOGUAN_2021 
-		{SETTYPE_LIST,	SET_NULL,	"电流越限投退", 			0 , 		TTListNum-1,		0,		TTList,		TTListNum,		GROUP_SET_SWSET,0X0000, BOOL_R},	
-		{SETTYPE_F,		SET_A,		"电流越限定值", 			0.1 , 	10.0,			5.0 ,		0,			0,				GROUP_SET_SWSET,0X0000, FLOAT_R},
-		{SETTYPE_F,		SET_S,		"电流越限时间",			0.0 , 	10000.0,			3600 ,	0,			0,				GROUP_SET_SWSET,0X0000, FLOAT_R},
-    #endif
+    {SETTYPE_LIST,	SET_NULL,	"电流越限投退", 			0 , 		TTListNum-1,		0,		TTList,		TTListNum,		GROUP_SET_SWSET,0X0000, BOOL_R},	
+    {SETTYPE_F,		SET_A,		"电流越限定值", 			0.1 , 	10.0,			5.0 ,		0,			0,				GROUP_SET_SWSET,0X0000, FLOAT_R},
+    {SETTYPE_F,		SET_S,		"电流越限时间",			0.0 , 	10000.0,			3600 ,	0,			0,				GROUP_SET_SWSET,0X0000, FLOAT_R},
 	{SETTYPE_LIST,	SET_NULL,	"零序电流越限投退", 		0 , 		TTListNum-1,		0,		TTList, 	TTListNum,		GROUP_SET_SWSET,0X0000, BOOL_R},
 	{SETTYPE_F, 	SET_A,		"零序电流越限定值", 		0.1 ,	10.0,			5.0 ,		0,			0,				GROUP_SET_SWSET,0X0000, FLOAT_R},
 	{SETTYPE_F, 	SET_S,		"零序电流越限时间", 	0.0 ,	10000.0,			3600 ,	0,			0,				GROUP_SET_SWSET,0X0000, FLOAT_R},
@@ -1853,7 +1762,7 @@ const  TSETTABLE tSwSetTable[]=
 	{SETTYPE_LIST,	SET_NULL,	"功率取反投退", 			0 , 		TTListNum-1,		0,		TTList, 		TTListNum,		GROUP_SET_SWSET,0X0000, BOOL_R},
 	{SETTYPE_LIST,	SET_NULL,	"保护方向取反投退", 		0 , 		TTListNum-1,		0,		TTList, 		TTListNum,		GROUP_SET_SWSET,0X0000, BOOL_R},
 	{SETTYPE_LIST,	SET_NULL,	"未储能告警", 				0 , 		TTListNum-1,		0,		TTList,		TTListNum,		GROUP_SET_SWSET,0X0000, BOOL_R},
-#if !defined GD_AREA_ZHONGSHAN && !defined GD_AREA_ECZD_SHAOGUAN_2021
+#if !defined GD_AREA_ZHONGSHAN
 	#ifdef GD_AREA_ECZD_2020//默认投入控制
 		{SETTYPE_LIST,	SET_NULL,	"控制回路检查", 			0 , 		TTListNum-1,		1,		TTList,		TTListNum,		GROUP_SET_SWSET,0X0000, BOOL_R},
 	#else
@@ -3210,9 +3119,6 @@ bool MakeRunSet(bool bFirst)
 		ptSet->bTT_SOFT_YK_YB = true;
 		ptSet->bTT_SOFT_JZS_YB = false;
         ptSet->bTT_BH_YB=((WORD)psetbuf[SET_BH_YB].ff==0 )?true:false;
-		#ifdef GD_AREA_ECZD_SHAOGUAN_2021
-			fresh_set_soe(EV_TY_SOFT_YB,!ptSet->bTT_BH_YB,bFirst,0);
-		#endif
 		
 		#ifdef defined GD_AREA_ZHONGSHAN_2020 || (defined GD_AREA_ECZD_2020 && !defined BH_FA_INONE_SW)
 			ptSet->bTT_SOFT_BH_YB = ((WORD)psetbuf[SET_BH_YBTT].ff==1 )?true:false;
@@ -3243,10 +3149,6 @@ bool MakeRunSet(bool bFirst)
             ptSet->bTT_TQ_YB =((WORD)psetbuf[SET_TQ_YB].ff==1 )?true:false;	 //同期合闸软压板
             #endif
         #endif
-            
-        #ifdef GD_AREA_ECZD_SHAOGUAN_2021
-            fresh_set_soe(EV_TQ_SOFT_YB,!ptSet->bTT_TQ_YB,bFirst,0);
-        #endif
 
         #ifdef YF_TQ_JL_TY_PUBLIC
             ptSet->bTT_JL_YB =((WORD)psetbuf[SET_JL_YB].ff==1 )?true:false;  //解列压板
@@ -3257,9 +3159,6 @@ bool MakeRunSet(bool bFirst)
             ptSet->bTT_JL_YB =((WORD)psetbuf[SET_JL_YB].ff==0 )?true:false;	 //！！！解列压板(停用)
             #endif
         #endif
-        #ifdef GD_AREA_ECZD_SHAOGUAN_2021
-            fresh_set_soe(EV_JL_SOFT_YB,!ptSet->bTT_JL_YB,bFirst,0);
-        #endif
 
 		#ifdef YF_TQ_JL_TY_PUBLIC
 			ptSet->bTT_EDIT_YB = ((WORD)psetbuf[SET_YF].ff==1 )?true:false; 							//远方投退软压板
@@ -3472,10 +3371,7 @@ bool MakeRunSet(bool bFirst)
 
 		#if defined GD_AREA_ZHUHAI || defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_CHAOZHOU || defined GD_AREA_MEIZHOU_FTU || defined GD_AREA_ZHONGSHAN_FTU ||defined GD_AREA_HEYUAN_KL || defined  GD_AREA_JIEYANG_FTU
 			poc->bTz=(((WORD)psetbuf[SET_GL3_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false)||(((WORD)psetbuf[SET_GL3_TT+sw*SW_SET_NUMBER ].ff==3 )?true:false); 
-			poc->bGj=(((WORD)psetbuf[SET_GL3_TT+sw*SW_SET_NUMBER ].ff==2 )?true:false)||(((WORD)psetbuf[SET_GL3_TT+sw*SW_SET_NUMBER ].ff==3 )?true:false);	
-		#elif defined GD_AREA_ECZD_SHAOGUAN_2021
-		    poc->bTz=(((WORD)psetbuf[SET_GL3_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false); 
-			poc->bGj=(((WORD)psetbuf[SET_GL3_TT+sw*SW_SET_NUMBER ].ff==0 )?true:false);
+			poc->bGj=(((WORD)psetbuf[SET_GL3_TT+sw*SW_SET_NUMBER ].ff==2 )?true:false)||(((WORD)psetbuf[SET_GL3_TT+sw*SW_SET_NUMBER ].ff==3 )?true:false);
 		#else
 			poc->bTz=(((WORD)psetbuf[SET_GL3_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false); 
 			poc->bGj=(((WORD)psetbuf[SET_GL3_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false);
@@ -4141,7 +4037,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 || defined GD_AREA_ECZD_CHAOZHOU_2021 || defined GD_AREA_ECZD_SHAOGUAN_2021
+				#if defined GD_AREA_HEYUAN_2021 || defined GD_AREA_ECZD_CHAOZHOU_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;		
@@ -4162,9 +4058,6 @@ bool MakeRunSet(bool bFirst)
 	#if defined GD_AREA_ECZD_2020 || defined GD_AREA_ZHONGSHAN_2020 //2020二次指导意见软压板放到公共 2020-9-9
 		//软压板状态处理
 		ptSet->bTT_CHZ_YB=((WORD)psetbuf[SET_CHZ_YB+sw*SW_SET_NUMBER ].ff==1 )?true:false;	 //重合闸投入软压板 	
-		#ifdef GD_AREA_ECZD_SHAOGUAN_2021
-			fresh_set_soe(EV_CHZ_SOFT_YB,ptSet->bTT_CHZ_YB,bFirst,0);
-		#endif
 	#else
 		{ 	
 			//软压板状态处理
@@ -4255,11 +4148,7 @@ bool MakeRunSet(bool bFirst)
 			ptSet->tSwSet[sw].bTT_DIR_Inv 	=((WORD)psetbuf[SET_DIR_INV_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false;   
 			ptSet->tSwSet[sw].bTT_WCN		=(((WORD)psetbuf[SET_TT_TWCN+sw*SW_SET_NUMBER ].ff==1 )?true:false);//&ptSet->bFUN_TWCN;	//弹簧未储能
 #ifndef GD_AREA_ZHONGSHAN
-	#ifdef GD_AREA_ECZD_SHAOGUAN_2021
-			ptSet->tSwSet[sw].bTT_KZHL		=(((WORD)psetbuf[SET_TT_KZHL+sw*SW_SET_NUMBER ].ff==1 )?true:false) || (((WORD)psetbuf[SET_TT_KZHL1+sw*SW_SET_NUMBER ].ff==1 )?true:false);		//控制回路
-	#else
 			ptSet->tSwSet[sw].bTT_KZHL		=(((WORD)psetbuf[SET_TT_KZHL+sw*SW_SET_NUMBER ].ff==1 )?true:false);//&ptSet->bFUN_TWCN;	//控制回路
-	#endif
 #endif
 			ptSet->tSwSet[sw].bTT_QYD_BS 		=((WORD)psetbuf[SET_QYD_BS_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false;   
 			ptSet->tSwSet[sw].bTT_Power_v2	= false;

dtu/dtu_main_t536/app/set.h

@@ -156,7 +156,7 @@ enum
 #endif
 
 //公共定值
-#if defined GD_AREA_ECZD_2020 && !defined GD_AREA_ECZD_SHAOGUAN_2021 //2020二次指导意见 2020-9-9
+#if defined GD_AREA_ECZD_2020 //2020二次指导意见 2020-9-9
 	GROUP_SET_SCT,		//定值区
 #endif
     GROUP_SET_PUBYB,		//软压板
@@ -342,16 +342,10 @@ enum
 	SET_GL1_TT,			// 过流1投入
 	SET_GL2_TT,			// 过流2投入
 	SET_GL3_TT,			// 过流3投入
-#ifdef GD_AREA_ECZD_SHAOGUAN_2021
-	SET_DLYX_TT,			  // 负荷越限
-#endif
 	SET_GL1_DIR,			// 过流1方向投入
 	SET_GL2_DIR,			// 过流2方向投入
 	SET_GL3_DIR,			// 过流3方向投入
 	SET_BH_PTDX,			// PT断线检查
-#ifdef GD_AREA_ECZD_SHAOGUAN_2021	
-	SET_TT_KZHL,			// 控制回路
-#endif
 	SET_LX1_TT,				// 零序1投入
 	SET_LX2_TT,				// 零序2投入
 #ifdef DISP_SET_LX3	
@@ -391,10 +385,6 @@ enum
 	SET_GL2_T,				// 过流2时间
 	SET_GL3_I,				// 过流3定值
 	SET_GL3_T,				// 过流3时间
-#ifdef GD_AREA_ECZD_SHAOGUAN_2021
-	SET_DLYX_I,				// 
-	SET_DLYX_T,				// 
-#endif
 	SET_LX1_I,				// 零序1定值
 	SET_LX1_T,				// 零序1时间
 	SET_LX2_I,				// 零序1定值
@@ -523,9 +513,6 @@ enum
 	SET_U0TZ_TT,			// 零压分闸投退	
 	SET_DLBS_TT,			//大电流闭锁
 	SET_FA_PTDX,			// PT断线检查
-	#ifdef GD_AREA_ECZD_SHAOGUAN_2021
-		SET_TT_KZHL1,			// 控制回路
-	#endif
 	SET_HZBS_TT,			//连续分闸闭锁投退
 	SET_FA_XBBS_TT, 		// 涌流识别
 	//扩展
@@ -842,11 +829,9 @@ enum
 	SET_LXYX_I, 			//
 	SET_LXYX_T, 			//
 #else
-	#ifndef GD_AREA_ECZD_SHAOGUAN_2021
-		SET_DLYX_TT,				// 电流过载载
-		SET_DLYX_I,				// 
-		SET_DLYX_T,				// 
-	#endif
+    SET_DLYX_TT,				// 电流过载载
+    SET_DLYX_I,				// 
+    SET_DLYX_T,				// 
 	SET_LXYX_TT,				// 零序电流越限
 	SET_LXYX_I, 			// 
 	SET_LXYX_T, 			// 
@@ -855,7 +840,7 @@ enum
 	SET_DIR_INV_TT ,		// 电流取反投退，过流方向计算时使用
 	//SET_POWER_V2_TT	,		//功率计算是否选择第二路电压
 	SET_TT_TWCN,			// 弹簧未储能投退
-#if !defined GD_AREA_ZHONGSHAN && !defined GD_AREA_ECZD_SHAOGUAN_2021	
+#if !defined GD_AREA_ZHONGSHAN	
 	SET_TT_KZHL,			// 控制回路
 #endif
 	SET_QYD_BS_TT,			// 低气压闭锁投退	
@@ -909,7 +894,7 @@ enum
 enum
 {
 // 电压参数	
-#if defined GD_AREA_ECZD_2020 && !defined GD_AREA_ECZD_SHAOGUAN_2021//2020二次指导意见 2020-9-8
+#if defined GD_AREA_ECZD_2020//2020二次指导意见 2020-9-8
     SET_LABLE_SEC_SET = 0,                                          // 列表名
     SET_SECTION,                                                    // 定值区
 	#ifdef GD_AREA_ECZD_MAOMING	//茂名局增自定义定值：待召唤定值区号、待执行定值区号