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

新增外触发测试功能。

Browse Source
This commit is contained in:
TAO Cheng
2014-06-13 15:12:44 +08:00
parent f6792e2b54
commit 41b9e8314b
6 changed files with 38 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log
+6
View File
@@ -4653,3 +4653,9 @@ Usb Port Initialized.
Destruct Cso7_Proto.
Construct Cso7_Proto.
Init:Open device succeed .
_start_machine
Exit: Exit_SO7Usb
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc
+9 -17
View File
@@ -38,11 +38,6 @@ BEGIN
CONTROL "输出口 (J3)",IDC_RADIO_READ_OUTPUT_PORT2,"Button",BS_AUTORADIOBUTTON,315,169,55,10
EDITTEXT IDC_EDIT_STATUS,247,270,199,117,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL
GROUPBOX "CMD",IDC_STATIC,102,12,193,116
CONTROL "等间距",IDC_RADIO_SO7_TRIGPULSE_EQDIS,"Button",BS_AUTORADIOBUTTON | WS_GROUP,140,142,41,8
CONTROL "指定位移",IDC_RADIO_SO7_TRIGPULSE_SPECLOCATION,"Button",BS_AUTORADIOBUTTON,140,158,42,8
EDITTEXT IDC_EDIT_SO7_TRIGPULSE_DIS,184,138,36,14,ES_AUTOHSCROLL
PUSHBUTTON "Start",IDC_BUTTON_SO7_TRIGPULSE_START,259,138,34,15
PUSHBUTTON "Stop",IDC_BUTTON_SO7_TRIGPULSE_STOP,259,156,34,15
CONTROL "连续读取",IDC_CHECK_CONTINUOUS_READ_IO_STATUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,380,144,47,10
PUSHBUTTON "读取IO状态",IDC_BUTTON_SO7_READ_IN_PORT_STATUS,378,156,61,14
COMBOBOX IDC_COMBO_OUTPORT_NUMBER,304,189,39,75,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
@@ -54,8 +49,8 @@ BEGIN
CONTROL "Fourth",IDC_RADIO_SPEED_GEAR4,"Button",BS_AUTORADIOBUTTON,170,236,37,10
CONTROL "Fifth",IDC_RADIO_SPEED_GEAR5,"Button",BS_AUTORADIOBUTTON,170,249,31,10
GROUPBOX "读写IO口",IDC_STATIC,301,129,144,78
PUSHBUTTON "连接控制器",IDC_BUTTON_START_SO7MACHINE,29,24,63,18
PUSHBUTTON "断开控制器",IDC_BUTTON_STOP_SO7MACHINE,29,50,63,18
PUSHBUTTON "连接控制器",IDC_BUTTON_START_SO7MACHINE,28,24,63,18
PUSHBUTTON "断开控制器",IDC_BUTTON_STOP_SO7MACHINE,28,50,63,18
PUSHBUTTON "Read XYZ Axis",IDC_BUTTON_SO7_READ_AXIS_XYZ,104,24,60,15
PUSHBUTTON "EnProbe OFF",IDC_BUTTON_READ_PROBE,104,45,60,15
PUSHBUTTON "Read V Axis",IDC_BUTTON_SO7_READ_AXIS_V,167,24,60,15
@@ -68,7 +63,7 @@ BEGIN
EDITTEXT IDC_EDIT_COAXIAL_LIGHT4,333,82,29,12,ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_COAXIAL_LIGHT,333,96,29,12,ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_COAXIAL_LIGHT2,333,110,29,12,ES_AUTOHSCROLL
PUSHBUTTON " 设置 运动参数",IDC_BUTTON_MOTION_PARAMETER,29,141,44,28,BS_MULTILINE
PUSHBUTTON "设置运动参数",IDC_BUTTON_MOTION_PARAMETER,28,129,63,25,BS_MULTILINE
PUSHBUTTON "V+",IDC_BUTTON_SO7_MOVE_ZOOM_IN,20,209,25,12
PUSHBUTTON "V-",IDC_BUTTON_SO7_MOVE_ZOOM_OUT,20,231,25,12
PUSHBUTTON "Z+",IDC_BUTTON_SO7_MOVE_Z_UP,44,192,25,12
@@ -81,7 +76,7 @@ BEGIN
PUSHBUTTON "手动复位",IDC_BUTTON_MANUAL_HOME,219,195,76,22,BS_MULTILINE
PUSHBUTTON "自动复位",IDC_BUTTON_RESET_WORKTABLE,219,227,40,22
PUSHBUTTON "RESET_RIGHT",IDC_BUTTON_RESET_WORKTABLE_RIGHT,167,45,60,15,BS_MULTILINE
PUSHBUTTON "Test AutoZoom",IDC_BUTTON_AUTO_ZOOM,29,82,63,18,BS_MULTILINE
PUSHBUTTON "AutoZoom",IDC_BUTTON_AUTO_ZOOM,167,144,60,18,BS_MULTILINE
PUSHBUTTON "Set Reset Flag",IDC_BUTTON_SET_RESET_FLAG,104,108,60,15
PUSHBUTTON "Home V",IDC_BUTTON_RESET_V,167,87,60,15
EDITTEXT IDC_EDIT_X_SCALE_COEFFICIENT,37,290,39,12,ES_CENTER | ES_AUTOHSCROLL
@@ -89,7 +84,7 @@ BEGIN
EDITTEXT IDC_EDIT_Z_SCALE_COEFFICIENT,155,290,39,12,ES_CENTER | ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_SET_VER_NO,261,25,29,14,ES_AUTOHSCROLL
GROUPBOX "USB Control",IDC_STATIC,17,12,81,59
GROUPBOX "Config",IDC_STATIC,17,129,116,44
GROUPBOX "Advanced Function",IDC_STATIC,102,129,193,44
LTEXT "Ver NO.",IDC_STATIC,232,27,26,8
GROUPBOX "R/W Data",IDC_STATIC,301,211,144,54
CONTROL "X",IDC_RADIO_SELECT_X,"Button",BS_AUTORADIOBUTTON | WS_GROUP,307,224,20,10
@@ -133,7 +128,7 @@ BEGIN
CTEXT "Y",IDC_STATIC,84,291,8,8
CTEXT "Z",IDC_STATIC,143,291,8,8
GROUPBOX "速度档位",IDC_STATIC,160,183,53,81
PUSHBUTTON "配置so7_config",IDC_BUTTON_SETUP_SO7CONFIG,82,141,44,28,BS_MULTILINE
PUSHBUTTON "配置so7_config",IDC_BUTTON_SETUP_SO7CONFIG,28,94,63,25,BS_MULTILINE
LTEXT "1",IDC_STATIC_IO_ADDR1,403,28,8,8
LTEXT "2",IDC_STATIC_IO_ADDR2,403,44,8,8
LTEXT "3",IDC_STATIC_IO_ADDR3,403,60,8,8
@@ -147,8 +142,8 @@ BEGIN
CONTROL "",IDC_MFCBUTTON_STATUS_IN_PORT5,"MfcButton",WS_TABSTOP,414,90,21,14
CONTROL "",IDC_MFCBUTTON_STATUS_IN_PORT6,"MfcButton",WS_TABSTOP,414,106,21,14
PUSHBUTTON "测试零位信号",IDC_BUTTON_SO7_TEST_Z_SIGNAL,167,108,60,15
PUSHBUTTON "CNC Program",IDC_BUTTON_SO7_CNC_PROGRAM,29,105,63,18
GROUPBOX "Advanced Function",IDC_STATIC,17,73,81,54
PUSHBUTTON "CNC Program",IDC_BUTTON_SO7_CNC_PROGRAM,104,144,60,18
GROUPBOX "Config",IDC_STATIC,17,73,81,99
EDITTEXT IDC_EDIT_RWDATA_DATA,353,244,44,13,ES_AUTOHSCROLL
PUSHBUTTON "Write",IDC_BUTTON_SO7_SENDDATATOFPGA,406,218,34,19
PUSHBUTTON "Read",IDC_BUTTON_SO7_READDATAFROMFPGA,406,241,34,19
@@ -160,7 +155,6 @@ BEGIN
PUSHBUTTON "◢",IDC_BUTTON_SO7_MOVE_XR_YB,122,233,25,12
PUSHBUTTON "◤",IDC_BUTTON_SO7_MOVE_XL_YF,71,207,25,12
PUSHBUTTON "◣",IDC_BUTTON_SO7_MOVE_XL_YB,71,233,25,12
GROUPBOX "外触发",IDC_STATIC,135,129,163,44
CONTROL "ON",IDC_CHECK_SO7_TOP_LIGHT_ON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,366,28,26,10
CONTROL "ON",IDC_CHECK_SO7_BOTTOM_LIGHT_ON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,366,42,26,10
CONTROL "ON",IDC_CHECK_SO7_RING_LIGHT_ON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,366,56,26,10
@@ -174,12 +168,10 @@ BEGIN
LTEXT "SEQ NO.",IDC_STATIC,232,69,29,8
PUSHBUTTON "Set SEQ NO.",IDC_BUTTON_SO7_SET_SEQ_NUMBER,230,108,60,15,BS_MULTILINE
PUSHBUTTON "Set Ver NO.",IDC_BUTTON_SO7_SET_VER_NUMBER,230,45,60,15,BS_MULTILINE
PUSHBUTTON "Write",IDC_BUTTON_SO7_TRIGPULSE_WRITE_PARA,224,138,34,15
PUSHBUTTON "Read",IDC_BUTTON_SO7_TRIGPULSE_READ_PARA,224,156,34,15
EDITTEXT IDC_EDIT_SO7_TRIGPULSE_DIS2,184,155,36,14,ES_AUTOHSCROLL
PUSHBUTTON "确定",IDC_BUTTON_SET_SCALE_COEFFICIENT,202,285,34,19
GROUPBOX "光栅尺分辨率(μm)",IDC_STATIC,18,277,223,31
PUSHBUTTON "General IO",IDC_BUTTON_S07_SET_IO_PURPOSE,104,65,60,15
PUSHBUTTON "External Trig",IDC_BUTTON_SO7_EXTERNAL_TRIG,230,144,60,18
END
IDD_SO7_UTIL_SEND_PARAMETER DIALOGEX 0, 0, 750, 480
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.cpp
+20 -131
View File
@@ -68,7 +68,6 @@ void CSO7_UtilDlg::DoDataExchange(CDataExchange* pDX)
DDX_Text(pDX, IDC_EDIT_X_SCALE_COEFFICIENT, m_cs_XScaleCoeff);
DDX_Text(pDX, IDC_EDIT_Y_SCALE_COEFFICIENT, m_cs_YScaleCoeff);
DDX_Text(pDX, IDC_EDIT_Z_SCALE_COEFFICIENT, m_cs_ZScaleCoeff);
DDX_Text(pDX, IDC_EDIT_SO7_TRIGPULSE_DIS, m_Rotary_Edit_Position);
DDX_Control(pDX, IDC_BUTTON_SO7_MOVE_X_LEFT, m_Button_MoveX_Left);
DDX_Control(pDX, IDC_BUTTON_SO7_MOVE_X_RIGHT, m_Button_MoveX_Right);
@@ -125,8 +124,6 @@ BEGIN_MESSAGE_MAP(CSO7_UtilDlg, CDialog)
ON_BN_CLICKED(IDC_RADIO_READ_INPUT_PORT, &CSO7_UtilDlg::OnBnClickedRadioReadInputPort)
ON_BN_CLICKED(IDC_RADIO_READ_OUTPUT_PORT, &CSO7_UtilDlg::OnBnClickedRadioReadOutputPort)
ON_BN_CLICKED(IDC_BUTTON_MOTION_PARAMETER, &CSO7_UtilDlg::OnBnClickedButtonMotionParameter)
ON_BN_CLICKED(IDC_BUTTON_SO7_TRIGPULSE_STOP, &CSO7_UtilDlg::OnBnClickedButtonSo7TrigpulseStop)
ON_BN_CLICKED(IDC_BUTTON_SO7_TRIGPULSE_START, &CSO7_UtilDlg::OnBnClickedButtonSo7TrigpulseStart)
ON_BN_CLICKED(IDC_CHECK_SO7_TOP_LIGHT_ON, &CSO7_UtilDlg::OnBnClickedCheckSo7TopLightOn)
ON_BN_CLICKED(IDC_CHECK_SO7_BOTTOM_LIGHT_ON, &CSO7_UtilDlg::OnBnClickedCheckSo7BottomLightOn)
ON_BN_CLICKED(IDC_CHECK_SO7_RING_LIGHT_ON, &CSO7_UtilDlg::OnBnClickedCheckSo7RingLightOn)
@@ -139,10 +136,9 @@ BEGIN_MESSAGE_MAP(CSO7_UtilDlg, CDialog)
ON_BN_CLICKED(IDC_BUTTON_SO7_SET_SEQ_NUMBER, &CSO7_UtilDlg::OnBnClickedButtonSo7SetSeqNumber)
ON_BN_CLICKED(IDC_BUTTON_SO7_SET_VER_NUMBER, &CSO7_UtilDlg::OnBnClickedButtonSo7SetVerNumber)
ON_BN_CLICKED(IDC_RADIO_READ_LIMIT_SWITCH, &CSO7_UtilDlg::OnBnClickedRadioReadLimitSwitch)
ON_BN_CLICKED(IDC_BUTTON_SO7_TRIGPULSE_WRITE_PARA, &CSO7_UtilDlg::OnBnClickedButtonSo7TrigpulseWritePara)
ON_BN_CLICKED(IDC_BUTTON_SO7_TRIGPULSE_READ_PARA, &CSO7_UtilDlg::OnBnClickedButtonSo7TrigpulseReadPara)
ON_BN_CLICKED(IDC_BUTTON_SET_SCALE_COEFFICIENT, &CSO7_UtilDlg::OnBnClickedButtonSetScaleCoefficient)
ON_BN_CLICKED(IDC_BUTTON_S07_SET_IO_PURPOSE, &CSO7_UtilDlg::OnBnClickedButtonS07SetIoPurpose)
ON_BN_CLICKED(IDC_BUTTON_SO7_EXTERNAL_TRIG, &CSO7_UtilDlg::OnBnClickedButtonSo7ExternalTrig)
END_MESSAGE_MAP()
@@ -190,10 +186,7 @@ BOOL CSO7_UtilDlg::OnInitDialog()
((CButton *)GetDlgItem(IDC_RADIO_READ_OUTPUT_PORT2))->SetCheck(false);
m_ReadIOStatusAddr=ESO7_CONTROLLER_LIMIT_SWITCH_ADDR;
UpdateIOAddrCaption();
((CButton *)GetDlgItem(IDC_RADIO_SO7_TRIGPULSE_EQDIS))->SetCheck(true);
((CButton *)GetDlgItem(IDC_RADIO_SO7_TRIGPULSE_SPECLOCATION))->SetCheck(false);
CString csTmp=_T("");
((CComboBox *)GetDlgItem(IDC_COMBO_OUTPORT_NUMBER))->ResetContent();
int iComboxIndex(0);
@@ -216,15 +209,23 @@ BOOL CSO7_UtilDlg::OnInitDialog()
{
if (i==9)
{
csTmp=_T("9-Flag");
csTmp=_T("Flags");
}
else if (i==10)
{
csTmp=_T("10-Trigger");
csTmp=_T("TrigLSB");
}
else if (i==11)
{
csTmp=_T("11-AccErr");
csTmp=_T("AccErr");
}
else if (i==12)
{
csTmp=_T("TrigMSB");
}
else if (i==13)
{
csTmp=_T("TrigHoldTime");
}
else
{
@@ -281,7 +282,6 @@ BOOL CSO7_UtilDlg::OnInitDialog()
m_cs_Version_Number=_T("3");
GetDlgItem(IDC_EDIT_SET_SEQ_NO)->SetWindowTextW(_T("0"));
m_Rotary_Edit_Position=_T("0.0");
if (!g_pLoggerDebug)
{
g_pLoggerDebug = new CLogger(_T("\\UtilityDebug.Log"));
@@ -352,14 +352,12 @@ void CSO7_UtilDlg::UpdateCtrlsStatus(bool _bEnable)
GetDlgItem(IDC_CHECK_SO7_COAXIAL_LIGHT_ON)->EnableWindow(_bEnable);
GetDlgItem(IDC_CHECK_SO7_SPARE_LIGHT_ON)->EnableWindow(_bEnable);
GetDlgItem(IDC_BUTTON_SO7_TRIGPULSE_STOP)->EnableWindow(_bEnable);
GetDlgItem(IDC_BUTTON_SO7_TRIGPULSE_START)->EnableWindow(_bEnable);
GetDlgItem(IDC_BUTTON_SO7_TRIGPULSE_WRITE_PARA)->EnableWindow(_bEnable);
GetDlgItem(IDC_BUTTON_SO7_TRIGPULSE_READ_PARA)->EnableWindow(_bEnable);
GetDlgItem(IDC_BUTTON_SO7_EXTERNAL_TRIG)->EnableWindow(_bEnable);
GetDlgItem(IDC_EDIT_SET_SEQ_NO)->EnableWindow(_bEnable);
GetDlgItem(IDC_BUTTON_SO7_GET_SEQ_NUMBER)->EnableWindow(_bEnable);
GetDlgItem(IDC_BUTTON_SO7_SET_SEQ_NUMBER)->EnableWindow(_bEnable);
GetDlgItem(IDC_BUTTON_SO7_SET_VER_NUMBER)->EnableWindow(_bEnable);
GetDlgItem(IDC_BUTTON_SET_SCALE_COEFFICIENT)->EnableWindow(_bEnable);
}
@@ -1401,7 +1399,6 @@ void CSO7_UtilDlg::m_KillTimer(int nIDEvent)
else
{
KillTimer(1);
KillTimer(2);
}
}
@@ -1472,42 +1469,6 @@ void CSO7_UtilDlg::OnTimer(UINT_PTR nIDEvent)
}
break;
}
case 2:
{
CString strOutput;
BYTE cdata[5]={0};
char ActiveAxis;
if (((CButton *)GetDlgItem(IDC_RADIO_SELECT_X))->GetCheck())
{
ActiveAxis=E_AXIS_X;
strOutput=_T("[TrigX]");
}
else if (((CButton *)GetDlgItem(IDC_RADIO_SELECT_Y))->GetCheck())
{
ActiveAxis=E_AXIS_Y;
strOutput=_T("[TrigY]");
}
else if (((CButton *)GetDlgItem(IDC_RADIO_SELECT_Z))->GetCheck())
{
ActiveAxis=E_AXIS_Z;
strOutput=_T("[TrigZ]");
}
m_pSO7_Proto->_send_cmd_SO7_CMD_READ_DATA_FROM_FPGA(ActiveAxis,12);
cdata[0]=static_cast<BYTE>(m_pSO7_Proto->g_machine.FPGAData);
m_pSO7_Proto->_send_cmd_SO7_CMD_READ_DATA_FROM_FPGA(ActiveAxis,10);
cdata[1]=static_cast<BYTE>(m_pSO7_Proto->g_machine.FPGAData);
m_pSO7_Proto->_send_cmd_SO7_CMD_READ_DATA_FROM_FPGA(ActiveAxis,13);
cdata[2]=static_cast<BYTE>(m_pSO7_Proto->g_machine.FPGAData);
m_pSO7_Proto->_send_cmd_SO7_CMD_READ_DATA_FROM_FPGA(ActiveAxis,14);
cdata[3]=static_cast<BYTE>(m_pSO7_Proto->g_machine.FPGAData);
m_pSO7_Proto->_send_cmd_SO7_CMD_READ_DATA_FROM_FPGA(ActiveAxis,15);
cdata[4]=static_cast<BYTE>(m_pSO7_Proto->g_machine.FPGAData);
m_OutMessage.Format(_T("(%02X %02X) %02X %02X %02X.\r\n"),cdata[0],cdata[1],cdata[2],cdata[3],cdata[4]);
strOutput += m_OutMessage;
OutputWithScroll(strOutput,m_edMSG);
break;
}
}
CDialog::OnTimer(nIDEvent);
@@ -1582,82 +1543,6 @@ void CSO7_UtilDlg::OnBnClickedButtonSo7CncProgram()
SetTimer(1,m_ReadAxisIntervalTime,NULL);
}
//======================================================
void CSO7_UtilDlg::OnBnClickedButtonSo7TrigpulseStart()
{
m_pSO7_Proto->_send_cmd_SO7_CMD_TRIG_PULSE_START();
SetTimer(2,200,NULL);
}
//======================================================
void CSO7_UtilDlg::OnBnClickedButtonSo7TrigpulseStop()
{
m_pSO7_Proto->_send_cmd_SO7_CMD_TRIG_PULSE_STOP();
m_KillTimer(2);
}
//======================================================
void CSO7_UtilDlg::OnBnClickedButtonSo7TrigpulseWritePara()
{
UpdateData(TRUE);
USES_CONVERSION;
short TrigDis[20]={0};
char ActiveAxis(E_AXIS_X);
char TrigMode(E_DIS_TRIG_PULSE_EQDIS);
short StartIndex(0);
short ParaNumber(0);
if (((CButton *)GetDlgItem(IDC_RADIO_SELECT_X))->GetCheck())
{
ActiveAxis=E_AXIS_X;
}
else if (((CButton *)GetDlgItem(IDC_RADIO_SELECT_Y))->GetCheck())
{
ActiveAxis=E_AXIS_Y;
}
else if (((CButton *)GetDlgItem(IDC_RADIO_SELECT_Z))->GetCheck())
{
ActiveAxis=E_AXIS_Z;
}
CString csText(_T(""));
GetDlgItem(IDC_EDIT_SO7_TRIGPULSE_DIS)->GetWindowText(csText);
const char* cTxt=T2A(csText);
TrigDis[0]= static_cast<short>(atoi(cTxt));
GetDlgItem(IDC_EDIT_SO7_TRIGPULSE_DIS2)->GetWindowText(csText);
cTxt=T2A(csText);
TrigDis[1] = static_cast<short>(atoi(cTxt));
if (((CButton *)GetDlgItem(IDC_RADIO_SO7_TRIGPULSE_SPECLOCATION))->GetCheck())
{
TrigMode=E_DIS_TRIG_PULSE_SPEC_LOCA;
ParaNumber=20;
for (int i=2;i<ParaNumber;i++)
{
TrigDis[i]=static_cast<short>(TrigDis[1]+(i-1)*10);
}
}
else
{
TrigMode=E_DIS_TRIG_PULSE_EQDIS;
ParaNumber=1;
}
m_pSO7_Proto->_send_cmd_SO7_CMD_WRITE_TRIG_PULSE_PARA(ActiveAxis,TrigMode,StartIndex,ParaNumber,TrigDis);
m_OutMessage.Format(_T("[Write Trig Para]:R TotalNo=%d"),m_pSO7_Proto->g_machine.TrigPara.TrigTotalNo);
OutputWithScroll(m_OutMessage,m_edMSG);
}
//======================================================
void CSO7_UtilDlg::OnBnClickedButtonSo7TrigpulseReadPara()
{
UpdateData(TRUE);
USES_CONVERSION;
short sGetIndex(0);
m_pSO7_Proto->_send_cmd_SO7_CMD_READ_TRIG_PULSE_PARA(sGetIndex);
m_OutMessage.Format(_T("[Read Trig Para]:R Axis=%d,Method=%d,TotalNo=%d,CurIndex=%d,Para[%d]=%d."),m_pSO7_Proto->g_machine.TrigPara.TrigPulseActiveAxis,
m_pSO7_Proto->g_machine.TrigPara.TrigPulseMethod,m_pSO7_Proto->g_machine.TrigPara.TrigTotalNo,
m_pSO7_Proto->g_machine.TrigPara.TrigCurIndex,m_pSO7_Proto->g_machine.TrigPara.TrigCurIndex,
m_pSO7_Proto->g_machine.TrigPara.TrigCurPara);
OutputWithScroll(m_OutMessage,m_edMSG);
}
//======================================================
void CSO7_UtilDlg::OnBnClickedButtonSetScaleCoefficient()
{
UpdateData(TRUE);
@@ -1670,4 +1555,8 @@ void CSO7_UtilDlg::OnBnClickedButtonSetScaleCoefficient()
m_pSO7_Proto->g_machine.s_machine_config.z_axis._scale_resolution = atof(cTempValue);
m_pSO7_Proto->Save_So7_Config();
}
//======================================================
void CSO7_UtilDlg::OnBnClickedButtonSo7ExternalTrig()
{
// TODO: Add your control notification handler code here
}
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.h
+1 -5
View File
@@ -25,7 +25,6 @@ public:
CString m_Y_Pos;
CString m_Z_Pos;
CString m_Zm_Pos;
CString m_Rotary_Edit_Position;
CString m_csTop_Light_Value;
CString m_csBom_Light_Value;
CString m_csFan_Light_Value;
@@ -117,8 +116,6 @@ public:
afx_msg void OnBnClickedRadioReadInputPort();
afx_msg void OnBnClickedRadioReadOutputPort();
afx_msg void OnBnClickedButtonMotionParameter();
afx_msg void OnBnClickedButtonSo7TrigpulseStop();
afx_msg void OnBnClickedButtonSo7TrigpulseStart();
afx_msg void OnBnClickedCheckSo7TopLightOn();
afx_msg void OnBnClickedCheckSo7BottomLightOn();
afx_msg void OnBnClickedCheckSo7RingLightOn();
@@ -131,8 +128,7 @@ public:
afx_msg void OnBnClickedButtonSo7SetSeqNumber();
afx_msg void OnBnClickedButtonSo7SetVerNumber();
afx_msg void OnBnClickedRadioReadLimitSwitch();
afx_msg void OnBnClickedButtonSo7TrigpulseWritePara();
afx_msg void OnBnClickedButtonSo7TrigpulseReadPara();
afx_msg void OnBnClickedButtonSetScaleCoefficient();
afx_msg void OnBnClickedButtonS07SetIoPurpose();
afx_msg void OnBnClickedButtonSo7ExternalTrig();
};
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h
+2 -1
View File
@@ -733,6 +733,8 @@
#define IDC_RADIO_TEST_IMAGE_DLL3 1598
#define IDC_BUTTON_SO7_CNC_PROGRAM 1599
#define IDC_BUTTON_PROGRAM_SET_ZERO_Z 1600
#define IDC_BUTTON_SO7_CNC_PROGRAM2 1600
#define IDC_BUTTON_SO7_EXTERNAL_TRIG 1600
#define IDC_BUTTON_IMAGEDLL_STOP_SCAN_LASER 1601
#define IDC_STATIC_TC4000_PICTURE 1602
#define IDC_RADIO_SO7_IP_CAMERA 1603
@@ -1000,7 +1002,6 @@
#define IDC_EDIT_STIL_LASER_VALUE1 1861
#define IDC_EDIT_STIL_MESSAGE 1862
#define IDC_BUTTON_STIL_CLEAR_LOG 1863
#define IDC_BUTTON6 1864
#define IDC_BUTTON_S07_SET_IO_PURPOSE 1864
#define IDC_BUTTON_DIY_EXIT_BUTTON 32740
#define ID_EDIT_SO7_CONFIG_MOTION 32741
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo
BIN
View File
Binary file not shown.