整理宏GD_AREA_ECZD_MAOMING；

dtu/dtu_main_t536/app/Appconfig.c

@@ -110,13 +110,11 @@ const char *ev_back[]=
 /***************************************************************************
 类型定义 
 Bit.7 ==1  故障记录上送
-Bit.6   ==1 作为关键记录，单独保存  by sunxi 20190925
-Bit.5  备用
-Bit.4  ==1 全参数保存
-
-Bit.3  备用
-Bit.2  备用
-
+Bit.6 ==1 作为关键记录，单独保存  by sunxi 20190925
+Bit.5 备用
+Bit.4 ==1 全参数保存
+Bit.3 备用
+Bit.2 备用
 Bit.[10]  事件返回后,显示描述的索引
 索引定义:
 {
@@ -141,12 +139,7 @@ const SOE_DEF tAllSOE[]=
 /*    代码         类型          参数1    参数2    参数3        名称            */
 /*保护专用事件*/
 	// 开关事件
-
-#ifdef GD_AREA_ECZD_MAOMING
-	{0x84,		{0,			0,					0},				"保护动作总"},
-#else
 	{0x04,		{0,			0,					0},				"保护动作总"},
-#endif
 	{0x04,		{0,			0,					0},				"故障总"},
 	{0x04,		{0,			0,					0},				"短路故障"},
 	{0x04,		{0,			0,					0},				"接地故障"},
@@ -252,17 +245,10 @@ const SOE_DEF tAllSOE[]=
 	{0x04,		{EV_PARA_U0,EV_PARA_I0,		0},				"接地过流启动"},
 #endif
 
-#ifdef GD_AREA_ECZD_MAOMING
-	{0x80,		{0, 			0,			0}, 			"重合闸启动"},
-	{0xC4|SOE_TYPE_DELAY_FHZ,		{0, 			0,			0}, 			"一次重合动作"},
-	{0xC4|SOE_TYPE_DELAY_FHZ,		{0, 			0,			0}, 			"二次重合动作"},
-	{0xC4|SOE_TYPE_DELAY_FHZ,		{0, 			0,			0}, 			"三次重合动作"},
-#else
 	{0x00,		{0,				0,			0},				"重合闸启动"},
 	{0x44|SOE_TYPE_DELAY_FHZ,		{0,				0,			0},				"一次重合动作"},
 	{0x44|SOE_TYPE_DELAY_FHZ,		{0,				0,			0},				"二次重合动作"},
 	{0x44|SOE_TYPE_DELAY_FHZ,		{0,				0,			0},				"三次重合动作"},
-#endif
 	{0x44,		{0,				0,			0},				"重合闸闭锁"},	
 	
 	{0x44,		{0, 			0,			0}, 			"大电流闭锁重合闸"},	
@@ -282,11 +268,7 @@ const SOE_DEF tAllSOE[]=
 	#endif
 	
 	{0x44,		{0,				0,			0},				"涌流谐波闭锁"},
-#ifdef GD_AREA_ECZD_MAOMING
-	{0xC4,		{0,				0,			0},				"闭锁合闸"},
-#else
 	{0x44,		{0,				0,			0},				"闭锁合闸"},
-#endif
 
 #ifdef defined GD_AREA_ZHUHAI_FTU
 	{0x84,		{EV_PARA_Us1,	EV_PARA_Us2,0},				"电源侧有压"},
@@ -299,20 +281,9 @@ const SOE_DEF tAllSOE[]=
 	{0x44,		{0,				0,			0},				"电源侧残压闭锁"},
 	{0x44,		{0,				0,			0},				"负荷侧残压闭锁"},
 #else
-	#ifdef GD_AREA_ECZD_MAOMING
 	{0x04,		{EV_PARA_Us1,	EV_PARA_Us2,0},				"母线侧有压"},
 	{0x04,		{EV_PARA_Us1,	EV_PARA_Us2,0},				"线路侧有压"},
 	{0x04,		{EV_PARA_Us1,	EV_PARA_Us2,0},				"双侧失压"},
-	#else
-		#ifdef GD_TEST_2021
-			{0x84,		{EV_PARA_Us1,	EV_PARA_Us2,0},			"A侧有压"},
-			{0x84,		{EV_PARA_Us1,	EV_PARA_Us2,0},			"B侧有压"},
-		#else
-			{0x84,		{EV_PARA_Us1,	EV_PARA_Us2,0},			"母线侧有压"},
-			{0x84,		{EV_PARA_Us1,	EV_PARA_Us2,0},			"线路侧有压"},
-		#endif
-		{0x84,		{EV_PARA_Us1,	EV_PARA_Us2,0},				"双侧失压"},
-	#endif
 
 	#ifdef GD_TEST_2021
 		{0x44,		{0,				0,			0},				"A侧X闭锁"},
@@ -354,11 +325,7 @@ const SOE_DEF tAllSOE[]=
 	#endif
 #endif
 
-#ifdef GD_AREA_ECZD_MAOMING
-	{0xC4,		{0,				0,			0},				"闭锁失压分闸"},	
-#else
 	{0x44,		{0,				0,			0},				"闭锁失压分闸"},	
