整理宏GD_AREA_ZHUHAI_V2；

dtu/dtu_main_t536/app/Appconfig.c

@@ -242,14 +242,8 @@ const SOE_DEF tAllSOE[]=
 	{0xD4|SOE_TYPE_DELAY_FHZ,		{EV_PARA_Ia,EV_PARA_Ib,	EV_PARA_Ic},		"合后故障过流动作"},	
 #endif
 	{0xD4|SOE_TYPE_DELAY_FHZ,		{EV_PARA_I0,	EV_PARA_U0,	0},				"合后故障零序动作"},
-#ifdef GD_AREA_ZHUHAI_V2
-	{0xD4,		{EV_PARA_Ia,EV_PARA_Ib,	EV_PARA_Ic},		"相间过流告警"},	
-	{0xD4,		{EV_PARA_I0,	EV_PARA_U0,	0},				"接地告警"},
-#else
 	{0x94,		{EV_PARA_Ia,EV_PARA_Ib, EV_PARA_Ic},		"相间过流告警"},
-
 	{0x94,		{EV_PARA_I0,	EV_PARA_U0, 0}, 			"接地告警"},
-#endif
 #ifdef EV_GL_STATR
 	{0x04,		{EV_PARA_Ia,EV_PARA_Ib,	EV_PARA_Ic},		"相间I段启动"},	
 	#ifdef GD_AREA_ECZD_2020 	
@@ -294,17 +288,7 @@ const SOE_DEF tAllSOE[]=
 	{0x44,		{0,				0,			0},				"闭锁合闸"},
 #endif
 
-#ifdef GD_AREA_ZHUHAI_V2
-	{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},				"母线侧残压闭锁"},
-#elif defined GD_AREA_ZHUHAI_FTU
+#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},				"双侧失压"},
@@ -357,10 +341,7 @@ const SOE_DEF tAllSOE[]=
 	{0x44,		{0,				0,			0},				"手合/遥合闭锁失压分"},
 	{0x44,		{0,				0,			0},				"双电源闭锁合闸"},	
 	{0x04|SOE_TYPE_DELAY_FHZ,		{0,				0,			0},				"合后故障"},	
-#ifdef GD_AREA_ZHUHAI_V2
-	{0x44,		{0,				0,			0},				"电缆侧合后故障"},	
-	{0x44,		{0,				0,			0},				"母线侧合后故障"},	
-#elif defined GD_AREA_ZHUHAI_FTU
+#ifdef defined GD_AREA_ZHUHAI_FTU
 	{0x44,		{0,				0,			0},				"电源侧合后故障"},	
 	{0x44,		{0,				0,			0},				"负荷侧合后故障"},	
 #else
@@ -404,9 +385,6 @@ const SOE_DEF tAllSOE[]=
 #if defined  GD_AREA_JIEYANG_FTU || defined  GD_AREA_ECZD_MEIZHOU_2021
 	{0x04,		{EV_PARA_Us1,	EV_PARA_Us2,0}, 			"母线侧得电合闸"},
 	{0x04,		{EV_PARA_Us1,	EV_PARA_Us2,0},				"线路侧得电合闸"},
-#elif defined GD_AREA_ZHUHAI_V2
-	{0x44,		{EV_PARA_Us1,	EV_PARA_Us2,0}, 			"电缆侧得电合闸"},
-	{0x44,		{EV_PARA_Us1,	EV_PARA_Us2,0},				"母线侧得电合闸"},
 #endif
 
 	{0xC4|SOE_TYPE_DELAY_FHZ,		{EV_PARA_Us1,	EV_PARA_Us2,0}, 			"联络合闸"},

dtu/dtu_main_t536/app/Appconfig.h

@@ -291,17 +291,12 @@ enum
 	EV_L_B_LST_HZ,     			// 联络B侧失压合闸
 #endif
 	EV_FA_HZ,					// 得电合闸	
-#if defined GD_AREA_ZHUHAI_V2 || defined  GD_AREA_JIEYANG_FTU || defined  GD_AREA_ECZD_MEIZHOU_2021
+#if defined  GD_AREA_JIEYANG_FTU || defined  GD_AREA_ECZD_MEIZHOU_2021
 	EV_FA_HZ_L,					// 电源侧得电合闸	
 	EV_FA_HZ_P,					// 负荷侧得电合闸	
 #endif
 	EV_FA_LL_HZ,					// 得电合闸	
 	EV_FA_FZ,					// 失电分闸
-#ifdef GD_AREA_ZHUHAI_V2  
-	EV_FA_LL_CD,			//联络充电
-	EV_FA_HZ_OK, 	        //联络合闸成功
-	EV_FA_HZ_FAIL,		   //联络合闸失败	
-#endif
 	EV_FA_HZ_OK,			//联络合闸成功
 	EV_FA_HZ_FAIL,		   //联络合闸失败 
 	EV_FA_LL_CD,			//联络充电

dtu/dtu_main_t536/app/FA.c

@@ -530,7 +530,7 @@ static void fa_uf_set(int sw, bool bSW_LL, DWORD  dStep)
 			bY2 = OverRelay(g_sw_pub.m2_max[3], pSet->dU_UF2, pSet->dU_UF2, 0)&&pR->run_stu.fa_start_hz;// 电源2瞬压
 		#endif
 		}
-	#else //GD_AREA_ZHUHAI_V2
+	#else
 		bY1 = OverRelay(g_sw_pub.m2_max[2], pSet->dU_UF, pSet->dU_UF, 0);// 电源1瞬压
 		bY2 = OverRelay(g_sw_pub.m2_max[3], pSet->dU_UF2, pSet->dU_UF2, 0)&&pR->run_stu.fa_start_hz;// 电源2瞬压
 	#endif
@@ -2147,9 +2147,7 @@ static void fa_s_status_run(int sw, DWORD  dStep)
 #endif
 				}
 			}
-		#if	defined GD_AREA_ZHUHAI_V2
-			if (pSW->uSdhz_S.bFlag.bPowerYY && (pSW->uSdhz_S.bFlag.bUABYY||(pSW->uSdhz_S.bFlag.bUBCYY&&pR->run_stu.fa_start_hz)))					//上电侧来电
-		#elif defined GD_AREA_ECZD_CHAOZHOU_2022
+		#if	defined GD_AREA_ECZD_CHAOZHOU_2022
 			if (pSW->uSdhz_S.bFlag.bPowerYY && ((pSW->uSdhz_S.bFlag.bPowerYY == pSW->uSdhz_S.bFlag.bUABYY)?(pSW->uSdhz_S.bFlag.bHzEnable_P):(pSW->uSdhz_S.bFlag.bHzEnable_L)))					//上电侧掉电再来电
 		#else
 			if (pSW->uSdhz_S.bFlag.bPowerYY)					//上电侧来电
@@ -2733,7 +2731,7 @@ 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_V2 || defined GD_AREA_ZHUHAI_FTU//珠海局2019供货要求合后故障只能在有压且开关合位的时候才能解锁
+		#if defined GD_AREA_ZHUHAI_FTU//珠海局2019供货要求合后故障只能在有压且开关合位的时候才能解锁
 				break;
 		#endif
 		#ifdef FA_BSYTIME_JS
@@ -3150,17 +3148,16 @@ static void fa_l_status_run(int sw, DWORD  dStep)
 				#endif
 			#endif
 
