diff --git a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp index 324384e..274d77e 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp @@ -530,13 +530,25 @@ CSO7_Proto::CSO7_Proto() g_machine.s_machine_config.zm_axis._SpeedSlow=800; g_machine.s_machine_config.zm_axis._speed._short_=0; - - g_machine.s_machine_config.motion._EnCloseLoop=FALSE; g_machine.s_machine_config.motion._RetryTimes=5; g_machine.s_machine_config.motion._ShiftPositionX=0.0; g_machine.s_machine_config.motion._ShiftPositionY=0.0; g_machine.s_machine_config.motion._ShiftPositionZ=0.0; + 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.m_WriteDataSleepTime=0; + g_machine.s_machine_config.motion.m_AccuraErrPulseX=1; + g_machine.s_machine_config.motion.m_AccuraErrPulseY=1; + g_machine.s_machine_config.motion.m_AccuraErrPulseZ=1; + g_machine.s_machine_config.motion.m_EQUIDIS_X=0; + g_machine.s_machine_config.motion.m_EQUIDIS_Y=0; + g_machine.s_machine_config.motion.m_EQUIDIS_Z=0; + g_machine.s_machine_config.motion.m_MachineType=MACHINE_SO7_CONTROLLER; + g_machine.s_machine_config.motion.m_VideoCardType=0; + g_machine.s_status._bIsZMMotionFinished=0; g_machine.x._scale_pos._long_ = 0; g_machine.y._scale_pos._long_ = 0; @@ -2080,56 +2092,44 @@ SSI_STATUS_MOTION CSO7_Proto::Save_So7_Config() outBuff="[7OCEANAUTOZOOM]"; fprintf(m_pOutFile,"%s", outBuff); fprintf(m_pOutFile, "\n"); - - outBuff="ZOOM_PRODUCT_ID="; fprintf(m_pOutFile,"%s", outBuff); USES_CONVERSION; outBuff=T2A(g_machine.s_machine_config.zm_axis._ProductID); fprintf(m_pOutFile,"%s", outBuff); fprintf(m_pOutFile, "\n"); - - outBuff="ZOOM_COM_PORT="; fprintf(m_pOutFile,"%s", outBuff); fprintf(m_pOutFile,"%d", g_machine.s_machine_config.zm_axis._ComPort); fprintf(m_pOutFile, "\n"); - outBuff="ZOOM_START_DEG="; fprintf(m_pOutFile,"%s", outBuff); fprintf(m_pOutFile,"%.6f", g_machine.s_machine_config.zm_axis._StartDegree); fprintf(m_pOutFile, "\n"); - outBuff="ZOOM_END_DEG="; fprintf(m_pOutFile,"%s", outBuff); fprintf(m_pOutFile,"%.6f", g_machine.s_machine_config.zm_axis._EndDegree); fprintf(m_pOutFile, "\n"); - outBuff="ZOOM_ORG_DEG="; fprintf(m_pOutFile,"%s", outBuff); fprintf(m_pOutFile,"%.6f", g_machine.s_machine_config.zm_axis._RelativeZeroDegree); fprintf(m_pOutFile, "\n"); - outBuff="ZOOM_DEADBAND_DEG="; fprintf(m_pOutFile,"%s", outBuff); fprintf(m_pOutFile,"%.6f", g_machine.s_machine_config.zm_axis._Deadband); fprintf(m_pOutFile, "\n"); - outBuff="ZOOM_PULSE_PER_DEG="; fprintf(m_pOutFile,"%s", outBuff); fprintf(m_pOutFile,"%.15f", g_machine.s_machine_config.zm_axis._PulseScale); fprintf(m_pOutFile, "\n"); - outBuff="ZOOM_READING_INTERVAL_TIME="; fprintf(m_pOutFile,"%s", outBuff); fprintf(m_pOutFile,"%d", g_machine.s_machine_config.zm_axis._ReadingInterval); fprintf(m_pOutFile, "\n"); - outBuff="ZOOM_MOTOR_SPEED_FAST="; fprintf(m_pOutFile,"%s", outBuff); fprintf(m_pOutFile,"%d", g_machine.s_machine_config.zm_axis._SpeedFast); fprintf(m_pOutFile, "\n"); - outBuff="ZOOM_MOTOR_SPEED_SLOW="; fprintf(m_pOutFile,"%s", outBuff); fprintf(m_pOutFile,"%d", g_machine.s_machine_config.zm_axis._SpeedSlow); @@ -2138,35 +2138,76 @@ SSI_STATUS_MOTION CSO7_Proto::Save_So7_Config() outBuff="[HARDWARE]"; fprintf(m_pOutFile,"%s", outBuff); fprintf(m_pOutFile, "\n"); - outBuff="CLOSE_LOOP_ENABLED="; fprintf(m_pOutFile,"%s", outBuff); fprintf(m_pOutFile,"%d", g_machine.s_machine_config.motion._EnCloseLoop); fprintf(m_pOutFile, "\n"); - - outBuff="RETRY_TIMES="; + outBuff="MOTION_RETRY_TIMES="; fprintf(m_pOutFile,"%s", outBuff); fprintf(m_pOutFile,"%d", g_machine.s_machine_config.motion._RetryTimes); fprintf(m_pOutFile, "\n"); - outBuff="SHIFT_POSITION_X="; fprintf(m_pOutFile,"%s", outBuff); fprintf(m_pOutFile,"%d", g_machine.s_machine_config.motion._ShiftPositionX); fprintf(m_pOutFile, "\n"); - outBuff="SHIFT_POSITION_Y="; fprintf(m_pOutFile,"%s", outBuff); fprintf(m_pOutFile,"%d", g_machine.s_machine_config.motion._ShiftPositionY); fprintf(m_pOutFile, "\n"); - outBuff="SHIFT_POSITION_Z="; fprintf(m_pOutFile,"%s", outBuff); fprintf(m_pOutFile,"%d", g_machine.s_machine_config.motion._ShiftPositionZ); fprintf(m_pOutFile, "\n"); + outBuff="SDK3000_SLEEP_COUNT="; + fprintf(m_pOutFile,"%s", outBuff); + fprintf(m_pOutFile,"%d", g_machine.s_machine_config.motion.m_CntThreadSleepVal); + fprintf(m_pOutFile, "\n"); + outBuff="GET_USB_MESSAGE_METHOD="; + fprintf(m_pOutFile,"%s", outBuff); + fprintf(m_pOutFile,"%d", g_machine.s_machine_config.motion.GetInterruptMsgMethod); + fprintf(m_pOutFile, "\n"); + outBuff="WRITE_DATA_SLEEP_TIME="; + fprintf(m_pOutFile,"%s", outBuff); + fprintf(m_pOutFile,"%d", g_machine.s_machine_config.motion.m_WriteDataSleepTime); + fprintf(m_pOutFile, "\n"); + outBuff="ACCURA_ERROR_PULSE_X="; + fprintf(m_pOutFile,"%s", outBuff); + fprintf(m_pOutFile,"%d", g_machine.s_machine_config.motion.m_AccuraErrPulseX); + fprintf(m_pOutFile, "\n"); + outBuff="ACCURA_ERROR_PULSE_Y="; + fprintf(m_pOutFile,"%s", outBuff); + fprintf(m_pOutFile,"%d", g_machine.s_machine_config.motion.m_AccuraErrPulseY); + fprintf(m_pOutFile, "\n"); + outBuff="ACCURA_ERROR_PULSE_Z="; + fprintf(m_pOutFile,"%s", outBuff); + fprintf(m_pOutFile,"%d", g_machine.s_machine_config.motion.m_AccuraErrPulseZ); + fprintf(m_pOutFile, "\n"); + outBuff="EQUIDISTANCE_PULSE_X="; + fprintf(m_pOutFile,"%s", outBuff); + fprintf(m_pOutFile,"%d", g_machine.s_machine_config.motion.m_EQUIDIS_X); + fprintf(m_pOutFile, "\n"); + outBuff="EQUIDISTANCE_PULSE_Y="; + fprintf(m_pOutFile,"%s", outBuff); + fprintf(m_pOutFile,"%d", g_machine.s_machine_config.motion.m_EQUIDIS_Y); + fprintf(m_pOutFile, "\n"); + outBuff="EQUIDISTANCE_PULSE_Z="; + fprintf(m_pOutFile,"%s", outBuff); + fprintf(m_pOutFile,"%d", g_machine.s_machine_config.motion.m_EQUIDIS_Z); + fprintf(m_pOutFile, "\n;\n"); + outBuff="[HSI]"; + fprintf(m_pOutFile,"%s", outBuff); + fprintf(m_pOutFile, "\n"); + outBuff="MACHINE_CONTROLLER_TYPE="; + fprintf(m_pOutFile,"%s", outBuff); + fprintf(m_pOutFile,"%d", g_machine.s_machine_config.motion.m_MachineType); + fprintf(m_pOutFile, "\n"); + outBuff="MACHINE_VIDEOCARD_TYPE="; + fprintf(m_pOutFile,"%s", outBuff); + fprintf(m_pOutFile,"%d", g_machine.s_machine_config.motion.m_VideoCardType); + fprintf(m_pOutFile, "\n"); fclose(m_pOutFile); - } return SSI_STATUS_MOTION_NORMAL; } @@ -2292,7 +2333,7 @@ SSI_STATUS_MOTION CSO7_Proto::Load_So7_Config() g_machine.s_machine_config.motion._EnCloseLoop=atoi(cTemp); } } - else if (!_stricmp(token,"RETRY_TIMES")) + else if (!_stricmp(token,"MOTION_RETRY_TIMES")) { token = strtok( NULL, seps); if (token) @@ -2328,8 +2369,106 @@ SSI_STATUS_MOTION CSO7_Proto::Load_So7_Config() g_machine.s_machine_config.motion._ShiftPositionZ=atof(cTemp); } } - - + else if (!_stricmp(token,"SDK3000_SLEEP_COUNT")) + { + token = strtok( NULL, seps); + if (token) + { + strcpy(cTemp,token); + g_machine.s_machine_config.motion.m_CntThreadSleepVal=atoi(cTemp); + } + } + else if (!_stricmp(token,"GET_USB_MESSAGE_METHOD")) + { + token = strtok( NULL, seps); + if (token) + { + strcpy(cTemp,token); + g_machine.s_machine_config.motion.GetInterruptMsgMethod=static_cast(atoi(cTemp)); + } + } + else if (!_stricmp(token,"WRITE_DATA_SLEEP_TIME")) + { + token = strtok( NULL, seps); + if (token) + { + strcpy(cTemp,token); + g_machine.s_machine_config.motion.m_WriteDataSleepTime=atoi(cTemp); + } + } + else if (!_stricmp(token,"ACCURA_ERROR_PULSE_X")) + { + token = strtok( NULL, seps); + if (token) + { + strcpy(cTemp,token); + g_machine.s_machine_config.motion.m_AccuraErrPulseX=atoi(cTemp); + } + } + else if (!_stricmp(token,"ACCURA_ERROR_PULSE_Y")) + { + token = strtok( NULL, seps); + if (token) + { + strcpy(cTemp,token); + g_machine.s_machine_config.motion.m_AccuraErrPulseY=atoi(cTemp); + } + } + else if (!_stricmp(token,"ACCURA_ERROR_PULSE_Z")) + { + token = strtok( NULL, seps); + if (token) + { + strcpy(cTemp,token); + g_machine.s_machine_config.motion.m_AccuraErrPulseZ=atoi(cTemp); + } + } + else if (!_stricmp(token,"EQUIDISTANCE_PULSE_X")) + { + token = strtok( NULL, seps); + if (token) + { + strcpy(cTemp,token); + g_machine.s_machine_config.motion.m_EQUIDIS_X=atoi(cTemp); + } + } + else if (!_stricmp(token,"EQUIDISTANCE_PULSE_Y")) + { + token = strtok( NULL, seps); + if (token) + { + strcpy(cTemp,token); + g_machine.s_machine_config.motion.m_EQUIDIS_Y=atoi(cTemp); + } + } + else if (!_stricmp(token,"EQUIDISTANCE_PULSE_Z")) + { + token = strtok( NULL, seps); + if (token) + { + strcpy(cTemp,token); + g_machine.s_machine_config.motion.m_EQUIDIS_Z=atoi(cTemp); + } + } + //=================MSI======================== + else if(!_stricmp(token,"MACHINE_CONTROLLER_TYPE")) + { + token = strtok( NULL, seps); + if (token) + { + strcpy(cTemp,token); + g_machine.s_machine_config.motion.m_MachineType=atoi(cTemp); + } + } + else if(!_stricmp(token,"MACHINE_VIDEOCARD_TYPE")) + { + token = strtok( NULL, seps); + if (token) + { + strcpy(cTemp,token); + g_machine.s_machine_config.motion.m_VideoCardType=atoi(cTemp); + } + } } } fclose(hConfigFile); @@ -3018,7 +3157,7 @@ SSI_STATUS_MOTION CSO7_Proto::so7_motion_set_position_xyz(double dX, double dY, so7_motion_is_finished(EMSG_STOPXYZ_1_MOVETOXYZ,IsFinished); Sleep(lSleep); ++lLoopCnt; - } while (g_machine.InterruptFlag[0]!=CT_STOPXYZ && lLoopCnt < lMaxLoopCnt); + } while (!IsFinished && lLoopCnt < lMaxLoopCnt); TRACE1("Presettle Time: %lf\n", TimeInSecs()); //WaitForSettleXYZZM(); diff --git a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h index bc02a42..d954547 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h @@ -58,6 +58,12 @@ const long MAX_INTENSITY = 0x3FF; #define MAXLIGHTVALUE 256 +enum EMACHINETYPE +{ + MACHINE_SO7_CONTROLLER, + MACHINE_METRONICS_CONTROLLER, + MACHINE_TOTAL=255 +}; enum EFirmwareVer { FirmwareVer_3_X=0, @@ -149,6 +155,17 @@ struct s_so7_machine_interface_config double _ShiftPositionX; double _ShiftPositionY; double _ShiftPositionZ; + INT m_CntThreadSleepVal; + char GetInterruptMsgMethod; + INT m_WriteDataSleepTime; + INT m_AccuraErrPulseX; + INT m_AccuraErrPulseY; + INT m_AccuraErrPulseZ; + INT m_EQUIDIS_X; + INT m_EQUIDIS_Y; + INT m_EQUIDIS_Z; + INT m_MachineType; + INT m_VideoCardType; }; //====================== 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 8c07685..f02cea1 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log @@ -2950,3 +2950,31 @@ 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 +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. 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 ce69cbf..559cd03 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 @@ -173,64 +173,8 @@ BOOL CSO7_UtilDlg::OnInitDialog() } m_OutMessage = _T("System Ready.\r\nPress 'Start_Machine' to start."); - OutputWithScroll(m_OutMessage,m_edMSG); - - GetDlgItem(IDC_BUTTON_START_SO7MACHINE)->EnableWindow(true); - GetDlgItem(IDC_BUTTON_STOP_SO7MACHINE)->EnableWindow(false); - - - GetDlgItem(IDC_BUTTON_SO7_READ_AXIS_XYZ)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_READ_PROBE)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_SO7_READ_AXIS_V)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_GET_FIXTURE_FLAG)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_SO7_GET_RESET_FLAG)->EnableWindow(false); - GetDlgItem(IDC_EDIT_AXIAL_LIGHT)->EnableWindow(false); - GetDlgItem(IDC_EDIT_BOTTOM_LIGHT)->EnableWindow(false); - GetDlgItem(IDC_EDIT_RING_LIGHT)->EnableWindow(false); - GetDlgItem(IDC_EDIT_COAXIAL_LIGHT)->EnableWindow(false); - GetDlgItem(IDC_EDIT_COAXIAL_LIGHT2)->EnableWindow(false); - GetDlgItem(IDC_EDIT_COAXIAL_LIGHT3)->EnableWindow(false); - GetDlgItem(IDC_EDIT_COAXIAL_LIGHT4)->EnableWindow(false); - - GetDlgItem(IDC_BUTTON_SETUP_SO7CONFIG)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_LOAD_SO7CONFIG)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_SO7_MOVE_ZOOM_IN)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_SO7_MOVE_ZOOM_OUT)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_SO7_MOVE_Z_UP)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_SO7_MOVE_Z_DOWN)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_SO7_MOVE_X_LEFT)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_SO7_MOVE_X_RIGHT)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_SO7_MOVE_Y_BACK)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_SO7_MOVE_Y_FRONT)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_SO7_MOVE_XR_YF)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_SO7_MOVE_XR_YB)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_SO7_MOVE_XL_YF)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_SO7_MOVE_XL_YB)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_SO7_RESET_XYZ)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_RESET_V)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_RESET_WORKTABLE)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_RESET_WORKTABLE_RIGHT)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_MANUAL_HOME)->EnableWindow(false); - - GetDlgItem(IDC_BUTTON_MOVE_TO)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_AUTO_ZOOM)->EnableWindow(false); - - GetDlgItem(IDC_BUTTON_SET_RESET_FLAG)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_GET_LASER)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_PROBE_ONOFF)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_FIXTURE_ONOFF)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_FIXTURE_UPDOWN)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_SO7_READ_IN_PORT_STATUS)->EnableWindow(false); - GetDlgItem(IDC_CHECK_CONTINUOUS_READ_IO_STATUS)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_SO7_TEST_Z_SIGNAL)->EnableWindow(false); - - GetDlgItem(IDC_EDIT_SET_VER_NO)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_SET_SECTION)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_CORRECTION_SCALE)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_SO7_CNC_PROGRAM)->EnableWindow(false); - GetDlgItem(IDC_CHECK_SO7_TURN_ON_FFF_LASER)->EnableWindow(false); - - + OutputWithScroll(m_OutMessage,m_edMSG); + UpdateCtrlsStatus(false); ((CButton *)GetDlgItem(IDC_RADIO_SPEED_GEAR1))->SetCheck(false); ((CButton *)GetDlgItem(IDC_RADIO_SPEED_GEAR2))->SetCheck(false); ((CButton *)GetDlgItem(IDC_RADIO_SPEED_GEAR3))->SetCheck(true); @@ -331,6 +275,66 @@ BOOL CSO7_UtilDlg::OnInitDialog() return TRUE; // return TRUE unless you set the focus to a control } +//===================================================================== +void CSO7_UtilDlg::UpdateCtrlsStatus(bool _bEnable) +{ + GetDlgItem(IDC_BUTTON_START_SO7MACHINE)->EnableWindow(!_bEnable); + GetDlgItem(IDC_BUTTON_STOP_SO7MACHINE)->EnableWindow(_bEnable); + + GetDlgItem(IDC_BUTTON_SO7_READ_AXIS_XYZ)->EnableWindow(_bEnable); + GetDlgItem(IDC_BUTTON_READ_PROBE)->EnableWindow(_bEnable); + GetDlgItem(IDC_BUTTON_SO7_READ_AXIS_V)->EnableWindow(_bEnable); + GetDlgItem(IDC_BUTTON_GET_FIXTURE_FLAG)->EnableWindow(_bEnable); + GetDlgItem(IDC_BUTTON_SO7_GET_RESET_FLAG)->EnableWindow(_bEnable); + GetDlgItem(IDC_EDIT_AXIAL_LIGHT)->EnableWindow(_bEnable); + GetDlgItem(IDC_EDIT_BOTTOM_LIGHT)->EnableWindow(_bEnable); + GetDlgItem(IDC_EDIT_RING_LIGHT)->EnableWindow(_bEnable); + GetDlgItem(IDC_EDIT_COAXIAL_LIGHT)->EnableWindow(_bEnable); + GetDlgItem(IDC_EDIT_COAXIAL_LIGHT2)->EnableWindow(_bEnable); + GetDlgItem(IDC_EDIT_COAXIAL_LIGHT3)->EnableWindow(_bEnable); + GetDlgItem(IDC_EDIT_COAXIAL_LIGHT4)->EnableWindow(_bEnable); + + GetDlgItem(IDC_BUTTON_SETUP_SO7CONFIG)->EnableWindow(_bEnable); + GetDlgItem(IDC_BUTTON_LOAD_SO7CONFIG)->EnableWindow(_bEnable); + GetDlgItem(IDC_BUTTON_SO7_MOVE_ZOOM_IN)->EnableWindow(_bEnable); + GetDlgItem(IDC_BUTTON_SO7_MOVE_ZOOM_OUT)->EnableWindow(_bEnable); + GetDlgItem(IDC_BUTTON_SO7_MOVE_Z_UP)->EnableWindow(_bEnable); + GetDlgItem(IDC_BUTTON_SO7_MOVE_Z_DOWN)->EnableWindow(_bEnable); + GetDlgItem(IDC_BUTTON_SO7_MOVE_X_LEFT)->EnableWindow(_bEnable); + GetDlgItem(IDC_BUTTON_SO7_MOVE_X_RIGHT)->EnableWindow(_bEnable); + GetDlgItem(IDC_BUTTON_SO7_MOVE_Y_BACK)->EnableWindow(_bEnable); + GetDlgItem(IDC_BUTTON_SO7_MOVE_Y_FRONT)->EnableWindow(_bEnable); + GetDlgItem(IDC_BUTTON_SO7_MOVE_XR_YF)->EnableWindow(_bEnable); + GetDlgItem(IDC_BUTTON_SO7_MOVE_XR_YB)->EnableWindow(_bEnable); + GetDlgItem(IDC_BUTTON_SO7_MOVE_XL_YF)->EnableWindow(_bEnable); + GetDlgItem(IDC_BUTTON_SO7_MOVE_XL_YB)->EnableWindow(_bEnable); + GetDlgItem(IDC_BUTTON_SO7_RESET_XYZ)->EnableWindow(_bEnable); + GetDlgItem(IDC_BUTTON_RESET_V)->EnableWindow(_bEnable); + GetDlgItem(IDC_BUTTON_RESET_WORKTABLE)->EnableWindow(_bEnable); + GetDlgItem(IDC_BUTTON_RESET_WORKTABLE_RIGHT)->EnableWindow(_bEnable); + GetDlgItem(IDC_BUTTON_MANUAL_HOME)->EnableWindow(_bEnable); + + GetDlgItem(IDC_BUTTON_MOVE_TO)->EnableWindow(_bEnable); + GetDlgItem(IDC_BUTTON_AUTO_ZOOM)->EnableWindow(_bEnable); + + GetDlgItem(IDC_BUTTON_SET_RESET_FLAG)->EnableWindow(_bEnable); + GetDlgItem(IDC_BUTTON_GET_LASER)->EnableWindow(_bEnable); + GetDlgItem(IDC_BUTTON_PROBE_ONOFF)->EnableWindow(_bEnable); + GetDlgItem(IDC_BUTTON_FIXTURE_ONOFF)->EnableWindow(_bEnable); + GetDlgItem(IDC_BUTTON_FIXTURE_UPDOWN)->EnableWindow(_bEnable); + GetDlgItem(IDC_BUTTON_SO7_READ_IN_PORT_STATUS)->EnableWindow(_bEnable); + GetDlgItem(IDC_CHECK_CONTINUOUS_READ_IO_STATUS)->EnableWindow(_bEnable); + GetDlgItem(IDC_BUTTON_SO7_TEST_Z_SIGNAL)->EnableWindow(_bEnable); + + GetDlgItem(IDC_EDIT_SET_VER_NO)->EnableWindow(_bEnable); + GetDlgItem(IDC_BUTTON_SET_SECTION)->EnableWindow(_bEnable); + GetDlgItem(IDC_BUTTON_CORRECTION_SCALE)->EnableWindow(_bEnable); + GetDlgItem(IDC_BUTTON_SO7_CNC_PROGRAM)->EnableWindow(_bEnable); + GetDlgItem(IDC_CHECK_SO7_TURN_ON_FFF_LASER)->EnableWindow(_bEnable); + GetDlgItem(IDC_BUTTON_SO7_SENDDATATOFPGA)->EnableWindow(_bEnable); + GetDlgItem(IDC_BUTTON_SO7_READDATAFROMFPGA)->EnableWindow(_bEnable); + +} //===================================================================== void CSO7_UtilDlg::OnBnClickedButtonInitSo7usb() @@ -367,7 +371,6 @@ void CSO7_UtilDlg::OnBnClickedButtonInitSo7usb() GetDlgItem(IDCANCEL)->EnableWindow(false); } - //===================================================================== void CSO7_UtilDlg::OnBnClickedButtonTermSo7usb() { @@ -399,62 +402,7 @@ void CSO7_UtilDlg::OnBnClickedButtonStartSo7machine() ((CButton*)GetDlgItem(IDC_BUTTON_FIXTURE_ONOFF))->SetWindowTextW(_T("当前状态：夹具开")); ((CButton*)GetDlgItem(IDC_BUTTON_FIXTURE_UPDOWN))->SetWindowTextW(_T("当前状态：夹具上")); - - GetDlgItem(IDC_BUTTON_START_SO7MACHINE)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_STOP_SO7MACHINE)->EnableWindow(true); - - GetDlgItem(IDC_BUTTON_SO7_READ_AXIS_XYZ)->EnableWindow(true); - GetDlgItem(IDC_BUTTON_READ_PROBE)->EnableWindow(true); - GetDlgItem(IDC_BUTTON_SO7_READ_AXIS_V)->EnableWindow(true); - GetDlgItem(IDC_BUTTON_GET_FIXTURE_FLAG)->EnableWindow(true); - GetDlgItem(IDC_BUTTON_SO7_GET_RESET_FLAG)->EnableWindow(true); - GetDlgItem(IDC_EDIT_AXIAL_LIGHT)->EnableWindow(true); - GetDlgItem(IDC_EDIT_BOTTOM_LIGHT)->EnableWindow(true); - GetDlgItem(IDC_EDIT_RING_LIGHT)->EnableWindow(true); - GetDlgItem(IDC_EDIT_COAXIAL_LIGHT)->EnableWindow(true); - GetDlgItem(IDC_EDIT_COAXIAL_LIGHT2)->EnableWindow(true); - GetDlgItem(IDC_EDIT_COAXIAL_LIGHT3)->EnableWindow(true); - GetDlgItem(IDC_EDIT_COAXIAL_LIGHT4)->EnableWindow(true); - - GetDlgItem(IDC_BUTTON_SETUP_SO7CONFIG)->EnableWindow(true); - GetDlgItem(IDC_BUTTON_LOAD_SO7CONFIG)->EnableWindow(true); - GetDlgItem(IDC_BUTTON_SO7_MOVE_ZOOM_IN)->EnableWindow(true); - GetDlgItem(IDC_BUTTON_SO7_MOVE_ZOOM_OUT)->EnableWindow(true); - GetDlgItem(IDC_BUTTON_SO7_MOVE_Z_UP)->EnableWindow(true); - GetDlgItem(IDC_BUTTON_SO7_MOVE_Z_DOWN)->EnableWindow(true); - GetDlgItem(IDC_BUTTON_SO7_MOVE_X_LEFT)->EnableWindow(true); - GetDlgItem(IDC_BUTTON_SO7_MOVE_X_RIGHT)->EnableWindow(true); - GetDlgItem(IDC_BUTTON_SO7_MOVE_Y_BACK)->EnableWindow(true); - GetDlgItem(IDC_BUTTON_SO7_MOVE_Y_FRONT)->EnableWindow(true); - GetDlgItem(IDC_BUTTON_SO7_MOVE_XR_YF)->EnableWindow(true); - GetDlgItem(IDC_BUTTON_SO7_MOVE_XR_YB)->EnableWindow(true); - GetDlgItem(IDC_BUTTON_SO7_MOVE_XL_YF)->EnableWindow(true); - GetDlgItem(IDC_BUTTON_SO7_MOVE_XL_YB)->EnableWindow(true); - GetDlgItem(IDC_BUTTON_SO7_RESET_XYZ)->EnableWindow(true); - GetDlgItem(IDC_BUTTON_RESET_V)->EnableWindow(true); - GetDlgItem(IDC_BUTTON_RESET_WORKTABLE)->EnableWindow(true); - GetDlgItem(IDC_BUTTON_RESET_WORKTABLE_RIGHT)->EnableWindow(true); - GetDlgItem(IDC_BUTTON_MANUAL_HOME)->EnableWindow(true); - - GetDlgItem(IDC_BUTTON_MOVE_TO)->EnableWindow(true); - GetDlgItem(IDC_BUTTON_AUTO_ZOOM)->EnableWindow(true); - - GetDlgItem(IDC_BUTTON_SET_RESET_FLAG)->EnableWindow(true); - GetDlgItem(IDC_BUTTON_GET_LASER)->EnableWindow(true); - GetDlgItem(IDC_BUTTON_PROBE_ONOFF)->EnableWindow(true); - GetDlgItem(IDC_BUTTON_FIXTURE_ONOFF)->EnableWindow(true); - GetDlgItem(IDC_BUTTON_FIXTURE_UPDOWN)->EnableWindow(true); - GetDlgItem(IDC_BUTTON_SO7_READ_IN_PORT_STATUS)->EnableWindow(true); - GetDlgItem(IDC_CHECK_CONTINUOUS_READ_IO_STATUS)->EnableWindow(true); - GetDlgItem(IDC_BUTTON_SO7_TEST_Z_SIGNAL)->EnableWindow(true); - - - GetDlgItem(IDC_EDIT_SET_VER_NO)->EnableWindow(true); - GetDlgItem(IDC_BUTTON_SET_SECTION)->EnableWindow(true); - GetDlgItem(IDC_BUTTON_CORRECTION_SCALE)->EnableWindow(true); - GetDlgItem(IDC_BUTTON_SO7_CNC_PROGRAM)->EnableWindow(true); - GetDlgItem(IDC_CHECK_SO7_TURN_ON_FFF_LASER)->EnableWindow(true); - + UpdateCtrlsStatus(true); SetTimer(1, 150, 0); GetDlgItem(IDC_EDIT_UPDATE_FREQ)->SetWindowText(_T("150")); @@ -472,61 +420,7 @@ void CSO7_UtilDlg::OnBnClickedButtonStopSo7machine() m_OutMessage = _T("Machine Stoped."); OutputWithScroll(m_OutMessage,m_edMSG); - - GetDlgItem(IDC_BUTTON_START_SO7MACHINE)->EnableWindow(true); - GetDlgItem(IDC_BUTTON_STOP_SO7MACHINE)->EnableWindow(false); - - GetDlgItem(IDC_BUTTON_SO7_READ_AXIS_XYZ)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_READ_PROBE)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_SO7_READ_AXIS_V)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_GET_FIXTURE_FLAG)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_SO7_GET_RESET_FLAG)->EnableWindow(false); - GetDlgItem(IDC_EDIT_AXIAL_LIGHT)->EnableWindow(false); - GetDlgItem(IDC_EDIT_BOTTOM_LIGHT)->EnableWindow(false); - GetDlgItem(IDC_EDIT_RING_LIGHT)->EnableWindow(false); - GetDlgItem(IDC_EDIT_COAXIAL_LIGHT)->EnableWindow(false); - GetDlgItem(IDC_EDIT_COAXIAL_LIGHT2)->EnableWindow(false); - GetDlgItem(IDC_EDIT_COAXIAL_LIGHT3)->EnableWindow(false); - GetDlgItem(IDC_EDIT_COAXIAL_LIGHT4)->EnableWindow(false); - - GetDlgItem(IDC_BUTTON_SETUP_SO7CONFIG)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_LOAD_SO7CONFIG)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_SO7_MOVE_ZOOM_IN)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_SO7_MOVE_ZOOM_OUT)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_SO7_MOVE_Z_UP)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_SO7_MOVE_Z_DOWN)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_SO7_MOVE_X_LEFT)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_SO7_MOVE_X_RIGHT)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_SO7_MOVE_Y_BACK)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_SO7_MOVE_Y_FRONT)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_SO7_MOVE_XR_YF)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_SO7_MOVE_XR_YB)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_SO7_MOVE_XL_YF)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_SO7_MOVE_XL_YB)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_SO7_RESET_XYZ)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_RESET_V)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_RESET_WORKTABLE)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_RESET_WORKTABLE_RIGHT)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_MANUAL_HOME)->EnableWindow(false); - - GetDlgItem(IDC_BUTTON_MOVE_TO)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_AUTO_ZOOM)->EnableWindow(false); - - GetDlgItem(IDC_BUTTON_SET_RESET_FLAG)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_GET_LASER)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_PROBE_ONOFF)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_FIXTURE_ONOFF)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_FIXTURE_UPDOWN)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_SO7_READ_IN_PORT_STATUS)->EnableWindow(false); - GetDlgItem(IDC_CHECK_CONTINUOUS_READ_IO_STATUS)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_SO7_TEST_Z_SIGNAL)->EnableWindow(false); - - GetDlgItem(IDC_EDIT_SET_VER_NO)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_SET_SECTION)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_CORRECTION_SCALE)->EnableWindow(false); - GetDlgItem(IDC_BUTTON_SO7_CNC_PROGRAM)->EnableWindow(false); - GetDlgItem(IDC_CHECK_SO7_TURN_ON_FFF_LASER)->EnableWindow(false); - + UpdateCtrlsStatus(false); KillTimer(1); m_pSO7_Proto->_shutdown_machine(); OnBnClickedButtonTermSo7usb(); 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 81f14e3..ff005e9 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 @@ -18,6 +18,7 @@ protected: virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV 支持 virtual BOOL OnInitDialog(); DECLARE_MESSAGE_MAP() + void UpdateCtrlsStatus(bool _bEnable); public: CString m_OutMessage; CString m_X_Pos; 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 a554108..485cd16 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