整理宏GD_AREA_CHAOZHOU_2021；

dtu/dtu_main_t536/app/Appconfig.c

@@ -382,7 +382,7 @@ const SOE_DEF tAllSOE[]=
 	{0x44|SOE_TYPE_DELAY_FHZ,		{EV_PARA_Us1,	EV_PARA_Us2,0},				"µÃµçºÏÕ¢"},
 #endif
 
-#if defined  GD_AREA_JIEYANG_FTU || defined  GD_AREA_ECZD_MEIZHOU_2021
+#if defined  GD_AREA_ECZD_MEIZHOU_2021
 	{0x04,		{EV_PARA_Us1,	EV_PARA_Us2,0}, 			"ĸÏß²àµÃµçºÏÕ¢"},
 	{0x04,		{EV_PARA_Us1,	EV_PARA_Us2,0},				"Ïß·²àµÃµçºÏÕ¢"},
 #endif

dtu/dtu_main_t536/app/Appconfig.h

@@ -291,7 +291,7 @@ enum
 	EV_L_B_LST_HZ,     			// ÁªÂçB²àʧѹºÏÕ¢
 #endif
 	EV_FA_HZ,					// µÃµçºÏÕ¢	
-#if defined  GD_AREA_JIEYANG_FTU || defined  GD_AREA_ECZD_MEIZHOU_2021
+#if defined  GD_AREA_ECZD_MEIZHOU_2021
 	EV_FA_HZ_L,					// µçÔ´²àµÃµçºÏÕ¢	
 	EV_FA_HZ_P,					// ¸ººÉ²àµÃµçºÏÕ¢	
 #endif

dtu/dtu_main_t536/app/FA.c

@@ -1822,7 +1822,7 @@ static void fa_s_status_run(int sw, DWORD  dStep)
 			 ||(pSW->uSdhz_S.bFlag.bUBCYY&&((pSW->uSdhz_S.bFlag.bUBCFlash||pSW->uSdhz_S.bFlag.bUbcflashDI)&&soe_check(EV_BS_UF_L+sw*EV_SW_NUM)))
 				)
 			{
-			#if defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_CHAOZHOU_2021 || defined GD_AREA_ECZD_2020 || defined GD_AREA_ECZD_MEIZHOU_2021//中山局、广东二次指导意见要求残压经过解锁时间才能解锁
+			#if defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_ECZD_2020 || defined GD_AREA_ECZD_MEIZHOU_2021//中山局、广东二次指导意见要求残压经过解锁时间才能解锁
 				RunTR(&pSW->tOnJSTime, TRUE , dStep);				//js时间计数
 				if(!pSW->tOnJSTime.boolTrip)
 					break;
@@ -4094,17 +4094,7 @@ static void fa_s_run(int sw, DWORD  dStep)
 			ResetTR(&gb_drive.tDriveFaBSTime);
 		#endif
 		}
-	#endif	
-	#if defined GD_AREA_CHAOZHOU_2021
-		if(pSW->S_Status == S_BSFLASH||soe_check(EV_BS_UF_L+sw*EV_SW_NUM)==true||soe_check(EV_BS_UF_P+sw*EV_SW_NUM)==true)
-		{
-			RunTR(&pSW->tOnJSTime, (bUAB||bUBC), dStep);				//js时间计数
-			if(!pSW->tOnJSTime.boolTrip)//残压闭锁后
-				return;
-			ResetTR(&pSW->tOnJSTime);				//js时间计数
-			//SignalReset(0,false);
-		}
-	#endif	
+	#endif
 		SignalReset(0,false);
 		g_tRelay[sw].tDYJL.bLed=false;
 		g_tRelay[sw].tPLJL.bLed=false;
@@ -4368,7 +4358,7 @@ static void fa_s_run(int sw, DWORD  dStep)
 			//rcd_start(sw,RECORD_WAVE_TYPE_TZ, RECORD_LEN_TZQD); 	//录波类型：跳闸类
 			soe_record_ev(EV_FA_HZ+sw*EV_SW_NUM, 1, Us1,Us2,0 );    
 
-		#if defined  GD_AREA_JIEYANG_FTU || defined  GD_AREA_ECZD_MEIZHOU_2021
+		#if defined  GD_AREA_ECZD_MEIZHOU_2021
 			if(pSW->uSdhz_S.bFlag.bPower)
 				soe_record_ev(EV_FA_HZ_L+sw*EV_SW_NUM, 1, Us1,Us2,0 ); 
 			else
