diff --git a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp index f9365c3..996b848 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp @@ -6872,6 +6872,14 @@ SSI_STATUS_MOTION CSO7_Proto::_process_SO7_CMD_READ_FIRMWARE_VERSION_INFO() g_machine.FirmwareVer=FirmwareVer_7_X; } } + else if (g_machine.FirmwareInfo[3]=='8') + { + g_machine.FirmwareVer=FirmwareVer_8_X; + } + else if (g_machine.FirmwareInfo[3]=='9') + { + g_machine.FirmwareVer=FirmwareVer_9_X; + } else { g_machine.FirmwareVer=FirmwareVer_3_X; diff --git a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h index 00bea55..4af65e0 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h @@ -82,6 +82,8 @@ enum EFirmwareVer FirmwareVer_7_X, FirmwareVer_7_9,//add control mode FirmwareVer_7_A,//add segment dis + FirmwareVer_8_X, + FirmwareVer_9_X, FirmwareVer_Total }; enum ESO7_AXIS_TYPE 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 6e90727..8cc17de 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 @@ -396,39 +396,39 @@ BEGIN EDITTEXT IDC_EDIT_ZOOM_TIME,14,159,112,112,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL END -IDD_SO7_OPTION_DIALOG DIALOGEX 0, 0, 290, 214 +IDD_SO7_OPTION_DIALOG DIALOGEX 0, 0, 335, 194 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Utility for SO7" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "SDK3000视频卡",IDC_RADIO_VIDEOCARD_SDK3000,"Button",BS_AUTORADIOBUTTON | WS_GROUP,24,31,69,10 - CONTROL "SV2000E视频卡",IDC_RADIO_VIDEOCARD_SV2000E,"Button",BS_AUTORADIOBUTTON,24,47,69,10 - CONTROL "SV4000E视频卡",IDC_RADIO_VIDEOCARD_SV4000E,"Button",BS_AUTORADIOBUTTON,24,63,68,10 - CONTROL "TC4000视频卡",IDC_RADIO_VIDEOCARD_TC4000,"Button",BS_AUTORADIOBUTTON,24,79,69,10 - CONTROL "IP Camera",IDC_RADIO_SO7_IP_CAMERA,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE,24,111,62,10 - CONTROL "USB Camera",IDC_RADIO_SO7_USB_CAMERA,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE,24,127,62,10 - CONTROL "LK_G激光",IDC_RADIO_KEYENCE_LASER,"Button",BS_AUTORADIOBUTTON,100,31,76,10 - CONTROL "LK_H激光(USB)",IDC_RADIO_KEYENCE_LASER_LK_H,"Button",BS_AUTORADIOBUTTON,100,47,76,10 + CONTROL "SDK3000视频卡",IDC_RADIO_VIDEOCARD_SDK3000,"Button",BS_AUTORADIOBUTTON | WS_GROUP,235,24,69,10 + CONTROL "SV2000E视频卡",IDC_RADIO_VIDEOCARD_SV2000E,"Button",BS_AUTORADIOBUTTON,235,40,69,10 + CONTROL "SV4000E视频卡",IDC_RADIO_VIDEOCARD_SV4000E,"Button",BS_AUTORADIOBUTTON,235,56,68,10 + CONTROL "TC4000视频卡",IDC_RADIO_VIDEOCARD_TC4000,"Button",BS_AUTORADIOBUTTON,235,72,69,10 + CONTROL "IP Camera",IDC_RADIO_SO7_IP_CAMERA,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE,235,104,62,10 + CONTROL "USB Camera",IDC_RADIO_SO7_USB_CAMERA,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE,235,120,62,10 + CONTROL "LK_G激光",IDC_RADIO_KEYENCE_LASER,"Button",BS_AUTORADIOBUTTON,129,24,76,10 + CONTROL "LK_H激光(USB)",IDC_RADIO_KEYENCE_LASER_LK_H,"Button",BS_AUTORADIOBUTTON,129,40,76,10 CONTROL "LK_H激光(ETHERNET)",IDC_RADIO_KEYENCE_LASER_LKH_ETHERNET, - "Button",BS_AUTORADIOBUTTON,100,63,85,10 - CONTROL "LJ_G激光",IDC_RADIO_KEYENCE_LASER3,"Button",BS_AUTORADIOBUTTON,100,79,76,10 - CONTROL "ART PCI8822",IDC_RADIO_ART_PCI8622,"Button",BS_AUTORADIOBUTTON,100,95,76,10 - CONTROL "STIL CCS-PRIMA",IDC_RADIO_ERT_CCS_PRIMA,"Button",BS_AUTORADIOBUTTON,100,111,76,10 - CONTROL "控制器(USB)",IDC_RADIO_CONTROLLER,"Button",BS_AUTORADIOBUTTON,195,31,69,10 - CONTROL "控制器(USB R)",IDC_RADIO_CONTROLLER2,"Button",BS_AUTORADIOBUTTON,195,47,75,10 - CONTROL "控制器(RS232)",IDC_RADIO__SO7_RS232,"Button",BS_AUTORADIOBUTTON,195,63,77,10 + "Button",BS_AUTORADIOBUTTON,129,56,85,10 + CONTROL "LJ_G激光",IDC_RADIO_KEYENCE_LASER3,"Button",BS_AUTORADIOBUTTON,129,72,76,10 + CONTROL "ART PCI8822",IDC_RADIO_ART_PCI8622,"Button",BS_AUTORADIOBUTTON,129,88,76,10 + CONTROL "STIL CCS-PRIMA",IDC_RADIO_ERT_CCS_PRIMA,"Button",BS_AUTORADIOBUTTON,129,104,76,10 + CONTROL "控制器(USB)",IDC_RADIO_CONTROLLER,"Button",BS_AUTORADIOBUTTON,26,24,69,10 + CONTROL "控制器(USB R)",IDC_RADIO_CONTROLLER2,"Button",BS_AUTORADIOBUTTON,26,40,75,10 + CONTROL "控制器(RS232)",IDC_RADIO__SO7_RS232,"Button",BS_AUTORADIOBUTTON,26,56,77,10 CONTROL "Verifcation algorithm",IDC_RADIO_SO7_VERIFICATION_ALGORITHM, - "Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,197,81,10 - CONTROL "Image.dll",IDC_RADIO_TEST_IMAGE_DLL,"Button",BS_AUTORADIOBUTTON,195,79,45,10 - DEFPUSHBUTTON "OK",IDOK,145,193,50,14 - PUSHBUTTON "Cancel",IDCANCEL,225,193,50,14 - GROUPBOX "测试选项",IDC_STATIC,10,8,265,179 - CONTROL "MV900视频卡",IDC_RADIO_VIDEOCARD_MV900,"Button",BS_AUTORADIOBUTTON,24,95,69,10 - CONTROL "TCPIP Client(CJ2M PLC)",IDC_RADIO_SO7_OMRON_PLC,"Button",BS_AUTORADIOBUTTON,100,127,106,10 + "Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE,235,152,81,10 + CONTROL "Image.dll",IDC_RADIO_TEST_IMAGE_DLL,"Button",BS_AUTORADIOBUTTON,235,136,45,10 + DEFPUSHBUTTON "OK",IDOK,195,173,50,14 + PUSHBUTTON "Cancel",IDCANCEL,270,173,50,14 + GROUPBOX "测试选项",IDC_STATIC,11,8,304,158 + CONTROL "MV900视频卡",IDC_RADIO_VIDEOCARD_MV900,"Button",BS_AUTORADIOBUTTON,235,88,69,10 + CONTROL "TCPIP Client(CJ2M PLC)",IDC_RADIO_SO7_OMRON_PLC,"Button",BS_AUTORADIOBUTTON,26,88,89,10 CONTROL "TCPIP Server(CJ2M PLC)",IDC_RADIO_SO7_OMRON_PLC_SERVER, - "Button",BS_AUTORADIOBUTTON,100,143,91,10 - CONTROL "Temperature Display",IDC_RADIO_SO7_TEMPERATURE_SENSOR, - "Button",BS_AUTORADIOBUTTON,99,159,82,10 + "Button",BS_AUTORADIOBUTTON,26,72,91,10 + CONTROL "Temperature Sensor",IDC_RADIO_SO7_TEMPERATURE_SENSOR, + "Button",BS_AUTORADIOBUTTON,26,104,81,10 END IDD_SO7_VIDEOCARD_SDK3000 DIALOGEX 0, 0, 488, 316 @@ -1229,9 +1229,9 @@ BEGIN IDD_SO7_OPTION_DIALOG, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 275 + RIGHTMARGIN, 320 TOPMARGIN, 6 - BOTTOMMARGIN, 207 + BOTTOMMARGIN, 187 END IDD_SO7_VIDEOCARD_SDK3000, DIALOG @@ -2080,8 +2080,8 @@ CAPTION "About Utility" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN ICON IDR_MAINFRAME,IDC_STATIC,16,11,20,20 - LTEXT "Version 6.1",IDC_STATIC,89,13,45,8,SS_NOPREFIX - LTEXT "Hexagon Metrology, Copyright (C) 2013",IDC_STATIC,51,27,129,8 + LTEXT "Version 7.0.9",IDC_STATIC,89,13,45,8,SS_NOPREFIX + LTEXT "Hexagon Metrology, Copyright (C) 2015",IDC_STATIC,51,27,129,8 DEFPUSHBUTTON "OK",IDOK,141,46,50,14,WS_GROUP END @@ -2792,8 +2792,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 7,0,8,0 - PRODUCTVERSION 7,0,8,0 + FILEVERSION 7,0,9,0 + PRODUCTVERSION 7,0,9,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -2810,12 +2810,12 @@ BEGIN BEGIN VALUE "CompanyName", "Hexagon Metrology" VALUE "FileDescription", "Utility for Hexagon Metrology" - VALUE "FileVersion", "7.0.8.0" + VALUE "FileVersion", "7.0.9.0" VALUE "InternalName", "Usb_Util.exe" - VALUE "LegalCopyright", "Copyright 2014 Hexagon Metrology." + VALUE "LegalCopyright", "Copyright 2015 Hexagon Metrology." VALUE "OriginalFilename", "Usb_Util.exe" VALUE "ProductName", "Utility" - VALUE "ProductVersion", "7.0.8.0" + VALUE "ProductVersion", "7.0.9.0" END END BLOCK "VarFileInfo" diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Option.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Option.cpp index 2d0deb1..cc85146 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Option.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Option.cpp @@ -175,6 +175,22 @@ BOOL CSo7_Option::OnInitDialog() ((CButton *)GetDlgItem(IDC_RADIO_TEST_IMAGE_DLL))->EnableWindow(FALSE); ((CButton *)GetDlgItem(IDC_RADIO_ART_PCI8622))->EnableWindow(FALSE); ((CButton *)GetDlgItem(IDC_RADIO_ERT_CCS_PRIMA))->EnableWindow(FALSE); + + ((CButton *)GetDlgItem(IDC_RADIO_VIDEOCARD_SDK3000))->ShowWindow(FALSE); + ((CButton *)GetDlgItem(IDC_RADIO_VIDEOCARD_SV2000E))->ShowWindow(FALSE); + ((CButton *)GetDlgItem(IDC_RADIO_VIDEOCARD_SV4000E))->ShowWindow(FALSE); + ((CButton *)GetDlgItem(IDC_RADIO_VIDEOCARD_TC4000))->ShowWindow(FALSE); + ((CButton *)GetDlgItem(IDC_RADIO_VIDEOCARD_MV900))->ShowWindow(FALSE); + ((CButton *)GetDlgItem(IDC_RADIO_SO7_IP_CAMERA))->ShowWindow(FALSE); + ((CButton *)GetDlgItem(IDC_RADIO_SO7_USB_CAMERA))->ShowWindow(FALSE); + ((CButton *)GetDlgItem(IDC_RADIO_KEYENCE_LASER))->ShowWindow(FALSE); + ((CButton *)GetDlgItem(IDC_RADIO_KEYENCE_LASER_LK_H))->ShowWindow(FALSE); + ((CButton *)GetDlgItem(IDC_RADIO_KEYENCE_LASER_LKH_ETHERNET))->ShowWindow(FALSE); + ((CButton *)GetDlgItem(IDC_RADIO_KEYENCE_LASER3))->ShowWindow(FALSE); + ((CButton *)GetDlgItem(IDC_RADIO_SO7_VERIFICATION_ALGORITHM))->ShowWindow(FALSE); + ((CButton *)GetDlgItem(IDC_RADIO_TEST_IMAGE_DLL))->ShowWindow(FALSE); + ((CButton *)GetDlgItem(IDC_RADIO_ART_PCI8622))->ShowWindow(FALSE); + ((CButton *)GetDlgItem(IDC_RADIO_ERT_CCS_PRIMA))->ShowWindow(FALSE); #endif #ifdef _RELEASE_ONLY_ONE_FUNCTION 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 ed8b0bd..18e0e09 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