修改GD_AREA_ECZD_2020宏；

app_public/fuxi_public/fuxi_bsp/source/ad7616.c

@@ -612,8 +612,9 @@ static void updata_adc(struct t_shmdata_adc *sample_data0, uint16_t us_adc_dot_i
             }
         }
     }
-
+#ifdef XDL_ZT
 	xdl_tbl_qd(mod);
+#endif
 	mod++;
 	mod &=(CFG_ADC_MOD_NUM-1);
     g_adc_dots_data_count++;

dtu/dtu_main_t536/app/Appconfig.c

@@ -228,7 +228,7 @@ const SOE_DEF tAllSOE[]=
 	#endif	
 #endif
 
-#ifdef FUN_JDXX
+#if defined FUN_JDXX ||defined XDL_ZT
 	{0x84,		{EV_PARA_U0, 0, 0}, "苤萇霜諉華錨揤1豢劑"},	 
 	{0x84,		{EV_PARA_U0, 0, 0}, "苤萇霜諉華錨揤2豢劑"},
 	{0x84,		{0, 0, 0},			"苤萇霜諉華ぎ雄"},

dtu/dtu_main_t536/app/Appconfig.h

@@ -204,7 +204,7 @@ enum
   #endif
 #endif
 
-#ifdef FUN_JDXX
+#if defined FUN_JDXX ||defined XDL_ZT
 		EV_JDXX_U01GJ,			// СµçÁ÷Áãѹ¸æ¾¯1
 		EV_JDXX_U02GJ,			// СµçÁ÷Áãѹ¸æ¾¯2
 		EV_JDXX_QD, 

dtu/dtu_main_t536/app/defineSys.h

@@ -481,7 +481,15 @@
 	#else
 		#define VER_NUM 				    29101			// 版本号29.101
 	#endif
-	
+    #define XDL_ZT            // 小电流接地
+    #define RCD_STRAN_M       /*录波传输*/
+    #define RCD_STRAN_S       /*录波传输*/
+    #define FUNC_MODE_JS      // 切换模式解除闭锁
+    #define FUNC_DRIVE        // 不停电传动功能
+    #define NO_SEND_YC        // 检修压板投入时不发送遥测
+    #define FUNC_MORE_PREREAD // 支持遥调时多次读取
+    #define FUNC_MORE_PRESET  // 支持遥调时多次预置,固化
+
 #elif defined  GD_AREA_ECZD_MAOMING	//广东二次指导意见分支-茂名局
 	#define VER_NUM 				    29102			// 版本号29.102
 	#define GEN_QUEUE	

dtu/dtu_main_t536/app/record.h

@@ -32,7 +32,7 @@ enum
 	RECORD_TYPE_LXGL,		// 录波类型为零序过流
 	RECORD_TYPE_LLTB,   	// 录波类型为零流突变
 	RECORD_TYPE_CHZ,   		// 录波类型为重合闸
-#ifdef FUN_JDXX
+#if defined FUN_JDXX ||defined XDL_ZT
 	RECORD_TYPE_XDLJD,		// 录波类型为小电流接地
 #endif
 	RECORD_TYPE_NUM,

dtu/dtu_main_t536/app/set.c

@@ -819,9 +819,6 @@ const  TSETTABLE tPubSetTable[]=
     {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},
 
-	{SETTYPE_LABEL, SET_NULL,	"控制字", 					0 , 		0,				0 , 	0,			0,				GROUP_SET_PUBTT,0x0000, NULL_R},
-	{SETTYPE_LIST,	SET_NULL,	"负荷侧(线路侧)PT接线方式", 		1 , 		TPT_TypeNum-1,	1,		TPT_Type,	TPT_TypeNum,	GROUP_SET_PUBTT,0x500A, UINT_R},
-
 	{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},
