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

Add Rotary axis。

Browse Source
This commit is contained in:
TAO Cheng
2014-02-21 20:14:36 +08:00
parent e8d5f45614
commit 7dcc572301
8 changed files with 126 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.hgignore
+1
View File
@@ -34,3 +34,4 @@ PcDmis/Base/Interfac/Msi/Hsi/KeyenceTM065/LKIF_Multi_USӢ
PcDmis/Base/Interfac/Msi/Hsi/KeyenceTM065/LK-GͨÐÅÓÃDLL-20090427
*.ipch
*.opensdf
*.tmp
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log
+57
View File
@@ -3293,3 +3293,60 @@ Init:Open device succeed .
_start_machine
Exit: Exit_SO7Usb
Destruct Cso7_Proto.
Construct Cso7_Proto.
Init:Open device succeed .
_start_machine
Exit: Exit_SO7Usb
Destruct Cso7_Proto.
Construct Cso7_Proto.
Init:Open device succeed .
_start_machine
Exit: Exit_SO7Usb
Destruct Cso7_Proto.
Construct Cso7_Proto.
Init:Open device succeed .
_start_machine
Exit: Exit_SO7Usb
Destruct Cso7_Proto.
Construct Cso7_Proto.
Init:Open device succeed .
_start_machine
Exit: Exit_SO7Usb
Destruct Cso7_Proto.
Construct Cso7_Proto.
Init:Open device succeed .
_start_machine
Exit: Exit_SO7Usb
Destruct Cso7_Proto.
Construct Cso7_Proto.
Init:Open device succeed .
_start_machine
Exit: Exit_SO7Usb
Destruct Cso7_Proto.
Construct Cso7_Proto.
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc
+13 -7
View File
@@ -27,7 +27,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
// Dialog
//
IDD_SO7_UTIL_DIALOG DIALOGEX 0, 0, 418, 486
IDD_SO7_UTIL_DIALOG DIALOGEX 0, 0, 418, 496
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "SevenOcean Utility"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
@@ -90,7 +90,7 @@ BEGIN
LTEXT "SegI",IDC_STATIC,236,72,16,8
LTEXT "SegII",IDC_STATIC,236,86,18,8
GROUPBOX "I/O Port Status",IDC_STATIC,321,14,72,111
PUSHBUTTON "Exit",IDCANCEL,366,465,39,14
PUSHBUTTON "Exit",IDCANCEL,366,475,39,14
LTEXT "x",IDC_STATIC,23,324,8,11
LTEXT "y",IDC_STATIC,23,338,8,11
LTEXT "z",IDC_STATIC,23,352,8,11
@@ -105,7 +105,7 @@ BEGIN
EDITTEXT IDC_EDIT_ZM_POSITION_58,103,365,54,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP
LTEXT "Scale Pulse",IDC_STATIC,40,309,36,8
LTEXT "mm",IDC_STATIC,123,310,12,8
EDITTEXT IDC_EDIT_STATUS,15,404,385,56,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL
EDITTEXT IDC_EDIT_STATUS,15,403,223,86,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL
LTEXT "ms",IDC_STATIC_SEC,212,384,16,9
EDITTEXT IDC_EDIT_UPDATE_FREQ,183,383,25,13,ES_AUTOHSCROLL | ES_READONLY
GROUPBOX "Scale Display",IDC_STATIC,15,264,224,136
@@ -155,6 +155,12 @@ BEGIN
COMBOBOX IDC_COMBO_OUTPORT_NUMBER,182,223,29,34,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
CONTROL "Inport",IDC_RADIO_READ_INPUT_PORT,"Button",BS_AUTORADIOBUTTON | WS_GROUP,344,227,36,10
CONTROL "Outport",IDC_RADIO_READ_OUTPUT_PORT,"Button",BS_AUTORADIOBUTTON,344,243,41,10
GROUPBOX "Rotary",IDC_STATIC,252,402,155,70
PUSHBUTTON "Home",IDC_BUTTON_HOME,263,419,34,15
EDITTEXT IDC_EDIT_POSITION,264,445,36,14,ES_AUTOHSCROLL
CONTROL "Rel",IDC_RADIO_RELATIVE,"Button",BS_AUTORADIOBUTTON,308,448,27,8
CONTROL "Abs",IDC_RADIO_ABSOLUTE,"Button",BS_AUTORADIOBUTTON,336,448,28,8
PUSHBUTTON "Go",IDC_BUTTON_GO,365,445,34,15
END
IDD_S07_UTIL_SEND_PARAMETER DIALOGEX 0, 0, 753, 481
@@ -266,7 +272,7 @@ BEGIN
LTEXT "Y=",IDC_STATIC,90,302,10,8
EDITTEXT IDC_EDIT_INPUT_FILE,58,12,181,14,ES_AUTOHSCROLL
LTEXT "Input File",IDC_STATIC,11,15,42,8
PUSHBUTTON "Browse...",IDC_BUTTON_BROWSE,246,12,44,14
PUSHBUTTON "Browse...",IDC_BUTTON_BROWSE,246,12,44,14,0,WS_EX_ACCEPTFILES
GROUPBOX "速度参数",IDC_STATIC,17,29,273,254
LTEXT "X-1",IDC_STATIC,27,63,12,8
LTEXT "X-2",IDC_STATIC,27,78,12,8
@@ -493,7 +499,7 @@ BEGIN
EDITTEXT IDC_EDIT_MOVE_TO_Y,41,101,53,12,ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_MOVE_TO_Z,41,124,53,12,ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_MOVE_TO_ZM,41,147,53,12,ES_AUTOHSCROLL
CONTROL "Reverse",IDC_CHECK_REVERSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,91,43,10
CONTROL "Reverse",IDC_CHECK_REVERSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,105,91,43,10
PUSHBUTTON "Move To XYZ",IDC_BUTTON_MOVE_TO_XYZ,103,107,71,24,BS_MULTILINE
PUSHBUTTON "Move To Zoom",IDC_BUTTON_MOVE_TO_ZOOM,103,136,71,24
PUSHBUTTON "Move To XYZ(JM)",IDC_BUTTON_MOVE_TO_XYZ_JM,180,78,71,24,BS_MULTILINE
@@ -556,7 +562,7 @@ BEGIN
PUSHBUTTON "Clear All",IDC_BUTTON_SO7_MOVETO_CLEAR_ALL_LOG,452,266,50,21
CONTROL "ErrPos",IDC_CHECK_SO7_MOVETO_FPGADATA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,459,187,34,10
CONTROL "Auto Set Zero ",IDC_CHECK_SO7_MOTION_AUTO_SET_ZERO,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,75,59,10
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,105,75,63,10
END
IDD_SO7_UTIL_IMAGE_DLL DIALOGEX 0, 0, 377, 184
@@ -863,7 +869,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 405
TOPMARGIN, 7
BOTTOMMARGIN, 479
BOTTOMMARGIN, 489
END
IDD_S07_UTIL_SEND_PARAMETER, DIALOG
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.cpp
+44 -2
View File
@@ -91,7 +91,7 @@ void CSO7_UtilDlg::DoDataExchange(CDataExchange* pDX)
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_Text(pDX, IDC_EDIT_POSITION, m_Rotary_Edit_Position);
DDX_Control(pDX, IDC_EDIT_STATUS, m_edMSG);
@@ -142,6 +142,8 @@ 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_HOME, &CSO7_UtilDlg::OnBnClickedButtonHome)
ON_BN_CLICKED(IDC_BUTTON_GO, &CSO7_UtilDlg::OnBnClickedButtonGo)
END_MESSAGE_MAP()
@@ -1369,4 +1371,44 @@ void CSO7_UtilDlg::OnBnClickedCheckSo7TurnOnFffLaser()
{
m_pSO7_Proto->_send_cmd_SO7_CMD_COMMON_COMMAND(CT_MOTOR,CT_M_LASE_OFF,0);
}
}
}
//=================================================
// Move one revolution 2**23
// When the rotary stop, take the curr pos - ref pos.
// m_pSO7_Proto->g_machine.z._scale_pos._long_
//
void CSO7_UtilDlg::OnBnClickedButtonHome()
{
m_pSO7_Proto->g_machine.z._scale_pos._long_ = (long)m_pSO7_Proto->g_machine.z._d_cur_pos_ + (long)(2^23);
m_pSO7_Proto->_send_cmd_SO7_CMD_MOVE_TO_POS_Z();
Sleep(200);
m_pSO7_Proto->_send_cmd_SO7_CMD_READ_ZSIGNAL_POS_Z();
m_ZsignalPosZ=m_pSO7_Proto->g_machine.z._ZSignal_pos._long_;
m_pSO7_Proto->_send_cmd_SO7_CMD_READ_AXIS_XYZ();
double lZ = m_pSO7_Proto->g_machine.z._scale_pos._long_;
lZ;
// set the home position.
// show the Z position in Angle
// show the signal position in Angle
}
//================================================
// Change Angle to Revolution
//
void CSO7_UtilDlg::OnBnClickedButtonGo()
{
UpdateData(TRUE);
USES_CONVERSION;
const char* cMove_to_Rotary=T2A(m_Rotary_Edit_Position);
double dPos = atof(cMove_to_Rotary);
if (((CButton *)GetDlgItem(IDC_RADIO_RELATIVE))->GetCheck())
{
// m_pSO7_Proto->g_machine.z._pos_fixed._long_ = atoi(cMove_to_Z) - (m_pSO7_Proto->g_machine.z._scale_pos._long_-m_pSO7_Proto->g_machine.z._lSet_Zero_Pos);
dPos;
} else
{
// m_pSO7_Proto->g_machine.z._pos_fixed._long_ = atoi(cMove_to_Z) - (m_pSO7_Proto->g_machine.z._scale_pos._long_-m_pSO7_Proto->g_machine.z._lSet_Zero_Pos);
};
m_pSO7_Proto->_send_cmd_SO7_CMD_MOVE_TO_POS_Z();
}
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.h
+3 -1
View File
@@ -25,7 +25,7 @@ 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;
@@ -118,4 +118,6 @@ public:
afx_msg void OnBnClickedRadioReadInputPort();
afx_msg void OnBnClickedRadioReadOutputPort();
afx_msg void OnBnClickedButtonMotionParameter();
afx_msg void OnBnClickedButtonHome();
afx_msg void OnBnClickedButtonGo();
};
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj
+1 -1
View File
@@ -127,7 +127,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_WARNINGS;_RELEASE_FULL_VERSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_RELEASE_SO7_CONTROLER_ONLY;WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_WARNINGS;_RELEASE_FULL_VERSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h
+7 -1
View File
@@ -685,7 +685,9 @@
#define IDC_RADIO_KEYENCE_LASER_LK_G 1584
#define IDC_BUTTON3 1585
#define IDC_BUTTONIDC_BUTTON_TESA_STAR_MOVETO 1585
#define IDC_BUTTON_HOME 1585
#define IDC_BUTTON_INIT_SCAN_KEYENCE_LK_GLASER 1586
#define IDC_BUTTON_GO 1586
#define IDC_EDIT_MEASURE_VALUE 1587
#define IDC_RADIO_OUT_EXTRACT 1588
#define IDC_RADIO_KEYENCE_LASER 1589
@@ -884,6 +886,10 @@
#define IDC_LIST_SO7_MOTION_CONFIG 1820
#define IDC_EDIT_SO7_MOTION_CONFIG_MSGOUT 1821
#define IDC_EDIT_SO7_PROGEAM_INTERCAL_TIME_PER_CNC 1822
#define IDC_EDIT_POSITION 1824
#define IDC_RADIO_RELATIVE 1825
#define IDC_RADIO_ABS 1826
#define IDC_RADIO_ABSOLUTE 1826
#define IDC_BUTTON_DIY_EXIT_BUTTON 32740
#define ID_EDIT_SO7_CONFIG_MOTION 32741
@@ -893,7 +899,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 189
#define _APS_NEXT_COMMAND_VALUE 32771
#define _APS_NEXT_CONTROL_VALUE 1823
#define _APS_NEXT_CONTROL_VALUE 1827
#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.