整理宏GD_AREA_CHAOZHOU；

dtu/dtu_main_t536/app/Appconfig.c

@@ -246,7 +246,7 @@ const SOE_DEF tAllSOE[]=
 	{0xD4|SOE_TYPE_DELAY_FHZ,		{EV_PARA_I0,	EV_PARA_U0,	0},				"零压加速动作"},
 
 	{0xD4,		{EV_PARA_Ia,EV_PARA_Ib,	EV_PARA_Ic},		"反时限过流动作"},
-#if defined GD_AREA_CHAOZHOU || defined GD_AREA_SHANTOU  || defined GD_AREA_ECZD_2020   //潮州局要求合后电流两段处理		
+#if defined GD_AREA_SHANTOU  || defined GD_AREA_ECZD_2020   //潮州局要求合后电流两段处理		
 	{0xD4|SOE_TYPE_DELAY_FHZ,		{EV_PARA_Ia,EV_PARA_Ib,	EV_PARA_Ic},		"合后故障过流I段动作"},	
 	{0xD4|SOE_TYPE_DELAY_FHZ,		{EV_PARA_Ia,EV_PARA_Ib,	EV_PARA_Ic},		"合后故障过流II段动作"},
 #elif defined GD_AREA_MAIN_2020

dtu/dtu_main_t536/app/Appconfig.h

@@ -217,9 +217,8 @@ enum
 	EV_LXJS,					// 零序加速
 	EV_U0JS,
 	EV_FSXGL,
-	EV_FA_GL_TZ,
-//#if defined GD_AREA_CHAOZHOU || defined GD_AREA_SHANTOU  || defined GD_AREA_ECZD_2020   //潮州局要求合后电流两段处理		
-#if defined GD_AREA_CHAOZHOU || defined GD_AREA_SHANTOU  || defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020
+	EV_FA_GL_TZ,	
+#if defined GD_AREA_SHANTOU  || defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020
 	EV_FA_GL_TZ2,
 #endif	
 	EV_FA_LX_TZ,

dtu/dtu_main_t536/app/FA.c

@@ -836,8 +836,7 @@ void fa_s_Dataset(int sw, DWORD  dStep)
 	int ui_begin;
 	bool xbQD1=false;
 	DWORD U01,U02;
-	//#if defined GD_AREA_CHAOZHOU || defined GD_AREA_SHANTOU  || defined GD_AREA_ECZD_2020   //潮州局要求合后电流两段处理	
-	#if defined GD_AREA_CHAOZHOU || defined GD_AREA_SHANTOU  || defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020 
+	#if defined GD_AREA_SHANTOU  || defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020 
 	bool xbQD2=false;
 	#endif
 	bool xbAll=false;
@@ -867,8 +866,7 @@ void fa_s_Dataset(int sw, DWORD  dStep)
 	xbQD1 = fa_XBCalc(sw,pSet->toc[FA_GL].dI);
 	RunTR(&g_tRelay[sw].tOC[FA_GL].tXBTime, xbQD1, dStep);//谐波含量
 	//xbQD1 = g_tRelay[sw].tOC[FA_GL].tXBTime.boolTrip;	
-//#if defined GD_AREA_CHAOZHOU || defined GD_AREA_SHANTOU  || defined GD_AREA_ECZD_2020   //潮州局要求合后电流两段处理
-#if defined GD_AREA_CHAOZHOU || defined GD_AREA_SHANTOU  || defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020 
+#if defined GD_AREA_SHANTOU  || defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020 
 	xbQD2 = fa_XBCalc(sw,pSet->toc[FA_GL_II].dI);	
 	RunTR(&g_tRelay[sw].tOC[FA_GL_II].tXBTime, xbQD2, dStep);//谐波含量
 	//xbQD2 = g_tRelay[sw].tOC[FA_GL_II].tXBTime.boolTrip;