-#endif
 
 	{0x04,		{0,				0,			0},				"合闸解锁"},
 	{0x04,		{0,				0,			0},				"人工解锁"},
@@ -376,11 +343,7 @@ const SOE_DEF tAllSOE[]=
 		{0x04,		{0,			0,				0},				"联络A侧失压合闸"},
 		{0x04,		{0,			0,				0},				"联络B侧失压合闸"},
 	#endif
-#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},				"得电合闸"},
-#endif
 	{0x04,		{EV_PARA_Us1,	EV_PARA_Us2,0}, 			"母线侧得电合闸"},
 	{0x04,		{EV_PARA_Us1,	EV_PARA_Us2,0},				"线路侧得电合闸"},
 
@@ -404,13 +367,8 @@ const SOE_DEF tAllSOE[]=
 	{0x44,		{0,			0,				0},				"FA遥控合闸"},
 	{0x44|SOE_TYPE_DELAY_FHZ,		{0,			0,				0},				"FA遥控分闸"},
 	#else
-	#ifdef GD_AREA_ECZD_MAOMING
-	{0xC4,		{0,			0,				0},				"手动合闸"},
-	{0xC4,		{0,			0,				0},				"手动分闸"},
-	#else
 	{0x44,		{0,			0,				0},				"手动合闸"},
 	{0x44,		{0,			0,				0},				"手动分闸"},
-	#endif
 	{0x44,		{0,			0,				0},				"开关就地合闸"},
 	{0x44,		{0,			0,				0},				"开关就地分闸"},
 	{0x44,		{0,			0,				0},				"遥控合闸"},
@@ -439,18 +397,6 @@ const SOE_DEF tAllSOE[]=
 	{0xD4,		{EV_PARA_f,	0,0},						"高频自动解列"},
 	{0xD4,		{EV_PARA_f,	0,0},						"低频自动解列"},
 
-#ifdef defined GD_AREA_ECZD_MAOMING
-	{0x44,		{0,0,	0}, 							"智能分布式切除动作"},
-	{0x44,		{0,0,	0}, 							"智能分布式切除成功"},
-	{0x44,		{0,0,	0}, 							"智能分布式切除失败"},
-	{0x44,		{0, 0,0},								"分布式故障隔离动作"}, 
-	{0x44,		{0, 0,0},								"分布式故障隔离成功"},
-	{0x44,		{0, 0,0},								"分布式故障隔离失败"},
-	{0x44,		{0, 0,0},								"分布式供电恢复动作"}, 
-	{0x44,		{0, 0,0},								"分布式供电恢复成功"},
-	{0x44,		{0, 0,0},								"分布式供电恢复失败"},
-
-#else
 	{0xC4,		{0,0,	0},								"智能分布式切除动作"},
 	{0xC4,		{0,0,	0},								"智能分布式切除成功"},
 	{0xC4,		{0,0,	0},								"智能分布式切除失败"},
@@ -460,7 +406,6 @@ const SOE_DEF tAllSOE[]=
 	{0xC4,		{0,	0,0},								"分布式供电恢复动作"},	
 	{0xC4,		{0,	0,0},								"分布式供电恢复成功"},
 	{0xC4,		{0,	0,0},								"分布式供电恢复失败"},
-#endif
 
 #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段跳闸"},
@@ -544,9 +489,7 @@ const SOE_DEF tAllSOE[]=
 
 	{0x07,		{0,	0,	0},								"保护出口投入软压板"},
 	
-#if defined GD_AREA_ECZD_MAOMING
-	{0x07,		{0, 0,	0}, 							"远方整定投入软压板"},
-#elif defined GD_AREA_ZHONGSHAN	|| defined GD_AREA_ZHONGSHAN_2020	
+#if defined GD_AREA_ZHONGSHAN	|| defined GD_AREA_ZHONGSHAN_2020	
 	{0x07,		{0, 0,	0}, 							"远方修改定值软压板"},
 #else
 	{0x07,		{0,	0,	0},								"远方投入软压板"},
@@ -583,11 +526,7 @@ const SOE_DEF tAllSOE[]=
 	{0x47,		{0, 0,	0}, 							"电流型压板不一致"},
 #endif
 
-#ifdef GD_AREA_ECZD_MAOMING
-	{0x85,		{0,				0,			0},			"未储能告警"},
-#else
 	{0x05,		{0,				0,			0},			"未储能告警"},
-#endif
 	{0x45,		{0,			0,			0},				"控制回路异常"},
 	{0x05,		{0,	0,	0},			"M侧节点故障01"},
 	{0x05,		{0,	0,	0},			"M侧节点故障02"},

dtu/dtu_main_t536/app/FA.c

