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

新增STIL CCS-PRIMA激光测试功能。

Browse Source
This commit is contained in:
TAO Cheng
2014-05-29 20:45:30 +08:00
parent ec719c48bb
commit 4a12706680
20 changed files with 14114 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc
+41 -8
View File
@@ -16,7 +16,7 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// 中文(简体，中国) resources
// Chinese (Simplified, PRC) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS)
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
@@ -410,21 +410,22 @@ BEGIN
CONTROL "TC4000视频卡",IDC_RADIO_VIDEOCARD_TC4000,"Button",BS_AUTORADIOBUTTON,24,80,69,10
CONTROL "IP Camera",IDC_RADIO_SO7_IP_CAMERA,"Button",BS_AUTORADIOBUTTON,24,96,62,10
CONTROL "USB Camera",IDC_RADIO_SO7_USB_CAMERA,"Button",BS_AUTORADIOBUTTON,24,112,62,10
CONTROL "控制器（USB）",IDC_RADIO_CONTROLLER,"Button",BS_AUTORADIOBUTTON,195,31,69,10
CONTROL "控制器（RS232）",IDC_RADIO__SO7_RS232,"Button",BS_AUTORADIOBUTTON,195,63,77,10
CONTROL "LK_G激光",IDC_RADIO_KEYENCE_LASER,"Button",BS_AUTORADIOBUTTON,100,32,76,10
CONTROL "LK_H激光(USB)",IDC_RADIO_KEYENCE_LASER_LK_H,"Button",BS_AUTORADIOBUTTON,100,48,76,10
CONTROL "LK_H激光(ETHERNET)",IDC_RADIO_KEYENCE_LASER_LKH_ETHERNET,
"Button",BS_AUTORADIOBUTTON,100,64,85,10
CONTROL "LJ_G激光",IDC_RADIO_KEYENCE_LASER3,"Button",BS_AUTORADIOBUTTON,100,80,76,10
CONTROL "ART PCI8822",IDC_RADIO_ART_PCI8622,"Button",BS_AUTORADIOBUTTON,100,96,76,10
CONTROL "STIL CCS-PRIMA",IDC_RADIO_ERT_CCS_PRIMA,"Button",BS_AUTORADIOBUTTON,100,112,76,10
CONTROL "控制器（USB）",IDC_RADIO_CONTROLLER,"Button",BS_AUTORADIOBUTTON,195,31,69,10
CONTROL "控制器（USB R）",IDC_RADIO_CONTROLLER2,"Button",BS_AUTORADIOBUTTON,195,47,75,10
CONTROL "控制器（RS232）",IDC_RADIO__SO7_RS232,"Button",BS_AUTORADIOBUTTON,195,63,77,10
CONTROL "Verifcation algorithm",IDC_RADIO_SO7_VERIFICATION_ALGORITHM,
"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE,8,139,81,10
CONTROL "Image.dll",IDC_RADIO_TEST_IMAGE_DLL,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,139,45,10
DEFPUSHBUTTON "OK",IDOK,145,142,50,14
PUSHBUTTON "Cancel",IDCANCEL,225,142,50,14
GROUPBOX "测试选项",IDC_STATIC,10,8,265,123
CONTROL "控制器（USB R）",IDC_RADIO_CONTROLLER2,"Button",BS_AUTORADIOBUTTON,195,47,75,10
CONTROL "ART PCI8822",IDC_RADIO_ART_PCI8622,"Button",BS_AUTORADIOBUTTON,100,96,76,10
END
IDD_SO7_VIDEOCARD_SDK3000 DIALOGEX 0, 0, 488, 316
@@ -1556,12 +1557,12 @@ IDB_BITMAP_Z_DOWN BITMAP "res\\bmp\\Z_DOWN.bmp"
IDB_BITMAP_Z_UP BITMAP "res\\bmp\\Z_UP.bmp"
IDB_BITMAP_X_LEFT BITMAP "res\\bmp\\X_LEFT.BMP"
IDB_BITMAP_X_RIGHT BITMAP "res\\bmp\\X_RIGHT.bmp"
#endif // 中文(简体，中国) resources
#endif // Chinese (Simplified, PRC) resources
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// 英语(美国) resources
// English (United States) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
@@ -2279,6 +2280,30 @@ BEGIN
EDITTEXT IDC_EDIT_TEST_KEYENCE_SETFOCUS,7,317,40,14,ES_AUTOHSCROLL | NOT WS_VISIBLE
END
IDD_DIALOG_STIL_CCS_PRIMA DIALOGEX 0, 0, 450, 337
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "STIL CCS - PRIMA"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
EDITTEXT IDC_EDIT_STIL_INTERVAL,287,39,40,14,ES_RIGHT | ES_AUTOHSCROLL
CONTROL "Continuous",IDC_CHECK_STIL_CONTINUE_GET_DATA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,288,64,52,10
PUSHBUTTON "Get Data",IDC_BUTTON_STIL_GET_DATA,356,38,66,38
PUSHBUTTON "Clear All",IDC_BUTTON_STIL_CLEAR_LOG,403,187,37,20
PUSHBUTTON "Exit",IDCANCEL,394,317,50,14
EDITTEXT IDC_EDIT_STIL_LASER_VALUE1,132,31,98,26,ES_CENTER | ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_STIL_LASER_VALUE2,132,65,98,26,ES_CENTER | ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_STIL_MESSAGE,26,113,370,177,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL
LTEXT "Interval",-1,259,41,26,8
LTEXT "ms",-1,333,41,10,8
GROUPBOX "Get Data",-1,255,22,95,74
GROUPBOX "Readout",-1,86,20,163,76
LTEXT "Dis1",-1,98,41,14,8
LTEXT "Dis2",-1,97,70,14,8
PUSHBUTTON "Init",IDC_BUTTON_STIL_LASER_INIT,27,24,50,24
PUSHBUTTON "Exit",IDC_BUTTON_STIL_LASER_EXIT,27,78,50,24
PUSHBUTTON "Set Measure Mode",IDC_BUTTON_STIL_LASER_SET_MODE,27,51,50,24,BS_MULTILINE
END
/////////////////////////////////////////////////////////////////////////////
//
@@ -2407,6 +2432,14 @@ BEGIN
TOPMARGIN, 11
BOTTOMMARGIN, 331
END
IDD_DIALOG_STIL_CCS_PRIMA, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 444
TOPMARGIN, 11
BOTTOMMARGIN, 331
END
END
#endif // APSTUDIO_INVOKED
@@ -2504,7 +2537,7 @@ BEGIN
IDS_SO7_ABOUTBOX "&About Utility for SO7..."
END
#endif // 英语(美国) resources
#endif // English (United States) resources
/////////////////////////////////////////////////////////////////////////////
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/STIL_CCS_PRIMA_Dlg.cpp
+174
View File
@@ -0,0 +1,174 @@
// STIL_CCS_PRIMA_Dlg.cpp : implementation file
//
#include "stdafx.h"
#include "resource.h"
#include "..\..\..\STIL\Common\inc\cAcqEasy.h"
#include "..\..\..\STIL\STIL_CCS_PRIMA_Laser.h"
#include "STIL_CCS_PRIMA_Dlg.h"
#include "afxdialogex.h"
extern CSTIL_CCS_PRIMA_Laser* g_pSTIL_CCS_PRIMA;
// CSTIL_CCS_PRIMA_Dlg dialog
IMPLEMENT_DYNAMIC(CSTIL_CCS_PRIMA_Dlg, CDialogEx)
CSTIL_CCS_PRIMA_Dlg::CSTIL_CCS_PRIMA_Dlg(CWnd* pParent /*=NULL*/)
: CDialogEx(CSTIL_CCS_PRIMA_Dlg::IDD, pParent)
{
m_dDis1=0.0;
m_dDis2=0.0;
m_dIntensity1=0.0;
m_dIntensity2=0.0;
m_dThickness=0.0;
m_BTN_StartGetData=FALSE;
m_Timer1Interval=100;
}
CSTIL_CCS_PRIMA_Dlg::~CSTIL_CCS_PRIMA_Dlg()
{
}
void CSTIL_CCS_PRIMA_Dlg::DoDataExchange(CDataExchange* pDX)
{
DDX_Control(pDX, IDC_EDIT_STIL_MESSAGE, m_edMsg);
CDialogEx::DoDataExchange(pDX);
}
BEGIN_MESSAGE_MAP(CSTIL_CCS_PRIMA_Dlg, CDialogEx)
ON_WM_TIMER()
ON_BN_CLICKED(IDC_BUTTON_STIL_GET_DATA, &CSTIL_CCS_PRIMA_Dlg::OnBnClickedButtonStilGetData)
ON_BN_CLICKED(IDC_BUTTON_STIL_LASER_INIT, &CSTIL_CCS_PRIMA_Dlg::OnBnClickedButtonStilLaserInit)
ON_BN_CLICKED(IDC_BUTTON_STIL_LASER_EXIT, &CSTIL_CCS_PRIMA_Dlg::OnBnClickedButtonStilLaserExit)
ON_BN_CLICKED(IDC_BUTTON_STIL_LASER_SET_MODE, &CSTIL_CCS_PRIMA_Dlg::OnBnClickedButtonStilLaserSetMode)
ON_BN_CLICKED(IDCANCEL, &CSTIL_CCS_PRIMA_Dlg::OnBnClickedCancel)
END_MESSAGE_MAP()
// CSTIL_CCS_PRIMA_Dlg message handlers
BOOL CSTIL_CCS_PRIMA_Dlg::OnInitDialog()
{
CDialog::OnInitDialog();
((CButton*)(GetDlgItem(IDC_EDIT_STIL_INTERVAL)))->SetWindowText(_T("100"));
return TRUE; // return TRUE unless you set the focus to a control
}
void CSTIL_CCS_PRIMA_Dlg::OnBnClickedButtonStilGetData()
{
if (((CButton*)(GetDlgItem(IDC_CHECK_STIL_CONTINUE_GET_DATA)))->GetCheck())
{
if (m_BTN_StartGetData)
{
KillTimer(1);
m_BTN_StartGetData=FALSE;
((CButton*)GetDlgItem(IDC_BUTTON_STIL_GET_DATA))->SetWindowTextW(_T("Get Data"));
}
else
{
UpdateData(TRUE);
USES_CONVERSION;
CString str(_T(""));
GetDlgItem(IDC_EDIT_STIL_INTERVAL)->GetWindowText(str);
const char* cTempValue=T2A(str);
m_Timer1Interval = atoi(cTempValue);
m_BTN_StartGetData=TRUE;
SetTimer(1,m_Timer1Interval,NULL);
((CButton*)GetDlgItem(IDC_BUTTON_STIL_GET_DATA))->SetWindowTextW(_T("STOP"));
}
}
else
{
g_pSTIL_CCS_PRIMA->GetDistance(m_dDis1,m_dDis2);
Show_Get_Data();
}
GetDlgItem(IDC_EDIT_STIL_MESSAGE)->SetFocus();
}
void CSTIL_CCS_PRIMA_Dlg::OnBnClickedButtonStilLaserInit()
{
g_pSTIL_CCS_PRIMA->Init();
}
void CSTIL_CCS_PRIMA_Dlg::OnBnClickedButtonStilLaserSetMode()
{
g_pSTIL_CCS_PRIMA->SetMeasureMode();
}
void CSTIL_CCS_PRIMA_Dlg::OnBnClickedButtonStilLaserExit()
{
g_pSTIL_CCS_PRIMA->Exit();
}
void CSTIL_CCS_PRIMA_Dlg::Show_Get_Data()
{
m_csMsg.Format(_T("%.4f"),m_dDis1);
GetDlgItem(IDC_EDIT_STIL_LASER_VALUE1)->SetWindowText(m_csMsg);
m_csMsg.Format(_T("%.4f"),m_dDis2);
GetDlgItem(IDC_EDIT_STIL_LASER_VALUE2)->SetWindowText(m_csMsg);
}
//=====================================================================================
//Print message on edit control
void CSTIL_CCS_PRIMA_Dlg::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);
}
//================================================================================================
void CSTIL_CCS_PRIMA_Dlg::OnTimer(UINT_PTR nIDEvent)
{
switch(nIDEvent)
{
case 1:
{
g_pSTIL_CCS_PRIMA->GetThicknessAllData(m_dThickness,m_dDis1,m_dDis2,m_dIntensity1,m_dIntensity2);
m_csMsg.Format(_T("Thick:%.4f,Dis1:%.4f,Dis2:%.4f,Int1:%.4f,Int2:%.4f\n"),m_dThickness,m_dDis1,m_dDis2,m_dIntensity1,m_dIntensity2);
OutputWithScroll(m_csMsg,m_edMsg);
}
break;
}
CDialog::OnTimer(nIDEvent);
}
//================================================================================================
BOOL CSTIL_CCS_PRIMA_Dlg::PreTranslateMessage(MSG* pMsg)
{
if(pMsg->message==WM_KEYDOWN)
{
if (pMsg->wParam==VK_SPACE)
{
OnBnClickedButtonStilGetData();
}
else if(pMsg->wParam==VK_RETURN || pMsg->wParam==VK_ESCAPE)
{
return TRUE;
}
}
return CDialog::PreTranslateMessage(pMsg);
}
void CSTIL_CCS_PRIMA_Dlg::OnBnClickedCancel()
{
g_pSTIL_CCS_PRIMA->Exit();
CDialogEx::OnCancel();
}
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/STIL_CCS_PRIMA_Dlg.h
+43
View File
@@ -0,0 +1,43 @@
#pragma once
// CSTIL_CCS_PRIMA_Dlg dialog
class CSTIL_CCS_PRIMA_Dlg : public CDialogEx
{
DECLARE_DYNAMIC(CSTIL_CCS_PRIMA_Dlg)
public:
CSTIL_CCS_PRIMA_Dlg(CWnd* pParent = NULL); // standard constructor
virtual ~CSTIL_CCS_PRIMA_Dlg();
// Dialog Data
enum { IDD = IDD_DIALOG_STIL_CCS_PRIMA };
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
virtual BOOL OnInitDialog();
DECLARE_MESSAGE_MAP()
private:
CEdit m_edMsg;
CString m_csMsg;
void OutputWithScroll(const CString &strNewText,CEdit &edtOutput);
void Show_Get_Data();
double m_dDis1;
double m_dDis2;
double m_dIntensity1;
double m_dIntensity2;
double m_dThickness;
int m_Timer1Interval;
BOOL m_BTN_StartGetData;
public:
afx_msg BOOL PreTranslateMessage(MSG* pMsg);
afx_msg void OnTimer(UINT_PTR nIDEvent);
afx_msg void OnBnClickedButtonStilGetData();
afx_msg void OnBnClickedButtonStilLaserInit();
afx_msg void OnBnClickedButtonStilLaserExit();
afx_msg void OnBnClickedButtonStilLaserSetMode();
afx_msg void OnBnClickedCancel();
};
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Option.cpp
+21
View File
@@ -23,6 +23,9 @@
#include "Videocard_TC4000.h"
#include "..\..\..\Videocard\SV4000E\SV4000E.h"
#include "Videocard_SV4000E.h"
#include "..\..\..\STIL\Common\inc\cAcqEasy.h"
#include "..\..\..\STIL\STIL_CCS_PRIMA_Laser.h"
#include "STIL_CCS_PRIMA_Dlg.h"
#endif //_RELEASE_FULL_VERSION
#include "SO7_UtilDlg.h"
@@ -66,6 +69,7 @@ CEF8000_Interface* m_pEF8000_Interface=NULL;
CXBOXController* XBoxPlayer =NULL;
CART_PCI8622* m_pART_PCI8622=NULL;
CSTIL_CCS_PRIMA_Laser* g_pSTIL_CCS_PRIMA=NULL;
// CSo7_Option dialog
IMPLEMENT_DYNAMIC(CSo7_Option, CDialog)
@@ -147,6 +151,7 @@ BOOL CSo7_Option::OnInitDialog()
((CButton *)GetDlgItem(IDC_RADIO_SO7_VERIFICATION_ALGORITHM))->EnableWindow(FALSE);
((CButton *)GetDlgItem(IDC_RADIO_TEST_IMAGE_DLL))->EnableWindow(FALSE);
((CButton *)GetDlgItem(IDC_RADIO_ART_PCI8622))->EnableWindow(FALSE);
((CButton *)GetDlgItem(IDC_RADIO_ERT_CCS_PRIMA))->EnableWindow(FALSE);
#endif
#ifdef _RELEASE_ONLY_ONE_FUNCTION
@@ -346,6 +351,22 @@ void CSo7_Option::OnBnClickedOk()
delete m_pART_PCI8622;
m_pART_PCI8622=NULL;
}
else if(((CButton *)GetDlgItem(IDC_RADIO_ERT_CCS_PRIMA))->GetCheck())
{
#ifdef _RELEASE_FULL_VERSION
if (!g_pSTIL_CCS_PRIMA)
{
g_pSTIL_CCS_PRIMA=new CSTIL_CCS_PRIMA_Laser();
}
CSTIL_CCS_PRIMA_Dlg* pSTIL_CCS_PRIMA_Dlg=new CSTIL_CCS_PRIMA_Dlg();
pSTIL_CCS_PRIMA_Dlg->DoModal();
delete pSTIL_CCS_PRIMA_Dlg;
pSTIL_CCS_PRIMA_Dlg=nullptr;
delete g_pSTIL_CCS_PRIMA;
g_pSTIL_CCS_PRIMA=NULL;
#endif //_RELEASE_FULL_VERSION
}
else if (((CButton *)GetDlgItem(IDC_RADIO_VIDEOCARD_SDK3000))->GetCheck())
{
#ifdef _RELEASE_FULL_VERSION
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj
+7 -2
View File
@@ -145,7 +145,7 @@
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>..\..\..\..\..\..\..\ThirdParty\UsbSupport\LibUsb_Win\Lib\Msvc\libusb.lib;..\..\..\Videocard\SDK3000\sdk3000_7130.lib;..\..\..\Videocard\TC4000\Sa7134Capture.lib;..\..\..\Videocard\SV4000E\dataAcq.lib;..\..\..\Videocard\SV4000E\DXMediaCap.lib;..\..\..\ART\PCI8622_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>..\..\..\..\..\..\..\ThirdParty\UsbSupport\LibUsb_Win\Lib\Msvc\libusb.lib;..\..\..\Videocard\SDK3000\sdk3000_7130.lib;..\..\..\Videocard\TC4000\Sa7134Capture.lib;..\..\..\Videocard\SV4000E\dataAcq.lib;..\..\..\Videocard\SV4000E\DXMediaCap.lib;..\..\..\ART\PCI8622_32.lib;..\..\..\STIL\Dll_chr.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
@@ -206,7 +206,7 @@
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<TargetMachine>MachineX86</TargetMachine>
<AdditionalDependencies>..\..\..\..\..\..\..\ThirdParty\UsbSupport\LibUsb_Win\Lib\Msvc\libusb.lib;..\..\..\Videocard\SDK3000\sdk3000_7130.lib;..\..\..\Videocard\SV2000E\dataAcq.lib;..\..\..\Videocard\SV2000E\DXMediaCap.lib;..\..\..\Videocard\TC4000\Sa7134Capture.lib;..\..\..\ART\PCI8622_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>..\..\..\..\..\..\..\ThirdParty\UsbSupport\LibUsb_Win\Lib\Msvc\libusb.lib;..\..\..\Videocard\SDK3000\sdk3000_7130.lib;..\..\..\Videocard\SV2000E\dataAcq.lib;..\..\..\Videocard\SV2000E\DXMediaCap.lib;..\..\..\Videocard\TC4000\Sa7134Capture.lib;..\..\..\ART\PCI8622_32.lib;..\..\..\STIL\Dll_chr.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSO7|Win32'">
@@ -323,6 +323,8 @@
<ClCompile Include="..\..\..\SevenOcean\So7_Interface.cpp" />
<ClCompile Include="..\..\..\SevenOcean\SO7_Proto.cpp" />
<ClCompile Include="..\..\..\SevenOcean\SO7_Proto_Aux.cpp" />
<ClCompile Include="..\..\..\STIL\Common\src\cAcqEasy.cpp" />
<ClCompile Include="..\..\..\STIL\STIL_CCS_PRIMA_Laser.cpp" />
<ClCompile Include="..\..\..\Tesa\TesaStarE.cpp" />
<ClCompile Include="..\LOGGER.CPP" />
<ClCompile Include="..\Proto_Util.cpp" />
@@ -375,6 +377,7 @@
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseSO7|x64'">Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="STIL_CCS_PRIMA_Dlg.cpp" />
<ClCompile Include="TestTesaStarEDialog.cpp" />
<ClCompile Include="Videocard_SDK3000.cpp" />
<ClCompile Include="Videocard_SV2000E.cpp" />
@@ -409,6 +412,7 @@
<ClInclude Include="..\..\..\SevenOcean\So7_Interface.h" />
<ClInclude Include="..\..\..\SevenOcean\SO7_Proto.h" />
<ClInclude Include="..\..\..\SevenOcean\SO7_Proto_Aux.h" />
<ClInclude Include="..\..\..\STIL\STIL_CCS_PRIMA_Laser.h" />
<ClInclude Include="..\..\..\Tesa\TesaStarE.h" />
<ClInclude Include="..\..\..\Videocard\SDK3000\sdk3000_7130.h" />
<ClInclude Include="..\Proto_Util.h" />
@@ -456,6 +460,7 @@
<ClInclude Include="So7_XBoxController.h" />
<ClInclude Include="STATUS_MOTION.H" />
<ClInclude Include="stdafx.h" />
<ClInclude Include="STIL_CCS_PRIMA_Dlg.h" />
<ClInclude Include="targetver.h" />
<ClInclude Include="TestTesaStarEDialog.h" />
<ClInclude Include="VideoCardDefine.h" />
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj.filters
+15
View File
@@ -208,6 +208,15 @@
<ClCompile Include="So7_Art_PCI8622.cpp">
<Filter>Sources Files</Filter>
</ClCompile>
<ClCompile Include="STIL_CCS_PRIMA_Dlg.cpp">
<Filter>Sources Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\STIL\STIL_CCS_PRIMA_Laser.cpp">
<Filter>Sources Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\STIL\Common\src\cAcqEasy.cpp">
<Filter>Sources Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="CaptureDataDlg.h">
@@ -453,6 +462,12 @@
<ClInclude Include="So7_Art_PCI8622.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="STIL_CCS_PRIMA_Dlg.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\STIL\STIL_CCS_PRIMA_Laser.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="ReadMe.txt" />
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h
+14 -1
View File
@@ -653,6 +653,7 @@
#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_STIL_LASER_EXIT 1542
#define IDC_BUTTON_STOP_SAMPLE_SCURVE 1543
#define IDC_BTN_KEYENCE_LKG5000_ETHERNET_READOUT2 1543
#define IDC_BUTTON_SO7_MOTION_CONFIG_OK2 1543
@@ -721,6 +722,7 @@
#define IDC_RADIO_MACHINE_KEYENCE_TM3000 1592
#define IDC_RADIO_ART_PCI8622 1592
#define IDC_BUTTON_GET_SCAN_DATA_KEYENCE_LK_HLASER 1593
#define IDC_RADIO_ERT_CCS_PRIMA 1593
#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
@@ -853,6 +855,7 @@
#define IDD_DIALOG_KEYENCE_LKG5000 1719
#define IDD_SO7_UTIL_SETUP_SO7_CONFIG_MOTION 1720
#define IDD_SO7_ART_PCI8622 1721
#define IDD_DIALOG_STIL_CCS_PRIMA 1722
#define IDC_RADIO_SPEED_SLOW 1770
#define IDC_RADIO_SCALE 1772
#define IDC_EDIT_SPEED_X 1773
@@ -883,8 +886,11 @@
#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_BUTTON_STIL_LASER_INIT 1794
#define IDC_COMBO_RWDATA_ADDR 1795
#define IDC_BTN_KEYENCE_LKG5000_ETHERNET_CONNECT2 1795
#define IDC_BUTTON_STIL_LASER_INIT2 1795
#define IDC_BUTTON_STIL_LASER_SET_MODE 1795
#define IDC_EDIT_MOTION_SPEEDY 1796
#define IDC_COMBO_OUTPORT_NUMBER 1796
#define IDC_EDIT4 1797
@@ -988,6 +994,13 @@
#define IDC_BUTTON_SO7_TRIGPULSE_READ_PARA 1855
#define IDC_BUTTON4 1856
#define IDC_BUTTON_SET_SCALE_COEFFICIENT 1856
#define IDC_BUTTON_STIL_GET_DATA 1857
#define IDC_EDIT_STIL_INTERVAL 1858
#define IDC_CHECK_STIL_CONTINUE_GET_DATA 1859
#define IDC_EDIT_STIL_LASER_VALUE2 1860
#define IDC_EDIT_STIL_LASER_VALUE1 1861
#define IDC_EDIT_STIL_MESSAGE 1862
#define IDC_BUTTON_STIL_CLEAR_LOG 1863
#define IDC_BUTTON_DIY_EXIT_BUTTON 32740
#define ID_EDIT_SO7_CONFIG_MOTION 32741
@@ -997,7 +1010,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 191
#define _APS_NEXT_COMMAND_VALUE 32771
#define _APS_NEXT_CONTROL_VALUE 1857
#define _APS_NEXT_CONTROL_VALUE 1864
#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.