From a71aa9182fd592f36723248d04fdb4bef7cc6d93 Mon Sep 17 00:00:00 2001 From: TAO Cheng Date: Thu, 27 Mar 2014 17:03:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=81=A2=E5=A4=8DUSB?= =?UTF-8?q?=E8=AF=BB=E5=8F=96=E5=AE=9A=E4=BD=8D=E5=AE=8C=E6=88=90=E7=9A=84?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=B8=BA=E4=B8=AD=E6=96=AD=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E3=80=82V8.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tools/UsbUtility/Debug/UtilityDebug.Log | 66 +++++++ .../Tools/UsbUtility/Debug/Utility_Config.ini | 162 +++++++++--------- .../Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc | 8 +- .../Tools/UsbUtility/UsbUtil/SO7_UtilDlg.cpp | 4 + .../Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo | Bin 2355712 -> 2355712 bytes 5 files changed, 155 insertions(+), 85 deletions(-) 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 d3ebbf89ee8afa2692ba15d2a4678f5fd22e7a42..a1fa219652a703c13da6069799014bafc9bc9ddc 100644 GIT binary patch delta 3170 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 Ky0?yXKm1=7#WM&1 delta 3227 zcmcJReNOsz~l%#jQkL_i%xK12r{ov!F) zWhruqZ7wxn49i6==vh;Z;&Lo_qrm^{=EpPbE|kge4#d*q_Xz^kJWVri7C! zfpDq#uszcP50Uu5eO0wzrVO!8(bOPDANI@g<~>q8uZ}p&d!-n+rIa146fa9t6yU0e@RmGmgHRw?(u|_MbbS= z`m-sAfFE0W4hzS)1?j=lJ;f1y%*F z91Xzk9K^^37iTgVXucz3=heB}*{VtUx4CXGcD1llh!s`{74#E?DMTx8PJW3WT za-U7V<4s#~QD`Nbw5EIA18ID5kW_oXOj2a+H}3)pmvRq!uY zp5+Cr-{L1$9TYDMB|JOtcw-P7kMRXe0Z-mnn!s%3L^>(!Ng%xO2SRcGMI7a8r5YO9E~y)1{@mId%LUnF8( z5sStBOXMO{!$G2+{HglK-<#)Ap0-ipgPT6(woM;niyiW@V3jl#6n?b*ZJyQkO~-G0 zW$Eqv9S(0hEyF4O-REYx!FB{ItV8VxOvRgjV;+3dx1MkUXP1fx@LHVci`T}<{$q}m zTD2v9DN%p8rLU~+Ex_4df*;o2V*a|hM`g@g)>%V`-1xHOhMFJq_Nkgx_}+KTwV8h( zUia9!C#^RG9+ne?1@WNhw_jf1B|SVk7G8ZglV`{Y`tV^-1$}R^qQ+ttj0Kw|iJyKW zna5l5u*=S_*MA<4hgu<+r+Ikj^EXM&&fD%!3wN zarL6|l*h}fSC_BNC|_H$8V9aRiPj>|4^oTOovNS;*euGwtUr)}W-fT?V)q@9w|7tC zlRk*#{KGP|MaU`GKMy>3+}n}ZeOt2N?Od3NGom0&KlZ^q=rGB&V@9W=55L#PERaF+ z+)*7L?sZL(SHGXhPo7Ee{1fF|C!C4z>7J|49_)gS({q^e2x%4&uI(b9r>`S?V_!5L zde1p?d8+(5sjiNwjzh4X)|c)9oqVg;(_HH#1HI)ec40bPzxd4hc z)wGN@ZEc}1g`k83MJ$1P1tQ61SwkhCVA`Iu=BOmERbO)7K5X z26+yD%_2HsJ!D>;e7K)5q#HE zp5Q!8${PKtXwI@4_?hFOGXPGK3(5(`a3CyTJZoAYuUi@cpW@RYu=PhL2hVO>-x>;T z+&5lDbt0JP6A7~o+6_Ho=T!I(8iOFhh=_qa#*a- zp@z8-RKN$BJi(Zd1Lxsz*d4}q9kc6U z6@K*;JPzil!&>o*O^(C5h2Vj)HaXJizgOTV{>>%{Sa3&Dad$n08QsfZj)G_2U{=Fg z0nb2d3DwcfhzIZRMpTnfMzxJY=d$IZ+0*PjXJo{`T|HSF%ir2 z;Lv{`7JJ&*L%1(gzU1$8n9T7sEN--#p|4SOIJS{s1j z><1y*__`iE0MpVS#0Y7GcGkKNq{FsjjG?w&ion(_5NM<|L3$)_w@4x7!rJ>cdEN7y zV-yNv=<>DUvM?5ntca*loYjNzkb`xL7hUndPR!mZ`(fQ2QN{zQ;tF&; zE!&O!wQ@Odb23$pU}gf&dYw63WsJT1*($(U8RELuT;^u{`4=n+c*SuaRJY2@jjDXM z3(z(QGVcB>_!~D5vwaXw({-kAnpD@jeZ$DxY#ezvy`cWg4dvQ&uC3&7)pR{fXJGUw zf&YAsz5IV`{OA-hy0wIPV0|=u5c`+Yqp*mb!rB$=vUq|*#;}qlKZGH8t(f^^|8c1b z&wMBa7|&O*4S-E+*$YPgdKR9+YZVpid)ah;GtrLT$5~Z)Siqn&WN+hu(Q;#zjVc#Q`Kdw$u8%t#qTN)*`bB%0Tc>1&`x(vK6D}-{POehq}`O%t( z@iLbkShPVd;B$)TillhO-RbGhusW