Prechádzať zdrojové kódy

整理GD_AREA_ECZD_FOS_2021宏;

lch 7 mesiacov pred
rodič
commit
a7b543ada2

+ 0 - 8
dtu/dtu_main_t536/app/defineSys.h

@@ -143,7 +143,6 @@
 #define GD_AREA_PROTECTOR              // 分布式装置用作保护用
 #define GD_AREA_LIAONING_2021          // 辽宁供货程序(基于广东20年主线宏)
 #define GD_AREA_ECZD_CHAOZHOU_2021     ////潮州20二次指导意见分支
-#define GD_AREA_ECZD_FOS_2021          // 二次指导意见框架新增佛山分支		//暂未用,下次可直接借用,借用后将此注释删除
 #endif
 
 #if defined (CPU_AM335X) || defined (CPU_FUXI)
@@ -524,13 +523,6 @@
 	#define EV_CHZ_FG
 	#define GD_AREA_CHAOZHOUFENGXI
 
-#elif defined  GD_AREA_ECZD_FOS_2021		//佛山21年新标准(针对分布式)			//暂未用,下次可直接借用,借用后将此注释删除
-	#ifdef __IEC61850_GOOSE_FUNC__
-		#define VER_NUM 					31205			// 版本号31.205
-	#else
-		#define VER_NUM 				31105			// 版本号31.105
-	#endif
-
 /*!!!!!注意!!!!!:往上↑↑↑↑↑↑↑↑地区版本定义VER_NUM不允许超32101/32201(goose)*/
 #else
 	#ifndef AREA_MAIN

+ 1 - 6
dtu/dtu_main_t536/app/set.c

@@ -835,13 +835,8 @@ const  TSETTABLE tPubSetTable[]=
 	
 	#ifdef YF_TQ_JL_TY_PUBLIC
         {SETTYPE_LIST,	SET_NULL,	"远方整定投入软压板",			0 ,  	  TTListNum-1,		1,			 TTList,		 TTListNum, 			GROUP_SET_PUBYB,0X0000, BOOL_R},
-	#endif	
-
-	#ifdef GD_AREA_ECZD_FOS_2021
-		{SETTYPE_LIST,	SET_NULL,	"保护投入软压板",		0 , 		TTListNum-1,		1,		TTList, 	TTListNum,		GROUP_SET_PUBYB,0x5023, BOOL_R},
-	#else
-		{SETTYPE_LIST,	SET_NULL,	"保护出口投入软压板",		0 , 		TTListNum-1,		1,		TTList, 	TTListNum,		GROUP_SET_PUBYB,0x5023, BOOL_R},
 	#endif
+    {SETTYPE_LIST,	SET_NULL,	"保护出口投入软压板",		0 , 		TTListNum-1,		1,		TTList, 	TTListNum,		GROUP_SET_PUBYB,0x5023, BOOL_R},
 	#if !defined GD_AREA_ZHONGSHAN_2020 && !defined BH_FA_INONE_SW
 		{SETTYPE_LIST,	SET_NULL,	"常规保护软压板",		0 , 		TTListNum-1,		1,		TTList, 	TTListNum,		GROUP_SET_PUBYB,0x0000, BOOL_R},
 		{SETTYPE_LIST,	SET_NULL,	"常规FA软压板",		0 , 		TTListNum-1,		1,		TTList, 	TTListNum,		GROUP_SET_PUBYB,0x0000, BOOL_R},