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

so7_config新增脚踏开关使能设置。

Browse Source
This commit is contained in:
TAO Cheng
2014-05-09 11:05:52 +08:00
parent 5aec9f2552
commit 4f6272ff92
14 changed files with 468 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc
+39 -28
View File
@@ -395,32 +395,32 @@ BEGIN
EDITTEXT IDC_EDIT_ZOOM_TIME,14,159,112,112,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL
END
IDD_SO7_OPTION_DIALOG DIALOGEX 0, 0, 317, 169
IDD_SO7_OPTION_DIALOG DIALOGEX 0, 0, 290, 163
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,34,39,69,10
CONTROL "SV2000E视频卡",IDC_RADIO_VIDEOCARD_SV2000E,"Button",BS_AUTORADIOBUTTON,34,55,69,10
CONTROL "SV4000E视频卡",IDC_RADIO_VIDEOCARD_SV4000E,"Button",BS_AUTORADIOBUTTON,34,71,68,10
CONTROL "TC4000视频卡",IDC_RADIO_VIDEOCARD_TC4000,"Button",BS_AUTORADIOBUTTON,34,87,69,10
CONTROL "IP Camera",IDC_RADIO_SO7_IP_CAMERA,"Button",BS_AUTORADIOBUTTON,34,103,62,10
CONTROL "USB Camera",IDC_RADIO_SO7_USB_CAMERA,"Button",BS_AUTORADIOBUTTON,34,119,62,10
CONTROL "控制器（USB）",IDC_RADIO_CONTROLLER,"Button",BS_AUTORADIOBUTTON,211,38,69,10
CONTROL "控制器（RS232）",IDC_RADIO__SO7_RS232,"Button",BS_AUTORADIOBUTTON,211,70,77,10
CONTROL "LK_G激光",IDC_RADIO_KEYENCE_LASER,"Button",BS_AUTORADIOBUTTON,114,39,76,10
CONTROL "LK_H激光(USB)",IDC_RADIO_KEYENCE_LASER_LK_H,"Button",BS_AUTORADIOBUTTON,114,55,76,10
CONTROL "SDK3000视频卡",IDC_RADIO_VIDEOCARD_SDK3000,"Button",BS_AUTORADIOBUTTON | WS_GROUP,24,32,69,10
CONTROL "SV2000E视频卡",IDC_RADIO_VIDEOCARD_SV2000E,"Button",BS_AUTORADIOBUTTON,24,48,69,10
CONTROL "SV4000E视频卡",IDC_RADIO_VIDEOCARD_SV4000E,"Button",BS_AUTORADIOBUTTON,24,64,68,10
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,114,71,85,10
CONTROL "LJ_G激光",IDC_RADIO_KEYENCE_LASER3,"Button",BS_AUTORADIOBUTTON,114,87,76,10
"Button",BS_AUTORADIOBUTTON,100,64,85,10
CONTROL "LJ_G激光",IDC_RADIO_KEYENCE_LASER3,"Button",BS_AUTORADIOBUTTON,100,80,76,10
CONTROL "Verifcation algorithm",IDC_RADIO_SO7_VERIFICATION_ALGORITHM,
"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE,8,152,81,10
CONTROL "Image.dll",IDC_RADIO_TEST_IMAGE_DLL,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,152,45,10
DEFPUSHBUTTON "OK",IDOK,191,148,50,14
PUSHBUTTON "Cancel",IDCANCEL,260,148,50,14
GROUPBOX "测试选项",IDC_STATIC,20,15,280,123
CONTROL "控制器（USB R）",IDC_RADIO_CONTROLLER2,"Button",BS_AUTORADIOBUTTON,211,54,75,10
CONTROL "ART PCI8822",IDC_RADIO_ART_PCI8622,"Button",BS_AUTORADIOBUTTON,114,103,76,10
"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
@@ -947,14 +947,25 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM
CAPTION "ART PCI8622"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
CONTROL "DMA SEQ",IDC_RADIO_ART_PCI8622_MODE_DMASEQ,"Button",BS_AUTORADIOBUTTON | WS_GROUP,30,29,46,10
CONTROL "NPT SEQ",IDC_RADIO_ART_PCI8622_MODE_NPTSEQ,"Button",BS_AUTORADIOBUTTON,87,29,44,10
CONTROL "HALF SEQ",IDC_RADIO_ART_PCI8622_MODE_HALFSEQ,"Button",BS_AUTORADIOBUTTON,144,29,48,10
CONTROL "DMA TRIG",IDC_RADIO_ART_PCI8622_MODE_DMATRIG,"Button",BS_AUTORADIOBUTTON,30,45,49,10
CONTROL "NPT TRIG",IDC_RADIO_ART_PCI8622_MODE_NPTTRIG,"Button",BS_AUTORADIOBUTTON,87,45,47,10
CONTROL "HALF TRIG",IDC_RADIO_ART_PCI8622_MODE_HALFTRIG,"Button",BS_AUTORADIOBUTTON,144,45,51,10
PUSHBUTTON "Set",IDC_BUTTON_ART_PCI8622_SET_MODE,147,62,50,14
PUSHBUTTON "Start",IDC_BUTTON_ART_PCI8622_START,213,62,34,14
PUSHBUTTON "Read Once",IDC_BUTTON_ART_PCI8622_READ_DATA,291,62,47,14
PUSHBUTTON "Stop",IDC_BUTTON_ART_PCI8622_STOP,253,62,34,14
PUSHBUTTON "Clear all",IDC_BUTTON_ART_PCI8622_CLEAR_LOG,351,163,38,14
PUSHBUTTON "Exit",IDCANCEL,347,264,50,14
PUSHBUTTON "Start",IDC_BUTTON_ART_PCI8622_START,129,41,50,14
PUSHBUTTON "Stop",IDC_BUTTON_ART_PCI8622_STOP,198,41,50,14
EDITTEXT IDC_EDIT_ART_PCI8622_LOG,20,88,326,161,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL
PUSHBUTTON "Clear all",IDC_BUTTON_ART_PCI8622_CLEAR_LOG,351,170,38,14
PUSHBUTTON "Read",IDC_BUTTON_ART_PCI8622_READ_DATA,267,41,50,14
GROUPBOX "Machine",-1,20,15,325,65
PUSHBUTTON "Set",IDC_BUTTON_ART_PCI8622_SET_MODE,65,43,50,14
GROUPBOX "PCI Sample Mode",IDC_STATIC,20,15,187,65
GROUPBOX "PCI Sample Operate",IDC_STATIC,209,15,136,65
EDITTEXT IDC_EDIT_ART_PCI8622_READ_TIMES,271,33,40,14,ES_AUTOHSCROLL
LTEXT "Read Times",IDC_STATIC,219,36,38,8
LTEXT "Data Number",IDC_STATIC,33,64,43,8
EDITTEXT IDC_EDIT_ART_PCI8622_GET_DATA_NUMBER,87,62,40,14,ES_AUTOHSCROLL
END
@@ -992,9 +1003,9 @@ BEGIN
IDD_SO7_OPTION_DIALOG, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 310
RIGHTMARGIN, 275
TOPMARGIN, 6
BOTTOMMARGIN, 162
BOTTOMMARGIN, 156
END
IDD_SO7_VIDEOCARD_SDK3000, DIALOG
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SetSo7MotionConfig.cpp
+14 -2
View File
@@ -61,8 +61,8 @@ BOOL CSetSo7MotionConfig::OnInitDialog()
}
UpdateLabelName();
UpdateDataValue();
m_ConfigList.SetEditableItemRange(0,22,2,2);
m_ConfigList.SetColorStyleItemRange(0,24,0,3);
m_ConfigList.SetEditableItemRange(0,23,2,2);
m_ConfigList.SetColorStyleItemRange(0,25,0,3);
return TRUE;
}
@@ -167,6 +167,12 @@ void CSetSo7MotionConfig::UpdateLabelName()
m_ConfigList.SetItemText(iRow,iCol+2,cStr);
iRow++;
cStr=L"FOOT_SWITCH_ENABLE";
m_ConfigList.SetItemText(iRow,iCol,cStr);
cStr=L"脚踏开关功能（接探针口）；0：禁用，1：使能；默认值：0";
m_ConfigList.SetItemText(iRow,iCol+2,cStr);
iRow++;
cStr=L"JOYSTICK_ENABLE";
m_ConfigList.SetItemText(iRow,iCol,cStr);
cStr=L"摇杆功能；0：禁用，1：使能；默认值：0";
@@ -258,6 +264,8 @@ void CSetSo7MotionConfig::UpdateDataValue()
m_ConfigList.SetItemText(iRow++,iCol,cStr);
cStr.Format(_T("%d"),m_pSO7_Proto->g_machine.s_machine_config.motion.m_TouchProbeEnable);
m_ConfigList.SetItemText(iRow++,iCol,cStr);
cStr.Format(_T("%d"),m_pSO7_Proto->g_machine.s_machine_config.motion.m_FootSwitchEnable);
m_ConfigList.SetItemText(iRow++,iCol,cStr);
cStr.Format(_T("%d"),m_pSO7_Proto->g_machine.s_machine_config.motion.m_JoyStickEnable);
m_ConfigList.SetItemText(iRow++,iCol,cStr);
cStr.Format(_T("%d"),m_pSO7_Proto->g_machine.s_machine_config.motion.m_DebugOutputEnable);
@@ -355,6 +363,10 @@ void CSetSo7MotionConfig::SaveDataValue()
iRow++;
cStr=m_ConfigList.GetItemText(iRow,iCol);
cTemp=T2A(cStr);
m_pSO7_Proto->g_machine.s_machine_config.motion.m_FootSwitchEnable=atoi(cTemp);
iRow++;
cStr=m_ConfigList.GetItemText(iRow,iCol);
cTemp=T2A(cStr);
m_pSO7_Proto->g_machine.s_machine_config.motion.m_JoyStickEnable=atoi(cTemp);
iRow++;
cStr=m_ConfigList.GetItemText(iRow,iCol);
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Art_PCI8622.cpp
+89 -13
View File
@@ -18,6 +18,8 @@ IMPLEMENT_DYNAMIC(CSo7_Art_PCI8622, CDialog)
: CDialog(CSo7_Art_PCI8622::IDD, pParent)
{
m_MsgCnts=0;
m_iReadTimes=0;
m_iReadTimesCnts=0;
}
CSo7_Art_PCI8622::~CSo7_Art_PCI8622()
@@ -68,7 +70,9 @@ BOOL CSo7_Art_PCI8622::OnInitDialog()
pSysMenu->AppendMenu(MF_STRING, IDM_ABOUTBOX, strAboutMenu);
}
}
GetDlgItem(IDC_EDIT_ART_PCI8622_GET_DATA_NUMBER)->SetWindowTextW(_T("4096"));
GetDlgItem(IDC_EDIT_ART_PCI8622_READ_TIMES)->SetWindowTextW(_T("1"));
((CButton *)GetDlgItem(IDC_RADIO_ART_PCI8622_MODE_DMATRIG))->SetCheck(TRUE);
m_pART_PCI8622->Init();
return TRUE; // return TRUE unless you set the focus to a control
@@ -76,14 +80,61 @@ BOOL CSo7_Art_PCI8622::OnInitDialog()
void CSo7_Art_PCI8622::OnBnClickedButtonArtPci8622SetMode()
{
m_pART_PCI8622->SetCaptureMode(E_ART_PCI8622_CAPTURE_NPT_TRIGCLK);
USES_CONVERSION;
CString csDataNumber("");
GetDlgItem(IDC_EDIT_ART_PCI8622_GET_DATA_NUMBER)->GetWindowText(csDataNumber);
const char* cDataNumber=T2A(csDataNumber);
int iDataNumber = atoi(cDataNumber);
int iMode(0);
if (((CButton *)GetDlgItem(IDC_RADIO_ART_PCI8622_MODE_DMASEQ))->GetCheck())
{
iMode=E_ART_PCI8622_SAMPLE_DMA_SEQ;
}
else if (((CButton *)GetDlgItem(IDC_RADIO_ART_PCI8622_MODE_DMATRIG))->GetCheck())
{
iMode=E_ART_PCI8622_SAMPLE_DMA_TRIGCLK;
}
else if (((CButton *)GetDlgItem(IDC_RADIO_ART_PCI8622_MODE_NPTSEQ))->GetCheck())
{
iMode=E_ART_PCI8622_SAMPLE_NPT_SEQ;
}
else if (((CButton *)GetDlgItem(IDC_RADIO_ART_PCI8622_MODE_NPTTRIG))->GetCheck())
{
iMode=E_ART_PCI8622_SAMPLE_NPT_TRIGCLK;
}
else if (((CButton *)GetDlgItem(IDC_RADIO_ART_PCI8622_MODE_HALFSEQ))->GetCheck())
{
iMode=E_ART_PCI8622_SAMPLE_HALF_SEQ;
}
else if (((CButton *)GetDlgItem(IDC_RADIO_ART_PCI8622_MODE_HALFTRIG))->GetCheck())
{
iMode=E_ART_PCI8622_SAMPLE_HALF_TRIGCLK;
}
BOOL BStatus=m_pART_PCI8622->SetSamplePara(iMode,iDataNumber);
if (!BStatus)
{
m_csMsg=_T("Failed to setup.");
OutputWithScroll(m_csMsg,m_edMSG);
m_pART_PCI8622->Exit();
m_pART_PCI8622->Init();
BStatus=m_pART_PCI8622->SetSamplePara(iMode,iDataNumber);
if (!BStatus)
{
m_csMsg=_T("Failed to setup.");
OutputWithScroll(m_csMsg,m_edMSG);
}
else
{
m_csMsg=_T("Setup successful.");
OutputWithScroll(m_csMsg,m_edMSG);
}
}
}
void CSo7_Art_PCI8622::OnBnClickedButtonArtPci8622ReadData()
{
SetTimer(1,200,NULL);
//GetData(TRUE);
GetData(TRUE);
}
@@ -103,15 +154,38 @@ void CSo7_Art_PCI8622::OnBnClickedCancel()
void CSo7_Art_PCI8622::OnBnClickedButtonArtPci8622Start()
{
m_pART_PCI8622->StartCaptureData();
GetDlgItem(IDC_BUTTON_ART_PCI8622_START)->EnableWindow(FALSE);
USES_CONVERSION;
CString csReadTimes("");
GetDlgItem(IDC_EDIT_ART_PCI8622_READ_TIMES)->GetWindowText(csReadTimes);
const char* cReadTimes=T2A(csReadTimes);
m_iReadTimes = atoi(cReadTimes);
m_pART_PCI8622->Init();
BOOL BStatus=m_pART_PCI8622->StartSampleData();
if (!BStatus)
{
m_csMsg=_T("Failed to start.");
OutputWithScroll(m_csMsg,m_edMSG);
}
m_iReadTimesCnts=0;
if (m_iReadTimes>0)
{
SetTimer(1,200,NULL);
}
}
void CSo7_Art_PCI8622::OnBnClickedButtonArtPci8622Stop()
{
KillTimer(1);
m_pART_PCI8622->StopCaptureData();
BOOL BStatus=m_pART_PCI8622->StopSampleData();
if (!BStatus)
{
m_csMsg=_T("Failed to stop.");
OutputWithScroll(m_csMsg,m_edMSG);
}
GetDlgItem(IDC_BUTTON_ART_PCI8622_START)->EnableWindow(TRUE);
}
//===================================================
void CSo7_Art_PCI8622::GetData(BOOL _BShow)
@@ -155,19 +229,21 @@ void CSo7_Art_PCI8622::OnTimer(UINT_PTR nIDEvent)
{
case 1:
{
bool bExit(false);
if (bExit)
m_iReadTimesCnts++;
if (m_iReadTimesCnts>m_iReadTimes)
{
KillTimer(1);
m_pART_PCI8622->StopSampleData();
GetDlgItem(IDC_BUTTON_ART_PCI8622_START)->EnableWindow(TRUE);
}
else
{
GetData();
}
GetData();
break;
}
}
CDialog::OnTimer(nIDEvent);
}
//=====================================================================================
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Art_PCI8622.h
+2
View File
@@ -23,6 +23,8 @@ protected:
CString m_csMsg;
CEdit m_edMSG;
int m_MsgCnts;
int m_iReadTimes;
int m_iReadTimesCnts;
void GetData(BOOL _BShow=FALSE);
void OutputWithScroll(const CString &strNewText,CEdit &edtOutput);
public:
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h
+9 -2
View File
@@ -597,6 +597,7 @@
#define IDC_RADIO_MOVE_TO_ABSOLUTE 1489
#define IDC_RADIO6 1490
#define IDC_RADIO_MOVE_TO_RELATIVE 1490
#define IDC_RADIO_ART_PCI8622_MODE_HALFTRIG 1490
#define IDC_BUTTON_STATUS_MOVING_X 1493
#define IDC_BUTTON_STATUS_HOME_X 1494
#define IDC_BUTTON_STATUS_MOVING_Y 1495
@@ -899,6 +900,7 @@
#define IDC_RADIO2 1805
#define IDC_RADIO_READ_OUTPUT_PORT 1805
#define IDC_RADIO_SO7_MOVE_SPEED_GEAR2 1805
#define IDC_RADIO_ART_PCI8622_MODE_NPTSEQ 1805
#define IDC_RADIO_MACHINE_TESASTARE 1806
#define IDC_RADIO_READ_OUTPUT_PORT2 1806
#define IDC_EDIT_MOVETO_DEG 1807
@@ -973,8 +975,13 @@
#define IDC_EDIT_ART_PCI8622_LOG 1846
#define IDC_EDIT_R1_CURRENT_POSITION 1847
#define IDC_BUTTON_ART_PCI8622_CLEAR_LOG 1847
#define IDC_BUTTON_ART_PCI8622_START2 1848
#define IDC_BUTTON_ART_PCI8622_SET_MODE 1848
#define IDC_RADIO_ART_PCI8622_MODE_DMASEQ 1849
#define IDC_RADIO_ART_PCI8622_MODE_HALFSEQ 1850
#define IDC_RADIO_ART_PCI8622_MODE_DMATRIG 1851
#define IDC_RADIO_ART_PCI8622_MODE_NPTTRIG 1852
#define IDC_EDIT_ART_PCI8622_READ_TIMES 1853
#define IDC_EDIT_ART_PCI8622_GET_DATA_NUMBER 1854
#define IDC_BUTTON_DIY_EXIT_BUTTON 32740
#define ID_EDIT_SO7_CONFIG_MOTION 32741
@@ -984,7 +991,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 191
#define _APS_NEXT_COMMAND_VALUE 32771
#define _APS_NEXT_CONTROL_VALUE 1848
#define _APS_NEXT_CONTROL_VALUE 1854
#define _APS_NEXT_SYMED_VALUE 104
#endif
#endif