新增so7_config恢复默认参数功能。

This commit is contained in:
TAO Cheng
2014-03-14 15:24:38 +08:00
parent 34afd5563f
commit 3c52203b7c
11 changed files with 137 additions and 55 deletions
@@ -536,35 +536,6 @@ CSO7_Proto::CSO7_Proto()
g_machine.s_machine_config.zm_axis._SpeedSlow=800;
g_machine.s_machine_config.zm_axis._speed._short_=0;
g_machine.s_machine_config.motion._EnCloseLoop=FALSE;
g_machine.s_machine_config.motion._RetryTimes=0;
g_machine.s_machine_config.motion._ShiftPositionX=0.0;
g_machine.s_machine_config.motion._ShiftPositionY=0.0;
g_machine.s_machine_config.motion._ShiftPositionZ=0.0;
g_machine.s_machine_config.motion._ShiftPositionZ=0.0;
g_machine.s_machine_config.motion.GetInterruptMsgMethod=E_GET_INTERRUPT_MSG_INQUIRY;
g_machine.s_machine_config.motion.m_WriteDataSleepTime=0;
g_machine.s_machine_config.motion.m_AccuraErrPulseX=1;
g_machine.s_machine_config.motion.m_AccuraErrPulseY=1;
g_machine.s_machine_config.motion.m_AccuraErrPulseZ=1;
g_machine.s_machine_config.motion.m_EQUIDIS_X=0;
g_machine.s_machine_config.motion.m_EQUIDIS_Y=0;
g_machine.s_machine_config.motion.m_EQUIDIS_Z=0;
g_machine.s_machine_config.motion.m_TouchProbeEnable=0;
g_machine.s_machine_config.motion.m_JoyStickEnable=0;
g_machine.s_machine_config.motion.m_DebugOutputEnable=0;
g_machine.s_machine_config.motion.m_SDK3000_CntThreadSleepVal=550000;
g_machine.s_machine_config.motion.m_SV4000E_DenoisePara[0]=70;
g_machine.s_machine_config.motion.m_SV4000E_DenoisePara[1]=70;
g_machine.s_machine_config.motion.m_SV4000E_DenoisePara[2]=70;
g_machine.s_machine_config.motion.m_SV4000E_DenoisePara[3]=70;
g_machine.s_machine_config.motion.m_MachineType=MACHINE_SO7_CONTROLLER;
g_machine.s_machine_config.motion.m_VideoCardType=0;
g_machine.s_status._bIsZMMotionFinished=0;
g_machine.x._scale_pos._long_ = 0;
g_machine.y._scale_pos._long_ = 0;
@@ -588,6 +559,7 @@ CSO7_Proto::CSO7_Proto()
g_machine.InterruptFlag[1]=0;
g_machine.InPortStatus=0;
so7_motion_reset_controller_parameter();
so7_config_para_set_default();
m_bHomingActive = false;
g_pLogger = new CLogger(_T("\\UtilityDebug.Log"));
g_pLogger->Send(_T("Construct Cso7_Proto.\r\n"));
@@ -610,6 +582,38 @@ CSO7_Proto::~CSO7_Proto()
//==============================================================================
//******************************************************************************
SSI_STATUS_MOTION CSO7_Proto::so7_config_para_set_default()
{
g_machine.s_machine_config.motion._EnCloseLoop=FALSE;
g_machine.s_machine_config.motion._RetryTimes=0;
g_machine.s_machine_config.motion._ShiftPositionX=0.0;
g_machine.s_machine_config.motion._ShiftPositionY=0.0;
g_machine.s_machine_config.motion._ShiftPositionZ=0.0;
g_machine.s_machine_config.motion._ShiftPositionZ=0.0;
g_machine.s_machine_config.motion.GetInterruptMsgMethod=E_GET_INTERRUPT_MSG_INQUIRY;
g_machine.s_machine_config.motion.m_WriteDataSleepTime=0;
g_machine.s_machine_config.motion.m_AccuraErrPulseX=1;
g_machine.s_machine_config.motion.m_AccuraErrPulseY=1;
g_machine.s_machine_config.motion.m_AccuraErrPulseZ=1;
g_machine.s_machine_config.motion.m_EQUIDIS_X=0;
g_machine.s_machine_config.motion.m_EQUIDIS_Y=0;
g_machine.s_machine_config.motion.m_EQUIDIS_Z=0;
g_machine.s_machine_config.motion.m_TouchProbeEnable=0;
g_machine.s_machine_config.motion.m_JoyStickEnable=0;
g_machine.s_machine_config.motion.m_DebugOutputEnable=0;
g_machine.s_machine_config.motion.m_SDK3000_CntThreadSleepVal=550000;
g_machine.s_machine_config.motion.m_SV4000E_DenoisePara[0]=70;
g_machine.s_machine_config.motion.m_SV4000E_DenoisePara[1]=70;
g_machine.s_machine_config.motion.m_SV4000E_DenoisePara[2]=70;
g_machine.s_machine_config.motion.m_SV4000E_DenoisePara[3]=70;
g_machine.s_machine_config.motion.m_MachineType=MACHINE_SO7_CONTROLLER;
g_machine.s_machine_config.motion.m_VideoCardType=0;
return SSI_STATUS_MOTION_NORMAL;
}
SSI_STATUS_MOTION CSO7_Proto::so7_motion_reset_controller_parameter()
{
for(int i=0;i<5;i++)