整理GD_AREA_ZHUHAI宏；

dtu/dtu_main_t536/app/Appconfig.h

@@ -22,14 +22,9 @@
 
 
 #define EQUIP_TYPE 0x3100
+#define SOFT_VERH  0x0100   //版本号格式为1.00.01  
+#define SOFT_VERL   0x0100    //VERL的低位位特殊版本号，若不等于0则为特殊版本
 
-#ifdef GD_AREA_ZHUHAI	//珠海报备程序版本：1.03.03
-	#define SOFT_VERH  0x0103   //版本号格式为1.03.03  
-	#define SOFT_VERL   0x0300    //VERL的低位位特殊版本号，若不等于0则为特殊版本
-#else
-	#define SOFT_VERH  0x0100   //版本号格式为1.00.01  
-	#define SOFT_VERL   0x0100    //VERL的低位位特殊版本号，若不等于0则为特殊版本
-#endif
 
 //采样频率(32次/周)
 #define SAMFREQ             CFG_ADC_DOTS_PER_PERIOD

dtu/dtu_main_t536/app/defineSys.h

@@ -99,7 +99,6 @@
 #define GD_AREA_FOS           // 佛山局要求
 #define GD_AREA_FOS_2020      // 佛山局2020要求
 #define GD_AREA_ZHONGSHAN     // 中山局要求
-#define GD_AREA_ZHUHAI        // 珠海局要求
 #define GD_AREA_DONGGUAN      // 东莞局要求
 #define GD_AREA_JIANGMEN               // 江门局要求
 #define GD_AREA_QINGYUAN               // 清远局要求
@@ -201,9 +200,6 @@
 	#define VER_NUM			 		5102          	// 版本号5.102 完善101遥参
 	#define INRUSH_CURRENT_IN_DECIMALS	//涌流识别定值显示为小数并给主站送小数形式
 
-#elif defined GD_AREA_ZHUHAI	//珠海局要求
-	#define VER_NUM			 		6101          	// 版本号6.101
-
 #elif defined GD_AREA_DONGGUAN	//东莞局要求
 	#undef PASSWORD_4_STR							//东莞要求8位密码,取消4位数字密码宏定义
 	#define VER_NUM			 		7101          	// 版本号7.101

dtu/dtu_main_t536/app/set.c

@@ -851,7 +851,7 @@ const  TSETTABLE tPubSetTable[]=
 #elif defined GD_AREA_ZHUHAI_FTU
 	{SETTYPE_F,		SET_U,		"电源侧PT额定二次值",	0.0,		300.0,			100.0,	0,			0,				GROUP_SET_EQPPARA,0x5008, FLOAT_R},
 	{SETTYPE_F,		SET_U,		"负荷侧PT额定二次值", 	0.0, 		300.0,			100.0 ,	0,			0,				GROUP_SET_EQPPARA,0x5009, FLOAT_R},
-#elif defined GD_AREA_ZHUHAI || defined GD_AREA_JIEYANG  
+#elif defined GD_AREA_JIEYANG  
 	{SETTYPE_F,		SET_U,		"母线侧PT额定二次值",	0.0,		300.0,			100.0,	0,			0,				GROUP_SET_EQPPARA,0x5008, FLOAT_R},
 	{SETTYPE_F,		SET_U,		"线路侧PT额定二次值", 	0.0, 		300.0,			100.0 ,	0,			0,				GROUP_SET_EQPPARA,0x5009, FLOAT_R},
 #elif defined  GD_AREA_ZHUHAI_V2
@@ -990,7 +990,7 @@ const  TSETTABLE tSwSetTable[]=
 {
 	
 	{SETTYPE_LABEL,	SET_NULL,	"保护控制字", 				0 , 		0,				0 ,		0,			0,				GROUP_SET_BHTT,0X0000, NULL_R},
-#if defined GD_AREA_ZHUHAI || defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_CHAOZHOU || 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_CHAOZHOU || defined GD_AREA_MEIZHOU_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 +1007,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 || defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_CHAOZHOU || 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_CHAOZHOU || defined GD_AREA_MEIZHOU_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 +1017,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 || defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_CHAOZHOU || 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_CHAOZHOU || defined GD_AREA_MEIZHOU_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
@@ -1342,7 +1342,7 @@ const  TSETTABLE tSwSetTable[]=
 		{SETTYPE_LIST,	SET_NULL,	"分段/联络模式", 			1 , 		KGFunListNum-1,	1,		KGFunList,	KGFunListNum,	GROUP_SET_FATT,0x500C, UINT_R},
 		#endif
 	#endif
-	#if defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHUHAI || defined GD_AREA_JIEYANG || defined GD_AREA_HEYUAN_2021
+	#if defined GD_AREA_ZHONGSHAN || defined GD_AREA_JIEYANG || defined GD_AREA_HEYUAN_2021
 		{SETTYPE_LIST,	SET_NULL,	"母线侧得电延时合闸",		0 , 		TTListNum-1,		0,		TTList, 	TTListNum,		GROUP_SET_FATT,0x500D, BOOL_R},
 		{SETTYPE_LIST,	SET_NULL,	"线路侧得电延时合闸",		0 , 		TTListNum-1,		0,		TTList, 	TTListNum,		GROUP_SET_FATT,0x500E, BOOL_R},
 		{SETTYPE_LIST,	SET_NULL,	"母线侧失电延时合闸",		0 , 		TTListNum-1,		0,		TTList, 	TTListNum,		GROUP_SET_FATT,0x500F, BOOL_R},
@@ -3296,7 +3296,7 @@ bool MakeRunSet(bool bFirst)
 		// 过流类定值
 		{
 			poc= &ptSet->tSwSet[sw].toc[BH_GL1];
-#if defined GD_AREA_ZHUHAI || defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_CHAOZHOU	|| 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_CHAOZHOU	|| defined GD_AREA_MEIZHOU_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//珠海局要求告警+跳闸两个选项
@@ -3329,7 +3329,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 || defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_CHAOZHOU	|| 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_CHAOZHOU	|| defined GD_AREA_MEIZHOU_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//珠海局要求告警+跳闸两个选项
@@ -3364,7 +3364,7 @@ bool MakeRunSet(bool bFirst)
 			poc->bGj  = false;
 			poc->bDir = false;
 
-		#if defined GD_AREA_ZHUHAI || defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_CHAOZHOU || 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_CHAOZHOU || defined GD_AREA_MEIZHOU_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
@@ -3415,7 +3415,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 || defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_CHAOZHOU || 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_CHAOZHOU || defined GD_AREA_MEIZHOU_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
@@ -3434,7 +3434,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 || defined GD_AREA_ZHUHAI_FTU || defined GD_AREA_CHAOZHOU || 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_CHAOZHOU || defined GD_AREA_MEIZHOU_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