@@ -895,8 +893,8 @@ void fa_s_Dataset(int sw, DWORD  dStep)
 	RunTR(&pSW->tGZJYRstGLTime, bgl&&!xbQD1 ,dStep);  //跳闸位置、超过故障记忆过流复归时间，清跳闸次数
 	pSW->uSdhz_S.bFlag.bGL=pSW->uSdhz_L.bFlag.bGL = pSW->tGZJYRstGLTime.boolTrip && !xbQD1;//时间&&谐波含量
 
-//#if defined GD_AREA_CHAOZHOU || defined GD_AREA_SHANTOU  || defined GD_AREA_ECZD_2020   //潮州局要求合后电流两段处理
-#if defined GD_AREA_CHAOZHOU || defined GD_AREA_SHANTOU  || defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020 
+//#if defined GD_AREA_SHANTOU  || defined GD_AREA_ECZD_2020   //潮州局要求合后电流两段处理
+#if defined GD_AREA_SHANTOU  || defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020 
 	//相间II段故障
 	bgl = OverRelay(g_sw[sw].m2_max, pSet->toc[FA_GL_II].dI, pSet->toc[FA_GL_II].dI_fh, pSW->uSdhz_S.bFlag.bGL_II) && (pSet->bTT_fa_Icheck||pSet->toc[FA_GL_II].bTz);//
 	RunTR(&pSW->tGZJYRstGL_II_Time, bgl&&!xbQD2,dStep);  //跳闸位置、超过故障记忆过流复归时间，清跳闸次数
@@ -1307,8 +1305,8 @@ void fa_rstbs_soe(int sw)
 #endif
 	if(soe_check(EV_FA_GL_TZ+sw*EV_SW_NUM)==true)
 		soe_record_ev(EV_FA_GL_TZ+sw*EV_SW_NUM, 0, 0,0 ,0 );	
-//#if defined GD_AREA_CHAOZHOU || defined GD_AREA_SHANTOU  || defined GD_AREA_ECZD_2020   //潮州局要求合后电流两段处理
-#if defined GD_AREA_CHAOZHOU || defined GD_AREA_SHANTOU  || defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020 
+//#if defined GD_AREA_SHANTOU  || defined GD_AREA_ECZD_2020   //潮州局要求合后电流两段处理
+#if defined GD_AREA_SHANTOU  || defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020 
 	if(soe_check(EV_FA_GL_TZ2+sw*EV_SW_NUM)==true)
 		soe_record_ev(EV_FA_GL_TZ2+sw*EV_SW_NUM, 0, 0,0 ,0 );	
 #endif
@@ -1518,8 +1516,8 @@ static void fa_sw_opt(int sw,u16 soeCode)
 				poc->sta.bFlag.bGjEvent = true;
 				poc->tQDTime.boolTrip = true; 
 				poc->tQD25ms.boolTrip =true;
-			//#if defined GD_AREA_CHAOZHOU || defined GD_AREA_SHANTOU  || defined GD_AREA_ECZD_2020   //潮州局要求合后电流两段处理		
-            #if defined GD_AREA_CHAOZHOU || defined GD_AREA_SHANTOU  || defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020 
+			//#if defined GD_AREA_SHANTOU  || defined GD_AREA_ECZD_2020   //潮州局要求合后电流两段处理		
+            #if defined GD_AREA_SHANTOU  || defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020 
 				if(soe_check(EV_FA_GL_TZ2+sw*EV_SW_NUM)==false)	 //
 					soe_record_ev(EV_FA_GL_TZ2+sw*EV_SW_NUM, 1, Ia,Ib,Ic );     
 			#endif
@@ -3128,8 +3126,8 @@ static void fa_l_status_run(int sw, DWORD  dStep)
 			}
 			if(soe_check(EV_FA_GL_TZ+sw*EV_SW_NUM)==true)
 				soe_record_ev(EV_FA_GL_TZ+sw*EV_SW_NUM, 0, 0,0 ,0 );	
