From d64816b2865ad47bd068f383653f54af1062213f Mon Sep 17 00:00:00 2001 From: TAO Cheng Date: Mon, 21 Jul 2014 16:29:29 +0800 Subject: [PATCH] RWData Test --- .../Tools/UsbUtility/Debug/UtilityDebug.Log | 4 + .../Tools/UsbUtility/UsbUtil/SO7_UtilDlg.cpp | 79 +++++++----------- .../Tools/UsbUtility/UsbUtil/SO7_UtilDlg.h | 6 ++ .../Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo | Bin 150016 -> 150016 bytes 4 files changed, 40 insertions(+), 49 deletions(-) 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 ca6a738..a8ca501 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log @@ -4746,3 +4746,7 @@ Usb Port Initialized. Usb Port Initialized. Usb Port Initialized. Usb Port Initialized. +Usb Port Initialized. +Usb Port Initialized. +Usb Port Initialized. +Usb Port Initialized. 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 c94caaf..cd69592 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 @@ -140,6 +140,10 @@ BEGIN_MESSAGE_MAP(CSO7_UtilDlg, CDialog) 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) + ON_BN_CLICKED(IDC_RADIO_SELECT_X, &CSO7_UtilDlg::OnBnClickedRadioSelectX) + ON_BN_CLICKED(IDC_RADIO_SELECT_Y, &CSO7_UtilDlg::OnBnClickedRadioSelectY) + ON_BN_CLICKED(IDC_RADIO_SELECT_Z, &CSO7_UtilDlg::OnBnClickedRadioSelectZ) + ON_CBN_SELCHANGE(IDC_COMBO_RWDATA_ADDR, &CSO7_UtilDlg::OnCbnSelchangeComboRwdataAddr) END_MESSAGE_MAP() @@ -180,7 +184,7 @@ BOOL CSO7_UtilDlg::OnInitDialog() ((CButton *)GetDlgItem(IDC_RADIO_SELECT_X))->SetCheck(true); ((CButton *)GetDlgItem(IDC_RADIO_SELECT_Y))->SetCheck(false); ((CButton *)GetDlgItem(IDC_RADIO_SELECT_Z))->SetCheck(false); - + m_RWDataAxis=2; ((CButton *)GetDlgItem(IDC_RADIO_READ_LIMIT_SWITCH))->SetCheck(true); ((CButton *)GetDlgItem(IDC_RADIO_READ_INPUT_PORT))->SetCheck(false); ((CButton *)GetDlgItem(IDC_RADIO_READ_OUTPUT_PORT))->SetCheck(false); @@ -1165,6 +1169,26 @@ void CSO7_UtilDlg::TestZSignal() } //================================================================================================ +void CSO7_UtilDlg::OnBnClickedRadioSelectX() +{ + m_RWDataAxis=2; +} +//================================================================================================ +void CSO7_UtilDlg::OnBnClickedRadioSelectY() +{ + m_RWDataAxis=1; +} +//================================================================================================ +void CSO7_UtilDlg::OnBnClickedRadioSelectZ() +{ + m_RWDataAxis=3; +} +//================================================================================================ +void CSO7_UtilDlg::OnCbnSelchangeComboRwdataAddr() +{ + m_RWDataAddr=static_cast(((CComboBox *)GetDlgItem(IDC_COMBO_RWDATA_ADDR))->GetCurSel()); +} +//================================================================================================ void CSO7_UtilDlg::OnBnClickedButtonSo7Senddatatofpga() { UpdateData(TRUE); @@ -1172,27 +1196,8 @@ void CSO7_UtilDlg::OnBnClickedButtonSo7Senddatatofpga() CString str; GetDlgItem(IDC_EDIT_RWDATA_DATA)->GetWindowText(str); const char* cTempValue=T2A(str); - char cTmpData= static_cast(atoi(cTempValue)); - char cAxis(0); - if (((CButton *)GetDlgItem(IDC_RADIO_SELECT_X))->GetCheck()) - { - cAxis=2; - } - else if (((CButton *)GetDlgItem(IDC_RADIO_SELECT_Y))->GetCheck()) - { - cAxis=1; - } - else if (((CButton *)GetDlgItem(IDC_RADIO_SELECT_Z))->GetCheck()) - { - cAxis=3; - } - else - { - cAxis=0; - } - char cAddr(0); - cAddr=static_cast(((CComboBox *)GetDlgItem(IDC_COMBO_RWDATA_ADDR))->GetCurSel()); - m_pSO7_Proto->_send_cmd_SO7_CMD_WRITE_DATA_TO_FPGA(cAxis,cAddr,cTmpData); + char cTmpData= static_cast(atoi(cTempValue)); + m_pSO7_Proto->_send_cmd_SO7_CMD_WRITE_DATA_TO_FPGA(m_RWDataAxis,m_RWDataAddr,cTmpData); if (m_pSO7_Proto->g_machine.FPGAData>0) { m_OutMessage=_T("Write data successful."); @@ -1208,33 +1213,7 @@ void CSO7_UtilDlg::OnBnClickedButtonSo7Senddatatofpga() //================================================================================================ void CSO7_UtilDlg::OnBnClickedButtonSo7Readdatafromfpga() { - UpdateData(TRUE); - USES_CONVERSION; - CString str; - GetDlgItem(IDC_EDIT_RWDATA_DATA)->GetWindowText(str); - const char* cTempValue=T2A(str); - char cTmpData(0); - cTmpData= static_cast(atoi(cTempValue)); - char cAxis(0); - if (((CButton *)GetDlgItem(IDC_RADIO_SELECT_X))->GetCheck()) - { - cAxis=2; - } - else if (((CButton *)GetDlgItem(IDC_RADIO_SELECT_Y))->GetCheck()) - { - cAxis=1; - } - else if (((CButton *)GetDlgItem(IDC_RADIO_SELECT_Z))->GetCheck()) - { - cAxis=3; - } - else - { - cAxis=0; - } - char cAddr(0); - cAddr=static_cast(((CComboBox *)GetDlgItem(IDC_COMBO_RWDATA_ADDR))->GetCurSel()); - m_pSO7_Proto->_send_cmd_SO7_CMD_READ_DATA_FROM_FPGA(cAxis,cAddr); + m_pSO7_Proto->_send_cmd_SO7_CMD_READ_DATA_FROM_FPGA(m_RWDataAxis,m_RWDataAddr); m_OutMessage.Format(_T("[Read]Data=%d ."),(BYTE)m_pSO7_Proto->g_machine.FPGAData); OutputWithScroll(m_OutMessage,m_edMSG); } @@ -1421,6 +1400,7 @@ void CSO7_UtilDlg::OnTimer(UINT_PTR nIDEvent) { if (m_BeginReadIO) { + //OnBnClickedButtonSo7Readdatafromfpga(); UpdateIOStatus(); } if (m_TestZSignalNow) @@ -1570,3 +1550,4 @@ void CSO7_UtilDlg::OnBnClickedButtonSo7ExternalTrig() pSo7_Util_External_Trig=NULL; SetTimer(1,m_ReadAxisIntervalTime,NULL); } + 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 0c3ef34..2f735bd 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 @@ -55,6 +55,8 @@ public: CProcessButton m_Button_MoveXLYF; CProcessButton m_Button_MoveXRYB; CProcessButton m_Button_MoveXLYB; + char m_RWDataAxis; + char m_RWDataAddr; char m_ReadIOStatusAddr; char m_SetIOStatusAddr; BOOL m_BeginReadIO; @@ -131,4 +133,8 @@ public: afx_msg void OnBnClickedButtonSetScaleCoefficient(); afx_msg void OnBnClickedButtonS07SetIoPurpose(); afx_msg void OnBnClickedButtonSo7ExternalTrig(); + afx_msg void OnBnClickedRadioSelectX(); + afx_msg void OnBnClickedRadioSelectY(); + afx_msg void OnBnClickedRadioSelectZ(); + afx_msg void OnCbnSelchangeComboRwdataAddr(); }; 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 187d3d1d9cd9443fc81f313f2ab0fcdd50d8339b..2685430374648cf53310cd200c84cc68ed39c9bf 100644 GIT binary patch delta 2826 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