@@ -3772,11 +3772,7 @@ static void fa_s_run(int sw, DWORD  dStep)
 	RunTR(&pSW->tOnHW_FA_JSTime,
 								((pR->tSWST.uSWST.bFlag.bDITW && pSW->uSdhz_S.bFlag.bDBYY && (soe_check(EV_BS_DB+sw*EV_SW_NUM)==false))// 双侧有压 && 分位 && 非双电源闭锁
 							|| (pR->tSWST.uSWST.bFlag.bDIHW && pSW->uSdhz_S.bFlag.bYY))	// 有压 && 合位
-						#ifdef GD_AREA_ECZD_MAOMING
-                            && ((soe_check(EV_BS_ALL+sw*EV_SW_NUM) && soe_check(EV_BS_HA+sw*EV_SW_NUM)) || get_s_bs(pSW->S_Status) )
-                        #else
 							&& ((soe_check(EV_BS_ALL+sw*EV_SW_NUM) && !soe_check(EV_BS_HA+sw*EV_SW_NUM)) || get_s_bs(pSW->S_Status) )
-						#endif
 							&& !soe_check(EV_TZFAIL+sw*EV_SW_NUM)
 							&& b_SyFinish
 							,dStep);
@@ -3825,14 +3821,12 @@ static void fa_s_run(int sw, DWORD  dStep)
 	&& soe_check(EV_BS_UF_L+sw*EV_SW_NUM)==false 
 	&& soe_check(EV_HHGZ+sw*EV_SW_NUM)==false 
 	)
-	{//合位解锁手分闭锁合闸
-	#ifndef GD_AREA_ECZD_MAOMING
-		if(soe_check(EV_BS_HA+sw*EV_SW_NUM)&&(pSW->bDL_Hz||pR->uRmtSW.bHandHz_fa||pR->uRmtSW.bYHExecute_fa||soe_check(EV_DL_HZ+sw*EV_SW_NUM)))//手分/遥分闭锁后，再次手合/遥控合立即解锁
-		{
-			bJS = 1; 
-		}
-    #endif
-	}
+
+	//合位解锁手分闭锁合闸
+    if(soe_check(EV_BS_HA+sw*EV_SW_NUM)&&(pSW->bDL_Hz||pR->uRmtSW.bHandHz_fa||pR->uRmtSW.bYHExecute_fa||soe_check(EV_DL_HZ+sw*EV_SW_NUM)))//手分/遥分闭锁后，再次手合/遥控合立即解锁
+    {
+        bJS = 1; 
+    }
 
 #elif defined GD_AREA_ZHONGSHAN
 	RunTR(&pSW->tOnHW_FA_JSTime,

dtu/dtu_main_t536/app/IECComm.c

@@ -3496,11 +3496,7 @@ bool selectRunParId(WORD sw, WORD parId, BYTE *pbuf)
 	}
 #endif	
 
-#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;
-#elif defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_ZHONGSHAN
+#if defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_ZHONGSHAN
 /*19年中山要求5001:保护总投退 5002:电流型保护模式投退 5003:电压电流型保护模式投退 5004:智能分布式保护模式投退 5011:远方修改功能只读，不可更改
 19年中山要求5001:保护总投退 5002:电流型保护模式投退 5003:电压电流型保护模式投退 5004:智能分布式保护模式投退 5005:远方修改功能只读，不可更改*/
 	if(parId==0x5001 || parId==0x5002 || parId==0x5003 || parId==0x5004)
@@ -3641,11 +3637,7 @@ bool wirteRunParId(WORD sw, WORD parId, BYTE *pbuf,u8 ti)
 	j_forCompare += 6;
 #endif
 
-#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;
-#elif defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_ZHONGSHAN
+#if defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_ZHONGSHAN
 /*19年中山要求5001:保护总投退 5002:电流型保护模式投退 5003:电压电流型保护模式投退 5004:智能分布式保护模式投退 5011:远方修改功能只读，不可更改
 19年中山要求5001:保护总投退 5002:电流型保护模式投退 5003:电压电流型保护模式投退 5004:智能分布式保护模式投退 5005:远方修改功能只读，不可更改*/
 	if(parId==0x5001 || parId==0x5002 || parId==0x5003 || parId==0x5004)
@@ -3730,7 +3722,7 @@ bool readRunParId(WORD sw, WORD parId, BYTE *pbuf)
 {
 	int parTable=0;
 	SET_VALUE *parBuf;
-#if defined GD_AREA_ECZD_MAOMING || defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020
+#if defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020
 	SET_VALUE *pparaBuf;
 #endif
 #ifdef FUNC_YT_HARD_YB
@@ -3749,7 +3741,7 @@ bool readRunParId(WORD sw, WORD parId, BYTE *pbuf)
 		return false;
 	}
 	
-#if defined GD_AREA_ECZD_MAOMING || defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020
+#if defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020
 	pparaBuf = rt_malloc(EQUIP_PARA_NUMBER*4);	
 	if(!pparaBuf)
 	{
@@ -3759,53 +3751,7 @@ bool readRunParId(WORD sw, WORD parId, BYTE *pbuf)
 	}
 #endif
 
