整理宏GD_AREA_ZHUHAI_FTU；

dtu/dtu_main_t536/app/Appconfig.c

@@ -270,17 +270,6 @@ const SOE_DEF tAllSOE[]=
 	{0x44,		{0,				0,			0},				"涌流谐波闭锁"},
 	{0x44,		{0,				0,			0},				"闭锁合闸"},
 
-#ifdef defined GD_AREA_ZHUHAI_FTU
-	{0x84,		{EV_PARA_Us1,	EV_PARA_Us2,0},				"电源侧有压"},
-	{0x84,		{EV_PARA_Us1,	EV_PARA_Us2,0},				"负荷侧有压"},
-	{0x84,		{EV_PARA_Us1,	EV_PARA_Us2,0},				"双侧失压"},
-	{0x44,		{0,				0,			0},				"电源侧X闭锁"},
-	{0x44,		{0,				0,			0},				"负荷侧X闭锁"},
-	{0x44,		{0,				0,			0},				"电源侧Y闭锁"},
-	{0x44,		{0,				0,			0},				"负荷侧Y闭锁"},
-	{0x44,		{0,				0,			0},				"电源侧残压闭锁"},
-	{0x44,		{0,				0,			0},				"负荷侧残压闭锁"},
-#else
 	{0x04,		{EV_PARA_Us1,	EV_PARA_Us2,0},				"母线侧有压"},
 	{0x04,		{EV_PARA_Us1,	EV_PARA_Us2,0},				"线路侧有压"},
 	{0x04,		{EV_PARA_Us1,	EV_PARA_Us2,0},				"双侧失压"},
@@ -300,7 +289,6 @@ const SOE_DEF tAllSOE[]=
 		{0x44,		{0,				0,			0},				"母线侧残压闭锁"},
 		{0x44,		{0,				0,			0},				"线路侧残压闭锁"},
 	#endif
-#endif
 
 	{0x54|SOE_TYPE_DELAY_FHZ,		{EV_PARA_U0,	EV_PARA_I0,	0},				"合后零压动作"},
 	{0x44,		{EV_PARA_U0,				0,			0},				"合前零压闭锁"},
@@ -312,17 +300,13 @@ const SOE_DEF tAllSOE[]=
 	{0x44,		{0,				0,			0},				"手合/遥合闭锁失压分"},
 	{0x44,		{0,				0,			0},				"双电源闭锁合闸"},	
 	{0x04|SOE_TYPE_DELAY_FHZ,		{0,				0,			0},				"合后故障"},	
-#ifdef defined GD_AREA_ZHUHAI_FTU
-	{0x44,		{0,				0,			0},				"电源侧合后故障"},	
-	{0x44,		{0,				0,			0},				"负荷侧合后故障"},	
+
+#ifdef GD_TEST_2021
+    {0x44,		{0,				0,			0},			"A侧合后故障"},	
+    {0x44,		{0,				0,			0},			"B侧合后故障"},	
 #else
-	#ifdef GD_TEST_2021
-		{0x44,		{0,				0,			0},			"A侧合后故障"},	
-		{0x44,		{0,				0,			0},			"B侧合后故障"},	
-	#else
-		{0x44,		{0,				0,			0},			"母线侧合后故障"},	
-		{0x44,		{0,				0,			0},			"线路侧合后故障"},	
-	#endif
+    {0x44,		{0,				0,			0},			"母线侧合后故障"},	
+    {0x44,		{0,				0,			0},			"线路侧合后故障"},	
 #endif
 
 	{0x44,		{0,				0,			0},				"闭锁失压分闸"},	

dtu/dtu_main_t536/app/FA.c

@@ -2661,9 +2661,6 @@ static void fa_s_status_run(int sw, DWORD  dStep)
 					soe_record_ev(EV_HHGZ+sw*EV_SW_NUM, 1, 0,0,0 );
 				}
 			}
-		#if defined GD_AREA_ZHUHAI_FTU//珠海局2019供货要求合后故障只能在有压且开关合位的时候才能解锁
-				break;
-		#endif
 		#ifdef FA_BSYTIME_JS
 		  #ifdef GD_AREA_ZHONGSHAN_2020	
 		    if(!pSW->uSdhz_S.bFlag.bDBYY && !pSW->uSdhz_S.bFlag.bOppositeYY)
