From 5b6de3f176bd62d96773223e0b005f56198aa434 Mon Sep 17 00:00:00 2001 From: TAO Cheng Date: Tue, 25 Feb 2014 10:45:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9ELKG5000=E7=9A=84ethernet?= =?UTF-8?q?=E9=80=9A=E4=BF=A1=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Msi/Hsi/Keyence/Keyence_Laser_LK_H.cpp | 44 +++++- .../Msi/Hsi/Keyence/Keyence_Laser_LK_H.h | 6 +- .../UsbUtility/UsbUtil/KeyenceLKH_Dlg.cpp | 1 + .../Tools/UsbUtility/UsbUtil/KeyenceLKH_Dlg.h | 2 +- .../UsbUtil/Keyence_LKG5000_Ethernet.cpp | 133 ++++++++++++++++++ .../UsbUtil/Keyence_LKG5000_Ethernet.h | 34 +++++ .../UsbUtility/UsbUtil/Keyence_UtilDlg.h | 2 +- .../Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc | 77 ++++++---- .../UsbUtility/UsbUtil/SO7_Send_Parameter.h | 2 +- .../Tools/UsbUtility/UsbUtil/So7_Option.cpp | 100 +++++++------ .../Hsi/Tools/UsbUtility/UsbUtil/So7_Option.h | 2 +- .../Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj | 4 + .../UsbUtil/Usb_Util.vcxproj.filters | 6 + .../Hsi/Tools/UsbUtility/UsbUtil/resource.h | 22 ++- .../Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo | Bin 2355712 -> 2355712 bytes 15 files changed, 351 insertions(+), 84 deletions(-) create mode 100644 PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Keyence_LKG5000_Ethernet.cpp create mode 100644 PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Keyence_LKG5000_Ethernet.h diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Keyence/Keyence_Laser_LK_H.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Keyence/Keyence_Laser_LK_H.cpp index 3c73ee3..ac0d057 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Keyence/Keyence_Laser_LK_H.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/Keyence/Keyence_Laser_LK_H.cpp @@ -33,7 +33,8 @@ void CKeyence_Laser_LK_H::KeyenceLaserInit(void) m_hLkif=(HMODULE)LoadLibrary(GetAppPath()+_T("\\LKIF2.dll")); if(m_hLkif) { - m_pGetCalcDataMulti=(pLKIF2_GetCalcDataMulti)GetProcAddress(m_hLkif,"LKIF2_GetCalcDataMulti"); + m_pGetCalcDataMulti=(pLKIF2_GetCalcDataMulti)GetProcAddress(m_hLkif,"LKIF2_GetCalcDataMulti"); + m_pOpenDeviceETHER=(pLKIF2_OpenDeviceETHER)GetProcAddress(m_hLkif,"LKIF2_OpenDeviceETHER"); m_pOpenDeviceUsb=(pLKIF2_OpenDeviceUsb)GetProcAddress(m_hLkif,"LKIF2_OpenDeviceUsb"); m_pCloseDevice=(pLKIF2_CloseDevice)GetProcAddress(m_hLkif,"LKIF2_CloseDevice"); @@ -54,7 +55,6 @@ void CKeyence_Laser_LK_H::KeyenceLaserInit(void) m_pDataStorageGetStatus=(pLKIF2_DataStorageGetStatus)GetProcAddress(m_hLkif,"LKIF2_DataStorageGetStatus"); m_pSetDataStorage=(pLKIF2_SetDataStorage)GetProcAddress(m_hLkif,"LKIF2_SetDataStorage"); - m_result = m_pOpenDeviceUsb(); } else { @@ -62,6 +62,46 @@ void CKeyence_Laser_LK_H::KeyenceLaserInit(void) } } } +//======================================== +BOOL CKeyence_Laser_LK_H::OpenDeviceUsb(void) +{ + BOOL ReturnStatus(FALSE); + m_result = m_pOpenDeviceUsb(); + if (m_result==RC_OK) + { + ReturnStatus=TRUE; + } + else + { + ReturnStatus=FALSE; + } + return ReturnStatus; + +} +//======================================== +BOOL CKeyence_Laser_LK_H::OpenDeviceEthernet(IN_ADDR _IPAddr) +{ + BOOL ReturnStatus(FALSE); + LKIF_OPENPARAM_ETHERNET paramEther; + paramEther.IPAddress = _IPAddr; + if(paramEther.IPAddress.S_un.S_addr == INADDR_NONE) + { + ReturnStatus=FALSE; + } + else + { + m_result = LKIF2_OpenDeviceETHER(¶mEther); + if (m_result==RC_OK) + { + ReturnStatus=TRUE; + } + else + { + ReturnStatus=FALSE; + } + } + return ReturnStatus; +} //============================================== /*********************************************** LaserValue1:为第一个OUT01值 diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Keyence/Keyence_Laser_LK_H.h b/PcDmis/Base/Interfac/Msi/Hsi/Keyence/Keyence_Laser_LK_H.h index e2c9df4..b33d1a7 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Keyence/Keyence_Laser_LK_H.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/Keyence/Keyence_Laser_LK_H.h @@ -12,6 +12,7 @@ #include "LKIF2.h" typedef RC (WINAPI* pLKIF2_GetCalcDataMulti)(IN LKIF_OUTNO OutNo, OUT LKIF_FLOATVALUE_OUT * CalcData); +typedef RC (WINAPI* pLKIF2_OpenDeviceETHER)(LKIF_OPENPARAM_ETHERNET * OpenParam); typedef RC (WINAPI* pLKIF2_OpenDeviceUsb)(void); typedef RC (WINAPI* pLKIF2_CloseDevice)(void); typedef RC (WINAPI* pLKIF2_SetNumOfUsedOut)(IN int NumOfUsedHeads);//rang2-12 @@ -54,6 +55,7 @@ public: //获取数据的函数指针 pLKIF2_GetCalcDataMulti m_pGetCalcDataMulti; + pLKIF2_OpenDeviceETHER m_pOpenDeviceETHER; pLKIF2_OpenDeviceUsb m_pOpenDeviceUsb; pLKIF2_CloseDevice m_pCloseDevice; pLKIF2_SetNumOfUsedOut m_SetNumOfUsedOut; @@ -77,7 +79,9 @@ public: BOOL m_bIsStorage; void KeyenceLaserInit(void); void Get_KeyenceLaserData(float *LaserValue1,float *LaserValue2); - + BOOL OpenDeviceUsb(void); + BOOL OpenDeviceEthernet(IN_ADDR _IPAddr); + BOOL StartStoreData(int _StorageOutNumber,int _NeedStorageDataNumber,int _SampleTime); BOOL StopStoreData(); BOOL GetStoreDataStatus(); diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/KeyenceLKH_Dlg.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/KeyenceLKH_Dlg.cpp index 08fc10d..d730c5d 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/KeyenceLKH_Dlg.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/KeyenceLKH_Dlg.cpp @@ -53,6 +53,7 @@ BOOL CKeyenceLKH_Dlg::OnInitDialog() m_LK_H_Interval=100; ((CButton*)(GetDlgItem(IDC_EDIT_TEST_LK_G_INTERVAL)))->SetWindowText(_T("100")); m_pKeyence_Laser_LK_H->KeyenceLaserInit(); + m_pKeyence_Laser_LK_H->OpenDeviceUsb(); return TRUE; // return TRUE unless you set the focus to a control } diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/KeyenceLKH_Dlg.h b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/KeyenceLKH_Dlg.h index c0b8190..3df45df 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/KeyenceLKH_Dlg.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/KeyenceLKH_Dlg.h @@ -12,7 +12,7 @@ public: virtual ~CKeyenceLKH_Dlg(); // Dialog Data - enum { IDD = IDD_DIALOG_TEST_KEYENCE_LK_H }; + enum { IDD = IDD_DIALOG_KEYENCE_LKG5000 }; protected: virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Keyence_LKG5000_Ethernet.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Keyence_LKG5000_Ethernet.cpp new file mode 100644 index 0000000..6d899c2 --- /dev/null +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Keyence_LKG5000_Ethernet.cpp @@ -0,0 +1,133 @@ +// Keyence_LKG5000_Ethernet.cpp : 实现文件 +// + +#include "stdafx.h" +#include "Resource.h" +#include "..\..\..\Keyence\Keyence_Laser_LK_H.h" +#include "Keyence_LKG5000_Ethernet.h" +#include "afxdialogex.h" + +const int DEVICENO=4; +CKeyence_Laser_LK_H g_Keyence_LKG5000[DEVICENO]; +// CKeyence_LKG5000_Ethernet 对话框 + +IMPLEMENT_DYNAMIC(CKeyence_LKG5000_Ethernet, CDialogEx) + +CKeyence_LKG5000_Ethernet::CKeyence_LKG5000_Ethernet(CWnd* pParent /*=NULL*/) + : CDialogEx(CKeyence_LKG5000_Ethernet::IDD, pParent) +{ + +} + +CKeyence_LKG5000_Ethernet::~CKeyence_LKG5000_Ethernet() +{ +} + +void CKeyence_LKG5000_Ethernet::DoDataExchange(CDataExchange* pDX) +{ + DDX_Control(pDX, IDC_EDIT_KEYENCE_LKG5000_MSG, m_edMSG); + DDX_Control(pDX, IDC_KEYENCE_LKG5000_IPADDRESS1, m_IPAddress[0]); + DDX_Control(pDX, IDC_KEYENCE_LKG5000_IPADDRESS2, m_IPAddress[1]); + CDialogEx::DoDataExchange(pDX); +} + + +BEGIN_MESSAGE_MAP(CKeyence_LKG5000_Ethernet, CDialogEx) + ON_BN_CLICKED(IDCANCEL, &CKeyence_LKG5000_Ethernet::OnBnClickedCancel) + ON_BN_CLICKED(IDC_BTN_KEYENCE_LKG5000_ETHERNET_CONNECT1, &CKeyence_LKG5000_Ethernet::OnBnClickedBtnKeyenceLkg5000EthernetConnect1) + ON_BN_CLICKED(IDC_BTN_KEYENCE_LKG5000_ETHERNET_READOUT1, &CKeyence_LKG5000_Ethernet::OnBnClickedBtnKeyenceLkg5000EthernetReadout1) + ON_BN_CLICKED(IDC_BTN_KEYENCE_LKG5000_ETHERNET_CONNECT2, &CKeyence_LKG5000_Ethernet::OnBnClickedBtnKeyenceLkg5000EthernetConnect2) + ON_BN_CLICKED(IDC_BTN_KEYENCE_LKG5000_ETHERNET_READOUT2, &CKeyence_LKG5000_Ethernet::OnBnClickedBtnKeyenceLkg5000EthernetReadout2) +END_MESSAGE_MAP() + + +// CKeyence_LKG5000_Ethernet 消息处理程序 +//====================================================== +BOOL CKeyence_LKG5000_Ethernet::OnInitDialog() +{ + CDialog::OnInitDialog(); + m_IPAddress[0].SetAddress(192,168,10,12); + m_IPAddress[1].SetAddress(192,168,10,13); + for (int i=0;iSetCheck(FALSE); ((CButton *)GetDlgItem(IDC_RADIO_SO7_VERIFICATION_ALGORITHM))->SetCheck(FALSE); ((CButton *)GetDlgItem(IDC_RADIO_TEST_IMAGE_DLL))->SetCheck(FALSE); - + #ifdef _RELEASE_SO7_CONTROLER_ONLY ((CButton *)GetDlgItem(IDC_RADIO_VIDEOCARD_SDK3000))->EnableWindow(FALSE); ((CButton *)GetDlgItem(IDC_RADIO_VIDEOCARD_SV2000E))->EnableWindow(FALSE); @@ -176,26 +177,32 @@ void CSo7_Option::OnBnClickedOk() m_pEF8000_Interface=NULL; } } - else if(((CButton *)GetDlgItem(IDC_RADIO_KEYENCE_LASER_LK_H))->GetCheck()) + else if (((CButton *)GetDlgItem(IDC_RADIO__SO7_RS232))->GetCheck()) { if (!m_pSO7_Proto) { m_pSO7_Proto = new CSO7_Proto(); } - if (!m_pKeyence_Laser_LK_H) + if (!m_pSO7_PCDSerial) { - m_pKeyence_Laser_LK_H=new CKeyence_Laser_LK_H(); + m_pSO7_PCDSerial = new CPSerial(); } - CKeyenceLKH_Dlg* pKeyence_LKHDlg=new CKeyenceLKH_Dlg(); - pKeyence_LKHDlg->DoModal(); - delete pKeyence_LKHDlg; + CSo7_Manual_Machine* pSo7_Manual_Machine=new CSo7_Manual_Machine(); + pSo7_Manual_Machine->DoModal(); + delete pSo7_Manual_Machine; - delete m_pKeyence_Laser_LK_H; - m_pKeyence_Laser_LK_H=NULL; - delete m_pSO7_Proto; - m_pSO7_Proto=NULL; - } + if (m_pSO7_PCDSerial) + { + delete m_pSO7_PCDSerial; + m_pSO7_PCDSerial=NULL; + } + if (m_pSO7_Proto) + { + delete m_pSO7_Proto; + m_pSO7_Proto=NULL; + } + } else if(((CButton *)GetDlgItem(IDC_RADIO_KEYENCE_LASER))->GetCheck()) { if (!m_pSO7_Proto) @@ -222,6 +229,33 @@ void CSo7_Option::OnBnClickedOk() delete m_pSO7_Proto; m_pSO7_Proto=NULL; } + else if(((CButton *)GetDlgItem(IDC_RADIO_KEYENCE_LASER_LK_H))->GetCheck()) + { + if (!m_pSO7_Proto) + { + m_pSO7_Proto = new CSO7_Proto(); + } + if (!m_pKeyence_Laser_LK_H) + { + m_pKeyence_Laser_LK_H=new CKeyence_Laser_LK_H(); + } + + CKeyenceLKH_Dlg* pKeyence_LKHDlg=new CKeyenceLKH_Dlg(); + pKeyence_LKHDlg->DoModal(); + delete pKeyence_LKHDlg; + + delete m_pKeyence_Laser_LK_H; + m_pKeyence_Laser_LK_H=NULL; + delete m_pSO7_Proto; + m_pSO7_Proto=NULL; + } + else if(((CButton *)GetDlgItem(IDC_RADIO_KEYENCE_LASER_LKH_ETHERNET))->GetCheck()) + { + CKeyence_LKG5000_Ethernet* pKeyence_LKG5000_Ethernet=new CKeyence_LKG5000_Ethernet(); + pKeyence_LKG5000_Ethernet->DoModal(); + delete pKeyence_LKG5000_Ethernet; + pKeyence_LKG5000_Ethernet=nullptr; + } else if (((CButton *)GetDlgItem(IDC_RADIO_VIDEOCARD_SDK3000))->GetCheck()) { #ifdef _RELEASE_FULL_VERSION @@ -275,32 +309,6 @@ void CSo7_Option::OnBnClickedOk() pSO7_Verfication_Algorithm->DoModal(); delete pSO7_Verfication_Algorithm; } - else if (((CButton *)GetDlgItem(IDC_RADIO__SO7_RS232))->GetCheck()) - { - if (!m_pSO7_Proto) - { - m_pSO7_Proto = new CSO7_Proto(); - } - if (!m_pSO7_PCDSerial) - { - m_pSO7_PCDSerial = new CPSerial(); - } - - CSo7_Manual_Machine* pSo7_Manual_Machine=new CSo7_Manual_Machine(); - pSo7_Manual_Machine->DoModal(); - delete pSo7_Manual_Machine; - - if (m_pSO7_PCDSerial) - { - delete m_pSO7_PCDSerial; - m_pSO7_PCDSerial=NULL; - } - if (m_pSO7_Proto) - { - delete m_pSO7_Proto; - m_pSO7_Proto=NULL; - } - } #ifdef _RELEASE_ONLY_ONE_FUNCTION @@ -311,7 +319,7 @@ void CSo7_Option::OnBnClickedOk() //=================================== void CSo7_Option::OnBnClickedCancel() { - CDialog::OnCancel(); + CDialog::OnCancel(); } //=================================== void CSo7_Option::OnTimer(UINT_PTR nIDEvent) diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Option.h b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Option.h index 775cb58..7db5a5d 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Option.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Option.h @@ -12,7 +12,7 @@ public: virtual ~CSo7_Option(); // Dialog Data - enum { IDD = IDD_S07_OPTION_DIALOG }; + enum { IDD = IDD_SO7_OPTION_DIALOG }; protected: virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support 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 5649cb0..5450d89 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 @@ -118,6 +118,8 @@ false false Utility for So7 Controller + true + true @@ -331,6 +333,7 @@ + @@ -410,6 +413,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 50328ad..69df0b0 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 @@ -190,6 +190,9 @@ Sources Files + + Sources Files + @@ -414,6 +417,9 @@ Header Files + + 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 e0f78fc..f68763d 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h @@ -24,8 +24,8 @@ #define IDD_DIALOG_FILE_UTILITIES 114 #define IDD_SO7_UTIL_DIALOG 115 #define IDD_SO7_UTIL_MOVE_LOCATION 116 -#define IDD_DIALOG_TEST_KEYENCE 117 -#define IDD_S07_UTIL_SEND_PARAMETER 118 +#define IDD_DIALOG_KEYENCE_LKG3000 117 +#define IDD_SO7_UTIL_SEND_PARAMETER 118 #define IDI_ICON1 119 #define IDR_MAINFRAME 120 #define IDD_SO7_UTIL_AUTO_ZOOM 121 @@ -35,7 +35,7 @@ #define IDI_ICON_WHITE 125 #define IDI_ICON_RED 126 #define IDI_ICON_BLACK 127 -#define IDD_S07_OPTION_DIALOG 128 +#define IDD_SO7_OPTION_DIALOG 128 #define IDD_DIALOG_VIDEOCARD_SDK3000 129 #define IDD_SO7_VIDEOCARD_SDK3000 130 #define IDD_DIALOG1 131 @@ -55,6 +55,7 @@ #define IDB_BITMAP_X_RIGHT 145 #define IDC_BUTTON_INIT_MVUSB 146 #define IDD_DIALOG_TESA_STAR_E 188 +#define IDD_DIALOG_KEYENCE_LKG5000_ETHERNET 190 #define IDC_BUTTON_START_MACHINE 1000 #define IDC_BUTTON_START_MACHINE3 1001 #define IDC_BUTTON_START_POLL_58 1002 @@ -641,7 +642,9 @@ #define IDC_BUTTON_SO7_READDATAFROMFPGA 1542 #define IDC_BUTTON_TESA_STAR_STOP_MACHINE 1542 #define IDC_BUTTON_SO7_MOTION_CONFIG_OK 1542 +#define IDC_BTN_KEYENCE_LKG5000_ETHERNET_READOUT1 1542 #define IDC_BUTTON_STOP_SAMPLE_SCURVE 1543 +#define IDC_BTN_KEYENCE_LKG5000_ETHERNET_READOUT2 1543 #define IDC_BTN_CONFIGURE_MOVEVOUT 1544 #define IDC_BUTTON_STOP_SCAN_KEYENCE_LK_GLASER 1545 #define IDC_BUTTON_SET_TRIGGER 1546 @@ -699,6 +702,8 @@ #define IDC_RADIO_KEYENCE_LASER_LK_H 1594 #define IDC_RADIO_TEST_IMAGE_DLL 1595 #define IDC_BUTTON_IMAGEDLL_PAUSE_AND_GET_SCAN_LASER_DATA 1596 +#define IDC_RADIO_KEYENCE_LASER_LK_H2 1596 +#define IDC_RADIO_KEYENCE_LASER_LKH_ETHERNET 1596 #define IDC_BUTTON_TEST_KEYENCE_SAVE_LOG 1597 #define IDC_BUTTON_SO7_MANUAL_MACHINE_SEND_DATA 1598 #define IDC_BUTTON_SO7_CNC_PROGRAM 1599 @@ -820,7 +825,7 @@ #define IDD_SO7_UTIL_MANUAL_MACHINE 1716 #define IDC_BUTTON_READ_PROGRAM 1717 #define IDD_SO7_VIDEOCARD_TC4000 1718 -#define IDD_DIALOG_TEST_KEYENCE_LK_H 1719 +#define IDD_DIALOG_KEYENCE_LKG5000 1719 #define IDD_SO7_UTIL_SETUP_SO7_CONFIG_MOTION 1720 #define IDC_RADIO_SPEED_SLOW 1770 #define IDC_RADIO_SCALE 1772 @@ -851,7 +856,9 @@ #define IDC_BUTTON_TESA_STAR_START_MACHINE 1794 #define IDC_BUTTON_SO7_MOVETO_CLEAR_ALL_LOG 1794 #define IDC_BUTTON_SO7_MOTION_CONFIG_CANCEL 1794 +#define IDC_BTN_KEYENCE_LKG5000_ETHERNET_CONNECT1 1794 #define IDC_COMBO_RWDATA_ADDR 1795 +#define IDC_BTN_KEYENCE_LKG5000_ETHERNET_CONNECT2 1795 #define IDC_EDIT_MOTION_SPEEDY 1796 #define IDC_COMBO_OUTPORT_NUMBER 1796 #define IDC_EDIT4 1797 @@ -890,6 +897,9 @@ #define IDC_RADIO_RELATIVE 1825 #define IDC_RADIO_ABS 1826 #define IDC_RADIO_ABSOLUTE 1826 +#define IDC_KEYENCE_LKG5000_IPADDRESS1 1827 +#define IDC_KEYENCE_LKG5000_IPADDRESS2 1828 +#define IDC_EDIT_KEYENCE_LKG5000_MSG 1830 #define IDC_BUTTON_DIY_EXIT_BUTTON 32740 #define ID_EDIT_SO7_CONFIG_MOTION 32741 @@ -897,9 +907,9 @@ // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 189 +#define _APS_NEXT_RESOURCE_VALUE 191 #define _APS_NEXT_COMMAND_VALUE 32771 -#define _APS_NEXT_CONTROL_VALUE 1827 +#define _APS_NEXT_CONTROL_VALUE 1831 #define _APS_NEXT_SYMED_VALUE 104 #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 b249e539f9617a54f90ae1e1a9095434a05e2000..6ad171ef226ab8bf211e67f880ea20d85ed194ee 100644 GIT binary patch delta 6391 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 delta 4795 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 z