@@ -1892,7 +1889,6 @@ const  TSETTABLE tSwSetTable[]=
 	{SETTYPE_LABEL, SET_NULL,	"控制字", 			0 , 				0,		0,				  0,				 0,				GROUP_SET_MODE,0X0000, NULL_R},
 	{SETTYPE_LIST,  SET_NULL,   "同期合闸",			0 ,       TTListNum-1,      1,     		 TTList,     	 TTListNum,      		GROUP_SET_MODE,0X0000, BOOL_R},
 	{SETTYPE_LIST,  SET_NULL,   "自动解列",			0 ,       TTListNum-1,      1,      	 TTList,     	 TTListNum,      		GROUP_SET_MODE,0X0000, BOOL_R},
-	{SETTYPE_LIST,	SET_NULL,	"停用",			0 , ALLQUIT_ListNum-1,		0,	   ALLQUIT_List,   ALLQUIT_ListNum,				GROUP_SET_MODE,0X0000, BOOL_R},
 	{SETTYPE_LABEL, SET_NULL,	"软压板", 			0 , 				0,		0,				  0,				 0,				GROUP_SET_SOFT,0X0000, NULL_R},
 	#ifdef GD_AREA_HEYUAN_2021
 		{SETTYPE_LIST,	SET_NULL,	"远方定值整定投入",			0 ,  	  TTListNum-1,		1,			 TTList,		 TTListNum, 			GROUP_SET_SOFT,0X0000, BOOL_R},
@@ -3029,7 +3025,7 @@ bool MakeRunSet(bool bFirst)
 	g_rcd_type_enable[RECORD_TYPE_LXGL] = ((WORD)psetbuf[CSTSET_WAVE_LXGL].ff==1 )?true:false;
 	g_rcd_type_enable[RECORD_TYPE_LLTB] = ((WORD)psetbuf[CSTSET_WAVE_LLTB].ff==1 )?true:false;  
 	g_rcd_type_enable[RECORD_TYPE_CHZ]  = ((WORD)psetbuf[CSTSET_WAVE_CHZ].ff==1 )?true:false;  
-#ifdef FUN_JDXX
+#if defined FUN_JDXX ||defined XDL_ZT
 	g_rcd_type_enable[RECORD_TYPE_XDLJD]  = ((WORD)psetbuf[SET_WAVE_XDLJD].ff==1 )?true:false;
 #endif
 
@@ -5122,8 +5118,8 @@ void MakeRunPara(bool bFirstInit, bool bUboot)
 
 #ifdef YX_RESET_TIME
 	pRunPara->dTEventRst=GetSetTIME(psetbuf[PARA_EVTRSTTIME].ff);
-#endif
 	pRunPara->fT_LBXH_RST= psetbuf[PARA_EVTRSTTIME].ff;
+#endif
 	if(pRunPara->dTBatBegin != dat)
 	{
 		pRunPara->dTBatBegin = dat;

dtu/dtu_main_t536/app/set.h

@@ -161,6 +161,7 @@ enum
 #if defined GD_AREA_ECZD_2020 && !defined GD_AREA_ECZD_SHAOGUAN_2021 //2020二次指导意见 2020-9-9
 	GROUP_SET_SCT,		//定值区
 #endif
+    GROUP_SET_PUBYB,		//软压板
 	GROUP_SET_EQPPARA,		//设备参数
 	GROUP_SET_PUBSET,		//电压参数
 	GROUP_SET_FDL,			//非电量
@@ -1349,7 +1350,7 @@ enum
 	CSTSET_WAVE_LXGL,		// 零序过流
 	CSTSET_WAVE_LLTB,		// 零流突变
 	CSTSET_WAVE_CHZ,		// 重合闸
-#ifdef FUN_JDXX
+#if defined FUN_JDXX ||defined XDL_ZT
 	SET_WAVE_XDLJD, 	// 小电流接地
 #endif
 	

dtu/dtu_main_t536/sh/t536/mybuild_for_std_dtu5.0

@@ -1,6 +1,6 @@
 #!/bin/sh
 
 if [ -e ./mybuild_for_gw_public_t536 ]; then
-	./mybuild_for_gw_public_t536 GuoWang DGD_MAIN_2021 DCPU_FUXI DMACHINE_NULL
+	./mybuild_for_gw_public_t536 GuoWang DGD_AREA_ECZD_2020 DCPU_FUXI DMACHINE_NULL
 fi