-			#ifdef GD_AREA_ZHUHAI_V2 
-				if(soe_check(EV_FA_HZ_OK+sw*EV_SW_NUM)==true)//联络合闸成功返回
-				{
-					soe_record_ev(EV_FA_HZ_OK+sw*EV_SW_NUM, 0, 0,0,0 );
-				}
-			#elif defined GD_AREA_ZHONGSHAN 
+			#ifdef GD_AREA_ZHONGSHAN 
 				if(soe_check(EV_GOOSE_HZ_OK+sw*EV_SW_NUM)==true)
 				{
 					soe_record_ev(EV_GOOSE_HZ_OK+sw*EV_SW_NUM, 0, 0,0,0 );
 				}
 			#endif
+				if(soe_check(EV_FA_HZ_OK+sw*EV_SW_NUM)==true)//联络合闸成功返回
+				{
+					soe_record_ev(EV_FA_HZ_OK+sw*EV_SW_NUM, 0, 0,0,0 );
+				}
 				if(soe_check(EV_FA_LL_CD+sw*EV_SW_NUM)==true)
 				{
 					soe_record_ev(EV_FA_LL_CD+sw*EV_SW_NUM, 0, 0,0,0 );
@@ -3293,18 +3290,16 @@ static void fa_l_status_run(int sw, DWORD  dStep)
 					soe_record_ev(EV_HHGZ+sw*EV_SW_NUM, 0, 0,0,0 );
 				}
 				//2020-03-17
-				#ifdef GD_AREA_ZHUHAI_V2
-					if(soe_check(EV_FA_HZ_FAIL+sw*EV_SW_NUM)==true)//自转电失败SOE返回
-					{
-						soe_record_ev(EV_FA_HZ_FAIL+sw*EV_SW_NUM, 0, 0,0,0 );
-					}
-				
-				#elif defined GD_AREA_ZHONGSHAN
+				#ifdef GD_AREA_ZHONGSHAN
 					if(soe_check(EV_GOOSE_HZ_FAIL+sw*EV_SW_NUM)==true)//自转电失败SOE返回
 					{
 						soe_record_ev(EV_GOOSE_HZ_FAIL+sw*EV_SW_NUM, 0, 0,0,0 );
 					}
 				#endif	