-#if defined GD_AREA_ECZD_MAOMING
-	if(parId==0x5013)
-	{
-		float2IECbuf(pbuf,(float)BH_ALL_EN(0));
-		rt_free(parBuf);
-		return true;
-	}
-	else if(parId==0x5051)
-	{
-		float2IECbuf(pbuf,(float)FA_ALL_EN(0));
-		rt_free(parBuf);
-		return true;
-	}
-	else if(parId==0x508d)
-	{
-		float2IECbuf(pbuf,(float)BH_GOOSE_EN(0));
-		rt_free(parBuf);
-		return true;
-	}
-	else if(parId==0x50ab)
-	{//转换把手位置	1：投入继电保护功能；2：投入FA功能；3：投入智能分布式FA功能；4：禁用功能
-		if(BH_ALL_EN(0))
-		{
-			float2IECbuf(pbuf,(float)1);
-			rt_free(parBuf);
-			return true;
-		}
-		else if(FA_ALL_EN(0))
-		{
-			float2IECbuf(pbuf,(float)2);
-			rt_free(parBuf);
-			return true;
-		}
-		else if(BH_GOOSE_EN(0))
-		{
-			float2IECbuf(pbuf,(float)3);
-			rt_free(parBuf);
-			return true;
-		}
-		else
-		{
-			float2IECbuf(pbuf,(float)4);
-			rt_free(parBuf);
-			return true;
-		}
-	}
-#elif defined GD_AREA_ZHONGSHAN_2020
+#if defined GD_AREA_ZHONGSHAN_2020
 	if(parId==0x5001)
 	{
 		int i;
@@ -4018,7 +3964,7 @@ bool readRunParId(WORD sw, WORD parId, BYTE *pbuf)
 		GetDefSet((float*)parBuf);
 	}
 	
-#if defined GD_AREA_ECZD_MAOMING || defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020
+#if defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020
 	if(!ReadPara((void*)pparaBuf,EEP_EQUIP_PARA_ADDR,EQUIP_PARA_NUMBER,&tEquipParaTable[0]))// 读参数
 	{
 		GetDefPara((void*)pparaBuf,EQUIP_PARA_NUMBER,&tEquipParaTable[0]);		
@@ -4060,7 +4006,7 @@ bool readRunParId(WORD sw, WORD parId, BYTE *pbuf)
 		return true;
 	}
 
-#if defined GD_AREA_ECZD_MAOMING || defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020
+#if defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020
 	parTable=getSetTableOffset(&tEquipParaTable[0],EQUIP_PARA_NUMBER,parId,SETGROUP_TYPE_PARA, false);
 	if(parTable != -1)
 	{

dtu/dtu_main_t536/app/IECComm.h

@@ -101,8 +101,6 @@ extern u8 TI_SELECT_NUM;
 #define FOS_PAR_STATR_ADDR 		0X5001	//遥参起始地址
 #if defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_ZHONGSHAN
 	#define FOS_PAR_SW_NUM 			130		//遥参单回路开关遥参数量
-#elif defined GD_AREA_ECZD_MAOMING
-	#define FOS_PAR_SW_NUM 			180		//遥参单回路开关遥参数量
 #else
 	#define FOS_PAR_SW_NUM 			50		//遥参单回路开关遥参数量
 #endif

dtu/dtu_main_t536/app/SOE.c

@@ -442,12 +442,7 @@ void soe_ext_arg(u16 index,u32 sw)
 
 	}
 	pArg->arg[11] = _Mul_Div_U(sqrt_32fix(g_ui[PUB_AC_US1].m2[0]), 256, g_ui[PUB_AC_US1].m2_factor_k);				
-	pArg->arg[12] = _Mul_Div_U(sqrt_32fix(g_ui[PUB_AC_US2].m2[0]), 256, g_ui[PUB_AC_US2].m2_factor_k);	
-
-	#ifdef GD_AREA_ECZD_MAOMING
-		pArg->arg[13] = _Mul_Div_U(sqrt_32fix(g_ui[PUB_AC_UAB2].m2[0]), 256, g_ui[PUB_AC_UAB2].m2_factor_k);
-		pArg->arg[14] = g_sw_pub.ac_in[PUB_AC_IN_UZ1];
-	#endif
+	pArg->arg[12] = _Mul_Div_U(sqrt_32fix(g_ui[PUB_AC_US2].m2[0]), 256, g_ui[PUB_AC_US2].m2_factor_k);
 	
 	pArg->type[0]=SW_AC_IA;
 	pArg->type[1]=SW_AC_IB;
@@ -476,11 +471,6 @@ void soe_ext_arg(u16 index,u32 sw)
 	pArg->type[11]=PUB_AC_US1|0x80;
 	pArg->type[12]=PUB_AC_US2|0x80;
 
-	#ifdef GD_AREA_ECZD_MAOMING
-		pArg->type[13]=PUB_AC_UAB2|0x80;
-		pArg->type[14]=PUB_AC_IN_UZ1|0x80;
-	#endif
-
 	pArg->sw=sw;
 	
 }

dtu/dtu_main_t536/app/SOE.h

@@ -19,11 +19,7 @@
 #define MAX_DEBUG_RECORD_NUMBER  MAX_VIP_NUMBER
 #endif
 
-#ifdef GD_AREA_ECZD_MAOMING
-	#define EXT_ARG_NUMBER 15
-#else
-	#define EXT_ARG_NUMBER 13
-#endif
+#define EXT_ARG_NUMBER 13
 
 // ʼþµÄÀàÐÍ
 enum  

dtu/dtu_main_t536/app/UnitsLib.c

