整理宏GD_AREA_HEYUAN_KL；

dtu/dtu_main_t536/app/Sys.c

@@ -309,8 +309,6 @@ void app_yb_refresh(void)
         //#ifdef GD_AREA_FOS
 #if defined GD_AREA_FOS || defined GD_AREA_MAIN_2020 || defined GD_AREA_ECZD_2020
         fresh_set_soe(EV_CHZ_YB,CHZ_ALL_EN(sw) , 0,sw);//重合闸投入
-#elif defined GD_AREA_HEYUAN_KL
-        fresh_set_soe(EV_CHZ_YB,!pRunSet->bTT_CHZ_YB, 0,sw);//重合闸投入
 #else
         fresh_set_soe(EV_CHZ_YB,!CHZ_ALL_EN(sw) , 0,sw);//停用重合闸
 #endif

dtu/dtu_main_t536/app/defineSys.h

@@ -102,7 +102,6 @@
 #define GD_AREA_FOS_2020      // 佛山局2020要求
 #define GD_AREA_ZHONGSHAN     // 中山局要求
 #define GD_AREA_ZHONGSHAN_FTU          // 中山FTU要求
-#define GD_AREA_HEYUAN_KL              // 科陆河源局要求
 #define GD_AREA_GUANGZHOU_FTU          // 广州局要求
 #define GD_AREA_ZHAOQING               // 肇庆局要求
 #define GD_AREA_ZHUHAI_FTU             // 珠海FTU局要求
@@ -196,10 +195,6 @@
 #elif defined GD_AREA_ZHAOQING_FENGKAI	//	//肇庆封开县要求，科陆在梅州FTU基础上新增功能
 	#define VER_NUM 				13102			// 版本号13.101
 
-#elif defined GD_AREA_HEYUAN_KL     //科陆河源
-    #define VER_NUM 				16101			// 版本号16.101
-	#define SOE_RECORD_DELAY
-
 #elif defined  GD_AREA_GUANGZHOU_FTU	//广州
 	#define VER_NUM 				17101			// 版本号17.101
 	#define KZ_OUT_TT				//

dtu/dtu_main_t536/app/protect.h

@@ -41,13 +41,6 @@
 
 	#define 	BH_ALL_EN(sw)		(FUN_ALL_EN(sw) && pRunSet->bTT_SOFT_BH_YB &&  ((g_tRelay[sw].run_stu.bhtt&&(!BH_GOOSE_EN_YB(sw)))||(BH_GOOSE_EN_YB(sw)&&pRunSet->tSwSet[sw].tGocSet.bsw_fz)))
 	#define 	FA_ALL_EN(sw)		(FUN_ALL_EN(sw) && pRunSet->bTT_SOFT_FA_YB &&  ((g_tRelay[sw].run_stu.fatt&&(!BH_GOOSE_EN_YB(sw)))||(BH_GOOSE_COMMERR(sw)&&!pRunSet->tSwSet[sw].tGocSet.bsw_fz)))
-#elif defined GD_AREA_HEYUAN_KL || (defined GD_AREA_CHAOZHOUFENGXI && !defined GD_AREA_ECZD_2020)	//科陆河源要求智能分布式不判断硬件压板，只判断FA的依赖通信的时候投入
-    #define 	BH_GOOSE_EN_YB(sw)	(FUN_ALL_EN(sw)&& pRunSet->bTT_SOFT_GOOSE_YB &&	 pRunSet->tSwSet[sw].tGocSet.bTT_gooseFA && (!pRunSet->tSwSet[sw].bTT_FA) && (g_tRelay[sw].run_stu.fatt))
-	#define 	BH_GOOSE_EN(sw)	(BH_GOOSE_EN_YB(sw))
-	#define 	BH_GOOSE_COMMERR(sw)	 (false)
-	#define 	BH_ALL_EN(sw)		(FUN_ALL_EN(sw) && pRunSet->bTT_SOFT_BH_YB&& g_tRelay[sw].run_stu.bhtt&&(!BH_GOOSE_EN(sw)))
-	#define 	FA_ALL_EN(sw)		(FUN_ALL_EN(sw) && pRunSet->bTT_SOFT_FA_YB  && g_tRelay[sw].run_stu.fatt&&(!BH_GOOSE_EN(sw)))
-
 #else
 	#ifdef YB_AUTO_SELECT
         #define 	BH_GOOSE_EN_YB(sw)	(FUN_ALL_EN(sw)&&goose_yb_enable(sw)&&pRunSet->tSwSet[sw].tGocSet.bTT_gooseFA)

