整理宏GD_AREA_GUANGZHOU_FTU；

dtu/dtu_main_t536/app/Sys.c

@@ -591,11 +591,7 @@ void ResetHzLed(int rstsw)
 			pR->tCHZ.wAR_ActTimes=0;	
 		   	ResetTR(&pR->tCHZ.tTCHJD_HJS);
 		}
-
-#if defined GD_AREA_GUANGZHOU_FTU
-		// 灭故障告警灯
 		led_set_sw(sw,SW_LED_FAULT_GJ, LED_OFF);
-#endif
 	    led_set_sw(sw,SW_LED_DZ, LED_OFF);  
 	    led_set_sw(sw,SW_LED_TZ, LED_OFF);
 	}
@@ -837,16 +833,12 @@ void SignalReset(int rstsw,bool blnk)
 		// 灭过流灯
 		if (bGLRst)
 		{
-		#ifndef GD_AREA_GUANGZHOU_FTU
 			led_set_sw(sw,SW_LED_GL, LED_OFF); 
-		#endif
 		}
 		// 灭接地灯
 		if (bJDRst)
 		{
-		#ifndef GD_AREA_GUANGZHOU_FTU
 			led_set_sw(sw,SW_LED_JD, LED_OFF);
-		#endif
 		}
 
 		// 灭重合灯
@@ -865,9 +857,7 @@ void SignalReset(int rstsw,bool blnk)
 		{
 			sw_do(sw,SW_DO_BHDZ,SW_DO_TYPE_OFF);
 			led_set_sw(sw,SW_LED_DZ, LED_OFF);
-			#ifndef GD_AREA_GUANGZHOU_FTU
 			led_set_sw(sw,SW_LED_TZ, LED_OFF);
-			#endif
 			pR->run_stu.dz = RY_DZ_NULL;
 			if(rstsw>0)soe_record_opt(EV_SIG_RESET, 0);
 							
@@ -2553,9 +2543,6 @@ static void _signrst_auto(void)
 			{
 				//rt_printf("合位复归...\r\n");
 				rt_printf(".");
-				#ifndef GD_AREA_GUANGZHOU_FTU	//广州FTU不进入下面函数，否则相关故障灯点亮后合闸不会自动复归
-				SignalReset(sw+1,false);
-				#endif
 			}
 		}
 	}

dtu/dtu_main_t536/app/defineSys.h

@@ -104,7 +104,6 @@
 
 #define AREA_MAIN             // 广东标准版
 #define GD_AREA_ZHONGSHAN     // 中山局要求
-#define GD_AREA_GUANGZHOU_FTU          // 广州局要求
 #define GD_AREA_ZHUHAI_FTU             // 珠海FTU局要求
 #define GD_AREA_MAIN_2020              // 广东标准版2020
 #define GD_AREA_ECZD_2020              // 2020广东配网终端二次功能指导意见
@@ -170,16 +169,6 @@
 	#define RCD_STRAN_M			/*录波传输*/
 	#define RCD_STRAN_S			/*录波传输*/
 
-#elif defined  GD_AREA_GUANGZHOU_FTU	//广州
-	#define VER_NUM 				17101			// 版本号17.101
-	#define KZ_OUT_TT				//
-	#define EV_CHZ_FG
-	#define DISP_CHZOKCHR_2_SW
-	#define BH_FA_INONE_SW			//功能模块配置定值部分，主要特征为BH/FA/智能FA三合一(在开关定值中)
-	#define SELF_OPEN_RELEASE		//本体分闸后重合闸放电功能，注意是否与当前偷跳重合冲突
-	#define STORE_PILOTELAMP	//故障指示灯掉电保存功能
-	#define FUN_SOE_DELAY_TIME	//SOE续传在总召后15s上送
-
 #elif defined GD_AREA_ZHUHAI_FTU	//珠海FTU
 	#define VER_NUM 				19101			// 版本号19.101
 

dtu/dtu_main_t536/app/led.c

@@ -161,12 +161,6 @@ void _led_update_status(void)
 	{
 		led_set_pub(PUB_LED_POWER, LED_ON);	
 	}
