From 5158d2bac20187248236ed228857f30fdd2ff455 Mon Sep 17 00:00:00 2001
From: TAO Cheng <cheng.tao@hexagon.com>
Date: Wed, 26 Feb 2014 08:43:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9ELKG5000=E7=9A=84ethernet?=
 =?UTF-8?q?=E9=80=9A=E4=BF=A1=EF=BC=8C=E5=8F=91=E9=80=81=E5=BC=80=E5=A7=8B?=
 =?UTF-8?q?=E3=80=81=E5=81=9C=E6=AD=A2=E6=89=AB=E6=8F=8F=E5=91=BD=E4=BB=A4?=
 =?UTF-8?q?=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    |  37 +++-
 .../Msi/Hsi/Keyence/Keyence_Laser_LK_H.h      |   6 +
 .../Tools/UsbUtility/Debug/UtilityDebug.Log   |   7 +
 .../UsbUtil/Keyence_LKG5000_Ethernet.cpp      | 204 +++++++++++++++---
 .../UsbUtil/Keyence_LKG5000_Ethernet.h        |  10 +
 .../Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc   |  14 +-
 .../Tools/UsbUtility/UsbUtil/So7_Option.cpp   |   8 +
 .../Hsi/Tools/UsbUtility/UsbUtil/resource.h   |  10 +-
 .../Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo   | Bin 2355712 -> 2355712 bytes
 9 files changed, 266 insertions(+), 30 deletions(-)

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 ac0d057..6f78bb9 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
@@ -15,6 +15,7 @@ CKeyence_Laser_LK_H::CKeyence_Laser_LK_H()
   m_StoredDataNumber=0;
   m_NeedStorageDataNumber=0;
   m_StorageCycle=LKIF_STORAGECYCLE_100;
+  m_DeviceID=LKG5000DEVICEMAXNO;
 }
 
 CKeyence_Laser_LK_H::~CKeyence_Laser_LK_H()
