整理宏ADD_FD_GL_FX_BH_FUN；

dtu/dtu_main_t536/app/Appconfig.c

@@ -159,33 +159,27 @@ const SOE_DEF tAllSOE[]=
 	#ifdef EV_GL_STATR
 		{0x04,		{EV_PARA_Ia,EV_PARA_Ib, EV_PARA_Ic},		"过流I段启动"},
 	#endif
-    #ifdef ADD_FD_GL_FX_BH_FUN
-        {0x14,		{EV_PARA_Ia,	0,					0},				"过流I段A相短路故障"},
-  	    {0x14,		{EV_PARA_Ib,	0,					0},				"过流I段B相短路故障"},
- 	    {0x14,		{EV_PARA_Ic,	0,					0},				"过流I段C相短路故障"},
-	#endif
+    {0x14,		{EV_PARA_Ia,	0,					0},				"过流I段A相短路故障"},
+    {0x14,		{EV_PARA_Ib,	0,					0},				"过流I段B相短路故障"},
+    {0x14,		{EV_PARA_Ic,	0,					0},				"过流I段C相短路故障"},
 
 	{0xD4|SOE_TYPE_DELAY_FHZ,		{EV_PARA_Ia,EV_PARA_Ib,	EV_PARA_Ic},		"过流II段动作"},
 	{0xD4,		{EV_PARA_Ia,EV_PARA_Ib,	EV_PARA_Ic},		"过流II段告警"},
 	#ifdef EV_GL_STATR
 		{0x04,		{EV_PARA_Ia,EV_PARA_Ib, EV_PARA_Ic},		"过流II段启动"},
 	#endif
-    #ifdef ADD_FD_GL_FX_BH_FUN
-        {0x14,		{EV_PARA_Ia,	0,					0},				"过流II段A相短路故障"},
-  	    {0x14,		{EV_PARA_Ib,	0,					0},				"过流II段B相短路故障"},
- 	    {0x14,		{EV_PARA_Ic,	0,					0},				"过流II段C相短路故障"},
-    #endif
+    {0x14,		{EV_PARA_Ia,	0,					0},				"过流II段A相短路故障"},
+    {0x14,		{EV_PARA_Ib,	0,					0},				"过流II段B相短路故障"},
+    {0x14,		{EV_PARA_Ic,	0,					0},				"过流II段C相短路故障"},
 	
 	{0xD4|SOE_TYPE_DELAY_FHZ,		{EV_PARA_Ia,EV_PARA_Ib,	EV_PARA_Ic},		"过流Ⅲ段动作"},
 	{0xD4,		{EV_PARA_Ia,EV_PARA_Ib,	EV_PARA_Ic},		"过流Ⅲ段告警"},
 	#ifdef EV_GL_STATR
 		{0x04,		{EV_PARA_Ia,EV_PARA_Ib, EV_PARA_Ic},		"过流Ⅲ段启动"},
 	#endif
-    #ifdef ADD_FD_GL_FX_BH_FUN
-        {0x14,		{EV_PARA_Ia,	0,					0},				"过流Ⅲ段A相短路故障"},
-  	    {0x14,		{EV_PARA_Ib,	0,					0},				"过流Ⅲ段B相短路故障"},
- 	    {0x14,		{EV_PARA_Ic,	0,					0},				"过流Ⅲ段C相短路故障"},
-    #endif	
+    {0x14,		{EV_PARA_Ia,	0,					0},				"过流Ⅲ段A相短路故障"},
+    {0x14,		{EV_PARA_Ib,	0,					0},				"过流Ⅲ段B相短路故障"},
+    {0x14,		{EV_PARA_Ic,	0,					0},				"过流Ⅲ段C相短路故障"},
 	
 	{0xD4|SOE_TYPE_DELAY_FHZ,		{EV_PARA_I0,	EV_PARA_U0,	0},				"零流I段动作"},
 	{0xD4,		{EV_PARA_I0,	EV_PARA_U0,	0},				"零流I段告警"},

dtu/dtu_main_t536/app/Appconfig.h

@@ -151,33 +151,27 @@ enum
 #ifdef EV_GL_STATR
 	EV_GL1_START,
 #endif
-#ifdef ADD_FD_GL_FX_BH_FUN
     EV_GL1_IA,                  //过流1 A相故障
     EV_GL1_IB,                  //过流1 B相故障
     EV_GL1_IC,                  //过流1 C相故障
-#endif
 
     EV_GL2TZ,           // 过流2动作
     EV_GL2GJ,
 #ifdef EV_GL_STATR
 	EV_GL2_START,
 #endif
-#ifdef ADD_FD_GL_FX_BH_FUN
 	EV_GL2_IA,					//过流2 A相故障
 	EV_GL2_IB,					//过流2 B相故障
 	EV_GL2_IC,					//过流2 C相故障
