From 92299ad02a2f6b4f70d2e7a60f931c5c496894eb Mon Sep 17 00:00:00 2001 From: TAO Cheng Date: Wed, 28 May 2014 14:36:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9config=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp | 21 +-- .../Tools/UsbUtility/Debug/UtilityDebug.Log | 4 + .../Tools/UsbUtility/Debug/Utility_Config.ini | 140 +++++++++--------- .../Hsi/Tools/UsbUtility/Debug/so7_config.ini | 13 ++ .../Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc | 23 +-- .../Tools/UsbUtility/UsbUtil/SO7_UtilDlg.cpp | 52 ++----- .../Tools/UsbUtility/UsbUtil/SO7_UtilDlg.h | 4 +- .../Hsi/Tools/UsbUtility/UsbUtil/resource.h | 4 +- .../Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo | Bin 135680 -> 135680 bytes .../UsbUtility/Win32TestDll/Win32TestDll.cpp | 46 +++--- 10 files changed, 154 insertions(+), 153 deletions(-) diff --git a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp index 9b3b684..27462bb 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp @@ -2309,42 +2309,43 @@ SSI_STATUS_MOTION CSO7_Proto::Save_So7_Config() outBuff="[CUSTOM_MACHINE]"; fprintf(m_pOutFile,"%s", outBuff); + fprintf(m_pOutFile, "\n"); outBuff="X_SCALE_RESOLUTION="; fprintf(m_pOutFile,"%s", outBuff); - fprintf(m_pOutFile,"%d", g_machine.s_machine_config.x_axis._scale_resolution); + fprintf(m_pOutFile,"%.6f", g_machine.s_machine_config.x_axis._scale_resolution); fprintf(m_pOutFile, "\n"); outBuff="Y_SCALE_RESOLUTION="; fprintf(m_pOutFile,"%s", outBuff); - fprintf(m_pOutFile,"%d", g_machine.s_machine_config.y_axis._scale_resolution); + fprintf(m_pOutFile,"%.6f", g_machine.s_machine_config.y_axis._scale_resolution); fprintf(m_pOutFile, "\n"); outBuff="Z_SCALE_RESOLUTION="; fprintf(m_pOutFile,"%s", outBuff); - fprintf(m_pOutFile,"%d", g_machine.s_machine_config.z_axis._scale_resolution); + fprintf(m_pOutFile,"%.6f", g_machine.s_machine_config.z_axis._scale_resolution); fprintf(m_pOutFile, "\n"); outBuff="X_NEG_WORKING_LIMIT="; fprintf(m_pOutFile,"%s", outBuff); - fprintf(m_pOutFile,"%d", g_machine.s_machine_config.x_axis._neg_working_limit); + fprintf(m_pOutFile,"%.6f", g_machine.s_machine_config.x_axis._neg_working_limit); fprintf(m_pOutFile, "\n"); outBuff="X_POS_WORKING_LIMIT="; fprintf(m_pOutFile,"%s", outBuff); - fprintf(m_pOutFile,"%d", g_machine.s_machine_config.x_axis._pos_working_limit); + fprintf(m_pOutFile,"%.6f", g_machine.s_machine_config.x_axis._pos_working_limit); fprintf(m_pOutFile, "\n"); outBuff="Y_NEG_WORKING_LIMIT="; fprintf(m_pOutFile,"%s", outBuff); - fprintf(m_pOutFile,"%d", g_machine.s_machine_config.y_axis._neg_working_limit); + fprintf(m_pOutFile,"%.6f", g_machine.s_machine_config.y_axis._neg_working_limit); fprintf(m_pOutFile, "\n"); outBuff="Y_POS_WORKING_LIMIT="; fprintf(m_pOutFile,"%s", outBuff); - fprintf(m_pOutFile,"%d", g_machine.s_machine_config.y_axis._pos_working_limit); + fprintf(m_pOutFile,"%.6f", g_machine.s_machine_config.y_axis._pos_working_limit); fprintf(m_pOutFile, "\n"); outBuff="Z_NEG_WORKING_LIMIT="; fprintf(m_pOutFile,"%s", outBuff); - fprintf(m_pOutFile,"%d", g_machine.s_machine_config.z_axis._neg_working_limit); + fprintf(m_pOutFile,"%.6f", g_machine.s_machine_config.z_axis._neg_working_limit); fprintf(m_pOutFile, "\n"); outBuff="Z_POS_WORKING_LIMIT="; fprintf(m_pOutFile,"%s", outBuff); - fprintf(m_pOutFile,"%d", g_machine.s_machine_config.z_axis._pos_working_limit); + fprintf(m_pOutFile,"%.6f", g_machine.s_machine_config.z_axis._pos_working_limit); fprintf(m_pOutFile, "\n"); outBuff="ROTARY_AXIS_NUMBER="; fprintf(m_pOutFile,"%s", outBuff); @@ -2352,7 +2353,7 @@ SSI_STATUS_MOTION CSO7_Proto::Save_So7_Config() fprintf(m_pOutFile, "\n"); outBuff="ROTARY_CIR_DIS="; fprintf(m_pOutFile,"%s", outBuff); - fprintf(m_pOutFile,"%d", g_machine.s_machine_config.motion.m_RotaryCircleDis); + fprintf(m_pOutFile,"%.6f", g_machine.s_machine_config.motion.m_RotaryCircleDis); fprintf(m_pOutFile, "\n"); fprintf(m_pOutFile, ";\n"); 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 e832905..2396879 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log @@ -4574,3 +4574,7 @@ Usb Port Initialized. Usb Port Initialized. Usb Port Initialized. Usb Port Initialized. +Usb Port Initialized. +Usb Port Initialized. +Usb Port Initialized. +Usb Port Initialized. 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 7b7701f..95bacbe 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,99 +11,99 @@ MOVETOSPEED_FAST_Z=0.00000000 MOVETOSPEED_SLOW_Z=0.00000000 MOVETOSPEED_SCALE_Z=1.00000000 ; -SPEED_BASE_X1=0 -SPEED_MAX_X1=0 -SPEED_START_X1=0 -SPEED_FRESH_X1=0 -SPEED_SLOW_X1=0.000 +SPEED_BASE_X1=28 +SPEED_MAX_X1=30 +SPEED_START_X1=20 +SPEED_FRESH_X1=8 +SPEED_SLOW_X1=3.000 ; -SPEED_BASE_X2=0 -SPEED_MAX_X2=0 -SPEED_START_X2=0 -SPEED_FRESH_X2=0 -SPEED_SLOW_X2=0.000 +SPEED_BASE_X2=16 +SPEED_MAX_X2=10 +SPEED_START_X2=12 +SPEED_FRESH_X2=10 +SPEED_SLOW_X2=2.000 ; -SPEED_BASE_X3=0 +SPEED_BASE_X3=2 SPEED_MAX_X3=0 SPEED_START_X3=0 -SPEED_FRESH_X3=0 -SPEED_SLOW_X3=0.000 +SPEED_FRESH_X3=100 +SPEED_SLOW_X3=0.001 ; -SPEED_BASE_X4=0 +SPEED_BASE_X4=2 SPEED_MAX_X4=0 -SPEED_START_X4=0 -SPEED_FRESH_X4=0 -SPEED_SLOW_X4=0.000 +SPEED_START_X4=5 +SPEED_FRESH_X4=100 +SPEED_SLOW_X4=0.001 ; -SPEED_BASE_X5=0 +SPEED_BASE_X5=2 SPEED_MAX_X5=0 -SPEED_START_X5=0 -SPEED_FRESH_X5=0 +SPEED_START_X5=50 +SPEED_FRESH_X5=100 SPEED_SLOW_X5=0.000 ; -SPEED_BASE_Y1=0 -SPEED_MAX_Y1=0 -SPEED_START_Y1=0 -SPEED_FRESH_Y1=0 -SPEED_SLOW_Y1=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_Y2=0 -SPEED_MAX_Y2=0 -SPEED_START_Y2=0 -SPEED_FRESH_Y2=0 -SPEED_SLOW_Y2=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_Y3=0 +SPEED_BASE_Y3=2 SPEED_MAX_Y3=0 SPEED_START_Y3=0 -SPEED_FRESH_Y3=0 -SPEED_SLOW_Y3=0.000 +SPEED_FRESH_Y3=100 +SPEED_SLOW_Y3=0.001 ; -SPEED_BASE_Y4=0 +SPEED_BASE_Y4=2 SPEED_MAX_Y4=0 -SPEED_START_Y4=0 -SPEED_FRESH_Y4=0 -SPEED_SLOW_Y4=0.000 +SPEED_START_Y4=10 +SPEED_FRESH_Y4=100 +SPEED_SLOW_Y4=0.001 ; -SPEED_BASE_Y5=0 +SPEED_BASE_Y5=2 SPEED_MAX_Y5=0 -SPEED_START_Y5=0 -SPEED_FRESH_Y5=0 +SPEED_START_Y5=50 +SPEED_FRESH_Y5=100 SPEED_SLOW_Y5=0.000 ; -SPEED_BASE_Z1=0 -SPEED_MAX_Z1=0 -SPEED_START_Z1=0 -SPEED_FRESH_Z1=0 -SPEED_SLOW_Z1=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_Z2=0 -SPEED_MAX_Z2=0 -SPEED_START_Z2=0 -SPEED_FRESH_Z2=0 -SPEED_SLOW_Z2=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_Z3=0 -SPEED_MAX_Z3=0 -SPEED_START_Z3=0 -SPEED_FRESH_Z3=0 -SPEED_SLOW_Z3=0.000 +SPEED_BASE_Z3=3 +SPEED_MAX_Z3=5 +SPEED_START_Z3=5 +SPEED_FRESH_Z3=100 +SPEED_SLOW_Z3=0.001 ; -SPEED_BASE_Z4=0 +SPEED_BASE_Z4=2 SPEED_MAX_Z4=0 -SPEED_START_Z4=0 -SPEED_FRESH_Z4=0 -SPEED_SLOW_Z4=0.000 +SPEED_START_Z4=18 +SPEED_FRESH_Z4=100 +SPEED_SLOW_Z4=0.001 ; -SPEED_BASE_Z5=0 -SPEED_MAX_Z5=0 -SPEED_START_Z5=0 -SPEED_FRESH_Z5=0 +SPEED_BASE_Z5=2 +SPEED_MAX_Z5=6 +SPEED_START_Z5=133 +SPEED_FRESH_Z5=100 SPEED_SLOW_Z5=0.000 ; -X_MOTOR_PRECISION=0.000 -Y_MOTOR_PRECISION=0.000 -Z_MOTOR_PRECISION=0.000 +X_MOTOR_PRECISION=0.008 +Y_MOTOR_PRECISION=0.004 +Z_MOTOR_PRECISION=0.004 ; X_MOTOR_WHEELBASE=0.000 Y_MOTOR_WHEELBASE=0.000 @@ -116,12 +116,12 @@ 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 +X_NEG_WORKING_LIMIT=-16.000 +Y_NEG_WORKING_LIMIT=-40.000 Z_NEG_WORKING_LIMIT=0.000 ; -X_POS_WORKING_LIMIT=400.000 -Y_POS_WORKING_LIMIT=300.000 +X_POS_WORKING_LIMIT=100.000 +Y_POS_WORKING_LIMIT=8.000 Z_POS_WORKING_LIMIT=200.000 ROTARY_CIR_DIS=100.000 ; diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/so7_config.ini b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/so7_config.ini index 3bd59b5..c3f078e 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/so7_config.ini +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/so7_config.ini @@ -42,3 +42,16 @@ SV4000E_DENOISE_PARA_CHANNEL4=70 MACHINE_CONTROLLER_TYPE=0 MACHINE_VIDEOCARD_TYPE=0 ; +[CUSTOM_MACHINE] +X_SCALE_RESOLUTION=0.500000 +Y_SCALE_RESOLUTION=0.500000 +Z_SCALE_RESOLUTION=0.500000 +X_NEG_WORKING_LIMIT=-16.000000 +X_POS_WORKING_LIMIT=100.000000 +Y_NEG_WORKING_LIMIT=-40.000000 +Y_POS_WORKING_LIMIT=8.000000 +Z_NEG_WORKING_LIMIT=0.000000 +Z_POS_WORKING_LIMIT=200.000000 +ROTARY_AXIS_NUMBER=0 +ROTARY_CIR_DIS=0.000000 +; 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 1162a92..4e0a381 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 @@ -16,7 +16,7 @@ #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// Chinese (Simplified, PRC) resources +// 中文(简体，中国) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS) LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED @@ -84,9 +84,9 @@ BEGIN PUSHBUTTON "Test AutoZoom",IDC_BUTTON_AUTO_ZOOM,29,82,63,18,BS_MULTILINE PUSHBUTTON "Set Reset Flag",IDC_BUTTON_SET_RESET_FLAG,104,108,60,15 PUSHBUTTON "Home V",IDC_BUTTON_RESET_V,167,87,60,15 - EDITTEXT IDC_EDIT_X_SCALE_COEFFICIENT,64,286,39,12,ES_CENTER | ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_Y_SCALE_COEFFICIENT,123,286,39,12,ES_CENTER | ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_Z_SCALE_COEFFICIENT,182,286,39,12,ES_CENTER | ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_X_SCALE_COEFFICIENT,37,290,39,12,ES_CENTER | ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_Y_SCALE_COEFFICIENT,96,290,39,12,ES_CENTER | ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_Z_SCALE_COEFFICIENT,155,290,39,12,ES_CENTER | ES_AUTOHSCROLL EDITTEXT IDC_EDIT_SET_VER_NO,261,25,29,14,ES_AUTOHSCROLL GROUPBOX "USB Control",IDC_STATIC,17,12,81,59 GROUPBOX "Config",IDC_STATIC,17,130,116,44 @@ -129,10 +129,9 @@ BEGIN LTEXT "Reference Mark",IDC_STATIC,179,311,52,8 LTEXT "Pos Update Frequency",IDC_STATIC,106,386,74,8 LTEXT "Spare1",IDC_STATIC,304,111,24,8 - CTEXT "X",IDC_STATIC,80,274,8,8 - CTEXT "Y",IDC_STATIC,139,275,8,8 - CTEXT "Z",IDC_STATIC,198,274,8,8 - CTEXT "光栅尺分辨率",IDC_STATIC,26,282,27,20 + CTEXT "X",IDC_STATIC,26,292,8,8 + CTEXT "Y",IDC_STATIC,84,291,8,8 + CTEXT "Z",IDC_STATIC,143,291,8,8 GROUPBOX "速度档位",IDC_STATIC,160,183,53,81 PUSHBUTTON "配置so7_config",IDC_BUTTON_SETUP_SO7CONFIG,82,141,44,28,BS_MULTILINE LTEXT "1",IDC_STATIC_IO_ADDR1,403,28,8,8 @@ -178,6 +177,8 @@ BEGIN PUSHBUTTON "Write",IDC_BUTTON_SO7_TRIGPULSE_WRITE_PARA,224,138,34,15 PUSHBUTTON "Read",IDC_BUTTON_SO7_TRIGPULSE_READ_PARA,224,156,34,15 EDITTEXT IDC_EDIT_SO7_TRIGPULSE_DIS2,184,155,36,14,ES_AUTOHSCROLL + PUSHBUTTON "确定",IDC_BUTTON_SET_SCALE_COEFFICIENT,202,285,34,19 + GROUPBOX "光栅尺分辨率(μm)",IDC_STATIC,18,277,223,31 END IDD_SO7_UTIL_SEND_PARAMETER DIALOGEX 0, 0, 750, 480 @@ -1555,12 +1556,12 @@ IDB_BITMAP_Z_DOWN BITMAP "res\\bmp\\Z_DOWN.bmp" IDB_BITMAP_Z_UP BITMAP "res\\bmp\\Z_UP.bmp" IDB_BITMAP_X_LEFT BITMAP "res\\bmp\\X_LEFT.BMP" IDB_BITMAP_X_RIGHT BITMAP "res\\bmp\\X_RIGHT.bmp" -#endif // Chinese (Simplified, PRC) resources +#endif // 中文(简体，中国) resources ///////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////// -// English (United States) resources +// 英语(美国) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US @@ -2503,7 +2504,7 @@ BEGIN IDS_SO7_ABOUTBOX "&About Utility for SO7..." END -#endif // English (United States) resources +#endif // 英语(美国) resources ///////////////////////////////////////////////////////////////////////////// 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 f5b697d..2ee367c 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 @@ -112,9 +112,6 @@ BEGIN_MESSAGE_MAP(CSO7_UtilDlg, CDialog) ON_BN_CLICKED(IDC_BUTTON_SET_RESET_FLAG, &CSO7_UtilDlg::OnBnClickedButtonSetResetFlag) ON_BN_CLICKED(IDC_BUTTON_RESET_WORKTABLE_RIGHT, &CSO7_UtilDlg::OnBnClickedButtonResetWorktableRight) ON_BN_CLICKED(IDC_BUTTON_SET_OUT_PORT, &CSO7_UtilDlg::OnBnClickedButtonSetOutPort) - ON_EN_KILLFOCUS(IDC_EDIT_X_SCALE_COEFFICIENT, &CSO7_UtilDlg::OnEnKillfocusEditXScaleCoefficient) - ON_EN_KILLFOCUS(IDC_EDIT_Y_SCALE_COEFFICIENT, &CSO7_UtilDlg::OnEnKillfocusEditYScaleCoefficient) - ON_EN_KILLFOCUS(IDC_EDIT_Z_SCALE_COEFFICIENT, &CSO7_UtilDlg::OnEnKillfocusEditZScaleCoefficient) ON_BN_CLICKED(IDC_BUTTON_AUTO_ZOOM, &CSO7_UtilDlg::OnBnClickedButtonAutoZoom) ON_BN_CLICKED(IDC_BUTTON_MANUAL_HOME, &CSO7_UtilDlg::OnBnClickedButtonManualHome) ON_BN_CLICKED(IDC_BUTTON_SETUP_SO7CONFIG, &CSO7_UtilDlg::OnBnClickedButtonSetupSo7config) @@ -143,6 +140,7 @@ BEGIN_MESSAGE_MAP(CSO7_UtilDlg, CDialog) ON_BN_CLICKED(IDC_RADIO_READ_LIMIT_SWITCH, &CSO7_UtilDlg::OnBnClickedRadioReadLimitSwitch) ON_BN_CLICKED(IDC_BUTTON_SO7_TRIGPULSE_WRITE_PARA, &CSO7_UtilDlg::OnBnClickedButtonSo7TrigpulseWritePara) ON_BN_CLICKED(IDC_BUTTON_SO7_TRIGPULSE_READ_PARA, &CSO7_UtilDlg::OnBnClickedButtonSo7TrigpulseReadPara) + ON_BN_CLICKED(IDC_BUTTON_SET_SCALE_COEFFICIENT, &CSO7_UtilDlg::OnBnClickedButtonSetScaleCoefficient) END_MESSAGE_MAP() @@ -934,41 +932,6 @@ void CSO7_UtilDlg::OnBnClickedButtonSetOutPort() m_pSO7_Proto->_send_cmd_SO7_CMD_COMMON_COMMAND_DATA(CT_DATA,CT_WRITE_IO_DAT,m_SetIOStatusAddr,cSetValue); } } -void CSO7_UtilDlg::OnEnKillfocusEditXScaleCoefficient() -{ - - UpdateData(TRUE); - USES_CONVERSION; - const char* cTempValue=T2A(m_cs_XScaleCoeff); - - m_pSO7_Proto->g_machine.s_machine_config.x_axis._scale_resolution = atof(cTempValue); - m_pSO7_Proto->Save_So7_Config(); - -} -void CSO7_UtilDlg::OnEnKillfocusEditYScaleCoefficient() -{ - - UpdateData(TRUE); - USES_CONVERSION; - const char* cTempValue=T2A(m_cs_YScaleCoeff); - - m_pSO7_Proto->g_machine.s_machine_config.y_axis._scale_resolution = atof(cTempValue); - m_pSO7_Proto->Save_So7_Config(); - -} - - -void CSO7_UtilDlg::OnEnKillfocusEditZScaleCoefficient() -{ - - UpdateData(TRUE); - USES_CONVERSION; - const char* cTempValue=T2A(m_cs_ZScaleCoeff); - - m_pSO7_Proto->g_machine.s_machine_config.z_axis._scale_resolution = atof(cTempValue); - m_pSO7_Proto->Save_So7_Config(); -} - void CSO7_UtilDlg::OnBnClickedButtonMotionParameter() { KillTimer(1); @@ -1583,3 +1546,16 @@ void CSO7_UtilDlg::OnBnClickedButtonSo7TrigpulseReadPara() m_pSO7_Proto->g_machine.TrigPara.TrigCurIndex,m_pSO7_Proto->g_machine.TrigPara.TrigCurPara); OutputWithScroll(m_OutMessage,m_edMSG); } +//====================================================== +void CSO7_UtilDlg::OnBnClickedButtonSetScaleCoefficient() +{ + UpdateData(TRUE); + USES_CONVERSION; + const char* cTempValue=T2A(m_cs_XScaleCoeff); + m_pSO7_Proto->g_machine.s_machine_config.x_axis._scale_resolution = atof(cTempValue); + cTempValue=T2A(m_cs_YScaleCoeff); + m_pSO7_Proto->g_machine.s_machine_config.y_axis._scale_resolution = atof(cTempValue); + cTempValue=T2A(m_cs_ZScaleCoeff); + m_pSO7_Proto->g_machine.s_machine_config.z_axis._scale_resolution = atof(cTempValue); + m_pSO7_Proto->Save_So7_Config(); +} \ No newline at end of file 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 ea63921..1cf1b40 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 @@ -103,9 +103,6 @@ public: afx_msg void OnBnClickedButtonSetResetFlag(); afx_msg void OnBnClickedButtonResetWorktableRight(); afx_msg void OnBnClickedButtonSetOutPort(); - afx_msg void OnEnKillfocusEditXScaleCoefficient(); - afx_msg void OnEnKillfocusEditYScaleCoefficient(); - afx_msg void OnEnKillfocusEditZScaleCoefficient(); afx_msg void OnBnClickedButtonAutoZoom(); afx_msg void OnBnClickedButtonManualHome(); afx_msg void OnBnClickedButtonSetupSo7config(); @@ -134,4 +131,5 @@ public: afx_msg void OnBnClickedRadioReadLimitSwitch(); afx_msg void OnBnClickedButtonSo7TrigpulseWritePara(); afx_msg void OnBnClickedButtonSo7TrigpulseReadPara(); + afx_msg void OnBnClickedButtonSetScaleCoefficient(); }; diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h index 7d65f60..12bf773 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h @@ -986,6 +986,8 @@ #define IDC_BUTTON_SO7_TRIGPULSE_WRITE_PARA 1854 #define IDC_BUTTON5 1855 #define IDC_BUTTON_SO7_TRIGPULSE_READ_PARA 1855 +#define IDC_BUTTON4 1856 +#define IDC_BUTTON_SET_SCALE_COEFFICIENT 1856 #define IDC_BUTTON_DIY_EXIT_BUTTON 32740 #define ID_EDIT_SO7_CONFIG_MOTION 32741 @@ -995,7 +997,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 191 #define _APS_NEXT_COMMAND_VALUE 32771 -#define _APS_NEXT_CONTROL_VALUE 1855 +#define _APS_NEXT_CONTROL_VALUE 1857 #define _APS_NEXT_SYMED_VALUE 104 #endif #endif 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 642a02b66d553176c46087e06e762e7c33f85460..765962429b24c6c0d9ea06265099c428cfb283e6 100644 GIT binary patch delta 4520 zcmb_g30PD|5`OiV8D<3J5CM-M;6P9rOs*Mp5Q>n0|jx|>Zl$Hv6jXo!*h`^^k!%=hi_?VIm^-CbRM zRCRS#y|Et9TMy{lt+M83Pfrh9FW;bt*cy+AX*2uEV|D+o^m&1q4QI$h!qaMN&}{JV zTULH@=Cwm?;$zk3Pj`4u3FB*eD9&cqYh?Xka76&TD}thJmVSj~ko0H|>ZLin3Uvk= ziuPtVjadQ;wKQHdt*a=8IYcwp-P8?0ElF={7?4k%&!Ij}O5Sox_s^$DI_n}$;@0=bmqk`Y(+4h6|Blc=**7jo zlE!Bj=hXHsv%D!Yg2mn&%03Sp={x;OZQ|X~1{QE{qpv?aN%wVO9r|s?h$CcL2%a1% zO`0h^Ak|7`(o(!s`>Z_nEy`!jks8lCmou{Z zs07c-+XrBq3AQbFTXbyBb#q7TQCZU;4606bKB%?Uv+lTjjnJo4(U$lvY-!ATHfM~U znNy6mD+zv{d`=*lo6?TzSA%VfMyD1lQJSqAWK7~VyRlHg9P&+U9A)* z$I2ib^}cq z>kUdaXyc_{NN#Q|7T3VYWOcN#wsGha_Ok*CpCDC8rBVsY^vv^e}8 ziBF7AOc`6AV2Vpgm~To-nwwxsO&Jq!8XI3;o)}+N{!mhR66@NK$rjA=vQ3_RWRRTO zD;=MGmIkOw>zWiaFiKUwctzQTf#dY5ANA2t% z`=jOysGf&eUMLj(HpdGk8jZ1!+*YJV!0Hi!$;s$wv+53@)g8cX|3-6QBv#B^(3I3dZtK%p9M}-IvR0vm|4dlS}Er2V07%Jm)-lt*84_D|CwH%Y_Jf|2^66b=e z4(@&t{Ly_V=Sh`nASjb!QLn-8+wd;~|9Sr8B~`7_Hla!i9Yv55M_iaxoEZC2j-9wexM}#bQ z_&UL91ii}a$A|hqKH$LUq!&Un4}8)-_uQ%dTi+B%z#p4Ie%jv=E`!KC?pd$~8(9m8 zlxaQ6&A*|9oPYg{l1R!S%5`%7o-cqel+$0;!d;xhXFx9i1HB7 z3fO?7z)Qd@fXL5Sd-qChBPus{%pJlCez>9OhlcAi-za47XmFWtcoUO9C{i{&P3^?2 z??&v5pnV33gR|7l{kns^Jy?fvExULsjD^0ZQ$Bu{rh@ylxz(&AnfaY;^r)3^y~OER zPfhZeE4|3p{C%}z?niblmuo3nnZ1|ZC9QhnlpcQ~S+1(!`?_f`_q$3#tfs_A8S*2& zMV&#Eqc>0%7SD5UfLlVTNWTuvr+P__P=Y^tK9jE9w%7d z2ubl~Achcl@EkIeEX*sN$7$sN7TOhRTy(0^zBT;0JzJtp{jU3_o(_h`g%#ZPFl$&G zw?~nKtv_cJ9vN;kQp_`3nVm~59!_D5LKv~Bz2Fe0rrLydH`c!)z9A-Z`*1Sz?LBzi zR!gT)g(~SRY0tZzlbUw7T}|_H##6^_^w@J#Ko7D zN-f0F?=|wMwe+3#12<=K=VZ!}4a6{fmwS`kQbHwcf;L8Rl)xxm@(9gmXj8nWs+tEc zo~D4IUb%2M%cOWIPC`DZ8N}>u8Z}nkg??3LT_i^IxDR5zOD((6En>El{fK`bz9jWyOvBgArXN}3IUNf- zu}e6i0@aw5*%oT?5sQYZUp74S3A)^L!78jhWmgp$6-ar(z&k1^P&u)iyh(cudQ?5` za&db3gG8<eGty=8IJ4rKy0$@YGJ45F&hc z1X{xZBOux{MepuTIu5=CRdU{Q#gDE#YT0xjn|Tm^jM2aW+0QUfSX-|Qe6aVH=u%3MEw-2PPQ8`Mt^Ibbsnp^@+`M2L#8FNcJYXEyvVff M=Jq;B(yllE3(zS3l>h($ delta 2934 zcmb7G3s6+o89x8ryX!74%40?116KrHQ3-BUC;_~{Du~FgNMdZM0%8L;KB_kvrH(At zXJQiMPdu7Y2T}1cBPCqJB_^q>lJOBO#F#cs93+f!k~T?=-N~fHO8Yp08N-FMRK1Aj+SBBq6J2hFEZG3cOHn! zy2oA+2KBCI%))x`_qo4BPeD4m^G4!~ws`myq2LJjUWcJrHQFI;74S^%^p+T#VChVt zDP%3k{*69B^8q-GpV$*DZ7;?*rLXP)??dzDvC~Y|SI;F5U9E_*Z7^C}sBD(XirJHF zEnCLc(0?&2V$W$BemU+WYzTI~jox_i(O6mIQ($$_dm8i8ZA$(G+0>HQE}+YpWD2F& ztO|RR^2|d>3Mc4miSpE)cz04e+LO(7GvbtHXV{>+)OPbIBD@qNDgM+e0+vZHV^?~t z5y;%dzjeb&?3TjFG=AI&mP_+3W##&;?QAxyWY3bkmZ%SYck~WCEL@m|-7~}VAOmeS zZ7bks8N=ZVtVyfJLZ=fu6QVIBD^=N?wE^&(XOk!e1-N|90=PuWzmt+Nj7OY?iO{2E z1JBIPK}*4YEO{jZ{v6DY6?dGO2sd@Y=XFm&r`9tvb7kdT)}x~=#&T{ z5Q*7*BS_Y^WPn1Sq*I>jkK*uEk*w`^*T8SpdBH$hYa(dfT>XonQ`Tv|z;AG%b^XuP z(Yo0ti2<(H=}RVAt4hU}2O})QPQUc_q^I{tKPncZz+8HPEDPpOpTOsVKorCG70Dq4 z`rLo3G>sZ=9UA10_l+ibsM59KQbNn?>jnuY24U5~%fqkGZqq79W~~_zO^M( z>DV(BTAGgv4W|TrUzv_8mFfKJ4v54!Q0MTmg0jL1Q`#yy6vHRc|&Aq4Y z(v9$y&XnSd!xp{u;qqIrOnN)C<1Efki{!-yh~rJ^P>9`!LX0_C`EwpQ<^JQzWE1e5 zl!&$OnQ=x>9v0dq#n*ERjQ9Kc`k1o*);1%S-EYB+Pi%_kek$xLwS{h_ir7ZjPPng* z6@;76^3C^x@Ku7+d&dO$LZ1YGM7Z=3KJ};ZVr8+siYL7e$MB24M=K>0>qShQ-i9Zp zSh3x?&#{?Ou#M16(8kAf=vgkZ_35KsZG>OgKVlBpfAZ z9ohr!Noq;$!{*)%;a5nxO85hzgK%F-|6wqQE)oOV=bjt0jZ+o>JuBcfheO%^laJw5 zIBx+?9PMD#d2jl`YCxxRt8#mK6||Z_67X{04BqR8P1t?ajxpCw{Fq3`;U+0fO$&i` zBlb**Q8p&`Kw|_5Sn|_)>`DlsGc^mlqN1^TiXB&`)X}npVM=mpYZPRgEi9A9n;jgJ z%Q4`=_UN?TV<6iC+Ba#1s?UeZW5E5uRvomd{xQ%YTG(r3piBjb{x~QSmjqQ+j)#tL zt)Nsn8Fq^J>yj+x%X7m)y>SPQ3XKv?wPsNa_bDJL#+wb$=%V}hX!jx_d( z9lqnz%h26;2n<-?S27^MDkb=7*nJQjDvfXr)bLN?Zvsk1!<8rAy=-Vb23`T{>wljH3E96FxrJTeP#u4HO@dVwwrxh;lDv##tRIu+VPZPJ0V^^u8?&CN$ zt_`{d@w-OBhV?hBJi-TyRj&^&n#AAsFM)gkXzOk~oL842(thpIR_t+GW&4He>qoSB zwq4xl-Vwerwc_W!@i^aTNAoZ%mo9;X=i+4RgX>8=1); +/* status=Motion_SetSpeedXYZ(MACHINE_AXIS_X,3,20,20,20,3,0.01); printf("Motion_SetSpeedXYZ:"); ShowMessage(status); @@ -96,7 +102,7 @@ int _tmain(int argc, _TCHAR* argv[]) status=Motion_Stop(); printf("Motion_Stop:"); ShowMessage(status); - + */ //===================================Rotary Table================================== //Motion_DCCHomeR(); //Motion_IsHomedR(bool &bHomed);