From a4ba2c6a6feb99e9b3d33482e7a933dd2b9e41d0 Mon Sep 17 00:00:00 2001 From: TAO Cheng Date: Tue, 11 Feb 2014 09:04:54 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=8F=82=E6=95=B0=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp | 22 ++- .../Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h | 6 +- .../Tools/UsbUtility/Debug/UtilityDebug.Log | 72 ++++++++++ .../Tools/UsbUtility/Debug/Utility_Config.ini | 3 +- .../Hsi/Tools/UsbUtility/Debug/so7_config.ini | 2 +- .../Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc | 2 +- .../Tools/UsbUtility/UsbUtil/SO7_UtilDlg.cpp | 131 +++++++++++++++--- .../Tools/UsbUtility/UsbUtil/SO7_UtilDlg.h | 1 + .../Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo | Bin 2355712 -> 2355712 bytes 9 files changed, 210 insertions(+), 29 deletions(-) diff --git a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp index 2a29860..c81dd6d 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp @@ -461,7 +461,6 @@ CSO7_Proto::CSO7_Proto() g_machine.GetInterruptMsg[i][j]=0; } } - g_machine.GetInterruptMsgMethod=E_GET_INTERRUPT_MSG_INTERRUPT;//E_GET_INTERRUPT_MSG_INQUIRY; g_machine.IsSupportReadInterrputMsg=FALSE; g_machine.IsOffline=TRUE; g_machine.FPGAData=0; @@ -494,7 +493,7 @@ CSO7_Proto::CSO7_Proto() g_machine.s_lights_value._spare_light1=1; g_machine.s_lights_value.segment[0]=0; g_machine.s_lights_value.segment[1]=0; - + g_machine.dRotaryCirclDis=100; g_machine.Light_Size=0; g_machine.Light_Switch=0; @@ -539,7 +538,7 @@ CSO7_Proto::CSO7_Proto() g_machine.s_machine_config.motion._ShiftPositionZ=0.0; g_machine.s_machine_config.motion.m_CntThreadSleepVal=550000; - g_machine.s_machine_config.motion.GetInterruptMsgMethod=1; + g_machine.s_machine_config.motion.GetInterruptMsgMethod=E_GET_INTERRUPT_MSG_INTERRUPT;//E_GET_INTERRUPT_MSG_INQUIRY; g_machine.s_machine_config.motion.m_WriteDataSleepTime=0; g_machine.s_machine_config.motion.m_AccuraErrPulseX=1; g_machine.s_machine_config.motion.m_AccuraErrPulseY=1; @@ -1116,6 +1115,11 @@ SSI_STATUS_MOTION CSO7_Proto::Save_SevenOcean_Inifile(CString path_and_fileName) fprintf(m_pOutFile,"%s", outBuff); fprintf(m_pOutFile,"%.3f", g_machine.s_machine_config.z_axis._pos_working_limit); fprintf(m_pOutFile, "\n"); + + outBuff="ROTARY_CIR_DIS="; + fprintf(m_pOutFile,"%s", outBuff); + fprintf(m_pOutFile,"%.3f", g_machine.dRotaryCirclDis); + fprintf(m_pOutFile, "\n"); fprintf(m_pOutFile,"%s", ";\n"); fclose(m_pOutFile); @@ -2063,7 +2067,15 @@ SSI_STATUS_MOTION CSO7_Proto::Load_SevenOcean_Inifile(CString cso7IniFile) g_machine.s_machine_config.z_axis._pos_working_limit=atof(cTemp); } } - + else if (!_stricmp(token,"ROTARY_CIR_DIS")) + { + token = strtok( NULL, seps); + if (token) + { + strcpy(cTemp,token); + g_machine.dRotaryCirclDis=atof(cTemp); + } + } } } fclose(hConfigFile); @@ -3171,7 +3183,7 @@ SSI_STATUS_MOTION CSO7_Proto::so7_motion_is_finished(char MotionType,BOOL& IsFin //WaitForSingleObject(g_hHomedEvent, INFINITE); // machine start and homing is done BOOL bIsFinised(FALSE); - if (g_machine.GetInterruptMsgMethod==E_GET_INTERRUPT_MSG_INQUIRY) + if (g_machine.s_machine_config.motion.GetInterruptMsgMethod==E_GET_INTERRUPT_MSG_INQUIRY) { _send_cmd_SO7_CMD_GET_INTERRUPT_MSG(MotionType); if (g_machine.GetInterruptMsg[MotionType][0]==CT_STOPXYZ) diff --git a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h index d954547..4ea5dea 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h @@ -121,8 +121,7 @@ struct s_so7_axis_config // axis configuration long _scale_range; double _neg_working_limit; double _pos_working_limit; - - double _scale_resolution; + double _scale_resolution; bool _bhomed; }; struct s_so7_zm_axis_config // zm configuration @@ -232,9 +231,10 @@ struct struct_so7_machine char FirmwareInfo[10]; int FirmwareVer; char GetInterruptMsg[20][2]; - char GetInterruptMsgMethod; BOOL IsOffline; BOOL IsSupportReadInterrputMsg; + double dRotaryCirclDis; + struct s_so7_axis x; struct s_so7_axis y; struct s_so7_axis z; 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 070a018..b9d33c3 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log @@ -3216,3 +3216,75 @@ 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 +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 +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 70281d9..8e824a0 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 @@ -21,7 +21,7 @@ SPEED_BASE_X2=16 SPEED_MAX_X2=10 SPEED_START_X2=12 SPEED_FRESH_X2=10 -SPEED_SLOW_X2=2.000 +SPEED_SLOW_X2=1.000 ; SPEED_BASE_X3=2 SPEED_MAX_X3=0 @@ -123,4 +123,5 @@ Z_NEG_WORKING_LIMIT=0.000 X_POS_WORKING_LIMIT=200.000 Y_POS_WORKING_LIMIT=300.000 Z_POS_WORKING_LIMIT=200.000 +ROTARY_CIR_DIS=655355555.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 6af55c1..9ece5c1 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 @@ -17,7 +17,7 @@ SHIFT_POSITION_X=0.000000 SHIFT_POSITION_Y=0.000000 SHIFT_POSITION_Z=0.000000 SDK3000_SLEEP_COUNT=550000 -GET_USB_MESSAGE_METHOD=1 +GET_USB_MESSAGE_METHOD=0 WRITE_DATA_SLEEP_TIME=0 ACCURA_ERROR_PULSE_X=1 ACCURA_ERROR_PULSE_Y=1 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 17ab4f9..7cd436f 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 @@ -41,7 +41,7 @@ BEGIN PUSHBUTTON "Start_Machine",IDC_BUTTON_START_SO7MACHINE,23,40,63,18 PUSHBUTTON "Stop_Machine",IDC_BUTTON_STOP_SO7MACHINE,23,75,63,18 PUSHBUTTON "Read XYZ Axis",IDC_BUTTON_SO7_READ_AXIS_XYZ,133,28,62,13 - PUSHBUTTON "Read Probe Axis",IDC_BUTTON_READ_PROBE,133,44,62,13 + PUSHBUTTON "EnProbe OFF",IDC_BUTTON_READ_PROBE,133,44,62,13 PUSHBUTTON "Read V Axis",IDC_BUTTON_SO7_READ_AXIS_V,133,60,62,13 PUSHBUTTON "Get Fixture Value",IDC_BUTTON_GET_FIXTURE_FLAG,133,76,62,13 PUSHBUTTON "Get Reset Flag",IDC_BUTTON_SO7_GET_RESET_FLAG,133,92,62,13 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 a6b932c..009646c 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 @@ -2,6 +2,7 @@ #include "afxwin.h" #include "resource.h" #include "afxdialogex.h" +#include #include "..\..\..\SevenOcean\CMMIO_SERIAL.H" #include "..\..\..\SevenOcean\SO7_Proto.h" #include "..\..\..\SevenOcean\CAutoZoom.h" @@ -49,7 +50,7 @@ IMPLEMENT_DYNAMIC(CSO7_UtilDlg, CDialog) m_ZsignalPosX=0; m_ZsignalPosY=0; m_ZsignalPosZ=0; - + m_bEnProbe=false; } CSO7_UtilDlg::~CSO7_UtilDlg() @@ -375,6 +376,7 @@ void CSO7_UtilDlg::OnBnClickedButtonTermSo7usb() void CSO7_UtilDlg::OnBnClickedButtonStartSo7machine() { OnBnClickedButtonInitSo7usb(); + m_pSO7_Proto->Load_So7_Config(); //m_pSO7_Proto->so7_motion_startup(0.5, 0.5, 0.5); m_pSO7_Proto->_start_machine(); m_pSO7_Proto->_send_cmd_SO7_CMD_GET_RESET_FLAG(); @@ -385,8 +387,7 @@ void CSO7_UtilDlg::OnBnClickedButtonStartSo7machine() csTmp.Format(("Firmware Version:[%s]"),m_pSO7_Proto->g_machine.FirmwareInfo); m_OutMessage=csTmp; OutputWithScroll(m_OutMessage,m_edMSG); - m_pSO7_Proto->g_machine.GetInterruptMsgMethod=E_GET_INTERRUPT_MSG_INQUIRY; - m_pSO7_Proto->_send_cmd_SO7_CMD_SET_GET_INTERRUPT_MSG_METHOD(m_pSO7_Proto->g_machine.GetInterruptMsgMethod); + 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); @@ -522,14 +523,25 @@ void CSO7_UtilDlg::OnBnClickedButtonSo7ReadAxisXyz() //===================================================================== void CSO7_UtilDlg::OnBnClickedButtonReadProbe() { - - m_pSO7_Proto->_send_cmd_SO7_CMD_READ_PROBE_XYZ(); - m_X_Pos.Format(_T("%8ld"),(m_pSO7_Proto->g_machine.x._scale_probe)); - GetDlgItem(IDC_EDIT_X_POSITION_59)->SetWindowText(m_X_Pos); - m_Y_Pos.Format(_T("%8ld"),(m_pSO7_Proto->g_machine.y._scale_probe)); - GetDlgItem(IDC_EDIT_Y_POSITION_59)->SetWindowText(m_Y_Pos); - m_Z_Pos.Format(_T("%8ld"),(m_pSO7_Proto->g_machine.z._scale_probe)); - GetDlgItem(IDC_EDIT_Z_POSITION_59)->SetWindowText(m_Z_Pos); + if(!m_bEnProbe) + { + m_bEnProbe=true; + m_pSO7_Proto->so7_motion_probe_on_off_(true); + GetDlgItem(IDC_BUTTON_READ_PROBE)->SetWindowText(_T("EnProbe ON")); + } + else + { + m_bEnProbe=false; + m_pSO7_Proto->so7_motion_probe_on_off_(false); + GetDlgItem(IDC_BUTTON_READ_PROBE)->SetWindowText(_T("EnProbe OFF")); + } + //m_pSO7_Proto->_send_cmd_SO7_CMD_READ_PROBE_XYZ(); + //m_X_Pos.Format(_T("%8ld"),(m_pSO7_Proto->g_machine.x._scale_probe)); + //GetDlgItem(IDC_EDIT_X_POSITION_59)->SetWindowText(m_X_Pos); + //m_Y_Pos.Format(_T("%8ld"),(m_pSO7_Proto->g_machine.y._scale_probe)); + //GetDlgItem(IDC_EDIT_Y_POSITION_59)->SetWindowText(m_Y_Pos); + //m_Z_Pos.Format(_T("%8ld"),(m_pSO7_Proto->g_machine.z._scale_probe)); + //GetDlgItem(IDC_EDIT_Z_POSITION_59)->SetWindowText(m_Z_Pos); } void CSO7_UtilDlg::OnBnClickedButtonSo7ReadAxisV() @@ -856,7 +868,6 @@ void CSO7_UtilDlg::OnBnClickedButtonMotionParameter() void CSO7_UtilDlg::OnBnClickedButtonSetupSo7config() { KillTimer(1); - m_pSO7_Proto->Load_So7_Config(); if (!m_pSO7_AutoZoom) m_pSO7_AutoZoom = new CAutoZoom(); @@ -898,9 +909,55 @@ void CSO7_UtilDlg::OnBnClickedButtonSo7TestZSignal() } void CSO7_UtilDlg::TestZSignal() { - m_pSO7_Proto->_send_cmd_SO7_CMD_READ_ZSIGNAL_POS_X(); - m_pSO7_Proto->_send_cmd_SO7_CMD_READ_ZSIGNAL_POS_Y(); - m_pSO7_Proto->_send_cmd_SO7_CMD_READ_ZSIGNAL_POS_Z(); + if (((CButton *)GetDlgItem(IDC_CHECK_SO7_OUT_PORT))->GetCheck()) + { + BYTE cdata[3]={0}; + //x + m_pSO7_Proto->_send_cmd_SO7_CMD_READ_DATA_FROM_FPGA(2,6); + cdata[0]=static_cast(m_pSO7_Proto->g_machine.FPGAData); + m_pSO7_Proto->_send_cmd_SO7_CMD_READ_DATA_FROM_FPGA(2,7); + cdata[1]=static_cast(m_pSO7_Proto->g_machine.FPGAData); + m_pSO7_Proto->_send_cmd_SO7_CMD_READ_DATA_FROM_FPGA(2,8); + cdata[2]=static_cast(m_pSO7_Proto->g_machine.FPGAData); + m_pSO7_Proto->g_machine.x._ZSignal_pos._char_[2] = cdata[2]; + m_pSO7_Proto->g_machine.x._ZSignal_pos._char_[1] = cdata[1]; + m_pSO7_Proto->g_machine.x._ZSignal_pos._char_[0] = cdata[0]; + m_pSO7_Proto->g_machine.x._ZSignal_pos._char_[3] = 0; + if (m_pSO7_Proto->g_machine.x._ZSignal_pos._long_ > 8388608) + m_pSO7_Proto->g_machine.x._ZSignal_pos._long_=m_pSO7_Proto->g_machine.x._ZSignal_pos._long_-16777216; + //y + m_pSO7_Proto->_send_cmd_SO7_CMD_READ_DATA_FROM_FPGA(1,6); + cdata[0]=static_cast(m_pSO7_Proto->g_machine.FPGAData); + m_pSO7_Proto->_send_cmd_SO7_CMD_READ_DATA_FROM_FPGA(1,7); + cdata[1]=static_cast(m_pSO7_Proto->g_machine.FPGAData); + m_pSO7_Proto->_send_cmd_SO7_CMD_READ_DATA_FROM_FPGA(1,8); + cdata[2]=static_cast(m_pSO7_Proto->g_machine.FPGAData); + m_pSO7_Proto->g_machine.y._ZSignal_pos._char_[2] = cdata[2]; + m_pSO7_Proto->g_machine.y._ZSignal_pos._char_[1] = cdata[1]; + m_pSO7_Proto->g_machine.y._ZSignal_pos._char_[0] = cdata[0]; + m_pSO7_Proto->g_machine.y._ZSignal_pos._char_[3] = 0; + if (m_pSO7_Proto->g_machine.y._ZSignal_pos._long_ > 8388608) + m_pSO7_Proto->g_machine.y._ZSignal_pos._long_=m_pSO7_Proto->g_machine.y._ZSignal_pos._long_-16777216; + //z + m_pSO7_Proto->_send_cmd_SO7_CMD_READ_DATA_FROM_FPGA(3,6); + cdata[0]=static_cast(m_pSO7_Proto->g_machine.FPGAData); + m_pSO7_Proto->_send_cmd_SO7_CMD_READ_DATA_FROM_FPGA(3,7); + cdata[1]=static_cast(m_pSO7_Proto->g_machine.FPGAData); + m_pSO7_Proto->_send_cmd_SO7_CMD_READ_DATA_FROM_FPGA(3,8); + cdata[2]=static_cast(m_pSO7_Proto->g_machine.FPGAData); + m_pSO7_Proto->g_machine.z._ZSignal_pos._char_[2] = cdata[2]; + m_pSO7_Proto->g_machine.z._ZSignal_pos._char_[1] = cdata[1]; + m_pSO7_Proto->g_machine.z._ZSignal_pos._char_[0] = cdata[0]; + m_pSO7_Proto->g_machine.z._ZSignal_pos._char_[3] = 0; + if (m_pSO7_Proto->g_machine.z._ZSignal_pos._long_ > 8388608) + m_pSO7_Proto->g_machine.z._ZSignal_pos._long_=m_pSO7_Proto->g_machine.z._ZSignal_pos._long_-16777216; + } + else + { + m_pSO7_Proto->_send_cmd_SO7_CMD_READ_ZSIGNAL_POS_X(); + m_pSO7_Proto->_send_cmd_SO7_CMD_READ_ZSIGNAL_POS_Y(); + m_pSO7_Proto->_send_cmd_SO7_CMD_READ_ZSIGNAL_POS_Z(); + } m_X_Pos.Format(_T("%8ld"),(m_pSO7_Proto->g_machine.x._ZSignal_pos._long_)); GetDlgItem(IDC_EDIT_X_POSITION_59)->SetWindowText(m_X_Pos); @@ -910,25 +967,63 @@ void CSO7_UtilDlg::TestZSignal() GetDlgItem(IDC_EDIT_Z_POSITION_59)->SetWindowText(m_Z_Pos); double dTmp1(0.0),dTmp2(0.0); + double dScaleResult(0.0); if (labs(m_pSO7_Proto->g_machine.x._ZSignal_pos._long_-m_ZsignalPosX)>5) { dTmp1=m_pSO7_Proto->ScaleToMM(m_ZsignalPosX,m_pSO7_Proto->g_machine.s_machine_config.x_axis._scale_resolution); dTmp2=m_pSO7_Proto->ScaleToMM(m_pSO7_Proto->g_machine.x._ZSignal_pos._long_,m_pSO7_Proto->g_machine.s_machine_config.x_axis._scale_resolution); - m_OutMessage.Format(_T("[ZSignal-X] From: %-3.4f To: %-3.4f Dis: %-3.4f"),dTmp1,dTmp2,dTmp2-dTmp1); + + dScaleResult=(dTmp2-dTmp1); + while ((fabs(dScaleResult)-fabs(m_pSO7_Proto->g_machine.dRotaryCirclDis))>1.0) + { + if (dScaleResult<-0.00001) + { + dScaleResult+=(m_pSO7_Proto->ScaleToMM(8388608,m_pSO7_Proto->g_machine.s_machine_config.x_axis._scale_resolution)); + } + else + { + dScaleResult-=(m_pSO7_Proto->ScaleToMM(8388608,m_pSO7_Proto->g_machine.s_machine_config.x_axis._scale_resolution)); + } + } + m_OutMessage.Format(_T("[ZSignal-X] From: %-3.4f To: %-3.4f Dis: %-3.4f"),dTmp1,dTmp2,dScaleResult); OutputWithScroll(m_OutMessage,m_edMSG); } if (labs(m_pSO7_Proto->g_machine.y._ZSignal_pos._long_-m_ZsignalPosY)>5) { dTmp1=m_pSO7_Proto->ScaleToMM(m_ZsignalPosY,m_pSO7_Proto->g_machine.s_machine_config.y_axis._scale_resolution); dTmp2=m_pSO7_Proto->ScaleToMM(m_pSO7_Proto->g_machine.y._ZSignal_pos._long_,m_pSO7_Proto->g_machine.s_machine_config.y_axis._scale_resolution); - m_OutMessage.Format(_T("[ZSignal-Y] From: %-3.4f To: %-3.4f Dis: %-3.4f"),dTmp1,dTmp2,dTmp2-dTmp1); + dScaleResult=(dTmp2-dTmp1); + while ((fabs(dScaleResult)-fabs(m_pSO7_Proto->g_machine.dRotaryCirclDis))>1.0) + { + if (dScaleResult<-0.00001) + { + dScaleResult+=(m_pSO7_Proto->ScaleToMM(8388608,m_pSO7_Proto->g_machine.s_machine_config.x_axis._scale_resolution)); + } + else + { + dScaleResult-=(m_pSO7_Proto->ScaleToMM(8388608,m_pSO7_Proto->g_machine.s_machine_config.x_axis._scale_resolution)); + } + } + m_OutMessage.Format(_T("[ZSignal-Y] From: %-3.4f To: %-3.4f Dis: %-3.4f"),dTmp1,dTmp2,dScaleResult); OutputWithScroll(m_OutMessage,m_edMSG); } if (labs(m_pSO7_Proto->g_machine.z._ZSignal_pos._long_-m_ZsignalPosZ)>5) { dTmp1=m_pSO7_Proto->ScaleToMM(m_ZsignalPosZ,m_pSO7_Proto->g_machine.s_machine_config.z_axis._scale_resolution); dTmp2=m_pSO7_Proto->ScaleToMM(m_pSO7_Proto->g_machine.z._ZSignal_pos._long_,m_pSO7_Proto->g_machine.s_machine_config.z_axis._scale_resolution); - m_OutMessage.Format(_T("[ZSignal-Z] From: %-3.4f To: %-3.4f Dis: %-3.4f"),dTmp1,dTmp2,dTmp2-dTmp1); + dScaleResult=(dTmp2-dTmp1); + while ((fabs(dScaleResult)-fabs(m_pSO7_Proto->g_machine.dRotaryCirclDis))>1.0) + { + if (dScaleResult<-0.00001) + { + dScaleResult+=(m_pSO7_Proto->ScaleToMM(8388608,m_pSO7_Proto->g_machine.s_machine_config.x_axis._scale_resolution)); + } + else + { + dScaleResult-=(m_pSO7_Proto->ScaleToMM(8388608,m_pSO7_Proto->g_machine.s_machine_config.x_axis._scale_resolution)); + } + } + m_OutMessage.Format(_T("[ZSignal-Z] From: %-3.4f To: %-3.4f Dis: %-3.4f"),dTmp1,dTmp2,dScaleResult); OutputWithScroll(m_OutMessage,m_edMSG); } m_ZsignalPosX=m_pSO7_Proto->g_machine.x._ZSignal_pos._long_; 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 9f36f53..a93a88c 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 @@ -64,6 +64,7 @@ public: long m_ZsignalPosY; long m_ZsignalPosZ; char m_HomeMode; + bool m_bEnProbe; void UpdateIOStatus(); void TestZSignal(); void OutputWithScroll(const CString &strNewText,CEdit &edtOutput); 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 29f003df014a27c287d2ce801234a7c4654d4db6..31d0facb1944313b3fbf5bc5d91f409d20afa75c 100644 GIT binary patch delta 3623 zcmZ`+dstOf7T;^%b1wJ7RX`CCQ9$vDAc$`Tu5e9h(t8svU-3{-CozI-m}g`9My?ankChW|*mDrjBV@@|C@;@w-!>P3f!yT*rUr@cr&tuf6u(>#Vi* zrm}T2R1zAVkYIp_k)q5E<5m|2_Y>vPM^^X(7>i?!p{F+ts1BF3=j9ej;y#H`{4ZFc zg^b4eM4A#XO_qlGSm6z7u^c0=uTP?RgIy*|Ct|z%MCJiR%>`{~xAlCindnHuLYBj3 zvBj*2Enp=qj}E?9k%UBk3vXNxzV&$w5#b>6Dig5kw$x1w8678$W$CX9m_I>$ zz9Td?qhhgAx-c^{b543jdQMhpMftpfInzsul&k_JtF&B6FDe--78S-py>Ce5{~eMv zwE*7^<4K@**!I(2nX>?@^9y&6Vk1_HPf$G$&YD7)2|@ z7qLCw=_d1Q#KjKLew|?k%fcLIdC`KR68vHpkJon2KWl2t&Vcq$(%&~qC^^n{QHoC# zu!^Wq$|FNCeiqEcJ5C-NJnppYSvc+JAknt6jU7b3C$xKc*e3o(g!J%Y`-1%dyz+ z07QsXd4#5{+-SnO<$SsJ)%I1O!MX<~xoB>Ao`PHY!(fcI$zz4BAVB+kM+{Wg7Vdso z5=Umu7w2o^#KfJ4`=>vaG~O|Cv?G4#h;&E%Fvqar@#9A)4~-w0p6nQ!JRv=C*vRx{ zj#IuI_uIYI%#~6~r9qwQ9!9w2%m=4|10!ZpfI97q^tI2R9^Y_gS9gJ?j#$vHBorUGKIehfrtsk>AVr=&#N zEzxGX}kAxv7)XAmVF}yw0DR0m{>zCRi4La ztg+gnltA_5jtV<7F|1q5bHq3> zOJ>Ou=zrS+vpL2+Bd>4#$^$V9O}>~8uF0%`DXfqVu6!E#$Rq0dMB#~Ss`7~2{UB9` zsqhXoew)$B3YREpOk~>LdX!&c{j9GNd!MpQ7j^fem z2?5E3Q&R*!dMxV`T~mCSt|2;BJaBp{q+R+ zv+OKs+a1**?LVJQqkWdKB%&YXjjM{$$Mb2o^V;qi1#BusVKJ+qeJZ5cNHA_AWuorK zt|p3^2ng>%w}#a;W6I|Cx6uQP2dhTFpzKGZnL}PnDX#O|VwpgmO37cyl5|gMu#&hZTZfPespvB!8@$2W8l> z3ZBB_*$|EH5pYqgd@5VZzP+1bmTAOn3|t4SPL@OTOVeR6*X^m`3BXAs;V8Cj;{)^o zk3+P)?{1xmxBcxf_h!}B9dAx6C#u@HH; zb-dY!TkyCdN9(hmfjhF;+sCfk=Yz*8zO+rn?FBF&?YWRHnm2U8X=UK8FNYxXtN}aT zkA!fnT?DyUmdOjzj@+V`t%R!_51xfAz2xuQ4rspx9xTy$HNJ3|kH)hh{7WpG1%uGD znwrD%HLwzUDN>{!xgG{X{YH>*(gxaJPzrR`JJ(RQqASI8880_e0N==haeC@jI04vY z9JtWFM6zJ*8OW{qT3V_vjppZh{dV%ur5R4?wx{?ws97V?5w#2=Ftrxe80|*)*1~e$ zc}(E5E$5#&_Wr$X+52i5^vXR@8H=MVqxjLmd44A&Re>bQggAWC#JhH{ zAaV>LgRqJ)o?w_g(7)h(UMGujuwL}}*Oeen7n8S}_>L16v>^}+KWSay`2v~(Eg4;*e=gFgq~io z6kR`abJG-lDj|5NA7jG^Ml{llH-7RW?+^F&-(TcG~(v zdFf`0m1aBPTmM?6*rY4P(%$=E!bRUg4-6kl-Om1;eAMFCkF4lH*v9+do%>+MUMF}E zj#A`nLuQz5RUfCmpUV#x|4Q9-8R+T zNp*Kt-GQn*NOcFR?k=jktLhF>-Q84osOk<=-QlXcyXuZm-91!yr0VXex_hbaDAgUU Ox?@y#?|OHi7yk=3u!ULx delta 3675 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