整理宏GD_AREA_JIEYANG；

dtu/dtu_main_t536/app/Appconfig.c

@@ -161,19 +161,6 @@ const SOE_DEF tAllSOE[]=
 	{0x04,		{0,			0,					0},				"分段模式"},
 	{0x04,		{0,			0,					0},				"联络模式"},
 
-#ifdef GD_AREA_JIEYANG
-	{0xD4|SOE_TYPE_DELAY_FHZ,		{EV_PARA_Ia,EV_PARA_Ib, EV_PARA_Ic},		"过流I段动作"},
-	{0x94,		{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段动作"},
-	{0x94,		{EV_PARA_Ia,EV_PARA_Ib, EV_PARA_Ic},		"过流II段告警"},
-	{0xD4|SOE_TYPE_DELAY_FHZ,		{EV_PARA_Ia,EV_PARA_Ib, EV_PARA_Ic},		"过流Ⅲ段动作"},
-	{0x94,		{EV_PARA_Ia,EV_PARA_Ib, EV_PARA_Ic},		"过流Ⅲ段告警"},
-	
-	{0xD4|SOE_TYPE_DELAY_FHZ,		{EV_PARA_I0,	EV_PARA_U0, 0}, 			"零流I段动作"},
-	{0x94,		{EV_PARA_I0,	EV_PARA_U0, 0}, 			"零流I段告警"},
-	{0xD4|SOE_TYPE_DELAY_FHZ,		{EV_PARA_I0,	EV_PARA_U0, 0}, 			"零流II段动作"},
-	{0x94,		{EV_PARA_I0,	EV_PARA_U0, 0}, 			"零流II段告警"},
-#else
 	{0xD4|SOE_TYPE_DELAY_FHZ,		{EV_PARA_Ia,EV_PARA_Ib,	EV_PARA_Ic},		"过流I段动作"},
 	{0xD4,		{EV_PARA_Ia,EV_PARA_Ib,	EV_PARA_Ic},		"过流I段告警"},
 	#ifdef EV_GL_STATR
@@ -226,7 +213,6 @@ const SOE_DEF tAllSOE[]=
 			{0x04,		{EV_PARA_U0,EV_PARA_I0,	 0}, 			"零流III段启动"},
 		#endif
 	#endif	
-#endif
 
 #if defined FUN_JDXX ||defined XDL_ZT
 	{0x84,		{EV_PARA_U0, 0, 0}, "小电流接地零压1告警"},	 
@@ -294,16 +280,12 @@ const SOE_DEF tAllSOE[]=
 #ifdef FUN_CHZ_TOPEN
 	{0x04,		{0, 			0,			0}, 			"终止重合闸过程"}, 
 #endif
-#ifdef GD_AREA_JIEYANG
-	{0xD4|SOE_TYPE_DELAY_FHZ,		{EV_PARA_U0,	EV_PARA_I0, 0}, 			"零序电压跳闸"},	
-	{0x94,		{EV_PARA_U0,	EV_PARA_I0, 0}, 			"零序电压告警"},	
-#else
+
 	{0xD4|SOE_TYPE_DELAY_FHZ,		{EV_PARA_U0,	EV_PARA_I0,	0},				"零序电压跳闸"},	
 	{0xD4,		{EV_PARA_U0,	EV_PARA_I0,	0},				"零序电压告警"},	
 	#ifdef EV_GL_STATR
 		{0x04,		{EV_PARA_U0,	EV_PARA_I0,	0},				"零序电压启动"},	
 	#endif
-#endif
 	
 	{0x44,		{0,				0,			0},				"涌流谐波闭锁"},
 #ifdef GD_AREA_ECZD_MAOMING
@@ -381,9 +363,6 @@ const SOE_DEF tAllSOE[]=
 #elif defined GD_AREA_ZHUHAI_FTU
 	{0x44,		{0,				0,			0},				"电源侧合后故障"},	
 	{0x44,		{0,				0,			0},				"负荷侧合后故障"},	
-#elif defined GD_AREA_JIEYANG
-	{0x04,		{0, 			0,			0}, 			"母线侧合后故障"},	
-	{0x04,		{0, 			0,			0}, 			"线路侧合后故障"},	
 #else
 	#ifdef GD_TEST_2021
 		{0x44,		{0,				0,			0},			"A侧合后故障"},	
@@ -416,9 +395,7 @@ const SOE_DEF tAllSOE[]=
 		{0x04,		{0,			0,				0},				"联络A侧失压合闸"},
 		{0x04,		{0,			0,				0},				"联络B侧失压合闸"},
 	#endif
-#ifdef GD_AREA_JIEYANG
-	{0x04|SOE_TYPE_DELAY_FHZ,		{EV_PARA_Us1,	EV_PARA_Us2,0}, 			"得电合闸"},
-#elif defined GD_AREA_ECZD_MAOMING
+#ifdef defined GD_AREA_ECZD_MAOMING
 	{0xC4|SOE_TYPE_DELAY_FHZ,		{EV_PARA_Us1,	EV_PARA_Us2,0}, 			"得电合闸"},
 #else
 	{0x44|SOE_TYPE_DELAY_FHZ,		{EV_PARA_Us1,	EV_PARA_Us2,0},				"得电合闸"},
@@ -432,13 +409,8 @@ const SOE_DEF tAllSOE[]=
 	{0x44,		{EV_PARA_Us1,	EV_PARA_Us2,0},				"母线侧得电合闸"},
 #endif
 
-#ifdef GD_AREA_JIEYANG
-	{0x84|SOE_TYPE_DELAY_FHZ,		{EV_PARA_Us1,	EV_PARA_Us2,0}, 			"联络合闸"},
-	{0x84|SOE_TYPE_DELAY_FHZ,		{EV_PARA_Us1,	EV_PARA_Us2,0}, 			"失电分闸"},
-#else
 	{0xC4|SOE_TYPE_DELAY_FHZ,		{EV_PARA_Us1,	EV_PARA_Us2,0}, 			"联络合闸"},
 	{0xC4|SOE_TYPE_DELAY_FHZ,		{EV_PARA_Us1,	EV_PARA_Us2,0}, 			"失电分闸"},
-#endif
 
 	{0x44,		{0, 			0,			0}, 			"联络充电完成"},
 	{0x44,		{0, 		0,				0}, 			"联络合闸成功"},
@@ -449,14 +421,6 @@ const SOE_DEF tAllSOE[]=
 	{0x44,		{0, 		0,				0}, 			"电压电流型转供电失败"},	
 #endif
 
-#ifdef GD_AREA_JIEYANG
-	{0x04,		{0, 		0,				0}, 			"手动合闸"},
-	{0x04,		{0, 		0,				0}, 			"手动分闸"},
-	{0x04,		{0, 		0,				0}, 			"开关就地合闸"},
-	{0x04,		{0, 		0,				0}, 			"开关就地分闸"},
-	{0x04,		{0, 		0,				0}, 			"遥控合闸"},
-	{0x04|SOE_TYPE_DELAY_FHZ,		{0, 		0,				0}, 			"遥控分闸"},
-#else
     #ifdef GD_AREA_MAIN_2020
 	{0x44,		{0,			0,				0},				"FA手动合闸"},
 	{0x44,		{0,			0,				0},				"FA手动分闸"},
@@ -477,15 +441,9 @@ const SOE_DEF tAllSOE[]=
 	{0x44,		{0,			0,				0},				"遥控合闸"},
 	{0x44|SOE_TYPE_DELAY_FHZ,		{0,			0,				0},				"遥控分闸"},
 	#endif
-#endif
 
 	{0x44,		{0,			0,				0},				"多次分闸闭锁合闸"},
-
-#ifdef GD_AREA_JIEYANG
-	{0x04,		{0, 		0,				0}, 					"上电拒合"},
-#else 
 	{0x44,		{0, 		0,				0}, 					"上电拒合"},
-#endif	
 
 #ifdef YK_FA_ENBLE
 	{0x44,		{0,			0,				0},				"遥控闭锁FA"},	
@@ -506,17 +464,7 @@ const SOE_DEF tAllSOE[]=
 	{0xD4,		{EV_PARA_f,	0,0},						"高频自动解列"},
 	{0xD4,		{EV_PARA_f,	0,0},						"低频自动解列"},
 
-#ifdef GD_AREA_JIEYANG
-	{0x84,		{0,0,	0}, 							"智能分布式切除动作"},
-	{0x84,		{0,0,	0}, 							"智能分布式切除成功"},
-	{0x84,		{0,0,	0}, 							"智能分布式切除失败"},
-	{0x84,		{0, 0,0},								"分布式故障隔离动作"}, 
-	{0x84,		{0, 0,0},								"分布式故障隔离成功"},
-	{0x84,		{0, 0,0},								"分布式故障隔离失败"},
-	{0x84,		{0, 0,0},								"分布式供电恢复动作"}, 
-	{0x84,		{0, 0,0},								"分布式供电恢复成功"},
-	{0x84,		{0, 0,0},								"分布式供电恢复失败"},
-#elif defined GD_AREA_ECZD_MAOMING
+#ifdef defined GD_AREA_ECZD_MAOMING
 	{0x44,		{0,0,	0}, 							"智能分布式切除动作"},
 	{0x44,		{0,0,	0}, 							"智能分布式切除成功"},
 	{0x44,		{0,0,	0}, 							"智能分布式切除失败"},
@@ -584,15 +532,9 @@ const SOE_DEF tAllSOE[]=
 #endif
 	{0x84,		{EV_PARA_I0,0,	0},						"零序电流越限告警"},
 
-#ifdef GD_AREA_JIEYANG
-	{0x04,		{0, 			0,			0}, 		"跳闸失败"},
-	{0x04,		{0, 			0,			0}, 		"合闸失败"},
-	{0x04,		{0, 			0,			0}, 		"开关拒动"},
-#else
 	{0x44,		{0,				0,			0},			"跳闸失败"},
 	{0x44,		{0,				0,			0},			"合闸失败"},
 	{0x44,		{0,				0,			0},			"开关拒动"},
-#endif
 	
 #ifdef	CUSTOMIZE_BZT //备自投
 	{0x44,	{0,	0,	0}, 			"1#开关自投跳闸"	},
@@ -659,10 +601,6 @@ const SOE_DEF tAllSOE[]=
 	{0x05,		{EV_PARA_U0,	0,			0},				"小电流零压2告警"},	
 #endif
 
-#ifdef GD_AREA_JIEYANG
-	{0x07,		{0, 0,	0}, 							"同期合闸软压板"},
-#endif
-
 #ifdef YB_STHD_CHECK
 	{0x47,		{0, 0,	0}, 							"功能总压板不一致"},    
 	{0x47,		{0, 0,	0}, 							"重合闸压板不一致"},	
@@ -738,13 +676,6 @@ const SOE_DEF tAllSOE[]=
 	{0x85,		{0,			0,			0},					"CT断线"},
 	{0x85,		{0,			0,			0},					"CT相序异常"},
 
-#ifdef GD_AREA_JIEYANG
-	{0x04,		{0, 			0,			0}, 					"自转电功能投入"},
-	{0x04,		{0, 			0,			0}, 					"分布式供电恢复未满足"},
-	{0x44,		{0, 			0,			0}, 					"分布式故障闭锁合闸"},
-	{0x44,		{0, 			0,			0}, 					"分布式分闸闭锁合闸"},
-	{0x84,		{EV_PARA_U0,	EV_PARA_I0, 0}, 			"合后零序电压告警"},	
-#else
 	{0x44,		{0, 			0,			0}, 					"自转电功能投入"},
 	{0x44,		{0, 			0,			0}, 					"分布式供电恢复未满足"},
 	{0x44,		{0, 			0,			0}, 					"分布式故障闭锁合闸"},
@@ -754,7 +685,6 @@ const SOE_DEF tAllSOE[]=
 	#else
 	{0xC4,		{EV_PARA_U0,	EV_PARA_I0,	0},				"合后零序电压告警"},
 	#endif
-#endif
 #ifdef FUNC_DRIVE
 	{0x04,		{0, 		0,			0}, 				"不停电传动软压板"},
 	{0x04,		{0, 		0,			0}, 				"传动开始"},

dtu/dtu_main_t536/app/Appconfig.h

@@ -424,10 +424,6 @@ enum
 	EV_XDL_U0GJ2,		// 小电流零压告警2
 #endif
 
-#ifdef GD_AREA_JIEYANG
-	EV_TQHZ_YBTT,               // 同期合闸软压板
-#endif
-
 #ifdef YB_STHD_CHECK
     EV_FUNALL_CHECK,            //功能总
     EV_CHZ_CHECK,               //重合闸

dtu/dtu_main_t536/app/FA.c

@@ -530,9 +530,6 @@ 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
 		}
-	#elif defined GD_AREA_JIEYANG
-		bY1 = OverRelay(g_sw_pub.m2_max[2], pSet->dU_UF, pSet->dU_UF, 0)&&pR->run_stu.fa_start_hz;
-		bY2 = OverRelay(g_sw_pub.m2_max[3], pSet->dU_UF2, pSet->dU_UF2, 0);
 	#else //GD_AREA_ZHUHAI_V2
 		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瞬压
@@ -747,7 +744,7 @@ void run_vol_refersh(int sw, DWORD  dStep)
 	pSW->uSdhz_S.bFlag.bUAB_NYY_NWY = pSW->tUABS_NYY_NWY_50ms.boolTrip;
 #endif
 
-	#if defined GD_AREA_JIEYANG || defined GD_AREA_LIAONING_2021
+	#if defined GD_AREA_LIAONING_2021
 		pSW->uSdhz_S.bFlag.bUABYY = pSW->tUABS25ms.boolTrip && pR->run_stu.fa_start_hz;
 	#else
 		pSW->uSdhz_S.bFlag.bUABYY = pSW->tUABS25ms.boolTrip;
@@ -787,7 +784,7 @@ void run_vol_refersh(int sw, DWORD  dStep)
 	RunTR(&pSW->tUBCS_NYY_NWY_50ms, bY3_n, dStep); 
 	pSW->uSdhz_S.bFlag.bUBC_NYY_NWY = pSW->tUBCS_NYY_NWY_50ms.boolTrip;
 #endif
-	#if defined GD_AREA_JIEYANG || defined GD_AREA_LIAONING_2021
+	#if defined GD_AREA_LIAONING_2021
 		pSW->uSdhz_S.bFlag.bUBCYY = pSW->tUBCS25ms.boolTrip;
 	#else
 		pSW->uSdhz_S.bFlag.bUBCYY = pSW->tUBCS25ms.boolTrip && pR->run_stu.fa_start_hz;
@@ -805,7 +802,7 @@ void run_vol_refersh(int sw, DWORD  dStep)
 	//停电时间Z
 	pR->tSWST.uSWST.bFlag.bFAWL = LowRelay(g_sw[sw].m2_max, pSet->dT_wldz,pSet->dT_wldz,false);
 
-	#if defined GD_AREA_JIEYANG || defined GD_AREA_LIAONING_2021
+	#if defined GD_AREA_LIAONING_2021
 		bQDD1 = LowRelay(g_sw_pub.m2_max[2], pSet->dU_fa_WY, pSet->dU_fa_WY_fh, false) || !pR->run_stu.fa_start_hz;
 		bQDD2 = LowRelay(g_sw_pub.m2_max[3], pSet->dU_fa_WY2, pSet->dU_fa_WY2_fh, false);	
 	#else
@@ -2152,8 +2149,6 @@ static void fa_s_status_run(int sw, DWORD  dStep)
 			}
 		#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_JIEYANG