@@ -90,7 +91,7 @@ BOOL CKeyence_Laser_LK_H::OpenDeviceEthernet(IN_ADDR _IPAddr)
   }
   else
   {
-    m_result = LKIF2_OpenDeviceETHER(&paramEther);
+    m_result = m_pOpenDeviceETHER(&paramEther);
     if (m_result==RC_OK)
     {
       ReturnStatus=TRUE;
@@ -103,6 +104,40 @@ BOOL CKeyence_Laser_LK_H::OpenDeviceEthernet(IN_ADDR _IPAddr)
   return ReturnStatus;
 }
 //==============================================
+BOOL CKeyence_Laser_LK_H::SetDeviceIPADDR(int _DeviceID,IN_ADDR _IPAddr)
+{
+  BOOL ReturnStatus(FALSE);
+  if (0<=_DeviceID && _DeviceID<LKG5000DEVICEMAXNO)
+  {
+    m_DeviceIDAddr[_DeviceID]=_IPAddr;
+    ReturnStatus=TRUE;
+  } 
+  else
+  {
+    ReturnStatus=FALSE;
+  }
+  return ReturnStatus;
+}
+//==============================================
+BOOL CKeyence_Laser_LK_H::SetDeviceID(int _DeviceID)
+{
+  BOOL ReturnStatus(FALSE);
+  if (0<=_DeviceID && _DeviceID<LKG5000DEVICEMAXNO)
+  {
+    if (m_DeviceID!=_DeviceID)
+    {
+      m_DeviceID=_DeviceID;
+      OpenDeviceEthernet(m_DeviceIDAddr[_DeviceID]);
+    }
+    ReturnStatus=TRUE;
+  } 
+  else
+  {
+    ReturnStatus=FALSE;
+  }
+  return ReturnStatus;  
+}
+//==============================================
 /***********************************************
 LaserValue1:为第一个OUT01值
 LaserValue2:为第二个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 b33d1a7..b4c74a9 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
@@ -39,6 +39,7 @@ typedef RC (WINAPI* pLKIF2_DataStorageGetStatus)(OUT BOOL * lsStorage,OUT int  *
 // Set Data Storage
 typedef RC (WINAPI* pLKIF2_SetDataStorage)(IN int NumStorage,IN LKIF_STORAGECYCLE StorageCycle);
 
+const int LKG5000DEVICEMAXNO=10;
 //======================================================================================
 class CKeyence_Laser_LK_H
 {
@@ -48,6 +49,8 @@ protected:
   LKIF_STORAGECYCLE m_StorageCycle;
   HMODULE m_hLkif; 
   RC m_result;
+  int m_DeviceID;
+  IN_ADDR m_DeviceIDAddr[10];
 public:
 
   CKeyence_Laser_LK_H();
@@ -80,7 +83,10 @@ public:
   void KeyenceLaserInit(void);
   void Get_KeyenceLaserData(float *LaserValue1,float *LaserValue2);
   BOOL OpenDeviceUsb(void);
+
   BOOL OpenDeviceEthernet(IN_ADDR _IPAddr);
+  BOOL SetDeviceIPADDR(int _DeviceID,IN_ADDR _IPAddr);
+  BOOL SetDeviceID(int _DeviceID);
   
   BOOL StartStoreData(int _StorageOutNumber,int  _NeedStorageDataNumber,int _SampleTime);
   BOOL StopStoreData();
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 cc79aed..52ba35b 100644
--- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log
+++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log
@@ -3671,3 +3671,10 @@ Init:Open device succeed .
 _start_machine
 Exit: Exit_SO7Usb 

 Destruct Cso7_Proto.

+Construct Cso7_Proto.

+Unable to open device Init:Open device succeed .

+_start_machine
+Exit: Exit_SO7Usb 

+Destruct Cso7_Proto.

+Construct Cso7_Proto.

+Destruct Cso7_Proto.

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
index 6d899c2..0a8cf31 100644
--- 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
@@ -7,8 +7,12 @@
 #include "Keyence_LKG5000_Ethernet.h"
 #include "afxdialogex.h"
 
-const int DEVICENO=4;
-CKeyence_Laser_LK_H g_Keyence_LKG5000[DEVICENO];
+
+const int LK_G_MAX_STORAGE_DATA_SIZE=65536;
+const int LK_H_MAX_STORAGE_DATA_SIZE=65535;
+
+extern CKeyence_Laser_LK_H* m_pKeyence_Laser_LK_H;
+
 // CKeyence_LKG5000_Ethernet 对话框
 
 IMPLEMENT_DYNAMIC(CKeyence_LKG5000_Ethernet, CDialogEx)
@@ -33,11 +37,20 @@ void CKeyence_LKG5000_Ethernet::DoDataExchange(CDataExchange* pDX)
 
 
 BEGIN_MESSAGE_MAP(CKeyence_LKG5000_Ethernet, CDialogEx)
+  ON_WM_TIMER()
   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)
+  ON_BN_CLICKED(IDC_CHECK_LKG5000_CONTINUE_READ1, &CKeyence_LKG5000_Ethernet::OnBnClickedCheckLkg5000ContinueRead1)
+  ON_BN_CLICKED(IDC_CHECK_LKG5000_CONTINUE_READ2, &CKeyence_LKG5000_Ethernet::OnBnClickedCheckLkg5000ContinueRead2)
+  ON_BN_CLICKED(IDC_BTN_KEYENCE_LKG5000_ETHERNET_STORAGEDATA1, &CKeyence_LKG5000_Ethernet::OnBnClickedBtnKeyenceLkg5000EthernetStoragedata1)
+  ON_BN_CLICKED(IDC_BTN_KEYENCE_LKG5000_ETHERNET_STORAGEDATA2, &CKeyence_LKG5000_Ethernet::OnBnClickedBtnKeyenceLkg5000EthernetStoragedata2)
+  ON_BN_CLICKED(IDC_BTN_KEYENCE_LKG5000_ETHERNET_START_SCAN, &CKeyence_LKG5000_Ethernet::OnBnClickedBtnKeyenceLkg5000EthernetStartScan)
+  ON_BN_CLICKED(IDC_BTN_KEYENCE_LKG5000_ETHERNET_STOP_SCAN, &CKeyence_LKG5000_Ethernet::OnBnClickedBtnKeyenceLkg5000EthernetStopScan)
+  ON_BN_CLICKED(IDC_BTN_KEYENCE_LKG5000_ETHERNET_START_SCAN2, &CKeyence_LKG5000_Ethernet::OnBnClickedBtnKeyenceLkg5000EthernetStartScan2)
+  ON_BN_CLICKED(IDC_BTN_KEYENCE_LKG5000_ETHERNET_STOP_SCAN2, &CKeyence_LKG5000_Ethernet::OnBnClickedBtnKeyenceLkg5000EthernetStopScan2)
 END_MESSAGE_MAP()
 
 
@@ -48,10 +61,7 @@ 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;i<DEVICENO;i++)
-  {
-    g_Keyence_LKG5000[i].KeyenceLaserInit();
-  }
+  m_pKeyence_Laser_LK_H->KeyenceLaserInit();
 
   return TRUE;  // return TRUE  unless you set the focus to a control
 }
@@ -60,6 +70,9 @@ BOOL CKeyence_LKG5000_Ethernet::OnInitDialog()
 //======================================================
 void CKeyence_LKG5000_Ethernet::OnBnClickedCancel()
 {
+  KillTimer(1);
+  KillTimer(2);
+
   CDialogEx::OnCancel();
 }
 
@@ -67,14 +80,19 @@ void CKeyence_LKG5000_Ethernet::OnBnClickedCancel()
 //======================================================
 void CKeyence_LKG5000_Ethernet::OnBnClickedBtnKeyenceLkg5000EthernetConnect1()
 {
-  UCHAR bIPAddr0,bIPAddr1,bIPAddr2,bIPAddr3;
-  m_IPAddress[0].GetAddress(bIPAddr0,bIPAddr1,bIPAddr2,bIPAddr3);
-  DWORD DIPAddr1(0);
-  m_IPAddress[0].GetAddress(DIPAddr1);
+  UCHAR bIPAddr[4];
+  m_IPAddress[0].GetAddress(bIPAddr[0],bIPAddr[1],bIPAddr[2],bIPAddr[3]);
   IN_ADDR IPAddr;
-  IPAddr.s_addr=DIPAddr1;
-  BOOL bStatus=g_Keyence_LKG5000[0].OpenDeviceEthernet(IPAddr);
-  m_csMsg.Format(_T("[Open Device1]%d"),bStatus);
+  int index(0);
+  IPAddr.S_un.S_un_b.s_b1=bIPAddr[index++];
+  IPAddr.S_un.S_un_b.s_b2=bIPAddr[index++];
+  IPAddr.S_un.S_un_b.s_b3=bIPAddr[index++];
+  IPAddr.S_un.S_un_b.s_b4=bIPAddr[index++];
+  BOOL bStatus(FALSE);
+  bStatus=m_pKeyence_Laser_LK_H->SetDeviceIPADDR(0,IPAddr);
+  bStatus=m_pKeyence_Laser_LK_H->SetDeviceID(0);
+
+  m_csMsg.Format(_T("[Open Device1] %d"),bStatus);
   OutputWithScroll(m_csMsg,m_edMSG);
 }
 
@@ -82,9 +100,9 @@ void CKeyence_LKG5000_Ethernet::OnBnClickedBtnKeyenceLkg5000EthernetConnect1()
 //======================================================
 void CKeyence_LKG5000_Ethernet::OnBnClickedBtnKeyenceLkg5000EthernetReadout1()
 {
-  float OutValue1(0.0),OutValue2(0.0);
-  g_Keyence_LKG5000[0].Get_KeyenceLaserData(&OutValue1,&OutValue2);
-  m_csMsg.Format(_T("[Device1 Redout]Out1:%.4f;Out2:%.4f."),OutValue1,OutValue2);
+  double dOutVal[2]={0.0};
+  GetLKG5000OUTValue(0,dOutVal);
+  m_csMsg.Format(_T("[Device1 Readout] Out1:%.4f;Out2:%.4f."),dOutVal[0],dOutVal[1]);
   OutputWithScroll(m_csMsg,m_edMSG);
 }
 
@@ -92,12 +110,19 @@ void CKeyence_LKG5000_Ethernet::OnBnClickedBtnKeyenceLkg5000EthernetReadout1()
 //======================================================
 void CKeyence_LKG5000_Ethernet::OnBnClickedBtnKeyenceLkg5000EthernetConnect2()
 {
-  DWORD DIPAddr1(0);
-  m_IPAddress[0].GetAddress(DIPAddr1);
+  UCHAR bIPAddr[4];
+  m_IPAddress[1].GetAddress(bIPAddr[0],bIPAddr[1],bIPAddr[2],bIPAddr[3]);
   IN_ADDR IPAddr;
-  IPAddr.s_addr=DIPAddr1;  
-  BOOL bStatus=g_Keyence_LKG5000[1].OpenDeviceEthernet(IPAddr);
-  m_csMsg.Format(_T("[Open Device2]%d"),bStatus);
+  int index(0);
+  IPAddr.S_un.S_un_b.s_b1=bIPAddr[index++];
+  IPAddr.S_un.S_un_b.s_b2=bIPAddr[index++];
+  IPAddr.S_un.S_un_b.s_b3=bIPAddr[index++];
+  IPAddr.S_un.S_un_b.s_b4=bIPAddr[index++];
+
+  BOOL bStatus(FALSE);
+  bStatus=m_pKeyence_Laser_LK_H->SetDeviceIPADDR(1,IPAddr);
+  bStatus=m_pKeyence_Laser_LK_H->SetDeviceID(1);
+  m_csMsg.Format(_T("[Open Device2] %d"),bStatus);
   OutputWithScroll(m_csMsg,m_edMSG);
 }
 
@@ -105,12 +130,117 @@ void CKeyence_LKG5000_Ethernet::OnBnClickedBtnKeyenceLkg5000EthernetConnect2()
 //======================================================
 void CKeyence_LKG5000_Ethernet::OnBnClickedBtnKeyenceLkg5000EthernetReadout2()
 {
-  float OutValue1(0.0),OutValue2(0.0);
-  g_Keyence_LKG5000[1].Get_KeyenceLaserData(&OutValue1,&OutValue2);
-  m_csMsg.Format(_T("[Device1 Redout]Out1:%.4f;Out2:%.4f."),OutValue1,OutValue2);
+  double dOutVal[2]={0.0};
+  GetLKG5000OUTValue(1,dOutVal);
+  m_csMsg.Format(_T("[Device2 Readout] Out1:%.4f;Out2:%.4f."),dOutVal[0],dOutVal[1]);
   OutputWithScroll(m_csMsg,m_edMSG);
 }
 //=====================================================================================
+void CKeyence_LKG5000_Ethernet::GetLKG5000OUTValue(int _DeviceID,double*_dVal)
+{  
+  float OutValue1(0.0),OutValue2(0.0);
+  m_pKeyence_Laser_LK_H->SetDeviceID(_DeviceID);
+  m_pKeyence_Laser_LK_H->Get_KeyenceLaserData(&OutValue1,&OutValue2);
+  _dVal[0]=static_cast<double>(OutValue1);
+  _dVal[1]=static_cast<double>(OutValue2);
+}
+
+//=====================================================================================
+void CKeyence_LKG5000_Ethernet::OnBnClickedCheckLkg5000ContinueRead1()
+{
+  if (((CButton *)GetDlgItem(IDC_CHECK_LKG5000_CONTINUE_READ1))->GetCheck())
+  {
+    SetTimer(1,200,NULL);
+  }
+  else
+  {
+    KillTimer(1);
+  }
+}
+//=====================================================================================
+void CKeyence_LKG5000_Ethernet::OnBnClickedCheckLkg5000ContinueRead2()
+{
+  if (((CButton *)GetDlgItem(IDC_CHECK_LKG5000_CONTINUE_READ2))->GetCheck())
+  {
+    SetTimer(2,200,NULL);
+  }
+  else
+  {
+    KillTimer(2);
+  }
+}
+//=====================================================================================
+void CKeyence_LKG5000_Ethernet::OnBnClickedBtnKeyenceLkg5000EthernetStoragedata1()
+{
+  GetStorageData(0,GetAppPath()+_T("\\storagedata1.log"));
+
+}
+//=====================================================================================
+void CKeyence_LKG5000_Ethernet::OnBnClickedBtnKeyenceLkg5000EthernetStoragedata2()
+{
+  GetStorageData(1,GetAppPath()+_T("\\storagedata2.log"));
+}
+//=====================================================================================
+void CKeyence_LKG5000_Ethernet::OnBnClickedBtnKeyenceLkg5000EthernetStartScan()
+{
+  m_pKeyence_Laser_LK_H->SetDeviceID(0);
+  m_pKeyence_Laser_LK_H->StartStoreData(0,0,0);
+}
+
+//=====================================================================================
+void CKeyence_LKG5000_Ethernet::OnBnClickedBtnKeyenceLkg5000EthernetStopScan()
+{
+  m_pKeyence_Laser_LK_H->SetDeviceID(0);
+  m_pKeyence_Laser_LK_H->StopStoreData();
+}
+//=====================================================================================
+void CKeyence_LKG5000_Ethernet::OnBnClickedBtnKeyenceLkg5000EthernetStartScan2()
+{
+  m_pKeyence_Laser_LK_H->SetDeviceID(1);
+  m_pKeyence_Laser_LK_H->StartStoreData(0,0,0);
+}
+//=====================================================================================
+void CKeyence_LKG5000_Ethernet::OnBnClickedBtnKeyenceLkg5000EthernetStopScan2()
+{
+  m_pKeyence_Laser_LK_H->SetDeviceID(1);  
+  m_pKeyence_Laser_LK_H->StopStoreData();
+}
+
+void CKeyence_LKG5000_Ethernet::GetStorageData(int _DeviceId,CString csFileName)
+{
+  float GetData[LK_H_MAX_STORAGE_DATA_SIZE]={0.0};
+  int GetDataNumber(0);
+  m_pKeyence_Laser_LK_H->SetDeviceID(_DeviceId);
+
+  FILE* m_pOutFile;
+  char *outBuff = NULL;   
+  CString cFileName=csFileName;
+  _wfopen_s(&m_pOutFile, cFileName, _T("wt"));
+  if (!m_pOutFile)
+  {
+    free(outBuff);
+  }
+  else
+  {
+    for(int i=0;i<1;i++)
+    {
+      m_pKeyence_Laser_LK_H->GetStoredData(i,GetData,&GetDataNumber);
+      m_csMsg.Format(_T("--------OUT%d: TotaL:%d----------"),i,GetDataNumber);
+      OutputWithScroll(m_csMsg,m_edMSG);
+
+      fprintf(m_pOutFile,"--------OUT%d: TotaL:%d----------\n", i,GetDataNumber);
+      for (int i=0;i<GetDataNumber;i++)
+      {
+        fprintf(m_pOutFile,"[%d]:", i);
+        fprintf(m_pOutFile,"%.4f", GetData[i]);
+        fprintf(m_pOutFile, "\n");
+      }
+    }
+    fclose(m_pOutFile);
+  }
+  ShellExecute(NULL,L"open",L"notepad++.exe",L"C:\\log\\LK_H_Laser.log",NULL,SW_SHOWNORMAL);
+}
+//=====================================================================================
 //Print message on edit control
 void CKeyence_LKG5000_Ethernet::OutputWithScroll(const CString &strNewText,CEdit &edtOutput)
 {
@@ -130,4 +260,28 @@ void CKeyence_LKG5000_Ethernet::OutputWithScroll(const CString &strNewText,CEdit
   edtOutput.LineScroll(iLine, 0);
   edtOutput.SetSel(iCount, iCount);
   edtOutput.SetRedraw(TRUE);
-}
\ No newline at end of file
+}
+//================================================================================================
+void CKeyence_LKG5000_Ethernet::OnTimer(UINT_PTR nIDEvent)
+{
+  switch(nIDEvent)
+  {
+  case 1:
+    {
+      double dOutVal[2]={0.0};
+      GetLKG5000OUTValue(0,dOutVal);
+      m_csMsg.Format(_T("[Device1 Readout] Out1:%.4f;Out2:%.4f."),dOutVal[0],dOutVal[1]);
+      OutputWithScroll(m_csMsg,m_edMSG);
+    }
+    break;
+  case 2:
+    {
+      double dOutVal[2]={0.0};
+      GetLKG5000OUTValue(1,dOutVal);
+      m_csMsg.Format(_T("[Device2 Readout] Out1:%.4f;Out2:%.4f."),dOutVal[0],dOutVal[1]);
+      OutputWithScroll(m_csMsg,m_edMSG);
+    }
+    break;
+  }	
+  CDialog::OnTimer(nIDEvent);
+}
diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Keyence_LKG5000_Ethernet.h b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Keyence_LKG5000_Ethernet.h
index f153677..fe5c5e8 100644
--- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Keyence_LKG5000_Ethernet.h
+++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Keyence_LKG5000_Ethernet.h
@@ -24,6 +24,8 @@ protected:
   CEdit m_edMSG;
   void OutputWithScroll(const CString &strNewText,CEdit &edtOutput);
   CIPAddressCtrl m_IPAddress[4];
+  void GetLKG5000OUTValue(int _DeviceID,double*_dVal);
+  void GetStorageData(int _DeviceId,CString csFileName);
 public:
   afx_msg void OnTimer(UINT_PTR nIDEvent);
   afx_msg void OnBnClickedCancel();
@@ -31,4 +33,12 @@ public:
   afx_msg void OnBnClickedBtnKeyenceLkg5000EthernetReadout1();
   afx_msg void OnBnClickedBtnKeyenceLkg5000EthernetConnect2();
   afx_msg void OnBnClickedBtnKeyenceLkg5000EthernetReadout2();
+  afx_msg void OnBnClickedCheckLkg5000ContinueRead1();
+  afx_msg void OnBnClickedCheckLkg5000ContinueRead2();
+  afx_msg void OnBnClickedBtnKeyenceLkg5000EthernetStoragedata1();
+  afx_msg void OnBnClickedBtnKeyenceLkg5000EthernetStoragedata2();
+  afx_msg void OnBnClickedBtnKeyenceLkg5000EthernetStartScan();
+  afx_msg void OnBnClickedBtnKeyenceLkg5000EthernetStopScan();
+  afx_msg void OnBnClickedBtnKeyenceLkg5000EthernetStartScan2();
+  afx_msg void OnBnClickedBtnKeyenceLkg5000EthernetStopScan2();
 };
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 f6ec003..ace1333 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
@@ -865,13 +865,21 @@ BEGIN
     PUSHBUTTON      "Exit",IDCANCEL,397,345,50,14
     CONTROL         "",IDC_KEYENCE_LKG5000_IPADDRESS1,"SysIPAddress32",WS_TABSTOP,44,38,100,15
     PUSHBUTTON      "Connect",IDC_BTN_KEYENCE_LKG5000_ETHERNET_CONNECT1,163,39,50,14
-    PUSHBUTTON      "Readout",IDC_BTN_KEYENCE_LKG5000_ETHERNET_READOUT1,65,70,50,14
-    EDITTEXT        IDC_EDIT_KEYENCE_LKG5000_MSG,26,129,413,205,ES_AUTOHSCROLL
+    PUSHBUTTON      "Readout",IDC_BTN_KEYENCE_LKG5000_ETHERNET_READOUT1,29,80,50,14
+    EDITTEXT        IDC_EDIT_KEYENCE_LKG5000_MSG,26,129,413,205,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN | WS_VSCROLL
     GROUPBOX        "Controller1",IDC_STATIC,23,18,202,88
     CONTROL         "",IDC_KEYENCE_LKG5000_IPADDRESS2,"SysIPAddress32",WS_TABSTOP,259,38,100,15
     PUSHBUTTON      "Connect",IDC_BTN_KEYENCE_LKG5000_ETHERNET_CONNECT2,378,39,50,14
-    PUSHBUTTON      "Readout",IDC_BTN_KEYENCE_LKG5000_ETHERNET_READOUT2,280,70,50,14
+    PUSHBUTTON      "Readout",IDC_BTN_KEYENCE_LKG5000_ETHERNET_READOUT2,253,82,50,14
     GROUPBOX        "Controller2",IDC_STATIC,238,18,202,88
+    CONTROL         "Continuous",IDC_CHECK_LKG5000_CONTINUE_READ1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,34,64,52,10
+    CONTROL         "Continuous",IDC_CHECK_LKG5000_CONTINUE_READ2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,253,64,52,10
+    PUSHBUTTON      "Storage Data",IDC_BTN_KEYENCE_LKG5000_ETHERNET_STORAGEDATA2,378,80,50,14
+    PUSHBUTTON      "Storage Data",IDC_BTN_KEYENCE_LKG5000_ETHERNET_STORAGEDATA1,167,77,50,14
+    PUSHBUTTON      "Start Scan",IDC_BTN_KEYENCE_LKG5000_ETHERNET_START_SCAN,103,67,50,14
+    PUSHBUTTON      "Stop Scan",IDC_BTN_KEYENCE_LKG5000_ETHERNET_STOP_SCAN,103,86,50,14
+    PUSHBUTTON      "Start Scan",IDC_BTN_KEYENCE_LKG5000_ETHERNET_START_SCAN2,313,67,50,14
+    PUSHBUTTON      "Stop Scan",IDC_BTN_KEYENCE_LKG5000_ETHERNET_STOP_SCAN2,313,86,50,14
 END
 
 
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 04d19fc..d3cadcc 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
@@ -251,10 +251,18 @@ void CSo7_Option::OnBnClickedOk()
   }  
   else if(((CButton *)GetDlgItem(IDC_RADIO_KEYENCE_LASER_LKH_ETHERNET))->GetCheck())
   {
+    if (!m_pKeyence_Laser_LK_H)
+    {
+      m_pKeyence_Laser_LK_H=new CKeyence_Laser_LK_H();
+    }
+    
     CKeyence_LKG5000_Ethernet* pKeyence_LKG5000_Ethernet=new CKeyence_LKG5000_Ethernet();
     pKeyence_LKG5000_Ethernet->DoModal();		
     delete pKeyence_LKG5000_Ethernet;
     pKeyence_LKG5000_Ethernet=nullptr;
+
+    delete m_pKeyence_Laser_LK_H;
+    m_pKeyence_Laser_LK_H=NULL;
   }    
   else if (((CButton *)GetDlgItem(IDC_RADIO_VIDEOCARD_SDK3000))->GetCheck()) 
   {
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 f68763d..a4f2645 100644
--- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h
+++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h
@@ -250,6 +250,7 @@
 #define IDC_CHECK_SO7_MANUAL_MACHINE_READ_POS_CONTINUE 1204
 #define IDC_CHECK_CONTINUOUS_READ_IO_STATUS 1204
 #define IDC_CHECK_SO7_RUNING_PROGRAM_RUNING_INFINITE 1204
+#define IDC_CHECK_LKG5000_CONTINUE_READ1 1204
 #define IDC_RADIO_MACHINE_SevenOcean    1205
 #define IDC_CHECK_CONTINUE_READ_LASER_LK_H_VALUE 1205
 #define IDC_BUTTON_INIT_SO7USB          1206
@@ -482,6 +483,7 @@
 #define IDC_CHECK_AUTOZOOM_CONTINUE_READ 1394
 #define IDC_CHECK_TEST_KEYENCE_LK_G_PROGRAM1 1394
 #define IDC_CHECK_SO7_OUT_PORT          1394
+#define IDC_CHECK_LKG5000_CONTINUE_READ2 1394
 #define IDC_BUTTON_MANUAL_HOME          1395
 #define IDC_CHECK_TEST_KEYENCE_LK_G_PROGRAM2 1395
 #define IDC_CHECK_                      1396
@@ -689,8 +691,10 @@
 #define IDC_BUTTON3                     1585
 #define IDC_BUTTONIDC_BUTTON_TESA_STAR_MOVETO 1585
 #define IDC_BUTTON_HOME                 1585
+#define IDC_BTN_KEYENCE_LKG5000_ETHERNET_STORAGEDATA2 1585
 #define IDC_BUTTON_INIT_SCAN_KEYENCE_LK_GLASER 1586
 #define IDC_BUTTON_GO                   1586
+#define IDC_BTN_KEYENCE_LKG5000_ETHERNET_STORAGEDATA1 1586
 #define IDC_EDIT_MEASURE_VALUE          1587
 #define IDC_RADIO_OUT_EXTRACT           1588
 #define IDC_RADIO_KEYENCE_LASER         1589
@@ -900,6 +904,10 @@
 #define IDC_KEYENCE_LKG5000_IPADDRESS1  1827
 #define IDC_KEYENCE_LKG5000_IPADDRESS2  1828
 #define IDC_EDIT_KEYENCE_LKG5000_MSG    1830
+#define IDC_BTN_KEYENCE_LKG5000_ETHERNET_START_SCAN 1831
+#define IDC_BTN_KEYENCE_LKG5000_ETHERNET_STOP_SCAN 1832
+#define IDC_BTN_KEYENCE_LKG5000_ETHERNET_START_SCAN2 1833
+#define IDC_BTN_KEYENCE_LKG5000_ETHERNET_STOP_SCAN2 1834
 #define IDC_BUTTON_DIY_EXIT_BUTTON      32740
 #define ID_EDIT_SO7_CONFIG_MOTION       32741
 
@@ -909,7 +917,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        191
 #define _APS_NEXT_COMMAND_VALUE         32771
-#define _APS_NEXT_CONTROL_VALUE         1831
+#define _APS_NEXT_CONTROL_VALUE         1832
 #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 6ad171ef226ab8bf211e67f880ea20d85ed194ee..ec5c3f2e4281709e51e15fdba805162a752d5b3c 100644
GIT binary patch
delta 8739
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

delta 6694
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
Ks?ip`{{I2)2XyBE