-#endif
 
     EV_GL3TZ,           // 过流2动作
     EV_GL3GJ,
 #ifdef EV_GL_STATR
     EV_GL3_START,
 #endif
-#ifdef ADD_FD_GL_FX_BH_FUN
 	EV_GL3_IA,					//过流3 A相故障
 	EV_GL3_IB,					//过流3 B相故障
 	EV_GL3_IC,					//过流3 C相故障
-#endif
 
 
     EV_LX1TZ,

dtu/dtu_main_t536/app/defineSys.h

@@ -42,7 +42,6 @@
 #define YK_FA_ENBLE                    // 主站需要具备遥控闭锁以及解锁开关自动合闸的功能，由主站发起的闭锁需要由主站解锁，即其他情况的解锁都不能消除此遥控闭锁。
 #define IEC_QDS_HAVE                   // 101/104品质描述压板(与QDS_TT二选一)
 #define YK_FG_FAJS                     // 遥控复归+FA解锁
-#define ADD_FD_GL_FX_BH_FUN            // 分段过流段内分相保护功能
 #define YK_FA_S_L_ENBLE                // 分段联络遥控
 #define YD_TEST_REALTIME_VALUE_DISPLAY // 远动测试遥信、遥测数据显示
 #define SEC_SETVALUE_4                 // 4个定值区
@@ -167,7 +166,7 @@
     #define YB_AUTO_SELECT	  // 在没配置硬压板的时自动选择软压板执行
     #define IEC_QDS_HAVE
 
-#else defined GD_AREA_ZHONGSHAN	//中山局要求
+#elif defined GD_AREA_ZHONGSHAN	//中山局要求
  	#ifdef __IEC61850_GOOSE_FUNC__
 		#define VER_NUM			 		3102          // 版本号3.102
 	#else
@@ -198,7 +197,6 @@
 
 #if (VER_NUM>=28101 && VER_NUM<50101)
 	#if (VER_NUM<29101)
-		#define ADD_FD_GL_FX_BH_FUN          //分段过流段内分相保护功能
 		#define BHFAGS_YB_YK                 //保护、FA合goose软压板定值投退/SOE硬压板关联/遥控
 	#elif ((VER_NUM>=29101) && (VER_NUM<32101))
 		#ifndef GD_AREA_ECZD_2020
@@ -207,7 +205,6 @@
 		#define SEC_SETVALUE_7
 		#define FUN_CHZ_TOPEN
 	#elif (VER_NUM>=32101)
-		#define ADD_FD_GL_FX_BH_FUN          //分段过流段内分相保护功能
 		#define BHFAGS_YB_YK                 //保护、FA合goose软压板定值投退/SOE硬压板关联/遥控
 		#define FUN_JDXX					//小电流接地功能
 	#endif

dtu/dtu_main_t536/app/oc.c

@@ -236,7 +236,6 @@ void  pro_check_gl_abc(int sw,DWORD i_set,DWORD I1,DWORD I2,DWORD I3)
 	}
 }
 
-#ifdef ADD_FD_GL_FX_BH_FUN
 void  pro_check_fd_gl_abc(int sw,DWORD i_set,DWORD I1,DWORD I2,DWORD I3,int soe_no)
 {
     bool bIa,bIb,bIc;
@@ -314,9 +313,6 @@ void pro_rst_fd_gl_event(int sw,int soe_no)
 
 }
 
-
-
-#endif
 void pro_rst_event(int sw,int soe_no)
 {
 	if(soe_check(soe_no+sw*EV_SW_NUM)==true)
@@ -1236,9 +1232,7 @@ int gl_soe_set_clr(u8 set_clr, int sw, u16 soe_no, u32 i_set,bool bfault)
                 if(bfault)rcd_start(sw,RECORD_TYPE_GLGZ, RECORD_LEN_TZQD);  //录波类型：跳闸类
             }
             pro_check_gl_abc(sw,i_set,Ia,Ib,Ic); // 分相故障判断
-#ifdef ADD_FD_GL_FX_BH_FUN
             pro_check_fd_gl_abc(sw,i_set,Ia,Ib,Ic,soe_no); // 分段分相故障判断
-#endif
             if(soe_check(EV_GL_FAULT+sw*EV_SW_NUM)==false) // 过流总
             {
                 soe_record_ev( EV_GL_FAULT+sw*EV_SW_NUM,1, 0,0,0 );
@@ -1265,9 +1259,7 @@ int gl_soe_set_clr(u8 set_clr, int sw, u16 soe_no, u32 i_set,bool bfault)
                 pro_rst_event(sw,EV_IB_GL);
                 pro_rst_event(sw,EV_IC_GL);
                 pro_rst_event(sw,EV_GL_FAULT);   //过流总
-#ifdef ADD_FD_GL_FX_BH_FUN
                 pro_rst_fd_gl_event(sw,soe_no);  //分段分相故障返回
-#endif
             }
             if(pro_check_fault_all(sw)==false)
             {