整理宏GD_AREA_SHANTOU；

dtu/dtu_main_t536/app/Appconfig.c

@@ -232,7 +232,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_SHANTOU  || defined GD_AREA_ECZD_2020   //潮州局要求合后电流两段处理		
+#if 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

@@ -218,7 +218,7 @@ enum
 	EV_U0JS,
 	EV_FSXGL,
 	EV_FA_GL_TZ,	
-#if defined GD_AREA_SHANTOU  || defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020
+#if 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

@@ -826,7 +826,7 @@ void fa_s_Dataset(int sw, DWORD  dStep)
 	int ui_begin;
 	bool xbQD1=false;
 	DWORD U01,U02;
-	#if defined GD_AREA_SHANTOU  || defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020 
+	#if defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020 
 	bool xbQD2=false;
 	#endif
 	bool xbAll=false;
@@ -856,7 +856,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_SHANTOU  || defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020 
+#if 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;
@@ -883,8 +883,7 @@ 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_SHANTOU  || defined GD_AREA_ECZD_2020   //潮州局要求合后电流两段处理
-#if defined GD_AREA_SHANTOU  || defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020 
+#if 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);  //跳闸位置、超过故障记忆过流复归时间，清跳闸次数
@@ -1270,8 +1269,7 @@ void fa_rstbs_soe(int sw)
 	}
 	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_SHANTOU  || defined GD_AREA_ECZD_2020   //潮州局要求合后电流两段处理
-#if defined GD_AREA_SHANTOU  || defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020 
+#if 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
@@ -1480,9 +1478,8 @@ static void fa_sw_opt(int sw,u16 soeCode)
 				poc->sta.bFlag.bGj = true;  // 告警
 				poc->sta.bFlag.bGjEvent = true;
 				poc->tQDTime.boolTrip = true; 
-				poc->tQD25ms.boolTrip =true;
-			//#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 
+				poc->tQD25ms.boolTrip =true;	
+            #if 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
@@ -3052,8 +3049,7 @@ 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_SHANTOU  || defined GD_AREA_ECZD_2020   //潮州局要求合后电流两段处理		
-        #if defined GD_AREA_SHANTOU  || defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020 
+        #if 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
@@ -4162,8 +4158,7 @@ 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_SHANTOU  || defined GD_AREA_ECZD_2020   //潮州局要求合后电流两段处理		
-           #if defined GD_AREA_SHANTOU  || defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020 
+           #if 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/IEC101.c

@@ -607,7 +607,7 @@ static void IEC101_UpdateCOS(u8 *pd)
 	for(i=0;i<num;i++)
 	{
 		SIQ = tbl_get_yx(tbl_cp2index(cp),(ti==3?1:0));
-        #if !defined GD_AREA_SHANTOU && !defined FUNC_JX_YX_BEFORE
+        #if !defined FUNC_JX_YX_BEFORE
 		if(g_run_stu.bjx)
 			SIQ|=0x80;	
         #endif
@@ -1084,12 +1084,10 @@ static bool IEC101_GetYc(IEC101_DEF *pt)
 					pd[num++]=(u8)(ycvalue);				 //无符号整数
 					pd[num++]=(u8)(ycvalue>>8);				 //无符号整数
 				}
-                #if  !defined GD_AREA_SHANTOU	
 				if(g_run_stu.bjx)
 				{
 					QDS|=0x80;//带品质描述，有效 <1>：=无效
 				}
-                #endif
 
 				#ifdef IEC_QDS_HAVE
 				QDS|=link_qds;
@@ -1677,7 +1675,7 @@ static void IEC101_CallAll(IEC101_DEF *pt,u8 QOI)		//确
 			{
 				if(pRunSet->bTT_RmtTest)QDS|=0x80;//带品质描述，有效 <1>：=无效
 			}
