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 29f003d..31d0fac 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