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 5f37d3a..019546d 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log @@ -4467,3 +4467,69 @@ 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. +Unable to open device Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Unable to open device Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Unable to open device 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 +Unable to open device Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Unable to open device 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 +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine 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 1dc2fcf..7b7701f 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 @@ -1,6 +1,6 @@ [HARDWARE] -MOVETOSPEED_FAST_X=50.00000000 -MOVETOSPEED_SLOW_X=100.00000000 +MOVETOSPEED_FAST_X=0.00000000 +MOVETOSPEED_SLOW_X=0.00000000 MOVETOSPEED_SCALE_X=1.00000000 ; MOVETOSPEED_FAST_Y=0.00000000 @@ -11,117 +11,117 @@ MOVETOSPEED_FAST_Z=0.00000000 MOVETOSPEED_SLOW_Z=0.00000000 MOVETOSPEED_SCALE_Z=1.00000000 ; -SPEED_BASE_X1=20 -SPEED_MAX_X1=20 -SPEED_START_X1=20 -SPEED_FRESH_X1=8 -SPEED_SLOW_X1=2.000 +SPEED_BASE_X1=0 +SPEED_MAX_X1=0 +SPEED_START_X1=0 +SPEED_FRESH_X1=0 +SPEED_SLOW_X1=0.000 ; -SPEED_BASE_X2=16 -SPEED_MAX_X2=10 -SPEED_START_X2=12 -SPEED_FRESH_X2=10 -SPEED_SLOW_X2=1.000 +SPEED_BASE_X2=0 +SPEED_MAX_X2=0 +SPEED_START_X2=0 +SPEED_FRESH_X2=0 +SPEED_SLOW_X2=0.000 ; -SPEED_BASE_X3=2 +SPEED_BASE_X3=0 SPEED_MAX_X3=0 -SPEED_START_X3=8 -SPEED_FRESH_X3=10 -SPEED_SLOW_X3=0.500 +SPEED_START_X3=0 +SPEED_FRESH_X3=0 +SPEED_SLOW_X3=0.000 ; -SPEED_BASE_X4=2 +SPEED_BASE_X4=0 SPEED_MAX_X4=0 -SPEED_START_X4=5 -SPEED_FRESH_X4=10 -SPEED_SLOW_X4=0.100 +SPEED_START_X4=0 +SPEED_FRESH_X4=0 +SPEED_SLOW_X4=0.000 ; -SPEED_BASE_X5=2 +SPEED_BASE_X5=0 SPEED_MAX_X5=0 -SPEED_START_X5=50 -SPEED_FRESH_X5=10 -SPEED_SLOW_X5=0.100 +SPEED_START_X5=0 +SPEED_FRESH_X5=0 +SPEED_SLOW_X5=0.000 ; -SPEED_BASE_Y1=20 -SPEED_MAX_Y1=10 -SPEED_START_Y1=20 -SPEED_FRESH_Y1=8 -SPEED_SLOW_Y1=2.000 +SPEED_BASE_Y1=0 +SPEED_MAX_Y1=0 +SPEED_START_Y1=0 +SPEED_FRESH_Y1=0 +SPEED_SLOW_Y1=0.000 ; -SPEED_BASE_Y2=16 -SPEED_MAX_Y2=10 -SPEED_START_Y2=12 -SPEED_FRESH_Y2=10 -SPEED_SLOW_Y2=1.000 +SPEED_BASE_Y2=0 +SPEED_MAX_Y2=0 +SPEED_START_Y2=0 +SPEED_FRESH_Y2=0 +SPEED_SLOW_Y2=0.000 ; -SPEED_BASE_Y3=2 +SPEED_BASE_Y3=0 SPEED_MAX_Y3=0 -SPEED_START_Y3=8 -SPEED_FRESH_Y3=10 -SPEED_SLOW_Y3=0.500 +SPEED_START_Y3=0 +SPEED_FRESH_Y3=0 +SPEED_SLOW_Y3=0.000 ; SPEED_BASE_Y4=0 SPEED_MAX_Y4=0 -SPEED_START_Y4=10 -SPEED_FRESH_Y4=10 -SPEED_SLOW_Y4=0.100 +SPEED_START_Y4=0 +SPEED_FRESH_Y4=0 +SPEED_SLOW_Y4=0.000 ; -SPEED_BASE_Y5=1 +SPEED_BASE_Y5=0 SPEED_MAX_Y5=0 -SPEED_START_Y5=50 -SPEED_FRESH_Y5=10 -SPEED_SLOW_Y5=0.100 +SPEED_START_Y5=0 +SPEED_FRESH_Y5=0 +SPEED_SLOW_Y5=0.000 ; -SPEED_BASE_Z1=20 -SPEED_MAX_Z1=100 -SPEED_START_Z1=150 -SPEED_FRESH_Z1=8 -SPEED_SLOW_Z1=2.500 +SPEED_BASE_Z1=0 +SPEED_MAX_Z1=0 +SPEED_START_Z1=0 +SPEED_FRESH_Z1=0 +SPEED_SLOW_Z1=0.000 ; -SPEED_BASE_Z2=16 -SPEED_MAX_Z2=10 -SPEED_START_Z2=100 -SPEED_FRESH_Z2=10 -SPEED_SLOW_Z2=1.500 +SPEED_BASE_Z2=0 +SPEED_MAX_Z2=0 +SPEED_START_Z2=0 +SPEED_FRESH_Z2=0 +SPEED_SLOW_Z2=0.000 ; -SPEED_BASE_Z3=3 -SPEED_MAX_Z3=5 -SPEED_START_Z3=5 -SPEED_FRESH_Z3=10 -SPEED_SLOW_Z3=0.100 +SPEED_BASE_Z3=0 +SPEED_MAX_Z3=0 +SPEED_START_Z3=0 +SPEED_FRESH_Z3=0 +SPEED_SLOW_Z3=0.000 ; -SPEED_BASE_Z4=2 +SPEED_BASE_Z4=0 SPEED_MAX_Z4=0 -SPEED_START_Z4=18 -SPEED_FRESH_Z4=10 -SPEED_SLOW_Z4=0.100 +SPEED_START_Z4=0 +SPEED_FRESH_Z4=0 +SPEED_SLOW_Z4=0.000 ; -SPEED_BASE_Z5=5 -SPEED_MAX_Z5=6 -SPEED_START_Z5=133 -SPEED_FRESH_Z5=10 -SPEED_SLOW_Z5=0.100 +SPEED_BASE_Z5=0 +SPEED_MAX_Z5=0 +SPEED_START_Z5=0 +SPEED_FRESH_Z5=0 +SPEED_SLOW_Z5=0.000 ; -X_MOTOR_PRECISION=0.004 -Y_MOTOR_PRECISION=0.008 -Z_MOTOR_PRECISION=0.004 +X_MOTOR_PRECISION=0.000 +Y_MOTOR_PRECISION=0.000 +Z_MOTOR_PRECISION=0.000 ; -X_MOTOR_WHEELBASE=1.200 -Y_MOTOR_WHEELBASE=1.200 -Z_MOTOR_WHEELBASE=1.200 +X_MOTOR_WHEELBASE=0.000 +Y_MOTOR_WHEELBASE=0.000 +Z_MOTOR_WHEELBASE=0.000 ; MOTOR_PULSE_NUM=10000 ; [WORKTABLE] -X_SCALE_RESOLUTION=0.400 -Y_SCALE_RESOLUTION=0.400 -Z_SCALE_RESOLUTION=0.400 +X_SCALE_RESOLUTION=0.500 +Y_SCALE_RESOLUTION=0.500 +Z_SCALE_RESOLUTION=0.500 ; X_NEG_WORKING_LIMIT=0.000 Y_NEG_WORKING_LIMIT=0.000 Z_NEG_WORKING_LIMIT=0.000 ; -X_POS_WORKING_LIMIT=200.000 +X_POS_WORKING_LIMIT=400.000 Y_POS_WORKING_LIMIT=300.000 -Z_POS_WORKING_LIMIT=40000.000 -ROTARY_CIR_DIS=655355555.000 +Z_POS_WORKING_LIMIT=200.000 +ROTARY_CIR_DIS=100.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 2f832a2..1377992 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 @@ -2417,8 +2417,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 7,7,0,0 - PRODUCTVERSION 7,7,0,0 + FILEVERSION 8,0,0,0 + PRODUCTVERSION 8,0,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -2435,12 +2435,12 @@ BEGIN BEGIN VALUE "CompanyName", "Hexagon Metrology" VALUE "FileDescription", "Utility for Hexagon Metrology" - VALUE "FileVersion", "7.7.0.0" + VALUE "FileVersion", "8.0.0.0" VALUE "InternalName", "Usb_Util.exe" VALUE "LegalCopyright", "Copyright 2014 Hexagon Metrology." VALUE "OriginalFilename", "Usb_Util.exe" VALUE "ProductName", "Utility" - VALUE "ProductVersion", "7.7.0.0" + VALUE "ProductVersion", "8.0.0.0" END END BLOCK "VarFileInfo" 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 190f685..d244be6 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 @@ -457,6 +457,10 @@ void CSO7_UtilDlg::OnBnClickedButtonStopSo7machine() OutputWithScroll(m_OutMessage,m_edMSG); UpdateCtrlsStatus(false); KillTimer(1); + if(m_pSO7_Proto->g_machine.IsSupportReadInterrputMsg) + { + m_pSO7_Proto->_send_cmd_SO7_CMD_SET_GET_INTERRUPT_MSG_METHOD(E_GET_INTERRUPT_MSG_INTERRUPT); + } m_pSO7_Proto->_shutdown_machine(); OnBnClickedButtonTermSo7usb(); 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 d3ebbf8..a1fa219 100644 Binary files a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo and b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo differ