Browse Source

整理宏ECZD_COMMON;

lch 6 months ago
parent
commit
e40da1dac2
1 changed files with 4 additions and 12 deletions
  1. 4 12
      dtu/dtu_main_t536/app/defineSys.h

+ 4 - 12
dtu/dtu_main_t536/app/defineSys.h

@@ -219,28 +219,16 @@
 
 #ifdef __IEC61850_GOOSE_FUNC__
 	#if(((VER_NUM > 28209) && (VER_NUM <= 29201)) || (VER_NUM >= 31201))
-		#if((VER_NUM == 29201) || ((VER_NUM > 31205) && (VER_NUM < 32201)))
-			#define ECZD_COMMON			//广东20年二次指导意见框架通用内容
-		#endif
 		#define YC_QUANTITY			//每间隔遥参数量可通过内部定值设定
 		#define FA_PL_PJ			//FA频率判据:频率在49~50.8Hz的频率才认为有效,可参与判得电
 	#endif
 #else
 	#if(((VER_NUM > 28109) && (VER_NUM <= 29101)) || (VER_NUM >= 31101))
-		#if((VER_NUM == 29101) || ((VER_NUM > 31105) && (VER_NUM < 32101)))
-			#define ECZD_COMMON			//广东20年二次指导意见框架通用内容
-		#endif
 		#define YC_QUANTITY			//每间隔遥参数量可通过内部定值设定
 		#define FA_PL_PJ			//FA频率判据:频率在49~50.8Hz的频率才认为有效,可参与判得电
 	#endif
 #endif
 
-#ifdef ECZD_COMMON
-	#define BATTERY_WITH_COMM		//带通讯电源模块
-    #define BH_FA_INONE_SW			//功能模块配置定值部分,主要特征为BH/FA三合一(在开关定值中)
-	#define YB_AUTO_SELECT			//在没配置硬压板的时自动选择软压板执行
-#endif
-
 #ifdef FUN_JDXX						//小电流接地功能
 	#define MIN_SIGNAL_SAMPLE		//小信号采样
 	#define SW_AC_I0S_SAMPLE		//I0S电流采样
@@ -265,4 +253,8 @@
 
 #define NW_AREA_MAIN_2021
 
+#define BATTERY_WITH_COMM		//带通讯电源模块
+#define BH_FA_INONE_SW			//功能模块配置定值部分,主要特征为BH/FA三合一(在开关定值中)
+#define YB_AUTO_SELECT			//在没配置硬压板的时自动选择软压板执行
+
 #endif /* _DEFINE_SYS_H */