整理宏GD_AREA_ZHONGSHAN_FTU；

dtu/dtu_main_t536/app/Appconfig.c

@@ -588,11 +588,7 @@ const SOE_DEF tAllSOE[]=
 #else
 	{0x05,		{0,				0,			0},			"未储能告警"},
 #endif
-#ifdef GD_AREA_ZHONGSHAN_FTU
-	{0x05,		{0,			0,			0},				"控制回路断线"},
-#else
 	{0x45,		{0,			0,			0},				"控制回路异常"},
-#endif	
 	{0x05,		{0,	0,	0},			"M侧节点故障01"},
 	{0x05,		{0,	0,	0},			"M侧节点故障02"},
 	{0x05,		{0,	0,	0},			"M侧节点故障03"},

dtu/dtu_main_t536/app/FA.c

@@ -1038,16 +1038,10 @@ static void fa_unlock_s_bs(int sw)
 	{
 		soe_record_ev(EV_BS_DB+sw*EV_SW_NUM, 0, 0,0,0 );
 	}
-
-#ifdef GD_AREA_ZHONGSHAN_FTU
-	if(!g_tRelay[sw].run_stu.bs_bhz)
-#endif	
-	{
-		if(soe_check(EV_BS_HA+sw*EV_SW_NUM)==true)   // 
-		{
-			soe_record_ev(EV_BS_HA+sw*EV_SW_NUM, 0, 0,0,0 );
-		}
-	}
+    if(soe_check(EV_BS_HA+sw*EV_SW_NUM)==true)   // 
+    {
+        soe_record_ev(EV_BS_HA+sw*EV_SW_NUM, 0, 0,0,0 );
+    }
 	if(soe_check(EV_BS_UF_P+sw*EV_SW_NUM)==true)   // 
 	{
 		soe_record_ev(EV_BS_UF_P+sw*EV_SW_NUM, 0, 0,0,0 );

dtu/dtu_main_t536/app/defineSys.h

@@ -102,7 +102,6 @@
 
 #define AREA_MAIN             // 广东标准版
 #define GD_AREA_ZHONGSHAN     // 中山局要求
-#define GD_AREA_ZHONGSHAN_FTU          // 中山FTU要求
 #define GD_AREA_GUANGZHOU_FTU          // 广州局要求
 #define GD_AREA_ZHUHAI_FTU             // 珠海FTU局要求
 #define GD_AREA_SHANTOU                // 汕头局要求
@@ -172,10 +171,6 @@
 	#define RCD_STRAN_M			/*录波传输*/
 	#define RCD_STRAN_S			/*录波传输*/
 
-#elif defined GD_AREA_ZHONGSHAN_FTU	//中山FTU
-	#define VER_NUM			 		11101          	// 版本号11.101
-	#define GD_AREA_ZHONGSHAN						//在中山局的要求上扩展
-
 #elif defined  GD_AREA_GUANGZHOU_FTU	//广州
 	#define VER_NUM 				17101			// 版本号17.101
 	#define KZ_OUT_TT				//

dtu/dtu_main_t536/app/led.c

@@ -432,11 +432,7 @@ void _led_update_status(void)
 		else 
 			led_set_sw(i,SW_LED_CHZBS_LOCK, LED_OFF);
 		#endif
-#ifdef GD_AREA_ZHONGSHAN_FTU //中山FTU要求手柄手分的时候退出自动化功能，亮闭锁灯 
-		if(prun->bs || prun->bs_bhz||prun->chzbs)
-#else
 		if (prun->bs||prun->chzbs)
-#endif
 		{
 			led_set_sw(i,SW_LED_CHZBS_LOCK, LED_ON);
 		}
@@ -753,11 +749,7 @@ void _led_update_status(void)
 			g_tRelay[i].run_stu.fgbs=1;
 		}
 #endif
-#ifdef GD_AREA_ZHONGSHAN_FTU //中山FTU要求手柄手分的时候退出自动化功能，亮闭锁灯 
-		if(prun->bs || prun->bs_bhz)
-#else
 		if (prun->bs||prun->fgbs)
