整理宏SOE_YK_OPT；

dtu/dtu_main_t536/app/Appconfig.c

@@ -703,7 +703,6 @@ const SOE_DEF tAllSOE[]=
 	{0x00,		{0,	0,	0},		"通道自校成功"},
 
 	/*遥控操作类*/
-#ifdef SOE_YK_OPT
 	{0x40,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0},		"遥控合闸预置成功"},
 	{0x40,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0},		"遥控合闸预置失败"},
 	{0x40,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0},		"遥控合闸预置超时"},
@@ -717,16 +716,6 @@ const SOE_DEF tAllSOE[]=
 	{0x44,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0},		"遥控分闸执行成功"},
 	{0x44,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0},		"遥控分闸执行失败"},
 	{0x40,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0},		"遥控分闸终止"},
-#else
-	{0x00,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0}, 	"遥控合闸选择成功"},
-	{0x00,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0}, 	"遥控合闸选择超时"},
-	{0x04,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0}, 	"遥控合闸执行成功"},
-	{0x00,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0}, 	"遥控合闸执行失败"},
-	{0x00,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0}, 	"遥控跳闸选择成功"},
-	{0x00,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0}, 	"遥控跳闸选择超时"},
-	{0x04,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0}, 	"遥控跳闸执行成功"},
-	{0x00,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0}, 	"遥控跳闸执行失败"},
-#endif
 	/*遥控操作类*/
 	{0x00,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0},		"PLC合"},
 	{0x00,		{PARA_TYPE_YK|EV_PARA_YK,	PARA_TYPE_YK|EV_PARA_YK,	0},		"PLC分"},

dtu/dtu_main_t536/app/Appconfig.h

@@ -582,7 +582,6 @@ enum
 	EV_ANGSJS,				//	角度手校成功
 	EV_CHNZJS,				//	幅值自校成功
 	/*遥控操作类*/
-#ifdef SOE_YK_OPT
 	EV_YH_SELECT,			//遥控合闸选择成功
 	EV_YH_SELFAIL,          //遥控合闸选择失败
 	EV_YH_SELTOUT,			//遥控合闸选择超时
@@ -596,16 +595,6 @@ enum
 	EV_YT_EXECT,			//遥控跳闸执行成功
 	EV_YT_EXFAIL,			//遥控跳闸执行失败
 	EV_YT_EXCANCEL,         //遥控跳闸执行取消
-#else
-	EV_YH_SELECT,			//遥控合闸选择
-	EV_YH_SELTOUT,			//遥控合闸选择超时
-	EV_YH_EXECT,			//遥控合闸执行
-	EV_YH_EXFAIL,			//遥控合闸执行失败
-	EV_YT_SELECT,			//遥控跳闸选择
-	EV_YT_SELTOUT,			//遥控跳闸选择超时
-	EV_YT_EXECT,			//遥控跳闸执行
-	EV_YT_EXFAIL,			//遥控跳闸执行失败
-#endif
 
 	EV_PLC_HZ,				// PLC 合输出
 	EV_PLC_TZ,				// PLC 跳输出

dtu/dtu_main_t536/app/Sys.c

@@ -1929,11 +1929,9 @@ int _RemoteCtrl(BYTE yktype,BYTE index,BYTE ykval,WORD wID)
 				sprintf(buf,"遥控取消成功--%s:开关%02d开出%02d",get_yk_owner(wID), owner,no);
 				log_str_time(LOG_OPERATE,buf,0,0);
 			}
-            #ifdef SOE_YK_OPT
-				soeno = (ykval==YK_VAL_HZ) ? EV_YH_EXCANCEL: EV_YT_EXCANCEL;
-				soe_record_opt(soeno,((owner<<8)|no|(wID<<16)));
-            #endif	
-			memset(&g_yk_info[index],0,sizeof(REMOTEYKSTATUS));
+            soeno = (ykval == YK_VAL_HZ) ? EV_YH_EXCANCEL : EV_YT_EXCANCEL;
+            soe_record_opt(soeno, ((owner << 8) | no | (wID << 16)));
+            memset(&g_yk_info[index],0,sizeof(REMOTEYKSTATUS));
 			return 0;
 		}
 	}