-		//#if defined GD_AREA_CHAOZHOU || defined GD_AREA_SHANTOU  || defined GD_AREA_ECZD_2020   //潮州局要求合后电流两段处理		
-        #if defined GD_AREA_CHAOZHOU || defined GD_AREA_SHANTOU  || defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020 
+		//#if defined GD_AREA_SHANTOU  || defined GD_AREA_ECZD_2020   //潮州局要求合后电流两段处理		
+        #if defined GD_AREA_SHANTOU  || defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020 
 			if(soe_check(EV_FA_GL_TZ2+sw*EV_SW_NUM)==true)
 				soe_record_ev(EV_FA_GL_TZ2+sw*EV_SW_NUM, 0, 0,0 ,0 );	
 		#endif
@@ -4305,8 +4303,8 @@ static void fa_s_run(int sw, DWORD  dStep)
 				fa_s_state_change(sw,S_YTIME);//pSW->S_Status = S_YTIME;//手合启动Y时限
 				if(soe_check(EV_FA_GL_TZ+sw*EV_SW_NUM)==true)
 					soe_record_ev(EV_FA_GL_TZ+sw*EV_SW_NUM, 0, 0,0 ,0 );	
-			//#if defined GD_AREA_CHAOZHOU || defined GD_AREA_SHANTOU  || defined GD_AREA_ECZD_2020   //潮州局要求合后电流两段处理		
-           #if defined GD_AREA_CHAOZHOU || defined GD_AREA_SHANTOU  || defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020 
+			//#if defined GD_AREA_SHANTOU  || defined GD_AREA_ECZD_2020   //潮州局要求合后电流两段处理		
+           #if defined GD_AREA_SHANTOU  || defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020 
 				if(soe_check(EV_FA_GL_TZ2+sw*EV_SW_NUM)==true)
 					soe_record_ev(EV_FA_GL_TZ2+sw*EV_SW_NUM, 0, 0,0 ,0 );	
 			#endif

dtu/dtu_main_t536/app/SOE.c

@@ -41,7 +41,7 @@ const u16 ExecuteEventIdTbl[]={EV_GL1TZ,EV_GL2TZ,EV_GL3TZ,
 	                           EV_LX3TZ,			
                             #endif
                                EV_GLJS,EV_LXJS,EV_FA_GL_TZ,	
-                            #if defined GD_AREA_CHAOZHOU || defined GD_AREA_SHANTOU  || defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020
+                            #if defined GD_AREA_SHANTOU  || defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020
 	                           EV_FA_GL_TZ2,
                             #endif 
                                EV_FA_LX_TZ,EV_AR1,EV_AR2,EV_AR3,EV_ARBS,EV_U0TZ,EV_XBBS,EV_BS_ALL,

dtu/dtu_main_t536/app/defineSys.h

@@ -193,9 +193,6 @@
 #elif defined GD_AREA_FOS			//佛山局要求
 	#define VER_NUM			 		5102          	// 版本号5.102 完善101遥参
 	#define INRUSH_CURRENT_IN_DECIMALS	//涌流识别定值显示为小数并给主站送小数形式
-	
-#elif defined GD_AREA_CHAOZHOU//潮州局要求
-	#define VER_NUM			 		8101          	// 版本号8.101
 
 #elif defined GD_AREA_ZHONGSHAN_FTU	//中山FTU
 	#define VER_NUM			 		11101          	// 版本号11.101

dtu/dtu_main_t536/app/set.c

@@ -990,7 +990,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_CHAOZHOU || defined GD_AREA_MEIZHOU_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_MEIZHOU_FTU || defined GD_AREA_ZHONGSHAN_FTU ||defined GD_AREA_HEYUAN_KL || 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
@@ -1007,7 +1007,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_CHAOZHOU || defined GD_AREA_MEIZHOU_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_MEIZHOU_FTU || defined GD_AREA_ZHONGSHAN_FTU ||defined GD_AREA_HEYUAN_KL || 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},
@@ -1017,7 +1017,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_CHAOZHOU || defined GD_AREA_MEIZHOU_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_MEIZHOU_FTU || defined GD_AREA_ZHONGSHAN_FTU ||defined GD_AREA_HEYUAN_KL || 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
@@ -1501,20 +1501,15 @@ const  TSETTABLE tSwSetTable[]=
 	    {SETTYPE_F,     SET_S,      "相间故障电流II段时间",         0 ,         99,        0 ,        0,          0,              GROUP_SET_FADZ,0x5026, FLOAT_R},
 	    {SETTYPE_F,     SET_S,      "接地故障电流时间",         0 , 99,             0 ,        0,          0,              GROUP_SET_FADZ,0x5026, FLOAT_R},
 	#else
