整理宏GD_AREA_FOS；

dtu/dtu_main_t536/app/Appconfig.c

@@ -465,7 +465,6 @@ const SOE_DEF tAllSOE[]=
 	{0xC4,		{0,	0,0},								"分布式供电恢复失败"},
 #endif
 
-//#if defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020
 #if defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_MAIN_2020
 	{0xD4,		{EV_PARA_Ia,EV_PARA_Ib,	EV_PARA_Ic},		"分布式过流I段跳闸"},
 	{0xD4,		{EV_PARA_Ia,EV_PARA_Ib,	EV_PARA_Ic},		"分布式过流II段跳闸"},
@@ -540,7 +539,7 @@ const SOE_DEF tAllSOE[]=
 	{0x07,		{0,	0,	0},								"保护投入软压板"},
 #endif
 
-#if  defined GD_AREA_FOS || defined GD_AREA_MAIN_2020	|| defined GD_AREA_ECZD_2020
+#if defined GD_AREA_MAIN_2020 || defined GD_AREA_ECZD_2020
 	{0x07,		{0, 0,	0}, 							"重合闸投入软压板"},
 #else
 	{0x07,		{0, 0,	0}, 							"停用重合闸软压板"},
@@ -548,7 +547,7 @@ const SOE_DEF tAllSOE[]=
 
 	{0x07,		{0,	0,	0},								"保护出口投入软压板"},
 	
-#if defined	GD_AREA_FOS	|| defined GD_AREA_ECZD_MAOMING
+#if defined GD_AREA_ECZD_MAOMING
 	{0x07,		{0, 0,	0}, 							"远方整定投入软压板"},
 #elif defined GD_AREA_ZHONGSHAN	|| defined GD_AREA_ZHONGSHAN_2020	
 	{0x07,		{0, 0,	0}, 							"远方修改定值软压板"},

dtu/dtu_main_t536/app/Appconfig.h

@@ -341,7 +341,6 @@ enum
 	EV_GOOSE_HZ_OK,		// 供电恢复成功
 	EV_GOOSE_HZ_FAIL,		// 供电恢复失败
 	EV_GOOSE_GL_TZ,			// 过流跳闸
-//#if defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020
 #if defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_MAIN_2020
 	EV_GOOSE_GL2_TZ, 		// 过流2段跳闸
 #endif

dtu/dtu_main_t536/app/FA_g.c

@@ -1064,7 +1064,6 @@ void fag_cd(int sw,DWORD dStep)  //
 	RunTR(&pcd->tWYTime, (poc->psta.bFlag.bWY1&&poc->psta.bFlag.bWY2), dStep);  //无压判断
 	pcd->sta.bFlag.bFD=(!BH_GOOSE_EN(sw))	 // 分布式退出
 			||!pSet->tGocSet.bTT_ll		//联络功能退出
-//#if defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020   //中山要求联络开关固定
 #if defined GD_AREA_ZHONGSHAN   //中山要求联络开关固定
 			||!pSet->tGocSet.bsw_ll
 #endif

dtu/dtu_main_t536/app/FA_g.h

@@ -318,7 +318,6 @@ enum
 typedef struct  TGOC_T
 {
 	UGOCDIR        psta;			// 公用动作信息
-//#if defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020
 #if defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_MAIN_2020
 	UGOCDIR        psta2;			// 过流2段用动作信息
 #endif
@@ -356,7 +355,6 @@ typedef struct  TGOC_T
 	TIMERELAY 	tlxslowTime; 		// 时间继电器
 
 
-//#if defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020
 #if defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_MAIN_2020
 
 	TIMERELAY	tgl2Fz25ms;  		// 幅值启动25ms

dtu/dtu_main_t536/app/IECComm.c

@@ -3496,7 +3496,7 @@ bool selectRunParId(WORD sw, WORD parId, BYTE *pbuf)
 	}
 #endif	
 
-#if defined  GD_AREA_FOS || defined GD_AREA_FOS_2021 || defined FOS_2021
+#if defined GD_AREA_FOS_2021 || defined FOS_2021
 	if(parId==0x5001 || parId==0x5002)//佛山局要求5001:常规继电保护模式 0x5002 常规继电保护定值区号 只读，不可更改
 		return false;
 
