|
@@ -318,67 +318,49 @@ void CTCLToolsDlg::OnBnClickedExecCmd()
|
|
|
bStatus = g_tclCommand.SendCommand(strCMDName.GetString(), cmdpara);
|
|
|
}
|
|
|
|
|
|
- if ( bStatus )
|
|
|
+
|
|
|
+ // 设置状态;
|
|
|
+ if ( cmdpara._rtnStatus == 0x0A )
|
|
|
+ {
|
|
|
+ SetDlgItemText(IDC_EDIT_STATUS, "成功");
|
|
|
+ }
|
|
|
+ else if ( cmdpara._rtnStatus == 0x0E )
|
|
|
+ {
|
|
|
+ SetDlgItemText(IDC_EDIT_STATUS, "命令错误或不可执行");
|
|
|
+ }
|
|
|
+ else if ( cmdpara._rtnStatus == 0x0F )
|
|
|
{
|
|
|
- // 设置状态;
|
|
|
- if ( cmdpara._rtnStatus == 0x0A )
|
|
|
- {
|
|
|
- SetDlgItemText(IDC_EDIT_STATUS, "成功");
|
|
|
- }
|
|
|
- else if ( cmdpara._rtnStatus == 0x0E )
|
|
|
- {
|
|
|
- SetDlgItemText(IDC_EDIT_STATUS, "命令错误或不可执行");
|
|
|
- }
|
|
|
- else if ( cmdpara._rtnStatus == 0x0F )
|
|
|
- {
|
|
|
- SetDlgItemText(IDC_EDIT_STATUS, "链路层数据错误");
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- SetDlgItemText(IDC_EDIT_STATUS, "不可识别的错误");
|
|
|
- }
|
|
|
-
|
|
|
- // 设置单字节值;
|
|
|
- if ( cmdpara.nOption == CMDOPT_Get && cmdpara._rtnData.size() < 3)
|
|
|
- {
|
|
|
- if ( cmdpara._rtnData.size() == 1)
|
|
|
- SetDlgItemInt(IDC_EDIT_INT, (byte)cmdpara._rtnData[0]);
|
|
|
- else if ( cmdpara._rtnData.size() == 2)
|
|
|
- SetDlgItemInt(IDC_EDIT_INT, (byte)cmdpara._rtnData[0] << 8 | (byte)cmdpara._rtnData[1]);
|
|
|
- }
|
|
|
-
|
|
|
- // 设置原字符串显示;
|
|
|
- if ( cmdpara.nOption == CMDOPT_Get )
|
|
|
- {
|
|
|
- SetDlgItemText(IDC_EDIT_STR, cmdpara._rtnData.c_str());
|
|
|
- }
|
|
|
-
|
|
|
- // 设置16进制字符串显示;
|
|
|
- if ( cmdpara.nOption == CMDOPT_Get )
|
|
|
- {
|
|
|
- SetDlgItemText(IDC_EDIT_HEX, utils::BytesToHexString((byte*)cmdpara._rtnData.c_str(), cmdpara._rtnData.size(), ' ').c_str());
|
|
|
- }
|
|
|
+ SetDlgItemText(IDC_EDIT_STATUS, "链路层数据错误");
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- //MessageBox("串口写指令失败", "错误!", MB_ICONEXCLAMATION);
|
|
|
- if ( cmdpara._rtnStatus == 0x0A )
|
|
|
- {
|
|
|
- SetDlgItemText(IDC_EDIT_STATUS, "成功");
|
|
|
- }
|
|
|
- else if ( cmdpara._rtnStatus == 0x0E )
|
|
|
- {
|
|
|
- SetDlgItemText(IDC_EDIT_STATUS, "命令错误或不可执行");
|
|
|
- }
|
|
|
- else if ( cmdpara._rtnStatus == 0x0F )
|
|
|
- {
|
|
|
- SetDlgItemText(IDC_EDIT_STATUS, "链路层数据错误");
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- SetDlgItemText(IDC_EDIT_STATUS, "不可识别的错误");
|
|
|
- }
|
|
|
+ SetDlgItemText(IDC_EDIT_STATUS, "不可识别的错误");
|
|
|
+ }
|
|
|
+
|
|
|
+ // 设置原字符串显示;
|
|
|
+ SetDlgItemText(IDC_EDIT_ERROR, cmdpara._rtnError.c_str());
|
|
|
+
|
|
|
+ // 设置单字节值;
|
|
|
+ if ( cmdpara.nOption == CMDOPT_Get && cmdpara._rtnData.size() < 3)
|
|
|
+ {
|
|
|
+ if ( cmdpara._rtnData.size() == 1)
|
|
|
+ SetDlgItemInt(IDC_EDIT_INT, (byte)cmdpara._rtnData[0]);
|
|
|
+ else if ( cmdpara._rtnData.size() == 2)
|
|
|
+ SetDlgItemInt(IDC_EDIT_INT, (byte)cmdpara._rtnData[0] << 8 | (byte)cmdpara._rtnData[1]);
|
|
|
+ }
|
|
|
+
|
|
|
+ // 设置原字符串显示;
|
|
|
+ if ( cmdpara.nOption == CMDOPT_Get )
|
|
|
+ {
|
|
|
+ SetDlgItemText(IDC_EDIT_STR, cmdpara._rtnData.c_str());
|
|
|
}
|
|
|
+
|
|
|
+ // 设置16进制字符串显示;
|
|
|
+ if ( cmdpara.nOption == CMDOPT_Get )
|
|
|
+ {
|
|
|
+ SetDlgItemText(IDC_EDIT_HEX, utils::BytesToHexString((byte*)cmdpara._rtnData.c_str(), cmdpara._rtnData.size(), ' ').c_str());
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
else
|
|
|
{
|