xhouse/EF3-Interface
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增LKG5000的ethernet通信。

Browse Source
This commit is contained in:
TAO Cheng
2014-02-25 10:45:01 +08:00
parent 4e781a690f
commit 5b6de3f176
15 changed files with 351 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/KeyenceLKH_Dlg.cpp
+1
View File
@@ -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
}
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/KeyenceLKH_Dlg.h
+1 -1
View File
@@ -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
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Keyence_LKG5000_Ethernet.cpp
+133
View File
@@ -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;i<DEVICENO;i++)
{
g_Keyence_LKG5000[i].KeyenceLaserInit();
}
return TRUE; // return TRUE unless you set the focus to a control
}
//======================================================
void CKeyence_LKG5000_Ethernet::OnBnClickedCancel()
{
CDialogEx::OnCancel();
}
//======================================================
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);
IN_ADDR IPAddr;
IPAddr.s_addr=DIPAddr1;
BOOL bStatus=g_Keyence_LKG5000[0].OpenDeviceEthernet(IPAddr);
m_csMsg.Format(_T("[Open Device1]%d"),bStatus);
OutputWithScroll(m_csMsg,m_edMSG);
}
//======================================================
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);
OutputWithScroll(m_csMsg,m_edMSG);
}
//======================================================
void CKeyence_LKG5000_Ethernet::OnBnClickedBtnKeyenceLkg5000EthernetConnect2()
{
DWORD DIPAddr1(0);
m_IPAddress[0].GetAddress(DIPAddr1);
IN_ADDR IPAddr;
IPAddr.s_addr=DIPAddr1;
BOOL bStatus=g_Keyence_LKG5000[1].OpenDeviceEthernet(IPAddr);
m_csMsg.Format(_T("[Open Device2]%d"),bStatus);
OutputWithScroll(m_csMsg,m_edMSG);
}
//======================================================
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);
OutputWithScroll(m_csMsg,m_edMSG);
}
//=====================================================================================
//Print message on edit control
void CKeyence_LKG5000_Ethernet::OutputWithScroll(const CString &strNewText,CEdit &edtOutput)
{
CString strOutput;
edtOutput.GetWindowText(strOutput);
strOutput += strNewText;
if ("\r\n" != strOutput.Right(2))
{
strOutput += "\r\n";
}
int iCount = strOutput.GetLength();
edtOutput.SetRedraw(FALSE);
edtOutput.SetWindowText(strOutput);
int iLine = edtOutput.GetLineCount();
edtOutput.LineScroll(iLine, 0);
edtOutput.SetSel(iCount, iCount);
edtOutput.SetRedraw(TRUE);
}
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Keyence_LKG5000_Ethernet.h
+34
View File
@@ -0,0 +1,34 @@
#pragma once
// CKeyence_LKG5000_Ethernet 对话框
class CKeyence_LKG5000_Ethernet : public CDialogEx
{
DECLARE_DYNAMIC(CKeyence_LKG5000_Ethernet)
public:
CKeyence_LKG5000_Ethernet(CWnd* pParent = NULL); // 标准构造函数
virtual ~CKeyence_LKG5000_Ethernet();
// 对话框数据
enum { IDD = IDD_DIALOG_KEYENCE_LKG5000_ETHERNET };
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV 支持
virtual BOOL OnInitDialog();
DECLARE_MESSAGE_MAP()
protected:
CString m_csMsg;
CEdit m_edMSG;
void OutputWithScroll(const CString &strNewText,CEdit &edtOutput);
CIPAddressCtrl m_IPAddress[4];
public:
afx_msg void OnTimer(UINT_PTR nIDEvent);
afx_msg void OnBnClickedCancel();
afx_msg void OnBnClickedBtnKeyenceLkg5000EthernetConnect1();
afx_msg void OnBnClickedBtnKeyenceLkg5000EthernetReadout1();
afx_msg void OnBnClickedBtnKeyenceLkg5000EthernetConnect2();
afx_msg void OnBnClickedBtnKeyenceLkg5000EthernetReadout2();
};
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Keyence_UtilDlg.h
+1 -1
View File
@@ -17,7 +17,7 @@ public:
virtual ~CKeyence_UtilDlg();
// 对话框数据
enum { IDD = IDD_DIALOG_TEST_KEYENCE };
enum { IDD = IDD_DIALOG_KEYENCE_LKG3000 };
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV 支持
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc
+52 -25
View File
@@ -163,7 +163,7 @@ BEGIN
PUSHBUTTON "Go",IDC_BUTTON_GO,365,445,34,15
END
IDD_S07_UTIL_SEND_PARAMETER DIALOGEX 0, 0, 753, 481
IDD_SO7_UTIL_SEND_PARAMETER DIALOGEX 0, 0, 753, 481
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Set Parameter"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
@@ -379,27 +379,29 @@ BEGIN
EDITTEXT IDC_EDIT_ZOOM_TIME,14,159,112,112,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL
END
IDD_S07_OPTION_DIALOG DIALOGEX 0, 0, 298, 166
IDD_SO7_OPTION_DIALOG DIALOGEX 0, 0, 278, 198
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,48,39,69,10
CONTROL "SV2000E视频卡",IDC_RADIO_VIDEOCARD_SV2000E,"Button",BS_AUTORADIOBUTTON,48,57,69,10
CONTROL "SV4000E视频卡",IDC_RADIO_VIDEOCARD_SV4000E,"Button",BS_AUTORADIOBUTTON,48,75,68,10
CONTROL "TC4000视频卡",IDC_RADIO_VIDEOCARD_TC4000,"Button",BS_AUTORADIOBUTTON,48,93,69,10
CONTROL "IP Camera",IDC_RADIO_SO7_IP_CAMERA,"Button",BS_AUTORADIOBUTTON,48,111,62,10
CONTROL "控制器（USB）",IDC_RADIO_CONTROLLER,"Button",BS_AUTORADIOBUTTON,175,39,69,10
CONTROL "控制器（RS232）",IDC_RADIO__SO7_RS232,"Button",BS_AUTORADIOBUTTON,175,57,77,10
CONTROL "LK_G激光",IDC_RADIO_KEYENCE_LASER,"Button",BS_AUTORADIOBUTTON,175,75,76,10
CONTROL "LK_H激光",IDC_RADIO_KEYENCE_LASER_LK_H,"Button",BS_AUTORADIOBUTTON,175,93,76,10
CONTROL "LJ_G激光",IDC_RADIO_KEYENCE_LASER3,"Button",BS_AUTORADIOBUTTON,175,111,76,10
CONTROL "SDK3000视频卡",IDC_RADIO_VIDEOCARD_SDK3000,"Button",BS_AUTORADIOBUTTON | WS_GROUP,39,39,69,10
CONTROL "SV2000E视频卡",IDC_RADIO_VIDEOCARD_SV2000E,"Button",BS_AUTORADIOBUTTON,39,56,69,10
CONTROL "SV4000E视频卡",IDC_RADIO_VIDEOCARD_SV4000E,"Button",BS_AUTORADIOBUTTON,39,73,68,10
CONTROL "TC4000视频卡",IDC_RADIO_VIDEOCARD_TC4000,"Button",BS_AUTORADIOBUTTON,39,90,69,10
CONTROL "IP Camera",IDC_RADIO_SO7_IP_CAMERA,"Button",BS_AUTORADIOBUTTON,39,107,62,10
CONTROL "控制器（USB）",IDC_RADIO_CONTROLLER,"Button",BS_AUTORADIOBUTTON,166,39,69,10
CONTROL "控制器（RS232）",IDC_RADIO__SO7_RS232,"Button",BS_AUTORADIOBUTTON,166,56,77,10
CONTROL "LK_G激光",IDC_RADIO_KEYENCE_LASER,"Button",BS_AUTORADIOBUTTON,166,73,76,10
CONTROL "LK_H激光(USB)",IDC_RADIO_KEYENCE_LASER_LK_H,"Button",BS_AUTORADIOBUTTON,166,90,76,10
CONTROL "LJ_G激光",IDC_RADIO_KEYENCE_LASER3,"Button",BS_AUTORADIOBUTTON,166,124,76,10
CONTROL "Verifcation algorithm",IDC_RADIO_SO7_VERIFICATION_ALGORITHM,
"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE,48,138,81,10
CONTROL "Image.dll",IDC_RADIO_TEST_IMAGE_DLL,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE,175,124,45,10
DEFPUSHBUTTON "OK",IDOK,181,145,50,14
PUSHBUTTON "Cancel",IDCANCEL,241,145,50,14
GROUPBOX "测试选项",IDC_STATIC,29,15,243,120
"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE,39,124,81,10
CONTROL "Image.dll",IDC_RADIO_TEST_IMAGE_DLL,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE,39,141,45,10
DEFPUSHBUTTON "OK",IDOK,163,177,50,14
PUSHBUTTON "Cancel",IDCANCEL,221,177,50,14
GROUPBOX "测试选项",IDC_STATIC,20,15,242,146
CONTROL "LK_H激光(ETHERNET)",IDC_RADIO_KEYENCE_LASER_LKH_ETHERNET,
"Button",BS_AUTORADIOBUTTON,166,107,85,10
END
IDD_SO7_VIDEOCARD_SDK3000 DIALOGEX 0, 0, 488, 316
@@ -855,6 +857,23 @@ BEGIN
EDITTEXT IDC_EDIT_SO7_MOTION_CONFIG_MSGOUT,7,317,462,96,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL
END
IDD_DIALOG_KEYENCE_LKG5000_ETHERNET DIALOGEX 0, 0, 454, 366
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Dialog"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
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
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
GROUPBOX "Controller2",IDC_STATIC,238,18,202,88
END
/////////////////////////////////////////////////////////////////////////////
//
@@ -872,7 +891,7 @@ BEGIN
BOTTOMMARGIN, 489
END
IDD_S07_UTIL_SEND_PARAMETER, DIALOG
IDD_SO7_UTIL_SEND_PARAMETER, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 749
@@ -887,12 +906,12 @@ BEGIN
BOTTOMMARGIN, 453
END
IDD_S07_OPTION_DIALOG, DIALOG
IDD_SO7_OPTION_DIALOG, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 291
RIGHTMARGIN, 271
TOPMARGIN, 6
BOTTOMMARGIN, 159
BOTTOMMARGIN, 191
END
IDD_SO7_VIDEOCARD_SDK3000, DIALOG
@@ -994,6 +1013,14 @@ BEGIN
TOPMARGIN, 7
BOTTOMMARGIN, 444
END
IDD_DIALOG_KEYENCE_LKG5000_ETHERNET, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 447
TOPMARGIN, 7
BOTTOMMARGIN, 359
END
END
#endif // APSTUDIO_INVOKED
@@ -2036,7 +2063,7 @@ BEGIN
CONTROL "Dump PRS",IDC_RADIO_DUMP_PRS,"Button",BS_AUTORADIOBUTTON,27,85,60,10
END
IDD_DIALOG_TEST_KEYENCE DIALOGEX 0, 0, 740, 353
IDD_DIALOG_KEYENCE_LKG3000 DIALOGEX 0, 0, 740, 353
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Keyence Utility"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
@@ -2114,7 +2141,7 @@ BEGIN
PUSHBUTTON "Replay Startup",IDC_BUTTON_REPLAY_STARTUP,11,26,69,17
END
IDD_DIALOG_TEST_KEYENCE_LK_H DIALOGEX 0, 0, 512, 337
IDD_DIALOG_KEYENCE_LKG5000 DIALOGEX 0, 0, 512, 337
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Keyence Utility"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
@@ -2243,7 +2270,7 @@ BEGIN
BOTTOMMARGIN, 154
END
IDD_DIALOG_TEST_KEYENCE, DIALOG
IDD_DIALOG_KEYENCE_LKG3000, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 738
@@ -2259,7 +2286,7 @@ BEGIN
BOTTOMMARGIN, 165
END
IDD_DIALOG_TEST_KEYENCE_LK_H, DIALOG
IDD_DIALOG_KEYENCE_LKG5000, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 506
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Send_Parameter.h
+1 -1
View File
@@ -14,7 +14,7 @@ public:
~CSO7_Send_Parameter();
// Dialog Data
enum { IDD = IDD_S07_UTIL_SEND_PARAMETER };
enum { IDD = IDD_SO7_UTIL_SEND_PARAMETER };
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Option.cpp
+54 -46
View File
@@ -29,6 +29,7 @@
#include "..\..\..\Keyence\\Keyence_Proto.h"
#include "Keyence_UtilDlg.h"
#include "KeyenceLKH_Dlg.h"
#include "Keyence_LKG5000_Ethernet.h"
#include "..\..\..\SevenOcean\dll.h"
#include "..\..\..\SevenOcean\So7_Interface.h"
@@ -51,15 +52,15 @@ CKeyence_Laser* m_pKeyence_Laser=NULL;
CKeyence_Laser_LK_H* m_pKeyence_Laser_LK_H=NULL;
CKeyence_Proto* m_pKeyence_Proto=NULL;
CSo7_Interface* m_pSo7_Interface=NULL;
CEF8000_Interface* m_pEF8000_Interface=NULL;
CSo7_Interface* m_pSo7_Interface=NULL;
CEF8000_Interface* m_pEF8000_Interface=NULL;
// CSo7_Option dialog
IMPLEMENT_DYNAMIC(CSo7_Option, CDialog)
CSo7_Option::CSo7_Option(CWnd* pParent /*=NULL*/)
: CDialog(CSo7_Option::IDD, pParent)
CSo7_Option::CSo7_Option(CWnd* pParent /*=NULL*/)
: CDialog(CSo7_Option::IDD, pParent)
{
}
@@ -70,15 +71,15 @@ CSo7_Option::~CSo7_Option()
void CSo7_Option::DoDataExchange(CDataExchange* pDX)
{
CDialog::DoDataExchange(pDX);
CDialog::DoDataExchange(pDX);
}
BEGIN_MESSAGE_MAP(CSo7_Option, CDialog)
ON_WM_SYSCOMMAND()
ON_WM_TIMER()
ON_BN_CLICKED(IDOK, &CSo7_Option::OnBnClickedOk)
ON_BN_CLICKED(IDCANCEL, &CSo7_Option::OnBnClickedCancel)
ON_BN_CLICKED(IDOK, &CSo7_Option::OnBnClickedOk)
ON_BN_CLICKED(IDCANCEL, &CSo7_Option::OnBnClickedCancel)
END_MESSAGE_MAP()
@@ -118,7 +119,7 @@ BOOL CSo7_Option::OnInitDialog()
((CButton *)GetDlgItem(IDC_RADIO_KEYENCE_LASER))->SetCheck(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)
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Option.h
+1 -1
View File
@@ -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
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj
+4
View File
@@ -118,6 +118,8 @@
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseSO7|x64'">false</LinkIncremental>
<TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseSO7|Win32'">Utility for So7 Controller</TargetName>
<EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
@@ -331,6 +333,7 @@
<ClCompile Include="FileUtilitiesDlg.cpp" />
<ClCompile Include="KeyenceLKH_Dlg.cpp" />
<ClCompile Include="KeyenceTM065_Dlg.cpp" />
<ClCompile Include="Keyence_LKG5000_Ethernet.cpp" />
<ClCompile Include="Keyence_UtilDlg.cpp" />
<ClCompile Include="ListCtrlItemEdit.cpp" />
<ClCompile Include="Mv_AutoTestDlg.cpp" />
@@ -410,6 +413,7 @@
<ClInclude Include="FileUtilitiesDlg.h" />
<ClInclude Include="KeyenceLKH_Dlg.h" />
<ClInclude Include="KeyenceTM065_Dlg.h" />
<ClInclude Include="Keyence_LKG5000_Ethernet.h" />
<ClInclude Include="Keyence_UtilDlg.h" />
<ClInclude Include="ListCtrlItemEdit.h" />
<ClInclude Include="Mv_AutoTestDlg.h" />
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj.filters
+6
View File
@@ -190,6 +190,9 @@
<ClCompile Include="SetSo7MotionConfig.cpp">
<Filter>Sources Files</Filter>
</ClCompile>
<ClCompile Include="Keyence_LKG5000_Ethernet.cpp">
<Filter>Sources Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="CaptureDataDlg.h">
@@ -414,6 +417,9 @@
<ClInclude Include="EditableListCtrl.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Keyence_LKG5000_Ethernet.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="ReadMe.txt" />
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h
+16 -6
View File
@@ -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
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo
BIN
View File
Binary file not shown.