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

统一参数配置。

Browse Source
This commit is contained in:
TAO Cheng
2014-02-11 09:04:54 +08:00
parent c7c61c05ff
commit a4ba2c6a6f
9 changed files with 210 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp
+17 -5
View File
@@ -461,7 +461,6 @@ CSO7_Proto::CSO7_Proto()
g_machine.GetInterruptMsg[i][j]=0;
}
}
g_machine.GetInterruptMsgMethod=E_GET_INTERRUPT_MSG_INTERRUPT;//E_GET_INTERRUPT_MSG_INQUIRY;
g_machine.IsSupportReadInterrputMsg=FALSE;
g_machine.IsOffline=TRUE;
g_machine.FPGAData=0;
@@ -494,7 +493,7 @@ CSO7_Proto::CSO7_Proto()
g_machine.s_lights_value._spare_light1=1;
g_machine.s_lights_value.segment[0]=0;
g_machine.s_lights_value.segment[1]=0;
g_machine.dRotaryCirclDis=100;
g_machine.Light_Size=0;
g_machine.Light_Switch=0;
@@ -539,7 +538,7 @@ CSO7_Proto::CSO7_Proto()
g_machine.s_machine_config.motion._ShiftPositionZ=0.0;
g_machine.s_machine_config.motion.m_CntThreadSleepVal=550000;
g_machine.s_machine_config.motion.GetInterruptMsgMethod=1;
g_machine.s_machine_config.motion.GetInterruptMsgMethod=E_GET_INTERRUPT_MSG_INTERRUPT;//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;
@@ -1116,6 +1115,11 @@ SSI_STATUS_MOTION CSO7_Proto::Save_SevenOcean_Inifile(CString path_and_fileName)
fprintf(m_pOutFile,"%s", outBuff);
fprintf(m_pOutFile,"%.3f", g_machine.s_machine_config.z_axis._pos_working_limit);
fprintf(m_pOutFile, "\n");
outBuff="ROTARY_CIR_DIS=";
fprintf(m_pOutFile,"%s", outBuff);
fprintf(m_pOutFile,"%.3f", g_machine.dRotaryCirclDis);
fprintf(m_pOutFile, "\n");
fprintf(m_pOutFile,"%s", ";\n");
fclose(m_pOutFile);
@@ -2063,7 +2067,15 @@ SSI_STATUS_MOTION CSO7_Proto::Load_SevenOcean_Inifile(CString cso7IniFile)
g_machine.s_machine_config.z_axis._pos_working_limit=atof(cTemp);
}
}
else if (!_stricmp(token,"ROTARY_CIR_DIS"))
{
token = strtok( NULL, seps);
if (token)
{
strcpy(cTemp,token);
g_machine.dRotaryCirclDis=atof(cTemp);
}
}
}
}
fclose(hConfigFile);
@@ -3171,7 +3183,7 @@ SSI_STATUS_MOTION CSO7_Proto::so7_motion_is_finished(char MotionType,BOOL& IsFin
//WaitForSingleObject(g_hHomedEvent, INFINITE); // machine start and homing is done
BOOL bIsFinised(FALSE);
if (g_machine.GetInterruptMsgMethod==E_GET_INTERRUPT_MSG_INQUIRY)
if (g_machine.s_machine_config.motion.GetInterruptMsgMethod==E_GET_INTERRUPT_MSG_INQUIRY)
{
_send_cmd_SO7_CMD_GET_INTERRUPT_MSG(MotionType);
if (g_machine.GetInterruptMsg[MotionType][0]==CT_STOPXYZ)
PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h
+3 -3
View File
@@ -121,8 +121,7 @@ struct s_so7_axis_config // axis configuration
long _scale_range;
double _neg_working_limit;
double _pos_working_limit;
double _scale_resolution;
double _scale_resolution;
bool _bhomed;
};
struct s_so7_zm_axis_config // zm configuration
@@ -232,9 +231,10 @@ struct struct_so7_machine
char FirmwareInfo[10];
int FirmwareVer;
char GetInterruptMsg[20][2];
char GetInterruptMsgMethod;
BOOL IsOffline;
BOOL IsSupportReadInterrputMsg;
double dRotaryCirclDis;
struct s_so7_axis x;
struct s_so7_axis y;
struct s_so7_axis z;