整理GD_AREA_MEIZHOU_2021宏；

dtu/dtu_main_t536/app/IECComm.c

@@ -3526,7 +3526,7 @@ bool selectRunParId(WORD sw, WORD parId, BYTE *pbuf)
 		if(parId==0x5005)
 	#endif
 			return false;
-#elif defined GD_AREA_MEIZHOU_FTU || defined GD_AREA_MEIZHOU_2021
+#elif defined GD_AREA_MEIZHOU_FTU
 	if(parId==0x5001 || parId==0x5024 || parId==0x505f || parId==0x5060
 		|| parId==0x5032 || parId==0x5033 || parId==0x5034 || parId==0x5035 || parId==0x5036
 		|| parId==0x5037 || parId==0x5038 || parId==0x5039 || parId==0x503a || parId==0x503b
@@ -3697,7 +3697,7 @@ bool wirteRunParId(WORD sw, WORD parId, BYTE *pbuf,u8 ti)
 		if(parId==0x5005)
 	#endif
 			return false;
-#elif defined GD_AREA_MEIZHOU_FTU || defined GD_AREA_MEIZHOU_2021
+#elif defined GD_AREA_MEIZHOU_FTU
 	if(parId==0x5001 || parId==0x5024 || parId==0x505f || parId==0x5060
 		|| parId==0x5032 || parId==0x5033 || parId==0x5034 || parId==0x5035 || parId==0x5036
 		|| parId==0x5037 || parId==0x5038 || parId==0x5039 || parId==0x503a || parId==0x503b
@@ -3782,7 +3782,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 || defined GD_AREA_ZHONGSHAN_2020_ZC || defined GD_AREA_MEIZHOU_FTU || defined GD_AREA_MEIZHOU_2021
+#if defined GD_AREA_ECZD_MAOMING || defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_ZHONGSHAN_2020_ZC || defined GD_AREA_MEIZHOU_FTU
 	SET_VALUE *pparaBuf;
 #endif
 #ifdef FUNC_YT_HARD_YB
@@ -3801,7 +3801,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 || defined GD_AREA_ZHONGSHAN_2020_ZC || defined GD_AREA_MEIZHOU_FTU || defined GD_AREA_MEIZHOU_2021
+#if defined GD_AREA_ECZD_MAOMING || defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_ZHONGSHAN_2020_ZC || defined GD_AREA_MEIZHOU_FTU
 	pparaBuf = rt_malloc(EQUIP_PARA_NUMBER*4);	
 	if(!pparaBuf)
 	{
@@ -3980,7 +3980,7 @@ bool readRunParId(WORD sw, WORD parId, BYTE *pbuf)
 		}
 	}
 
-#elif defined GD_AREA_MEIZHOU_FTU || defined GD_AREA_MEIZHOU_2021
+#elif defined GD_AREA_MEIZHOU_FTU
 	if(parId==0x5001)
 	{
 		float2IECbuf(pbuf,(float)BH_ALL_EN(0));
@@ -4107,7 +4107,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 || defined GD_AREA_ZHONGSHAN_2020_ZC || defined GD_AREA_MEIZHOU_FTU || defined GD_AREA_MEIZHOU_2021
+#if defined GD_AREA_ECZD_MAOMING || defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_ZHONGSHAN_2020_ZC || defined GD_AREA_MEIZHOU_FTU
 	if(!ReadPara((void*)pparaBuf,EEP_EQUIP_PARA_ADDR,EQUIP_PARA_NUMBER,&tEquipParaTable[0]))// śÁ˛ÎĘý
 	{
 		GetDefPara((void*)pparaBuf,EQUIP_PARA_NUMBER,&tEquipParaTable[0]);		
@@ -4149,7 +4149,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 || defined GD_AREA_ZHONGSHAN_2020_ZC || defined GD_AREA_MEIZHOU_FTU || defined GD_AREA_MEIZHOU_2021
+#if defined GD_AREA_ECZD_MAOMING || defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_ZHONGSHAN_2020_ZC || defined GD_AREA_MEIZHOU_FTU
 	parTable=getSetTableOffset(&tEquipParaTable[0],EQUIP_PARA_NUMBER,parId,SETGROUP_TYPE_PARA, false);
 	if(parTable != -1)
 	{

dtu/dtu_main_t536/app/IECComm.h

@@ -103,7 +103,7 @@ extern u8 TI_SELECT_NUM;
 	#define FOS_PAR_SW_NUM 			130		//遥参单回路开关遥参数量
 #elif defined GD_AREA_ECZD_MAOMING
 	#define FOS_PAR_SW_NUM 			180		//遥参单回路开关遥参数量
-#elif defined GD_AREA_MEIZHOU_FTU || defined GD_AREA_MEIZHOU_2021
+#elif defined GD_AREA_MEIZHOU_FTU
 	#define FOS_PAR_SW_NUM 			110		//遥参单回路开关遥参数量
 #else
 	#define FOS_PAR_SW_NUM 			50		//遥参单回路开关遥参数量

dtu/dtu_main_t536/app/defineSys.h

@@ -138,7 +138,6 @@
 #define GD_AREA_JIEYANG_2021           // 广东标准2020分支-揭阳
 #define GD_AREA_ECZD_MAOMING           // 广东标准2020分支-茂名局
 #define GD_AREA_DONGGUAN_2021          // 广东标准2020分支-东莞
-#define GD_AREA_MEIZHOU_2021           // 广东标准2020分支-梅州局
 #define GD_AREA_ECZD_MEIZHOU_2021      // 20二次指导意见梅州分支
 #define GD_AREA_PROTECTOR              // 分布式装置用作保护用
 #define GD_AREA_LIAONING_2021          // 辽宁供货程序(基于广东20年主线宏)
@@ -438,13 +437,6 @@
 	#define YC_QUANTITY			//每间隔遥参数量可通过内部定值设定
 	#define INRUSH_CURRENT_IN_DECIMALS	//涌流识别定值显示为小数并给主站送小数形式
 
-#elif defined  GD_AREA_MEIZHOU_2021		//广东标准2020分支-梅州局
-	#ifdef __IEC61850_GOOSE_FUNC__
-		#define VER_NUM 					28209			// 版本号28.209
-	#else
-		#define VER_NUM 				28109			// 版本号28.109
-	#endif
-
 #elif defined GD_AREA_LIAONING_2021
 	#ifdef __IEC61850_GOOSE_FUNC__
 		#define VER_NUM 					28210			// 版本号28.210

dtu/dtu_main_t536/app/set.c

@@ -782,7 +782,7 @@ const  TSETTABLE tPubSetTable[]=
 	{SETTYPE_F, 	SET_A,		"测量CT额定二次值",		0.0,		10.0,			5.0 ,		0,			0,				GROUP_SET_EQPPARA,0x5007, FLOAT_R},
 #else
     {SETTYPE_LABEL, SET_NULL,   "设备参数",                     0 ,         0,              0 ,     0,          0,              GROUP_SET_EQPPARA,0X0000, NULL_R},
-    #if defined GD_AREA_MEIZHOU_FTU || defined GD_AREA_MEIZHOU_2021
+    #if defined GD_AREA_MEIZHOU_FTU
 	    {SETTYPE_UINT,  SET_NULL,   "定值区号",                 0.0,        0.0,                0,      0,          0,              GROUP_SET_EQPPARA,0x5001, UINT_R},
 	#elif defined GD_AREA_HEYUAN_2021
 		{SETTYPE_UINT,  SET_NULL,   "定值区号",             1.0,        SEC_NUMBER-1,                1,      0,          0,              GROUP_SET_EQPPARA,0x5001, UINT_R},

dtu/dtu_main_t536/app/set.h

@@ -26,7 +26,7 @@
 
 #ifdef GD_AREA_ECZD_MAOMING
 	#define MAX_SET_NUMBER 			360		// 最大定值个数
-#elif defined GD_AREA_MEIZHOU_FTU || defined GD_AREA_MEIZHOU_2021
+#elif defined GD_AREA_MEIZHOU_FTU
 	#define MAX_SET_NUMBER 			500		// 最大定值个数
 #elif defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_ZHONGSHAN_2020_ZC
 	#define MAX_SET_NUMBER 			500		// 最大定值个数