From 61a49df5ee147559550f22abf9b2cb481209dc2f Mon Sep 17 00:00:00 2001 From: TAO Cheng Date: Wed, 26 Jun 2013 17:53:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9RS232=E9=80=9A=E4=BF=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Interfac/Msi/Hsi/SevenOcean/CMMIO_BASE.H | 2 +- .../Msi/Hsi/SevenOcean/CMMIO_SERIAL.CPP | 32 ++------ .../Msi/Hsi/SevenOcean/CMMIO_SERIAL.H | 6 +- .../Tools/UsbUtility/Debug/UtilityDebug.Log | 20 +++++ .../UsbUtility/UsbUtil/SO7_Automatic_Zoom.cpp | 57 ++++++++------- .../UsbUtility/UsbUtil/Setup_so7config.cpp | 47 ++++++------ .../UsbUtility/UsbUtil/So7_Manual_Machine.cpp | 69 ++++++++---------- .../Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo | Bin 2355712 -> 2355712 bytes 8 files changed, 112 insertions(+), 121 deletions(-) diff --git a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/CMMIO_BASE.H b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/CMMIO_BASE.H index 43078f7..f0a9124 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/CMMIO_BASE.H +++ b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/CMMIO_BASE.H @@ -6,7 +6,7 @@ #define MAX_OUTPUT_BUFFER_SIZE 2048 -#define MAX_RECIEVE_BUFFER_SIZE 16000 +#define MAX_RECIEVE_BUFFER_SIZE 30000 // TCP, serial style routines struct SerialList diff --git a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/CMMIO_SERIAL.CPP b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/CMMIO_SERIAL.CPP index 9d72f5a..a10b71e 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/CMMIO_SERIAL.CPP +++ b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/CMMIO_SERIAL.CPP @@ -55,9 +55,7 @@ CPSerial::CPSerial() m_RXTimeout = CS_DEFAULT_RX_TIMEOUT; m_TXTimeout = CS_DEFAULT_TX_TIMEOUT; m_iRecvState=FALSE; - m_csRecv=_T(""); - m_iRecvByte=0; - m_iReadDataNum=255; + m_iRecvBytes=0; // Everything else set to NULL m_ThreadHandle = NULL; //m_TXHead = NULL; @@ -482,33 +480,19 @@ void CPSerial::ReceiveTask( void ) void CPSerial::OnReceive() { // Dummy OnReceieve if not used - char s[255]={0}; + char s[MAX_RECIEVE_BUFFER_SIZE]={0}; - CStringA csTemp; s[1]='\0'; CurrentPointer = 0; int num=0; + num = ReadPort(s, MAX_RECIEVE_BUFFER_SIZE); - num = ReadPort(s, m_iReadDataNum); - //for (int i=0;i0) { - for (int i=0;i<255;i++) - { - m_RecvData[i]=0; - } - for (int i=0;im_iRecvState) { - if(m_pSO7_PCDSerial->m_csRecv==_T("")) + if(m_pSO7_PCDSerial->m_RecvData[0]==0) Sleep(50); - USES_CONVERSION; - char *cRecvData= NULL; char *token = NULL; char cTemp[20]={0}; - cRecvData=T2A(m_pSO7_PCDSerial->m_csRecv); char seps[] = "$AD:"; - token = strtok(cRecvData,seps); + token = strtok(m_pSO7_PCDSerial->m_RecvData,seps); if (token) { memcpy(cTemp,token,8); @@ -566,8 +563,7 @@ double CSO7_Automatic_Zoom::ReadZoomAngle() dZoomAngle=-1; }; token=NULL; - cRecvData=NULL; - m_pSO7_PCDSerial->m_csRecv=_T(""); + m_pSO7_PCDSerial->m_iRecvState=FALSE; return dZoomAngle; @@ -585,10 +581,11 @@ BOOL CSO7_Automatic_Zoom::CalibrateEncoder() char sendDataII[6]={'S','C',':','1',13,10}; char sendDataIII[6]={'R','F',':','1',13,10}; CString csRightRecv; + CStringA m_csRecv(""); csRightRecv.Format(_T("@OK\r\n")); INT iRetrys(0); DWORD iWriteByte(0); - m_pSO7_PCDSerial->m_csRecv=_T(""); + m_pSO7_PCDSerial->m_iRecvState=FALSE; //Phase I @@ -601,12 +598,13 @@ BOOL CSO7_Automatic_Zoom::CalibrateEncoder() if (m_pSO7_PCDSerial->m_iRecvState) { - if(m_pSO7_PCDSerial->m_csRecv==_T("")) + if(m_pSO7_PCDSerial->m_RecvData[0]==0) Sleep(100); - if(m_pSO7_PCDSerial->m_csRecv==csRightRecv) + m_csRecv.Format(("%s"),m_pSO7_PCDSerial->m_RecvData); + if((CString)m_csRecv==csRightRecv) { - m_pSO7_PCDSerial->m_csRecv=_T(""); + m_pSO7_PCDSerial->m_iRecvState=FALSE; iRetrys=0; iWriteByte=0; @@ -620,12 +618,13 @@ BOOL CSO7_Automatic_Zoom::CalibrateEncoder() } if(m_pSO7_PCDSerial->m_iRecvState) { - if(m_pSO7_PCDSerial->m_csRecv==_T("")) + if(m_pSO7_PCDSerial->m_RecvData[0]==0) Sleep(100); - if(m_pSO7_PCDSerial->m_csRecv==csRightRecv) + m_csRecv.Format(("%s"),m_pSO7_PCDSerial->m_RecvData); + if((CString)m_csRecv==csRightRecv) { - m_pSO7_PCDSerial->m_csRecv=_T(""); + m_pSO7_PCDSerial->m_iRecvState=FALSE; iRetrys=0; iWriteByte=0; @@ -639,12 +638,13 @@ BOOL CSO7_Automatic_Zoom::CalibrateEncoder() } if(m_pSO7_PCDSerial->m_iRecvState) { - if(m_pSO7_PCDSerial->m_csRecv==_T("")) + if(m_pSO7_PCDSerial->m_RecvData[0]==0) Sleep(100); - if(m_pSO7_PCDSerial->m_csRecv==csRightRecv) + m_csRecv.Format(("%s"),m_pSO7_PCDSerial->m_RecvData); + if((CString)m_csRecv==csRightRecv) { - m_pSO7_PCDSerial->m_csRecv=_T(""); + m_pSO7_PCDSerial->m_iRecvState=FALSE; iRetrys=0; iWriteByte=0; @@ -652,7 +652,7 @@ BOOL CSO7_Automatic_Zoom::CalibrateEncoder() } else { - m_pSO7_PCDSerial->m_csRecv=_T(""); + m_pSO7_PCDSerial->m_iRecvState=FALSE; return FALSE; } @@ -664,7 +664,7 @@ BOOL CSO7_Automatic_Zoom::CalibrateEncoder() } else { - m_pSO7_PCDSerial->m_csRecv=_T(""); + m_pSO7_PCDSerial->m_iRecvState=FALSE; return FALSE; } @@ -677,7 +677,7 @@ BOOL CSO7_Automatic_Zoom::CalibrateEncoder() } else { - m_pSO7_PCDSerial->m_csRecv=_T(""); + m_pSO7_PCDSerial->m_iRecvState=FALSE; return FALSE; } @@ -749,7 +749,7 @@ void CSO7_Automatic_Zoom::OnBnClickedButtonSendData() UpdateData(TRUE); CString csSendData(""); GetDlgItem(IDC_EDIT_DATASEND)->GetWindowText(csSendData); - m_pSO7_PCDSerial->m_csRecv=_T(""); + USES_CONVERSION; //加上回车换行符 CString csTemp; @@ -766,6 +766,7 @@ void CSO7_Automatic_Zoom::OnBnClickedButtonSendData() csSendData.Format(_T("Send(%dByte)"),iWriteByte); m_StatusBar.SetText(csSendData, 1, 0); //接受数据 + CStringA m_csRecv(""); INT iRetrys(0); while(!m_pSO7_PCDSerial->m_iRecvState && iRetrys<20) { @@ -774,7 +775,7 @@ void CSO7_Automatic_Zoom::OnBnClickedButtonSendData() } if (m_pSO7_PCDSerial->m_iRecvState) { - if(m_pSO7_PCDSerial->m_csRecv==_T("")) + if(m_pSO7_PCDSerial->m_RecvData[0]==0) { m_pSO7_PCDSerial->m_iRecvState=FALSE; INT iRetrys2(0); @@ -783,16 +784,16 @@ void CSO7_Automatic_Zoom::OnBnClickedButtonSendData() iRetrys2++; Sleep(100); } - ((CListBox *)GetDlgItem(IDC_LIST_SHOWMESSAGE))->InsertString(-1,CString(_T("[Recv]: "))+m_pSO7_PCDSerial->m_csRecv); - m_pSO7_PCDSerial->m_csRecv=_T(""); - csSendData.Format(_T("Recv(%dByte)"),m_pSO7_PCDSerial->m_iRecvByte); + m_csRecv.Format(("%s"),m_pSO7_PCDSerial->m_RecvData); + ((CListBox *)GetDlgItem(IDC_LIST_SHOWMESSAGE))->InsertString(-1,CString(_T("[Recv]: "))+(CString)m_csRecv); + csSendData.Format(_T("Recv(%dByte)"),m_pSO7_PCDSerial->m_iRecvBytes); m_StatusBar.SetText(csSendData, 2, 0); } else { - ((CListBox *)GetDlgItem(IDC_LIST_SHOWMESSAGE))->InsertString(-1,CString(_T("[Recv]: "))+m_pSO7_PCDSerial->m_csRecv); - m_pSO7_PCDSerial->m_csRecv=_T(""); - csSendData.Format(_T("Recv(%dByte)"),m_pSO7_PCDSerial->m_iRecvByte); + m_csRecv.Format(("%s"),m_pSO7_PCDSerial->m_RecvData); + ((CListBox *)GetDlgItem(IDC_LIST_SHOWMESSAGE))->InsertString(-1,CString(_T("[Recv]: "))+(CString)m_csRecv); + csSendData.Format(_T("Recv(%dByte)"),m_pSO7_PCDSerial->m_iRecvBytes); m_StatusBar.SetText(csSendData, 2, 0); } diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Setup_so7config.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Setup_so7config.cpp index 12c3f97..aff7d82 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Setup_so7config.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Setup_so7config.cpp @@ -399,18 +399,15 @@ double CSetup_so7config::ReadZoomAngle() } if (m_pSO7_PCDSerial->m_iRecvState) { - if(m_pSO7_PCDSerial->m_csRecv==_T("")) + if(m_pSO7_PCDSerial->m_RecvData[0]==0) Sleep(40);//200 - char *cRecvData= NULL; char *token = NULL; char cTemp[20]={0}; - USES_CONVERSION; - cRecvData=T2A(m_pSO7_PCDSerial->m_csRecv); char seps[] = "$AD:"; - token = strtok(cRecvData,seps); + token = strtok(m_pSO7_PCDSerial->m_RecvData,seps); if (token) { memcpy(cTemp,token,8); @@ -418,8 +415,6 @@ double CSetup_so7config::ReadZoomAngle() dZoomAngle=dZoomAngle*180/PI; }; token=NULL; - cRecvData=NULL; - m_pSO7_PCDSerial->m_csRecv=_T(""); m_pSO7_PCDSerial->m_iRecvState=FALSE; _bReading=false; return dZoomAngle; @@ -482,9 +477,10 @@ BOOL CSetup_so7config::CalibrateEncoder() char sendDataIII[6]={'R','F',':','1',13,10}; CString csRightRecv; csRightRecv.Format(_T("@OK\r\n")); + CStringA m_csRecv(""); INT iRetrys(0); DWORD iWriteByte(0); - m_pSO7_PCDSerial->m_csRecv=_T(""); + m_pSO7_PCDSerial->m_iRecvState=FALSE; //Phase I @@ -497,12 +493,12 @@ BOOL CSetup_so7config::CalibrateEncoder() if (m_pSO7_PCDSerial->m_iRecvState) { - if(m_pSO7_PCDSerial->m_csRecv==_T("")) + if(m_pSO7_PCDSerial->m_RecvData[0]==0) Sleep(100); - - if(m_pSO7_PCDSerial->m_csRecv==csRightRecv) + m_csRecv.Format(("%s"),m_pSO7_PCDSerial->m_RecvData); + if((CString)m_csRecv==csRightRecv) { - m_pSO7_PCDSerial->m_csRecv=_T(""); + m_pSO7_PCDSerial->m_iRecvState=FALSE; iRetrys=0; iWriteByte=0; @@ -512,16 +508,16 @@ BOOL CSetup_so7config::CalibrateEncoder() while(!m_pSO7_PCDSerial->m_iRecvState && iRetrys<20 && iWriteByte==6) { iRetrys++; - Sleep(50); + Sleep(100); } if(m_pSO7_PCDSerial->m_iRecvState) { - if(m_pSO7_PCDSerial->m_csRecv==_T("")) + if(m_pSO7_PCDSerial->m_RecvData[0]==0) Sleep(100); - if(m_pSO7_PCDSerial->m_csRecv==csRightRecv) - { - m_pSO7_PCDSerial->m_csRecv=_T(""); + m_csRecv.Format(("%s"),m_pSO7_PCDSerial->m_RecvData); + if((CString)m_csRecv==csRightRecv) + { m_pSO7_PCDSerial->m_iRecvState=FALSE; iRetrys=0; iWriteByte=0; @@ -531,24 +527,23 @@ BOOL CSetup_so7config::CalibrateEncoder() while(!m_pSO7_PCDSerial->m_iRecvState && iRetrys<20 && iWriteByte==6) { iRetrys++; - Sleep(50); + Sleep(100); } if(m_pSO7_PCDSerial->m_iRecvState) { - if(m_pSO7_PCDSerial->m_csRecv==_T("")) + if(m_pSO7_PCDSerial->m_RecvData[0]==0) Sleep(100); - if(m_pSO7_PCDSerial->m_csRecv==csRightRecv) - { - m_pSO7_PCDSerial->m_csRecv=_T(""); + m_csRecv.Format(("%s"),m_pSO7_PCDSerial->m_RecvData); + if((CString)m_csRecv==csRightRecv) + { m_pSO7_PCDSerial->m_iRecvState=FALSE; iRetrys=0; iWriteByte=0; return TRUE; } else - { - m_pSO7_PCDSerial->m_csRecv=_T(""); + { m_pSO7_PCDSerial->m_iRecvState=FALSE; return FALSE; } @@ -560,7 +555,7 @@ BOOL CSetup_so7config::CalibrateEncoder() } else { - m_pSO7_PCDSerial->m_csRecv=_T(""); + m_pSO7_PCDSerial->m_iRecvState=FALSE; return FALSE; } @@ -573,7 +568,7 @@ BOOL CSetup_so7config::CalibrateEncoder() } else { - m_pSO7_PCDSerial->m_csRecv=_T(""); + m_pSO7_PCDSerial->m_iRecvState=FALSE; return FALSE; } diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Manual_Machine.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Manual_Machine.cpp index 9d88bab..8e015d0 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Manual_Machine.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Manual_Machine.cpp @@ -202,8 +202,7 @@ void CSo7_Manual_Machine::OnBnClickedButtonSo7ManualMachineSendData() DWORD iSendDataLength(0); DWORD iWriteByte(0); - m_pSO7_PCDSerial->m_iReadDataNum=255; - m_pSO7_PCDSerial->m_csRecv=_T(""); + if (m_SendType==HEXADECIMAL) { char* stop; @@ -239,7 +238,7 @@ void CSo7_Manual_Machine::OnBnClickedButtonSo7ManualMachineSendData() } if (m_pSO7_PCDSerial->m_iRecvState) { - if(m_pSO7_PCDSerial->m_csRecv==_T("")) + if(m_pSO7_PCDSerial->m_RecvData[0]==0) { m_pSO7_PCDSerial->m_iRecvState=FALSE; INT iRetrys2(0); @@ -249,28 +248,28 @@ void CSo7_Manual_Machine::OnBnClickedButtonSo7ManualMachineSendData() Sleep(100); } m_OutMessage=_T("[Recv]"); - for (INT i=0;im_iRecvByte;i++) + for (INT i=0;im_iRecvBytes;i++) { csTemp.Format(_T("%X "),(BYTE)m_pSO7_PCDSerial->m_RecvData[i]); m_OutMessage+=csTemp; } OutputWithScroll(m_OutMessage,m_edMSG); - m_OutMessage.Format(_T("Recv(%dByte)"),m_pSO7_PCDSerial->m_iRecvByte); + m_OutMessage.Format(_T("Recv(%dByte)"),m_pSO7_PCDSerial->m_iRecvBytes); m_StatusBar.SetText(m_OutMessage, 2, 0); } else { m_OutMessage=_T("[Recv]"); - for (INT i=0;im_iRecvByte;i++) + for (INT i=0;im_iRecvBytes;i++) { csTemp.Format(_T("%X "),(BYTE)m_pSO7_PCDSerial->m_RecvData[i]); m_OutMessage+=csTemp; } OutputWithScroll(m_OutMessage,m_edMSG); - m_OutMessage.Format(_T("Recv(%dByte)"),m_pSO7_PCDSerial->m_iRecvByte); + m_OutMessage.Format(_T("Recv(%dByte)"),m_pSO7_PCDSerial->m_iRecvBytes); m_StatusBar.SetText(m_OutMessage, 2, 0); } - m_pSO7_PCDSerial->m_csRecv=_T(""); + m_pSO7_PCDSerial->m_iRecvState=FALSE; } else @@ -283,7 +282,6 @@ void CSo7_Manual_Machine::OnBnClickedCheckSo7ManualMachineReadPosContinue() { if (!((CButton*)(GetDlgItem(IDC_CHECK_SO7_MANUAL_MACHINE_READ_POS_CONTINUE)))->GetCheck()) { - m_pSO7_PCDSerial->m_iReadDataNum=255; KillTimer(1); } } @@ -296,7 +294,6 @@ void CSo7_Manual_Machine::OnBnClickedButtonSo7ManualMachinereadPos() UpdatePosDisplay(); if (((CButton*)(GetDlgItem(IDC_CHECK_SO7_MANUAL_MACHINE_READ_POS_CONTINUE)))->GetCheck()) { - m_pSO7_PCDSerial->m_iReadDataNum=255; SetTimer(1,200,NULL); } else @@ -309,8 +306,7 @@ BOOL CSo7_Manual_Machine::_Send_Common_CMD(const char* _SendData,DWORD _SendDa { BOOL rStatus(FALSE); DWORD iWriteByte(0); - m_pSO7_PCDSerial->m_csRecv=_T(""); - m_pSO7_PCDSerial->m_iReadDataNum=255; + iWriteByte=m_pSO7_PCDSerial->Send(_SendData,_SendDataLength); m_OutMessage.Format(_T("Send(%dByte)"),iWriteByte); m_StatusBar.SetText(m_OutMessage, 1, 0); @@ -324,7 +320,7 @@ BOOL CSo7_Manual_Machine::_Send_Common_CMD(const char* _SendData,DWORD _SendDa } if (m_pSO7_PCDSerial->m_iRecvState) { - if(m_pSO7_PCDSerial->m_csRecv==_T("")) + if(m_pSO7_PCDSerial->m_RecvData[0]==0) { m_pSO7_PCDSerial->m_iRecvState=FALSE; INT iRetrys2(0); @@ -334,10 +330,10 @@ BOOL CSo7_Manual_Machine::_Send_Common_CMD(const char* _SendData,DWORD _SendDa Sleep(100); } } - m_OutMessage.Format(_T("Recv(%dByte)"),m_pSO7_PCDSerial->m_iRecvByte); + m_OutMessage.Format(_T("Recv(%dByte)"),m_pSO7_PCDSerial->m_iRecvBytes); m_StatusBar.SetText(m_OutMessage, 2, 0); - m_pSO7_PCDSerial->m_csRecv=_T(""); + m_pSO7_PCDSerial->m_iRecvState=FALSE; rStatus=TRUE; } @@ -369,8 +365,7 @@ void CSo7_Manual_Machine::_Send_CMD_ReadPositionX() BYTE bSendData[2]={0xF4,0x0D}; DWORD iSendDataLength(2); DWORD iWriteByte(0); - m_pSO7_PCDSerial->m_csRecv=_T(""); - m_pSO7_PCDSerial->m_iReadDataNum=255; + iWriteByte=m_pSO7_PCDSerial->Send((const char*)bSendData,iSendDataLength); m_OutMessage.Format(_T("Send(%dByte)"),iWriteByte); m_StatusBar.SetText(m_OutMessage, 1, 0); @@ -384,7 +379,7 @@ void CSo7_Manual_Machine::_Send_CMD_ReadPositionX() } if (m_pSO7_PCDSerial->m_iRecvState) { - if(m_pSO7_PCDSerial->m_csRecv==_T("")) + if(m_pSO7_PCDSerial->m_RecvData[0]==0) { m_pSO7_PCDSerial->m_iRecvState=FALSE; INT iRetrys2(0); @@ -396,10 +391,10 @@ void CSo7_Manual_Machine::_Send_CMD_ReadPositionX() } m_pSO7_Proto->g_machine.x._d_cur_pos_=HEXDataToIntScalePosX(&m_pSO7_PCDSerial->m_RecvData[2]); m_pSO7_Proto->g_machine.x._d_cur_pos_ *= m_pSO7_Proto->g_machine.s_machine_config.x_axis._scale_resolution; - m_OutMessage.Format(_T("Recv(%dByte)"),m_pSO7_PCDSerial->m_iRecvByte); + m_OutMessage.Format(_T("Recv(%dByte)"),m_pSO7_PCDSerial->m_iRecvBytes); m_StatusBar.SetText(m_OutMessage, 2, 0); - m_pSO7_PCDSerial->m_csRecv=_T(""); + m_pSO7_PCDSerial->m_iRecvState=FALSE; } else @@ -413,8 +408,7 @@ void CSo7_Manual_Machine::_Send_CMD_ReadPositionY() BYTE bSendData[2]={0xF5,0x0D}; DWORD iSendDataLength(2); DWORD iWriteByte(0); - m_pSO7_PCDSerial->m_csRecv=_T(""); - m_pSO7_PCDSerial->m_iReadDataNum=255; + iWriteByte=m_pSO7_PCDSerial->Send((const char*)bSendData,iSendDataLength); m_OutMessage.Format(_T("Send(%dByte)"),iWriteByte); m_StatusBar.SetText(m_OutMessage, 1, 0); @@ -428,7 +422,7 @@ void CSo7_Manual_Machine::_Send_CMD_ReadPositionY() } if (m_pSO7_PCDSerial->m_iRecvState) { - if(m_pSO7_PCDSerial->m_csRecv==_T("")) + if(m_pSO7_PCDSerial->m_RecvData[0]==0) { m_pSO7_PCDSerial->m_iRecvState=FALSE; INT iRetrys2(0); @@ -440,10 +434,10 @@ void CSo7_Manual_Machine::_Send_CMD_ReadPositionY() } m_pSO7_Proto->g_machine.y._d_cur_pos_=HEXDataToIntScalePosY(&m_pSO7_PCDSerial->m_RecvData[2]); m_pSO7_Proto->g_machine.y._d_cur_pos_ *= m_pSO7_Proto->g_machine.s_machine_config.y_axis._scale_resolution; - m_OutMessage.Format(_T("Recv(%dByte)"),m_pSO7_PCDSerial->m_iRecvByte); + m_OutMessage.Format(_T("Recv(%dByte)"),m_pSO7_PCDSerial->m_iRecvBytes); m_StatusBar.SetText(m_OutMessage, 2, 0); - m_pSO7_PCDSerial->m_csRecv=_T(""); + m_pSO7_PCDSerial->m_iRecvState=FALSE; } else @@ -457,8 +451,7 @@ void CSo7_Manual_Machine::_Send_CMD_ReadPositionZ() BYTE bSendData[2]={0xF6,0x0D}; DWORD iSendDataLength(2); DWORD iWriteByte(0); - m_pSO7_PCDSerial->m_csRecv=_T(""); - m_pSO7_PCDSerial->m_iReadDataNum=255; + iWriteByte=m_pSO7_PCDSerial->Send((const char*)bSendData,iSendDataLength); m_OutMessage.Format(_T("Send(%dByte)"),iWriteByte); m_StatusBar.SetText(m_OutMessage, 1, 0); @@ -472,7 +465,7 @@ void CSo7_Manual_Machine::_Send_CMD_ReadPositionZ() } if (m_pSO7_PCDSerial->m_iRecvState) { - if(m_pSO7_PCDSerial->m_csRecv==_T("")) + if(m_pSO7_PCDSerial->m_RecvData[0]==0) { m_pSO7_PCDSerial->m_iRecvState=FALSE; INT iRetrys2(0); @@ -484,10 +477,10 @@ void CSo7_Manual_Machine::_Send_CMD_ReadPositionZ() } m_pSO7_Proto->g_machine.z._d_cur_pos_=HEXDataToIntScalePosZ(&m_pSO7_PCDSerial->m_RecvData[2]); m_pSO7_Proto->g_machine.z._d_cur_pos_ *= m_pSO7_Proto->g_machine.s_machine_config.z_axis._scale_resolution; - m_OutMessage.Format(_T("Recv(%dByte)"),m_pSO7_PCDSerial->m_iRecvByte); + m_OutMessage.Format(_T("Recv(%dByte)"),m_pSO7_PCDSerial->m_iRecvBytes); m_StatusBar.SetText(m_OutMessage, 2, 0); - m_pSO7_PCDSerial->m_csRecv=_T(""); + m_pSO7_PCDSerial->m_iRecvState=FALSE; } else @@ -501,7 +494,7 @@ void CSo7_Manual_Machine::_Process_RecvData() CString csTemp; if (m_pSO7_PCDSerial->m_iRecvState) { - if(m_pSO7_PCDSerial->m_csRecv==_T("")) + if(m_pSO7_PCDSerial->m_RecvData[0]==0) { m_pSO7_PCDSerial->m_iRecvState=FALSE; INT iRetrys2(0); @@ -512,18 +505,18 @@ void CSo7_Manual_Machine::_Process_RecvData() } } //m_OutMessage=_T("[Recv]"); - //for (INT i=0;im_iRecvByte;i++) + //for (INT i=0;im_iRecvBytes;i++) //{ // csTemp.Format(_T("%X "),(BYTE)m_pSO7_PCDSerial->m_RecvData[i]); // m_OutMessage+=csTemp; //} //OutputWithScroll(m_OutMessage,m_edMSG); int i=0; - while(im_iRecvByte) + while(im_iRecvBytes) { if ((BYTE)m_pSO7_PCDSerial->m_RecvData[i]==0xF4)//x { - if ((m_pSO7_PCDSerial->m_iRecvByte-i)>=12) + if ((m_pSO7_PCDSerial->m_iRecvBytes-i)>=12) { m_pSO7_Proto->g_machine.x._d_cur_pos_=HEXDataToIntScalePosX(&m_pSO7_PCDSerial->m_RecvData[i+1]); m_pSO7_Proto->g_machine.x._d_cur_pos_ *= m_pSO7_Proto->g_machine.s_machine_config.x_axis._scale_resolution; @@ -533,7 +526,7 @@ void CSo7_Manual_Machine::_Process_RecvData() } else if ((BYTE)m_pSO7_PCDSerial->m_RecvData[i]==0xF5)//y { - if ((m_pSO7_PCDSerial->m_iRecvByte-i)>=12) + if ((m_pSO7_PCDSerial->m_iRecvBytes-i)>=12) { m_pSO7_Proto->g_machine.y._d_cur_pos_=HEXDataToIntScalePosY(&m_pSO7_PCDSerial->m_RecvData[i+1]); m_pSO7_Proto->g_machine.y._d_cur_pos_ *= m_pSO7_Proto->g_machine.s_machine_config.y_axis._scale_resolution; @@ -542,7 +535,7 @@ void CSo7_Manual_Machine::_Process_RecvData() } else if ((BYTE)m_pSO7_PCDSerial->m_RecvData[i]==0xF6)//z { - if ((m_pSO7_PCDSerial->m_iRecvByte-i)>=12) + if ((m_pSO7_PCDSerial->m_iRecvBytes-i)>=12) { m_pSO7_Proto->g_machine.z._d_cur_pos_=HEXDataToIntScalePosZ(&m_pSO7_PCDSerial->m_RecvData[i+1]); m_pSO7_Proto->g_machine.z._d_cur_pos_ *= m_pSO7_Proto->g_machine.s_machine_config.z_axis._scale_resolution; @@ -555,10 +548,10 @@ void CSo7_Manual_Machine::_Process_RecvData() } }; - m_OutMessage.Format(_T("Recv(%dByte)"),m_pSO7_PCDSerial->m_iRecvByte); + m_OutMessage.Format(_T("Recv(%dByte)"),m_pSO7_PCDSerial->m_iRecvBytes); m_StatusBar.SetText(m_OutMessage, 2, 0); - m_pSO7_PCDSerial->m_csRecv=_T(""); + m_pSO7_PCDSerial->m_iRecvState=FALSE; } else 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 1b9fbf089e3d152b496646e6ea809f568175db63..83b22ecdb0f1d30da97f6a31a9bd1a3ff6e6d89d 100644 GIT binary patch delta 4491 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 delta 3259 zcmb7`e^k^}7QnyveeVo2{E{DvgMtDfQXvk~V!0+Gf+-pzf}nW>72WKh*f^S^;YggZ zj7s^o+^r=OY{^<{g;8Ib+NfLWnklxHR<2=@+m@Q_j#ikk_d7V&cFz8>Z{~C6z5Cv~ z_uY5zdvBbb&w!KJSt4MdHcO;KruLK=4r$tMkqJ@mtD+bnS&PS^Az`OhJU_*L98`si zdo>Oh*wfqF>wd{N2f~Vnyq)Q||Bc*jt!Inv;>ivzJaVKv(}ZR-4CCR640#e*lOsIe zl+CR`zr^hgKOxMJ!0l+iO!M~7H>Gha)-N$6bIqo$9ic%e_ zRSlbLhDer1`Fq^nVbhE>VY@m?Tal7yP(uC6+};#~04s8v)i;I040l25>!4lPRp2ft zf89`@(b>1hUu9UJ`5~cQnH@oA{sx2GDXUIF^H`xJ6b~WWXffaIta3t|%`4zd_tmUF zg6S1r%&UyHJ$r2OUash|+Q+~9nFGw*jE6bM9Ab_#T5wK`L{5kZV>}^O(2%irkJP(<05v2yVyRl6gPP z%b%8pD^>l=L5#09mIGEesoe<7m$# zvg;hI2iWY>376nbT~wcAlCORV4Ka{Ph95yENwWf&kkhKo=Tvw^N8iyjD--`*~!Ck-vv&$kk%OjH&t6}&y5+V}iyZNFF;A`Is#}tSIVA8$Pk2N{(<^IG%an{^YBLsE0U<~!l zhas}WCAI@O=R>1xd|H&NEsI2GOCt|)KA_K7DbA`5bHxrwlAAYRKcIc3A{a(c>pW2e zlPJw0n#fZoI?a{Bw=$)YUYjRo!R>ur2g=0-`Sb!|7cCCf*;WiOGNx8^0@bV$g|e`U zHIwsukw}S;i$om6`{PSM>3Ce!8K|a8tduL)ijAsfpWQ(D!y!U$uNNg|8Z`?O$Rofg zlbzxWQ1b$PwOhnX!8q@h67Q>GuLTNx`*G;7NE+?Ce&}Mih%@UKNDi;LM_ZpWG`fIm zGnna29+Sb8Fg;pVb|hGRCryS$sCBqYodo#6EfWq$m#^kg{g+^o9oNNI(2}PLvOb6f@?5@}plU zZ-ts~Dq>5s{MN{^ghlz>EcJ_|cZupWgnzO#e#Yg-YbPJ+?igP7LFy$lHN}bn^7-ZJ zyT-&fQY_uqE<~O$I~>nCQ zc&MW0&L@_2T>RwtQf=Nh{pp2j^+x!x(%tapji-usJ(09)OWAwxP515Zfpuz4AeH5d zIBDCc#({J`sZNT;Ahy*PQSWwjttq_s@s9=@Cv1Fe{tKT^UGtl+zl6y3t?Ke^@Btkx z6Z^He2Q49{zC=>=-!MJV(#W$3qRh$4N~MwyLb<%Z5I+W4SAq^R%^3@U6u1a$_zBh> z(u)>m&CqJrOr>KjI4Wokzs{@pkqS`G(!t;125nQpZB+I?rqgM{*9>=At=1e`e;)6k z9na!8=_yAWPW0@`CtQ1 z5tLJpr-MNOp*;6uPFmiZ^QnC|HfxnjgMVg66-qXp+>K4YkkgC1F)Cbtf%{6FN58)V z=-f{1immWVmFGO?xqi>B_F~(A`!!I5B~jGAJlZNhaA2ycIiJiXt0pYQnVdBoj;?3$ zj)qm30A^q0GFIVHkV!M~6VR63mPFGxV+f(nreyaMFFRWZJ&t6_SW9H97^#5+rTOo(42QI1p#TKRGFeU3^L#gLB8W;4=Al_ij&h$e zS;_0$1I3`cq9A8J-#uLPBap*=`d`darATqe-WCL*St66QxX2jt{0V}o{S~xwE6xW$ zl|M=4bB8e~0CrH=c^pIg-@(DOj)AqFCWr)aR?R^KQxAza6av8yN@)&NG z*(W%p;Xe;i4tsMqwI0LoqXKV5F5VM#v!4BSpQUXL=;||4eG+3)C|PIxCoej9%EHwP zmo8XXTI5(28AMLIvkC1x^wh$Eq1pP5RYPtih8oy9;o z?lW8|IJ2_e(R=Qr)X#C9e#N$ykqKZ-jF|~! zf|y_?gb8K(F=5iSINWnlmX#Z}Htv}j!MFWve+