+                if(soe_check(EV_FA_HZ_FAIL+sw*EV_SW_NUM)==true)//自转电失败SOE返回
+                {
+                    soe_record_ev(EV_FA_HZ_FAIL+sw*EV_SW_NUM, 0, 0,0,0 );
+                }
                 if(soe_check(EV_FA_LL_CD+sw*EV_SW_NUM)==false)
                 {
                     soe_record_ev(EV_FA_LL_CD+sw*EV_SW_NUM, 1, 0,0,0 );
@@ -3637,7 +3632,7 @@ static void fa_l_status_run(int sw, DWORD  dStep)
 				#endif
 				
 					//2020-03-17 EV_GOOSE_HZ_FAIL
-					#if defined GD_AREA_ZHUHAI_V2 || defined GD_AREA_ZHONGSHAN_2020
+					#if defined GD_AREA_ZHONGSHAN_2020
 						if(soe_check(EV_FA_HZ_FAIL+sw*EV_SW_NUM)==false)
 						{
 							soe_record_ev(EV_FA_HZ_FAIL+sw*EV_SW_NUM, 1, 0,0,0 );
@@ -3655,7 +3650,7 @@ static void fa_l_status_run(int sw, DWORD  dStep)
 			//开关拒动
 			if(soe_check(EV_HZFAIL+sw*EV_SW_NUM)==true)
 			{
-				#if defined GD_AREA_ZHUHAI_V2 || defined GD_AREA_ZHONGSHAN_2020
+				#if defined GD_AREA_ZHONGSHAN_2020
 					if(soe_check(EV_FA_HZ_FAIL+sw*EV_SW_NUM)==false)
 					{
 						soe_record_ev(EV_FA_HZ_FAIL+sw*EV_SW_NUM, 1, 0,0,0 );
@@ -3680,7 +3675,7 @@ static void fa_l_status_run(int sw, DWORD  dStep)
 				//2020-03-17 EV_GOOSE_HZ_OK				
 				if(pR->tSWST.uSWST.bFlag.bHZWZ)//开关合位,SOE转供电成功
 				{
-					#if defined GD_AREA_ZHUHAI_V2 || defined GD_AREA_ZHONGSHAN_2020
+					#if defined GD_AREA_ZHONGSHAN_2020
 						if(soe_check(EV_FA_HZ_OK+sw*EV_SW_NUM)==false)
 						{
 							soe_record_ev(EV_FA_HZ_OK+sw*EV_SW_NUM, 1, 0,0,0 );
@@ -3694,7 +3689,7 @@ static void fa_l_status_run(int sw, DWORD  dStep)
 				}
 				else
 				{					
-					#if defined GD_AREA_ZHUHAI_V2 || defined GD_AREA_ZHONGSHAN_2020
+					#if defined GD_AREA_ZHONGSHAN_2020
 						if(soe_check(EV_FA_HZ_FAIL+sw*EV_SW_NUM)==false)
 						{
 							soe_record_ev(EV_FA_HZ_FAIL+sw*EV_SW_NUM, 1, 0,0,0 );
@@ -4047,7 +4042,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_V2 || defined GD_AREA_ZHUHAI_FTU || (defined GD_AREA_ECZD_2020  && !defined GD_AREA_ZHONGSHAN_2020) || defined GD_AREA_ZHONGSHAN//有压且合位的时候才能解锁
+	#if defined GD_AREA_ZHUHAI_FTU || (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)
@@ -4224,14 +4219,9 @@ static void fa_s_run(int sw, DWORD  dStep)
 		pR->tU0TZ.bU0Led=false;
 		if(g_run_stu.js||g_run_stu.rmtjs||bFWJS||bJS)  // 解锁后，进入初始状态
 		{//解锁条件后期需更改？无闭锁直接退出？
-			if(pR->tSWST.uSWST.bFlag.bHZWZ)//当前在合位且正常运行态，直接切换至正常运行???
+			if(pR->tSWST.uSWST.bFlag.bHZWZ)//当前在合位且正常运行态，直接切换至正常运行
 			{
-			//珠海要求B侧需判断对侧开关位置
-			#if	defined GD_AREA_ZHUHAI_V2
-				pR->tLostVot.uLostVot.bFlag.bSHWY=!(bUAB||(bUBC&&pR->run_stu.fa_start_hz));//将手合状态电压保存
-			#else
 				pR->tLostVot.uLostVot.bFlag.bSHWY=!(bUAB||bUBC);//将手合状态电压保存
-			#endif
 				pSW->uSdhz_S.bFlag.bPowerZ=0;
 				ResetTR(&pR->tLostVot.tLostVotTime);//重新开始Z计时
 				fa_s_state_change(sw,S_USUAL);//
@@ -4262,13 +4252,7 @@ static void fa_s_run(int sw, DWORD  dStep)
 			pSW->uSdhz_S.bFlag.bGL_II=false;
 			pSW->uSdhz_S.bFlag.bJD = false;
 			pSW->uSdhz_S.bFlag.bXOverUo=bU0;
-			
-		//#ifdef GD_AREA_ZHUHAI_V2//珠海要求B侧需判断对侧开关位置
-		#if	defined GD_AREA_ZHUHAI_V2
-				pR->tLostVot.uLostVot.bFlag.bSHWY=!(bUAB||(bUBC&&pR->run_stu.fa_start_hz));//将手合状态电压保存
-		#else
-				pR->tLostVot.uLostVot.bFlag.bSHWY=!(bUAB||bUBC);//将手合状态电压保存
-		#endif	
+            pR->tLostVot.uLostVot.bFlag.bSHWY=!(bUAB||bUBC);//将手合状态电压保存
 
 		#ifndef GD_AREA_ZHONGSHAN_2020	//中山2020要求手合无压进入Y时间，如果Y时间合后故障则闭锁双侧 2020-12-23
 			if(pR->tLostVot.uLostVot.bFlag.bSHWY || pSW->S_Status == S_USUAL)
@@ -4471,7 +4455,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_ZHUHAI_V2 || defined  GD_AREA_JIEYANG_FTU || defined  GD_AREA_ECZD_MEIZHOU_2021
+		#if defined  GD_AREA_JIEYANG_FTU || 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
@@ -4486,7 +4470,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_ZHUHAI_V2 || defined  GD_AREA_JIEYANG_FTU || defined  GD_AREA_ECZD_MEIZHOU_2021
+		#if defined  GD_AREA_JIEYANG_FTU || 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
@@ -4804,7 +4788,7 @@ static void fa_l_run(int sw, DWORD  dStep)
 	}
 	//pSW->bL_BSLed=check_all_l_bs(sw);	
 	//闭锁标志处理
-	#if defined GD_AREA_ZHUHAI_V2 || defined GD_AREA_ZHONGSHAN_2020
+	#if defined GD_AREA_ZHONGSHAN_2020
 	pSW->uSdhz_L.bFlag.bLockY = pSW->uSdhz_L.bFlag.bLockUFlash;//(	((pSW->L_Status == L_BS_STATE) && (!pSW->tOnYLTime.boolTrip))
 								//||	(pSW->uSdhz_L.bFlag.bLockUFlash));	//L_Status == L_Y_ZTIME));
 	#else
@@ -5677,7 +5661,7 @@ static void _volstu_update(void)
 				soe_record_ev(EV_BSBE_U0+sw*EV_SW_NUM, 1, 0,0,0 );
 			}	
 		#endif
-		#if defined GD_AREA_ZHUHAI_V2 || defined GD_AREA_ZHUHAI_FTU //珠海局要求合后故障，有压且合位的时候才能解锁
+		#if defined GD_AREA_ZHUHAI_FTU //珠海局要求合后故障，有压且合位的时候才能解锁
 			if(soe_check(EV_HHGZ+sw*EV_SW_NUM))
 			{
 				g_tRelay[sw].uRmtSW.bYH_fajs_flag=true;

dtu/dtu_main_t536/app/FA_g.c

@@ -327,7 +327,7 @@ extern unsigned char fec_get_hsr_prp_flag(void);//
 void fa_g_app_time(int sw) // 1s  执行一次函数
 {	
 	sw=0;
-#ifdef GD_AREA_ZHUHAI_V2 //珠海局，单一网口网线掉了，需弹soe	
+#ifdef DFA_MESH_ERR_SOE // 单一网口网线掉了，需弹soe	
 	if( rt_get_net_linkstatus(0) && BH_GOOSE_EN_YB(sw)&&g_goose_net_type)  //普通模式，不报单网卡掉线
 	{
 		if(soe_check(EV_NET1_DOWN)==false)
@@ -501,7 +501,7 @@ void fa_g_commcheck(DWORD dStep) //
 		{
 			tFAg.dTrecv[i]=dTCounter;
 			}
-#ifdef GD_AREA_ZHUHAI_V2 //珠海局，要求报M和N侧故障
+#ifdef DFA_MESH_ERR_SOE // 单一网口网线掉了，需弹soe
 		{
 			bool berr=((dTCounter-tFAg.dTrecv[i])>T_1s*20)?true:false;
 			if(berr&&BH_GOOSE_EN_YB(sw))
@@ -549,17 +549,14 @@ void fa_g_commcheck(DWORD dStep) //
 	}
 	if(boverdT&&BH_GOOSE_EN_YB(sw))
 	{
-//#ifndef GD_AREA_ZHUHAI_V2 //珠海局，要求报M和N侧故障
 		if(soe_check(EV_GOOSE_ERR)==false)
 		{				
 			soe_record_ev(EV_GOOSE_ERR,1, 0,0,0 ); 			
 		}
-//#endif		
 		tFAg.commerr=1;
 	}
 	else
 	{
-//#ifndef GD_AREA_ZHUHAI_V2 //珠海局，要求报M和N侧故障
 		if(soe_check(EV_GOOSE_ERR)==true)
 		{				
 			soe_record_ev(EV_GOOSE_ERR,0, 0,0,0 );   //本机通信恢复 
@@ -567,7 +564,6 @@ void fa_g_commcheck(DWORD dStep) //
 			tFAg.commerrfg|=(1<<tRunPara.gse_id);	 // 本机通信恢复,置复归位
 #endif
 		}
-//#endif
 		tFAg.commerr=0;		
 	}
 	

dtu/dtu_main_t536/app/MmiData.c

@@ -5036,7 +5036,7 @@ static void mmd_GetFtuYxValue(int i,DATA_FIELD_DEF *pF)
 	    (ecd->owner!=0 && (!TQ_ALL_EN(0))))//同期压板	
 		strcpy(tmpstr,YX_F);	
 
-    #if defined GD_AREA_SHAOGUAN || defined BHFAGS_YB_YK || defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHUHAI_V2 || defined GD_AREA_ECZD_2020
+    #if defined GD_AREA_SHAOGUAN || defined BHFAGS_YB_YK || defined GD_AREA_ZHONGSHAN || defined GD_AREA_ECZD_2020
 		if((SW_DI_BHTT+1==ecd->type && ecd->owner!=0 && (!BH_ALL_EN(0)))||//常规保护压板
 			(SW_DI_FA_TT+1==ecd->type && ecd->owner!=0 && (!FA_ALL_EN(0)))||//FA压板
 			(SW_DI_FA_GOOSE+1==ecd->type && ecd->owner!=0 && (!BH_GOOSE_EN(0))))//智能分布式压板	
@@ -5167,34 +5167,7 @@ void mmd_RefreshFAStatus(void)
 	sprintf(strGprsInf[num++],"联络充电  :  %s",m_Fa_chr);
 	sprintf(strGprsInf[num++],"智能分布式:  %s",m_Ledgoose);
 	sprintf(strGprsInf[num++],"分布式充电:  %s",m_Goose_chr);
-#ifdef GD_AREA_ZHUHAI_V2 
-	{
-		extern const  SET_LIST GOOSE_NET_List[];
-		int i;
-		int sw=0;
-		sprintf(strGprsInf[num++],"GOOSE网络类型:%s",GOOSE_NET_List[g_goose_net_type].str);
-		sprintf(strGprsInf[num++],"GOOSE订阅数量:%d",tFAg.recvgolbnum);
-		for(i=0;i<tFAg.recvgolbnum;i++)
-		{
-			if(BH_GOOSE_EN_YB(sw))
-			{			
-				bool berr=((dTCounter-tFAg.dTrecv[i])>T_1s*10)?true:false;
-				if(berr)
-				{
-					sprintf(strGprsInf[num++],"测控装置%1d通信:正常",i+1);
-				}
-				else
-				{
-					sprintf(strGprsInf[num++],"测控装置%1d通信:异常",i+1);
-				}
-			}
-			else
-			{
-				sprintf(strGprsInf[num++],"测控装置%1d通信:----",i+1);
-			}
-		}	
-	}
-#endif
+
 	g_gprs_info_num=num;
 }
 
@@ -5877,11 +5850,7 @@ int mmd_EnterMainMenu(int key)
 	{
 		#if SWITCH_NUM_MAX==1
 			mmd_GetFtuMea(0);
-		#endif	
-		#ifdef GD_AREA_ZHUHAI_V2
-			mmd_EnterAutoMenu();
-			return M_OK;//NULL
-		#else
+		#endif
 		if(g_tLcdComm.tImage.pBuf==NULL)
 		{
 			return M_JUMP0;
@@ -5890,26 +5859,10 @@ int mmd_EnterMainMenu(int key)
 		{
 			return M_JUMP1;
 		}
-		#endif
 	}
 	return M_ERROR;
 }
 
-#ifdef GD_AREA_ZHUHAI_V2
-void mmd_EnterAutoMenu(void)
-{
-	if(g_tScreen.cActiveMenuNo!=26) // 不在主循环界面下
-	{
-		mmd_GetFaStatus(0); 				
-		mmi_FormsInit(26,1);
-		g_tLcdComm.bLock=false; //退出主界面lock状态
-		m_LockIcon[0]=' ';
-		m_LockIcon[1]=0;	
-	}
-}
-#endif
-
-
 int mmd_BoardLedTest(int value)
 {
 	if(value==1) // 辅助板

dtu/dtu_main_t536/app/MmiData.h

@@ -183,9 +183,6 @@ int  mmd_RenewMain(void);
 
 int mmd_KeyMain(int key);
 int mmd_EnterMainMenu(int key);
-#ifdef GD_AREA_ZHUHAI_V2
-void mmd_EnterAutoMenu(void);
-#endif
 
 int m_TestLed(int value);
 

dtu/dtu_main_t536/app/MmiDrv.c

@@ -1238,18 +1238,14 @@ void  mmi_Menu_Task(void)
 		{
 			if((dTCounter-g_tScreen.lnMainTime)>tRunPara.dMainTime)  //熄灭背光
 			{
-				#ifdef GD_AREA_ZHUHAI_V2	
-					mmd_EnterAutoMenu();
-				#else
-					if(g_tScreen.cActiveMenuNo!=0) // 不在主循环界面下
-					{
-						mmd_EnterMainMenu((g_tScreen.lcd_type==LCD_TYPE_6KEY)?HA_KEY_LEFT:HA_KEY_ESC);					
-						mmi_FormsInit(0,1);
-						g_tLcdComm.bLock=false; //退出主界面lock状态
-						m_LockIcon[0]=' ';
-						m_LockIcon[1]=0;	
-					}
-				#endif
+                if(g_tScreen.cActiveMenuNo!=0) // 不在主循环界面下
+                {
+                    mmd_EnterMainMenu((g_tScreen.lcd_type==LCD_TYPE_6KEY)?HA_KEY_LEFT:HA_KEY_ESC);					
+                    mmi_FormsInit(0,1);
+                    g_tLcdComm.bLock=false; //退出主界面lock状态
+                    m_LockIcon[0]=' ';
+                    m_LockIcon[1]=0;	
+                }
 				g_tScreen.lnMainTime=dTCounter;
 			}
 		}			

dtu/dtu_main_t536/app/Sys.c

@@ -322,7 +322,7 @@ void app_yb_refresh(void)
         fresh_set_soe(EV_BH_YB, FUN_ALL_EN(sw), 0,sw);
 #endif
 
-#if defined BHFAGS_YB_YK || defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_ZHUHAI_V2 || defined GD_AREA_SHAOGUAN || defined GD_AREA_ECZD_2020
+#if defined BHFAGS_YB_YK || defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_SHAOGUAN || defined GD_AREA_ECZD_2020
         // EV_GOOSE_YBTT/EV_FA_YBTT/EV_BH_YBTT (goose/fa/bh)
         fresh_set_soe(EV_BH_YBTT, BH_ALL_EN(sw), 0,sw);
         fresh_set_soe(EV_FA_YBTT, FA_ALL_EN(sw), 0,sw);
@@ -366,7 +366,7 @@ void app_yb_refresh(void)
 				soe_record_ev(EV_CHZ_CHECK+sw*EV_SW_NUM, 0, 0,0,0);
 			}
 		}		 
-		#if defined BHFAGS_YB_YK ||	defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_ZHUHAI_V2 || defined GD_AREA_SHAOGUAN
+		#if defined BHFAGS_YB_YK ||	defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_SHAOGUAN
 			//GOOSE
 			if(((short)g_sw[sw].di_cfg_index[SW_DI_FA_GOOSE] != INDEX_INVALLID)&&(pRunSet->bTT_SOFT_GOOSE_YB != g_tRelay[sw].run_stu.fa_g_tt))
 			{
@@ -596,14 +596,11 @@ void ResetHzLed(int rstsw)
 		   	ResetTR(&pR->tCHZ.tTCHJD_HJS);
 		}
 
-#if defined GD_AREA_GUANGZHOU_FTU || defined GD_AREA_ZHUHAI_V2
+#if defined GD_AREA_GUANGZHOU_FTU
 		// Ãð¹ÊÕϸ澯µÆ
 		led_set_sw(sw,SW_LED_FAULT_GJ, LED_OFF);
 #endif
-
-#ifdef GD_AREA_ZHUHAI_V2
 	    led_set_sw(sw,SW_LED_DZ, LED_OFF);  
-#endif
 	    led_set_sw(sw,SW_LED_TZ, LED_OFF);
 	}
 }
@@ -878,9 +875,7 @@ void SignalReset(int rstsw,bool blnk)
 		if(bRst)
 		{
 			sw_do(sw,SW_DO_BHDZ,SW_DO_TYPE_OFF);
-		#ifndef GD_AREA_ZHUHAI_V2
-			led_set_sw(sw,SW_LED_DZ, LED_OFF); 			
-		#endif
+			led_set_sw(sw,SW_LED_DZ, LED_OFF);
 			#ifndef GD_AREA_GUANGZHOU_FTU
 			led_set_sw(sw,SW_LED_TZ, LED_OFF);
 			#endif

dtu/dtu_main_t536/app/UnitsLib.c

@@ -397,7 +397,7 @@ void ProtectRelayInit(void)
 		fresh_set_soe(EV_BH_YB, FUN_ALL_EN(sw), true,sw);		
 #endif
 	   	
-	#if defined BHFAGS_YB_YK ||	defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_ZHUHAI_V2 || defined GD_AREA_SHAOGUAN || defined GD_AREA_ECZD_2020
+	#if defined BHFAGS_YB_YK ||	defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_SHAOGUAN || defined GD_AREA_ECZD_2020
 		fresh_set_soe(EV_BH_YBTT, BH_ALL_EN(sw), true,sw);
 		fresh_set_soe(EV_FA_YBTT, FA_ALL_EN(sw), true,sw);
 		fresh_set_soe(EV_GOOSE_YBTT, BH_GOOSE_EN(sw), true,sw);			

dtu/dtu_main_t536/app/defineSys.h

@@ -90,6 +90,7 @@
 #define IEC_RESET_PROCESS              // 复位命令重启装置
 #define FIXAREA_TYPE_V2                // 定值区号使用V2版本（当前、待召唤、待执行）
 #define IEC_SETTIME_ANS_WEK            // 对时报文回复带周
+#define DFA_MESH_ERR_SOE               // 智能分布式网线拔出报soe
 // #define TMP_CHIP_AHT20
 
 //定制功能
@@ -100,7 +101,6 @@
 #define GD_AREA_FOS_2020      // 佛山局2020要求
 #define GD_AREA_ZHONGSHAN     // 中山局要求
 #define GD_AREA_ZHONGSHAN_FTU          // 中山FTU要求
-#define GD_AREA_ZHUHAI_V2              // 珠海局2019_V2要求
 #define GD_AREA_HEYUAN                 // 河源局要求
 #define GD_AREA_HEYUAN_KL              // 科陆河源局要求
 #define GD_AREA_GUANGZHOU_FTU          // 广州局要求
@@ -197,14 +197,6 @@
 #elif defined GD_AREA_ZHAOQING_FENGKAI	//	//肇庆封开县要求，科陆在梅州FTU基础上新增功能
 	#define VER_NUM 				13102			// 版本号13.101
 
-#elif defined  GD_AREA_ZHUHAI_V2	//珠海送检版本
-	#define VER_NUM 				15101			// 版本号15.101
-	#define SOE_PARA_ALL_SAVE		//故障断面所有遥测全部显示
-	#define DISP_MEA_CN				//液晶遥测名称显示中文
-	#define EV_GL_STATR
-	#define EV_CHZ_FG
-	#define YB_STHD_CHECK
-
 #elif defined GD_AREA_HEYUAN_KL     //科陆河源
     #define VER_NUM 				16101			// 版本号16.101
 	#define SOE_RECORD_DELAY

dtu/dtu_main_t536/app/led.c

@@ -188,7 +188,6 @@ void _led_update_status(void)
 
 	//异常灯,以内部异常优先级高
 	exerr=0;
-#ifndef GD_AREA_ZHUHAI_V2	//未储能异常	
 	for(i=0;i<g_sw_num;i++)
 	{
 		RUN_STU_SW *prun=&g_tRelay[i].run_stu;
@@ -199,7 +198,6 @@ void _led_update_status(void)
 			break;
 		}
 	}
-#endif
 	if (rt_err_count())
 	{
 		led_set_pub(PUB_LED_ERR, LED_ON);
@@ -207,13 +205,7 @@ void _led_update_status(void)
 		gb_drive.b_err = true;
 	#endif
 	}
-#ifdef GD_AREA_ZHUHAI_V2
-	else if((soe_check(EV_FUNALL_CHECK+0*EV_SW_NUM)==true)||(soe_check(EV_CHZ_CHECK+0*EV_SW_NUM)==true)||
-		    (soe_check(EV_GOOSE_CHECK+0*EV_SW_NUM)==true)||(soe_check(EV_FA_CHECK+0*EV_SW_NUM)==true)||(soe_check(EV_BH_CHECK+0*EV_SW_NUM)==true))
-	{
-		led_set_pub(PUB_LED_ERR, LED_ON);
-	}
-#elif defined GD_AREA_ZHONGSHAN_2020
+#ifdef defined GD_AREA_ZHONGSHAN_2020
 	else if (exerr||soe_check(EV_GOOSE_CONFIG_ERR)==true)//中山2020要求通信异常不允许亮异常灯
 	{
 		led_set_pub(PUB_LED_ERR, LED_ON);
@@ -242,7 +234,6 @@ void _led_update_status(void)
 	#endif
 	}
 
-//#ifdef GD_AREA_ECZD_2020
 #if defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020
     for(i=0; i<g_sw_num; i++)
     {
@@ -269,11 +260,6 @@ void _led_update_status(void)
 	#endif
     }
 #endif
-	//if(g_run_stu.pubdz==1)  // ==1 闭锁
-	//{
-		//led_set_pub(PUB_LED_DZ,LED_ON);
-	//}
-	//else 
 	if(g_run_stu.pubdz==2) // ==2故障动作
 	{
 		led_set_pub(PUB_LED_DZ,LED_QUICK);
@@ -352,18 +338,7 @@ void _led_update_status(void)
 		else 
 		{
 			led_set_sw(i,SW_LED_ZHTW, LED_OFF);	
-		}	
-	#ifdef GD_AREA_ZHUHAI_V2
-		//通讯异常
-		if(tFAg.bComErr>0)
-		{
-			led_set_sw(i,SW_LED_COMMERR, LED_ON);
-		}		
-		else
-		{
-			led_set_sw(i,SW_LED_COMMERR, LED_OFF);
 		}
-	#endif
 		// 合位灯、跳位灯
 		if (prun->hw)
 		{			 
@@ -426,22 +401,6 @@ void _led_update_status(void)
 		if (prun->gj_led)
 			led_set_sw(i,SW_LED_FAULT_GJ, LED_ON);
 	#endif
-	
-	#ifdef GD_AREA_ZHUHAI_V2
-		if((prun->gj_led)|| //故障
-		    (soe_check(EV_TH_WCN+i*EV_SW_NUM)==true)|| //弹簧未储能
-		    (soe_check(EV_KZHL+i*EV_SW_NUM)==true)||//控制回路
-		    (soe_check(EV_FUNALL_CHECK+0*EV_SW_NUM)==true||soe_check(EV_CHZ_CHECK+0*EV_SW_NUM)==true||soe_check(EV_GOOSE_CHECK+0*EV_SW_NUM)==true||soe_check(EV_FA_CHECK+0*EV_SW_NUM)==true||soe_check(EV_BH_CHECK+0*EV_SW_NUM)==true)||//压板不一致
-		    (soe_check(EV_CTYC+i*EV_SW_NUM)==true||soe_check(EV_CTXXYC+i*EV_SW_NUM)==true)||//CT异常+相序异常  
-			(soe_check(EV_PT1ERR)||soe_check(EV_PT2ERR)))//珠海局要求PT断线当做异常告警
-		{
-			led_set_sw(i,SW_LED_FAULT_GJ, LED_ON);
-		}	
-		else//无故障时熄灭
-		{
-			led_set_sw(i,SW_LED_FAULT_GJ, LED_OFF);
-		}	
-    #endif
 		// 重合闸灯
 		if (prun->chzdz)
 		{			 
@@ -490,13 +449,7 @@ void _led_update_status(void)
 		{
 			led_set_sw(i,SW_LED_DZ, LED_ON);
             led_set_sw(i,SW_LED_TZ, LED_ON);
-		}	
-		#ifdef GD_AREA_ZHUHAI_V2
-		else if ((prun->dz == RY_DZ_BHT)||(prun->dz == RY_DZ_HZ))  //动作灯常亮,手动复归
-		{
-			led_set_sw(i,SW_LED_DZ, LED_ON);
-		}			
-		#else
+		}
 		else if (prun->dz == RY_DZ_BHT)	 //xj 故障状态闪烁
 		{
 			led_set_sw(i,SW_LED_DZ, LED_QUICK);
@@ -506,7 +459,6 @@ void _led_update_status(void)
 		{
 			led_set_sw(i,SW_LED_DZ, LED_OFF);
 		}
-		#endif
 
 		if(BH_GOOSE_EN(i))  //智能FA逻辑，联络开关自动查找
 		{

dtu/dtu_main_t536/app/protect.c

@@ -590,9 +590,6 @@ int protect_tbl_qd(void)
 // 速断幅值启动滤波加速，加快幅值启动过程
 int protect_amp_qd_js(int sw)
 {
-#ifdef GD_AREA_ZHUHAI_V2
-	return 0;
-#else
     int i,v,r;
 	int ui_begin;
 	int chn_index;
@@ -657,16 +654,12 @@ int protect_amp_qd_js(int sw)
 	}
 	
 	return r;
-#endif	
 }
 
 
 // 零序幅值启动滤波加速，加快幅值启动过程
 int protect_amp_lx_js(int sw)
-{	
-#ifdef GD_AREA_ZHUHAI_V2
-	return 0;
-#else
+{
 	int i,v,r;
 	int ui_begin;
 	int chn_index;
@@ -722,7 +715,6 @@ int protect_amp_lx_js(int sw)
 	}
 	
 	return r;
-#endif	
 }
 
 /*------------------------------ 内部函数 -------------------------------------
@@ -836,10 +828,8 @@ static int _protect_amp_qd(u32  dStep)
 			dStep = 0;
 		}
 		// 幅值启动加速
-		#ifndef GD_AREA_ZHUHAI_V2
 		bFZJS = protect_amp_qd_js(sw); 		
 		bFZJS |= protect_amp_lx_js(sw); //xj
-		#endif
 	}
 	else
 	{

dtu/dtu_main_t536/app/run_status.c

@@ -315,7 +315,7 @@ int run_status_init(void)
 			prun->chzyb = 1;
 		}	
 		prun->fa_start_hz = 1;
-	#if	defined GD_AREA_ZHUHAI_V2 || defined GD_AREA_LIAONING_2021
+	#if	defined GD_AREA_LIAONING_2021
 		if ((short)g_sw[sw].di_cfg_index[SW_DI_B_SW] == INDEX_INVALLID)
 		{
 			prun->fa_start_hz = 1;
@@ -784,8 +784,7 @@ int  run_status_check(u32 dStep)
 			prun->jzs_tt = dido_di_is_on(ecd->slot,ecd->index);
 		}
 
-	//#ifdef GD_AREA_ZHUHAI_V2
-	#if	defined GD_AREA_ZHUHAI_V2 || defined GD_AREA_LIAONING_2021
+	#if	defined GD_AREA_LIAONING_2021
 		if ((short)g_sw[sw].di_cfg_index[SW_DI_B_SW] != INDEX_INVALLID)
 		{
 			ecd = &g_equ_config_di[g_sw[sw].di_cfg_index[SW_DI_B_SW]];
@@ -1284,15 +1283,6 @@ int app_action_result(void)
 		{
 			chzdz = 1;		
 		}
-		#ifdef GD_AREA_ZHUHAI_V2//珠海要求合闸需亮动作灯
-		//合闸动作		
-		if(pR->uBHDZ.bFlag.bBHH)//合闸动作展宽200ms
-		{
-			//prun->dz=RY_DZ_BHGJ;//珠海要求重合闸动作后，过流或接地灯一直亮。灯人工干预或定时复归才灭	
-			prun->dz=RY_DZ_HZ;			
-		}
-		//rt_printf("run_dz = %d, b_BHH = %d\r\n",prun->dz,pR->uBHDZ.bFlag.bBHH);
-		#endif
 		// 闭锁
 		if (	 pR->tSDHZ.bL_BSLed
 			|| pR->tSDHZ.bS_BSLed)

dtu/dtu_main_t536/app/samint.c

@@ -43,10 +43,10 @@ int pit_156us_main(int mod)
 		//protect_tbl_qd(); 
 	}
 #ifdef	XDL_ZT //小电流接地
-		// 小电流突变量启动不受g_adc_sync保护，避免频率跟踪的封锁。
-		// 由于pit_156us_main启动时所有其它条件都初始化好了，且目前模块退出时已增加
-		// 此中断的退出，所以因为没啥问题。
-		xdl_tbl_qd(mod);
+    // 小电流突变量启动不受g_adc_sync保护，避免频率跟踪的封锁。
+    // 由于pit_156us_main启动时所有其它条件都初始化好了，且目前模块退出时已增加
+    // 此中断的退出，所以因为没啥问题。
+    xdl_tbl_qd(mod);
 #endif
 
 	//fa_g_156us();
@@ -55,9 +55,6 @@ int pit_156us_main(int mod)
 #ifndef CPU_FUXI	
 		dTCounter++;	// 系统计数器
 #endif
-	#ifdef GD_AREA_ZHUHAI_V2			
-		protect_tbl_qd(); 			
-	#endif
 	}
 
 #ifdef __IEC61850_GOOSE_FUNC__

dtu/dtu_main_t536/app/set.c

@@ -841,9 +841,6 @@ const  TSETTABLE tPubSetTable[]=
 #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},
-#elif defined  GD_AREA_ZHUHAI_V2
-	{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},
 #elif defined  GD_AREA_HEYUAN_2021
 	{SETTYPE_F, 	SET_U,		"电源侧PT额定二次值",	0.0,		1000.0,			220.0,	0,			0,				GROUP_SET_EQPPARA,0x5008, FLOAT_R},
 	{SETTYPE_F, 	SET_U,		"负荷侧PT额定二次值",	0.0,		1000.0,			220.0 , 0,			0,				GROUP_SET_EQPPARA,0x5009, FLOAT_R},
@@ -983,7 +980,7 @@ const  TSETTABLE tSwSetTable[]=
 #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_ZHUHAI_V2 || defined GD_AREA_MAIN_2020 || defined GD_AREA_ECZD_2020  //珠海局要求告警+跳闸两个选项     广东标准2020要求告警+跳闸两个选项
+#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},
 #elif defined GD_AREA_GUANGZHOU_FTU
@@ -1317,11 +1314,7 @@ const  TSETTABLE tSwSetTable[]=
 		{SETTYPE_LIST,	SET_NULL,	"合到故障主动跳闸", 		0 , 		TTListNum-1,		1,		TTList,		TTListNum,		GROUP_SET_FATT,0, BOOL_R},	
 	#endif
 #else //非2020二次指导意见 2020-9-8
-	#if defined GD_AREA_ZHUHAI_V2 
-		{SETTYPE_LIST,	SET_NULL,	"不依赖通信/依赖通信模式", 			1 , 		TFA_TypeNum-1,	1,		TFA_Type,	TFA_TypeNum,	GROUP_SET_FATT,0x500B, UINT_R},
-	#else
 		{SETTYPE_LIST,	SET_NULL,	"通信模式", 			1 , 		TFA_TypeNum-1,	1,		TFA_Type,	TFA_TypeNum,	GROUP_SET_FATT,0x500B, UINT_R},
-	#endif
 	#ifndef GD_AREA_HEYUAN_2021
 		#if defined GD_AREA_SHANWEI_2021
 		{SETTYPE_LIST,	SET_NULL,	"分段/联络模式", 			0 , 		KGFunListNum-1,	1,		KGFunList,	KGFunListNum,	GROUP_SET_FATT,0x500C, UINT_R},
@@ -1334,11 +1327,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_V2
-		{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},
 	#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},
@@ -1650,16 +1638,7 @@ const  TSETTABLE tSwSetTable[]=
 		{SETTYPE_LIST,	SET_NULL,	"电流型软压板", 	0 , 		TTListNum-1,		1,		TTList, 	TTListNum,		GROUP_SET_YB,0X5025, BOOL_R},
 		//中山局扩展
 		{SETTYPE_LIST,	SET_NULL,	"保护出口投入软压板",		0 , 		TTListNum-1,		1,		TTList, 	TTListNum,		GROUP_SET_YB,0X5023, BOOL_R},
-		{SETTYPE_LIST,	SET_NULL,	"保护投入软压板",	0 , 		TTListNum-1,		1,		TTList, 	TTListNum,		GROUP_SET_YB,0X5026, BOOL_R},		
-	#elif defined GD_AREA_ZHUHAI_V2
-		{SETTYPE_LIST,	SET_NULL,	"远方修改定值软压板",		0 , 		TTListNum-1,		1,		TTList,		TTListNum,		GROUP_SET_YB,0X5025, BOOL_R},
-		{SETTYPE_LIST,	SET_NULL,	"停用重合闸软压板", 0 , 		TTListNum-1,		0,		TTList, 	TTListNum,		GROUP_SET_YB,0X5024, BOOL_R},	
-		{SETTYPE_LIST,	SET_NULL,	"常规继电保护投入软压板", 	0 , 		TTListNum-1,		1,		TTList, 	TTListNum,		GROUP_SET_YB,0X5025, BOOL_R},	
-		{SETTYPE_LIST,	SET_NULL,	"馈线自动化投入软压板", 	0 , 		TTListNum-1,		1,		TTList, 	TTListNum,		GROUP_SET_YB,0X5025, BOOL_R},
-		{SETTYPE_LIST,	SET_NULL,	"智能分布式软压板",		0 , 		TTListNum-1,		1,		TTList,		TTListNum,		GROUP_SET_YB,0X5025, BOOL_R},
-		//中山局扩展
-		{SETTYPE_LIST,	SET_NULL,	"保护出口投入软压板",		0 , 		TTListNum-1,		1,		TTList, 	TTListNum,		GROUP_SET_YB,0X5023, BOOL_R},
-		{SETTYPE_LIST,	SET_NULL,	"保护投入软压板",	0 , 		TTListNum-1,		1,		TTList, 	TTListNum,		GROUP_SET_YB,0X5026, BOOL_R},		
+		{SETTYPE_LIST,	SET_NULL,	"保护投入软压板",	0 , 		TTListNum-1,		1,		TTList, 	TTListNum,		GROUP_SET_YB,0X5026, BOOL_R},
 	#elif defined GD_AREA_SHAOGUAN	
 		{SETTYPE_LIST,	SET_NULL,	"远方投入软压板",		0 , 		TTListNum-1,		1,		TTList, 	TTListNum,		GROUP_SET_YB,0X5025, BOOL_R},
 		{SETTYPE_LIST,	SET_NULL,	"功能总投入软压板",	0 , 		TTListNum-1,		1,		TTList, 	TTListNum,		GROUP_SET_YB,0X5026, BOOL_R},		
@@ -1929,11 +1908,7 @@ const  TSETTABLE tCstSetTable[]=   	// min       max        default
 #endif
 
 	{SETTYPE_UINT,	SET_NULL,	"直流通道数",	1, 2,		1 , 0,		0,			GROUP_CSTSET_OTHERS,0x0000, UINT_R},
-#ifdef GD_AREA_ZHUHAI_V2 	
-	{SETTYPE_LIST,	SET_NULL,	"母线侧电压选择",	0 , 	TPT_UNum-1,	0,		PUList,	TPT_UNum,	GROUP_CSTSET_OTHERS,0x0000, UINT_R},
-#else
 	{SETTYPE_LIST,	SET_NULL,	"负荷侧电压选择",	0 , 	TPT_UNum-1,	0,		PUList,	TPT_UNum,	GROUP_CSTSET_OTHERS,0x0000, UINT_R},
-#endif
 
 	{SETTYPE_LIST,	SET_NULL,	"液晶遥测数据显示", 		0 , DISPMODEListNum-1,	0,	DISPMODEList,	DISPMODEListNum,    GROUP_CSTSET_OTHERS,0x0000, UINT_R},
     {SETTYPE_LIST,	SET_NULL,	"故障事件遥信地址长度",	0 , 	AddrNumListNum-1,	0,	AddrNumList,    AddrNumListNum,     GROUP_CSTSET_OTHERS,0x0000, BOOL_R},
@@ -3281,7 +3256,7 @@ bool MakeRunSet(bool bFirst)
 #if defined GD_AREA_ZHUHAI_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//珠海局要求告警+跳闸两个选项
+#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
@@ -3314,7 +3289,7 @@ bool MakeRunSet(bool bFirst)
 #if defined GD_AREA_ZHUHAI_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//珠海局要求告警+跳闸两个选项
+#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要求告警+跳闸两个选项 跳闸包含跳闸和告警
@@ -3702,12 +3677,6 @@ bool MakeRunSet(bool bFirst)
 			ptSet->tSwSet[sw].dU_jl_dhz_fh= ptSet->tSwSet[sw].dU_jl_dhz+1310;	// 返回值小 0.02
 			ptSet->tSwSet[sw].dU_jl_lowhz_fh= ptSet->tSwSet[sw].dU_jl_lowhz+1310;	// 0.98的返回值			
 			ptSet->tSwSet[sw].dU_jl_ghz_fh=ptSet->tSwSet[sw].dU_jl_ghz-1310;	// 0.98的返回值
-
-			#ifdef GD_AREA_ZHUHAI_V2
-			if(ptSet->tSwSet[sw].dT_jl_ghz>T_40ms && ptSet->tSwSet[sw].dT_jl_ghz<T_1s*2)  ptSet->tSwSet[sw].dT_jl_ghz-=(T_25ms+T_10ms);
-			if(ptSet->tSwSet[sw].dT_jl_dhz>T_40ms && ptSet->tSwSet[sw].dT_jl_dhz<T_1s*2)  ptSet->tSwSet[sw].dT_jl_dhz-=(T_25ms+T_10ms);
-			if(ptSet->tSwSet[sw].dT_jl_lowhz>T_40ms && ptSet->tSwSet[sw].dT_jl_lowhz<T_1s*2)  ptSet->tSwSet[sw].dT_jl_lowhz-=(T_25ms+T_10ms);
-			#endif
 		}
 		ptSet->tSwSet[sw].bTT_hcbs_dy=(((WORD)psetbuf[SET_DYJL_HCBS_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false); //电压滑差投退
 		ptSet->tSwSet[sw].bTT_hcbs_hz=(((WORD)psetbuf[SET_DPJL_HCBS_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false); //频率滑差投退
@@ -4060,7 +4029,7 @@ bool MakeRunSet(bool bFirst)
 
             ptSet->bTT_TQ_YB =((WORD)psetbuf[SET_TQ_YB+sw*SW_SET_NUMBER ].ff==1 )?true:false;	 //同期合闸软压板
 
-			#if (defined BHFAGS_YB_YK || defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHUHAI_V2 || defined GD_AREA_SHAOGUAN) && !defined BH_FA_INONE_SW
+			#if (defined BHFAGS_YB_YK || defined GD_AREA_ZHONGSHAN || defined GD_AREA_SHAOGUAN) && !defined BH_FA_INONE_SW
 				#ifdef GD_TEST_2021
 					mode_total = (BYTE)(psetbuf[SET_BH_YBTT+sw*SW_SET_NUMBER ].ff + psetbuf[SET_FA_YBTT+sw*SW_SET_NUMBER ].ff + psetbuf[SET_GOOSE_YBTT+sw*SW_SET_NUMBER ].ff);
 					if(mode_total > 1){ 	 // 当前只允许一种功能模式投入运行

dtu/dtu_main_t536/app/set.h

@@ -767,15 +767,6 @@ enum
 		SET_BH_YBTT,		//电流型软压板
 		SET_KZ_OUT_YB,	//控制出口压板
 		SET_BH_YB,
-	#elif defined GD_AREA_ZHUHAI_V2
-		SET_EDIT_PAR_YB,	//远程修改定值压板
-		SET_CHZ_YB, 		//重合闸压板	
-		SET_BH_YBTT,		//电流型软压板
-		SET_FA_YBTT,		//电压电流型软压板
-		SET_GOOSE_YBTT, 	//智能分布式软压板
-		//扩展
-		SET_KZ_OUT_YB,	//控制出口压板
-		SET_BH_YB,	
 	#elif defined GD_AREA_SHAOGUAN
 		SET_EDIT_PAR_YB,	//远程修改定值压板
 		SET_BH_YB,	

dtu/dtu_main_t536/app/switch.c

@@ -100,7 +100,7 @@ const s8 *g_sw_di_name[SW_DI_NUM] =
     "开入3",
 #endif
 
-#if defined GD_AREA_ZHUHAI_V2 || defined GD_AREA_LIAONING_2021
+#if defined GD_AREA_LIAONING_2021
     "对侧开关位置",
 #else
     "开入4",
@@ -190,13 +190,7 @@ const s8 * g_sw_led_name[SW_LED_NUM]=
 	"X+Y灯",
 #if defined GD_AREA_GUANGZHOU_FTU 
 	"故障告警灯",
-#elif defined GD_AREA_ZHUHAI_V2
-	"告警灯",
 #endif
-#ifdef GD_AREA_ZHUHAI_V2    
-    "通讯异常灯"	//珠海局针对的是智能分布式通信异常
-#endif
-//#ifdef GD_AREA_ECZD_2020
 #if defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020
 	"自动解列功能灯",
 	"同期合闸功能灯",
@@ -569,41 +563,22 @@ const s8 * g_pub_led_name[PUB_LED_NUM]=
 const struct mea_desc g_pub_ac_desc[PUB_AC_NUM_ALL] =
 {
 #ifdef DISP_MEA_CN
-	#ifdef GD_AREA_ZHUHAI_V2
-		{"电缆UA1",UNIT_V100,UNIT_ANG},
-		{"电缆UB1",UNIT_V100,UNIT_ANG},
-		{"电缆UC1",UNIT_V100,UNIT_ANG},
-		{"电缆UAB1",UNIT_V100,UNIT_ANG},
-		{"电缆UBC1",UNIT_V100,UNIT_ANG},
-		{"电缆UCA1",UNIT_V100,UNIT_ANG},
-		{"母线U0 ",UNIT_V100,UNIT_ANG},
-		{"电缆US1",UNIT_V220,UNIT_ANG},
-		{"母线UA2",UNIT_V100,UNIT_ANG},
-		{"母线UB2",UNIT_V100,UNIT_ANG},
-		{"母线UC2",UNIT_V100,UNIT_ANG},
-		{"母线UAB2",UNIT_V100,UNIT_ANG},
-		{"母线UBC2",UNIT_V100,UNIT_ANG},
-		{"母线UCA2",UNIT_V100,UNIT_ANG},
-		{"电缆U0   ",UNIT_V100,UNIT_ANG},
-		{"母线US2",UNIT_V220,UNIT_ANG},
-	#else
-		{"母线UA1",UNIT_V100,UNIT_ANG},
-		{"母线UB1",UNIT_V100,UNIT_ANG},
-		{"母线UC1",UNIT_V100,UNIT_ANG},
-		{"母线UAB1",UNIT_V100,UNIT_ANG},
-		{"母线UBC1",UNIT_V100,UNIT_ANG},
-		{"母线UCA1",UNIT_V100,UNIT_ANG},
-		{"母线U01",UNIT_V100,UNIT_ANG},
-        {"母线US1",UNIT_V220,UNIT_ANG},
-		{"线路UA2",UNIT_V100,UNIT_ANG},
-		{"线路UB2",UNIT_V100,UNIT_ANG},
-		{"线路UC2",UNIT_V100,UNIT_ANG},
-		{"线路UAB2",UNIT_V100,UNIT_ANG},
-		{"线路UBC2",UNIT_V100,UNIT_ANG},
-		{"线路UCA2",UNIT_V100,UNIT_ANG},
-		{"线路U02",UNIT_V100,UNIT_ANG},
-        {"线路US2",UNIT_V220,UNIT_ANG},
-	#endif
+    {"母线UA1",UNIT_V100,UNIT_ANG},
+    {"母线UB1",UNIT_V100,UNIT_ANG},
+    {"母线UC1",UNIT_V100,UNIT_ANG},
+    {"母线UAB1",UNIT_V100,UNIT_ANG},
+    {"母线UBC1",UNIT_V100,UNIT_ANG},
+    {"母线UCA1",UNIT_V100,UNIT_ANG},
+    {"母线U01",UNIT_V100,UNIT_ANG},
+    {"母线US1",UNIT_V220,UNIT_ANG},
+    {"线路UA2",UNIT_V100,UNIT_ANG},
+    {"线路UB2",UNIT_V100,UNIT_ANG},
+    {"线路UC2",UNIT_V100,UNIT_ANG},
+    {"线路UAB2",UNIT_V100,UNIT_ANG},
+    {"线路UBC2",UNIT_V100,UNIT_ANG},
+    {"线路UCA2",UNIT_V100,UNIT_ANG},
+    {"线路U02",UNIT_V100,UNIT_ANG},
+    {"线路US2",UNIT_V220,UNIT_ANG},
 	
 	{"V_UNB1",UNIT_Per,UNIT_NULL},
 	{"V_UNB2",UNIT_Per,UNIT_NULL},

dtu/dtu_main_t536/app/switch.h

@@ -94,7 +94,7 @@ enum
     SW_DI_26,
 #endif
 
-#if defined GD_AREA_ZHUHAI_V2 || defined GD_AREA_LIAONING_2021
+#if defined GD_AREA_LIAONING_2021
     SW_DI_B_SW, // 对侧开关位置
 #else
     SW_DI_27,
@@ -181,13 +181,9 @@ enum
 	SW_LED_MODE_GOOSE,	//智能分布式
 	SW_LED_X_YT,
 
-#if defined GD_AREA_GUANGZHOU_FTU || defined GD_AREA_ZHUHAI_V2
+#if defined GD_AREA_GUANGZHOU_FTU
 	SW_LED_FAULT_GJ,//故障告警灯
 #endif
-
-#ifdef GD_AREA_ZHUHAI_V2	
-	SW_LED_COMMERR, //通讯异常
-#endif
 //#ifdef GD_AREA_ECZD_2020
 #if defined GD_AREA_ECZD_2020 || defined GD_AREA_MAIN_2020
 	SW_LED_ZDJL,	//"自动解列功能",