整理宏GD_AREA_MEIZHOU_FTU；

dtu/dtu_main_t536/app/Appconfig.c

@@ -424,7 +424,7 @@ const SOE_DEF tAllSOE[]=
 	{0x44|SOE_TYPE_DELAY_FHZ,		{EV_PARA_Us1,	EV_PARA_Us2,0},				"µÃµçºÏÕ¢"},
 #endif
 
-#if defined GD_AREA_MEIZHOU_FTU	|| defined  GD_AREA_JIEYANG_FTU || defined  GD_AREA_ECZD_MEIZHOU_2021
+#if defined  GD_AREA_JIEYANG_FTU || defined  GD_AREA_ECZD_MEIZHOU_2021
 	{0x04,		{EV_PARA_Us1,	EV_PARA_Us2,0}, 			"ĸÏß²àµÃµçºÏÕ¢"},
 	{0x04,		{EV_PARA_Us1,	EV_PARA_Us2,0},				"Ïß·²àµÃµçºÏÕ¢"},
 #elif defined GD_AREA_ZHUHAI_V2

dtu/dtu_main_t536/app/Appconfig.h

@@ -291,7 +291,7 @@ enum
 	EV_L_B_LST_HZ,     			// ÁŞÂçB˛ŕʧњşĎŐ˘
 #endif
 	EV_FA_HZ,					// ľĂľçşĎŐ˘	
-#if defined GD_AREA_MEIZHOU_FTU	|| defined GD_AREA_ZHUHAI_V2 || defined  GD_AREA_JIEYANG_FTU || defined  GD_AREA_ECZD_MEIZHOU_2021
+#if defined GD_AREA_ZHUHAI_V2 || defined  GD_AREA_JIEYANG_FTU || defined  GD_AREA_ECZD_MEIZHOU_2021
 	EV_FA_HZ_L,					// ľçÔ´˛ŕľĂľçşĎŐ˘	
 	EV_FA_HZ_P,					// ¸şşÉ˛ŕľĂľçşĎŐ˘	
 #endif

dtu/dtu_main_t536/app/FA.c

@@ -3850,8 +3850,8 @@ static void fa_s_run(int sw, DWORD  dStep)
 		pR->uRmtSW.bYH_fajs_flag=false;	//状态保持合
 		pR->uBHDZ.bFlag.bTZSB=false;
 	}
-//#if defined GD_AREA_MEIZHOU_FTU || defined GD_AREA_ZHONGSHAN 
-#if defined GD_AREA_MEIZHOU_FTU
+
+#if (0)
 	// 合位 && 闭锁 && 未跳闸失败 ，则可以直接合位解锁
 	RunTR(&pSW->tOnHW_FA_JSTime,
 								pR->tSWST.uSWST.bFlag.bHZWZ 
@@ -3860,7 +3860,6 @@ static void fa_s_run(int sw, DWORD  dStep)
 							&& pSW->S_Status != S_BS_SW ,dStep);				//js时间计数
 	if(pSW->tOnHW_FA_JSTime.boolTrip)	//合位直接解锁,防止闭锁且合位无法解锁 2020-7-28	
 		pSW->bDL_Hz = true;
-		
 #elif defined GD_AREA_ECZD_2020 && !defined GD_AREA_ZHONGSHAN_2020
 	//合后故障后需等双侧完全失压才允许判解锁逻辑，
 	//因解锁时间判50ms，合后故障后50ms内有压来不及变为无压导致判定分位、双侧有压进入解锁会执行逻辑出错
@@ -4481,7 +4480,7 @@ static void fa_s_run(int sw, DWORD  dStep)
 			//rcd_start(sw,RECORD_WAVE_TYPE_TZ, RECORD_LEN_TZQD); 	//录波类型：跳闸类
 			soe_record_ev(EV_FA_HZ+sw*EV_SW_NUM, 1, Us1,Us2,0 );    
 
-		#if defined GD_AREA_MEIZHOU_FTU	|| defined GD_AREA_ZHUHAI_V2 || defined  GD_AREA_JIEYANG_FTU || defined  GD_AREA_ECZD_MEIZHOU_2021
+		#if defined GD_AREA_ZHUHAI_V2 || defined  GD_AREA_JIEYANG_FTU || defined  GD_AREA_ECZD_MEIZHOU_2021
 			if(pSW->uSdhz_S.bFlag.bPower)
 				soe_record_ev(EV_FA_HZ_L+sw*EV_SW_NUM, 1, Us1,Us2,0 ); 
 			else
