diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Release/UtilityDebug.Log b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Release/UtilityDebug.Log index 90847fb..7c71cae 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Release/UtilityDebug.Log +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Release/UtilityDebug.Log @@ -16,3 +16,21 @@ Construct Cso7_Proto. Destruct Cso7_Proto. Construct Cso7_Proto. Destruct Cso7_Proto. +Construct Cso7_Proto. +Destruct Cso7_Proto. +Construct Cso7_Proto. +Destruct Cso7_Proto. +Construct Cso7_Proto. +Destruct Cso7_Proto. +Construct Cso7_Proto. +Destruct Cso7_Proto. +Construct Cso7_Proto. +Destruct Cso7_Proto. +Construct Cso7_Proto. +Destruct Cso7_Proto. +Construct Cso7_Proto. +Destruct Cso7_Proto. +Construct Cso7_Proto. +Destruct Cso7_Proto. +Construct Cso7_Proto. +Destruct Cso7_Proto. 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 17b2b93..ef04e77 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 @@ -355,17 +355,19 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "Option Dialog" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "控制器",IDC_RADIO_CONTROLLER,"Button",BS_AUTORADIOBUTTON,175,39,40,10 - CONTROL "Keyence激光",IDC_RADIO_KEYENCE_LASER,"Button",BS_AUTORADIOBUTTON,175,89,76,10 CONTROL "SDK3000视频卡",IDC_RADIO_VIDEOCARD_SDK3000,"Button",BS_AUTORADIOBUTTON,48,39,69,10 CONTROL "SV2000E视频卡",IDC_RADIO_VIDEOCARD_SV2000E,"Button",BS_AUTORADIOBUTTON,48,64,69,10 CONTROL "TC4000视频卡",IDC_RADIO_VIDEOCARD_TC4000,"Button",BS_AUTORADIOBUTTON,48,89,69,10 + CONTROL "IP Camera",IDC_RADIO_SO7_IP_CAMERA,"Button",BS_AUTORADIOBUTTON,48,114,62,10 + CONTROL "控制器",IDC_RADIO_CONTROLLER,"Button",BS_AUTORADIOBUTTON,175,39,40,10 + CONTROL "Manual Machine",IDC_RADIO__SO7_RS232,"Button",BS_AUTORADIOBUTTON,175,57,67,10 + CONTROL "Keyence激光",IDC_RADIO_KEYENCE_LASER,"Button",BS_AUTORADIOBUTTON,175,75,76,10 + CONTROL "Verifcation",IDC_RADIO_SO7_VERIFICATION_ALGORITHM, + "Button",BS_AUTORADIOBUTTON,175,93,50,10 + CONTROL "Image.dll",IDC_RADIO_TEST_IMAGE_DLL,"Button",BS_AUTORADIOBUTTON,175,111,45,10 DEFPUSHBUTTON "OK",IDOK,181,145,50,14 PUSHBUTTON "Cancel",IDCANCEL,241,145,50,14 GROUPBOX "测试选项",IDC_STATIC,29,15,243,120 - CONTROL "Image.dll",IDC_RADIO_TEST_IMAGE_DLL,"Button",BS_AUTORADIOBUTTON,175,114,45,10 - CONTROL "IP Camera",IDC_RADIO_SO7_IP_CAMERA,"Button",BS_AUTORADIOBUTTON,48,114,62,10 - CONTROL "Manual Machine",IDC_RADIO__SO7_RS232,"Button",BS_AUTORADIOBUTTON,175,64,67,10 END IDD_SO7_VIDEOCARD_SDK3000 DIALOGEX 0, 0, 488, 316 @@ -620,6 +622,91 @@ BEGIN PUSHBUTTON "Save as...",IDC_BUTTON_SO7_MANUAL_MACHINE_SAVE_MSG,280,249,40,17 END +IDD_SO7_UTIL_VERIFICATION_ALGORITHM DIALOGEX 0, 0, 617, 254 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Verification Algorithm" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + EDITTEXT IDC_EDIT_IMAGEDLL_2LASER_X1,38,32,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_IMAGEDLL_2LASER_Y1,84,32,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_IMAGEDLL_2LASER_TOPZ1,130,32,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_IMAGEDLL_2LASER_X2,38,49,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_IMAGEDLL_2LASER_Y2,84,49,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_IMAGEDLL_2LASER_TOPZ2,130,49,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_IMAGEDLL_2LASER_X3,38,66,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_IMAGEDLL_2LASER_Y3,84,66,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_IMAGEDLL_2LASER_TOPZ3,130,66,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_IMAGEDLL_2LASER_X4,205,32,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_IMAGEDLL_2LASER_Y4,251,32,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_IMAGEDLL_2LASER_TOPZ4,297,32,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_IMAGEDLL_2LASER_X5,205,49,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_IMAGEDLL_2LASER_Y5,251,49,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_IMAGEDLL_2LASER_TOPZ5,297,49,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_IMAGEDLL_2LASER_X6,205,65,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_IMAGEDLL_2LASER_Y6,251,65,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_IMAGEDLL_2LASER_TOPZ6,297,65,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_IMAGEDLL_2LASER_X7,375,32,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_IMAGEDLL_2LASER_Y7,421,32,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_IMAGEDLL_2LASER_BOTTOMZ1,465,31,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_IMAGEDLL_2LASER_X8,375,49,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_IMAGEDLL_2LASER_Y8,421,49,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_IMAGEDLL_2LASER_BOTTOMZ2,465,48,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_IMAGEDLL_2LASER_X9,375,65,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_IMAGEDLL_2LASER_Y9,421,65,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_IMAGEDLL_2LASER_BOTTOMZ3,465,65,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_IMAGEDLL_2LASER_TOPZ_CALIBRATE,556,31,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_IMAGEDLL_2LASER_BOTTOMZ__CALIBRATE,556,48,40,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_IMAGEDLL_2LASER_STANDARD_VALUE,556,65,40,14,ES_AUTOHSCROLL + PUSHBUTTON "Calculate",IDC_BUTTON_IMAGEDLL_2LASER_CALCULATE,373,114,110,65 + EDITTEXT IDC_EDIT_IMAGEDLL_2LASER_MEASURED_VALUE4,78,117,46,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_IMAGEDLL_2LASER_MEASURED_VALUE,145,117,46,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_IMAGEDLL_2LASER_MEASURED_VALUE2,215,117,46,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_IMAGEDLL_2LASER_MEASURED_VALUE3,279,117,46,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_IMAGEDLL_2LASER_MEASURED_VALUE8,79,153,46,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_IMAGEDLL_2LASER_MEASURED_VALUE5,146,153,46,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_IMAGEDLL_2LASER_MEASURED_VALUE7,216,153,46,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_IMAGEDLL_2LASER_MEASURED_VALUE6,280,153,46,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_IMAGEDLL_2LASER_MEASURED_VALUE9,79,179,46,14,ES_AUTOHSCROLL + PUSHBUTTON "Exit",IDCANCEL,560,233,50,14 + LTEXT "X",IDC_STATIC,56,20,8,8 + LTEXT "Y",IDC_STATIC,100,20,8,8 + LTEXT "Laser-TOP",IDC_STATIC,134,20,34,8 + LTEXT "Z-BOTTOM",IDC_STATIC,469,19,36,8 + LTEXT "Point1",IDC_STATIC,16,34,21,8 + LTEXT "Point2",IDC_STATIC,16,51,21,8 + LTEXT "Point3",IDC_STATIC,16,69,21,8 + LTEXT "Top Surface",IDC_STATIC,31,120,40,8 + LTEXT "X",IDC_STATIC,223,20,8,8 + LTEXT "Y",IDC_STATIC,267,20,8,8 + LTEXT "Point1",IDC_STATIC,183,33,21,8 + LTEXT "Point2",IDC_STATIC,183,51,21,8 + LTEXT "Point3",IDC_STATIC,183,69,21,8 + LTEXT "Laser-TOP",IDC_STATIC,302,20,34,8 + LTEXT "X",IDC_STATIC,393,20,8,8 + LTEXT "Y",IDC_STATIC,436,20,8,8 + LTEXT "Point1",IDC_STATIC,353,33,21,8 + LTEXT "Point2",IDC_STATIC,353,51,21,8 + LTEXT "Point3",IDC_STATIC,353,69,21,8 + GROUPBOX "Reference plane",IDC_STATIC,14,9,161,76 + GROUPBOX "Top surface",IDC_STATIC,181,10,161,76 + GROUPBOX "Bottom surface",IDC_STATIC,350,10,161,76 + GROUPBOX "Calibrate value",IDC_STATIC,518,10,87,77 + LTEXT "PNT1-RefPlane",IDC_STATIC,145,103,49,8 + LTEXT "PNT2-RefPlane",IDC_STATIC,213,103,49,8 + LTEXT "PNT3-RefPlane",IDC_STATIC,281,103,49,8 + LTEXT "Average",IDC_STATIC,84,103,28,8 + LTEXT "Bottom Surface",IDC_STATIC,23,155,50,8 + LTEXT "PNT1-RefPlane",IDC_STATIC,146,139,49,8 + LTEXT "PNT2-RefPlane",IDC_STATIC,214,139,49,8 + LTEXT "PNT3-RefPlane",IDC_STATIC,282,139,49,8 + LTEXT "Average",IDC_STATIC,85,139,28,8 + LTEXT "Thickness",IDC_STATIC,33,182,32,8 + GROUPBOX "Result",IDC_STATIC,16,91,325,127 + LTEXT "Top",IDC_STATIC,529,33,13,8 + LTEXT "Bottom",IDC_STATIC,525,49,23,8 + LTEXT "Standard",IDC_STATIC,523,68,30,8 +END + ///////////////////////////////////////////////////////////////////////////// // @@ -718,6 +805,14 @@ BEGIN TOPMARGIN, 7 BOTTOMMARGIN, 306 END + + IDD_SO7_UTIL_VERIFICATION_ALGORITHM, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 610 + TOPMARGIN, 7 + BOTTOMMARGIN, 247 + END END #endif // APSTUDIO_INVOKED 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 5798be7..9763aec 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 @@ -29,8 +29,12 @@ #include "..\..\..\SevenOcean\dll.h" #include "..\..\..\SevenOcean\So7_Interface.h" #include "So7_Util_ImageDll.h" -#include "afxdialogex.h" + +#include "SO7_Verfication_Algorithm.h" + #include "So7_Option.h" +#include "afxdialogex.h" +//#define _RELEASE_ONLY_ONE_FUNCTION CSerial* m_pSO7_Serial=NULL; @@ -61,6 +65,7 @@ void CSo7_Option::DoDataExchange(CDataExchange* pDX) BEGIN_MESSAGE_MAP(CSo7_Option, CDialog) + ON_WM_TIMER() ON_BN_CLICKED(IDOK, &CSo7_Option::OnBnClickedOk) ON_BN_CLICKED(IDCANCEL, &CSo7_Option::OnBnClickedCancel) END_MESSAGE_MAP() @@ -99,6 +104,11 @@ BOOL CSo7_Option::OnInitDialog() ((CButton *)GetDlgItem(IDC_RADIO_KEYENCE_LASER))->SetCheck(TRUE); ((CButton *)GetDlgItem(IDC_RADIO_SO7_IP_CAMERA))->SetCheck(FALSE); ((CButton *)GetDlgItem(IDC_RADIO__SO7_RS232))->SetCheck(FALSE); + ((CButton *)GetDlgItem(IDC_RADIO_SO7_VERIFICATION_ALGORITHM))->SetCheck(FALSE); + +#ifdef _RELEASE_ONLY_ONE_FUNCTION + SetTimer(1,50,NULL); +#endif return TRUE; // return TRUE unless you set the focus to a control } @@ -147,7 +157,6 @@ void CSo7_Option::OnBnClickedOk() m_pKeyence_Proto=NULL; delete m_pSO7_Proto; m_pSO7_Proto=NULL; - OnBnClickedCancel(); } else if (((CButton *)GetDlgItem(IDC_RADIO_VIDEOCARD_SDK3000))->GetCheck()) { @@ -182,6 +191,16 @@ void CSo7_Option::OnBnClickedOk() m_pSo7_Interface=NULL; } } + else if(((CButton *)GetDlgItem(IDC_RADIO_SO7_VERIFICATION_ALGORITHM))->GetCheck()) + { + CSO7_Verfication_Algorithm* pSO7_Verfication_Algorithm=new CSO7_Verfication_Algorithm(); + pSO7_Verfication_Algorithm->DoModal(); + } + + +#ifdef _RELEASE_ONLY_ONE_FUNCTION + OnBnClickedCancel(); +#endif } //=================================== @@ -196,7 +215,8 @@ void CSo7_Option::OnTimer(UINT_PTR nIDEvent) { case 1: { - + KillTimer(1); + OnBnClickedOk(); } break; } diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj index ba384c7..459c4ca 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj @@ -241,6 +241,7 @@ + Create @@ -295,6 +296,7 @@ + diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj.filters b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj.filters index 51e7039..0a0acf3 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj.filters +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj.filters @@ -121,6 +121,7 @@ Sources Files + @@ -273,6 +274,7 @@ Header Files + 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 fbb8c44..153af00 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h @@ -43,6 +43,7 @@ #define IDD_SO7_UTIL_IMAGE_DLL 165 #define IDD_SO7_VIDEOCARD_TC4000 166 #define IDD_SO7_UTIL_MANUAL_MACHINE 167 +#define IDD_SO7_UTIL_VERIFICATION_ALGORITHM 168 #define IDC_BUTTON_INIT_MVUSB 1001 #define IDC_BUTTON_START_MACHINE 1002 #define IDC_BUTTON_START_POLL_58 1004 @@ -348,11 +349,17 @@ #define IDC_EDIT_IMAGEDLL_2LASER_TOPZ3 1276 #define IDC_BUTTON_ZERO_SET 1277 #define IDC_EDIT_FRESHSPEED_X4 1277 +#define IDC_EDIT_IMAGEDLL_2LASER_TOPZ4 1277 #define IDC_EDIT_SAVE_INI_FILE 1278 #define IDC_EDIT_FRESHSPEED_X5 1278 +#define IDC_EDIT_IMAGEDLL_2LASER_TOPZ5 1278 #define IDC_EDIT_FRESHSPEED_Y1 1279 +#define IDC_EDIT_IMAGEDLL_2LASER_TOPZ6 1279 #define IDC_BUTTON_SAVE 1280 +#define IDC_EDIT_IMAGEDLL_2LASER_TOPZ7 1280 +#define IDC_EDIT_IMAGEDLL_2LASER_BOTTOMZ__CALIBRATE 1280 #define IDC_BUTTON_SAVE_PARAMETER 1281 +#define IDC_EDIT_IMAGEDLL_2LASER_TOPZ_CALIBRATE 1281 #define IDC_BUTTON_READ_PARAMETER_FROM_CONTROLLER 1282 #define IDC_EDIT_FRESHSPEED_Y2 1283 #define IDC_EDIT_FRESHSPEED_Y3 1284 @@ -699,21 +706,42 @@ #define IDC_EDIT_IMAGEDLL_2LASER_BOTTOMZ3 1585 #define IDC_BUTTON_IMAGEDLL_2LASER_CALCULATE 1586 #define IDC_EDIT_IMAGEDLL_2LASER_XSHIFT 1587 +#define IDC_EDIT_IMAGEDLL_2LASER_MEASURED_VALUE2 1587 #define IDC_EDIT_IMAGEDLL_2LASER_YSHIFT 1588 +#define IDC_EDIT_IMAGEDLL_2LASER_MEASURED_VALUE3 1588 +#define IDC_EDIT_IMAGEDLL_2LASER_X4 1589 +#define IDC_EDIT_IMAGEDLL_2LASER_Y4 1590 #define IDC_EDIT_TEST_LK_G_INTERVAL 1591 +#define IDC_EDIT_IMAGEDLL_2LASER_X5 1591 #define IDC_RADIO__SO7_RS232 1592 +#define IDC_EDIT_IMAGEDLL_2LASER_Y5 1592 +#define IDC_EDIT_IMAGEDLL_2LASER_X6 1593 +#define IDC_EDIT_IMAGEDLL_2LASER_Y6 1594 +#define IDC_EDIT_IMAGEDLL_2LASER_X7 1595 +#define IDC_EDIT_IMAGEDLL_2LASER_Y7 1596 +#define IDC_EDIT_IMAGEDLL_2LASER_X8 1597 #define IDC_EDIT_SO7_MANUAL_MACHINE_DATA 1598 +#define IDC_EDIT_IMAGEDLL_2LASER_Y8 1598 #define IDC_RADIO_SO7_MANUAL_MACHINE_SEND_DATA_TYPE_HEX 1599 +#define IDC_EDIT_IMAGEDLL_2LASER_X9 1599 #define IDC_RADIO_SO7_MANUAL_MACHINE_SEND_DATA_TYPE_ANSCII 1600 +#define IDC_EDIT_IMAGEDLL_2LASER_Y9 1600 #define IDC_RADIO_SO7_MANUAL_MACHINE_COMMON_CMD1 1601 +#define IDC_EDIT_IMAGEDLL_2LASER_MEASURED_VALUE4 1601 #define IDC_RADIO_SO7_MANUAL_MACHINE_COMMON_CMD2 1602 +#define IDC_EDIT_IMAGEDLL_2LASER_MEASURED_VALUE5 1602 #define IDC_RADIO_SO7_MANUAL_MACHINE_COMMON_CMD3 1603 +#define IDC_EDIT_IMAGEDLL_2LASER_MEASURED_VALUE6 1603 #define IDC_BUTTON_SO7_MANUAL_MACHINE_CLEAR_MSG 1604 +#define IDC_EDIT_IMAGEDLL_2LASER_MEASURED_VALUE7 1604 #define IDC_BUTTON_SO7_MANUAL_MACHINE_SAVE_MSG 1605 +#define IDC_EDIT_IMAGEDLL_2LASER_MEASURED_VALUE8 1605 #define IDC_BUTTON_TEST_KEYENCE_CLEAR_LOG 1606 #define IDC_BUTTON_KEYENCE_LASER_CALIBRATE_VALUE 1607 #define IDC_EDIT_KEYENCE_LASER_CALIBRATE_VALUE 1608 +#define IDC_EDIT_IMAGEDLL_2LASER_MEASURED_VALUE9 1610 #define IDC_EDIT_TEST_KEYENCE_SETFOCUS 1650 +#define IDC_RADIO_SO7_VERIFICATION_ALGORITHM 1651 // Next default values for new objects // @@ -721,7 +749,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 168 #define _APS_NEXT_COMMAND_VALUE 32771 -#define _APS_NEXT_CONTROL_VALUE 1651 +#define _APS_NEXT_CONTROL_VALUE 1652 #define _APS_NEXT_SYMED_VALUE 101 #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 bc54acd..82bf99c 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