dtu/dtu_main_t536/app/set.c

@@ -111,7 +111,7 @@ BH_SET_GROUP SetGroups[]=  //
 #endif
 
 
-#if defined GD_AREA_HEYUAN_KL || (defined GD_AREA_CHAOZHOUFENGXI && !defined GD_AREA_ECZD_2020)//科陆河源要求智能分布式要在FA模式下显示
+#if (defined GD_AREA_CHAOZHOUFENGXI && !defined GD_AREA_ECZD_2020)//科陆河源要求智能分布式要在FA模式下显示
 	{SETGROUP_TYPE_BH			,1 ,		SET_HYB_FA,		GROUP_SET_GOOSETT,	"保护定值", 		"分布式控制字", 	},			
 	{SETGROUP_TYPE_BH			,1 ,		SET_HYB_FA,		GROUP_SET_GOOSEDZ,	"保护定值", 		"分布式FA定值", 	},
 #else
@@ -969,7 +969,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 ||defined GD_AREA_HEYUAN_KL || defined  GD_AREA_JIEYANG_FTU
+#if defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_ZHONGSHAN_FTU ||defined  GD_AREA_JIEYANG_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
@@ -986,7 +986,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 ||defined GD_AREA_HEYUAN_KL || defined  GD_AREA_JIEYANG_FTU
+#if defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_ZHONGSHAN_FTU ||defined  GD_AREA_JIEYANG_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},
@@ -996,7 +996,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 ||defined GD_AREA_HEYUAN_KL || defined  GD_AREA_JIEYANG_FTU
+#if defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_ZHONGSHAN_FTU ||defined  GD_AREA_JIEYANG_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
@@ -3239,7 +3239,7 @@ bool MakeRunSet(bool bFirst)
 		// 过流类定值
 		{
 			poc= &ptSet->tSwSet[sw].toc[BH_GL1];
-#if defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_ZHONGSHAN_FTU ||defined GD_AREA_HEYUAN_KL || defined  GD_AREA_JIEYANG_FTU
+#if defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_ZHONGSHAN_FTU ||defined  GD_AREA_JIEYANG_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//珠海局要求告警+跳闸两个选项
@@ -3272,7 +3272,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 ||defined GD_AREA_HEYUAN_KL || defined  GD_AREA_JIEYANG_FTU
+#if defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_ZHONGSHAN_FTU ||defined  GD_AREA_JIEYANG_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//珠海局要求告警+跳闸两个选项
@@ -3307,7 +3307,7 @@ bool MakeRunSet(bool bFirst)
 			poc->bGj  = false;
 			poc->bDir = false;
 
-		#if defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_ZHONGSHAN_FTU ||defined GD_AREA_HEYUAN_KL || defined  GD_AREA_JIEYANG_FTU
+		#if defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_ZHONGSHAN_FTU ||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);
 		#else
@@ -3358,7 +3358,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 ||defined GD_AREA_HEYUAN_KL || defined  GD_AREA_JIEYANG_FTU
+#if defined GD_AREA_ZHUHAI_FTU  || defined GD_AREA_ZHONGSHAN_FTU ||defined  GD_AREA_JIEYANG_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
@@ -3377,7 +3377,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 ||defined GD_AREA_HEYUAN_KL || defined  GD_AREA_JIEYANG_FTU
+#if defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_ZHONGSHAN_FTU ||defined  GD_AREA_JIEYANG_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