完善Tesa star e测试功能。

This commit is contained in:
TAO Cheng
2013-12-13 08:53:55 +08:00
parent 70611fea3b
commit d060bf56dd
7 changed files with 86 additions and 81 deletions
@@ -2394,3 +2394,8 @@ Unable to open device Init:Open device succeed .
_start_machine
Exit: Exit_SO7Usb
Destruct Cso7_Proto.
Construct Cso7_Proto.
@@ -138,3 +138,8 @@ Construct Cso7_Proto.
Destruct Cso7_Proto.
Construct Cso7_Proto.
Destruct Cso7_Proto.
Construct Cso7_Proto.
Init:Open device succeed .
_start_machine
Exit: Exit_SO7Usb
Destruct Cso7_Proto.
@@ -116,6 +116,7 @@ void TestTesaStarEDialog::OnBnClickedButtonTesaStarSendmsg()
DWORD iSendDataLength(0);
DWORD iWriteByte(0);
CPSerial *pSerial = &(g_pTesaStarE->m_pSerial);
if (m_SendType==0)
{
@@ -126,7 +127,7 @@ void TestTesaStarEDialog::OnBnClickedButtonTesaStarSendmsg()
{
bSendData[i]=(BYTE)strtol(cSendData+i*3,&stop,16);
}
iWriteByte=g_pTesaStarE->m_pSerial->Send((const char*)bSendData,iSendDataLength);
iWriteByte=pSerial->Send((const char*)bSendData,iSendDataLength);
}
else
{
@@ -134,7 +135,7 @@ void TestTesaStarEDialog::OnBnClickedButtonTesaStarSendmsg()
csSendData+=_T("\r");
cSendData=T2A(csSendData);
iSendDataLength=csSendData.GetLength();
iWriteByte=g_pTesaStarE->m_pSerial->Send(cSendData,iSendDataLength);
iWriteByte=pSerial->Send(cSendData,iSendDataLength);
}
m_OutMessage=_T("[Send] ")+csSendData;
@@ -150,29 +151,29 @@ void TestTesaStarEDialog::OnBnClickedButtonTesaStarSendmsg()
do
{
iRetrys=0;
while(!g_pTesaStarE->m_pSerial->m_iRecvState && iRetrys<20)
while(!pSerial->m_iRecvState && iRetrys<20)
{
iRetrys++;
Sleep(100);
}
if (g_pTesaStarE->m_pSerial->m_iRecvState)
if (pSerial->m_iRecvState)
{
if(g_pTesaStarE->m_pSerial->m_RecvData[0]==0)
if(pSerial->m_RecvData[0]==0)
{
g_pTesaStarE->m_pSerial->m_iRecvState=FALSE;
pSerial->m_iRecvState=FALSE;
INT iRetrys2(0);
while(!g_pTesaStarE->m_pSerial->m_iRecvState && iRetrys2<60)
while(!pSerial->m_iRecvState && iRetrys2<60)
{
iRetrys2++;
Sleep(100);
}
m_OutMessage=_T("[Recv]");
memcpy(m_RecvData,g_pTesaStarE->m_pSerial->m_RecvData, g_pTesaStarE->m_pSerial->m_iRecvBytes);
iRecvBytes=g_pTesaStarE->m_pSerial->m_iRecvBytes;
TRACE1("====RECV%d====\r\n",g_pTesaStarE->m_pSerial->m_iRecvBytes);
TRACE3("%02X %02X %02X ",g_pTesaStarE->m_pSerial->m_RecvData[0],g_pTesaStarE->m_pSerial->m_RecvData[1],g_pTesaStarE->m_pSerial->m_RecvData[2]);
TRACE3("%02X %02X %02X ",g_pTesaStarE->m_pSerial->m_RecvData[3],g_pTesaStarE->m_pSerial->m_RecvData[4],g_pTesaStarE->m_pSerial->m_RecvData[5]);
TRACE3("%02X %02X %02X\r\n",g_pTesaStarE->m_pSerial->m_RecvData[6],g_pTesaStarE->m_pSerial->m_RecvData[7],g_pTesaStarE->m_pSerial->m_RecvData[8]);
memcpy(m_RecvData,pSerial->m_RecvData, pSerial->m_iRecvBytes);
iRecvBytes=pSerial->m_iRecvBytes;
TRACE1("====RECV%d====\r\n",pSerial->m_iRecvBytes);
TRACE3("%02X %02X %02X ",pSerial->m_RecvData[0],pSerial->m_RecvData[1],pSerial->m_RecvData[2]);
TRACE3("%02X %02X %02X ",pSerial->m_RecvData[3],pSerial->m_RecvData[4],pSerial->m_RecvData[5]);
TRACE3("%02X %02X %02X\r\n",pSerial->m_RecvData[6],pSerial->m_RecvData[7],pSerial->m_RecvData[8]);
for (INT i=0;i<iRecvBytes;i++)
{
if((BYTE)m_RecvData[i]>32)
@@ -188,13 +189,13 @@ void TestTesaStarEDialog::OnBnClickedButtonTesaStarSendmsg()
else
{
m_OutMessage=_T("[Recv]");
memcpy(m_RecvData,g_pTesaStarE->m_pSerial->m_RecvData, g_pTesaStarE->m_pSerial->m_iRecvBytes);
iRecvBytes=g_pTesaStarE->m_pSerial->m_iRecvBytes;
memcpy(m_RecvData,pSerial->m_RecvData, pSerial->m_iRecvBytes);
iRecvBytes=pSerial->m_iRecvBytes;
TRACE1("====RECV%d====\r\n",g_pTesaStarE->m_pSerial->m_iRecvBytes);
TRACE3("%02X %02X %02X ",g_pTesaStarE->m_pSerial->m_RecvData[0],g_pTesaStarE->m_pSerial->m_RecvData[1],g_pTesaStarE->m_pSerial->m_RecvData[2]);
TRACE3("%02X %02X %02X ",g_pTesaStarE->m_pSerial->m_RecvData[3],g_pTesaStarE->m_pSerial->m_RecvData[4],g_pTesaStarE->m_pSerial->m_RecvData[5]);
TRACE3("%02X %02X %02X\r\n",g_pTesaStarE->m_pSerial->m_RecvData[6],g_pTesaStarE->m_pSerial->m_RecvData[7],g_pTesaStarE->m_pSerial->m_RecvData[8]);
TRACE1("====RECV%d====\r\n",pSerial->m_iRecvBytes);
TRACE3("%02X %02X %02X ",pSerial->m_RecvData[0],pSerial->m_RecvData[1],pSerial->m_RecvData[2]);
TRACE3("%02X %02X %02X ",pSerial->m_RecvData[3],pSerial->m_RecvData[4],pSerial->m_RecvData[5]);
TRACE3("%02X %02X %02X\r\n",pSerial->m_RecvData[6],pSerial->m_RecvData[7],pSerial->m_RecvData[8]);
for (INT i=0;i<iRecvBytes;i++)
{
@@ -209,15 +210,15 @@ void TestTesaStarEDialog::OnBnClickedButtonTesaStarSendmsg()
m_StatusBar.SetText(m_OutMessage, 2, 0);
}
g_pTesaStarE->m_pSerial->m_iRecvState=FALSE;
pSerial->m_iRecvState=FALSE;
}
else
{
m_StatusBar.SetText(_T("Time Out!"), 2, 0);
BYTE bSendData[MAX_OUTPUT_BUFFER_SIZE]={0x0d};
iWriteByte=g_pTesaStarE->m_pSerial->Send((const char*)bSendData,1);
iWriteByte=pSerial->Send((const char*)bSendData,1);
}
iRecvBytes=g_pTesaStarE->m_pSerial->m_iRecvBytes;
iRecvBytes=pSerial->m_iRecvBytes;
if(iRecvBytes<3)
{
iRecvBytes=3;