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 3902d58..417c1c2 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log @@ -4642,3 +4642,14 @@ Usb Port Initialized. Usb Port Initialized. Usb Port Initialized. Usb Port Initialized. +Usb Port Initialized. +Usb Port Initialized. +Usb Port Initialized. +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 3a7624a..7d8a251 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 @@ -1598,7 +1598,7 @@ void CSO7_UtilDlg::OnBnClickedButtonSo7TrigpulseWritePara() { UpdateData(TRUE); USES_CONVERSION; - short TrigDis[2]={0}; + short TrigDis[20]={0}; char ActiveAxis(E_AXIS_X); char TrigMode(E_DIS_TRIG_PULSE_EQDIS); short StartIndex(0); @@ -1627,7 +1627,11 @@ void CSO7_UtilDlg::OnBnClickedButtonSo7TrigpulseWritePara() if (((CButton *)GetDlgItem(IDC_RADIO_SO7_TRIGPULSE_SPECLOCATION))->GetCheck()) { TrigMode=E_DIS_TRIG_PULSE_SPEC_LOCA; - ParaNumber=2; + ParaNumber=20; + for (int i=2;i(TrigDis[1]+(i-1)*10); + } } else { @@ -1644,8 +1648,8 @@ void CSO7_UtilDlg::OnBnClickedButtonSo7TrigpulseReadPara() { UpdateData(TRUE); USES_CONVERSION; - short GetIndex(256); - m_pSO7_Proto->_send_cmd_SO7_CMD_READ_TRIG_PULSE_PARA(GetIndex); + short sGetIndex(0); + m_pSO7_Proto->_send_cmd_SO7_CMD_READ_TRIG_PULSE_PARA(sGetIndex); m_OutMessage.Format(_T("[Read Trig Para]:R Axis=%d,Method=%d,TotalNo=%d,CurIndex=%d,Para[%d]=%d."),m_pSO7_Proto->g_machine.TrigPara.TrigPulseActiveAxis, m_pSO7_Proto->g_machine.TrigPara.TrigPulseMethod,m_pSO7_Proto->g_machine.TrigPara.TrigTotalNo, 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 a7ae338..6694fb8 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