-		#ifdef GD_AREA_CHAOZHOU  //潮州局要求合后电流两段处理       
-		    {SETTYPE_F,     SET_A,      "相间电流I段定值",      0.0 ,   100.0,          100.0 ,     0,          0,              GROUP_SET_FADZ,0x5024, FLOAT_R},
-		    {SETTYPE_F,     SET_A,      "相间电流II段定值",     0.0 ,   100.0,          100.0 ,     0,          0,              GROUP_SET_FADZ,0x5025, FLOAT_R},
-		#elif defined GD_AREA_SHANTOU  //汕头局要求合后电流两段处理(I+t)
-		    {SETTYPE_F,     SET_A,      "相间故障电流I段定值",      0.0 ,   100.0,          100.0 ,     0,          0,              GROUP_SET_FADZ,0x5024, FLOAT_R},
-		    {SETTYPE_F,     SET_S,      "相间故障电流I段时间",      0 ,         99,         99 ,        0,          0,              GROUP_SET_FADZ,0x5026, FLOAT_R},
-		    {SETTYPE_F,     SET_A,      "相间故障电流II段定值",     0.0 ,   100.0,          100.0 ,     0,          0,              GROUP_SET_FADZ,0x5025, FLOAT_R},
-		    {SETTYPE_F,     SET_S,      "相间故障电流II段时间",         0 ,         99,         99 ,        0,          0,              GROUP_SET_FADZ,0x5026, FLOAT_R},
-		    {SETTYPE_F,     SET_A,      "相间故障电流定值",     0.0 ,   100.0,          100.0 ,     0,          0,              GROUP_SET_FADZ,0x5024, FLOAT_R},
-		    {SETTYPE_F,     SET_A,      "接地故障电流定值",     0.0 ,   100.0,          100.0 ,     0,          0,              GROUP_SET_FADZ,0x5025, FLOAT_R},
-		#ifdef GD_AREA_SHANTOU
-		    {SETTYPE_F,     SET_S,      "接地故障电流时间",         0 , 99,             99 ,        0,          0,              GROUP_SET_FADZ,0x5026, FLOAT_R},
-		#endif
-	    #endif
+        {SETTYPE_F,     SET_A,      "相间故障电流I段定值",      0.0 ,   100.0,          100.0 ,     0,          0,              GROUP_SET_FADZ,0x5024, FLOAT_R},
+        {SETTYPE_F,     SET_S,      "相间故障电流I段时间",      0 ,         99,         99 ,        0,          0,              GROUP_SET_FADZ,0x5026, FLOAT_R},
+        {SETTYPE_F,     SET_A,      "相间故障电流II段定值",     0.0 ,   100.0,          100.0 ,     0,          0,              GROUP_SET_FADZ,0x5025, FLOAT_R},
+        {SETTYPE_F,     SET_S,      "相间故障电流II段时间",         0 ,         99,         99 ,        0,          0,              GROUP_SET_FADZ,0x5026, FLOAT_R},
+        {SETTYPE_F,     SET_A,      "相间故障电流定值",     0.0 ,   100.0,          100.0 ,     0,          0,              GROUP_SET_FADZ,0x5024, FLOAT_R},
+        {SETTYPE_F,     SET_A,      "接地故障电流定值",     0.0 ,   100.0,          100.0 ,     0,          0,              GROUP_SET_FADZ,0x5025, FLOAT_R},
+        #ifdef GD_AREA_SHANTOU
+            {SETTYPE_F,     SET_S,      "接地故障电流时间",         0 , 99,             99 ,        0,          0,              GROUP_SET_FADZ,0x5026, FLOAT_R},
+        #endif
 	#endif
 	#ifdef GD_AREA_HEYUAN_2021
 		{SETTYPE_F,		SET_U,		"合到零压保护电压", 			0.0 , 	220.0,			20.0 ,	0,			0,				GROUP_SET_FADZ,0x0000, FLOAT_R},