@@ -3652,7 +3652,7 @@ bool wirteRunParId(WORD sw, WORD parId, BYTE *pbuf,u8 ti)
 	j_forCompare += 6;
 #endif
 
-#if defined  GD_AREA_FOS || defined GD_AREA_FOS_2021 || defined FOS_2021
+#if defined GD_AREA_FOS_2021 || defined FOS_2021
 	if(parId==0x5001 || parId==0x5002)//佛山局要求5001:常规继电保护模式 0x5002 常规继电保护定值区号 只读，不可更改
 		return false;
 
@@ -3781,7 +3781,7 @@ bool readRunParId(WORD sw, WORD parId, BYTE *pbuf)
 	}
 #endif
 
-#if defined  GD_AREA_FOS || defined GD_AREA_FOS_2021  || defined FOS_2021
+#if defined GD_AREA_FOS_2021  || defined FOS_2021
     if(parId==0x5001)//佛山局要求5001:常规继电保护模式 为保护总硬件遥信,不需要配置
     {
         float2IECbuf(pbuf,(float)BH_ALL_EN(0));

dtu/dtu_main_t536/app/MmiData.c

@@ -4859,7 +4859,7 @@ static int  mmd_ChangeSection(int value)
 
 int mmd_ClearSOE(int value) /*清除事件库 */
 {
-#if defined  GD_AREA_FOS || defined GD_AREA_FOS_2021 || defined FOS_2021//佛山要求不允许本地删除记录 2020-5-14《10kV柱上断路器自动化成套设备的技术交底（2020年）2020.05.11.doc》
+#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

dtu/dtu_main_t536/app/SOE.c

@@ -841,7 +841,7 @@ void soe_record_yx(u16 code,u8 value,struct timespec * ts)
 			type--;
 		
 		//佛山局要求开关分合位为关键记录
-#if defined  GD_AREA_FOS || defined GD_AREA_FOS_2021 || defined FOS_2021
+#if defined GD_AREA_FOS_2021 || defined FOS_2021
 		if(type==SW_DI_KRHW ||type==SW_DI_KRTW)	// 跳位
 		{
 			ev->ev_type|=SOE_TYPE_VIP;

dtu/dtu_main_t536/app/Sys.c

@@ -305,9 +305,7 @@ void app_yb_refresh(void)
 		fresh_set_soe(EV_EDIT_YB, pRunSet->bTT_EDIT_YB, 0,sw); 
 
         //关联硬压板
-        // EV_CHZ_YB (重合闸)
-        //#ifdef GD_AREA_FOS
-#if defined GD_AREA_FOS || defined GD_AREA_MAIN_2020 || defined GD_AREA_ECZD_2020
+#if defined GD_AREA_MAIN_2020 || defined GD_AREA_ECZD_2020
         fresh_set_soe(EV_CHZ_YB,CHZ_ALL_EN(sw) , 0,sw);//重合闸投入
 #else
         fresh_set_soe(EV_CHZ_YB,!CHZ_ALL_EN(sw) , 0,sw);//停用重合闸

dtu/dtu_main_t536/app/UnitsLib.c

@@ -384,8 +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); 
 		
-		//#ifdef GD_AREA_FOS
-		#if defined GD_AREA_FOS || 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 || defined GD_AREA_FOS_2021
 			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

@@ -98,7 +98,6 @@
 // #define CUSTOMIZE_BZT			//定制功能-备自投
 
 #define AREA_MAIN             // 广东标准版
-#define GD_AREA_FOS           // 佛山局要求
 #define GD_AREA_FOS_2020      // 佛山局2020要求
 #define GD_AREA_ZHONGSHAN     // 中山局要求
 #define GD_AREA_ZHONGSHAN_FTU          // 中山FTU要求
@@ -159,7 +158,7 @@
 #define FUN_HMI_WATCH
 #endif
 
-// #define IEC_NOLINK_NO_CALLYX
+// #define IEC_NOLINK_NO_CALLYX // 级联无响应遥信
 
 // #define GOOSE_NETTYPE_SET   //goose网络类型设置
 
@@ -174,10 +173,6 @@
 	#define RCD_STRAN_M			/*录波传输*/
 	#define RCD_STRAN_S			/*录波传输*/
 
-#elif defined GD_AREA_FOS			//佛山局要求
-	#define VER_NUM			 		5102          	// 版本号5.102 完善101遥参
-	#define INRUSH_CURRENT_IN_DECIMALS	//涌流识别定值显示为小数并给主站送小数形式
-
 #elif defined GD_AREA_ZHONGSHAN_FTU	//中山FTU
 	#define VER_NUM			 		11101          	// 版本号11.101
 	#define GD_AREA_ZHONGSHAN						//在中山局的要求上扩展
@@ -197,13 +192,6 @@
 
 #elif defined GD_AREA_PROTECTOR		//分布式装置用作保护用
 	#define VER_NUM 				24102			// 版本号24.102
-
-#elif defined GD_AREA_FOS_2020			//佛山局要求	
-	#define VER_NUM			 		25101          	// 版本号25.101 
-	#define GD_AREA_FOS
-	#define SOE_YK_OPT
-	#define FUN_SET_CHANGE_SOE
-	#define INRUSH_CURRENT_IN_DECIMALS	//涌流识别定值显示为小数并给主站送小数形式
 	
 #elif defined GD_AREA_SHANTOU 		//汕头局
 	#define VER_NUM 				26101			// 版本号26.101	

dtu/dtu_main_t536/app/set.c

@@ -1527,12 +1527,7 @@ const  TSETTABLE tSwSetTable[]=
 	
 #ifndef GD_AREA_ECZD_2020 //2020二次指导意见将各种模式软压板分开显示 2020-9-8
 	{SETTYPE_LABEL,	SET_NULL,	"装置软压板", 			0 , 		0,				0 ,		0,			0,				GROUP_SET_YB,0X0000, NULL_R},
-	#ifdef	GD_AREA_FOS		//佛山显示启用重合闸软压板
-		{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,0X5023, BOOL_R},
-		{SETTYPE_LIST,	SET_NULL,	"保护功能投入软压板",	0 , 		TTListNum-1,		1,		TTList,		TTListNum,		GROUP_SET_YB,0X5026, BOOL_R},		
-	#elif defined GD_AREA_ZHONGSHAN
+	#ifdef GD_AREA_ZHONGSHAN
 		{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},
@@ -3344,8 +3339,6 @@ bool MakeRunSet(bool bFirst)
             poc->bTT_DIR=false; // 合环运行
 
             poc->bFA_slow=(((WORD)psetbuf[SET_GOOSE_FA_TYPE+sw*SW_SET_NUMBER ].ff==1 )?true:false);   // 速动/缓动
-//#if defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020   //中山要求联络开关固定
-//#if defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_MAIN_2020  //中山要求联络开关固定
 #if defined GD_AREA_ZHONGSHAN || defined GD_AREA_MAIN_2020  //中山要求联络开关固定
             poc->bsw_sd=(((WORD)psetbuf[SET_GOOSE_FTU_TYPE+sw*SW_SET_NUMBER ].ff==0 )?true:false);    // 首端
             poc->bsw_fz=(((WORD)psetbuf[SET_GOOSE_FTU_TYPE+sw*SW_SET_NUMBER ].ff==2 )?true:false);    // 末端
@@ -3900,7 +3893,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_FOS || defined GD_AREA_MAIN_2020 || defined GD_AREA_FOS_2021
+#if defined GD_AREA_MAIN_2020 || defined GD_AREA_FOS_2021
             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;   //停用重合闸压板

dtu/dtu_main_t536/app/set.h

@@ -739,12 +739,7 @@ enum
 
 #ifndef GD_AREA_ECZD_2020 //2020二次指导意见将各种模式软压板分开显示 2020-9-8
 	SET_LABLE_YB,		//列表名	
-	#ifdef	GD_AREA_FOS	
-		SET_EDIT_PAR_YB,	//远程修改定值压板
-		SET_CHZ_YB, 		//重合闸压板
-		SET_KZ_OUT_YB,		//控制出口压板
-		SET_BH_YB,	
-	#elif defined GD_AREA_ZHONGSHAN
+	#ifdef GD_AREA_ZHONGSHAN
 		SET_CHZ_YB, 		//重合闸压板
 		SET_EDIT_PAR_YB,	//远程修改定值压板
 		SET_GOOSE_YBTT,		//智能分布式软压板