整理宏GD_AREA_SHAOGUAN；

dtu/dtu_main_t536/app/MmiData.c

@@ -4415,7 +4415,7 @@ static void mmd_GetFtuYxValue(int i,DATA_FIELD_DEF *pF)
 	    (ecd->owner!=0 && (!TQ_ALL_EN(0))))//同期压板	
 		strcpy(tmpstr,YX_F);	
 
-    #if defined GD_AREA_SHAOGUAN || defined BHFAGS_YB_YK || defined GD_AREA_ZHONGSHAN || defined GD_AREA_ECZD_2020
+    #if defined BHFAGS_YB_YK || defined GD_AREA_ZHONGSHAN || defined GD_AREA_ECZD_2020
 		if((SW_DI_BHTT+1==ecd->type && ecd->owner!=0 && (!BH_ALL_EN(0)))||//常规保护压板
 			(SW_DI_FA_TT+1==ecd->type && ecd->owner!=0 && (!FA_ALL_EN(0)))||//FA压板
 			(SW_DI_FA_GOOSE+1==ecd->type && ecd->owner!=0 && (!BH_GOOSE_EN(0))))//智能分布式压板	

dtu/dtu_main_t536/app/Sys.c

@@ -320,7 +320,7 @@ void app_yb_refresh(void)
         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_SHAOGUAN || defined GD_AREA_ECZD_2020
+#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)
         fresh_set_soe(EV_BH_YBTT, BH_ALL_EN(sw), 0,sw);
         fresh_set_soe(EV_FA_YBTT, FA_ALL_EN(sw), 0,sw);
@@ -364,7 +364,7 @@ void app_yb_refresh(void)
 				soe_record_ev(EV_CHZ_CHECK+sw*EV_SW_NUM, 0, 0,0,0);
 			}
 		}		 
