diff --git a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/CMD_H.h b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/CMD_H.h index e5063c4..c6031e8 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/CMD_H.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/CMD_H.h @@ -347,4 +347,17 @@ CT_CLEAR_PROBE_FLAG, CT_READ_IO_DAT, CT_WRITE_IO_DAT +}; + +enum EHOME_MODE +{ + CT_HOME_XYZ=1, + CT_HOME_X=10, + CT_HOME_Y, + CT_HOME_Z, + CT_HOME_XY=20, + CT_HOME_XZ, + CT_HOME_YZ, + + CT_HOME_TOATAL=255 }; \ No newline at end of file diff --git a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp index 7de40be..2e2340f 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp @@ -2764,9 +2764,9 @@ SSI_STATUS_MOTION CSO7_Proto::so7_motion_probe_on_off_(bool _bOnOff) }; //============================================================== -SSI_STATUS_MOTION CSO7_Proto::so7_motion_reset_worktable_lower_left() +SSI_STATUS_MOTION CSO7_Proto::so7_motion_reset_worktable_lower_left(char _HomeMode) { - _send_cmd_SO7_CMD_COMMON_COMMAND(CT_MOTOR,CT_M_RESET_LEFT,1); + _send_cmd_SO7_CMD_COMMON_COMMAND(CT_MOTOR,CT_M_RESET_LEFT,_HomeMode); return SSI_STATUS_MOTION_NORMAL; }; @@ -2868,7 +2868,7 @@ SSI_STATUS_MOTION CSO7_Proto::so7_motion_Dcc_Home() m_bHomingActive = true; // Tell the world we need to home the stage // Home - so7_motion_reset_worktable_lower_left(); + so7_motion_reset_worktable_lower_left(CT_HOME_XYZ); g_pLogger->SendAndFlushPerMode(_T("so7_motion_reset_worktable_lower_left.\n")); TRACE0(" - waiting for X,Y,Zm to stop moving\n"); diff --git a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h index 7362309..8f4f3c1 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h @@ -341,7 +341,7 @@ public: SSI_STATUS_MOTION _start_machine(); SSI_STATUS_MOTION _shutdown_machine(); SSI_STATUS_MOTION so7_motion_probe_on_off_(bool _bOnOff); - SSI_STATUS_MOTION so7_motion_reset_worktable_lower_left(); + SSI_STATUS_MOTION so7_motion_reset_worktable_lower_left(char _HomeMode); SSI_STATUS_MOTION so7_motion_reset_worktable_top_right(); SSI_STATUS_MOTION so7_motion_stop_motor_to_get_laser_data(); SSI_STATUS_MOTION so7_motion_laser_on_off(bool _bOnOff); diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log index 8663987..a4221e8 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log @@ -2173,3 +2173,43 @@ Init:Open device succeed . _start_machine Exit: Exit_SO7Usb Destruct Cso7_Proto. +Construct Cso7_Proto. +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 +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Init:Open device succeed . +_start_machine diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Release/UtilityDebug.Log b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Release/UtilityDebug.Log index c63ebc0..92ffdf4 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Release/UtilityDebug.Log +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Release/UtilityDebug.Log @@ -122,3 +122,8 @@ 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. diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/KeyenceLKH_Dlg.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/KeyenceLKH_Dlg.cpp new file mode 100644 index 0000000..08fc10d --- /dev/null +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/KeyenceLKH_Dlg.cpp @@ -0,0 +1,207 @@ +// KeyenceLKH_Dlg.cpp : implementation file +// + +#include "stdafx.h" +#include "resource.h" +#include "..\..\..\Keyence\Keyence_Laser_LK_H.h" +#include "..\..\..\SevenOcean\SO7_Proto.h" +#include "KeyenceLKH_Dlg.h" +#include "afxdialogex.h" + +extern CKeyence_Laser_LK_H* m_pKeyence_Laser_LK_H; + +// CKeyenceLKH_Dlg dialog + +IMPLEMENT_DYNAMIC(CKeyenceLKH_Dlg, CDialog) + +CKeyenceLKH_Dlg::CKeyenceLKH_Dlg(CWnd* pParent /*=NULL*/) + : CDialog(CKeyenceLKH_Dlg::IDD, pParent) +{ + +} + +CKeyenceLKH_Dlg::~CKeyenceLKH_Dlg() +{ +} + +void CKeyenceLKH_Dlg::DoDataExchange(CDataExchange* pDX) +{ + DDX_Control(pDX, IDC_EDIT_TEST_KEYENCE_MESSAGE, m_edMSG); + + CDialog::DoDataExchange(pDX); +} + + +BEGIN_MESSAGE_MAP(CKeyenceLKH_Dlg, CDialog) + ON_WM_TIMER() + ON_BN_CLICKED(IDC_BUTTON_KEYENCE_LASER_GET_DATA, &CKeyenceLKH_Dlg::OnBnClickedButtonKeyenceLaserGetData) + ON_BN_CLICKED(IDC_BUTTON_SCAN_KEYENCE_LK_H_LASER, &CKeyenceLKH_Dlg::OnBnClickedButtonScanKeyenceLkHLaser) + ON_BN_CLICKED(IDC_BUTTON_STOP_SCAN_KEYENCE_LK_H_LASER, &CKeyenceLKH_Dlg::OnBnClickedButtonStopScanKeyenceLkHLaser) + ON_BN_CLICKED(IDC_BUTTON_TEST_KEYENCE_CLEAR_LOG, &CKeyenceLKH_Dlg::OnBnClickedButtonTestKeyenceClearLog) + ON_BN_CLICKED(IDC_CHECK_CONTINUE_READ_LASER_VALUE, &CKeyenceLKH_Dlg::OnBnClickedCheckContinueReadLaserValue) + ON_EN_KILLFOCUS(IDC_EDIT_TEST_LK_G_INTERVAL, &CKeyenceLKH_Dlg::OnEnKillfocusEditTestLkGInterval) + ON_BN_CLICKED(IDCANCEL, &CKeyenceLKH_Dlg::OnBnClickedCancel) +END_MESSAGE_MAP() + + +// CKeyenceLKH_Dlg message handlers +//====================================================== +BOOL CKeyenceLKH_Dlg::OnInitDialog() +{ + CDialog::OnInitDialog(); + m_LK_H_BTN_StartGetData=FALSE; + m_LK_H_Interval=100; + ((CButton*)(GetDlgItem(IDC_EDIT_TEST_LK_G_INTERVAL)))->SetWindowText(_T("100")); + m_pKeyence_Laser_LK_H->KeyenceLaserInit(); + + return TRUE; // return TRUE unless you set the focus to a control +} + +void CKeyenceLKH_Dlg::OnBnClickedButtonKeyenceLaserGetData() +{ + if (((CButton*)(GetDlgItem(IDC_CHECK_CONTINUE_READ_LASER_VALUE)))->GetCheck()) + { + if (m_LK_H_BTN_StartGetData) + { + KillTimer(1); + m_LK_H_BTN_StartGetData=FALSE; + ((CButton*)GetDlgItem(IDC_BUTTON_KEYENCE_LASER_GET_DATA))->SetWindowTextW(_T("Get Data")); + } + else + { + m_LK_H_BTN_StartGetData=TRUE; + SetTimer(1,m_LK_H_Interval,NULL); + ((CButton*)GetDlgItem(IDC_BUTTON_KEYENCE_LASER_GET_DATA))->SetWindowTextW(_T("STOP")); + } + } + else + { + Show_LKH_Data(); + } + GetDlgItem(IDC_EDIT_TEST_KEYENCE_SETFOCUS)->SetFocus(); + +} + + +//================================================================================================ +void CKeyenceLKH_Dlg::OnBnClickedButtonScanKeyenceLkHLaser() +{ + // TODO: Add your control notification handler code here +} + + +//================================================================================================ +void CKeyenceLKH_Dlg::OnBnClickedButtonStopScanKeyenceLkHLaser() +{ + // TODO: Add your control notification handler code here +} + + +//================================================================================================ +void CKeyenceLKH_Dlg::OnBnClickedButtonTestKeyenceClearLog() +{ + m_edMSG.SetWindowText(_T("")); +} + +//================================================================================================ +void CKeyenceLKH_Dlg::OnBnClickedCheckContinueReadLaserValue() +{ + if (((CButton*)(GetDlgItem(IDC_CHECK_CONTINUE_READ_LASER_VALUE)))->GetCheck()==FALSE) + { + ((CButton*)GetDlgItem(IDC_BUTTON_KEYENCE_LASER_GET_DATA))->SetWindowTextW(_T("Get Data")); + KillTimer(1); + } + GetDlgItem(IDC_EDIT_TEST_KEYENCE_SETFOCUS)->SetFocus(); + +} + +//================================================================================================ +void CKeyenceLKH_Dlg::OnEnKillfocusEditTestLkGInterval() +{ + UpdateData(TRUE); + USES_CONVERSION; + CString csTmp; + (GetDlgItem(IDC_EDIT_TEST_LK_G_INTERVAL))->GetWindowText(csTmp); + const char* cTempValue=T2A(csTmp); + m_LK_H_Interval=atoi(cTempValue); + GetDlgItem(IDC_EDIT_TEST_KEYENCE_SETFOCUS)->SetFocus(); +} + +//================================================================================================ +BOOL CKeyenceLKH_Dlg::Get_LKH_Data(double& _dOUT1,double& _dOUT2) +{ + float fLaserVaule1(0.0),fLaserVaule2(0.0); + m_pKeyence_Laser_LK_H->Get_KeyenceLaserData(&fLaserVaule1,&fLaserVaule2); + _dOUT1=static_cast(fLaserVaule1); + _dOUT2=static_cast(fLaserVaule2); + return TRUE; + +} + +//================================================================================================ +void CKeyenceLKH_Dlg::Show_LKH_Data() +{ + CString csLaserValue; + double LaserVaule1(0.0),LaserVaule2(0.0); + Get_LKH_Data(LaserVaule1,LaserVaule2); + csLaserValue.Format(_T("%.4f"),LaserVaule1); + GetDlgItem(IDC_EDIT_LASER_VALUE1)->SetWindowText(csLaserValue); + csLaserValue.Format(_T("%.4f"),LaserVaule2); + GetDlgItem(IDC_EDIT_LASER_VALUE2)->SetWindowText(csLaserValue); +} + +//================================================================================================ +void CKeyenceLKH_Dlg::OnBnClickedCancel() +{ + + CDialog::OnCancel(); +} +//===================================================================================== +//Print message on edit control +void CKeyenceLKH_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 CKeyenceLKH_Dlg::OnTimer(UINT_PTR nIDEvent) +{ + switch(nIDEvent) + { + case 1:Show_LKH_Data(); + break; + } + CDialog::OnTimer(nIDEvent); +} + +//================================================================================================ +BOOL CKeyenceLKH_Dlg::PreTranslateMessage(MSG* pMsg) +{ + if(pMsg->message==WM_KEYDOWN) + { + if (pMsg->wParam==VK_SPACE) + { + OnBnClickedButtonKeyenceLaserGetData(); + } + else if(pMsg->wParam==VK_RETURN || pMsg->wParam==VK_ESCAPE) + { + return TRUE; + } + } + return CDialog::PreTranslateMessage(pMsg); +} \ No newline at end of file diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/KeyenceLKH_Dlg.h b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/KeyenceLKH_Dlg.h new file mode 100644 index 0000000..c0b8190 --- /dev/null +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/KeyenceLKH_Dlg.h @@ -0,0 +1,44 @@ +#pragma once + + +// CKeyenceLKH_Dlg dialog + +class CKeyenceLKH_Dlg : public CDialog +{ + DECLARE_DYNAMIC(CKeyenceLKH_Dlg) + +public: + CKeyenceLKH_Dlg(CWnd* pParent = NULL); // standard constructor + virtual ~CKeyenceLKH_Dlg(); + +// Dialog Data + enum { IDD = IDD_DIALOG_TEST_KEYENCE_LK_H }; + +protected: + virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual BOOL OnInitDialog(); + + DECLARE_MESSAGE_MAP() +private: + CEdit m_edMSG; + int m_LK_H_Interval; + BOOL m_LK_H_BTN_StartGetData; + + BOOL Get_LKH_Data(double& _dOUT1,double& _dOUT2); + void Show_LKH_Data(); + void OutputWithScroll(const CString &strNewText,CEdit &edtOutput); + +public: + afx_msg BOOL PreTranslateMessage(MSG* pMsg); + afx_msg void OnTimer(UINT_PTR nIDEvent); + + afx_msg void OnBnClickedButtonKeyenceLaserGetData(); + afx_msg void OnBnClickedButtonScanKeyenceLkHLaser(); + afx_msg void OnBnClickedButtonStopScanKeyenceLkHLaser(); + afx_msg void OnBnClickedButtonTestKeyenceClearLog(); + afx_msg void OnBnClickedCheckContinueReadLaserValue(); + afx_msg void OnEnKillfocusEditTestLkGInterval(); + + + afx_msg void OnBnClickedCancel(); +}; diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Keyence_UtilDlg.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Keyence_UtilDlg.cpp index 4b6f776..8ac8df5 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Keyence_UtilDlg.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Keyence_UtilDlg.cpp @@ -9,7 +9,7 @@ #include #include "..\..\..\Keyence\Keyence_Laser.h" #include "..\..\..\Keyence\Keyence_Laser_LK_H.h" -#include "..\..\..\Keyence\\Keyence_Proto.h" +#include "..\..\..\Keyence\Keyence_Proto.h" #include "..\..\..\SevenOcean\SO7_Proto.h" #include "Keyence_UtilDlg.h" diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc index 4bab68e..9068971 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc @@ -61,10 +61,10 @@ BEGIN 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 "Home XYZ",IDC_BUTTON_SO7_RESET_XYZ,274,140,76,14,BS_MULTILINE - PUSHBUTTON "Hoom Manual",IDC_BUTTON_MANUAL_HOME,274,157,76,14 - PUSHBUTTON "Home Worktable Left",IDC_BUTTON_RESET_WORKTABLE,274,174,76,14 - PUSHBUTTON "Home Worktable Right",IDC_BUTTON_RESET_WORKTABLE_RIGHT,274,191,76,14 + 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 + PUSHBUTTON "Home Worktable Right",IDC_BUTTON_RESET_WORKTABLE_RIGHT,277,173,76,14 PUSHBUTTON "Move\n To",IDC_BUTTON_MOVE_TO,359,142,32,27,BS_MULTILINE PUSHBUTTON "Auto Zoom",IDC_BUTTON_AUTO_ZOOM,359,177,32,27,BS_MULTILINE PUSHBUTTON "Set Reset Flag",IDC_BUTTON_SET_RESET_FLAG,27,235,61,14 @@ -155,6 +155,7 @@ BEGIN LTEXT "Addr",IDC_STATIC,287,351,16,8 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 END IDD_S07_UTIL_SEND_PARAMETER DIALOGEX 0, 0, 753, 481 @@ -384,10 +385,12 @@ BEGIN CONTROL "IP Camera",IDC_RADIO_SO7_IP_CAMERA,"Button",BS_AUTORADIOBUTTON,48,111,62,10 CONTROL "控制器（USB）",IDC_RADIO_CONTROLLER,"Button",BS_AUTORADIOBUTTON,175,39,69,10 CONTROL "控制器（RS232）",IDC_RADIO__SO7_RS232,"Button",BS_AUTORADIOBUTTON,175,57,77,10 - CONTROL "Keyence激光",IDC_RADIO_KEYENCE_LASER,"Button",BS_AUTORADIOBUTTON,175,75,76,10 + CONTROL "LK_G激光",IDC_RADIO_KEYENCE_LASER,"Button",BS_AUTORADIOBUTTON,175,75,76,10 + CONTROL "LK_H激光",IDC_RADIO_KEYENCE_LASER_LK_H,"Button",BS_AUTORADIOBUTTON,175,93,76,10 + CONTROL "LJ_G激光",IDC_RADIO_KEYENCE_LASER3,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE,175,111,76,10 CONTROL "Verifcation algorithm",IDC_RADIO_SO7_VERIFICATION_ALGORITHM, - "Button",BS_AUTORADIOBUTTON,175,93,81,10 - CONTROL "Image.dll",IDC_RADIO_TEST_IMAGE_DLL,"Button",BS_AUTORADIOBUTTON,175,111,45,10 + "Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE,48,138,81,10 + CONTROL "Image.dll",IDC_RADIO_TEST_IMAGE_DLL,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE,48,149,45,10 DEFPUSHBUTTON "OK",IDOK,181,145,50,14 PUSHBUTTON "Cancel",IDCANCEL,241,145,50,14 GROUPBOX "测试选项",IDC_STATIC,29,15,243,120 @@ -1968,7 +1971,7 @@ BEGIN CONTROL "Dump PRS",IDC_RADIO_DUMP_PRS,"Button",BS_AUTORADIOBUTTON,27,85,60,10 END -IDD_DIALOG_TEST_KEYENCE DIALOGEX 0, 0, 741, 349 +IDD_DIALOG_TEST_KEYENCE DIALOGEX 0, 0, 740, 353 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Keyence Utility" FONT 8, "MS Shell Dlg", 400, 0, 0x1 @@ -1989,14 +1992,14 @@ BEGIN PUSHBUTTON "Get Data",IDC_BUTTON_INIT_KEYENCE_LASER,576,28,90,65 PUSHBUTTON "Clear All",IDC_BUTTON_TEST_KEYENCE_CLEAR_LOG,687,161,37,20 PUSHBUTTON "Save as...",IDC_BUTTON_TEST_KEYENCE_SAVE_LOG,687,217,37,20 - PUSHBUTTON "Exit",IDCANCEL,684,328,50,14 + PUSHBUTTON "Exit",IDCANCEL,688,328,50,14 EDITTEXT IDC_EDIT_LASER_VALUE1,348,32,98,26,ES_CENTER | ES_AUTOHSCROLL EDITTEXT IDC_EDIT_LASER_VALUE2,348,66,98,26,ES_CENTER | ES_AUTOHSCROLL PUSHBUTTON "Begin Scan",IDC_BUTTON_SCAN_KEYENCE_LK_GLASER,27,298,50,14,NOT WS_VISIBLE PUSHBUTTON "Stop Scan",IDC_BUTTON_STOP_SCAN_KEYENCE_LK_GLASER,31,295,50,14,NOT WS_VISIBLE PUSHBUTTON "Get Data",IDC_BUTTON_GET_SCAN_DATA_KEYENCE_LK_GLASER,25,295,50,14,NOT WS_VISIBLE - GROUPBOX "LKIF.DLL",IDC_STATIC,12,11,722,313 - EDITTEXT IDC_EDIT_TEST_KEYENCE_MESSAGE,22,104,649,207,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL + GROUPBOX "LKIF.DLL",IDC_STATIC,16,11,722,313 + EDITTEXT IDC_EDIT_TEST_KEYENCE_MESSAGE,22,107,649,207,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL GROUPBOX "Program No. Setting",IDC_STATIC,19,20,276,78 LTEXT "Interval",IDC_STATIC,475,40,26,8 LTEXT "ms",IDC_STATIC,549,40,10,8 @@ -2046,6 +2049,30 @@ BEGIN PUSHBUTTON "Replay Startup",IDC_BUTTON_REPLAY_STARTUP,11,26,69,17 END +IDD_DIALOG_TEST_KEYENCE_LK_H DIALOGEX 0, 0, 512, 337 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Keyence Utility" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + EDITTEXT IDC_EDIT_TEST_LK_G_INTERVAL,227,39,40,14,ES_RIGHT | ES_AUTOHSCROLL + CONTROL "Continuous",IDC_CHECK_CONTINUE_READ_LASER_VALUE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,226,60,52,10 + PUSHBUTTON "Get Data",IDC_BUTTON_KEYENCE_LASER_GET_DATA,300,28,90,65 + PUSHBUTTON "Clear All",IDC_BUTTON_TEST_KEYENCE_CLEAR_LOG,457,182,37,20 + PUSHBUTTON "Exit",IDCANCEL,456,317,50,14 + EDITTEXT IDC_EDIT_LASER_VALUE1,72,31,98,26,ES_CENTER | ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_LASER_VALUE2,72,65,98,26,ES_CENTER | ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_TEST_KEYENCE_MESSAGE,26,113,423,177,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL + LTEXT "Interval",-1,199,39,26,8 + LTEXT "ms",-1,273,39,10,8 + GROUPBOX "Get Data",-1,195,22,95,74 + GROUPBOX "Readout",-1,26,20,163,76 + LTEXT "OUT1",-1,38,41,19,8 + LTEXT "OUT2",-1,37,70,19,8 + PUSHBUTTON "Stop Scan",IDC_BUTTON_STOP_SCAN_KEYENCE_LK_H_LASER,444,71,50,14,NOT WS_VISIBLE + PUSHBUTTON "Begin Scan",IDC_BUTTON_SCAN_KEYENCE_LK_H_LASER,444,35,50,14,NOT WS_VISIBLE + EDITTEXT IDC_EDIT_TEST_KEYENCE_SETFOCUS,7,317,40,14,ES_AUTOHSCROLL | NOT WS_VISIBLE +END + ///////////////////////////////////////////////////////////////////////////// // @@ -2154,9 +2181,9 @@ BEGIN IDD_DIALOG_TEST_KEYENCE, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 402 - TOPMARGIN, 7 - BOTTOMMARGIN, 207 + RIGHTMARGIN, 738 + TOPMARGIN, 11 + BOTTOMMARGIN, 349 END IDD_DIALOG_KEYENCE_DLG, DIALOG @@ -2166,6 +2193,14 @@ BEGIN TOPMARGIN, 7 BOTTOMMARGIN, 165 END + + IDD_DIALOG_TEST_KEYENCE_LK_H, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 506 + TOPMARGIN, 11 + BOTTOMMARGIN, 331 + END END #endif // APSTUDIO_INVOKED diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.cpp index 5a95d55..d4177cf 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.cpp @@ -240,6 +240,30 @@ BOOL CSO7_UtilDlg::OnInitDialog() GetDlgItem(IDC_EDIT_SO7_READ_IO_STATUS_ADDRESS)->SetWindowTextW(_T("4")); GetDlgItem(IDC_EDIT_RWDATA_DATA)->SetWindowTextW(_T("0")); + ((CComboBox *)GetDlgItem(IDC_COMBO_SO7_HOMEMODE))->ResetContent(); + int ComboIndex=0; + csTmp=_T("XYZ"); + ((CComboBox *)GetDlgItem(IDC_COMBO_SO7_HOMEMODE))->InsertString(ComboIndex,csTmp); + csTmp=_T("X"); + ComboIndex++; + ((CComboBox *)GetDlgItem(IDC_COMBO_SO7_HOMEMODE))->InsertString(ComboIndex,csTmp); + csTmp=_T("Y"); + ComboIndex++; + ((CComboBox *)GetDlgItem(IDC_COMBO_SO7_HOMEMODE))->InsertString(ComboIndex,csTmp); + csTmp=_T("Z"); + ComboIndex++; + ((CComboBox *)GetDlgItem(IDC_COMBO_SO7_HOMEMODE))->InsertString(ComboIndex,csTmp); + csTmp=_T("XY"); + ComboIndex++; + ((CComboBox *)GetDlgItem(IDC_COMBO_SO7_HOMEMODE))->InsertString(ComboIndex,csTmp); + csTmp=_T("XZ"); + ComboIndex++; + ((CComboBox *)GetDlgItem(IDC_COMBO_SO7_HOMEMODE))->InsertString(ComboIndex,csTmp); + csTmp=_T("YZ"); + ComboIndex++; + ((CComboBox *)GetDlgItem(IDC_COMBO_SO7_HOMEMODE))->InsertString(ComboIndex,csTmp); + ((CComboBox *)GetDlgItem(IDC_COMBO_SO7_HOMEMODE))->SetCurSel(0); + CString csPath; m_pSO7_Proto->GetAppPath(csPath); m_pSO7_Proto->Load_SevenOcean_Inifile(csPath+_T("\\Utility_Config.ini")); @@ -774,8 +798,46 @@ void CSO7_UtilDlg::OnEnKillfocusEditLightSwitch() void CSO7_UtilDlg::OnBnClickedButtonResetWorktable() { - - m_pSO7_Proto->so7_motion_reset_worktable_lower_left(); + int iSel=((CComboBox *)GetDlgItem(IDC_COMBO_SO7_HOMEMODE))->GetCurSel(); + switch(iSel) + { + case 0: + { + m_HomeMode=CT_HOME_XYZ; + break; + } + case 1: + { + m_HomeMode=CT_HOME_X; + break; + } + case 2: + { + m_HomeMode=CT_HOME_Y; + break; + } + case 3: + { + m_HomeMode=CT_HOME_Z; + break; + } + case 4: + { + m_HomeMode=CT_HOME_XY; + break; + } + case 5: + { + m_HomeMode=CT_HOME_XZ; + break; + } + case 6: + { + m_HomeMode=CT_HOME_YZ; + break; + } + } + m_pSO7_Proto->so7_motion_reset_worktable_lower_left(m_HomeMode); } diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.h b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.h index ce0ec4d..f50c62a 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.h @@ -57,7 +57,7 @@ public: long m_ZsignalPosX; long m_ZsignalPosY; long m_ZsignalPosZ; - + char m_HomeMode; void UpdateIOStatus(); void TestZSignal(); void OutputWithScroll(const CString &strNewText,CEdit &edtOutput); diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Option.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Option.cpp index f543444..c7add88 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Option.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Option.cpp @@ -28,6 +28,7 @@ #include "..\..\..\Keyence\Keyence_Laser_LK_H.h" #include "..\..\..\Keyence\\Keyence_Proto.h" #include "Keyence_UtilDlg.h" +#include "KeyenceLKH_Dlg.h" #include "..\..\..\SevenOcean\dll.h" #include "..\..\..\SevenOcean\So7_Interface.h" @@ -174,7 +175,27 @@ void CSo7_Option::OnBnClickedOk() delete m_pEF8000_Interface; m_pEF8000_Interface=NULL; } - } + } + else if(((CButton *)GetDlgItem(IDC_RADIO_KEYENCE_LASER_LK_H))->GetCheck()) + { + if (!m_pSO7_Proto) + { + m_pSO7_Proto = new CSO7_Proto(); + } + if (!m_pKeyence_Laser_LK_H) + { + m_pKeyence_Laser_LK_H=new CKeyence_Laser_LK_H(); + } + + CKeyenceLKH_Dlg* pKeyence_LKHDlg=new CKeyenceLKH_Dlg(); + pKeyence_LKHDlg->DoModal(); + delete pKeyence_LKHDlg; + + delete m_pKeyence_Laser_LK_H; + m_pKeyence_Laser_LK_H=NULL; + delete m_pSO7_Proto; + m_pSO7_Proto=NULL; + } else if(((CButton *)GetDlgItem(IDC_RADIO_KEYENCE_LASER))->GetCheck()) { if (!m_pSO7_Proto) @@ -189,10 +210,6 @@ void CSo7_Option::OnBnClickedOk() { m_pKeyence_Laser = new CKeyence_Laser(); } - if (!m_pKeyence_Laser_LK_H) - { - m_pKeyence_Laser_LK_H=new CKeyence_Laser_LK_H(); - } CKeyence_UtilDlg* pKeyence_UtilDlg=new CKeyence_UtilDlg(); pKeyence_UtilDlg->DoModal(); @@ -200,8 +217,6 @@ void CSo7_Option::OnBnClickedOk() delete m_pKeyence_Laser; m_pKeyence_Laser=NULL; - delete m_pKeyence_Laser_LK_H; - m_pKeyence_Laser_LK_H=NULL; delete m_pKeyence_Proto; m_pKeyence_Proto=NULL; delete m_pSO7_Proto; diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj index 746be7e..49cd387 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj @@ -135,6 +135,7 @@ Level4 EditAndContinue true + $(IntDir)vc$(ProjectName).pdb _DEBUG;%(PreprocessorDefinitions) @@ -326,6 +327,7 @@ + @@ -397,6 +399,7 @@ + diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj.filters b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj.filters index 03e9427..22cd7b7 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj.filters +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj.filters @@ -166,6 +166,9 @@ Sources Files + + Sources Files + @@ -366,6 +369,9 @@ Header Files + + Header Files + diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h index 31cc045..46af8f2 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h @@ -686,6 +686,7 @@ #define IDC_RADIO_KEYENCE_LASER 1589 #define IDC_BUTTON_GET_SCAN_DATA_KEYENCE_LK_GLASER 1590 #define IDC_EDIT_TEST_KEYENCE_MESSAGE 1591 +#define IDC_RADIO_KEYENCE_LASER3 1591 #define IDC_RADIO_MACHINE_KEYENCE_TM3000 1592 #define IDC_BUTTON_GET_SCAN_DATA_KEYENCE_LK_HLASER 1593 #define IDC_RADIO_KEYENCE_LASER_LK_H 1594 @@ -811,6 +812,7 @@ #define IDD_SO7_UTIL_MANUAL_MACHINE 1716 #define IDC_BUTTON_READ_PROGRAM 1717 #define IDD_SO7_VIDEOCARD_TC4000 1718 +#define IDD_DIALOG_TEST_KEYENCE_LK_H 1719 #define IDC_RADIO_SPEED_SLOW 1770 #define IDC_RADIO_SCALE 1772 #define IDC_EDIT_SPEED_X 1773 @@ -842,6 +844,11 @@ #define IDC_EDIT4 1797 #define IDC_EDIT_MOTION_SPEEDZ 1797 #define IDC_EDIT_MOTION_SPEEDX 1798 +#define IDC_BUTTON_SCAN_KEYENCE_LK_H_LASER 1799 +#define IDC_BUTTON_STOP_SCAN_KEYENCE_LK_H_LASER 1800 +#define IDC_BUTTON_KEYENCE_LASER_GET_DATA 1801 +#define IDC_COMBO1 1802 +#define IDC_COMBO_SO7_HOMEMODE 1802 // Next default values for new objects // @@ -849,7 +856,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 188 #define _APS_NEXT_COMMAND_VALUE 32771 -#define _APS_NEXT_CONTROL_VALUE 1799 +#define _APS_NEXT_CONTROL_VALUE 1803 #define _APS_NEXT_SYMED_VALUE 104 #endif #endif diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo index ac0c4bc..9f5aea1 100644 Binary files a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo and b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo differ