@@ -4496,7 +4495,7 @@ static void fa_s_run(int sw, DWORD  dStep)
 		if(pSW->uSdhz_S.bFlag.bHZEvent) 			
 		{
 			soe_record_ev(EV_FA_HZ+sw*EV_SW_NUM, 0, 0,0,0 );   
-		#if defined GD_AREA_MEIZHOU_FTU	|| defined GD_AREA_ZHUHAI_V2 || defined  GD_AREA_JIEYANG_FTU || defined  GD_AREA_ECZD_MEIZHOU_2021
+		#if defined GD_AREA_ZHUHAI_V2 || defined  GD_AREA_JIEYANG_FTU || defined  GD_AREA_ECZD_MEIZHOU_2021
 			if(pSW->uSdhz_S.bFlag.bPower)
 				soe_record_ev(EV_FA_HZ_L+sw*EV_SW_NUM,0, 0,0,0 ); 
 			else

dtu/dtu_main_t536/app/IECComm.c

@@ -3525,14 +3525,7 @@ bool selectRunParId(WORD sw, WORD parId, BYTE *pbuf)
 	#elif defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_ZHONGSHAN_2020_ZC
 		if(parId==0x5005)
 	#endif
-			return false;
-#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
-		|| parId==0x5501 || parId==0x5502 || parId==0x5503 || parId==0x5504 || parId==0x5505
-		|| parId==0x5506 || parId==0x5507 || parId==0x5508 || parId==0x5509 || parId==0x550a)
-		return false;
+        return false;
 #elif 0
 	if(parId==0x5001)//云浮郁南要求5001:定值区号 只读，不可更改
 	{
@@ -3691,14 +3684,7 @@ bool wirteRunParId(WORD sw, WORD parId, BYTE *pbuf,u8 ti)
 	#elif defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_ZHONGSHAN_2020_ZC
 		if(parId==0x5005)
 	#endif
-			return false;
-#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
-		|| parId==0x5501 || parId==0x5502 || parId==0x5503 || parId==0x5504 || parId==0x5505
-		|| parId==0x5506 || parId==0x5507 || parId==0x5508 || parId==0x5509 || parId==0x550a)
-		return false;
+        return false;
 #endif
 
 	if(selectRunParId(sw, parId, pbuf) ==false)	return false;
@@ -3772,7 +3758,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
+#if defined GD_AREA_ECZD_MAOMING || defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_ZHONGSHAN_2020_ZC
 	SET_VALUE *pparaBuf;
 #endif
 #ifdef FUNC_YT_HARD_YB
@@ -3791,7 +3777,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
+#if defined GD_AREA_ECZD_MAOMING || defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_ZHONGSHAN_2020_ZC
 	pparaBuf = rt_malloc(EQUIP_PARA_NUMBER*4);	
 	if(!pparaBuf)
 	{
@@ -3969,21 +3955,6 @@ bool readRunParId(WORD sw, WORD parId, BYTE *pbuf)
 			}
 		}
 	}
-
-#elif defined GD_AREA_MEIZHOU_FTU
-	if(parId==0x5001)
-	{
-		float2IECbuf(pbuf,(float)BH_ALL_EN(0));
-		rt_free(parBuf);
-		return true;
-	}
-	else if(parId==0x5032)
-	{
-		float2IECbuf(pbuf,(float)FA_ALL_EN(0));
-		rt_free(parBuf);
-		return true;
-	}
-
 #endif
 
 #ifdef FUNC_YT_HARD_YB	
