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

新增LK_H激光对话框，新增多种复位方式。

Browse Source
This commit is contained in:
TAO Cheng
2013-10-21 11:31:34 +08:00
parent f14a72d4e7
commit 842c95f8b1
16 changed files with 467 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/CMD_H.h
+13
View File
@@ -347,4 +347,17 @@ CT_CLEAR_PROBE_FLAG,
CT_READ_IO_DAT,
CT_WRITE_IO_DAT
};
enum EHOME_MODE
{
CT_HOME_XYZ=1,
CT_HOME_X=10,
CT_HOME_Y,
CT_HOME_Z,
CT_HOME_XY=20,
CT_HOME_XZ,
CT_HOME_YZ,
CT_HOME_TOATAL=255
};
PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp
+3 -3
View File
@@ -2764,9 +2764,9 @@ SSI_STATUS_MOTION CSO7_Proto::so7_motion_probe_on_off_(bool _bOnOff)
};
//==============================================================
SSI_STATUS_MOTION CSO7_Proto::so7_motion_reset_worktable_lower_left()
SSI_STATUS_MOTION CSO7_Proto::so7_motion_reset_worktable_lower_left(char _HomeMode)
{
_send_cmd_SO7_CMD_COMMON_COMMAND(CT_MOTOR,CT_M_RESET_LEFT,1);
_send_cmd_SO7_CMD_COMMON_COMMAND(CT_MOTOR,CT_M_RESET_LEFT,_HomeMode);
return SSI_STATUS_MOTION_NORMAL;
};
@@ -2868,7 +2868,7 @@ SSI_STATUS_MOTION CSO7_Proto::so7_motion_Dcc_Home()
m_bHomingActive = true; // Tell the world we need to home the stage
// Home
so7_motion_reset_worktable_lower_left();
so7_motion_reset_worktable_lower_left(CT_HOME_XYZ);
g_pLogger->SendAndFlushPerMode(_T("so7_motion_reset_worktable_lower_left.\n"));
TRACE0(" - waiting for X,Y,Zm to stop moving\n");
PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h
+1 -1
View File
@@ -341,7 +341,7 @@ public:
SSI_STATUS_MOTION _start_machine();
SSI_STATUS_MOTION _shutdown_machine();
SSI_STATUS_MOTION so7_motion_probe_on_off_(bool _bOnOff);
SSI_STATUS_MOTION so7_motion_reset_worktable_lower_left();
SSI_STATUS_MOTION so7_motion_reset_worktable_lower_left(char _HomeMode);
SSI_STATUS_MOTION so7_motion_reset_worktable_top_right();
SSI_STATUS_MOTION so7_motion_stop_motor_to_get_laser_data();
SSI_STATUS_MOTION so7_motion_laser_on_off(bool _bOnOff);