整理宏GD_AREA_LIAONING_2021；

dtu/dtu_main_t536/app/FA.c

@@ -501,34 +501,19 @@ static void fa_uf_set(int sw, bool bSW_LL, DWORD  dStep)
 		{
 			if(bSW_LL)
 			{
-			#ifdef GD_AREA_LIAONING_2021
-				bY1 = OverRelay(g_sw_pub.m2_max[2], pSet->dU_UF, pSet->dU_UF, 0)&&pSW->tFREQAB25ms_LCY.boolTrip&&pR->run_stu.fa_start_hz;// 电源1瞬压
-				bY2 = OverRelay(g_sw_pub.m2_max[3], pSet->dU_UF2, pSet->dU_UF2, 0)&&pSW->tFREQBC25ms_LCY.boolTrip;// 电源2瞬压
-			#else
 				bY1 = OverRelay(g_sw_pub.m2_max[2], pSet->dU_UF, pSet->dU_UF, 0)&&pSW->tFREQAB25ms_LCY.boolTrip;// 电源1瞬压
 				bY2 = OverRelay(g_sw_pub.m2_max[3], pSet->dU_UF2, pSet->dU_UF2, 0)&&pR->run_stu.fa_start_hz&&pSW->tFREQBC25ms_LCY.boolTrip;// 电源2瞬压
-			#endif
 			}
 			else
 			{
-			#ifdef GD_AREA_LIAONING_2021
-				bY1 = OverRelay(g_sw_pub.m2_max[2], pSet->dU_UF, pSet->dU_UF, 0)&&pSW->tFREQAB25ms_SCY.boolTrip&&pR->run_stu.fa_start_hz;// 电源1瞬压
-				bY2 = OverRelay(g_sw_pub.m2_max[3], pSet->dU_UF2, pSet->dU_UF2, 0)&&pSW->tFREQBC25ms_SCY.boolTrip;// 电源2瞬压
-			#else
 				bY1 = OverRelay(g_sw_pub.m2_max[2], pSet->dU_UF, pSet->dU_UF, 0)&&pSW->tFREQAB25ms_SCY.boolTrip;// 电源1瞬压
 				bY2 = OverRelay(g_sw_pub.m2_max[3], pSet->dU_UF2, pSet->dU_UF2, 0)&&pR->run_stu.fa_start_hz&&pSW->tFREQBC25ms_SCY.boolTrip;// 电源2瞬压
-			#endif
 			}
 		}
 		else
 		{
-		#ifdef GD_AREA_LIAONING_2021
-			bY1 = OverRelay(g_sw_pub.m2_max[2], pSet->dU_UF, pSet->dU_UF, 0)&&pR->run_stu.fa_start_hz;// 电源1瞬压
-			bY2 = OverRelay(g_sw_pub.m2_max[3], pSet->dU_UF2, pSet->dU_UF2, 0);// 电源2瞬压
-		#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
 		}
 	#else
 		bY1 = OverRelay(g_sw_pub.m2_max[2], pSet->dU_UF, pSet->dU_UF, 0);// 电源1瞬压
@@ -736,11 +721,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_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;
-	#endif
+    pSW->uSdhz_S.bFlag.bUABYY = pSW->tUABS25ms.boolTrip;
 		
 	if(soe_check(EV_YY_P+sw*EV_SW_NUM)!=pSW->uSdhz_S.bFlag.bUABYY)//记录SOE
 		soe_record_ev(EV_YY_P+sw*EV_SW_NUM, pSW->uSdhz_S.bFlag.bUABYY, Us1,Us2,0 ); 
@@ -776,11 +757,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_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;
-	#endif
+    pSW->uSdhz_S.bFlag.bUBCYY = pSW->tUBCS25ms.boolTrip && pR->run_stu.fa_start_hz;
 	if(soe_check(EV_YY_L+sw*EV_SW_NUM)!=pSW->uSdhz_S.bFlag.bUBCYY)//记录SOE
 		soe_record_ev(EV_YY_L+sw*EV_SW_NUM, pSW->uSdhz_S.bFlag.bUBCYY, Us1,Us2,0 ); 
 
