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

新增so7_config.ini文件的参数，CNC运动停顿判断开关。V7.7

Browse Source
This commit is contained in:
TAO Cheng
2014-03-21 15:04:39 +08:00
parent d61bee185c
commit ba1d352b60
10 changed files with 208 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp
+28
View File
@@ -599,6 +599,8 @@ SSI_STATUS_MOTION CSO7_Proto::so7_config_para_set_default()
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_CNC_Deadlock_Solution=1;
g_machine.s_machine_config.motion.m_CNC_Deadlock_JudgeMaxCnts=6;
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;
@@ -2221,6 +2223,14 @@ SSI_STATUS_MOTION CSO7_Proto::Save_So7_Config()
fprintf(m_pOutFile,"%s", outBuff);
fprintf(m_pOutFile,"%d", g_machine.s_machine_config.motion.m_EQUIDIS_Z);
fprintf(m_pOutFile, "\n");
outBuff="CNC_DEADLOCK_SOLUTION=";
fprintf(m_pOutFile,"%s", outBuff);
fprintf(m_pOutFile,"%d", g_machine.s_machine_config.motion.m_CNC_Deadlock_Solution);
fprintf(m_pOutFile, "\n");
outBuff="CNC_DEADLOCK_MAX_CNTS=";
fprintf(m_pOutFile,"%s", outBuff);
fprintf(m_pOutFile,"%d", g_machine.s_machine_config.motion.m_CNC_Deadlock_JudgeMaxCnts);
fprintf(m_pOutFile, "\n");
outBuff="TOUCH_PROBE_ENABLE=";
fprintf(m_pOutFile,"%s", outBuff);
fprintf(m_pOutFile,"%d", g_machine.s_machine_config.motion.m_TouchProbeEnable);
@@ -2507,6 +2517,24 @@ SSI_STATUS_MOTION CSO7_Proto::Load_So7_Config()
g_machine.s_machine_config.motion.m_EQUIDIS_Z=atoi(cTemp);
}
}
else if (!_stricmp(token,"CNC_DEADLOCK_SOLUTION"))
{
token = strtok( NULL, seps);
if (token)
{
strcpy(cTemp,token);
g_machine.s_machine_config.motion.m_CNC_Deadlock_Solution=atoi(cTemp);
}
}
else if (!_stricmp(token,"CNC_DEADLOCK_MAX_CNTS"))
{
token = strtok( NULL, seps);
if (token)
{
strcpy(cTemp,token);
g_machine.s_machine_config.motion.m_CNC_Deadlock_JudgeMaxCnts=atoi(cTemp);
}
}
else if (!_stricmp(token,"TOUCH_PROBE_ENABLE"))
{
token = strtok( NULL, seps);