整理宏GD_AREA_FOS_2020；

dtu/dtu_main_t536/app/Appconfig.c

@@ -815,35 +815,6 @@ const SOE_DEF tAllSOE[]=
 
 	/*遥控操作类*/
 #ifdef SOE_YK_OPT
-	#if defined GD_AREA_FOS_2020
-	{0x40,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0},		"遥控合闸预置成功"},
-	{0x40,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0},		"遥控合闸预置失败"},
-	{0x40,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0},		"遥控合闸预置超时"},
-	{0x44,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0},		"遥控合闸执行成功"},	
-	{0x44,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0},		"遥控合闸执行失败"},	
-	{0x40,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0},		"遥控合闸终止"},
-	
-	{0x40,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0},		"遥控跳闸预置成功"},
-	{0x40,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0},		"遥控跳闸预置失败"},	
-	{0x40,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0},		"遥控跳闸预置超时"},
-	{0x44,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0},		"遥控跳闸执行成功"},
-	{0x44,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0},		"遥控跳闸执行失败"},
-	{0x40,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0},		"遥控跳闸终止"},
-	#elif defined GD_AREA_FOS_2021
-	{0x40,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0},		"遥控合闸预置成功"},
-	{0x40,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0},		"遥控合闸预置失败"},
-	{0x40,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0},		"遥控合闸预置超时"},
-	{0x44,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0},		"遥控合闸执行成功(控制器)"},	
-	{0x44,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0},		"遥控合闸执行失败"},	
-	{0x40,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0},		"遥控合闸终止"},
-	
-	{0x40,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0},		"遥控跳闸预置成功"},
-	{0x40,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0},		"遥控跳闸预置失败"},	
-	{0x40,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0},		"遥控跳闸预置超时"},
-	{0x44,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0},		"遥控分闸执行成功(控制器)"},
-	{0x44,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0},		"遥控跳闸执行失败"},
-	{0x40,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0},		"遥控跳闸终止"},
-	#else
 	{0x40,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0},		"遥控合闸预置成功"},
 	{0x40,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0},		"遥控合闸预置失败"},
 	{0x40,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0},		"遥控合闸预置超时"},
@@ -857,7 +828,6 @@ const SOE_DEF tAllSOE[]=
 	{0x44,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0},		"遥控分闸执行成功"},
 	{0x44,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0},		"遥控分闸执行失败"},
 	{0x40,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0},		"遥控分闸终止"},
-	#endif
 #else
 	{0x00,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0}, 	"遥控合闸选择成功"},
 	{0x00,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0}, 	"遥控合闸选择超时"},

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 GD_AREA_FOS_2020 && !defined FUNC_JX_YX_BEFORE
+        #if !defined GD_AREA_SHANTOU && !defined FUNC_JX_YX_BEFORE
 		if(g_run_stu.bjx)
 			SIQ|=0x80;	
         #endif
@@ -1084,7 +1084,7 @@ static bool IEC101_GetYc(IEC101_DEF *pt)
 					pd[num++]=(u8)(ycvalue);				 //无符号整数
 					pd[num++]=(u8)(ycvalue>>8);				 //无符号整数
 				}
