From 4e781a690f31e2b48027b2c35b4444d0407e761d Mon Sep 17 00:00:00 2001 From: TAO Cheng Date: Mon, 24 Feb 2014 21:33:42 +0800 Subject: [PATCH] =?UTF-8?q?Add=20Rotary=20axis=E3=80=82-Ed?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp | 11 +- .../Tools/UsbUtility/Debug/UtilityDebug.Log | 321 ++++++++++++++++++ .../Tools/UsbUtility/Debug/Utility_Config.ini | 20 +- .../Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc | 6 +- .../UsbUtility/UsbUtil/SO7_Move_Location.cpp | 4 +- .../Tools/UsbUtility/UsbUtil/SO7_UtilDlg.cpp | 31 +- .../Tools/UsbUtility/UsbUtil/SO7_UtilDlg.h | 1 + .../Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo | Bin 2355712 -> 2355712 bytes 8 files changed, 364 insertions(+), 30 deletions(-) diff --git a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp index fb02d60..3867cf3 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp @@ -4697,18 +4697,21 @@ SSI_STATUS_MOTION CSO7_Proto::_process_SO7_CMD_READ_AXIS_XYZ() g_machine.z._scale_pos._char_[1] = *(ep_buff[EP_82_DATA_IDX]._buffer+7); g_machine.z._scale_pos._char_[0] = *(ep_buff[EP_82_DATA_IDX]._buffer+8); g_machine.z._scale_pos._char_[3] = 0; - if (g_machine.x._scale_pos._long_ > 8388608) g_machine.x._scale_pos._long_=g_machine.x._scale_pos._long_-16777216; if (g_machine.y._scale_pos._long_ > 8388608) g_machine.y._scale_pos._long_=g_machine.y._scale_pos._long_-16777216; - if (g_machine.z._scale_pos._long_ > 8388608) - g_machine.z._scale_pos._long_=g_machine.z._scale_pos._long_-16777216; +// if (g_machine.z._scale_pos._long_ > 8388608) +// g_machine.z._scale_pos._long_=g_machine.z._scale_pos._long_-16777216; - return SSI_STATUS_MOTION_NORMAL; + // for rotary table + if (g_machine.z._scale_pos._long_ > 4194304) + g_machine.z._scale_pos._long_=g_machine.z._scale_pos._long_-8388608; + + return SSI_STATUS_MOTION_NORMAL; }; //============================================================== diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log index e2d58b2..cc79aed 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log @@ -3350,3 +3350,324 @@ Init:Open device succeed . _start_machine Exit: Exit_SO7Usb Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/Utility_Config.ini b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/Utility_Config.ini index 8e824a0..19bd7ef 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/Utility_Config.ini +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/Utility_Config.ini @@ -11,14 +11,14 @@ MOVETOSPEED_FAST_Z=0.00000000 MOVETOSPEED_SLOW_Z=0.00000000 MOVETOSPEED_SCALE_Z=1.00000000 ; -SPEED_BASE_X1=26 -SPEED_MAX_X1=20 +SPEED_BASE_X1=20 +SPEED_MAX_X1=120 SPEED_START_X1=20 SPEED_FRESH_X1=7 SPEED_SLOW_X1=3.600 ; SPEED_BASE_X2=16 -SPEED_MAX_X2=10 +SPEED_MAX_X2=100 SPEED_START_X2=12 SPEED_FRESH_X2=10 SPEED_SLOW_X2=1.000 @@ -42,13 +42,13 @@ SPEED_FRESH_X5=100 SPEED_SLOW_X5=0.000 ; SPEED_BASE_Y1=22 -SPEED_MAX_Y1=10 +SPEED_MAX_Y1=150 SPEED_START_Y1=20 SPEED_FRESH_Y1=8 SPEED_SLOW_Y1=2.500 ; SPEED_BASE_Y2=16 -SPEED_MAX_Y2=10 +SPEED_MAX_Y2=100 SPEED_START_Y2=12 SPEED_FRESH_Y2=10 SPEED_SLOW_Y2=1.000 @@ -103,11 +103,11 @@ SPEED_SLOW_Z5=0.000 ; X_MOTOR_PRECISION=0.008 Y_MOTOR_PRECISION=0.004 -Z_MOTOR_PRECISION=0.004 +Z_MOTOR_PRECISION=0.100 ; -X_MOTOR_WHEELBASE=1.500 -Y_MOTOR_WHEELBASE=1.500 -Z_MOTOR_WHEELBASE=1.500 +X_MOTOR_WHEELBASE=10.000 +Y_MOTOR_WHEELBASE=10.000 +Z_MOTOR_WHEELBASE=80.000 ; MOTOR_PULSE_NUM=10000 ; @@ -122,6 +122,6 @@ Z_NEG_WORKING_LIMIT=0.000 ; X_POS_WORKING_LIMIT=200.000 Y_POS_WORKING_LIMIT=300.000 -Z_POS_WORKING_LIMIT=200.000 +Z_POS_WORKING_LIMIT=40000.000 ROTARY_CIR_DIS=655355555.000 ; diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc index c9a1c91..e3ebdff 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc @@ -61,10 +61,10 @@ BEGIN PUSHBUTTON "Y+",IDC_BUTTON_SO7_MOVE_Y_FRONT,154,156,25,12 PUSHBUTTON "Y-",IDC_BUTTON_SO7_MOVE_Y_BACK,154,182,25,12 PUSHBUTTON "X+",IDC_BUTTON_SO7_MOVE_X_RIGHT,179,169,25,12 - PUSHBUTTON "Home XYZ",IDC_BUTTON_SO7_RESET_XYZ,277,154,76,14,BS_MULTILINE - PUSHBUTTON "Home Manual",IDC_BUTTON_MANUAL_HOME,277,135,76,14 + PUSHBUTTON "CT_RESET",IDC_BUTTON_SO7_RESET_XYZ,277,154,76,14,BS_MULTILINE + PUSHBUTTON "SET_RESET_FLAG",IDC_BUTTON_MANUAL_HOME,277,135,76,14 PUSHBUTTON "Home DCC",IDC_BUTTON_RESET_WORKTABLE,277,192,40,14 - PUSHBUTTON "Home Worktable Right",IDC_BUTTON_RESET_WORKTABLE_RIGHT,277,173,76,14 + PUSHBUTTON "CT_M_RESET_RIGHT",IDC_BUTTON_RESET_WORKTABLE_RIGHT,277,173,76,14 PUSHBUTTON "Auto Zoom",IDC_BUTTON_AUTO_ZOOM,360,156,32,27,BS_MULTILINE PUSHBUTTON "Set Reset Flag",IDC_BUTTON_SET_RESET_FLAG,133,108,61,14 PUSHBUTTON "Set outport",IDC_BUTTON_SET_OUT_PORT,181,240,61,14 diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Move_Location.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Move_Location.cpp index 31ce131..ee2c857 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Move_Location.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Move_Location.cpp @@ -161,7 +161,7 @@ BOOL CSO7_Move_Location::OnSetActive() m_OutMessageZ=_T(""); m_OutMessageV=_T(""); ((CButton*)GetDlgItem(IDC_BUTTON_BEGIN_REPE_TEST))->SetWindowTextW(_T("Begin")); - SetTimer(1,150,0); + SetTimer(1,50,0); return CPropertyPage::OnSetActive(); } //========================================================================================= @@ -851,7 +851,7 @@ void CSO7_Move_Location::OnBnClickedButtonBeginRepeTest() } ((CButton*)GetDlgItem(IDC_BUTTON_BEGIN_REPE_TEST))->SetWindowTextW(_T("Stop")); - SetTimer(2,200,0); + SetTimer(2,50,0); } } diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.cpp index 7b27a17..b88d9bc 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.cpp @@ -144,6 +144,7 @@ BEGIN_MESSAGE_MAP(CSO7_UtilDlg, CDialog) ON_BN_CLICKED(IDC_BUTTON_MOTION_PARAMETER, &CSO7_UtilDlg::OnBnClickedButtonMotionParameter) ON_BN_CLICKED(IDC_BUTTON_HOME, &CSO7_UtilDlg::OnBnClickedButtonHome) ON_BN_CLICKED(IDC_BUTTON_GO, &CSO7_UtilDlg::OnBnClickedButtonGo) + ON_BN_CLICKED(IDC_BUTTON_SO7_MOVE_Z_UP, &CSO7_UtilDlg::OnBnClickedButtonSo7MoveZUp) END_MESSAGE_MAP() @@ -392,8 +393,8 @@ void CSO7_UtilDlg::OnBnClickedButtonStartSo7machine() m_pSO7_Proto->_send_cmd_SO7_CMD_SET_GET_INTERRUPT_MSG_METHOD(m_pSO7_Proto->g_machine.s_machine_config.motion.GetInterruptMsgMethod); } UpdateCtrlsStatus(true); - SetTimer(1, 150, 0); - GetDlgItem(IDC_EDIT_UPDATE_FREQ)->SetWindowText(_T("150")); + SetTimer(1, 350, 0); + GetDlgItem(IDC_EDIT_UPDATE_FREQ)->SetWindowText(_T("350")); @@ -862,7 +863,7 @@ void CSO7_UtilDlg::OnBnClickedButtonMotionParameter() delete g_pVolComp; g_pVolComp=nullptr; } - SetTimer(1,150,NULL); + SetTimer(1,500,NULL); return; } @@ -883,7 +884,7 @@ void CSO7_UtilDlg::OnBnClickedButtonSetupSo7config() delete m_pSO7_AutoZoom; m_pSO7_AutoZoom=NULL; } - SetTimer(1,150,NULL); + SetTimer(1,500,NULL); } //================================================================================================ @@ -1277,8 +1278,6 @@ void CSO7_UtilDlg::OnTimer(UINT_PTR nIDEvent) GetDlgItem(IDC_EDIT_Y_POSITION_58)->SetWindowText(m_Y_Pos); m_Z_Pos.Format(_T("%8.4lf"), m_pSO7_Proto->g_machine.z._d_cur_pos_); GetDlgItem(IDC_EDIT_Z_POSITION_58)->SetWindowText(m_Z_Pos); - - m_Zm_Pos.Format(_T("%8ld"),(m_pSO7_Proto->g_machine.zm._scale_pos._long_)); GetDlgItem(IDC_EDIT_ZM_AXIS)->SetWindowText(m_Zm_Pos); } @@ -1357,7 +1356,7 @@ void CSO7_UtilDlg::OnBnClickedButtonSo7CncProgram() delete pSo7_Util_Program; pSo7_Util_Program=NULL; } - SetTimer(1,150,NULL); + SetTimer(1,500,NULL); } @@ -1376,25 +1375,29 @@ void CSO7_UtilDlg::OnBnClickedCheckSo7TurnOnFffLaser() //================================================= // Move one revolution 2**23 // When the rotary stop, take the curr pos - ref pos. -// m_pSO7_Proto->g_machine.z._scale_pos._long_ +// g_machine.z._pos_fixed._char_[3] // void CSO7_UtilDlg::OnBnClickedButtonHome() { - m_pSO7_Proto->g_machine.z._scale_pos._long_ = (long)m_pSO7_Proto->g_machine.z._d_cur_pos_ + (long)(2^23); - m_pSO7_Proto->_send_cmd_SO7_CMD_MOVE_TO_POS_Z(); + long lMax = 90000; // This value is try and error. there must be a mapping I do not understand. + m_pSO7_Proto->g_machine.x._pos_fixed._long_ = 0; + m_pSO7_Proto->g_machine.y._pos_fixed._long_ = 0; + m_pSO7_Proto->g_machine.z._pos_fixed._long_ = lMax; + m_pSO7_Proto->_send_cmd_SO7_CMD_MOVE_TO_POS_XYZ(CT_MOVETOXYZ); Sleep(200); m_pSO7_Proto->_send_cmd_SO7_CMD_READ_ZSIGNAL_POS_Z(); m_ZsignalPosZ=m_pSO7_Proto->g_machine.z._ZSignal_pos._long_; m_pSO7_Proto->_send_cmd_SO7_CMD_READ_AXIS_XYZ(); double lZ = m_pSO7_Proto->g_machine.z._scale_pos._long_; lZ; + // set the home position. // show the Z position in Angle // show the signal position in Angle } //================================================ -// Change Angle to Revolution +// Change Angle to scale // void CSO7_UtilDlg::OnBnClickedButtonGo() { @@ -1412,3 +1415,9 @@ void CSO7_UtilDlg::OnBnClickedButtonGo() }; m_pSO7_Proto->_send_cmd_SO7_CMD_MOVE_TO_POS_Z(); } + + +void CSO7_UtilDlg::OnBnClickedButtonSo7MoveZUp() +{ + // TODO: 在此添加控件通知处理程序代码 +} diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.h b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.h index cc00485..31fcc4b 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.h @@ -120,4 +120,5 @@ public: afx_msg void OnBnClickedButtonMotionParameter(); afx_msg void OnBnClickedButtonHome(); afx_msg void OnBnClickedButtonGo(); + afx_msg void OnBnClickedButtonSo7MoveZUp(); }; diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo index 1e654e5611876a09a63464f7f0c066e791f08597..b249e539f9617a54f90ae1e1a9095434a05e2000 100644 GIT binary patch delta 6998 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 U7(@smgc8CC;o8RK5$o6f8;$Zar2qf` delta 8218 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