@@ -793,14 +770,8 @@ 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_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
-		bQDD1 = LowRelay(g_sw_pub.m2_max[2], pSet->dU_fa_WY, pSet->dU_fa_WY_fh, false);
-		bQDD2 = LowRelay(g_sw_pub.m2_max[3], pSet->dU_fa_WY2, pSet->dU_fa_WY2_fh, false) || !pR->run_stu.fa_start_hz;
-	#endif
+    bQDD1 = LowRelay(g_sw_pub.m2_max[2], pSet->dU_fa_WY, pSet->dU_fa_WY_fh, false);
+    bQDD2 = LowRelay(g_sw_pub.m2_max[3], pSet->dU_fa_WY2, pSet->dU_fa_WY2_fh, false) || !pR->run_stu.fa_start_hz;
 	RunTR(&pR->tLostVot.tLostVotTime,  bQDD1 && bQDD2&&pSet->bTT_fa_Lostfz && pR->tSWST.uSWST.bFlag.bFAWL, dStep);	
 	pSW->uSdhz_S.bFlag.bPowerZ=pSW->uSdhz_L.bFlag.bPowerZ =   pR->tLostVot.tLostVotTime.boolTrip
 								&& !pSW->uSdhz_S.bFlag.bUABYY && !pSW->uSdhz_S.bFlag.bUBCYY			//两侧无压
@@ -4418,12 +4389,7 @@ static void fa_l_run(int sw, DWORD  dStep)
 	}
 	
 	RunTR(&pSW->tUABL25ms, bY1, dStep);	
-
-#ifdef GD_AREA_LIAONING_2021
-	pSW->uSdhz_L.bFlag.bUABYY = pSW->tUABL25ms.boolTrip && pR->run_stu.fa_start_hz;
-#else
 	pSW->uSdhz_L.bFlag.bUABYY = pSW->tUABL25ms.boolTrip;
-#endif
 
 	// 电源2上电合闸
 	//bY2 = OverRelay(g_sw_pub.m2_max[3], pSet->dU_fa_YY, pSet->dU_fa_YY_fh, pSW->uSdhz_L.bFlag.bUBCYY);

dtu/dtu_main_t536/app/defineSys.h

@@ -107,7 +107,6 @@
 #define GD_AREA_MAIN_2020              // 广东标准版2020
 #define GD_AREA_ECZD_2020              // 2020广东配网终端二次功能指导意见
 #define GD_AREA_ZHONGSHAN_2020         // 中山局2020要求
-#define GD_AREA_LIAONING_2021          // 辽宁供货程序(基于广东20年主线宏)
 #endif
 
 #if defined (CPU_AM335X) || defined (CPU_FUXI)
@@ -178,15 +177,6 @@
     #else
     #define VER_NUM 				    28101			// 版本号28.101	
     #endif
-
-#elif defined GD_AREA_LIAONING_2021
-	#ifdef __IEC61850_GOOSE_FUNC__
-		#define VER_NUM 					28210			// 版本号28.210
-	#else
-		#define VER_NUM 				28110			// 版本号28.110
-	#endif
-	#define MIN_SIGNAL_SAMPLE		//小信号采样
-	#define SW_AC_I0S_SAMPLE		//I0S电流采样
 	
 /*！！！！！注意！！！！！：往上↑↑↑↑↑↑↑↑地区版本定义VER_NUM不允许超29101/29201(goose)*/
 

dtu/dtu_main_t536/app/run_status.c

@@ -313,12 +313,6 @@ int run_status_init(void)
 			prun->chzyb = 1;
 		}	
 		prun->fa_start_hz = 1;
-	#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;
-		}
-	#endif
 
 		if ((short)g_sw[sw].di_cfg_index[SW_DI_KGYF] == INDEX_INVALLID)
 		{
@@ -781,14 +775,6 @@ int  run_status_check(u32 dStep)
 			ecd = &g_equ_config_di[g_sw[sw].di_cfg_index[SW_DI_JZS_TT]];
 			prun->jzs_tt = dido_di_is_on(ecd->slot,ecd->index);
 		}
-
-	#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]];
-			prun->fa_start_hz = dido_di_is_on(ecd->slot,ecd->index);
-		}
-	#endif
 		if ((short)g_sw[sw].di_cfg_index[SW_DI_KGYF] != INDEX_INVALLID)
 		{
 			ecd = &g_equ_config_di[g_sw[sw].di_cfg_index[SW_DI_KGYF]];

dtu/dtu_main_t536/app/switch.c

@@ -100,12 +100,6 @@ const s8 *g_sw_di_name[SW_DI_NUM] =
     "开入3",
 #endif
 
-#if defined GD_AREA_LIAONING_2021
-    "对侧开关位置",
-#else
-    "开入4",
-#endif
-
 #ifdef CUSTOMIZE_BZT // 备自投
     "备自投",
     "#1进线合位",

dtu/dtu_main_t536/app/switch.h

@@ -94,12 +94,6 @@ enum
     SW_DI_26,
 #endif
 
-#if defined GD_AREA_LIAONING_2021
-    SW_DI_B_SW, // 对侧开关位置
-#else
-    SW_DI_27,
-#endif
-
 #ifdef CUSTOMIZE_BZT // 备自投
     SW_DI_BZT,       // 备自投
     SW_DI_DL1_HW,    // #1进线合位