@@ -1948,39 +1946,37 @@ int RemoteCtrl(BYTE yktype,BYTE index,BYTE ykval,WORD wID)
 	ret = _RemoteCtrl(yktype,index,ykval,wID);
 	if(ret != 0)
 	{
-         #ifdef SOE_YK_OPT
-			BYTE no,owner;
-		    WORD soeno;
-		 
-		    if(ykval==YK_VAL_HZ)
-			{
-				no=g_do_table[index].indexno[0];
-				owner=g_do_table[index].owner;
-			}
-			else
-			{
-				if(g_do_table[index].indexno[1])
-				{
-					no=g_do_table[index].indexno[1];
-				}
-				else
-				{
-					no=g_do_table[index].indexno[0];
-				}	
-				owner=g_do_table[index].owner;
-			}
-			//soe
-		    if(yktype==YK_TYPE_SEL)
-	    	{
-				soeno = (ykval==YK_VAL_HZ) ? EV_YH_SELFAIL: EV_YT_SELFAIL;
-				soe_record_opt(soeno,((owner<<8)|no|(wID<<16)));
-	    	}
-			else if(yktype==YK_TYPE_EXE)
-			{
-				soeno = (ykval==YK_VAL_HZ) ? EV_YH_EXFAIL: EV_YT_EXFAIL;
-				soe_record_opt(soeno,((owner<<8)|no|(wID<<16)));
-	    	}
-         #endif
+        BYTE no,owner;
+        WORD soeno;
+        
+        if(ykval==YK_VAL_HZ)
+        {
+            no=g_do_table[index].indexno[0];
+            owner=g_do_table[index].owner;
+        }
+        else
+        {
+            if(g_do_table[index].indexno[1])
+            {
+                no=g_do_table[index].indexno[1];
+            }
+            else
+            {
+                no=g_do_table[index].indexno[0];
+            }	
+            owner=g_do_table[index].owner;
+        }
+        //soe
+        if(yktype==YK_TYPE_SEL)
+        {
+            soeno = (ykval==YK_VAL_HZ) ? EV_YH_SELFAIL: EV_YT_SELFAIL;
+            soe_record_opt(soeno,((owner<<8)|no|(wID<<16)));
+        }
+        else if(yktype==YK_TYPE_EXE)
+        {
+            soeno = (ykval==YK_VAL_HZ) ? EV_YH_EXFAIL: EV_YT_EXFAIL;
+            soe_record_opt(soeno,((owner<<8)|no|(wID<<16)));
+        }
 
 		sprintf(buf,"遥控失败--%s:%s(ykno=0x%04x,yktype=%d,ykThz=%d)",get_yk_owner(wID),RmtCtrl_Err(ret),g_do_table[index].cp,yktype,ykval);
 		log_str_time(LOG_OPERATE,buf,0,0);

dtu/dtu_main_t536/app/defineSys.h

@@ -32,7 +32,6 @@
 #define EV_GL_STATR                    // 过流启动SOE
 #define EV_CHZ_FG                      // 重合闸复归SOE
 #define DISP_CHZOKCHR_2_SW             // 重合闸确认时间+充电时间移到开关定值
-#define SOE_YK_OPT                     // 佛山局2020版遥控要求
 #define YX_DI_ERROR                    // 遥信硬件自检错误
 #define HISTORY_DB                     // 历史文件数据库
 #define DO_KOUT_CHECK                  // 开出反校
@@ -251,7 +250,6 @@
 #endif
 
 #ifdef ECZD_COMMON
-	#define SOE_YK_OPT				//需记录遥控相关日志
 	#define FUN_SET_CHANGE_SOE		//定值修改生成SOE
 	#define BATTERY_WITH_COMM		//带通讯电源模块
 	#define NO_SEND_YC				//检修压板投入时不发送遥测