|
@@ -30,7 +30,7 @@ int _tmain(int argc, TCHAR* argv[], TCHAR* envp[])
|
|
|
else
|
|
|
{
|
|
|
// TODO: 在此处为应用程序的行为编写代码。
|
|
|
-#if 1
|
|
|
+#if 0
|
|
|
TCLCommand tcl(true);
|
|
|
if (tcl.Open(23, _T("baud=115200 parity=N data=8 stop=1")) )
|
|
|
{
|
|
@@ -59,30 +59,33 @@ int _tmain(int argc, TCHAR* argv[], TCHAR* envp[])
|
|
|
}
|
|
|
}
|
|
|
#else
|
|
|
- CBaseSerial sb;
|
|
|
- if ( sb.Open(23, _T("baud=115200 parity=N data=8 stop=1") ) )
|
|
|
+ TCLCommand tcl(false);
|
|
|
+ if ( tcl.Open(23, _T("baud=115200 parity=N data=8 stop=1") ) )
|
|
|
{
|
|
|
- sb.SetTimeouts();
|
|
|
+ tcl.SetTimeouts();
|
|
|
std::vector<CommandParam> vtCommandParams;
|
|
|
- parse_cmd_param_from_file("F:\\source\\scbc_repos\\Serail-Demo\\Demo\\command.data", vtCommandParams);
|
|
|
+ tcl.parse_cmd_param_from_file("F:\\source\\scbc_repos\\Serail-Demo\\Demo\\command.data", vtCommandParams);
|
|
|
for ( std::vector<CommandParam>::iterator it = vtCommandParams.begin(); it != vtCommandParams.end(); it++ )
|
|
|
{
|
|
|
if ( !_tcsicmp(it->name.c_str(), _T("LeaveFactory")) )
|
|
|
break;
|
|
|
byte szData[1024] = {0};
|
|
|
- std::string cmd = PackingCommand(*it, _T(""), 0);
|
|
|
+ std::string cmd = tcl.PackingCommand(*it, _T(""), 0);
|
|
|
//sb.Read(szData, 1024, 100);
|
|
|
- if ( sb.Write((void*)cmd.c_str(), cmd.size()) )
|
|
|
+ if ( tcl.Write((void*)cmd.c_str(), cmd.size()) )
|
|
|
{
|
|
|
Sleep(it->read_wait_time);
|
|
|
- int c = sb.Read(szData, 1024, 200);
|
|
|
- std::string str = BytesToHexString(szData, c, ' ');
|
|
|
- _dprintf("结果:%s", str.c_str());
|
|
|
+ int c = tcl.Read(szData, 1024, 200);
|
|
|
+ std::string str = utils::BytesToHexString(szData, c, ' ');
|
|
|
+ utils::_dprintf("结果:%s", str.c_str());
|
|
|
|
|
|
+ str = "";
|
|
|
+ str.append((char*)szData, c);
|
|
|
+ tcl.ParseResultString(*it, str, str.size());
|
|
|
Sleep(it->cmd_wait_time);
|
|
|
}
|
|
|
|
|
|
- sb.ClearCommBuffer();
|
|
|
+ tcl.ClearCommBuffer();
|
|
|
}
|
|
|
}
|
|
|
#endif
|