@@ -209,8 +209,6 @@ void ProtectRelayInit(void)
 		#if defined GD_AREA_ECZD_2020
 			#if defined FUNC_SET_FA_JS
 			InitTR(&pR->tSDHZ.tOnHW_FA_JSTime, pRunSet->dT_FA_JS, 0);
-            #elif defined  GD_AREA_ECZD_MAOMING
-            InitTR(&pR->tSDHZ.tOnHW_FA_JSTime, 3*T_1s, 0);
 			#else
 			InitTR(&pR->tSDHZ.tOnHW_FA_JSTime, 5*T_10ms, 0);
 			#endif
@@ -608,8 +606,6 @@ void ProtectRelayInit1(void)
 		#if defined GD_AREA_ECZD_2020
 			#if defined FUNC_SET_FA_JS
 			    InitTR_Time(&pR->tSDHZ.tOnHW_FA_JSTime, pRunSet->dT_FA_JS, 0);
-            #elif defined  GD_AREA_ECZD_MAOMING
-                InitTR(&pR->tSDHZ.tOnHW_FA_JSTime, 3*T_1s, 0);
 			#else
 			    InitTR_Time(&pR->tSDHZ.tOnHW_FA_JSTime, 5*T_10ms, 0);
 			#endif

dtu/dtu_main_t536/app/defineSys.h

@@ -96,6 +96,7 @@
 #define PRO_AL_LOCK_HZ                 // 解列动作闭锁合闸
 #define PRO_AL_RESET_FA                // 解列动作复归FA
 #define PRO_PT_LL_NC                   // 非Fa联络 无压有流动作 PT断线告警
+#define FIXAREA_VERSION_T              // 定值区号版本2 待召唤定值区号、待执行定值区号
 // #define TMP_CHIP_AHT20
 
 //定制功能
@@ -108,7 +109,6 @@
 #define GD_AREA_MAIN_2020              // 广东标准版2020
 #define GD_AREA_ECZD_2020              // 2020广东配网终端二次功能指导意见
 #define GD_AREA_ZHONGSHAN_2020         // 中山局2020要求
-#define GD_AREA_ECZD_MAOMING           // 广东标准2020分支-茂名局
 #define GD_AREA_PROTECTOR              // 分布式装置用作保护用
 #define GD_AREA_LIAONING_2021          // 辽宁供货程序(基于广东20年主线宏)
 #endif
@@ -230,12 +230,6 @@
     #define YB_AUTO_SELECT	  // 在没配置硬压板的时自动选择软压板执行
     #define IEC_QDS_HAVE
 
-#elif defined  GD_AREA_ECZD_MAOMING	//广东二次指导意见分支-茂名局
-	#define VER_NUM 				    29102			// 版本号29.102
-	#define GEN_QUEUE	
-	#define RCD_STRAN_M			/*录波传输*/
-	#define RCD_STRAN_S			/*录波传输*/
-    #define FUNC_MODE_JS		//切换模式解除闭锁
 #elif defined  GD_AREA_ZHONGSHAN_2020	//中山局2020要求
 	#define VER_NUM 				    30103			// 版本号30.101->30.103
 	#define PUB_SET_SECTION

dtu/dtu_main_t536/app/set.c