-#endif
 		{
 			led_set_sw(i,SW_LED_LOCK, LED_ON);
 		#ifdef GD_AREA_ZHONGSHAN_2020//中山2020要求分段的时候，双电源不亮闭锁灯

dtu/dtu_main_t536/app/protect.h

@@ -22,9 +22,6 @@
 // ±£»¤×ÜͶÍË
 #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_FTU
-	#define 	FUN_ALL_EN(sw)		(g_run_stu.bhall&&pRunSet->bTT_BH_YB&&(!g_tRelay[sw].run_stu.bs_bhz))
-//#elif defined GD_AREA_ZHONGSHAN_2020
 #elif defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_MAIN_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

dtu/dtu_main_t536/app/run_status.c

@@ -193,9 +193,7 @@ int run_status_init(void)
 	for (sw=0; sw<g_sw_num; sw++)
 	{
 		RUN_STU_SW *prun=&g_tRelay[sw].run_stu;
-#ifdef GD_AREA_ZHONGSHAN_FTU
-		prun->bs_bhz=false;
-#endif
+
 		// 合位无配置，置无效
 		if ((short)g_sw[sw].di_cfg_index[SW_DI_KRHW] == INDEX_INVALLID)
 		{
@@ -895,24 +893,6 @@ int  run_status_check(u32 dStep)
 		// 每3秒才可进行一次手分动作
 		RunTR(&pSW->tSTz3s10ms, (!sw_sf[sw]), dStep);
 		pR->run_stu.sw_sf = (pSW->tSTz3s10ms.boolTrip && sw_sf[sw] && g_run_stu.jd );
-	#ifdef GD_AREA_ZHONGSHAN_FTU //中山FTU要求手柄手分的时候退出自动化功能，亮闭锁灯 
-
-		RunTR(&pSW->tSf3s, (sw_sf[sw]), dStep);
-	
-		if(pSW->tSf3s.boolTrip&& g_run_stu.jd)
-		{
-			if(soe_check(EV_BS_HA+sw*EV_SW_NUM)==false)   // 手动分闸，闭锁合闸
- 			{
-				soe_record_ev(EV_BS_HA+sw*EV_SW_NUM, 1, 0,0,0 );
-				//fa_s_set_savestatus(sw);
-			}
-			prun->bs_bhz = true;
-		}
-		else
-		{
-			prun->bs_bhz = false;
-		}
-	#endif
 		//CT相序检查
 		{
 			bool bok,bCheck;

dtu/dtu_main_t536/app/run_status.h

@@ -140,9 +140,6 @@ typedef struct run_stu_sw
     u8 sw_sh; // 手合
     u8 sw_sf; // 手分
     u8 bhztt; // 保护总投退
-#ifdef GD_AREA_ZHONGSHAN_FTU
-    u8 bs_bhz; // 闭锁功能总
-#endif
 
     u8 jzs_tt; // 集中式投退
     u8 bhtt;        // 常规保护投退

dtu/dtu_main_t536/app/set.c

@@ -957,7 +957,7 @@ const  TSETTABLE tSwSetTable[]=
 {
 	
 	{SETTYPE_LABEL,	SET_NULL,	"保护控制字", 				0 , 		0,				0 ,		0,			0,				GROUP_SET_BHTT,0X0000, NULL_R},
-#if defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_ZHONGSHAN_FTU
+#if defined GD_AREA_ZHUHAI_FTU
 	{SETTYPE_LIST,	SET_NULL,	"过流Ⅰ段投入",			0 , 		TZGJListNum-1,		0,		TZGJList, 	TZGJListNum,		GROUP_SET_BHTT,0X500B, UINT_R},
 	{SETTYPE_LIST,	SET_NULL,	"过流Ⅱ段投入",			0 , 		TZGJListNum-1,		0,		TZGJList, 	TZGJListNum,		GROUP_SET_BHTT,0X500C, UINT_R},
 #elif defined GD_AREA_SHANTOU
@@ -974,7 +974,7 @@ const  TSETTABLE tSwSetTable[]=
 	{SETTYPE_LIST,	SET_NULL,	"过流Ⅱ段投入", 			0 , 		TTListNum-1,		0,		TTList,		TTListNum,		GROUP_SET_BHTT,0X500C, BOOL_R},
 #endif
 
-#if defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_ZHONGSHAN_FTU
+#if defined GD_AREA_ZHUHAI_FTU
     {SETTYPE_LIST,	SET_NULL,	"过流Ⅲ段投入", 			0 , 		TZGJListNum-1,		0,		TZGJList,	TZGJListNum,		GROUP_SET_BHTT,0X0000, UINT_R},
 #else
     {SETTYPE_LIST,	SET_NULL,	"过流Ⅲ段投入", 			0 , 		TTListNum-1,		0,		TTList,		TTListNum,		GROUP_SET_BHTT,0X0000, BOOL_R},
@@ -984,7 +984,7 @@ const  TSETTABLE tSwSetTable[]=
     {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},
 
-#if defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_ZHONGSHAN_FTU
+#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_SHANTOU
@@ -1967,7 +1967,7 @@ const  TSETTABLE tEquipParaTable[]=     			// min 	max 			default
 
 	{SETTYPE_5INT,	SET_S,		"液晶背光时间", 	0, 		65535,				180 ,	0,				0,				GROUP_PARA_OTHERS,0x0000, UINT_R},
 	{SETTYPE_LIST,	SET_NULL,	"级联状态监测", 0 , 	LinkListNum-1,		1,		LinkList,			LinkListNum,		GROUP_PARA_OTHERS,0x0000, UINT_R},
-#if (defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020) && !defined GD_AREA_ZHONGSHAN_FTU
+#if (defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020)
 	{SETTYPE_UINT,	SET_NULL,	"GOOSE通信ID", 		1 , 	32,				1 , 	0,				0,				GROUP_PARA_OTHERS,0x0000, FLOAT_R},
 	{SETTYPE_F, 		SET_S,		"GOOSE通信T1", 		0.0 ,	100.0,			6.0 ,	0,		0,	GROUP_PARA_OTHERS,0x0000, FLOAT_R},		
 	{SETTYPE_F, 		SET_S,		"GOOSE通信T2", 		0.0 ,	100.0,			3.0 ,	0,		0,	GROUP_PARA_OTHERS,0x0000, FLOAT_R},		
@@ -3124,7 +3124,7 @@ bool MakeRunSet(bool bFirst)
 		// 过流类定值
 		{
 			poc= &ptSet->tSwSet[sw].toc[BH_GL1];
-#if defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_ZHONGSHAN_FTU
+#if defined GD_AREA_ZHUHAI_FTU
 			poc->bTz=(((WORD)psetbuf[SET_GL1_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false)||(((WORD)psetbuf[SET_GL1_TT+sw*SW_SET_NUMBER ].ff==3 )?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==3 )?true:false);
 #elif defined GD_AREA_MAIN_2020//珠海局要求告警+跳闸两个选项
@@ -3157,7 +3157,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_ZHUHAI_FTU || defined GD_AREA_ZHONGSHAN_FTU
+#if defined GD_AREA_ZHUHAI_FTU
 			poc->bTz=(((WORD)psetbuf[SET_GL2_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false)||(((WORD)psetbuf[SET_GL2_TT+sw*SW_SET_NUMBER ].ff==3 )?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==3 )?true:false);
 #elif defined GD_AREA_MAIN_2020//珠海局要求告警+跳闸两个选项
@@ -3192,7 +3192,7 @@ bool MakeRunSet(bool bFirst)
 			poc->bGj  = false;
 			poc->bDir = false;
 
-		#if defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_ZHONGSHAN_FTU
+		#if defined GD_AREA_ZHUHAI_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);
 		#else
@@ -3243,7 +3243,7 @@ bool MakeRunSet(bool bFirst)
 			poc->dI_fh= _Mul_Div_U(poc->dI,	96, 100);		//0.96=0.98*0.98;        		//过流2定值返回值
 
 			poc= &ptSet->tSwSet[sw].toc[BH_LX1];
-#if defined GD_AREA_ZHUHAI_FTU  || defined GD_AREA_ZHONGSHAN_FTU
+#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_SHANTOU
@@ -3262,7 +3262,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_LX2];
-#if defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_ZHONGSHAN_FTU
+#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_SHANTOU
@@ -4911,7 +4911,7 @@ void MakeRunPara(bool bFirstInit, bool bUboot)
 #endif	
 	pRunPara->wFAFZT= (DWORD)rt_round(psetbuf[PARA_FZPULSE].ff);
 	pRunPara->wFAHZT= (DWORD)rt_round(psetbuf[PARA_HZPULSE].ff);
-#if (defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020) && !defined GD_AREA_ZHONGSHAN_FTU
+#if (defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020)
 	pRunPara->gse_id= (WORD)rt_round(psetbuf[PARA_GOOSE_ID].ff)-1;
 	pRunPara->gse_T1=GetSetTIME(psetbuf[PARA_GOOSE_T1].ff);
 	pRunPara->gse_T2=GetSetTIME(psetbuf[PARA_GOOSE_T2].ff);

dtu/dtu_main_t536/app/set.h

@@ -1155,7 +1155,7 @@ enum
 #endif
 	PARA_LHTTIME,			// 液晶背光时间
 	PARA_LINK_STATE,		// 级联状态通道
-#if (defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020) && !defined GD_AREA_ZHONGSHAN_FTU
+#if (defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020)
 	PARA_GOOSE_ID,		// goose通信ID
 	PARA_GOOSE_T1,		// goose通信ID
 	PARA_GOOSE_T2,		// goose通信ID