-#if defined GD_AREA_GUANGZHOU_FTU
-	else
-	{
-		led_set_pub(PUB_LED_POWER, LED_OFF);//FTU外置电源灯一般用继电器开出，灯闪烁容易损坏继电器	
-	}
-#else	
 	else if (g_run_stu.dcjlsd && (!g_run_stu.dcqy))
 	{
 		led_set_pub(PUB_LED_POWER, LED_SLOW);	
@@ -175,7 +169,6 @@ void _led_update_status(void)
 	{
 		led_set_pub(PUB_LED_POWER, LED_QUICK);	
 	}
-#endif
 	// 运行灯
 	if(rt_err_count())
 	{
@@ -397,11 +390,11 @@ void _led_update_status(void)
 		{
 			led_set_sw(i,SW_LED_JDDZ, LED_OFF);
 		}
-#if defined GD_AREA_GUANGZHOU_FTU
 		if (prun->gj_led)
-			led_set_sw(i,SW_LED_FAULT_GJ, LED_ON);
-	#endif
-		// 重合闸灯
+        {
+            led_set_sw(i, SW_LED_FAULT_GJ, LED_ON);
+        }
+        // 重合闸灯
 		if (prun->chzdz)
 		{			 
 			led_set_sw(i,SW_LED_CHZ, LED_ON);	

dtu/dtu_main_t536/app/set.c

@@ -943,9 +943,6 @@ const  TSETTABLE tSwSetTable[]=
 #elif defined GD_AREA_MAIN_2020 || 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},
-#elif defined GD_AREA_GUANGZHOU_FTU
-	{SETTYPE_LIST,	SET_NULL,	"过流Ⅰ段投入",			0 , 		TZCKListNum-1,		0,		TZCKList,	TZCKListNum,		GROUP_SET_BHTT,0X0000, UINT_R},
-	{SETTYPE_LIST,	SET_NULL,	"过流Ⅱ段投入",			0 , 		TZCKListNum-1,		0,		TZCKList,	TZCKListNum,		GROUP_SET_BHTT,0X0000, UINT_R},
 #else
 	{SETTYPE_LIST,	SET_NULL,	"过流Ⅰ段投入", 			0 , 		TTListNum-1,		0,		TTList,		TTListNum,		GROUP_SET_BHTT,0X500B, BOOL_R},
 	{SETTYPE_LIST,	SET_NULL,	"过流Ⅱ段投入", 			0 , 		TTListNum-1,		0,		TTList,		TTListNum,		GROUP_SET_BHTT,0X500C, BOOL_R},
@@ -964,9 +961,6 @@ const  TSETTABLE tSwSetTable[]=
 #if defined GD_AREA_ZHUHAI_FTU
 	{SETTYPE_LIST,	SET_NULL,	"零序过流Ⅰ段投入", 		0 , 		TZGJListNum-1,		0,		TZGJList, 	TZGJListNum,		GROUP_SET_BHTT,0X5010, UINT_R},
 	{SETTYPE_LIST,	SET_NULL,	"零序过流Ⅱ段投入", 0 , 				TZGJListNum-1,		0,		TZGJList, 	TZGJListNum,		GROUP_SET_BHTT,0X5011, UINT_R},
-#elif defined GD_AREA_GUANGZHOU_FTU
-	{SETTYPE_LIST,	SET_NULL,	"零序过流Ⅰ段投入", 		0 , 		TZCKListNum-1,		0,		TZCKList,		TZCKListNum,		GROUP_SET_BHTT,0X0000, UINT_R},
-	{SETTYPE_LIST,	SET_NULL,	"零序过流Ⅱ段投入", 0 , 				TZCKListNum-1,		0,		TZCKList,		TZCKListNum,		GROUP_SET_BHTT,0X0000, UINT_R},
 #else
 	{SETTYPE_LIST,	SET_NULL,	"零序过流Ⅰ段投入", 		0 , 		TZListNum-1,		0,		TZList,		TZListNum,		GROUP_SET_BHTT,0X5010, BOOL_R},
 	{SETTYPE_LIST,	SET_NULL,	"零序过流Ⅱ段投入", 0 , 				TZListNum-1,		0,		TZList,		TZListNum,		GROUP_SET_BHTT,0X5011, BOOL_R},
@@ -3060,9 +3054,6 @@ bool MakeRunSet(bool bFirst)
 #elif 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);
-#elif defined GD_AREA_GUANGZHOU_FTU
-			poc->bTz=(((WORD)psetbuf[SET_GL1_TT+sw*SW_SET_NUMBER ].ff==2 )?true:false); 
-			poc->bGj= (((WORD)psetbuf[SET_GL1_TT+sw*SW_SET_NUMBER ].ff==2 )?true:false)||(((WORD)psetbuf[SET_GL1_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false);
 #else
 			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==1 )?true:false);
@@ -3090,9 +3081,6 @@ bool MakeRunSet(bool bFirst)
 #elif 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);
-#elif defined GD_AREA_GUANGZHOU_FTU
-			poc->bTz=(((WORD)psetbuf[SET_GL2_TT+sw*SW_SET_NUMBER ].ff==2 )?true:false); 
-			poc->bGj= (((WORD)psetbuf[SET_GL2_TT+sw*SW_SET_NUMBER ].ff==2 )?true:false)||(((WORD)psetbuf[SET_GL2_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false);
 #else
 			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==1 )?true:false);
@@ -3167,9 +3155,6 @@ bool MakeRunSet(bool bFirst)
 #if defined GD_AREA_ZHUHAI_FTU 
 			poc->bTz=(((WORD)psetbuf[SET_LX1_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false)||(((WORD)psetbuf[SET_LX1_TT+sw*SW_SET_NUMBER ].ff==3 )?true:false); 
 			poc->bGj=(((WORD)psetbuf[SET_LX1_TT+sw*SW_SET_NUMBER ].ff==2 )?true:false)||(((WORD)psetbuf[SET_LX1_TT+sw*SW_SET_NUMBER ].ff==3 )?true:false);
-#elif defined GD_AREA_GUANGZHOU_FTU
-			poc->bTz=(((WORD)psetbuf[SET_LX1_TT+sw*SW_SET_NUMBER ].ff==2 )?true:false); 
-			poc->bGj= (((WORD)psetbuf[SET_LX1_TT+sw*SW_SET_NUMBER ].ff==2 )?true:false)||(((WORD)psetbuf[SET_LX1_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false);
 #else			
 			poc->bTz=(((WORD)psetbuf[SET_LX1_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false); 
 			poc->bGj=(((WORD)psetbuf[SET_LX1_TT+sw*SW_SET_NUMBER ].ff==0 )?true:false); 
@@ -3183,9 +3168,6 @@ bool MakeRunSet(bool bFirst)
 #if defined GD_AREA_ZHUHAI_FTU
 			poc->bTz=(((WORD)psetbuf[SET_LX2_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false)||(((WORD)psetbuf[SET_LX2_TT+sw*SW_SET_NUMBER ].ff==3 )?true:false); 
 			poc->bGj=(((WORD)psetbuf[SET_LX2_TT+sw*SW_SET_NUMBER ].ff==2 )?true:false)||(((WORD)psetbuf[SET_LX2_TT+sw*SW_SET_NUMBER ].ff==3 )?true:false);
-#elif defined GD_AREA_GUANGZHOU_FTU
-			poc->bTz=(((WORD)psetbuf[SET_LX2_TT+sw*SW_SET_NUMBER ].ff==2 )?true:false); 
-			poc->bGj= (((WORD)psetbuf[SET_LX2_TT+sw*SW_SET_NUMBER ].ff==2 )?true:false)||(((WORD)psetbuf[SET_LX2_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false);
 #else
 			poc->bTz=(((WORD)psetbuf[SET_LX2_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false); 
 			poc->bGj=(((WORD)psetbuf[SET_LX2_TT+sw*SW_SET_NUMBER ].ff==0 )?true:false);  

dtu/dtu_main_t536/app/switch.c

@@ -179,9 +179,7 @@ const s8 * g_sw_led_name[SW_LED_NUM]=
 	"就地FA模式灯",
 	"分布式模式灯",
 	"X+Y灯",
-#if defined GD_AREA_GUANGZHOU_FTU 
 	"故障告警灯",
-#endif
 #if defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020
 	"自动解列功能灯",
 	"同期合闸功能灯",

dtu/dtu_main_t536/app/switch.h

@@ -174,9 +174,7 @@ enum
 	SW_LED_MODE_GOOSE,	//智能分布式
 	SW_LED_X_YT,
 
-#if defined GD_AREA_GUANGZHOU_FTU
 	SW_LED_FAULT_GJ,//故障告警灯
-#endif
 //#ifdef GD_AREA_ECZD_2020
 #if defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020
 	SW_LED_ZDJL,	//"自动解列功能",