@@ -3942,7 +3939,7 @@ static void fa_s_run(int sw, DWORD  dStep)
 		if(pR->uRmtSW.bYHExecute_fa||pR->uRmtSW.bHandHz_fa)
 			pR->uRmtSW.bYH_fajs_flag=true;
 	#endif
-	#if defined GD_AREA_ZHUHAI_FTU || (defined GD_AREA_ECZD_2020  && !defined GD_AREA_ZHONGSHAN_2020) || defined GD_AREA_ZHONGSHAN//有压且合位的时候才能解锁
+	#if (defined GD_AREA_ECZD_2020  && !defined GD_AREA_ZHONGSHAN_2020) || defined GD_AREA_ZHONGSHAN//有压且合位的时候才能解锁
 		#ifdef GD_AREA_ZHONGSHAN
 		if(soe_check(EV_HHGZ+sw*EV_SW_NUM) || soe_check(EV_BS_UF_L+sw*EV_SW_NUM) || soe_check(EV_BS_UF_P+sw*EV_SW_NUM)
 			|| soe_check(EV_BS_X_P+sw*EV_SW_NUM) || soe_check(EV_BS_X_L+sw*EV_SW_NUM)
@@ -3973,19 +3970,6 @@ static void fa_s_run(int sw, DWORD  dStep)
 			}
 			
 		}
-		#ifdef GD_AREA_ZHUHAI_FTU//珠海之前提出Y闭锁后有压不允许解锁，合后故障有压且合位才能解锁
-			if(soe_check(EV_BS_Y_P+sw*EV_SW_NUM)||soe_check(EV_BS_Y_L+sw*EV_SW_NUM))
-			{
-				if(bUAB||bUBC)// 有压 
-				{
-					g_run_stu.js=0;
-					g_run_stu.rmtjs=0;
-					return ;//不允许解锁;
-				}
-					
-			}
-
-		#endif
 	#endif
 	#if defined GD_AREA_ECZD_2020  && !defined GD_AREA_ZHONGSHAN_2020
 		if(soe_check(EV_BS_ALL+sw*EV_SW_NUM))
@@ -5521,13 +5505,6 @@ static void _volstu_update(void)
 			{
 				soe_record_ev(EV_BS_FZMORE+sw*EV_SW_NUM, 1, 0,0,0 );//soe_ev_set(EV_BS_FZMORE+sw*EV_SW_NUM,1);
 			}
-		#if defined GD_AREA_ZHUHAI_FTU //珠海局要求合后故障，有压且合位的时候才能解锁
-			if(soe_check(EV_HHGZ+sw*EV_SW_NUM))
-			{
-				g_tRelay[sw].uRmtSW.bYH_fajs_flag=true;
-				pSW->bS_BSLed=fa_check_all_s_bs(sw);//点灯
-			}
-		#endif
 			g_vol_stu[sw].L_status = L_INIT;//重置联络模式保存信息
 		}
 		else if (pRunSet->tSwSet[sw].bTT_FA && g_tRelay[sw].run_stu.fa_ls)

dtu/dtu_main_t536/app/defineSys.h

@@ -104,7 +104,6 @@
 
 #define AREA_MAIN             // 广东标准版
 #define GD_AREA_ZHONGSHAN     // 中山局要求
-#define GD_AREA_ZHUHAI_FTU             // 珠海FTU局要求
 #define GD_AREA_MAIN_2020              // 广东标准版2020
 #define GD_AREA_ECZD_2020              // 2020广东配网终端二次功能指导意见
 #define GD_AREA_ZHONGSHAN_2020         // 中山局2020要求
@@ -169,9 +168,6 @@
 	#define RCD_STRAN_M			/*录波传输*/
 	#define RCD_STRAN_S			/*录波传输*/
 
-#elif defined GD_AREA_ZHUHAI_FTU	//珠海FTU
-	#define VER_NUM 				19101			// 版本号19.101
-
 
 /********************************************************************************************************/
 /****************↓↓↓↓↓↓↓↓↓↓↓以下为广东20年主线宏相关地区(GD_AREA_MAIN_2020)↓↓↓↓↓↓↓↓↓↓↓*******************/