@@ -743,7 +743,7 @@ const  TSETTABLE tPubSetTable[]=
 {
 #ifdef GD_AREA_ECZD_2020 //2020二次指导意见 2020-9-9
     {SETTYPE_LABEL, SET_NULL,	"定值区", 					0 , 		0,				0 , 	0,			0,				GROUP_SET_SCT,0X0000, NULL_R},
-    #ifdef GD_AREA_ECZD_MAOMING
+    #ifdef FIXAREA_VERSION_T
         {SETTYPE_UINT,	   SET_NULL,	  "当前定值区号", 				0.0,		SEC_NUMBER-1,				0,		0,			0,				GROUP_SET_SCT,0x5001, UINT_R},
         {SETTYPE_UINT,     SET_NULL,      "待召唤定值区号",     0.0,        SEC_NUMBER-1,      0,      0,          0,              GROUP_SET_SCT,0x0000, UINT_R},
         {SETTYPE_UINT,     SET_NULL,      "待执行定值区号",     0.0,        SEC_NUMBER-1,      0,      0,          0,              GROUP_SET_SCT,0x0000, UINT_R},
@@ -781,7 +781,7 @@ const  TSETTABLE tPubSetTable[]=
 	{SETTYPE_LABEL, SET_NULL,	"软压板", 					0 , 		0,				0 , 	0,			0,				GROUP_SET_PUBYB,0x0000, NULL_R},
 	#ifdef GD_AREA_ZHONGSHAN_2020
 		{SETTYPE_LIST,	SET_NULL,	"远方修改功能",		0 , 		TTListNum-1,		1,		TTList, 	TTListNum,		GROUP_SET_PUBYB,0x5025, BOOL_R},
-	#elif !defined GD_AREA_ECZD_MAOMING && !defined BH_FA_INONE_SW
+	#elif !defined BH_FA_INONE_SW
 		{SETTYPE_LIST,	SET_NULL,	"远方投入软压板",		0 , 		TTListNum-1,		1,		TTList, 	TTListNum,		GROUP_SET_PUBYB,0x5025, BOOL_R},
 	#endif
 	#ifdef FUNC_DRIVE
@@ -1104,9 +1104,6 @@ const  TSETTABLE tSwSetTable[]=
 
 #ifdef GD_AREA_ECZD_2020	
     {SETTYPE_LABEL,	SET_NULL,	"保护软压板", 					0 , 		0,				0 ,		0,			0,	GROUP_SET_BHYB,0X0000, NULL_R},
-    #ifdef GD_AREA_ECZD_MAOMING
-        {SETTYPE_LIST,	SET_NULL,	"远方整定投入软压板",	0 , 		TTListNum-1,		0,		TTList,		TTListNum,		GROUP_SET_BHYB,0X5024, BOOL_R},
-    #endif
     {SETTYPE_LIST,	SET_NULL,	"重合闸投入软压板",	0 , 		TTListNum-1,		0,		TTList,		TTListNum,		GROUP_SET_BHYB,0X5024, BOOL_R},
 #endif
 
@@ -1130,47 +1127,24 @@ const  TSETTABLE tSwSetTable[]=
 #endif
 
 	{SETTYPE_LABEL,	SET_NULL,	"电压解列", 					0 , 		0,				0 ,		0,			0,				GROUP_SET_DYJL,0X0000, NULL_R},
-#if defined GD_AREA_ECZD_MAOMING
-	{SETTYPE_LIST,	SET_NULL,	"电压越限解列Ku",			0 , 		TTListNum-1,		0,		TTList, 	TTListNum,		GROUP_SET_DYJL,0X0000, BOOL_R},
-#else
 	{SETTYPE_LIST,	SET_NULL,	"电压越限解列控制字Ku", 			0 , 		TTListNum-1,		0,		TTList,		TTListNum,		GROUP_SET_DYJL,0X0000, BOOL_R},
-#endif
 
 	{SETTYPE_F, 	SET_PERUN,	"电压过低解列ULL",			0.0 ,	50.0,			50.0 ,	0,			0,				GROUP_SET_DYJL,0X0000, FLOAT_R},
 	{SETTYPE_F, 	SET_S,		"电压过低延时TULL",			0.0 ,	999.0,			1.0 ,	0,			0,				GROUP_SET_DYJL,0X0000, FLOAT_R},
-#if defined GD_AREA_ECZD_MAOMING
-	{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},
-	{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},
-#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},
 	{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},	
-#endif
 
 	{SETTYPE_LIST,	SET_NULL,	"滑差闭锁低压投入", 			0 , 		TTListNum-1,		0,		TTList, 	TTListNum,		GROUP_SET_DYJL,0X0000, BOOL_R},
 	{SETTYPE_F,		SET_U_S,	"滑差闭锁低压定值",			10.0 , 	220.0,			70.0 ,	       0,		 	0,				GROUP_SET_DYJL,0X0000, FLOAT_R},
 
 	{SETTYPE_LABEL,	SET_NULL,	"频率解列", 					0 , 		0,				0 ,		0,			0,				GROUP_SET_PLJL,0X0000, NULL_R},
-#if defined GD_AREA_ECZD_MAOMING
-	{SETTYPE_LIST,	SET_NULL,	"频率越限解列Kf",			0 , 		TTListNum-1,		0,		TTList, 	TTListNum,		GROUP_SET_PLJL,0X0000, BOOL_R},
-#else
 	{SETTYPE_LIST,	SET_NULL,	"频率越限解列控制字Kf", 			0 , 		TTListNum-1,		0,		TTList,		TTListNum,		GROUP_SET_PLJL,0X0000, BOOL_R},
-#endif
-
-#ifdef GD_AREA_ECZD_MAOMING
-	{SETTYPE_F, 	SET_HZ, 	"低频解列fL",			47.1 ,	49.9,			47.6 ,	0,			0,				GROUP_SET_PLJL,0X0000, FLOAT_R},
-	{SETTYPE_F, 	SET_S,		"低频延时TfL",			0.0 ,	999.0,			2.0 ,		   0,			0,				GROUP_SET_PLJL,0X0000, FLOAT_R},
-	{SETTYPE_F, 	SET_HZ, 	"高频解列fH",			50.1 ,	55.0,			51.0 ,	0,			0,				GROUP_SET_PLJL,0X0000, FLOAT_R},
-	{SETTYPE_F, 	SET_S,		"高频延时TfH",			0.0 ,	999.0,			2.0 ,		  0,			0,				GROUP_SET_PLJL,0X0000, FLOAT_R},
-#else
 	{SETTYPE_F,		SET_HZ,		"低频解列fL", 			47.1 , 	49.9,			47.6 ,	0,			0,				GROUP_SET_PLJL,0X0000, FLOAT_R},
 	{SETTYPE_F,		SET_S,		"低频解列延时TfL",			0.0 , 	999.0,			2.0 ,	       0,			0,				GROUP_SET_PLJL,0X0000, FLOAT_R},
     {SETTYPE_F,		SET_HZ,		"高频解列fH", 			50.1 , 	55.0,			51.0 ,	0,			0,				GROUP_SET_PLJL,0X0000, FLOAT_R},
 	{SETTYPE_F,		SET_S,		"高频解列延时TfH",			0.0 , 	999.0,			2.0 ,	      0,			0,				GROUP_SET_PLJL,0X0000, FLOAT_R},
-#endif
 
 	{SETTYPE_LIST,	SET_NULL,	"滑差闭锁低频投入", 			0 , 		TTListNum-1,		0,		TTList, 	TTListNum,		GROUP_SET_PLJL,0X0000, BOOL_R},
 	{SETTYPE_F,		SET_HZ_S,	"滑差闭锁低频定值",			1.0 , 	50.0,			8.0 ,	       0,		 	0,				GROUP_SET_PLJL,0X0000, FLOAT_R},
@@ -1301,7 +1275,7 @@ const  TSETTABLE tSwSetTable[]=
         {SETTYPE_F, 	SET_U,		"合到零压保护电压定值",			0.0 ,	100.0,			20.0 ,	0,			0,				GROUP_SET_FADZ,0x0000, FLOAT_R},
         {SETTYPE_F, 	SET_S,		"合到零压保护时间定值",			0.0 ,	99.0,			0.6 ,		0,			0,				GROUP_SET_FADZ,0X0000, FLOAT_R},
     #else
-        #if defined GD_AREA_ECZD_2020 || defined GD_AREA_ECZD_MAOMING
+        #if defined GD_AREA_ECZD_2020
             #ifdef GD_AREA_ECZD_CHAOZHOU_2022
                 {SETTYPE_F, 	SET_U,		"合到零压保护电压定值",			0.0 ,	1000.0, 		20.0 ,	0,			0,				GROUP_SET_FADZ,0x0000, FLOAT_R},
             #else
@@ -1326,16 +1300,13 @@ const  TSETTABLE tSwSetTable[]=
 	#else
         {SETTYPE_F, 	SET_PER,	"涌流识别定值",			0.0 ,	100.0,			15 ,		0,			0,				GROUP_SET_FADZ,0x0000, FLOAT_R},
 	#endif
-	#if defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_ECZD_MAOMING
+	#if defined GD_AREA_ZHONGSHAN_2020
 		{SETTYPE_F, 	SET_S,		"快速跳闸延时",			0 , 		99, 			99 ,		0,			0,				GROUP_SET_FADZ,0x5026, FLOAT_R},
 	#endif
 	{SETTYPE_UINT,	SET_NULL,	"多次失压分闸闭锁次数",		1,		5,				3 , 0,		0,			GROUP_SET_FADZ,0x0000, UINT_R},
 	{SETTYPE_F, 	SET_S,		"多次失压分闸闭锁时间",		0.1 ,	65536.0,			300.0 , 	0,			0,			GROUP_SET_FADZ,0x0000, FLOAT_R},
 
 	{SETTYPE_LABEL, SET_NULL,	"电压电流型软压板", 			0 , 		0,				0 , 	0,			0,				GROUP_SET_FAYB,0X0000, NULL_R},
-	#ifdef GD_AREA_ECZD_MAOMING
-		{SETTYPE_LIST,	SET_NULL,	"远方整定投入软压板",	0 , 		TTListNum-1,		0,		TTList, 	TTListNum,		GROUP_SET_FAYB,0X5024, BOOL_R},
-	#endif
 	{SETTYPE_LIST,	SET_NULL,	"分段/联络模式软压板", 		0 , 		KGFunListNum-1, 1,		KGFunList,	KGFunListNum,	GROUP_SET_FAYB,0x500C, BOOL_R},
 #else	//非2020指导意见 2020-9-8
 	{SETTYPE_F,		SET_PERUN,	"有压定值", 					0.0 , 	100.0,			80.0 ,	0,			0,				GROUP_SET_FADZ,0x501B, FLOAT_R},
@@ -2014,17 +1985,7 @@ const int RMT_SET_TABLE_NUMBER  = sizeof( tRmtsettable ) / sizeof(tRmtsettable[0
 
 const  TFIXEDSETTABLE tfixedsettable[]=         //
 {
-#ifdef GD_AREA_ECZD_MAOMING
-	{FIXED_SET_EQU,		0x8001,	STR_R,	"D30",						"终端类型",},
-	{FIXED_SET_SYS,		0x8002,	STR_R,	"Linux 2.6.29.1",			"操作系统",},
-	{FIXED_SET_MAU,		0x50A2,	STR_R,	"",							"  制造商",},
-	{FIXED_SET_HVR,		0x50A4,	STR_R,	"HV01.02",					"硬件版本",},
-	{FIXED_SET_SVR,		0x50A5,	STR_R,	"",							"软件版本",},
-	{FIXED_SET_CRC,		0x8006,	USHORT_R,"",						"软件校验",},
-	{FIXED_SET_COM,		0x50A6,	STR_R,	"101-2016,104-2016",		"通信规约",},
-	{FIXED_SET_TPE,		0x50A3,	STR_R,	"DFTU-8000",				"出厂型号",},
-	{FIXED_SET_ID,		0x50A1,	STR_R,	"",							"终端ID号",},
-#elif defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020
+#ifdef defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020
 	{FIXED_SET_EQU, 	0x8001, STR_R,	"D30",						"终端类型",},
 	{FIXED_SET_SYS, 	0x8002, STR_R,	"Linux 2.6.29.1",			"操作系统",},
 	{FIXED_SET_MAU, 	0x5077, STR_R,	"", 						"  制造商",},
@@ -2925,7 +2886,7 @@ bool MakeRunSet(bool bFirst)
 			ptSet->bTT_SOFT_FA_YB_PUB = ((WORD)psetbuf[SET_FA_YBTT].ff==1 )?true:false;
 			ptSet->bTT_SOFT_GOOSE_YB_PUB = ((WORD)psetbuf[SET_GOOSE_YBTT].ff==1 )?true:false;
 		#endif
-		#if !defined GD_AREA_ECZD_MAOMING && !defined BH_FA_INONE_SW
+		#if !defined BH_FA_INONE_SW
 			ptSet->bTT_EDIT_YB=((WORD)psetbuf[SET_EDIT_PAR_YB].ff==1 )?true:false;
 		#endif
 		ptSet->bTT_KZ_YB=((WORD)psetbuf[SET_KZ_OUT_YB].ff==1 )?true:false; 
@@ -3539,9 +3500,6 @@ bool MakeRunSet(bool bFirst)
 
         // 配网自动化功能
         {
-		#ifdef GD_AREA_ECZD_MAOMING
-			ptSet->bTT_EDIT_YB=((WORD)psetbuf[SET_EDIT_PAR_YB1+sw*SW_SET_NUMBER ].ff==1 )?true:false || ((WORD)psetbuf[SET_EDIT_PAR_YB2+sw*SW_SET_NUMBER ].ff==1 )?true:false;
-		#endif
             ptSet->tSwSet[sw].bTT_fa_poweron    = ((DWORD)psetbuf[SET_P_YY_TT+sw*SW_SET_NUMBER ].ff==1)?true:false;
             ptSet->tSwSet[sw].bTT_fa_lineon     = ((DWORD)psetbuf[SET_L_YY_TT+sw*SW_SET_NUMBER ].ff==1)?true:false;
 		#ifdef GD_TEST_2021

dtu/dtu_main_t536/app/set.h

@@ -24,9 +24,7 @@
 */
 #define  SAM_FREQUENCY          (SAMFREQ*50) 		// 采样频率,中断计数值=时间*采样频率/1000
 
-#ifdef GD_AREA_ECZD_MAOMING
-	#define MAX_SET_NUMBER 			360		// 最大定值个数
-#elif defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020
+#ifdef defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020
 	#define MAX_SET_NUMBER 			500		// 最大定值个数
 #else
 	#define MAX_SET_NUMBER 			2000		// 最大定值个数
@@ -438,9 +436,6 @@ enum
 
 #ifdef GD_AREA_ECZD_2020	
     SET_LABLE_BHYB,		//列表名
-    #ifdef GD_AREA_ECZD_MAOMING
-        SET_EDIT_PAR_YB1,	//远方整定投入软压板
-    #endif
     SET_CHZ_YB,				//重合闸软压板
 #endif
 
@@ -547,16 +542,13 @@ enum
 	SET_FA_DLBS_I,			//非遮断电流值
 	SET_FA_XBCOE,			//涌流识别定值(谐波含量)
 	//扩展
-	#if defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_ECZD_MAOMING
+	#if defined GD_AREA_ZHONGSHAN_2020
 		SET_FA_GZTZ_T,			//快速跳闸延时
 	#endif
 	SET_HZBS_TIMES, 		//连续分闸闭锁次数
 	SET_HZBS_T, 			//连续分闸时间 
 
 	SET_LABLE_FA_YB,		//列表名
-	#ifdef GD_AREA_ECZD_MAOMING
-		SET_EDIT_PAR_YB2,
-	#endif
 	SET_SL_TT,			// 分段、联络
 #else //非2020二次指导意见 2020-9-8
 	SET_FA_TT,				//就地馈线自动化选型
@@ -847,7 +839,7 @@ enum
 #if defined GD_AREA_ECZD_2020//2020二次指导意见 2020-9-8
     SET_LABLE_SEC_SET = 0,                                          // 列表名
     SET_SECTION,                                                    // 定值区
-	#ifdef GD_AREA_ECZD_MAOMING	//茂名局增自定义定值：待召唤定值区号、待执行定值区号
+	#ifdef FIXAREA_VERSION_T	// 待召唤定值区号、待执行定值区号
     SET_SECTION_ONCALL,         // 待召唤定值区号
     SET_SECTION_ONDO,           // 待执行定值区号
 	#endif
@@ -872,7 +864,7 @@ enum
     SET_LABLE_PUBTT,    // 列表名
 
     SET_LABLE_PUBYB, // 列表名
-	#if !defined GD_AREA_ECZD_MAOMING && !defined BH_FA_INONE_SW
+	#if !defined BH_FA_INONE_SW
     SET_EDIT_PAR_YB, // 远方投入&远方修改压板
 	#endif
 	#ifdef FUNC_DRIVE