lch 6 месяцев назад
Родитель
Сommit
634e80ed7a

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

@@ -100,7 +100,6 @@
 #define GD_AREA_FOS_2020      // 佛山局2020要求
 #define GD_AREA_ZHONGSHAN     // 中山局要求
 #define GD_AREA_ZHONGSHAN_FTU          // 中山FTU要求
-#define GD_AREA_YUNAN_LP               // 云南涞浦
 #define GD_AREA_PANYU_TEST             // 番禺测试
 #define GD_AREA_ZHUHAI_V2              // 珠海局2019_V2要求
 #define GD_AREA_HEYUAN                 // 河源局要求
@@ -199,9 +198,6 @@
 #elif defined GD_AREA_ZHAOQING_FENGKAI	//	//肇庆封开县要求,科陆在梅州FTU基础上新增功能
 	#define VER_NUM 				13102			// 版本号13.101
 
-#elif defined  GD_AREA_YUNAN_LP	//云南涞浦
-	#define VER_NUM 				40101			// 版本号40.101
-
 #elif defined  GD_AREA_PANYU_TEST	//番禺测试
 	#define VER_NUM 				14101			// 版本号14.101
 

+ 0 - 4
dtu/dtu_main_t536/app/protect.c

@@ -2077,10 +2077,6 @@ static int _protect_rmt_sw(u32 dStep)
 	//rt_printf("pRunstu->wcn=%d \r\n",pRunstu->wcn);
 	#endif
 
-#ifdef	GD_AREA_YUNAN_LP//交流失电开出
-	//sw_do(sw,SW_DO_LOST_AC,SW_DO_TYPE_SELECT_ON);
-	sw_do(sw,SW_DO_LOST_AC,SW_DO_TYPE_ON); 
-#endif
 	if (((((g_rmt_op.cmd == CMD_FZ)||pRunstu->sw_sf||g_run_stu.mb_fz) && (!g_run_stu.yf))
 		 || g_tPDA.bPDATz || g_tPDA.bMsgTz)&&(!pR->bBSTZ))  //有手跳信号
 	{

+ 0 - 10
dtu/dtu_main_t536/app/switch.c

@@ -155,12 +155,6 @@ const s8 * g_sw_do_name[SW_DO_NUM] =
     "开关失灵",
 #endif
 
-#ifdef GD_AREA_YUNAN_LP	
-	"电源消失开出",
-#else
-	"开出14",
-#endif	
-
 #ifdef GD_AREA_PROTECTOR
 	"装置异常告警动作",
 #endif
@@ -639,14 +633,12 @@ const struct mea_desc g_pub_ac_desc[PUB_AC_NUM_ALL] =
 #endif
 	{"直流电压1",UNIT_V050,UNIT_NULL},
 	{"直流电压2",UNIT_V050,UNIT_NULL},
-#ifdef GD_AREA_YUNAN_LP		// 云南涞浦
 	{"DltUab",UNIT_V100,UNIT_NULL},
 	{"DltUbc",UNIT_V100,UNIT_NULL},
 	{"DltUca",UNIT_V100,UNIT_NULL},
 	{"ArgUab",UNIT_ANG,UNIT_NULL},
 	{"ArgUbc",UNIT_ANG,UNIT_NULL},
 	{"ArgUca",UNIT_ANG,UNIT_NULL},
-#endif
 	{"温度",UNIT_TEMP,UNIT_NULL},
 #ifdef TMP_CHIP_AHT20
 	{"湿度",UNIT_HUMI,UNIT_NULL},
@@ -3818,7 +3810,6 @@ void _sw_cal_average(int cal_num)
 	g_sw_pub.ac_in_acc[PUB_AC_IN_V_UNBALANCE1] = 0;
 	g_sw_pub.ac_in_acc[PUB_AC_IN_V_UNBALANCE2] = 0;
 
-#ifdef GD_AREA_YUNAN_LP		// 云南涞浦
 	g_sw_pub.ac_in[PUB_AC_IN_DLTUAB] =_AbsL(g_ui[PUB_AC_UAB1].e -g_ui[PUB_AC_UAB2].e);
 	g_sw_pub.ac_in[PUB_AC_IN_DLTUBC] =_AbsL(g_ui[PUB_AC_UBC1].e -g_ui[PUB_AC_UBC2].e);
 	g_sw_pub.ac_in[PUB_AC_IN_DLTUCA] =_AbsL(g_ui[PUB_AC_UCA1].e -g_ui[PUB_AC_UCA2].e);
@@ -3848,7 +3839,6 @@ void _sw_cal_average(int cal_num)
 	{
 		g_sw_pub.ac_in[PUB_AC_IN_ARGUCA]=0;
 	}
-#endif
 	//版本号0x00010104
 	{
 		g_sw_pub.ac_in[PUB_AC_IN_VER] =((BYTE)((VER_NUM>>0)&0x0f)

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

@@ -148,12 +148,6 @@ enum
 	SW_DO_UNSTUCK_SINGLE,
 #endif
 
-#ifdef GD_AREA_YUNAN_LP	
-	SW_DO_LOST_AC,
-#else
-	SW_DO_14,
-#endif
-
 #ifdef GD_AREA_PROTECTOR
 	SW_EQU_ERR,
 #endif
@@ -569,14 +563,12 @@ enum
 	PUB_AC_IN_F2,
 	PUB_AC_IN_UZ1,
 	PUB_AC_IN_UZ2,
-#ifdef GD_AREA_YUNAN_LP		// ÔÆÄÏ䵯Ö
 	PUB_AC_IN_DLTUAB,
 	PUB_AC_IN_DLTUBC,
 	PUB_AC_IN_DLTUCA,
 	PUB_AC_IN_ARGUAB,
 	PUB_AC_IN_ARGUBC,
 	PUB_AC_IN_ARGUCA,
-#endif
 	PUB_AC_IN_TEMP,
 #ifdef TMP_CHIP_AHT20
 	PUB_AC_IN_HUMI,