@@ -4383,7 +4373,7 @@ static void fa_s_run(int sw, DWORD  dStep)
 		if(pSW->uSdhz_S.bFlag.bHZEvent) 			
 		{
 			soe_record_ev(EV_FA_HZ+sw*EV_SW_NUM, 0, 0,0,0 );   
-		#if defined  GD_AREA_JIEYANG_FTU || defined  GD_AREA_ECZD_MEIZHOU_2021
+		#if defined  GD_AREA_ECZD_MEIZHOU_2021
 			if(pSW->uSdhz_S.bFlag.bPower)
 				soe_record_ev(EV_FA_HZ_L+sw*EV_SW_NUM,0, 0,0,0 ); 
 			else

dtu/dtu_main_t536/app/defineSys.h

@@ -105,7 +105,6 @@
 #define GD_AREA_GUANGZHOU_FTU          // 广州局要求
 #define GD_AREA_ZHUHAI_FTU             // 珠海FTU局要求
 #define GD_AREA_SHANTOU                // 汕头局要求
-#define GD_AREA_JIEYANG_FTU            // 揭阳FTU要求
 #define GD_AREA_MAIN_2020              // 广东标准版2020
 #define GD_AREA_MAIN_2020_V2
 #define GD_AREA_ECZD_2020              // 2020广东配网终端二次功能指导意见
@@ -113,7 +112,6 @@
 #define GD_AREA_ZHONGSHAN_2020_ZC      // 中山局2020要求正超版本
 #define GD_AREA_SHANWEI                // 汕尾局要求
 #define GD_AREA_FOS_2021               // 佛山21年新标准(针对环网柜)
-#define GD_AREA_CHAOZHOU_2021          // 广东标准2020分支-潮州地区装置统一程序
 #define GD_AREA_HEYUAN_2021            // 广东标准2020分支-河源兼容20年硬件配置及19年非标需求
 #define GD_AREA_ECZD_MAOMING           // 广东标准2020分支-茂名局
 #define GD_AREA_ECZD_MEIZHOU_2021      // 20二次指导意见梅州分支
@@ -217,14 +215,6 @@
 	#define LINK_MODBUS_YK_MERGE	//施耐德级联遥控点号合并
 	#define LINK_MODBUS_YX_CP		//施耐德级联遥信特殊处理,按位取遥信，遥信点号大于0x1000
 
-#elif defined  GD_AREA_JIEYANG_FTU	//揭阳局FTU要求
-    #ifdef __IEC61850_GOOSE_FUNC__
-		#define VER_NUM			 		27201          // 版本号27.201
-	#else
-		#define VER_NUM 				27101			// 版本号27.101		
-	#endif
-	#define YK_FG_FAJS
-
 
 /********************************************************************************************************/
 /****************↓↓↓↓↓↓↓↓↓↓↓以下为广东20年主线宏相关地区(GD_AREA_MAIN_2020)↓↓↓↓↓↓↓↓↓↓↓*******************/
@@ -258,15 +248,6 @@
 	#define INRUSH_CURRENT_IN_DECIMALS	//涌流识别定值显示为小数并给主站送小数形式
 	#define OCI_XB_0MS					//过流一段0ms的谐波闭锁
 
-#elif defined  GD_AREA_CHAOZHOU_2021	//广东标准2020分支-潮州
-	#ifdef __IEC61850_GOOSE_FUNC__
-		#define VER_NUM			 		28205          // 版本号28.205
-	#else
-		#define VER_NUM 				28105			// 版本号28.105
-	#endif
-	#define IEC_QDS_HAVE 
-	#define EV_CHZ_FG
-
 #elif defined  GD_AREA_HEYUAN_2021	//广东标准2020分支-河源
 	#define VER_NUM 				    28106			// 版本号28.106
 	#define SOE_RECORD_DELAY

dtu/dtu_main_t536/app/set.c

@@ -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_JIEYANG_FTU
+#if defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_ZHONGSHAN_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_JIEYANG_FTU
+#if defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_ZHONGSHAN_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_JIEYANG_FTU
+#if defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_ZHONGSHAN_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
@@ -3231,7 +3231,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_JIEYANG_FTU
+#if defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_ZHONGSHAN_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//珠海局要求告警+跳闸两个选项
@@ -3264,7 +3264,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_JIEYANG_FTU
+#if defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_ZHONGSHAN_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//珠海局要求告警+跳闸两个选项
@@ -3299,7 +3299,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_JIEYANG_FTU
+		#if defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_ZHONGSHAN_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
@@ -3350,7 +3350,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_JIEYANG_FTU
+#if defined GD_AREA_ZHUHAI_FTU  || defined GD_AREA_ZHONGSHAN_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
@@ -3369,7 +3369,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_JIEYANG_FTU
+#if defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_ZHONGSHAN_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