-			if (pSW->uSdhz_S.bFlag.bPowerYY && (pSW->uSdhz_S.bFlag.bUBCYY||(pSW->uSdhz_S.bFlag.bUABYY&&pR->run_stu.fa_start_hz)))	
 		#elif 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
@@ -4231,11 +4226,9 @@ static void fa_s_run(int sw, DWORD  dStep)
 		{//解锁条件后期需更改？无闭锁直接退出？
 			if(pR->tSWST.uSWST.bFlag.bHZWZ)//当前在合位且正常运行态，直接切换至正常运行???
 			{
-			//#ifdef GD_AREA_ZHUHAI_V2//珠海要求B侧需判断对侧开关位置
-			#if	defined GD_AREA_ZHUHAI_V2 //|| defined GD_AREA_JIEYANG
+			//珠海要求B侧需判断对侧开关位置
+			#if	defined GD_AREA_ZHUHAI_V2
 				pR->tLostVot.uLostVot.bFlag.bSHWY=!(bUAB||(bUBC&&pR->run_stu.fa_start_hz));//将手合状态电压保存
-			#elif defined GD_AREA_JIEYANG
-				pR->tLostVot.uLostVot.bFlag.bSHWY=!(bUBC||(bUAB&&pR->run_stu.fa_start_hz));//将手合状态电压保存
 			#else
 				pR->tLostVot.uLostVot.bFlag.bSHWY=!(bUAB||bUBC);//将手合状态电压保存
 			#endif
@@ -4271,10 +4264,8 @@ static void fa_s_run(int sw, DWORD  dStep)
 			pSW->uSdhz_S.bFlag.bXOverUo=bU0;
 			
 		//#ifdef GD_AREA_ZHUHAI_V2//珠海要求B侧需判断对侧开关位置
-		#if	defined GD_AREA_ZHUHAI_V2 //|| defined GD_AREA_JIEYANG
+		#if	defined GD_AREA_ZHUHAI_V2
 				pR->tLostVot.uLostVot.bFlag.bSHWY=!(bUAB||(bUBC&&pR->run_stu.fa_start_hz));//将手合状态电压保存
-		#elif defined GD_AREA_JIEYANG
-				pR->tLostVot.uLostVot.bFlag.bSHWY=!(bUBC||(bUAB&&pR->run_stu.fa_start_hz));//将手合状态电压保存
 		#else
 				pR->tLostVot.uLostVot.bFlag.bSHWY=!(bUAB||bUBC);//将手合状态电压保存
 		#endif	

dtu/dtu_main_t536/app/Sys.c

@@ -329,11 +329,6 @@ void app_yb_refresh(void)
         fresh_set_soe(EV_GOOSE_YBTT, BH_GOOSE_EN(sw), 0,sw);
 #endif
 
-#ifdef GD_AREA_JIEYANG
-        //EV_TQHZ_YBTT(ͬÆÚ)
-        fresh_set_soe(EV_TQHZ_YBTT, TQ_ALL_EN(sw), 0,sw);
-#endif
-
         fresh_set_soe(EV_TQ_YBTT,TYTQ_ALL_EN(sw),0,sw);
         fresh_set_soe(EV_JL_YBTT,!JL_ALL_EN(sw),0,sw);// ×Ô¶¯½âÁÐÈíѹ°å
 	#ifdef YB_STHD_CHECK

dtu/dtu_main_t536/app/UnitsLib.c

@@ -402,10 +402,6 @@ void ProtectRelayInit(void)
 		fresh_set_soe(EV_FA_YBTT, FA_ALL_EN(sw), true,sw);
 		fresh_set_soe(EV_GOOSE_YBTT, BH_GOOSE_EN(sw), true,sw);			
 	#endif  
-	
-	#ifdef GD_AREA_JIEYANG			
-		fresh_set_soe(EV_TQHZ_YBTT, TQ_ALL_EN(sw), true,sw); 			 
-	#endif
 		fresh_set_soe(EV_TQ_YBTT,TYTQ_ALL_EN(sw),true,sw);
 		fresh_set_soe(EV_JL_YBTT,JL_ALL_EN(sw),true,sw);// ×Ô¶¯½âÁÐÈíѹ°å
 

dtu/dtu_main_t536/app/defineSys.h

@@ -100,7 +100,6 @@
 #define GD_AREA_FOS_2020      // 佛山局2020要求
 #define GD_AREA_ZHONGSHAN     // 中山局要求
 #define GD_AREA_ZHONGSHAN_FTU          // 中山FTU要求
-#define GD_AREA_JIEYANG                // 揭阳要求
 #define GD_AREA_YUNAN_LP               // 云南涞浦
 #define GD_AREA_PANYU_TEST             // 番禺测试
 #define GD_AREA_ZHUHAI_V2              // 珠海局2019_V2要求
@@ -197,15 +196,6 @@
 	#define VER_NUM			 		11101          	// 版本号11.101
 	#define GD_AREA_ZHONGSHAN						//在中山局的要求上扩展
 
-#elif defined  GD_AREA_JIEYANG	//揭阳局要求
-    #ifdef __IEC61850_GOOSE_FUNC__
-		#define VER_NUM			 		12201          // 版本号12.201
-	#else
-		#define VER_NUM 				12101			// 版本号12.101		
-	#endif
-	#define BHFAGS_YB_YK
-    #define IEC_QDS_HAVE
-
 #elif defined GD_AREA_ZHAOQING_FENGKAI	//	//肇庆封开县要求，科陆在梅州FTU基础上新增功能
 	#define VER_NUM 				13102			// 版本号13.101
 

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_JIEYANG || defined GD_AREA_LIAONING_2021
+	#if	defined GD_AREA_ZHUHAI_V2 || defined GD_AREA_LIAONING_2021
 		if ((short)g_sw[sw].di_cfg_index[SW_DI_B_SW] == INDEX_INVALLID)
 		{
 			prun->fa_start_hz = 1;
@@ -785,7 +785,7 @@ int  run_status_check(u32 dStep)
 		}
 
 	//#ifdef GD_AREA_ZHUHAI_V2
-	#if	defined GD_AREA_ZHUHAI_V2 || defined GD_AREA_JIEYANG || defined GD_AREA_LIAONING_2021
+	#if	defined GD_AREA_ZHUHAI_V2 || 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]];

dtu/dtu_main_t536/app/set.c

@@ -849,9 +849,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_JIEYANG  
-	{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},
@@ -1340,7 +1337,7 @@ const  TSETTABLE tSwSetTable[]=
 		{SETTYPE_LIST,	SET_NULL,	"分段/联络模式", 			1 , 		KGFunListNum-1,	1,		KGFunList,	KGFunListNum,	GROUP_SET_FATT,0x500C, UINT_R},
 		#endif
 	#endif
-	#if defined GD_AREA_ZHONGSHAN || defined GD_AREA_JIEYANG || defined GD_AREA_HEYUAN_2021
+	#if defined GD_AREA_ZHONGSHAN || defined GD_AREA_HEYUAN_2021
 		{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},

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_JIEYANG || defined GD_AREA_LIAONING_2021
+#if defined GD_AREA_ZHUHAI_V2 || defined GD_AREA_LIAONING_2021
     "śÔ˛ŕżŞšŘÎťÖĂ",
 #else
     "żŞČë4",

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_JIEYANG || defined GD_AREA_LIAONING_2021
+#if defined GD_AREA_ZHUHAI_V2 || defined GD_AREA_LIAONING_2021
     SW_DI_B_SW, // śÔ˛ŕżŞšŘÎťÖĂ
 #else
     SW_DI_27,