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

新增变倍时间输出，统一CMD_H文件。

Browse Source
This commit is contained in:
TAO Cheng
2013-11-12 14:37:21 +08:00
parent 842c95f8b1
commit 24ba06adf7
16 changed files with 912 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc
+19 -13
View File
@@ -55,12 +55,12 @@ BEGIN
PUSHBUTTON "Motion",IDC_BUTTON_LOAD_SO7CONFIG,20,143,44,23,BS_MULTILINE
PUSHBUTTON "V+",IDC_BUTTON_SO7_MOVE_ZOOM_IN,77,159,25,12
PUSHBUTTON "V-",IDC_BUTTON_SO7_MOVE_ZOOM_OUT,77,180,25,12
PUSHBUTTON "Z+",IDC_BUTTON_SO7_MOVE_Z_UP,112,152,25,12
PUSHBUTTON "Z-",IDC_BUTTON_SO7_MOVE_Z_DOWN,112,186,25,12
PUSHBUTTON "Z+",IDC_BUTTON_SO7_MOVE_Z_UP,101,140,25,12
PUSHBUTTON "Z-",IDC_BUTTON_SO7_MOVE_Z_DOWN,103,196,25,12
PUSHBUTTON "X-",IDC_BUTTON_SO7_MOVE_X_LEFT,128,169,25,12
PUSHBUTTON "Y+",IDC_BUTTON_SO7_MOVE_Y_FRONT,154,159,25,12
PUSHBUTTON "Y-",IDC_BUTTON_SO7_MOVE_Y_BACK,154,180,25,12
PUSHBUTTON "X+",IDC_BUTTON_SO7_MOVE_X_RIGHT,180,169,25,12
PUSHBUTTON "Y+",IDC_BUTTON_SO7_MOVE_Y_FRONT,154,156,25,12
PUSHBUTTON "Y-",IDC_BUTTON_SO7_MOVE_Y_BACK,154,182,25,12
PUSHBUTTON "X+",IDC_BUTTON_SO7_MOVE_X_RIGHT,179,169,25,12
PUSHBUTTON "Home XYZ",IDC_BUTTON_SO7_RESET_XYZ,277,154,76,14,BS_MULTILINE
PUSHBUTTON "Hoom Manual",IDC_BUTTON_MANUAL_HOME,277,135,76,14
PUSHBUTTON "Home DCC",IDC_BUTTON_RESET_WORKTABLE,277,192,40,14
@@ -156,6 +156,10 @@ BEGIN
LTEXT "Data",IDC_STATIC,287,373,16,8
COMBOBOX IDC_COMBO_RWDATA_ADDR,307,348,45,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
COMBOBOX IDC_COMBO_SO7_HOMEMODE,324,192,27,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "◥",IDC_BUTTON_SO7_MOVE_XR_YF,179,156,25,12
PUSHBUTTON "◢",IDC_BUTTON_SO7_MOVE_XR_YB,179,182,25,12
PUSHBUTTON "◤",IDC_BUTTON_SO7_MOVE_XL_YF,128,156,25,12
PUSHBUTTON "◣",IDC_BUTTON_SO7_MOVE_XL_YB,128,182,25,12
END
IDD_S07_UTIL_SEND_PARAMETER DIALOGEX 0, 0, 753, 481
@@ -328,7 +332,7 @@ BEGIN
EDITTEXT IDC_EDIT_DATASEND,86,316,191,16,ES_MULTILINE | ES_AUTOHSCROLL | ES_WANTRETURN
PUSHBUTTON "Clear",IDC_BUTTON_CLEARMESSAGE,284,363,50,17
GROUPBOX "Serial Communication",IDC_STATIC,11,300,398,117
GROUPBOX "Move Test",IDC_STATIC,13,28,393,247
GROUPBOX "Move Test",IDC_STATIC,13,28,406,247
EDITTEXT IDC_EDIT_ZOOM_ANGLE,129,137,81,14,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY
LTEXT "Zm",IDC_STATIC,109,140,10,8
CTEXT "°",IDC_STATIC,213,136,8,8
@@ -337,17 +341,17 @@ BEGIN
PUSHBUTTON "Zero Set",IDC_BUTTON_ZOOM_SETZERO,263,138,50,14,NOT WS_VISIBLE
EDITTEXT IDC_EDIT_REPETEST_PAUSE,179,100,54,14,ES_AUTOHSCROLL
CTEXT "ms",IDC_STATIC,235,101,11,8
EDITTEXT IDC_EDIT_ZOOM_LOG,47,159,250,110,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL
PUSHBUTTON "Save as...",IDC_BUTTON_SAVELOG,320,209,39,19
EDITTEXT IDC_EDIT_ZOOM_LOG,129,158,249,110,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL
PUSHBUTTON "Save as...",IDC_BUTTON_SAVELOG,380,212,39,19
COMBOBOX IDC_COMBO_REPETEST_FROM,85,80,54,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
COMBOBOX IDC_COMBO_REPETEST_TO,179,76,54,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
COMBOBOX IDC_COMBO_REPETEST_TO,179,80,54,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "Begin",IDC_BUTTON_REPETEST_BEGIN,263,89,50,14
EDITTEXT IDC_EDIT_REPETEST_TIMES,85,100,54,14,ES_AUTOHSCROLL
GROUPBOX "Repeatability Test",IDC_STATIC,47,69,268,64
LTEXT "Times",IDC_STATIC,59,104,19,8
LTEXT "Pause",IDC_STATIC,155,102,20,8
LTEXT "To",IDC_STATIC,165,80,9,8
LTEXT "From",IDC_STATIC,61,85,17,8
LTEXT "To",IDC_STATIC,165,83,9,8
LTEXT "From",IDC_STATIC,61,83,17,8
CONTROL "Continue",IDC_CHECK_AUTOZOOM_CONTINUE_READ,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,61,140,40,10
PUSHBUTTON "V+",IDC_BUTTON_MOVEV_IN,48,235,50,14,NOT WS_VISIBLE
PUSHBUTTON "V-",IDC_BUTTON_MOVEV_OUT,48,252,50,14,NOT WS_VISIBLE
@@ -371,6 +375,7 @@ BEGIN
EDITTEXT IDC_EDIT_TESTZOOM_PRODUCTID,159,16,124,14,ES_AUTOHSCROLL | ES_READONLY
LTEXT "变倍镜头产品编号：",IDC_STATIC,80,18,73,8
PUSHBUTTON "MoveTo",IDC_BUTTON_ZOOM_MOVETO,263,43,50,14
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
@@ -486,6 +491,9 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM
CAPTION "Move To Location(SO7)"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
CONTROL "System",IDC_RADIO_SPEED_SYSTEM,"Button",BS_AUTORADIOBUTTON | WS_GROUP,179,20,39,10
CONTROL "Fast",IDC_RADIO_SPEED_FAST,"Button",BS_AUTORADIOBUTTON,179,31,30,10
CONTROL "Slow",IDC_RADIO_SPEED_SLOW,"Button",BS_AUTORADIOBUTTON,179,42,31,10
EDITTEXT IDC_EDIT_MOVE_TO_X,41,78,53,12,ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_MOVE_TO_Y,41,99,53,12,ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_MOVE_TO_Z,41,120,53,12,ES_AUTOHSCROLL
@@ -510,8 +518,6 @@ BEGIN
CONTROL "Relative",IDC_RADIO_MOVE_RELATIVE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,107,22,42,10
CONTROL "Absolute",IDC_RADIO_MOVE_ABSOLUTE,"Button",BS_AUTORADIOBUTTON,107,38,44,10
GROUPBOX "Move Speed",IDC_STATIC,168,9,330,46
CONTROL "Fast",IDC_RADIO_SPEED_FAST,"Button",BS_AUTORADIOBUTTON | WS_GROUP,180,22,30,10
CONTROL "Slow",IDC_RADIO_SPEED_SLOW,"Button",BS_AUTORADIOBUTTON,180,36,31,10
PUSHBUTTON "EXIT",IDCANCEL,454,333,50,14
LTEXT "x",IDC_STATIC,29,78,8,8
LTEXT "y",IDC_STATIC,29,99,8,8
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/ProcessButton.cpp
+25 -1
View File
@@ -50,6 +50,26 @@ void CProcessButton::OnLButtonDown(UINT nFlags, CPoint point)
switch (iCtrlID)
{
case IDC_BUTTON_SO7_MOVE_XR_YF:
{
m_pSO7_Proto->_send_cmd_SO7_CMD_MOVE_XY(m_pSO7_Proto->g_machine.x._Move_Speed_Gear,m_pSO7_Proto->g_machine.y._Move_Speed_Gear);
break;
}
case IDC_BUTTON_SO7_MOVE_XR_YB:
{
m_pSO7_Proto->_send_cmd_SO7_CMD_MOVE_XY(m_pSO7_Proto->g_machine.x._Move_Speed_Gear,-m_pSO7_Proto->g_machine.y._Move_Speed_Gear);
break;
}
case IDC_BUTTON_SO7_MOVE_XL_YF:
{
m_pSO7_Proto->_send_cmd_SO7_CMD_MOVE_XY(-m_pSO7_Proto->g_machine.x._Move_Speed_Gear,m_pSO7_Proto->g_machine.y._Move_Speed_Gear);
break;
}
case IDC_BUTTON_SO7_MOVE_XL_YB:
{
m_pSO7_Proto->_send_cmd_SO7_CMD_MOVE_XY(-m_pSO7_Proto->g_machine.x._Move_Speed_Gear,-m_pSO7_Proto->g_machine.y._Move_Speed_Gear);
break;
}
//======================================================================================
case IDC_BUTTON_SO7_MOVE_X_LEFT:
{
@@ -177,8 +197,12 @@ void CProcessButton::OnLButtonUp(UINT /*nFlags*/, CPoint/* point*/)
case IDC_BUTTON_SO7_MOVE_X_RIGHT:
case IDC_BUTTON_SO7_MOVE_Y_FRONT:
case IDC_BUTTON_SO7_MOVE_Y_BACK:
case IDC_BUTTON_SO7_MOVE_Z_UP:
case IDC_BUTTON_SO7_MOVE_Z_UP:
case IDC_BUTTON_SO7_MOVE_Z_DOWN:
case IDC_BUTTON_SO7_MOVE_XR_YF:
case IDC_BUTTON_SO7_MOVE_XR_YB:
case IDC_BUTTON_SO7_MOVE_XL_YF:
case IDC_BUTTON_SO7_MOVE_XL_YB:
{
m_pSO7_Proto->_send_cmd_SO7_CMD_STOP_MOVE_XYZ();
break;
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Automatic_Zoom.cpp
+61 -3
View File
@@ -45,6 +45,8 @@ void CSO7_Automatic_Zoom::DoDataExchange(CDataExchange* pDX)
DDX_Control(pDX, IDC_COMBO_REPETEST_FROM, m_cmbRepeTestFrom);
DDX_Control(pDX, IDC_COMBO_REPETEST_TO, m_cmbRepeTestTo);
DDX_Control(pDX, IDC_EDIT_ZOOM_LOG, m_edit_Log);
DDX_Control(pDX, IDC_EDIT_ZOOM_TIME, m_edit_Time);
DDX_Control(pDX, IDC_BUTTON_MOVEV_IN, m_Button_MoveV_Zoom_In);
DDX_Control(pDX, IDC_BUTTON_MOVEV_OUT, m_Button_MoveV_Zoom_Out);
@@ -270,6 +272,7 @@ void CSO7_Automatic_Zoom::OnBnClickedButtonRepetestBegin()
bBeginFlag=false;
bRepeTestDone=true;
((CButton*)GetDlgItem(IDC_BUTTON_REPETEST_BEGIN))->SetWindowTextW(_T("Begin"));
SetTimer(1,200,NULL);
}
else
{
@@ -289,7 +292,7 @@ void CSO7_Automatic_Zoom::OnBnClickedButtonRepetestBegin()
m_pSO7_Proto->_send_cmd_SO7_CMD_MOVE_TO_POS_ZM();
bRepeTestDone=false;
((CButton*)GetDlgItem(IDC_BUTTON_REPETEST_BEGIN))->SetWindowTextW(_T("Stop"));
SetTimer(1,200,NULL);
//SetTimer(1,200,NULL);
SetTimer(2,100,NULL);
}
@@ -297,7 +300,6 @@ void CSO7_Automatic_Zoom::OnBnClickedButtonRepetestBegin()
//====================================================
BOOL CSO7_Automatic_Zoom::RepeTest()
{
KillTimer(1);
UpdateData(TRUE);
CString csTemp;
m_pSO7_Proto->g_machine.zm._d_cur_pos_=GetZoomCurPos();
@@ -398,8 +400,9 @@ BOOL CSO7_Automatic_Zoom::RepeTest()
OutputWithScroll(m_OutMessage,m_edit_Log);
bBeginFlag=false;
((CButton*)GetDlgItem(IDC_BUTTON_REPETEST_BEGIN))->SetWindowTextW(_T("Begin"));
SetTimer(1,200,NULL);
}
SetTimer(1,200,NULL);
return TRUE;
}
@@ -455,10 +458,34 @@ void CSO7_Automatic_Zoom::OnTimer(UINT_PTR nIDEvent)
bRepeTestDone=true;
m_OutMessage=_T("");
((CButton*)GetDlgItem(IDC_BUTTON_BEGIN_REPE_TEST))->SetWindowTextW(_T("Begin"));
SetTimer(1,200,NULL);
}
}
m_pSO7_Proto->g_machine.InterruptFlag[0]=0;
}
else
{
m_pSO7_Proto->_send_cmd_SO7_CMD_READ_ZOOM_MOTION_STATUS();
if (m_pSO7_Proto->g_machine.s_status._bIsZMMotionFinished)
{
if (!bRepeTestDone)
{
if (bBeginFlag)
{
SetTimer(3,m_iZoom_Pause_Time,NULL);
}
else
{
bRepeTestDone=true;
m_OutMessage=_T("");
((CButton*)GetDlgItem(IDC_BUTTON_BEGIN_REPE_TEST))->SetWindowTextW(_T("Begin"));
SetTimer(1,200,NULL);
}
}
}
}
}
}
break;
@@ -475,6 +502,7 @@ void CSO7_Automatic_Zoom::OnTimer(UINT_PTR nIDEvent)
bRepeTestDone=true;
m_OutMessage=_T("");
((CButton*)GetDlgItem(IDC_BUTTON_REPETEST_BEGIN))->SetWindowTextW(_T("Begin"));
SetTimer(1,200,NULL);
}
KillTimer(3);
break;
@@ -500,6 +528,28 @@ void CSO7_Automatic_Zoom::OutputWithScroll(const CString &strText,CEdit &edtOutp
edtOutput.SetSel(iCount, iCount);
edtOutput.SetRedraw(TRUE);
}
//=====================================================================================
//Print message on edit control
void CSO7_Automatic_Zoom::OutputWithScroll_Auto(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 CSO7_Automatic_Zoom::OnBnClickedButtonSavelog()
{ USES_CONVERSION;
@@ -729,6 +779,14 @@ double CSO7_Automatic_Zoom::GetZoomCurPos()
{
dZoomPos=dZoomPos/(iCnt2);
}
CTime t = CTime::GetCurrentTime();
int hh=t.GetHour();
int mm=t.GetMinute();
int s=t.GetSecond();
CString csTime;
csTime.Format(_T("[%2d:%2d:%2d] %.4f°\r\n"),hh,mm,s,dZoomPos);
OutputWithScroll_Auto(csTime,m_edit_Time);
return dZoomPos;
}
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Automatic_Zoom.h
+9 -2
View File
@@ -19,7 +19,8 @@ protected:
DECLARE_MESSAGE_MAP()
public:
CStatusBarCtrl m_StatusBar;
CEdit m_edit_Log;
CEdit m_edit_Log;
CEdit m_edit_Time;
int Port;
int Baud;
char Parity;
@@ -54,11 +55,17 @@ public:
INT iRetryCnt,iRetryCntTo,iRetryCntFrom;
INT iFrom,iTo;
BOOL m_bZMHoming;
double ReadZoomAngle();
BOOL CalibrateEncoder();
double GetZoomCurPos();
BOOL RepeTest();
void OutputWithScroll(const CString &strText,CEdit &edtOutput);
void OutputWithScroll(const CString &strText,CEdit &edtOutput);
void OutputWithScroll_Auto(const CString &strText,CEdit &edtOutput);
afx_msg void OnTimer(UINT_PTR nIDEvent);
afx_msg void OnBnClickedCancel();
afx_msg void OnBnClickedButtonSendData();
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Move_Location.cpp
+46 -45
View File
@@ -1,4 +1,4 @@
// SO7_Move_Location.cpp : 实现文件
7// SO7_Move_Location.cpp : 实现文件
//
#include "stdafx.h"
#include "afxdialogex.h"
@@ -76,6 +76,7 @@ BEGIN_MESSAGE_MAP(CSO7_Move_Location, CDialog)
ON_EN_KILLFOCUS(IDC_EDIT_MOTION_SPEEDZ, &CSO7_Move_Location::OnEnKillfocusEditMotionSpeedz)
ON_BN_CLICKED(IDC_RADIO_SPEED_FAST, &CSO7_Move_Location::OnBnClickedRadioSpeedFast)
ON_BN_CLICKED(IDC_RADIO_SPEED_SLOW, &CSO7_Move_Location::OnBnClickedRadioSpeedSlow)
ON_BN_CLICKED(IDC_RADIO_SPEED_SYSTEM, &CSO7_Move_Location::OnBnClickedRadioSpeedSystem)
END_MESSAGE_MAP()
@@ -92,12 +93,15 @@ BOOL CSO7_Move_Location::OnInitDialog()
((CButton *)GetDlgItem(IDC_RADIO_MM))->SetCheck(1);
((CButton *)GetDlgItem(IDC_RADIO_SCALE))->SetCheck(0);
((CButton *)GetDlgItem(IDC_RADIO_SPEED_FAST))->SetCheck(0);
((CButton *)GetDlgItem(IDC_RADIO_SPEED_SLOW))->SetCheck(1);
((CButton *)GetDlgItem(IDC_RADIO_SPEED_SLOW))->SetCheck(0);
((CButton *)GetDlgItem(IDC_RADIO_SPEED_SYSTEM))->SetCheck(1);
(GetDlgItem(IDC_EDIT_MOTION_SPEEDX))->EnableWindow(FALSE);
(GetDlgItem(IDC_EDIT_MOTION_SPEEDY))->EnableWindow(FALSE);
(GetDlgItem(IDC_EDIT_MOTION_SPEEDZ))->EnableWindow(FALSE);
((CButton *)GetDlgItem(IDC_RADIO_MOVE_RELATIVE))->SetCheck(1);
((CButton *)GetDlgItem(IDC_RADIO_MOVE_ABSOLUTE))->SetCheck(0);
GetDlgItem(IDC_EDIT_REPETEST_ERRORRANGE)->EnableWindow(false);
OnBnClickedRadioSpeedSlow();
if (((CButton *)GetDlgItem(IDC_RADIO_SCALE))->GetCheck())
{// scale
@@ -602,8 +606,23 @@ void CSO7_Move_Location::OnEnKillfocusEditMotionSpeedz()
m_pSO7_Proto->_send_cmd_SO7_CMD_SET_SPEED_PARAMETER(2,0);
}
//=====================================================================================
void CSO7_Move_Location::OnBnClickedRadioSpeedSystem()
{
(GetDlgItem(IDC_EDIT_MOTION_SPEEDX))->EnableWindow(FALSE);
(GetDlgItem(IDC_EDIT_MOTION_SPEEDY))->EnableWindow(FALSE);
(GetDlgItem(IDC_EDIT_MOTION_SPEEDZ))->EnableWindow(FALSE);
m_pSO7_Proto->_send_cmd_SO7_CMD_SET_SPEED_PARAMETER(0,0);
Sleep(20);
m_pSO7_Proto->_send_cmd_SO7_CMD_SET_SPEED_PARAMETER(1,0);
Sleep(20);
m_pSO7_Proto->_send_cmd_SO7_CMD_SET_SPEED_PARAMETER(2,0);
}
//=====================================================================================
void CSO7_Move_Location::OnBnClickedRadioSpeedFast()
{
(GetDlgItem(IDC_EDIT_MOTION_SPEEDX))->EnableWindow(TRUE);
(GetDlgItem(IDC_EDIT_MOTION_SPEEDY))->EnableWindow(TRUE);
(GetDlgItem(IDC_EDIT_MOTION_SPEEDZ))->EnableWindow(TRUE);
CString cStr("");
cStr.Format(_T("%.3f"),(m_pSO7_Proto->g_machine.s_machine_config.x_axis._MoveToSpeed[0]));
GetDlgItem(IDC_EDIT_MOTION_SPEEDX)->SetWindowTextW(cStr);
@@ -615,32 +634,23 @@ void CSO7_Move_Location::OnBnClickedRadioSpeedFast()
double dSpeedX=m_pSO7_Proto->g_machine.s_machine_config.x_axis._MoveToSpeed[0];
double dSpeedY=m_pSO7_Proto->g_machine.s_machine_config.y_axis._MoveToSpeed[0];
double dSpeedZ=m_pSO7_Proto->g_machine.s_machine_config.z_axis._MoveToSpeed[0];
m_pSO7_Proto->g_machine.s_machine_config.x_axis._speed_base[0]=0;
m_pSO7_Proto->g_machine.s_machine_config.x_axis._speed_max[0]=0;
m_pSO7_Proto->g_machine.s_machine_config.x_axis._speed_start[0]=static_cast<char>(dSpeedX*m_pSO7_Proto->g_machine.s_machine_config.x_axis._MotionSpeedScale);
m_pSO7_Proto->g_machine.s_machine_config.x_axis._speed_fresh[0]=10;
m_pSO7_Proto->g_machine.s_machine_config.x_axis._speed_slow_dis[0]=0.0;
m_pSO7_Proto->_send_cmd_SO7_CMD_SET_SPEED_PARAMETER(0,0);
int iSpeed(0);
iSpeed=static_cast<int>(dSpeedX*m_pSO7_Proto->g_machine.s_machine_config.x_axis._MotionSpeedScale);
m_pSO7_Proto->_send_cmd_SO7_CMD_SET_CONSTANT_SPEED(iSpeed,0,0);
Sleep(20);
m_pSO7_Proto->g_machine.s_machine_config.y_axis._speed_base[0]=0;
m_pSO7_Proto->g_machine.s_machine_config.y_axis._speed_max[0]=0;
m_pSO7_Proto->g_machine.s_machine_config.y_axis._speed_start[0]=static_cast<char>(dSpeedY*m_pSO7_Proto->g_machine.s_machine_config.y_axis._MotionSpeedScale);
m_pSO7_Proto->g_machine.s_machine_config.y_axis._speed_fresh[0]=10;
m_pSO7_Proto->g_machine.s_machine_config.y_axis._speed_slow_dis[0]=0.0;
m_pSO7_Proto->_send_cmd_SO7_CMD_SET_SPEED_PARAMETER(1,0);
iSpeed=static_cast<char>(dSpeedY*m_pSO7_Proto->g_machine.s_machine_config.y_axis._MotionSpeedScale);
m_pSO7_Proto->_send_cmd_SO7_CMD_SET_CONSTANT_SPEED(iSpeed,1,0);
Sleep(20);
m_pSO7_Proto->g_machine.s_machine_config.z_axis._speed_base[0]=0;
m_pSO7_Proto->g_machine.s_machine_config.z_axis._speed_max[0]=0;
m_pSO7_Proto->g_machine.s_machine_config.z_axis._speed_start[0]=static_cast<char>(dSpeedZ*m_pSO7_Proto->g_machine.s_machine_config.z_axis._MotionSpeedScale);
m_pSO7_Proto->g_machine.s_machine_config.z_axis._speed_fresh[0]=10;
m_pSO7_Proto->g_machine.s_machine_config.z_axis._speed_slow_dis[0]=0.0;
m_pSO7_Proto->_send_cmd_SO7_CMD_SET_SPEED_PARAMETER(2,0);
iSpeed=static_cast<char>(dSpeedZ*m_pSO7_Proto->g_machine.s_machine_config.z_axis._MotionSpeedScale);
m_pSO7_Proto->_send_cmd_SO7_CMD_SET_CONSTANT_SPEED(iSpeed,2,0);
Sleep(20);
}
//=====================================================================================
void CSO7_Move_Location::OnBnClickedRadioSpeedSlow()
{
(GetDlgItem(IDC_EDIT_MOTION_SPEEDX))->EnableWindow(TRUE);
(GetDlgItem(IDC_EDIT_MOTION_SPEEDY))->EnableWindow(TRUE);
(GetDlgItem(IDC_EDIT_MOTION_SPEEDZ))->EnableWindow(TRUE);
CString cStr("");
cStr.Format(_T("%.3f"),(m_pSO7_Proto->g_machine.s_machine_config.x_axis._MoveToSpeed[1]));
GetDlgItem(IDC_EDIT_MOTION_SPEEDX)->SetWindowTextW(cStr);
@@ -652,27 +662,15 @@ void CSO7_Move_Location::OnBnClickedRadioSpeedSlow()
double dSpeedX=m_pSO7_Proto->g_machine.s_machine_config.x_axis._MoveToSpeed[1];
double dSpeedY=m_pSO7_Proto->g_machine.s_machine_config.y_axis._MoveToSpeed[1];
double dSpeedZ=m_pSO7_Proto->g_machine.s_machine_config.z_axis._MoveToSpeed[1];
m_pSO7_Proto->g_machine.s_machine_config.x_axis._speed_base[0]=0;
m_pSO7_Proto->g_machine.s_machine_config.x_axis._speed_max[0]=0;
m_pSO7_Proto->g_machine.s_machine_config.x_axis._speed_start[0]=static_cast<char>(dSpeedX*m_pSO7_Proto->g_machine.s_machine_config.x_axis._MotionSpeedScale);
m_pSO7_Proto->g_machine.s_machine_config.x_axis._speed_fresh[0]=10;
m_pSO7_Proto->g_machine.s_machine_config.x_axis._speed_slow_dis[0]=0.0;
m_pSO7_Proto->_send_cmd_SO7_CMD_SET_SPEED_PARAMETER(0,0);
int iSpeed(0);
iSpeed=static_cast<int>(dSpeedX*m_pSO7_Proto->g_machine.s_machine_config.x_axis._MotionSpeedScale);
m_pSO7_Proto->_send_cmd_SO7_CMD_SET_CONSTANT_SPEED(iSpeed,0,0);
Sleep(20);
m_pSO7_Proto->g_machine.s_machine_config.y_axis._speed_base[0]=0;
m_pSO7_Proto->g_machine.s_machine_config.y_axis._speed_max[0]=0;
m_pSO7_Proto->g_machine.s_machine_config.y_axis._speed_start[0]=static_cast<char>(dSpeedY*m_pSO7_Proto->g_machine.s_machine_config.y_axis._MotionSpeedScale);
m_pSO7_Proto->g_machine.s_machine_config.y_axis._speed_fresh[0]=10;
m_pSO7_Proto->g_machine.s_machine_config.y_axis._speed_slow_dis[0]=0.0;
m_pSO7_Proto->_send_cmd_SO7_CMD_SET_SPEED_PARAMETER(1,0);
iSpeed=static_cast<char>(dSpeedY*m_pSO7_Proto->g_machine.s_machine_config.y_axis._MotionSpeedScale);
m_pSO7_Proto->_send_cmd_SO7_CMD_SET_CONSTANT_SPEED(iSpeed,1,0);
Sleep(20);
m_pSO7_Proto->g_machine.s_machine_config.z_axis._speed_base[0]=0;
m_pSO7_Proto->g_machine.s_machine_config.z_axis._speed_max[0]=0;
m_pSO7_Proto->g_machine.s_machine_config.z_axis._speed_start[0]=static_cast<char>(dSpeedZ*m_pSO7_Proto->g_machine.s_machine_config.z_axis._MotionSpeedScale);
m_pSO7_Proto->g_machine.s_machine_config.z_axis._speed_fresh[0]=10;
m_pSO7_Proto->g_machine.s_machine_config.z_axis._speed_slow_dis[0]=0.0;
m_pSO7_Proto->_send_cmd_SO7_CMD_SET_SPEED_PARAMETER(2,0);
iSpeed=static_cast<char>(dSpeedZ*m_pSO7_Proto->g_machine.s_machine_config.z_axis._MotionSpeedScale);
m_pSO7_Proto->_send_cmd_SO7_CMD_SET_CONSTANT_SPEED(iSpeed,2,0);
Sleep(20);
}
//=========================================================================================
@@ -2385,8 +2383,9 @@ void CSO7_Move_Location::OnTimer(UINT_PTR nIDEvent)
{
if (m_pSO7_Proto->g_machine.s_status._machine_running)
{
m_pSO7_Proto->_send_cmd_SO7_CMD_READ_INTERRUPT_MESSAGE();
if (m_pSO7_Proto->g_machine.InterruptFlag[0] == CT_STOPXYZ)
BOOL IsFinished(FALSE);
m_pSO7_Proto->so7_motion_is_finished(EMSG_STOPXYZ_1_MOVETOXYZ,IsFinished);
if (IsFinished)
{
if (!bRepeTestDone)
{
@@ -2404,7 +2403,6 @@ void CSO7_Move_Location::OnTimer(UINT_PTR nIDEvent)
((CButton*)GetDlgItem(IDC_BUTTON_BEGIN_REPE_TEST))->SetWindowTextW(_T("Begin"));
}
}
m_pSO7_Proto->g_machine.InterruptFlag[0]=0;
}
}
}
@@ -2524,3 +2522,6 @@ void CSO7_Move_Location::OnBnClickedCheckSo7MotionOutputTime()
}
}
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Move_Location.h
+1
View File
@@ -97,4 +97,5 @@ public:
afx_msg void OnEnKillfocusEditMotionSpeedz();
afx_msg void OnBnClickedRadioSpeedFast();
afx_msg void OnBnClickedRadioSpeedSlow();
afx_msg void OnBnClickedRadioSpeedSystem();
};
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.cpp
+26 -1
View File
@@ -80,6 +80,10 @@ void CSO7_UtilDlg::DoDataExchange(CDataExchange* pDX)
DDX_Control(pDX, IDC_BUTTON_SO7_MOVE_Z_DOWN, m_Button_MoveZ_Down);
DDX_Control(pDX, IDC_BUTTON_SO7_MOVE_ZOOM_IN, m_Button_MoveV_Zoom_In);
DDX_Control(pDX, IDC_BUTTON_SO7_MOVE_ZOOM_OUT, m_Button_MoveV_Zoom_Out);
DDX_Control(pDX, IDC_BUTTON_SO7_MOVE_XR_YF, m_Button_MoveXRYF);
DDX_Control(pDX, IDC_BUTTON_SO7_MOVE_XR_YB, m_Button_MoveXRYB);
DDX_Control(pDX, IDC_BUTTON_SO7_MOVE_XL_YF, m_Button_MoveXLYF);
DDX_Control(pDX, IDC_BUTTON_SO7_MOVE_XL_YB, m_Button_MoveXLYB);
DDX_Control(pDX, IDC_EDIT_STATUS, m_edMSG);
@@ -195,6 +199,10 @@ BOOL CSO7_UtilDlg::OnInitDialog()
GetDlgItem(IDC_BUTTON_SO7_MOVE_X_RIGHT)->EnableWindow(false);
GetDlgItem(IDC_BUTTON_SO7_MOVE_Y_BACK)->EnableWindow(false);
GetDlgItem(IDC_BUTTON_SO7_MOVE_Y_FRONT)->EnableWindow(false);
GetDlgItem(IDC_BUTTON_SO7_MOVE_XR_YF)->EnableWindow(false);
GetDlgItem(IDC_BUTTON_SO7_MOVE_XR_YB)->EnableWindow(false);
GetDlgItem(IDC_BUTTON_SO7_MOVE_XL_YF)->EnableWindow(false);
GetDlgItem(IDC_BUTTON_SO7_MOVE_XL_YB)->EnableWindow(false);
GetDlgItem(IDC_BUTTON_SO7_RESET_XYZ)->EnableWindow(false);
GetDlgItem(IDC_BUTTON_RESET_V)->EnableWindow(false);
GetDlgItem(IDC_BUTTON_RESET_WORKTABLE)->EnableWindow(false);
@@ -347,7 +355,16 @@ void CSO7_UtilDlg::OnBnClickedButtonStartSo7machine()
OnBnClickedButtonInitSo7usb();
//m_pSO7_Proto->so7_motion_startup(0.5, 0.5, 0.5);
m_pSO7_Proto->_start_machine();
m_pSO7_Proto->_send_cmd_SO7_CMD_GET_RESET_FLAG();
if(m_pSO7_Proto->g_machine.IsSupportReadInterrputMsg)
{
m_pSO7_Proto->_send_cmd_SO7_CMD_READ_FIRMWARE_VERSION_INFO();
CStringA csTmp("");
csTmp.Format(("Firmware Version:[%s]"),m_pSO7_Proto->g_machine.FirmwareInfo);
m_OutMessage=csTmp;
OutputWithScroll(m_OutMessage,m_edMSG);
m_pSO7_Proto->_send_cmd_SO7_CMD_SET_GET_INTERRUPT_MSG_METHOD(E_GET_INTERRUPT_MSG_INQUIRY);
}
((CButton*)GetDlgItem(IDC_BUTTON_PROBE_ONOFF))->SetWindowTextW(_T("当前探头：激光"));
((CButton*)GetDlgItem(IDC_BUTTON_FIXTURE_ONOFF))->SetWindowTextW(_T("当前状态：夹具开"));
((CButton*)GetDlgItem(IDC_BUTTON_FIXTURE_UPDOWN))->SetWindowTextW(_T("当前状态：夹具上"));
@@ -379,6 +396,10 @@ void CSO7_UtilDlg::OnBnClickedButtonStartSo7machine()
GetDlgItem(IDC_BUTTON_SO7_MOVE_X_RIGHT)->EnableWindow(true);
GetDlgItem(IDC_BUTTON_SO7_MOVE_Y_BACK)->EnableWindow(true);
GetDlgItem(IDC_BUTTON_SO7_MOVE_Y_FRONT)->EnableWindow(true);
GetDlgItem(IDC_BUTTON_SO7_MOVE_XR_YF)->EnableWindow(true);
GetDlgItem(IDC_BUTTON_SO7_MOVE_XR_YB)->EnableWindow(true);
GetDlgItem(IDC_BUTTON_SO7_MOVE_XL_YF)->EnableWindow(true);
GetDlgItem(IDC_BUTTON_SO7_MOVE_XL_YB)->EnableWindow(true);
GetDlgItem(IDC_BUTTON_SO7_RESET_XYZ)->EnableWindow(true);
GetDlgItem(IDC_BUTTON_RESET_V)->EnableWindow(true);
GetDlgItem(IDC_BUTTON_RESET_WORKTABLE)->EnableWindow(true);
@@ -448,6 +469,10 @@ void CSO7_UtilDlg::OnBnClickedButtonStopSo7machine()
GetDlgItem(IDC_BUTTON_SO7_MOVE_X_RIGHT)->EnableWindow(false);
GetDlgItem(IDC_BUTTON_SO7_MOVE_Y_BACK)->EnableWindow(false);
GetDlgItem(IDC_BUTTON_SO7_MOVE_Y_FRONT)->EnableWindow(false);
GetDlgItem(IDC_BUTTON_SO7_MOVE_XR_YF)->EnableWindow(false);
GetDlgItem(IDC_BUTTON_SO7_MOVE_XR_YB)->EnableWindow(false);
GetDlgItem(IDC_BUTTON_SO7_MOVE_XL_YF)->EnableWindow(false);
GetDlgItem(IDC_BUTTON_SO7_MOVE_XL_YB)->EnableWindow(false);
GetDlgItem(IDC_BUTTON_SO7_RESET_XYZ)->EnableWindow(false);
GetDlgItem(IDC_BUTTON_RESET_V)->EnableWindow(false);
GetDlgItem(IDC_BUTTON_RESET_WORKTABLE)->EnableWindow(false);
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.h
+4
View File
@@ -51,6 +51,10 @@ public:
CProcessButton m_Button_MoveZ_Down;
CProcessButton m_Button_MoveV_Zoom_In;
CProcessButton m_Button_MoveV_Zoom_Out;
CProcessButton m_Button_MoveXRYF;
CProcessButton m_Button_MoveXLYF;
CProcessButton m_Button_MoveXRYB;
CProcessButton m_Button_MoveXLYB;
char m_ReadIOStatusAddr;
BOOL m_BeginReadIO;
BOOL m_TestZSignalNow;
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h
+8 -1
View File
@@ -151,6 +151,8 @@
#define IDC_RADIO_FAST 1093
#define IDC_RADIO_SPEED_FAST 1094
#define IDC_EDIT_DECEL_X 1095
#define IDC_RADIO_SPEED_FAST2 1095
#define IDC_RADIO_SPEED_SYSTEM 1095
#define IDC_EDIT_DECEL_Y 1096
#define IDC_EDIT_DECEL_Z 1097
#define IDC_BUTTON_ALL_ON 1101
@@ -291,13 +293,17 @@
#define IDC_BUTTON_SO7_MOVE_Z_DOWN 1232
#define IDC_EDIT_LASER_LK_H_VALUE2 1232
#define IDC_BUTTON_READ_PROBE 1233
#define IDC_BUTTON_SO7_MOVE_XR_YF 1234
#define IDC_BUTTON_SO7_MOVE_XR_YB 1235
#define IDC_BUTTON_SO7_MOVE_ZOOM_IN 1236
#define IDC_BUTTON_SO7_MOVE_ZOOM_OUT 1237
#define IDC_BUTTON_MOVE_TO_ZOOM 1238
#define IDC_BUTTON_SO7_MOVE_XL_YF 1238
#define IDC_BUTTON_MOVE_TO_XYZ_LASER 1239
#define IDC_BUTTON_SO7_READ_AXIS_V 1239
#define IDC_BUTTON_MOVE_TO_XYZ_JM 1240
#define IDC_BUTTON_SO7_READ_ADC 1240
#define IDC_BUTTON_SO7_MOVE_XL_YB 1240
#define IDC_BUTTON_MOVE_TO_XYZV 1241
#define IDC_BUTTON_SO7_GET_RESET_FLAG 1241
#define IDC_EDIT_RING_LIGHT 1242
@@ -849,6 +855,7 @@
#define IDC_BUTTON_KEYENCE_LASER_GET_DATA 1801
#define IDC_COMBO1 1802
#define IDC_COMBO_SO7_HOMEMODE 1802
#define IDC_EDIT_ZOOM_TIME 1803
// Next default values for new objects
//
@@ -856,7 +863,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 188
#define _APS_NEXT_COMMAND_VALUE 32771
#define _APS_NEXT_CONTROL_VALUE 1803
#define _APS_NEXT_CONTROL_VALUE 1804
#define _APS_NEXT_SYMED_VALUE 104
#endif
#endif