xhouse/EF3-Interface
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增导出函数，完善INI文件。

Browse Source
This commit is contained in:
TAO Cheng
2014-04-15 22:36:11 +08:00
parent 4bfd0a6a4c
commit f1188c017c
5 changed files with 66 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp
+27 -1
View File
@@ -535,6 +535,7 @@ CSO7_Proto::CSO7_Proto()
g_machine.s_machine_config.zm_axis._SpeedFast=2000;
g_machine.s_machine_config.zm_axis._SpeedSlow=800;
g_machine.s_machine_config.zm_axis._speed._short_=0;
g_machine.MotionType=-1;
g_machine.s_status._bIsZMMotionFinished=0;
g_machine.x._scale_pos._long_ = 0;
@@ -614,6 +615,11 @@ SSI_STATUS_MOTION CSO7_Proto::so7_config_para_set_default()
g_machine.s_machine_config.motion.m_MachineType=MACHINE_SO7_CONTROLLER;
g_machine.s_machine_config.motion.m_VideoCardType=0;
g_machine.s_machine_config.motion.m_RotaryCircleDis=7.2;
g_machine.s_machine_config.motion.m_RotaryCirclePulse=14400;
g_machine.s_machine_config.motion.m_RotaryAxisNO=MACHINE_AXIS_Y;
return SSI_STATUS_MOTION_NORMAL;
}
SSI_STATUS_MOTION CSO7_Proto::so7_motion_reset_controller_parameter()
@@ -2562,6 +2568,27 @@ SSI_STATUS_MOTION CSO7_Proto::Load_So7_Config()
g_machine.s_machine_config.motion.m_DebugOutputEnable=atoi(cTemp);
}
}
//=================Rotary========================
else if (!_stricmp(token,"ROTARY_AXIS_NUMBER"))
{
token = strtok( NULL, seps);
if (token)
{
strcpy(cTemp,token);
g_machine.s_machine_config.motion.m_RotaryAxisNO=atoi(cTemp);
}
}
else if (!_stricmp(token,"ROTARY_CIR_DIS"))
{
token = strtok( NULL, seps);
if (token)
{
strcpy(cTemp,token);
g_machine.s_machine_config.motion.m_RotaryCircleDis=atof(cTemp);
g_machine.s_machine_config.motion.m_RotaryCirclePulse=g_machine.s_machine_config.motion.m_RotaryCircleDis/ROTARY_MMtoScale_RESOLUTION;
}
}
//=================VideoCard========================
else if (!_stricmp(token,"SDK3000_SLEEP_COUNT"))
{
@@ -3368,7 +3395,6 @@ SSI_STATUS_MOTION CSO7_Proto::so7_motion_get_position_R(double & dRad)
bPlus=false;
}
int iRetryCnts(0);
g_machine.s_machine_config.motion.m_RotaryCirclePulse=g_machine.s_machine_config.motion.m_RotaryCircleDis/ROTARY_MMtoScale_RESOLUTION;
if (fabs(dR)-fabs(2.0*g_machine.s_machine_config.motion.m_RotaryCirclePulse)>100)
{
do