@@ -3296,7 +3291,7 @@ bool MakeRunSet(bool bFirst)
 		// 过流类定值
 		{
 			poc= &ptSet->tSwSet[sw].toc[BH_GL1];
-#if defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_CHAOZHOU	|| defined GD_AREA_MEIZHOU_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_MEIZHOU_FTU || defined GD_AREA_ZHONGSHAN_FTU ||defined GD_AREA_HEYUAN_KL || 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_ZHUHAI_V2 || defined GD_AREA_MAIN_2020//珠海局要求告警+跳闸两个选项
@@ -3329,7 +3324,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_CHAOZHOU	|| defined GD_AREA_MEIZHOU_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_MEIZHOU_FTU || defined GD_AREA_ZHONGSHAN_FTU ||defined GD_AREA_HEYUAN_KL || 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_ZHUHAI_V2 || defined GD_AREA_MAIN_2020//珠海局要求告警+跳闸两个选项
@@ -3364,7 +3359,7 @@ bool MakeRunSet(bool bFirst)
 			poc->bGj  = false;
 			poc->bDir = false;
 
-		#if defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_CHAOZHOU || defined GD_AREA_MEIZHOU_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_MEIZHOU_FTU || defined GD_AREA_ZHONGSHAN_FTU ||defined GD_AREA_HEYUAN_KL || 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
@@ -3415,7 +3410,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_CHAOZHOU || defined GD_AREA_MEIZHOU_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_MEIZHOU_FTU  || defined GD_AREA_ZHONGSHAN_FTU ||defined GD_AREA_HEYUAN_KL || 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
@@ -3434,7 +3429,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_CHAOZHOU || defined GD_AREA_MEIZHOU_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_MEIZHOU_FTU || defined GD_AREA_ZHONGSHAN_FTU ||defined GD_AREA_HEYUAN_KL || 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
@@ -3945,7 +3940,7 @@ bool MakeRunSet(bool bFirst)
 			poc->dT=GetSetTIME(psetbuf[SET_FA_GZTZ_T+sw*SW_SET_NUMBER ].ff);
 		#endif 
 			if(poc->dT<T_FA_TZ_MIN_TIME) poc->dT= T_FA_TZ_MIN_TIME;//不小于20ms
-		#if defined GD_AREA_CHAOZHOU || defined GD_AREA_SHANTOU || defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020 //潮州局要求合后电流两段处理   
+		#if defined GD_AREA_SHANTOU || defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020 //潮州局要求合后电流两段处理   
 			poc->dI=GetSetSQR(psetbuf[SET_FA_GL_II+sw*SW_SET_NUMBER ].ff,fKI);
 		#else
 			poc->bTz=false; 

dtu/dtu_main_t536/app/set.h

@@ -624,9 +624,6 @@ enum
 			SET_FA_LX_T,            //零序故障时间
 		#else
 			SET_FA_GL_I,			//相间故障定值
-			#if defined GD_AREA_CHAOZHOU  //潮州局要求合后电流两段处理		
-				SET_FA_GL_II,			//相间二段定值
-			#endif
 			SET_FA_LX_I,
 		#endif
 	#endif