dtu/dtu_main_t536/app/set.c

@@ -815,9 +815,6 @@ const  TSETTABLE tPubSetTable[]=
 	//中山局扩展	
 	{SETTYPE_LIST,	SET_NULL,	"线路侧PT接线方式", 		1 , 		TPT_TypeNum-1,	1,		TPT_Type,	TPT_TypeNum,	GROUP_SET_EQPPARA,0x500A, UINT_R},
 	{SETTYPE_LIST,	SET_NULL,	"控制回路断线检测", 				0 , 		TTListNum-1,		0,		TTList,		TTListNum,		GROUP_SET_EQPPARA,0x0000, BOOL_R},
-#elif defined GD_AREA_ZHUHAI_FTU
-	{SETTYPE_F,		SET_U,		"电源侧PT额定二次值",	0.0,		300.0,			100.0,	0,			0,				GROUP_SET_EQPPARA,0x5008, FLOAT_R},
-	{SETTYPE_F,		SET_U,		"负荷侧PT额定二次值", 	0.0, 		300.0,			100.0 ,	0,			0,				GROUP_SET_EQPPARA,0x5009, FLOAT_R},
 #else	
 	{SETTYPE_F,		SET_U,		"电源侧PT额定二次值",	0.0,		300.0,			100.0,	0,			0,				GROUP_SET_EQPPARA,0x5008, FLOAT_R},
 	{SETTYPE_F,		SET_U,		"负荷侧PT额定二次值", 	0.0, 		300.0,			100.0,	0,			0,				GROUP_SET_EQPPARA,0x5009, FLOAT_R},	