-		#if defined BHFAGS_YB_YK ||	defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_SHAOGUAN
+		#if defined BHFAGS_YB_YK ||	defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020
 			//GOOSE
 			if(((short)g_sw[sw].di_cfg_index[SW_DI_FA_GOOSE] != INDEX_INVALLID)&&(pRunSet->bTT_SOFT_GOOSE_YB != g_tRelay[sw].run_stu.fa_g_tt))
 			{

dtu/dtu_main_t536/app/UnitsLib.c

@@ -397,7 +397,7 @@ void ProtectRelayInit(void)
 		fresh_set_soe(EV_BH_YB, FUN_ALL_EN(sw), true,sw);		
 #endif
 	   	
-	#if defined BHFAGS_YB_YK ||	defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_SHAOGUAN || defined GD_AREA_ECZD_2020
+	#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);
 		fresh_set_soe(EV_FA_YBTT, FA_ALL_EN(sw), true,sw);
 		fresh_set_soe(EV_GOOSE_YBTT, BH_GOOSE_EN(sw), true,sw);			

dtu/dtu_main_t536/app/defineSys.h

@@ -104,7 +104,6 @@
 #define GD_AREA_ZHONGSHAN_FTU          // 中山FTU要求
 #define GD_AREA_GUANGZHOU_FTU          // 广州局要求
 #define GD_AREA_ZHUHAI_FTU             // 珠海FTU局要求
-#define GD_AREA_SHAOGUAN               // 韶关局要求
 #define GD_AREA_CHAOZHOUFENGXI         // 潮州枫溪局要求
 #define GD_AREA_CHAOZHOU_CHAOAN_FUYANG // 潮州潮安浮洋
 #define GD_AREA_ZHAOQING_FENGKAI       // 肇庆封开县要求，科陆在梅州FTU基础上新增功能
@@ -207,14 +206,6 @@
 #elif defined GD_AREA_ZHUHAI_FTU	//珠海FTU
 	#define VER_NUM 				19101			// 版本号19.101
 
-#elif defined GD_AREA_SHAOGUAN	    //韶关
-    #ifdef __IEC61850_GOOSE_FUNC__
-		#define VER_NUM			 		20201          // 版本号20.201
-	#else
-		#define VER_NUM 				20101			// 版本号20.101		
-	#endif
-	#define BHFA_YB_YK
-
 #elif defined  GD_AREA_CHAOZHOUFENGXI		//正超潮州枫溪版本	
     #ifdef __IEC61850_GOOSE_FUNC__
 		#define VER_NUM			 		22201          // 版本号22.201

dtu/dtu_main_t536/app/set.c

@@ -1625,14 +1625,6 @@ const  TSETTABLE tSwSetTable[]=
 		//中山局扩展
 		{SETTYPE_LIST,	SET_NULL,	"保护出口投入软压板",		0 , 		TTListNum-1,		1,		TTList, 	TTListNum,		GROUP_SET_YB,0X5023, BOOL_R},
 		{SETTYPE_LIST,	SET_NULL,	"保护投入软压板",	0 , 		TTListNum-1,		1,		TTList, 	TTListNum,		GROUP_SET_YB,0X5026, BOOL_R},
-	#elif defined GD_AREA_SHAOGUAN	
-		{SETTYPE_LIST,	SET_NULL,	"远方投入软压板",		0 , 		TTListNum-1,		1,		TTList, 	TTListNum,		GROUP_SET_YB,0X5025, BOOL_R},
-		{SETTYPE_LIST,	SET_NULL,	"功能总投入软压板",	0 , 		TTListNum-1,		1,		TTList, 	TTListNum,		GROUP_SET_YB,0X5026, 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,		1,		TTList, 	TTListNum,		GROUP_SET_YB,0X5025, 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,0X5025, BOOL_R},
-		{SETTYPE_LIST,	SET_NULL,	"智能分布式功能投入",		0 , 		TTListNum-1,		1,		TTList,		TTListNum,		GROUP_SET_YB,0X5025, BOOL_R},
 	#else	
 		#ifdef GD_AREA_FOS_2021
 			{SETTYPE_LIST,	SET_NULL,	"远方整定投入软压板",		0 , 		TTListNum-1,		1,		TTList,		TTListNum,		GROUP_SET_YB,0X5025, BOOL_R},
@@ -4015,7 +4007,7 @@ bool MakeRunSet(bool bFirst)
 
             ptSet->bTT_TQ_YB =((WORD)psetbuf[SET_TQ_YB+sw*SW_SET_NUMBER ].ff==1 )?true:false;	 //同期合闸软压板
 
-			#if (defined BHFAGS_YB_YK || defined GD_AREA_ZHONGSHAN || defined GD_AREA_SHAOGUAN) && !defined BH_FA_INONE_SW
+			#if (defined BHFAGS_YB_YK || defined GD_AREA_ZHONGSHAN) && !defined BH_FA_INONE_SW
 				#ifdef GD_TEST_2021
 					mode_total = (BYTE)(psetbuf[SET_BH_YBTT+sw*SW_SET_NUMBER ].ff + psetbuf[SET_FA_YBTT+sw*SW_SET_NUMBER ].ff + psetbuf[SET_GOOSE_YBTT+sw*SW_SET_NUMBER ].ff);
 					if(mode_total > 1){ 	 // 当前只允许一种功能模式投入运行

dtu/dtu_main_t536/app/set.h

@@ -767,14 +767,6 @@ enum
 		SET_BH_YBTT,		//电流型软压板
 		SET_KZ_OUT_YB,	//控制出口压板
 		SET_BH_YB,
-	#elif defined GD_AREA_SHAOGUAN
-		SET_EDIT_PAR_YB,	//远程修改定值压板
-		SET_BH_YB,	
-		SET_KZ_OUT_YB,		//控制出口压板		
-		SET_BH_YBTT,		//电流型软压板
-		SET_CHZ_YB, 		//重合闸压板
-		SET_FA_YBTT,		//电压电流型软压板
-		SET_GOOSE_YBTT,		//智能分布式软压板	
 	#else
 		SET_EDIT_PAR_YB,	//远程修改定值压板
         SET_BH_YB,	//保护总/停用