瀏覽代碼

显示更多错误信息。

sat23 4 年之前
父節點
當前提交
7e974c7582
共有 3 個文件被更改,包括 42 次插入56 次删除
  1. 2 0
      TCLTools/TCLTools/TCLTools.rc
  2. 38 56
      TCLTools/TCLTools/TCLToolsDlg.cpp
  3. 2 0
      TCLTools/TCLTools/resource.h

+ 2 - 0
TCLTools/TCLTools/TCLTools.rc

@@ -103,6 +103,8 @@ BEGIN
     LTEXT           "Ê®Áù½øÖÆ£º",IDC_STATIC,10,125,35,8
     EDITTEXT        IDC_EDIT_STATUS,49,70,74,14,ES_AUTOHSCROLL | ES_READONLY
     GROUPBOX        "½á¹û",IDC_STATIC,7,60,333,135
+    LTEXT           "´íÎó£º",IDC_STATIC,131,72,22,8
+    EDITTEXT        IDC_EDIT_ERROR,153,70,181,31,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY
 END
 
 

+ 38 - 56
TCLTools/TCLTools/TCLToolsDlg.cpp

@@ -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
         {

+ 2 - 0
TCLTools/TCLTools/resource.h

@@ -19,6 +19,8 @@
 #define BTN_EXEC_CMD                    1010
 #define BTN_OPEN_PORT                   1011
 #define IDC_EDIT_STATUS                 1012
+#define IDC_EDIT_STATUS2                1013
+#define IDC_EDIT_ERROR                  1013
 
 // Next default values for new objects
 //