@@ -937,34 +934,21 @@ const  TSETTABLE tSwSetTable[]=
 {
 	
 	{SETTYPE_LABEL,	SET_NULL,	"保护控制字", 				0 , 		0,				0 ,		0,			0,				GROUP_SET_BHTT,0X0000, NULL_R},
-#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_MAIN_2020 || defined GD_AREA_ECZD_2020  //珠海局要求告警+跳闸两个选项     广东标准2020要求告警+跳闸两个选项
+#if 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},
 #else
 	{SETTYPE_LIST,	SET_NULL,	"过流Ⅰ段投入", 			0 , 		TTListNum-1,		0,		TTList,		TTListNum,		GROUP_SET_BHTT,0X500B, BOOL_R},
 	{SETTYPE_LIST,	SET_NULL,	"过流Ⅱ段投入", 			0 , 		TTListNum-1,		0,		TTList,		TTListNum,		GROUP_SET_BHTT,0X500C, BOOL_R},
 #endif
-
-#if defined GD_AREA_ZHUHAI_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},
-#endif
 	{SETTYPE_LIST,	SET_NULL,	"过流Ⅰ段投方向", 		0 , 		TTListNum-1,		0,		TTList,		TTListNum,		GROUP_SET_BHTT,0X500D, BOOL_R},
 	{SETTYPE_LIST,	SET_NULL,	"过流Ⅱ段投方向", 		0 , 		TTListNum-1,		0,		TTList,		TTListNum,		GROUP_SET_BHTT,0X500E, BOOL_R},		
     {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
-	{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},
-#else
 	{SETTYPE_LIST,	SET_NULL,	"零序过流Ⅰ段投入", 		0 , 		TZListNum-1,		0,		TZList,		TZListNum,		GROUP_SET_BHTT,0X5010, BOOL_R},
 	{SETTYPE_LIST,	SET_NULL,	"零序过流Ⅱ段投入", 0 , 				TZListNum-1,		0,		TZList,		TZListNum,		GROUP_SET_BHTT,0X5011, BOOL_R},
-#endif
 
 #ifdef DISP_SET_LX3 
 	#ifdef GD_TEST_2021
@@ -1191,11 +1175,6 @@ const  TSETTABLE tSwSetTable[]=
 		{SETTYPE_LIST,	SET_NULL,	"线路侧得电延时合闸",		0 , 		TTListNum-1,		0,		TTList, 	TTListNum,		GROUP_SET_FATT,0x500E, BOOL_R},
 		{SETTYPE_LIST,	SET_NULL,	"母线侧失电延时合闸",		0 , 		TTListNum-1,		0,		TTList, 	TTListNum,		GROUP_SET_FATT,0x500F, BOOL_R},
 		{SETTYPE_LIST,	SET_NULL,	"线路侧失电延时合闸",		0 , 		TTListNum-1,		0,		TTList, 	TTListNum,		GROUP_SET_FATT,0x5010, BOOL_R},
-	#elif defined GD_AREA_ZHUHAI_FTU
-		{SETTYPE_LIST,	SET_NULL,	"电源侧得电延时合闸",		0 , 		TTListNum-1,		0,		TTList, 	TTListNum,		GROUP_SET_FATT,0x500D, BOOL_R},
-		{SETTYPE_LIST,	SET_NULL,	"负荷侧得电延时合闸",		0 , 		TTListNum-1,		0,		TTList, 	TTListNum,		GROUP_SET_FATT,0x500E, BOOL_R},
-		{SETTYPE_LIST,	SET_NULL,	"电源侧失电延时合闸",		0 , 		TTListNum-1,		0,		TTList, 	TTListNum,		GROUP_SET_FATT,0x500F, BOOL_R},
-		{SETTYPE_LIST,	SET_NULL,	"负荷侧失电延时合闸",		0 , 		TTListNum-1,		0,		TTList, 	TTListNum,		GROUP_SET_FATT,0x5010, BOOL_R},
 	#else	
 		{SETTYPE_LIST,	SET_NULL,	"A侧得电延时合闸", 		0 , 		TTListNum-1,		0,		TTList,		TTListNum,		GROUP_SET_FATT,0x500D, BOOL_R},
 		{SETTYPE_LIST,	SET_NULL,	"B侧得电延时合闸", 		0 , 		TTListNum-1,		0,		TTList,		TTListNum,		GROUP_SET_FATT,0x500E, BOOL_R},
@@ -3045,10 +3024,7 @@ bool MakeRunSet(bool bFirst)
 		// 过流类定值
 		{
 			poc= &ptSet->tSwSet[sw].toc[BH_GL1];
-#if defined GD_AREA_ZHUHAI_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//珠海局要求告警+跳闸两个选项
+#if 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_ECZD_2020
@@ -3072,10 +3048,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
-			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//珠海局要求告警+跳闸两个选项
+#if 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_ECZD_2020//广东标准2020要求告警+跳闸两个选项 跳闸包含跳闸和告警
@@ -3101,13 +3074,8 @@ bool MakeRunSet(bool bFirst)
 			poc->bGj  = false;
 			poc->bDir = false;
 
-		#if defined GD_AREA_ZHUHAI_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
 			poc->bTz=(((WORD)psetbuf[SET_GL3_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false); 
 			poc->bGj=(((WORD)psetbuf[SET_GL3_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false);
-		#endif
 			poc->bDir=(((WORD)psetbuf[SET_GL3_DIR+sw*SW_SET_NUMBER ].ff==1 )?true:false); 
 		
 			poc->dT=GetSetTIME(psetbuf[SET_GL3_T+sw*SW_SET_NUMBER ].ff);
@@ -3152,26 +3120,16 @@ 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 
-			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);
-#else			
 			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==0 )?true:false); 
-#endif	
 			poc->bDir=false;
 			poc->dT=GetSetTIME(psetbuf[SET_LX1_T+sw*SW_SET_NUMBER ].ff);
 			poc->dI=GetSetSQR(psetbuf[SET_LX1_I+sw*SW_SET_NUMBER ].ff,fKI0);		     			
 			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
-			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);
-#else
 			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==0 )?true:false);  
-#endif	 
+			poc->bGj=(((WORD)psetbuf[SET_LX2_TT+sw*SW_SET_NUMBER ].ff==0 )?true:false); 
 			poc->bDir=false;
 			poc->dT=GetSetTIME(psetbuf[SET_LX2_T+sw*SW_SET_NUMBER ].ff);
 			poc->dI=GetSetSQR(psetbuf[SET_LX2_I+sw*SW_SET_NUMBER ].ff,fKI0);