From 667f78e7f4c2074a105e2458096c5841001b58ca Mon Sep 17 00:00:00 2001 From: TAO Cheng Date: Fri, 7 Jun 2013 15:38:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=82=B9=E5=88=B0=E9=9D=A2?= =?UTF-8?q?=E7=9A=84=E8=AE=A1=E7=AE=97=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tools/UsbUtility/Release/UtilityDebug.Log | 18 +++ .../Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc | 105 +++++++++++++++++- .../Tools/UsbUtility/UsbUtil/So7_Option.cpp | 26 ++++- .../Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj | 2 + .../UsbUtil/Usb_Util.vcxproj.filters | 2 + .../Hsi/Tools/UsbUtility/UsbUtil/resource.h | 30 ++++- .../Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo | Bin 1202176 -> 1202176 bytes 7 files changed, 174 insertions(+), 9 deletions(-) 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 bc54acd1bc3a00b6259f3ceb075b68826a71bab1..82bf99ccf8b73e290f81187ad3abaad633c8eeae 100644 GIT binary patch delta 9155 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