-                #if  !defined GD_AREA_SHANTOU //&& !defined GD_AREA_FOS_2020	
+                #if  !defined GD_AREA_SHANTOU	
 				if(g_run_stu.bjx)
 				{
 					QDS|=0x80;//带品质描述，有效 <1>：=无效
@@ -1677,7 +1677,7 @@ static void IEC101_CallAll(IEC101_DEF *pt,u8 QOI)		//确
 			{
 				if(pRunSet->bTT_RmtTest)QDS|=0x80;//带品质描述，有效 <1>：=无效
 			}
-        #if  !defined GD_AREA_SHANTOU && !defined GD_AREA_FOS_2020 && !defined FUNC_JX_YC_SIQ00
+        #if  !defined GD_AREA_SHANTOU && !defined FUNC_JX_YC_SIQ00
 			if(g_run_stu.bjx)
 			{
 				QDS|=0x80;//带品质描述，有效 <1>：=无效
@@ -1828,7 +1828,7 @@ static void IEC101_CallAll(IEC101_DEF *pt,u8 QOI)		//确
 			{
 				SIQ = tbl_get_yx(i,tRunPara.bDPI);
 			}
-         #if !defined GD_AREA_SHANTOU && !defined GD_AREA_FOS_2020 && !defined FUNC_JX_YX_BEFORE
+         #if !defined GD_AREA_SHANTOU && !defined FUNC_JX_YX_BEFORE
 			if(g_run_stu.bjx)
 			{
 				SIQ|=0x80;//带品质描述，有效 <1>：=无效
@@ -4029,7 +4029,7 @@ u32 IEC101_SendEvent(IEC101_DEF *pt,int is_send_cos)
 					SIQ+=1;	//转为双点信息
 				}
 
-				#if  !defined GD_AREA_SHANTOU && !defined GD_AREA_FOS_2020 && !defined FUNC_JX_YC_SIQ00
+				#if  !defined GD_AREA_SHANTOU && !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 GD_AREA_FOS_2020 && !defined FUNC_JX_YX_BEFORE
+			#if  !defined GD_AREA_SHANTOU && !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 GD_AREA_FOS_2020 && !defined FUNC_JX_YC_SIQ00
+        #if !defined GD_AREA_SHANTOU && !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 GD_AREA_FOS_2020 && !defined FUNC_JX_YX_BEFORE
+        #if !defined GD_AREA_SHANTOU && !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 GD_AREA_FOS_2020 && !defined FUNC_JX_YC_SIQ00
+        #if  !defined GD_AREA_SHANTOU && !defined FUNC_JX_YC_SIQ00
 			if(g_run_stu.bjx)
 			{
 				SIQ|=0x80;//带品质描述，有效 <1>：=无效
@@ -2293,7 +2293,7 @@ void IEC104_SendYC(IEC104_DEF *pt104)
 					*pd++=(BYTE)(ycvalue);	
 					*pd++=(BYTE)(ycvalue>>8);	
 				}	
-             #if  !defined GD_AREA_SHANTOU //&& !defined GD_AREA_FOS_2020	
+             #if  !defined GD_AREA_SHANTOU	
 				if(g_run_stu.bjx)
 				{
 					QDS|=0x80;//带品质描述，有效 <1>：=无效

dtu/dtu_main_t536/app/IECComm.c

@@ -3496,18 +3496,7 @@ bool selectRunParId(WORD sw, WORD parId, BYTE *pbuf)
 	}
 #endif	
 
-#if defined GD_AREA_FOS_2021 || defined FOS_2021
-	if(parId==0x5001 || parId==0x5002)//佛山局要求5001:常规继电保护模式 0x5002 常规继电保护定值区号 只读，不可更改
-		return false;
-
-	#ifdef FOS_2021
-		if(parId==0x5024)		//远方整定投入软压板
-		{
-			rt_printf("远方整定投入软压板不允许远方修改\r\n");
-			return false;
-		}
-	#endif
-#elif defined GD_AREA_ECZD_MAOMING
+#if defined GD_AREA_ECZD_MAOMING
 	//茂名局要求5001:定值区号 5013:常规继电保护模式/5051:电压电流型继电保护模式/508d:智能分布式保护模式/50ab:转换把手位置/504c、507e:远方整定投入软压板 只读，不可更改
 	if(parId==0x5001 || parId==0x5013 || parId==0x5051 || parId==0x508d || parId==0x50ab || parId==0x504c || parId==0x507e)
 		return false;
@@ -3652,18 +3641,7 @@ bool wirteRunParId(WORD sw, WORD parId, BYTE *pbuf,u8 ti)
 	j_forCompare += 6;
 #endif
 
-#if defined GD_AREA_FOS_2021 || defined FOS_2021
-	if(parId==0x5001 || parId==0x5002)//佛山局要求5001:常规继电保护模式 0x5002 常规继电保护定值区号 只读，不可更改
-		return false;
-
-	#ifdef FOS_2021
-		if(parId==0x5024)		//远方整定投入软压板
-		{
-			rt_printf("远方整定投入软压板不允许远方修改\r\n");
-			return false;
-		}
-	#endif
-#elif defined GD_AREA_ECZD_MAOMING
+#if defined GD_AREA_ECZD_MAOMING
 	//茂名局要求5001:定值区号 5013:常规继电保护模式/5051:电压电流型继电保护模式/508d:智能分布式保护模式/50ab:转换把手位置/504c、507e:远方整定投入软压板 只读，不可更改
 	if(parId==0x5001 || parId==0x5013 || parId==0x5051 || parId==0x508d || parId==0x50ab || parId==0x504c || parId==0x507e)
 		return false;
@@ -3781,15 +3759,7 @@ bool readRunParId(WORD sw, WORD parId, BYTE *pbuf)
 	}
 #endif
 
-#if defined GD_AREA_FOS_2021  || defined FOS_2021
-    if(parId==0x5001)//佛山局要求5001:常规继电保护模式 为保护总硬件遥信,不需要配置
-    {
-        float2IECbuf(pbuf,(float)BH_ALL_EN(0));
-        rt_free(parBuf);
-        return true;
-    }
-//茂名局要求5001:定值区号 5013:常规继电保护模式/5051:电压电流型继电保护模式/508d:智能分布式保护模式/50ab:转换把手位置 只读，不可更改
-#elif defined GD_AREA_ECZD_MAOMING
+#if defined GD_AREA_ECZD_MAOMING
 	if(parId==0x5013)
 	{
 		float2IECbuf(pbuf,(float)BH_ALL_EN(0));

dtu/dtu_main_t536/app/MmiData.c

@@ -3576,14 +3576,11 @@ bool CheckAutoSOE(void)
 
     if(g_bVipSoe_show)
     {
-
-#ifdef GD_AREA_FOS_2020
         if(g_soe_info.bDpType)
         {
             mmd_GetOpe(0);
         }
         else
-#endif
         {
         #ifdef ADD_DEBUG_RECORD_FUN
             mmd_GetDebugEvent(0);
@@ -4859,15 +4856,10 @@ static int  mmd_ChangeSection(int value)
 
 int mmd_ClearSOE(int value) /*清除事件库 */
 {
-#if defined GD_AREA_FOS_2021 || defined FOS_2021//佛山要求不允许本地删除记录 2020-5-14《10kV柱上断路器自动化成套设备的技术交底（2020年）2020.05.11.doc》
-	strcpy(m_WarningStr,"本地禁止删除记录");
-	return M_JUMP3;
-#else
 	soe_clear_ev(); 				// 清事件记录	
 	soe_record_opt(EV_CLEAR_SOE,0);
 	strcpy(m_WarningStr,"事件库清除完毕");
 	return M_JUMP3;
-#endif
 }
 
 /**************************************************************************

dtu/dtu_main_t536/app/MmiDrv.c

@@ -1199,14 +1199,12 @@ void  mmi_Menu_Task(void)
 		g_tScreen.lnMainTime=dTCounter;		
 		if(g_bVipSoe_show)
 		{
-			#ifdef GD_AREA_FOS_2020
 				if(g_soe_info.bDpType)
 				{
 					g_soe_info.bDpType=false;
 					mmi_FormsInit(82,1); 
 				}
 				else
-			#endif
 				{
 				#ifdef ADD_DEBUG_RECORD_FUN
                     mmi_FormsInit(84,1);

dtu/dtu_main_t536/app/SOE.c

@@ -840,14 +840,11 @@ void soe_record_yx(u16 code,u8 value,struct timespec * ts)
 		{			
 			type--;
 		
-		//佛山局要求开关分合位为关键记录
-#if defined GD_AREA_FOS_2021 || defined FOS_2021
-		if(type==SW_DI_KRHW ||type==SW_DI_KRTW)	// 跳位
-		{
-			ev->ev_type|=SOE_TYPE_VIP;
-		}
-#endif
-				
+            // 开关分合位为关键记录
+            if(type==SW_DI_KRHW ||type==SW_DI_KRTW)	// 跳位
+            {
+                ev->ev_type|=SOE_TYPE_VIP;
+            }	
 		}
 	}
 	
@@ -931,12 +928,10 @@ void soe_record_opt(u16 code,long v1)
 	EVENT_STRUCT *ev = &soe_get_buffer(NULL)->es_ev;
 	
 	ev->ev_type=SOE_TYPE_OPT;	
-	#ifdef GD_AREA_FOS_2020
 	if(tAllSOE[code-EV_SW_NUM*(SWITCH_NUM_MAX-1)].soe_def&0x40)  // 置关键事件标志
 	{
 		ev->ev_type|=SOE_TYPE_VIP;
 	}
-	#endif
 	ev->ev_value=1;
 	ev->ev_code=code;
 	ev->ev_arg[0]=v1;	
@@ -953,13 +948,11 @@ void soe_record_opt3(u16 code,long v1,long v2,long v3)
 {
 	EVENT_STRUCT *ev = &soe_get_buffer(NULL)->es_ev;
 	
-	ev->ev_type=SOE_TYPE_OPT;	
-	#ifdef GD_AREA_FOS_2020
+	ev->ev_type=SOE_TYPE_OPT;
 	if(tAllSOE[code-EV_SW_NUM*(SWITCH_NUM_MAX-1)].soe_def&0x40)  // 置关键事件标志
 	{
 		ev->ev_type|=SOE_TYPE_VIP;
 	}
-	#endif
 	ev->ev_value=1;
 	ev->ev_code=code;
 	ev->ev_arg[0]=v1;	
@@ -1593,9 +1586,7 @@ void soe_save(void)
 					{
 						g_soe_info.bDpNew=true;
 						g_soe_info.wDpAutoShow=tail_send.n;
-						#ifdef GD_AREA_FOS_2020
-							g_soe_info.bDpType=false;
-						#endif
+                        g_soe_info.bDpType=false;
 					}				
 					es.es_id=g_soe_info.wVipID++;					
 					g_soe_info.wVipIndex++;
@@ -1638,7 +1629,6 @@ void soe_save(void)
 			// 记录操作
 			else if(soe_type==SOE_TYPE_OPT)  
 			{
-			#ifdef GD_AREA_FOS_2020
 			    if(es.es_ev.ev_type&SOE_TYPE_VIP)
 		    	{
 					if(g_bVipSoe_show)
@@ -1648,7 +1638,6 @@ void soe_save(void)
 						g_soe_info.bDpType=true;						
 					}
 		    	}
-			#endif
 				es.es_id=g_soe_info.wOpID++;
 				
 				g_soe_info.wOpIndex++;

dtu/dtu_main_t536/app/SOE.h

@@ -168,14 +168,10 @@ typedef struct SOE_INF  //
 	// 事件显示
 	u16 	wDpAutoShow;
 	bool  	bDpNew;
-	#ifdef GD_AREA_FOS_2020
 	bool    bDpType;  //操作记录标志
-	#endif
-    //#ifdef ADD_DEBUG_RECORD_FUN	
 	u16 wDebugNumber; //调试记录数目
 	u16 wDebugIndex;   //调试记录保存位置
 	u16 wDebugID;
-    //#endif
 }SOE_INF;
 
 

dtu/dtu_main_t536/app/Sys.c

@@ -1117,7 +1117,7 @@ int _RemoteCtrl(BYTE yktype,BYTE index,BYTE ykval,WORD wID)
     //是遥控选择
 	if(yktype == YK_TYPE_SEL)
 	{
-	#if !defined GD_AREA_FOS_2020 && !defined FOS_2021 //支持多次预置，每次预置重新计时		
+	#if !defined IEC_YK_MORE_PRESET //支持多次预置，每次预置重新计时		
 		// 国网最新要求:同一点不接受多次预置，就是说连续预置的情况下，
 		// 第一次预置成功，第二次预置失败，第3次预置成功。
 		if(g_yk_info[index].yk_st!= YK_STATUS_NONE && g_yk_info[index].yk_st!= YK_STATUS_TIMEOUT)
@@ -1155,17 +1155,6 @@ int _RemoteCtrl(BYTE yktype,BYTE index,BYTE ykval,WORD wID)
 				{
 					// 远方重启
 				}
-			/*
-			#ifdef BHFA_YB_YK
-				else if((no==PUB_CHYB_HZ+1)||(no==PUB_CHYB_FZ+1)||(no == PUB_BHYB_HZ+1) || (no ==PUB_BHYB_FZ+1)||(no == PUB_KZYB_HZ+1) || (no ==PUB_KZYB_FZ+1)||
-						(no==PUB_BHYBTT_HZ+1)||(no==PUB_BHYBTT_FZ+1)||(no == PUB_FAYBTT_HZ+1) || (no ==PUB_FAYBTT_FZ+1))	//压板定值操作					    
-		    #elif defined BHFAGS_YB_YK
-				else if((no==PUB_CHYB_HZ+1)||(no==PUB_CHYB_FZ+1)||(no == PUB_BHYB_HZ+1) || (no ==PUB_BHYB_FZ+1)||(no == PUB_KZYB_HZ+1) || (no ==PUB_KZYB_FZ+1)||
-						(no==PUB_BHYBTT_HZ+1)||(no==PUB_BHYBTT_FZ+1)||(no == PUB_FAYBTT_HZ+1) || (no ==PUB_FAYBTT_FZ+1)||(no == PUB_GOOSEYBTT_HZ+1) || (no ==PUB_GOOSEYBTT_FZ+1))	//压板定值操作
-			#else
-				else if((no==PUB_CHYB_HZ+1)||(no==PUB_CHYB_FZ+1)||(no == PUB_BHYB_HZ+1) || (no ==PUB_BHYB_FZ+1)||(no == PUB_KZYB_HZ+1) || (no ==PUB_KZYB_FZ+1))//压板定值操作
-			#endif
-			*/
 			#ifdef METERING_ENERGY
 				else if(no==PUB_DD_CLR+1)
 				{
@@ -1256,11 +1245,6 @@ int _RemoteCtrl(BYTE yktype,BYTE index,BYTE ykval,WORD wID)
 				}
 				else//不是压板操作，判断软压板状态
 				{
-					// 必须是总软压板投入和对应的线路软压板投入才允许动作。
-					//if(pRunSet->tSwSet[owner-1].bTT_yf_YB==0)
-					//{
-					//	return -10;
-					//}
 					//非远方状态 ，不允许遥控
 					if(!g_run_stu.yf)   
 					{	
@@ -1456,15 +1440,6 @@ int _RemoteCtrl(BYTE yktype,BYTE index,BYTE ykval,WORD wID)
 			}
 			#endif	
 #endif
-		/*#ifdef BHFA_YB_YK
-			else if((no==PUB_CHYB_HZ+1)||(no==PUB_CHYB_FZ+1)||(no == PUB_BHYB_HZ+1) || (no ==PUB_BHYB_FZ+1)||(no == PUB_KZYB_HZ+1) || (no ==PUB_KZYB_FZ+1)||
-					(no==PUB_BHYBTT_HZ+1)||(no==PUB_BHYBTT_FZ+1)||(no == PUB_FAYBTT_HZ+1) || (no ==PUB_FAYBTT_FZ+1))	//压板定值操作			    
-	    #elif defined BHFAGS_YB_YK 
-			else if((no==PUB_CHYB_HZ+1)||(no==PUB_CHYB_FZ+1)||(no == PUB_BHYB_HZ+1) || (no ==PUB_BHYB_FZ+1)||(no == PUB_KZYB_HZ+1) || (no ==PUB_KZYB_FZ+1)||
-					(no==PUB_BHYBTT_HZ+1)||(no==PUB_BHYBTT_FZ+1)||(no == PUB_FAYBTT_HZ+1) || (no ==PUB_FAYBTT_FZ+1)||(no == PUB_GOOSEYBTT_HZ+1) || (no ==PUB_GOOSEYBTT_FZ+1))	//压板定值操作
-		#else 
-			else if((no==PUB_CHYB_HZ+1)||(no==PUB_CHYB_FZ+1)||(no == PUB_BHYB_HZ+1) || (no ==PUB_BHYB_FZ+1)||(no == PUB_KZYB_HZ+1) || (no ==PUB_KZYB_FZ+1))//压板定值操作		
-		#endif*/
 		#ifdef FUNC_DRIVE
 			else if(no==PUB_DRIVE_HZ+1)
 			{

dtu/dtu_main_t536/app/UnitsLib.c

@@ -384,7 +384,7 @@ void ProtectRelayInit(void)
 		fresh_set_soe(EV_KZ_YB, pRunSet->bTT_KZ_YB, true,sw); 	
 		fresh_set_soe(EV_EDIT_YB, pRunSet->bTT_EDIT_YB, true,sw); 
 		
-		#if defined GD_AREA_MAIN_2020 || defined GD_AREA_ECZD_2020 || defined GD_AREA_FOS_2021
+		#if defined GD_AREA_MAIN_2020 || defined GD_AREA_ECZD_2020
 			fresh_set_soe(EV_CHZ_YB,CHZ_ALL_EN(sw) , true,sw);//ÖغÏբͶÈë
 		#else
 			fresh_set_soe(EV_CHZ_YB,!CHZ_ALL_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 IEC_YK_MORE_PRESET             // 遥控多次预置
 #define DFA_MESH_ERR_SOE               // 智能分布式网线拔出报soe
 #define PRO_UZ_START_REC               // 零压启动重合器
 // #define TMP_CHIP_AHT20
@@ -98,7 +99,6 @@
 // #define CUSTOMIZE_BZT			//定制功能-备自投
 
 #define AREA_MAIN             // 广东标准版
-#define GD_AREA_FOS_2020      // 佛山局2020要求
 #define GD_AREA_ZHONGSHAN     // 中山局要求
 #define GD_AREA_ZHONGSHAN_FTU          // 中山FTU要求
 #define GD_AREA_GUANGZHOU_FTU          // 广州局要求
@@ -108,7 +108,6 @@
 #define GD_AREA_MAIN_2020_V2
 #define GD_AREA_ECZD_2020              // 2020广东配网终端二次功能指导意见
 #define GD_AREA_ZHONGSHAN_2020         // 中山局2020要求
-#define GD_AREA_FOS_2021               // 佛山21年新标准(针对环网柜)
 #define GD_AREA_ECZD_MAOMING           // 广东标准2020分支-茂名局
 #define GD_AREA_ECZD_MEIZHOU_2021      // 20二次指导意见梅州分支
 #define GD_AREA_PROTECTOR              // 分布式装置用作保护用
@@ -217,19 +216,6 @@
 		#define YB_AUTO_SELECT	//在没配置硬压板的时自动选择软压板执行
 	#endif
 
-#elif defined  GD_AREA_FOS_2021	//佛山21年新标准(针对环网柜)
-	#ifdef __IEC61850_GOOSE_FUNC__
-		#define VER_NUM 					28203			// 版本号28.203
-	#else
-		#define VER_NUM 				28103			// 版本号28.103
-	#endif
-	#define SOE_YK_OPT				//需记录遥控相关日志
-	#define FUN_SET_CHANGE_SOE		//定值修改生成SOE
-	#define FOS_2021				//佛山21年新标准
-	#define NO_SEND_YC				//检修压板投入时不发送遥测
-	#define INRUSH_CURRENT_IN_DECIMALS	//涌流识别定值显示为小数并给主站送小数形式
-	#define OCI_XB_0MS					//过流一段0ms的谐波闭锁
-
 #elif defined GD_AREA_LIAONING_2021
 	#ifdef __IEC61850_GOOSE_FUNC__
 		#define VER_NUM 					28210			// 版本号28.210

dtu/dtu_main_t536/app/set.c

@@ -1169,11 +1169,6 @@ const  TSETTABLE tSwSetTable[]=
 	{SETTYPE_F,		SET_S,		"低电压延时TUL",			0.0 , 	999.0,			95.0 ,	0,			0,				GROUP_SET_DYJL,0X0000, FLOAT_R},
 	{SETTYPE_F,		SET_PERUN,	"高电压解列UH", 			101.0 , 	134.0,			120.0 ,	0,			0,				GROUP_SET_DYJL,0X0000, FLOAT_R},
 	{SETTYPE_F,		SET_S,		"高电压延时TUH",			0.0 , 	999.0,			2.0 ,	       0,		 	0,				GROUP_SET_DYJL,0X0000, FLOAT_R},
-#elif defined GD_AREA_FOS_2021
-	{SETTYPE_F, 	SET_PERUN,	"低电压解列UL",			51.0 ,	85.0,			80.0 ,	0,			0,				GROUP_SET_DYJL,0X0000, FLOAT_R},
-	{SETTYPE_F, 	SET_S,		"低电压解列延时TUL", 		0.0 ,	999.0,			95.0 ,	0,			0,				GROUP_SET_DYJL,0X0000, FLOAT_R},
-	{SETTYPE_F, 	SET_PERUN,	"高电压解列UH",			110.0 , 	134.0,			120.0 , 0,			0,				GROUP_SET_DYJL,0X0000, FLOAT_R},
-	{SETTYPE_F, 	SET_S,		"高电压解列延时TUH", 		0.0 ,	999.0,			2.0 ,		   0,			0,				GROUP_SET_DYJL,0X0000, FLOAT_R},
 #else
 	{SETTYPE_F,		SET_PERUN,	"低电压解列UL", 			51.0 , 	99.0,			80.0 ,	0,			0,				GROUP_SET_DYJL,0X0000, FLOAT_R},
 	{SETTYPE_F,		SET_S,		"低电压解列延时TUL",			0.0 , 	999.0,			95.0 ,	0,			0,				GROUP_SET_DYJL,0X0000, FLOAT_R},
@@ -1536,23 +1531,15 @@ const  TSETTABLE tSwSetTable[]=
 		//中山局扩展
 		{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},
-	#else	
-		#ifdef GD_AREA_FOS_2021
-			{SETTYPE_LIST,	SET_NULL,	"远方整定投入软压板",		0 , 		TTListNum-1,		1,		TTList,		TTListNum,		GROUP_SET_YB,0X5025, BOOL_R},
-		#else
-			{SETTYPE_LIST,	SET_NULL,	"远方投入软压板",		0 , 		TTListNum-1,		1,		TTList,		TTListNum,		GROUP_SET_YB,0X5025, BOOL_R},
-		#endif
+	#else
+        {SETTYPE_LIST,	SET_NULL,	"远方投入软压板",		0 , 		TTListNum-1,		1,		TTList,		TTListNum,		GROUP_SET_YB,0X5025, BOOL_R},
         #ifdef GD_AREA_MAIN_2020  //广东标准2020要求重合闸投入软压板   和停用FA和保护软压板
             {SETTYPE_LIST,  SET_NULL,   "停用保护及FA功能软压板",   0 ,         TTListNum-1,        0,      TTList,     TTListNum,      GROUP_SET_YB,0X5026, BOOL_R},
         #else
             {SETTYPE_LIST,  SET_NULL,   "保护投入软压板",   0 ,         TTListNum-1,        1,      TTList,     TTListNum,      GROUP_SET_YB,0X5026, BOOL_R},
             {SETTYPE_LIST,  SET_NULL,   "停用重合闸软压板", 0 ,         TTListNum-1,        0,      TTList,     TTListNum,      GROUP_SET_YB,0X5024, BOOL_R},
         #endif
-		#ifdef GD_AREA_FOS_2021
-			{SETTYPE_LIST,  SET_NULL,   "保护投入软压板",       0 ,         TTListNum-1,        1,      TTList,     TTListNum,      GROUP_SET_YB,0X5023, BOOL_R},
-		#else
-		    {SETTYPE_LIST,  SET_NULL,   "保护出口投入软压板",       0 ,         TTListNum-1,        1,      TTList,     TTListNum,      GROUP_SET_YB,0X5023, BOOL_R},
-		#endif
+        {SETTYPE_LIST,  SET_NULL,   "保护出口投入软压板",       0 ,         TTListNum-1,        1,      TTList,     TTListNum,      GROUP_SET_YB,0X5023, BOOL_R},
         {SETTYPE_LIST,  SET_NULL,   "同期合闸软压板", 0 ,         TTListNum-1,       0,      TTList,     TTListNum,      GROUP_SET_YB,0X5025, BOOL_R},
 		#if defined BHFAGS_YB_YK && !defined BH_FA_INONE_SW
 			#ifdef GD_TEST_2021
@@ -3893,7 +3880,7 @@ bool MakeRunSet(bool bFirst)
 #endif
             ptSet->bTT_KZ_YB=((WORD)psetbuf[SET_KZ_OUT_YB+sw*SW_SET_NUMBER ].ff==1 )?true:false;
 
-#if defined GD_AREA_MAIN_2020 || defined GD_AREA_FOS_2021
+#if defined GD_AREA_MAIN_2020
             ptSet->bTT_CHZ_YB=((WORD)psetbuf[SET_CHZ_YB+sw*SW_SET_NUMBER ].ff==1 )?true:false;   //重合闸投入软压板
 #else
             ptSet->bTT_CHZ_YB=((WORD)psetbuf[SET_CHZ_YB+sw*SW_SET_NUMBER ].ff==0 )?true:false;   //停用重合闸压板