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 187d3d1..2685430 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