-        #if  !defined GD_AREA_SHANTOU && !defined FUNC_JX_YC_SIQ00
+        #if  !defined FUNC_JX_YC_SIQ00
 			if(g_run_stu.bjx)
 			{
 				QDS|=0x80;//带品质描述，有效 <1>：=无效
@@ -1828,7 +1826,7 @@ static void IEC101_CallAll(IEC101_DEF *pt,u8 QOI)		//确
 			{
 				SIQ = tbl_get_yx(i,tRunPara.bDPI);
 			}
-         #if !defined GD_AREA_SHANTOU && !defined FUNC_JX_YX_BEFORE
+         #if !defined FUNC_JX_YX_BEFORE
 			if(g_run_stu.bjx)
 			{
 				SIQ|=0x80;//带品质描述，有效 <1>：=无效
@@ -4029,7 +4027,7 @@ u32 IEC101_SendEvent(IEC101_DEF *pt,int is_send_cos)
 					SIQ+=1;	//转为双点信息
 				}
 
-				#if  !defined GD_AREA_SHANTOU && !defined FUNC_JX_YC_SIQ00
+				#if  !defined FUNC_JX_YC_SIQ00
 					if(g_run_stu.bjx)
 					{
 						SIQ|=0x80;//带品质描述，有效 <1>：=无效

dtu/dtu_main_t536/app/IEC104.c

@@ -502,7 +502,7 @@ static void IEC104_UpdateCOS(u8 *pd)
 		{
 		
 			SIQ = tbl_get_yx(tbl_cp2index(cp),(ti==3?1:0));
-			#if  !defined GD_AREA_SHANTOU && !defined FUNC_JX_YX_BEFORE
+			#if !defined FUNC_JX_YX_BEFORE
 			if(g_run_stu.bjx)
 				SIQ|=0x80;	
 			#endif
@@ -1413,7 +1413,7 @@ static void IEC104_CallAll(IEC104_DEF *pt104,BYTE QOI)
 				*pd++=(BYTE)(BYTE)(ycvalue);	
 				*pd++=(BYTE)(BYTE)(ycvalue>>8);	
 			}
-        #if !defined GD_AREA_SHANTOU && !defined FUNC_JX_YC_SIQ00
+        #if !defined FUNC_JX_YC_SIQ00
 			if(g_run_stu.bjx)
 			{
 				QDS|=0x80;//带品质描述，有效 <1>：=无效
@@ -1576,7 +1576,7 @@ static void IEC104_CallAll(IEC104_DEF *pt104,BYTE QOI)
 				// 填写SIQ
 				SIQ = tbl_get_yx(i,tRunPara.bDPI);
 			}
-        #if !defined GD_AREA_SHANTOU && !defined FUNC_JX_YX_BEFORE
+        #if !defined FUNC_JX_YX_BEFORE
 			if(g_run_stu.bjx)
 			{
 				SIQ|=0x80;//带品质描述，有效 <1>：=无效
@@ -2095,7 +2095,7 @@ u32 IEC104_SendEvent(IEC104_DEF *pt104,int is_send_cos) /*104
 			}
 			timespec_to_rtc(event.ts,&rt,1);
 			week = WEEK_DAY(event.ts.tv_sec);
-        #if  !defined GD_AREA_SHANTOU && !defined FUNC_JX_YC_SIQ00
+        #if !defined FUNC_JX_YC_SIQ00
 			if(g_run_stu.bjx)
 			{
 				SIQ|=0x80;//带品质描述，有效 <1>：=无效
@@ -2292,14 +2292,12 @@ void IEC104_SendYC(IEC104_DEF *pt104)
 				{				
 					*pd++=(BYTE)(ycvalue);	
 					*pd++=(BYTE)(ycvalue>>8);	
-				}	
-             #if  !defined GD_AREA_SHANTOU	
+				}
 				if(g_run_stu.bjx)
 				{
 					QDS|=0x80;//带品质描述，有效 <1>：=无效
 					
 				}
-			#endif
 
 				#ifdef IEC_QDS_HAVE
 					QDS|=link_qds;

dtu/dtu_main_t536/app/MmiData.c

@@ -4418,11 +4418,6 @@ static void mmd_GetFtuYxValue(int i,DATA_FIELD_DEF *pF)
 			(SW_DI_FA_GOOSE+1==ecd->type && ecd->owner!=0 && (!BH_GOOSE_EN(0))))//智能分布式压板	
 			strcpy(tmpstr,YX_F);		
     #endif
-
-	#ifdef GD_AREA_SHANTOU
-		if(SW_DI_TYTQ+1==ecd->type && ecd->owner!=0 && TYTQ_ALL_EN(0))//停用同期压板				
-				strcpy(tmpstr,YX_H);
-	#endif
 	#ifdef GD_AREA_ECZD_2020 
 		if(ecd->owner!=0 && TYTQ_ALL_EN(0))//停用同期压板				
 			strcpy(tmpstr,YX_H);

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_SHANTOU  || defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020
+                            #if 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

@@ -95,6 +95,7 @@
 #define PRO_UZ_START_REC               // 零压启动重合器
 #define PRO_AL_LOCK_HZ                 // 解列动作闭锁合闸
 #define PRO_AL_RESET_FA                // 解列动作复归FA
+#define PRO_PT_LL_NC                   // 非Fa联络 无压有流动作 PT断线告警
 // #define TMP_CHIP_AHT20
 
 //定制功能
@@ -104,7 +105,6 @@
 #define GD_AREA_ZHONGSHAN     // 中山局要求
 #define GD_AREA_GUANGZHOU_FTU          // 广州局要求
 #define GD_AREA_ZHUHAI_FTU             // 珠海FTU局要求
-#define GD_AREA_SHANTOU                // 汕头局要求
 #define GD_AREA_MAIN_2020              // 广东标准版2020
 #define GD_AREA_ECZD_2020              // 2020广东配网终端二次功能指导意见
 #define GD_AREA_ZHONGSHAN_2020         // 中山局2020要求
@@ -186,13 +186,6 @@
 
 #elif defined GD_AREA_PROTECTOR		//分布式装置用作保护用
 	#define VER_NUM 				24102			// 版本号24.102
-	
-#elif defined GD_AREA_SHANTOU 		//汕头局
-	#define VER_NUM 				26101			// 版本号26.101	
-	#define BHFAGS_YB_YK
-	#define YK_FA_ENBLE
-	#define LINK_MODBUS_YK_MERGE	//施耐德级联遥控点号合并
-	#define LINK_MODBUS_YX_CP		//施耐德级联遥信特殊处理,按位取遥信，遥信点号大于0x1000
 
 
 /********************************************************************************************************/

dtu/dtu_main_t536/app/set.c

@@ -258,21 +258,12 @@ const  SET_LIST HZList[]=
 #define HZListNum	sizeof(HZList)/sizeof(SET_LIST)
 
 //跳闸检出投退列表
-#ifdef GD_AREA_SHANTOU
-const  SET_LIST TZCKList[]=
-{	
-	{"告 警", 0,},	
-	{"跳 闸", 1,},	
-	{"退 出", 2,},
-};
-#else
 const  SET_LIST TZCKList[]=
 {
 	{"退 出", 0 ,},
 	{"告 警", 1,},	
 	{"跳 闸", 2 ,},	
 };
-#endif
 #define TZCKListNum	sizeof(TZCKList)/sizeof(SET_LIST)
 
 //告警跳闸投退列表
@@ -862,16 +853,6 @@ const  TSETTABLE tPubSetTable[]=
 	{SETTYPE_F, 	SET_S,		"直流电压2告警时间",	0.1 ,			100.0,			100.0 , 0,			0,			GROUP_SET_PUBSET,0x0000, FLOAT_R},
 
 	{SETTYPE_LABEL,	SET_NULL,	"非电量保护", 		0 , 		0,				       0 ,		0,			0,				GROUP_SET_FDL,0x0000, NULL_R},
-#ifdef GD_AREA_SHANTOU
-	{SETTYPE_LIST,	SET_NULL,	"非电量1保护", 		0 , 		TZCKListNum-1,		TZCKListNum-1,		TZCKList,		TZCKListNum,		GROUP_SET_FDL,0x0000, UINT_R},
-	{SETTYPE_LIST,	SET_NULL,	"非电量2保护", 		0 , 		TZCKListNum-1,		TZCKListNum-1,		TZCKList,		TZCKListNum,		GROUP_SET_FDL,0x0000, UINT_R},
-	{SETTYPE_LIST,	SET_NULL,	"非电量3保护", 		0 , 		TZCKListNum-1,		TZCKListNum-1,		TZCKList,		TZCKListNum,		GROUP_SET_FDL,0x0000, UINT_R},
-	{SETTYPE_LIST,	SET_NULL,	"非电量4保护", 		0 , 		TZCKListNum-1,		TZCKListNum-1,		TZCKList,		TZCKListNum,		GROUP_SET_FDL,0x0000, UINT_R},
-	{SETTYPE_LIST,	SET_NULL,	"非电量5保护", 		0 , 		TZCKListNum-1,		TZCKListNum-1,		TZCKList,		TZCKListNum,		GROUP_SET_FDL,0x0000, UINT_R},
-	{SETTYPE_LIST,	SET_NULL,	"非电量6保护", 		0 , 		TZCKListNum-1,		TZCKListNum-1,		TZCKList,		TZCKListNum,		GROUP_SET_FDL,0x0000, UINT_R},
-	{SETTYPE_LIST,	SET_NULL,	"非电量7保护", 		0 , 		TZCKListNum-1,		TZCKListNum-1,		TZCKList,		TZCKListNum,		GROUP_SET_FDL,0x0000, UINT_R},
-	{SETTYPE_LIST,	SET_NULL,	"非电量8保护", 		0 , 		TZCKListNum-1,		TZCKListNum-1,		TZCKList,		TZCKListNum,		GROUP_SET_FDL,0x0000, UINT_R},
-#else
 	{SETTYPE_LIST,	SET_NULL,	"非电量1保护", 		0 , 		TZCKListNum-1,		0,		TZCKList,		TZCKListNum,		GROUP_SET_FDL,0x0000, UINT_R},
 	{SETTYPE_LIST,	SET_NULL,	"非电量2保护", 		0 , 		TZCKListNum-1,		0,		TZCKList,		TZCKListNum,		GROUP_SET_FDL,0x0000, UINT_R},
 	{SETTYPE_LIST,	SET_NULL,	"非电量3保护", 		0 , 		TZCKListNum-1,		0,		TZCKList,		TZCKListNum,		GROUP_SET_FDL,0x0000, UINT_R},
@@ -880,7 +861,6 @@ const  TSETTABLE tPubSetTable[]=
 	{SETTYPE_LIST,	SET_NULL,	"非电量6保护", 		0 , 		TZCKListNum-1,		0,		TZCKList,		TZCKListNum,		GROUP_SET_FDL,0x0000, UINT_R},
 	{SETTYPE_LIST,	SET_NULL,	"非电量7保护", 		0 , 		TZCKListNum-1,		0,		TZCKList,		TZCKListNum,		GROUP_SET_FDL,0x0000, UINT_R},
 	{SETTYPE_LIST,	SET_NULL,	"非电量8保护", 		0 , 		TZCKListNum-1,		0,		TZCKList,		TZCKListNum,		GROUP_SET_FDL,0x0000, UINT_R},
-#endif
 	{SETTYPE_F,		SET_S,		"非电量1时间", 		0.0 , 	100.0,			1.0 ,		0,			0,				GROUP_SET_FDL,0x0000, FLOAT_R},
 	{SETTYPE_F,		SET_S,		"非电量2时间", 		0.0 , 	100.0,			1.0 ,		0,			0,				GROUP_SET_FDL,0x0000, FLOAT_R},
 	{SETTYPE_F,		SET_S,		"非电量3时间", 		0.0 , 	100.0,			1.0 ,		0,			0,				GROUP_SET_FDL,0x0000, FLOAT_R},
@@ -960,9 +940,6 @@ const  TSETTABLE tSwSetTable[]=
 #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
-	{SETTYPE_LIST,	SET_NULL,	"过流Ⅰ段投入",			0 , 		TZCKListNum-1,		TZCKListNum-1,		TZCKList,	TZCKListNum,		GROUP_SET_BHTT,0X500B, UINT_R},
-	{SETTYPE_LIST,	SET_NULL,	"过流Ⅱ段投入",			0 , 		TZCKListNum-1,		TZCKListNum-1,		TZCKList,	TZCKListNum,		GROUP_SET_BHTT,0X500C, UINT_R},
 #elif defined GD_AREA_MAIN_2020 || defined GD_AREA_ECZD_2020  //珠海局要求告警+跳闸两个选项     广东标准2020要求告警+跳闸两个选项
     {SETTYPE_LIST,	SET_NULL,	"过流Ⅰ段投入", 			0 , 		TZListNum-1,		0,		TZList,		TZListNum,		GROUP_SET_BHTT,0X500B, BOOL_R},
     {SETTYPE_LIST,	SET_NULL,	"过流Ⅱ段投入", 			0 , 		TZListNum-1,		0,		TZList,		TZListNum,		GROUP_SET_BHTT,0X500C, BOOL_R},
@@ -987,9 +964,6 @@ const  TSETTABLE tSwSetTable[]=
 #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
-	{SETTYPE_LIST,	SET_NULL,	"零序过流Ⅰ段投入", 		0 , 		TZCKListNum-1,		TZCKListNum-1,		TZCKList,		TZCKListNum,		GROUP_SET_BHTT,0X5010, UINT_R},
-	{SETTYPE_LIST,	SET_NULL,	"零序过流Ⅱ段投入", 0 , 				TZCKListNum-1,		TZCKListNum-1,		TZCKList,		TZCKListNum,		GROUP_SET_BHTT,0X5011, UINT_R},
 #elif defined GD_AREA_GUANGZHOU_FTU
 	{SETTYPE_LIST,	SET_NULL,	"零序过流Ⅰ段投入", 		0 , 		TZCKListNum-1,		0,		TZCKList,		TZCKListNum,		GROUP_SET_BHTT,0X0000, UINT_R},
 	{SETTYPE_LIST,	SET_NULL,	"零序过流Ⅱ段投入", 0 , 				TZCKListNum-1,		0,		TZCKList,		TZCKListNum,		GROUP_SET_BHTT,0X0000, UINT_R},
@@ -1388,9 +1362,6 @@ const  TSETTABLE tSwSetTable[]=
         {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_U,		"零序过压定值", 			0.0 , 	100.0,			20.0 ,	0,			0,				GROUP_SET_FADZ,0x0000, FLOAT_R},
 	{SETTYPE_F,		SET_S,		"零序过压时间",			0.0 , 	99.0,			0.6 ,		0,			0,				GROUP_SET_FADZ,0X0000, FLOAT_R},
@@ -2892,13 +2863,8 @@ bool MakeRunSet(bool bFirst)
 
 	for(i=0;i<8;i++)
 	{
-    #ifdef GD_AREA_SHANTOU
-		ptSet->bTT_FDLGj[i] = ((WORD)psetbuf[SET_FDL1_TT+i].ff==0 )?true:false; 		// 
-		ptSet->bTT_FDLTz[i] = ((WORD)psetbuf[SET_FDL1_TT+i].ff==1 )?true:false; 		// 
-	#else
 		ptSet->bTT_FDLGj[i] = ((WORD)psetbuf[SET_FDL1_TT+i].ff==1 )?true:false; 		// 
 		ptSet->bTT_FDLTz[i] = ((WORD)psetbuf[SET_FDL1_TT+i].ff==2 )?true:false; 		// 
-	#endif
 		ptSet->dTFDL[i]=GetSetTIME(psetbuf[SET_FDL1_T+i].ff);  	// 
 	}
 
@@ -3130,9 +3096,6 @@ bool MakeRunSet(bool bFirst)
 #elif defined GD_AREA_MAIN_2020//珠海局要求告警+跳闸两个选项
 			poc->bTz=(((WORD)psetbuf[SET_GL1_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false);
 			poc->bGj=(((WORD)psetbuf[SET_GL1_TT+sw*SW_SET_NUMBER ].ff==0 )?true:false);
-#elif defined GD_AREA_SHANTOU
-			poc->bTz=(((WORD)psetbuf[SET_GL1_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false); 
-			poc->bGj= (((WORD)psetbuf[SET_GL1_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false)||(((WORD)psetbuf[SET_GL1_TT+sw*SW_SET_NUMBER ].ff==0 )?true:false);
 #elif defined GD_AREA_ECZD_2020
 			poc->bTz=(((WORD)psetbuf[SET_GL1_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false); 
 			poc->bGj=(((WORD)psetbuf[SET_GL1_TT+sw*SW_SET_NUMBER ].ff==0 )?true:false);
@@ -3163,9 +3126,6 @@ bool MakeRunSet(bool bFirst)
 #elif defined GD_AREA_MAIN_2020//珠海局要求告警+跳闸两个选项
 			poc->bTz=(((WORD)psetbuf[SET_GL2_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false);
 			poc->bGj=(((WORD)psetbuf[SET_GL2_TT+sw*SW_SET_NUMBER ].ff==0 )?true:false);
-#elif defined GD_AREA_SHANTOU//广东标准2020要求告警+跳闸两个选项 跳闸包含跳闸和告警
-			poc->bTz=(((WORD)psetbuf[SET_GL2_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false); 
-			poc->bGj= (((WORD)psetbuf[SET_GL2_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false)||(((WORD)psetbuf[SET_GL2_TT+sw*SW_SET_NUMBER ].ff==0 )?true:false);
 #elif defined GD_AREA_ECZD_2020//广东标准2020要求告警+跳闸两个选项 跳闸包含跳闸和告警
 			poc->bTz=(((WORD)psetbuf[SET_GL2_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false); 
 			poc->bGj=(((WORD)psetbuf[SET_GL2_TT+sw*SW_SET_NUMBER ].ff==0 )?true:false);
@@ -3245,10 +3205,7 @@ bool MakeRunSet(bool bFirst)
 			poc= &ptSet->tSwSet[sw].toc[BH_LX1];
 #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
-			poc->bTz=(((WORD)psetbuf[SET_LX1_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false); 
-			poc->bGj= (((WORD)psetbuf[SET_LX1_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false)||(((WORD)psetbuf[SET_LX1_TT+sw*SW_SET_NUMBER ].ff==0 )?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_GUANGZHOU_FTU
 			poc->bTz=(((WORD)psetbuf[SET_LX1_TT+sw*SW_SET_NUMBER ].ff==2 )?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==1 )?true:false);
@@ -3264,10 +3221,7 @@ bool MakeRunSet(bool bFirst)
 			poc= &ptSet->tSwSet[sw].toc[BH_LX2];
 #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
-			poc->bTz=(((WORD)psetbuf[SET_LX2_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false); 
-			poc->bGj= (((WORD)psetbuf[SET_LX2_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false)||(((WORD)psetbuf[SET_LX2_TT+sw*SW_SET_NUMBER ].ff==0 )?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_GUANGZHOU_FTU
 			poc->bTz=(((WORD)psetbuf[SET_LX2_TT+sw*SW_SET_NUMBER ].ff==2 )?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==1 )?true:false);
@@ -3637,13 +3591,8 @@ bool MakeRunSet(bool bFirst)
             ptSet->tSwSet[sw].bTT_fa_bsTz       = ((DWORD)psetbuf[SET_BSTZ_TT+sw*SW_SET_NUMBER ].ff==1)?true:false;
             ptSet->tSwSet[sw].bTT_fa_cybs       = ((DWORD)psetbuf[SET_CYBS_TT+sw*SW_SET_NUMBER ].ff==1)?true:false;
             ptSet->tSwSet[sw].bTT_fa_xbbs   = ((DWORD)psetbuf[SET_FA_XBBS_TT+sw*SW_SET_NUMBER ].ff==1)?true:false;
-#ifdef GD_AREA_SHANTOU
-            ptSet->tSwSet[sw].bTT_fa_U0Tz   = ((DWORD)psetbuf[SET_U0TZ_TT+sw*SW_SET_NUMBER ].ff==1)?true:false;
-            ptSet->tSwSet[sw].bTT_fa_U0Gj   = ((DWORD)psetbuf[SET_U0TZ_TT+sw*SW_SET_NUMBER ].ff==0)?true:false;
-#else
             ptSet->tSwSet[sw].bTT_fa_U0Tz   = ((DWORD)psetbuf[SET_U0TZ_TT+sw*SW_SET_NUMBER ].ff==2)?true:false;
             ptSet->tSwSet[sw].bTT_fa_U0Gj   = ((DWORD)psetbuf[SET_U0TZ_TT+sw*SW_SET_NUMBER ].ff==1)?true:false;
-#endif
             ptSet->tSwSet[sw].bTT_fa_ptdx   = ((DWORD)psetbuf[SET_FA_PTDX+sw*SW_SET_NUMBER ].ff==1)?true:false;
             ptSet->tSwSet[sw].bTT_hzbs      = (((DWORD)psetbuf[SET_HZBS_TT+sw*SW_SET_NUMBER].ff==1 )?true:false);
             ptSet->tSwSet[sw].dU_fa_YY  =GetSetSQR(psetbuf[SET_FA_YY_U+sw*SW_SET_NUMBER ].ff*fUn/100,fKU[PUB_AC_UAB1]);  // 0.4 倍的额定值
@@ -3722,7 +3671,7 @@ bool MakeRunSet(bool bFirst)
 		//#endif
 			poc->bDir=false;
 			poc->bGj=false;
-			#if defined GD_AREA_SHANTOU || defined GD_AREA_MAIN_2020 //汕头局要求合后电流两段处理(I+t) 广东标准2020与汕头局保持一致
+			#if defined GD_AREA_MAIN_2020 //汕头局要求合后电流两段处理(I+t) 广东标准2020与汕头局保持一致
 				poc->dT=GetSetTIME(psetbuf[SET_FA_GLI_T+sw*SW_SET_NUMBER ].ff)+GetSetTIME(psetbuf[SET_FA_GZTZ_T+sw*SW_SET_NUMBER ].ff);
 			#elif defined GD_AREA_ECZD_2020
 				poc->dT=GetSetTIME(psetbuf[SET_FA_GLI_T+sw*SW_SET_NUMBER ].ff);
@@ -3745,7 +3694,7 @@ bool MakeRunSet(bool bFirst)
 		//#endif
 			poc->bDir=false;
 			poc->bGj=false;
-		#if defined GD_AREA_SHANTOU || defined GD_AREA_MAIN_2020 //汕头局要求合后电流两段处理(I+t) 广东标准2020与汕头局保持一致
+		#if defined GD_AREA_MAIN_2020 //汕头局要求合后电流两段处理(I+t) 广东标准2020与汕头局保持一致
 			poc->dT=GetSetTIME(psetbuf[SET_FA_GLII_T+sw*SW_SET_NUMBER ].ff)+GetSetTIME(psetbuf[SET_FA_GZTZ_T+sw*SW_SET_NUMBER ].ff);
 		#elif defined GD_AREA_ECZD_2020 
 			 #ifdef GD_AREA_ZHONGSHAN_2020
@@ -3765,7 +3714,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_SHANTOU || defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020 //潮州局要求合后电流两段处理   
+		#if 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; 
@@ -3805,7 +3754,7 @@ bool MakeRunSet(bool bFirst)
 		//#endif
 			poc->bDir=false;
 			poc->bGj=false;
-		#if defined GD_AREA_SHANTOU || defined GD_AREA_MAIN_2020 //汕头局要求合后电流两段处理(I+t) 广东标准2020与汕头局保持一致
+		#if defined GD_AREA_MAIN_2020 //汕头局要求合后电流两段处理(I+t) 广东标准2020与汕头局保持一致
 			poc->dT=GetSetTIME(psetbuf[SET_FA_LX_T+sw*SW_SET_NUMBER ].ff) + GetSetTIME(psetbuf[SET_FA_GZTZ_T+sw*SW_SET_NUMBER ].ff);
 		#elif defined GD_AREA_ECZD_2020
 		    #ifdef GD_AREA_ZHONGSHAN_2020

dtu/dtu_main_t536/app/set.h

@@ -604,18 +604,13 @@ enum
         SET_FA_GLII_T,          //相间故障II时间
      	SET_FA_LX_T,			//接地故障时间
 	#else
-		#ifdef GD_AREA_SHANTOU      //汕头局要求合后电流两段处理(I+t)
-			SET_FA_GL_I,			//相间故障定值
-			SET_FA_GLI_T,           //相间故障I时间
-			SET_FA_GL_II,			//相间二段定值
-			SET_FA_GLII_T,          //相间故障II时间
-
-			SET_FA_LX_I,            //零序故障定值
-			SET_FA_LX_T,            //零序故障时间
-		#else
-			SET_FA_GL_I,			//相间故障定值
-			SET_FA_LX_I,
-		#endif
+        SET_FA_GL_I,			//相间故障定值
+        SET_FA_GLI_T,           //相间故障I时间
+        SET_FA_GL_II,			//相间二段定值
+        SET_FA_GLII_T,          //相间故障II时间
+
+        SET_FA_LX_I,            //零序故障定值
+        SET_FA_LX_T,            //零序故障时间
 	#endif
 	SET_FA_U0_U,			//零序电压定值
 	SET_FA_U0_T,			//零序电压时间

dtu/dtu_main_t536/app/vol.c

@@ -994,7 +994,7 @@ void PT_Check(DWORD  dStep)
 				&&((short)g_sw_pub.ac_cfg_index[PUB_AC_UBC1] != INDEX_INVALLID));
 		Umax=g_sw_pub.m2_max[2];
 		Umin=g_sw_pub.m2_min[2];
-	#ifdef GD_AREA_SHANTOU
+	#ifdef PRO_PT_LL_NC
 		tPT.uPT1DX.bFlag.bQD=(((Umax<pRunSet->dVOL16V_SQR)&&((((FA_ALL_EN(0) && !g_tRelay[0].run_stu.fa_ls) || BH_ALL_EN(0)) && bsxyl )//三相断线:无压有流(非Fa联络)
 		                                                      ||(FA_ALL_EN(0) && g_tRelay[0].run_stu.fa_ls))) //三相断线:三相断线(Fa联络)
 									||((Umax>pRunSet->dVOL50V_SQR)&&(Umin<pRunSet->dVOL16V_SQR))// 两相断线最小值小于16V，最大值大于50V
@@ -1102,7 +1102,7 @@ void PT_Check(DWORD  dStep)
 			#endif
 					;
 
-	#ifdef GD_AREA_SHANTOU
+	#ifdef PRO_PT_LL_NC
 		tPT.uPT2DX.bFlag.bQD=(((Umax<pRunSet->dVOL16V_SQR)&&((((FA_ALL_EN(0) && !g_tRelay[0].run_stu.fa_ls) || BH_ALL_EN(0)) && bsxyl )//三相断线:无压有流(非Fa联络)
 		                                                      ||(FA_ALL_EN(0) && g_tRelay[0].run_stu.fa_ls))) //三相断线:三相断线(Fa联络)
 									||((Umax>pRunSet->dVOL50V_SQR)&&(Umin<pRunSet->dVOL16V_SQR))// 两相断线最小值小于16V，最大值大于50V