@@ -4097,7 +4068,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
+#if defined GD_AREA_ECZD_MAOMING || defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_ZHONGSHAN_2020_ZC
 	if(!ReadPara((void*)pparaBuf,EEP_EQUIP_PARA_ADDR,EQUIP_PARA_NUMBER,&tEquipParaTable[0]))// 读参数
 	{
 		GetDefPara((void*)pparaBuf,EQUIP_PARA_NUMBER,&tEquipParaTable[0]);		
@@ -4139,7 +4110,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
+#if defined GD_AREA_ECZD_MAOMING || defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_ZHONGSHAN_2020_ZC
 	parTable=getSetTableOffset(&tEquipParaTable[0],EQUIP_PARA_NUMBER,parId,SETGROUP_TYPE_PARA, false);
 	if(parTable != -1)
 	{

dtu/dtu_main_t536/app/IECComm.h

@@ -103,8 +103,6 @@ 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
-	#define FOS_PAR_SW_NUM 			110		//遥参单回路开关遥参数量
 #else
 	#define FOS_PAR_SW_NUM 			50		//遥参单回路开关遥参数量
 #endif

dtu/dtu_main_t536/app/defineSys.h

@@ -101,7 +101,6 @@
 #define GD_AREA_ZHONGSHAN     // 中山局要求
 #define GD_AREA_ZHONGSHAN_FTU          // 中山FTU要求
 #define GD_AREA_JIEYANG                // 揭阳要求
-#define GD_AREA_MEIZHOU_FTU            // 梅州要求
 #define GD_AREA_YUNAN_LP               // 云南涞浦
 #define GD_AREA_PANYU_TEST             // 番禺测试
 #define GD_AREA_ZHUHAI_V2              // 珠海局2019_V2要求
@@ -206,12 +205,9 @@
 	#endif
 	#define BHFAGS_YB_YK
     #define IEC_QDS_HAVE
-#elif defined  GD_AREA_MEIZHOU_FTU		//梅州局要求
-	#define VER_NUM 				13101			// 版本号13.101
 
 #elif defined GD_AREA_ZHAOQING_FENGKAI	//	//肇庆封开县要求，科陆在梅州FTU基础上新增功能
 	#define VER_NUM 				13102			// 版本号13.101
-	#define GD_AREA_MEIZHOU_FTU
 
 #elif defined  GD_AREA_YUNAN_LP	//云南涞浦
 	#define VER_NUM 				40101			// 版本号40.101

dtu/dtu_main_t536/app/set.c

@@ -782,9 +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
-	    {SETTYPE_UINT,  SET_NULL,   "定值区号",                 0.0,        0.0,                0,      0,          0,              GROUP_SET_EQPPARA,0x5001, UINT_R},
-	#elif defined GD_AREA_HEYUAN_2021
+    #if defined GD_AREA_HEYUAN_2021
 		{SETTYPE_UINT,  SET_NULL,   "定值区号",             1.0,        SEC_NUMBER-1,                1,      0,          0,              GROUP_SET_EQPPARA,0x5001, UINT_R},
 	#else
 	    {SETTYPE_UINT,  SET_NULL,   "定值区号",                 0.0,        4.0,                0,      0,          0,              GROUP_SET_EQPPARA,0x5001, UINT_R},
@@ -990,7 +988,7 @@ const  TSETTABLE tSwSetTable[]=
 {
 	
 	{SETTYPE_LABEL,	SET_NULL,	"保护控制字", 				0 , 		0,				0 ,		0,			0,				GROUP_SET_BHTT,0X0000, NULL_R},
-#if defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_MEIZHOU_FTU || defined GD_AREA_ZHONGSHAN_FTU ||defined GD_AREA_HEYUAN_KL || defined  GD_AREA_JIEYANG_FTU
+#if defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_ZHONGSHAN_FTU ||defined GD_AREA_HEYUAN_KL || defined  GD_AREA_JIEYANG_FTU
 	{SETTYPE_LIST,	SET_NULL,	"过流Ⅰ段投入",			0 , 		TZGJListNum-1,		0,		TZGJList, 	TZGJListNum,		GROUP_SET_BHTT,0X500B, UINT_R},
 	{SETTYPE_LIST,	SET_NULL,	"过流Ⅱ段投入",			0 , 		TZGJListNum-1,		0,		TZGJList, 	TZGJListNum,		GROUP_SET_BHTT,0X500C, UINT_R},
 #elif defined GD_AREA_SHANTOU
@@ -1007,7 +1005,7 @@ const  TSETTABLE tSwSetTable[]=
 	{SETTYPE_LIST,	SET_NULL,	"过流Ⅱ段投入", 			0 , 		TTListNum-1,		0,		TTList,		TTListNum,		GROUP_SET_BHTT,0X500C, BOOL_R},
 #endif
 
-#if defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_MEIZHOU_FTU || defined GD_AREA_ZHONGSHAN_FTU ||defined GD_AREA_HEYUAN_KL || defined  GD_AREA_JIEYANG_FTU
+#if defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_ZHONGSHAN_FTU ||defined GD_AREA_HEYUAN_KL || defined  GD_AREA_JIEYANG_FTU
     {SETTYPE_LIST,	SET_NULL,	"过流Ⅲ段投入", 			0 , 		TZGJListNum-1,		0,		TZGJList,	TZGJListNum,		GROUP_SET_BHTT,0X0000, UINT_R},
 #else
     {SETTYPE_LIST,	SET_NULL,	"过流Ⅲ段投入", 			0 , 		TTListNum-1,		0,		TTList,		TTListNum,		GROUP_SET_BHTT,0X0000, BOOL_R},
@@ -1017,7 +1015,7 @@ const  TSETTABLE tSwSetTable[]=
     {SETTYPE_LIST,	SET_NULL,	"过流Ⅲ段投方向", 		0 , 		TTListNum-1,		0,		TTList,		TTListNum,		GROUP_SET_BHTT,0X0000, BOOL_R},
 	{SETTYPE_LIST,	SET_NULL,	"PT断线检测投入", 			0 , 		TTListNum-1,		0,		TTList,		TTListNum,		GROUP_SET_BHTT,0X500F, BOOL_R},
 
-#if defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_MEIZHOU_FTU || defined GD_AREA_ZHONGSHAN_FTU ||defined GD_AREA_HEYUAN_KL || defined  GD_AREA_JIEYANG_FTU
+#if defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_ZHONGSHAN_FTU ||defined GD_AREA_HEYUAN_KL || defined  GD_AREA_JIEYANG_FTU
 	{SETTYPE_LIST,	SET_NULL,	"零序过流Ⅰ段投入", 		0 , 		TZGJListNum-1,		0,		TZGJList, 	TZGJListNum,		GROUP_SET_BHTT,0X5010, UINT_R},
 	{SETTYPE_LIST,	SET_NULL,	"零序过流Ⅱ段投入", 0 , 				TZGJListNum-1,		0,		TZGJList, 	TZGJListNum,		GROUP_SET_BHTT,0X5011, UINT_R},
 #elif defined GD_AREA_SHANTOU
@@ -3291,7 +3289,7 @@ bool MakeRunSet(bool bFirst)
 		// 过流类定值
 		{
 			poc= &ptSet->tSwSet[sw].toc[BH_GL1];
-#if defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_MEIZHOU_FTU || defined GD_AREA_ZHONGSHAN_FTU ||defined GD_AREA_HEYUAN_KL || defined  GD_AREA_JIEYANG_FTU
+#if defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_ZHONGSHAN_FTU ||defined GD_AREA_HEYUAN_KL || defined  GD_AREA_JIEYANG_FTU
 			poc->bTz=(((WORD)psetbuf[SET_GL1_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false)||(((WORD)psetbuf[SET_GL1_TT+sw*SW_SET_NUMBER ].ff==3 )?true:false); 
 			poc->bGj= (((WORD)psetbuf[SET_GL1_TT+sw*SW_SET_NUMBER ].ff==2 )?true:false)||(((WORD)psetbuf[SET_GL1_TT+sw*SW_SET_NUMBER ].ff==3 )?true:false);
 #elif defined GD_AREA_ZHUHAI_V2 || defined GD_AREA_MAIN_2020//珠海局要求告警+跳闸两个选项
@@ -3324,7 +3322,7 @@ bool MakeRunSet(bool bFirst)
 			poc->dI_fh= _Mul_Div_U(poc->dI,	96, 100);		//0.96=0.98*0.98;        		//过流定值返回值
 
 			poc = &ptSet->tSwSet[sw].toc[BH_GL2];
-#if defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_MEIZHOU_FTU || defined GD_AREA_ZHONGSHAN_FTU ||defined GD_AREA_HEYUAN_KL || defined  GD_AREA_JIEYANG_FTU
+#if defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_ZHONGSHAN_FTU ||defined GD_AREA_HEYUAN_KL || defined  GD_AREA_JIEYANG_FTU
 			poc->bTz=(((WORD)psetbuf[SET_GL2_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false)||(((WORD)psetbuf[SET_GL2_TT+sw*SW_SET_NUMBER ].ff==3 )?true:false);
 			poc->bGj=(((WORD)psetbuf[SET_GL2_TT+sw*SW_SET_NUMBER ].ff==2 )?true:false)||(((WORD)psetbuf[SET_GL2_TT+sw*SW_SET_NUMBER ].ff==3 )?true:false);
 #elif defined GD_AREA_ZHUHAI_V2 || defined GD_AREA_MAIN_2020//珠海局要求告警+跳闸两个选项
@@ -3359,7 +3357,7 @@ bool MakeRunSet(bool bFirst)
 			poc->bGj  = false;
 			poc->bDir = false;
 
-		#if defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_MEIZHOU_FTU || defined GD_AREA_ZHONGSHAN_FTU ||defined GD_AREA_HEYUAN_KL || defined  GD_AREA_JIEYANG_FTU
+		#if defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_ZHONGSHAN_FTU ||defined GD_AREA_HEYUAN_KL || defined  GD_AREA_JIEYANG_FTU
 			poc->bTz=(((WORD)psetbuf[SET_GL3_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false)||(((WORD)psetbuf[SET_GL3_TT+sw*SW_SET_NUMBER ].ff==3 )?true:false); 
 			poc->bGj=(((WORD)psetbuf[SET_GL3_TT+sw*SW_SET_NUMBER ].ff==2 )?true:false)||(((WORD)psetbuf[SET_GL3_TT+sw*SW_SET_NUMBER ].ff==3 )?true:false);
 		#else
@@ -3410,7 +3408,7 @@ bool MakeRunSet(bool bFirst)
 			poc->dI_fh= _Mul_Div_U(poc->dI,	96, 100);		//0.96=0.98*0.98;        		//过流2定值返回值
 
 			poc= &ptSet->tSwSet[sw].toc[BH_LX1];
-#if defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_MEIZHOU_FTU  || defined GD_AREA_ZHONGSHAN_FTU ||defined GD_AREA_HEYUAN_KL || defined  GD_AREA_JIEYANG_FTU
+#if defined GD_AREA_ZHUHAI_FTU  || defined GD_AREA_ZHONGSHAN_FTU ||defined GD_AREA_HEYUAN_KL || defined  GD_AREA_JIEYANG_FTU
 			poc->bTz=(((WORD)psetbuf[SET_LX1_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false)||(((WORD)psetbuf[SET_LX1_TT+sw*SW_SET_NUMBER ].ff==3 )?true:false); 
 			poc->bGj=(((WORD)psetbuf[SET_LX1_TT+sw*SW_SET_NUMBER ].ff==2 )?true:false)||(((WORD)psetbuf[SET_LX1_TT+sw*SW_SET_NUMBER ].ff==3 )?true:false); 
 #elif defined GD_AREA_SHANTOU
@@ -3429,7 +3427,7 @@ bool MakeRunSet(bool bFirst)
 			poc->dI_fh= _Mul_Div_U(poc->dI,	96, 100);		//0.96=0.98*0.98;        
 			
 			poc= &ptSet->tSwSet[sw].toc[BH_LX2];
-#if defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_MEIZHOU_FTU || defined GD_AREA_ZHONGSHAN_FTU ||defined GD_AREA_HEYUAN_KL || defined  GD_AREA_JIEYANG_FTU
+#if defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_ZHONGSHAN_FTU ||defined GD_AREA_HEYUAN_KL || defined  GD_AREA_JIEYANG_FTU
 			poc->bTz=(((WORD)psetbuf[SET_LX2_TT+sw*SW_SET_NUMBER ].ff==1 )?true:false)||(((WORD)psetbuf[SET_LX2_TT+sw*SW_SET_NUMBER ].ff==3 )?true:false); 
 			poc->bGj=(((WORD)psetbuf[SET_LX2_TT+sw*SW_SET_NUMBER ].ff==2 )?true:false)||(((WORD)psetbuf[SET_LX2_TT+sw*SW_SET_NUMBER ].ff==3 )?true:false);  
 #elif defined GD_AREA_SHANTOU

dtu/dtu_main_t536/app/set.h

@@ -26,8 +26,6 @@
 
 #ifdef GD_AREA_ECZD_MAOMING
 	#define MAX_SET_NUMBER 			360		// 最大定值个数
-#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		// 最大定值个数
 #else