1、在CheckMode时，增加PCBA型号的判断。

CheckForm.cs

@@ -32,6 +32,10 @@ namespace MOTINOVA_Motor_Factory_Set
         TorqueCheckParam TorqueCheck = new TorqueCheckParam();
         #endregion
 
+        #region 硬件版本检测判断值
+        string HW_Version_Check = "";
+        #endregion
+
         #region 串口缓存
         public static List<byte> buffer = new List<byte>(4096);
         private byte[] binary_data_1 = new byte[1024];
@@ -247,10 +251,13 @@ namespace MOTINOVA_Motor_Factory_Set
                                     if (IsBootVerOK == false)//开机时一般会发送4条，只显示1条
                                     {
                                         richTextBox_TestRecord.AppendText("Bootloader版本：");
+                                        string boot_Version = "";
                                         for (ushort i = 0; i < 9; i++)
                                         {
-                                            richTextBox_TestRecord.Text += ((char)binary_data_1[2 + i]).ToString();
+                                            boot_Version += ((char)binary_data_1[2 + i]).ToString();                                           
                                         }
+                                        richTextBox_TestRecord.AppendText(boot_Version+" ");
+                                        richTextBox_TestRecord.AppendText(boot_Version.Contains("V1") ? "125K" : "250K");
                                         richTextBox_TestRecord.AppendText("\r\n");
                                     }
                                     IsBootVerOK = true;
@@ -835,7 +842,26 @@ namespace MOTINOVA_Motor_Factory_Set
             TorqueCheck.CheckParam_Load(LocalCfgFilePath + SelectFile);
             textBox_TQ_Zero.Text = TorqueCheck.Zero_Min.ToString() + " - " + TorqueCheck.Zero_Max.ToString();
             textBox_TQ_K.Text = TorqueCheck.Cal_K_Min.ToString("#0.00") + " - " + TorqueCheck.Cal_K_Max.ToString("#0.00");
-            textBox_TQ_Start.Text = TorqueCheck.Start_Min.ToString() + " - " + TorqueCheck.Start_Max.ToString(); 
+            textBox_TQ_Start.Text = TorqueCheck.Start_Min.ToString() + " - " + TorqueCheck.Start_Max.ToString();
+
+            //加载PCBA检测值
+            try
+            {
+                for (int i = 0; i < array_CfgInfo.Count; i++)
+                {
+                    if (array_CfgInfo[i].ToString().Contains("[其它测试备注信息]"))
+                    {
+                        HW_Version_Check = array_CfgInfo[i + 1].ToString().Split(',')[1];
+                        break;
+                    }
+                            
+                }
+            }
+            catch (System.Exception)
+            {
+                return;
+            }
+
         }
         #endregion
 
@@ -951,11 +977,12 @@ namespace MOTINOVA_Motor_Factory_Set
         //创建线程执行一次测试任务
         /*
         执行流程如下：
-        1、读取电机版本信息 -> 确认SN是否存在为0、确认版本和cfg文件是否一致；
-        2、读取力矩传感器标定值 -> 依次判断零点、校正系数、启动值是否在允许范围内，判断零点值差异是否过大
-        3、依次读取配置参数，严格按照cfg文件的顺序读取 -> 对比两个richbox内容是否一致
-        4、显示测试结果
-        5、存储测试结果，上传ftp服务器
+        1、读取BOOT版本信息；
+        2、读取电机版本信息 -> 确认SN是否存在为0、确认版本和cfg文件是否一致；
+        3、读取力矩传感器标定值 -> 依次判断零点、校正系数、启动值是否在允许范围内，判断零点值差异是否过大；
+        4、依次读取配置参数，严格按照cfg文件的顺序读取 -> 对比两个richbox内容是否一致；
+        5、显示测试结果；
+        6、存储测试结果，上传ftp服务器。
         */
         private void Thread_Task()
         {
@@ -974,6 +1001,7 @@ namespace MOTINOVA_Motor_Factory_Set
             {
                 label_Step.Text = "电机存在故障！";
                 button_Start.Enabled = true;
+                textBox_PDinfo.Enabled = true;
                 //关机
                 Code[0] = 0xF0;
                 SendCmd(0x7FF, 0x16, 0x2201, Code);
@@ -992,35 +1020,36 @@ namespace MOTINOVA_Motor_Factory_Set
             SendCmd(0x7FF, 0x16, 0x2201, Code);
             开ToolStripMenuItem.Checked = true;
             关ToolStripMenuItem.Checked = false;
-            
             Delay_ms(2000);
 
-            //发送系统复位指令
-            Code[0] = (byte)'R';
-            Code[1] = (byte)'E';
-            Code[2] = (byte)'S';
-            Code[3] = (byte)'E';
-            Code[4] = (byte)'T';
-            SendCmd((ushort)0x751, (byte)0x16, (ushort)0x2505, Code);
-
-            Delay_ms(1000);
-
-            #region 判断Boot Loader版本
+            #region 判断BootLoader版本
             if (IsBootVerOK == false)
             {
-                label_Step.Text = "Bootloader波特率错误！";
-                button_Start.Enabled = true;
-                //关机
-                Code[0] = 0xF0;
-                SendCmd(0x7FF, 0x16, 0x2201, Code);
-                开ToolStripMenuItem.Checked = false;
-                关ToolStripMenuItem.Checked = true;
-                Delay_ms(500);
-                //关闭串口
-                portsettings_form.closePort();
-                //存储测试数据
-                ErrorSaveLog();
-                return;
+                //发送系统复位指令
+                Code[0] = (byte)'R';
+                Code[1] = (byte)'E';
+                Code[2] = (byte)'S';
+                Code[3] = (byte)'E';
+                Code[4] = (byte)'T';
+                SendCmd((ushort)0x751, (byte)0x16, (ushort)0x2505, Code);
+                Delay_ms(2000);
+                if (IsBootVerOK == false)
+                {
+                    label_Step.Text = "Bootloader波特率错误！";
+                    button_Start.Enabled = true;
+                    textBox_PDinfo.Enabled = true;
+                    //关机
+                    Code[0] = 0xF0;
+                    SendCmd(0x7FF, 0x16, 0x2201, Code);
+                    开ToolStripMenuItem.Checked = false;
+                    关ToolStripMenuItem.Checked = true;
+                    Delay_ms(500);
+                    //关闭串口
+                    portsettings_form.closePort();
+                    //存储测试数据
+                    ErrorSaveLog();
+                    return;
+                }
             }
             #endregion
 
@@ -1035,8 +1064,10 @@ namespace MOTINOVA_Motor_Factory_Set
             string FW_Version_Result = "";
             string TE_FW_Ver_Check = comboBox_File.Text.Split('_')[4] + "_" + comboBox_File.Text.Split('_')[5];
             string TE_FW_Ver_Result = "";
+            string HW_Version_Result = "";
             try
             {
+                HW_Version_Result = richTextBox_VerInfo.Lines[2].Split('：')[1];
                 FW_Version_Result = richTextBox_VerInfo.Lines[3].Split('：')[1];
                 FW_Version_Result = FW_Version_Result.Split('_')[0] + richTextBox_VerInfo.Lines[4].Split('-')[2].Replace('V', '.') + "_" + FW_Version_Result.Split('_')[1];
                 TE_FW_Ver_Result = richTextBox_VerInfo.Lines[5].Split('：')[1];
@@ -1045,12 +1076,33 @@ namespace MOTINOVA_Motor_Factory_Set
             {
                 label_Step.Text = "软件版本信息不完整！";
             }
+            //PCBA版本确认
+            if (HW_Version_Result.Contains(HW_Version_Check) == false)//PCBA版号错误，直接结束
+            {
+                richTextBox_TestRecord.Text += DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "->" + "PCBA版本错误" + "\r\n";
+                label_Step.Text = "PCBA版本错误，测试结束！";
+                label_Step.ForeColor = Color.Red;
+                button_Start.Enabled = true;
+                textBox_PDinfo.Enabled = true;
+                ErrorSaveLog();
+                //关机
+                Code[0] = 0xF0;
+                SendCmd(0x7FF, 0x16, 0x2201, Code);
+                开ToolStripMenuItem.Checked = false;
+                关ToolStripMenuItem.Checked = true;
+                Delay_ms(500);
+                //关闭串口
+                portsettings_form.closePort();
+                return;
+            }
+            //主控软件版本检查
             if (string.Equals(FW_Version_Check, FW_Version_Result) == false) //主控版本错误，直接结束
             {
                 richTextBox_TestRecord.Text += DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "->" + "主控版本错误" + "\r\n";
                 label_Step.Text = "主控软件版本错误，测试结束！";
                 label_Step.ForeColor = Color.Red;
                 button_Start.Enabled = true;
+                textBox_PDinfo.Enabled = true;
                 ErrorSaveLog();
                 //关机
                 Code[0] = 0xF0;
@@ -1064,6 +1116,7 @@ namespace MOTINOVA_Motor_Factory_Set
             }
             else
             {
+                //TE软件版本检查
                 if (TE_FW_Ver_Check != "N_A")//单MCU主控板不检测TE版本
                 {
                     if (string.Equals(TE_FW_Ver_Check, TE_FW_Ver_Result) == false) //TE版本错误，给出提示
@@ -1074,6 +1127,7 @@ namespace MOTINOVA_Motor_Factory_Set
                             label_Step.Text = "TE软件版本错误，测试结束！";
                             label_Step.ForeColor = Color.Red;
                             button_Start.Enabled = true;
+                            textBox_PDinfo.Enabled = true;
                             ErrorSaveLog();
                             //关机
                             Code[0] = 0xF0;
@@ -1086,7 +1140,8 @@ namespace MOTINOVA_Motor_Factory_Set
                             return;
                         }
                     }
-                }                
+                }   
+                //型号和SN确认
                 try
                 {
                     string mode1 = "", mode2 = ""; 
@@ -1099,6 +1154,7 @@ namespace MOTINOVA_Motor_Factory_Set
                         label_Step.Text = "型号不一致，测试结束！";
                         label_Step.ForeColor = Color.Red;
                         button_Start.Enabled = true;
+                        textBox_PDinfo.Enabled = true;
                         ErrorSaveLog();
                         //关机
                         Code[0] = 0xF0;
@@ -1120,6 +1176,7 @@ namespace MOTINOVA_Motor_Factory_Set
                         label_Step.Text = "SN不一致，测试结束！";
                         label_Step.ForeColor = Color.Red;
                         button_Start.Enabled = true;
+                        textBox_PDinfo.Enabled = true;
                         ErrorSaveLog();
                         //关机
                         Code[0] = 0xF0;
@@ -1138,6 +1195,7 @@ namespace MOTINOVA_Motor_Factory_Set
                     label_Step.Text = "电机信息错误，测试结束！";
                     label_Step.ForeColor = Color.Red;
                     button_Start.Enabled = true;
+                    textBox_PDinfo.Enabled = true;
                     ErrorSaveLog();
                     //关机
                     Code[0] = 0xF0;
@@ -1195,6 +1253,7 @@ namespace MOTINOVA_Motor_Factory_Set
                                     label_Step.Text = "传感器零点超范围，测试结束！";
                                     label_Step.ForeColor = Color.Red;
                                     button_Start.Enabled = true;
+                                    textBox_PDinfo.Enabled = true;
                                     ErrorSaveLog();
                                     //关机
                                     Code[0] = 0xF0;
@@ -1219,6 +1278,7 @@ namespace MOTINOVA_Motor_Factory_Set
                                 label_Step.Text = "校正系数超范围，测试结束！";
                                 label_Step.ForeColor = Color.Red;
                                 button_Start.Enabled = true;
+                                textBox_PDinfo.Enabled = true;
                                 ErrorSaveLog();
                                 //关机
                                 Code[0] = 0xF0;
@@ -1236,6 +1296,7 @@ namespace MOTINOVA_Motor_Factory_Set
                                 label_Step.Text = "传感器未标定，测试结束！";
                                 label_Step.ForeColor = Color.Red;
                                 button_Start.Enabled = true;
+                                textBox_PDinfo.Enabled = true;
                                 ErrorSaveLog();
                                 //关机
                                 Code[0] = 0xF0;
@@ -1259,6 +1320,7 @@ namespace MOTINOVA_Motor_Factory_Set
                                 label_Step.Text = "启动值超范围，测试结束！";
                                 label_Step.ForeColor = Color.Red;
                                 button_Start.Enabled = true;
+                                textBox_PDinfo.Enabled = true;
                                 ErrorSaveLog();
                                 //关机
                                 Code[0] = 0xF0;
@@ -1309,6 +1371,7 @@ namespace MOTINOVA_Motor_Factory_Set
                         label_Step.Text = "检查配置参数失败，测试结束！";
                         label_Step.ForeColor = Color.Red;
                         button_Start.Enabled = true;
+                        textBox_PDinfo.Enabled = true;
                         ErrorSaveLog();
                         //关机
                         Code[0] = 0xF0;
@@ -1327,6 +1390,7 @@ namespace MOTINOVA_Motor_Factory_Set
                     label_Step.Text = "检查配置参数失败，测试结束！";
                     label_Step.ForeColor = Color.Red;
                     button_Start.Enabled = true;
+                    textBox_PDinfo.Enabled = true;
                     ErrorSaveLog();
                     //关机
                     Code[0] = 0xF0;
@@ -1347,6 +1411,7 @@ namespace MOTINOVA_Motor_Factory_Set
             {
                 label_Step.Text = "电机存在故障！";
                 button_Start.Enabled = true;
+                textBox_PDinfo.Enabled = true;
                 //关机
                 Code[0] = 0xF0;
                 SendCmd(0x7FF, 0x16, 0x2201, Code);
@@ -1367,6 +1432,7 @@ namespace MOTINOVA_Motor_Factory_Set
             label_Result.Text = "合格";
             label_Result.BackColor = Color.Green;
             button_Start.Enabled = true;
+            textBox_PDinfo.Enabled = true;
             //关机
             Code[0] = 0xF0;
             SendCmd(0x7FF, 0x16, 0x2201, Code);
@@ -1648,6 +1714,7 @@ namespace MOTINOVA_Motor_Factory_Set
             }
 
             button_Start.Enabled = false;
+            textBox_PDinfo.Enabled = false;
 
             //创建线程，执行测试任务
             Thread th = new Thread(Thread_Task);

ExportForm.cs

@@ -27,6 +27,7 @@ namespace MOTINOVA_Motor_Factory_Set
         Dictionary<string, UInt16> MotorParam = new Dictionary<string, UInt16>();
         Dictionary<string, string> Otherinfo = new Dictionary<string, string>();
         Dictionary<string, UInt16> TestThData = new Dictionary<string, ushort>();
+        Dictionary<string, string> MarkInfo = new Dictionary<string, string>();
 
         //文件路径
         public string FilePath = "";
@@ -116,6 +117,10 @@ namespace MOTINOVA_Motor_Factory_Set
             TestThData.Add("标定系数最大值", 75);
             TestThData.Add("启动值最小值", 350);
             TestThData.Add("启动值最大值", 750);
+
+            //其它测试备注信息
+            MarkInfo.Clear();
+            MarkInfo.Add("PCBA版号", "");
         }
 
         private void ParamsDisplayUpdate()
@@ -250,6 +255,9 @@ namespace MOTINOVA_Motor_Factory_Set
             textBox_K_Max.Text = ((float)(TestThData["标定系数最大值"]) / 100.0f).ToString("#0.00");
             textBox_Start_Min.Text = TestThData["启动值最小值"].ToString();
             textBox_Start_Max.Text = TestThData["启动值最大值"].ToString();
+
+            //其它测试备注信息
+            textBox_HW_Version.Text = MarkInfo["PCBA版号"];
         }
 
         private bool DisplaySetToParams()
@@ -324,6 +332,7 @@ namespace MOTINOVA_Motor_Factory_Set
                 else
                 {
                     MessageBox.Show("请检查无码表设置！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                    return false;
                 }
                 Params1.Add("轮胎周长", Convert.ToUInt16(textBox_WheelSize.Text));
                 if (Params1["轮胎周长"] < 80 || Params1["轮胎周长"] > 250)
@@ -360,6 +369,7 @@ namespace MOTINOVA_Motor_Factory_Set
                 else
                 {
                     MessageBox.Show("请检查指拨模式设置！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                    return false;
                 }
                 if (comboBox_SpeedSensor.Text == "传感器")
                 {
@@ -376,6 +386,7 @@ namespace MOTINOVA_Motor_Factory_Set
                 else
                 {
                     MessageBox.Show("请检查速度信号来源设置！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                    return false;
                 }
                 Params1.Add("周长微调", Convert.ToUInt16(textBox_WheelSizeAdj.Text));
                 Params1.Add("低压保护", Convert.ToUInt16(textBox_UV_Protect.Text));//mV
@@ -395,6 +406,7 @@ namespace MOTINOVA_Motor_Factory_Set
                 else
                 {
                     MessageBox.Show("请检查姿态传感器设置！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                    return false;
                 }
 
                 Params2.Add("俯仰角零偏", Convert.ToUInt16(float.Parse(textBox_Angle_P.Text) * 10));
@@ -480,6 +492,19 @@ namespace MOTINOVA_Motor_Factory_Set
                 TestThData.Add("标定系数最大值", Convert.ToUInt16(float.Parse(textBox_K_Max.Text) * 100));
                 TestThData.Add("启动值最小值", Convert.ToUInt16(textBox_Start_Min.Text));
                 TestThData.Add("启动值最大值", Convert.ToUInt16(textBox_Start_Max.Text));
+
+                //其它测试备注信息
+                MarkInfo.Clear();
+                if (textBox_HW_Version.Text == string.Empty)
+                {
+                    MessageBox.Show("请输入PCBA版号！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                    return false;
+                }
+                else
+                {
+                    MarkInfo.Add("PCBA版号", textBox_HW_Version.Text);
+                }
+
                 return true;
             }
             catch(Exception ex)
@@ -600,6 +625,13 @@ namespace MOTINOVA_Motor_Factory_Set
                 file.WriteLine("[{0}]", "测试阈值");
                 foreach (var entry in TestThData)
                     file.WriteLine("{0},{1}", entry.Key, entry.Value);
+
+                //其它测试备注信息
+                file.WriteLine("");
+                file.WriteLine("[{0}]", "其它测试备注信息");
+                foreach (var entry in MarkInfo)
+                    file.WriteLine("{0},{1}", entry.Key, entry.Value);
+
             }
 
             button_Generate.Text = "转换中";

ImportForm.cs

@@ -520,10 +520,13 @@ namespace MOTINOVA_Motor_Factory_Set
                                     if (label_Boot_Version.Text != "OK")
                                     {
                                         richTextBox_TestRecord.AppendText("Bootloader版本：");
+                                        string boot_Version = "";
                                         for (ushort i = 0; i < 9; i++)
                                         {
-                                            richTextBox_TestRecord.Text += ((char)binary_data_1[2 + i]).ToString();
+                                            boot_Version += ((char)binary_data_1[2 + i]).ToString();
                                         }
+                                        richTextBox_TestRecord.AppendText(boot_Version + " ");
+                                        richTextBox_TestRecord.AppendText(boot_Version.Contains("V1") ? "125K" : "250K");
                                         richTextBox_TestRecord.AppendText("\r\n");
                                     }
                                     label_Boot_Version.BackColor = Color.Green;
@@ -1046,6 +1049,7 @@ namespace MOTINOVA_Motor_Factory_Set
             {
                 label_Step.Text = "电机存在故障！";
                 button_Start.Enabled = true;
+                textBox_PDinfo.Enabled = true;
                 //关机
                 Code[0] = 0xF0;
                 SendCmd(0x7FF, 0x16, 0x2201, Code);
@@ -1087,6 +1091,7 @@ namespace MOTINOVA_Motor_Factory_Set
                     label_Step.Text = "系统清除失败，测试结束！";
                     richTextBox_TestRecord.Text += DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "->" + "系统清除失败，测试结束" + "\r\n";
                     button_Start.Enabled = true;
+                    textBox_PDinfo.Enabled = true;
                     //关机
                     Code[0] = 0xF0;
                     SendCmd(0x7FF, 0x16, 0x2201, Code);
@@ -1131,6 +1136,7 @@ namespace MOTINOVA_Motor_Factory_Set
                     label_Step.Text = "系统复位失败，测试结束！";
                     richTextBox_TestRecord.Text += DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "->" + "系统复位失败，测试结束" + "\r\n";
                     button_Start.Enabled = true;
+                    textBox_PDinfo.Enabled = true;
                     //关机
                     Code[0] = 0xF0;
                     SendCmd(0x7FF, 0x16, 0x2201, Code);
@@ -1172,6 +1178,7 @@ namespace MOTINOVA_Motor_Factory_Set
                     开ToolStripMenuItem.Checked = false;
                     关ToolStripMenuItem.Checked = true;
                     button_Start.Enabled = true;
+                    textBox_PDinfo.Enabled = true;
                     Delay_ms(500);
                     //关闭串口
                     portsettings_form.closePort();
@@ -1226,6 +1233,7 @@ namespace MOTINOVA_Motor_Factory_Set
                 开ToolStripMenuItem.Checked = false;
                 关ToolStripMenuItem.Checked = true;
                 button_Start.Enabled = true;
+                textBox_PDinfo.Enabled = true;
                 Delay_ms(500);
                 //关闭串口
                 portsettings_form.closePort();
@@ -1267,6 +1275,7 @@ namespace MOTINOVA_Motor_Factory_Set
                 开ToolStripMenuItem.Checked = false;
                 关ToolStripMenuItem.Checked = true;
                 button_Start.Enabled = true;
+                textBox_PDinfo.Enabled = true;
                 Delay_ms(500);
                 //关闭串口
                 portsettings_form.closePort();
@@ -1364,6 +1373,7 @@ namespace MOTINOVA_Motor_Factory_Set
                 开ToolStripMenuItem.Checked = false;
                 关ToolStripMenuItem.Checked = true;
                 button_Start.Enabled = true;
+                textBox_PDinfo.Enabled = true;
                 Delay_ms(500);
                 //关闭串口
                 portsettings_form.closePort();
@@ -1413,6 +1423,7 @@ namespace MOTINOVA_Motor_Factory_Set
                 开ToolStripMenuItem.Checked = false;
                 关ToolStripMenuItem.Checked = true;
                 button_Start.Enabled = true;
+                textBox_PDinfo.Enabled = true;
                 Delay_ms(500);
                 //关闭串口
                 portsettings_form.closePort();
@@ -1471,6 +1482,7 @@ namespace MOTINOVA_Motor_Factory_Set
                 开ToolStripMenuItem.Checked = false;
                 关ToolStripMenuItem.Checked = true;
                 button_Start.Enabled = true;
+                textBox_PDinfo.Enabled = true;
                 Delay_ms(500);
                 //关闭串口
                 portsettings_form.closePort();
@@ -1519,6 +1531,7 @@ namespace MOTINOVA_Motor_Factory_Set
                 开ToolStripMenuItem.Checked = false;
                 关ToolStripMenuItem.Checked = true;
                 button_Start.Enabled = true;
+                textBox_PDinfo.Enabled = true;
                 Delay_ms(500);
                 //关闭串口
                 portsettings_form.closePort();
@@ -1563,6 +1576,7 @@ namespace MOTINOVA_Motor_Factory_Set
                 开ToolStripMenuItem.Checked = false;
                 关ToolStripMenuItem.Checked = true;
                 button_Start.Enabled = true;
+                textBox_PDinfo.Enabled = true;
                 Delay_ms(500);
                 //关闭串口
                 portsettings_form.closePort();
@@ -1608,6 +1622,7 @@ namespace MOTINOVA_Motor_Factory_Set
                 开ToolStripMenuItem.Checked = false;
                 关ToolStripMenuItem.Checked = true;
                 button_Start.Enabled = true;
+                textBox_PDinfo.Enabled = true;
                 Delay_ms(500);
                 //关闭串口
                 portsettings_form.closePort();
@@ -1650,6 +1665,7 @@ namespace MOTINOVA_Motor_Factory_Set
                 开ToolStripMenuItem.Checked = false;
                 关ToolStripMenuItem.Checked = true;
                 button_Start.Enabled = true;
+                textBox_PDinfo.Enabled = true;
                 Delay_ms(500);
                 //关闭串口
                 portsettings_form.closePort();
@@ -1692,6 +1708,7 @@ namespace MOTINOVA_Motor_Factory_Set
                 开ToolStripMenuItem.Checked = false;
                 关ToolStripMenuItem.Checked = true;
                 button_Start.Enabled = true;
+                textBox_PDinfo.Enabled = true;
                 Delay_ms(500);
                 //关闭串口
                 portsettings_form.closePort();
@@ -1747,6 +1764,7 @@ namespace MOTINOVA_Motor_Factory_Set
                     开ToolStripMenuItem.Checked = false;
                     关ToolStripMenuItem.Checked = true;
                     button_Start.Enabled = true;
+                    textBox_PDinfo.Enabled = true;
                     radioButton_Light_OK.Enabled = false;
                     radioButton_Light_NG.Enabled = false;
                     Delay_ms(500);
@@ -1783,6 +1801,7 @@ namespace MOTINOVA_Motor_Factory_Set
                     开ToolStripMenuItem.Checked = false;
                     关ToolStripMenuItem.Checked = true;
                     button_Start.Enabled = true;
+                    textBox_PDinfo.Enabled = true;
                     Delay_ms(500);
                     //关闭串口
                     portsettings_form.closePort();
@@ -1807,6 +1826,7 @@ namespace MOTINOVA_Motor_Factory_Set
                     开ToolStripMenuItem.Checked = false;
                     关ToolStripMenuItem.Checked = true;
                     button_Start.Enabled = true;
+                    textBox_PDinfo.Enabled = true;
                     Delay_ms(500);
                     //关闭串口
                     portsettings_form.closePort();
@@ -1851,6 +1871,7 @@ namespace MOTINOVA_Motor_Factory_Set
                             开ToolStripMenuItem.Checked = false;
                             关ToolStripMenuItem.Checked = true;
                             button_Start.Enabled = true;
+                            textBox_PDinfo.Enabled = true;
                             Delay_ms(500);
                             //关闭串口
                             portsettings_form.closePort();
@@ -1883,6 +1904,7 @@ namespace MOTINOVA_Motor_Factory_Set
                         开ToolStripMenuItem.Checked = false;
                         关ToolStripMenuItem.Checked = true;
                         button_Start.Enabled = true;
+                        textBox_PDinfo.Enabled = true;
                         Delay_ms(500);
                         //关闭串口
                         portsettings_form.closePort();
@@ -1914,6 +1936,7 @@ namespace MOTINOVA_Motor_Factory_Set
                     //    开ToolStripMenuItem.Checked = false;
                     //    关ToolStripMenuItem.Checked = true;
                     //    button_Start.Enabled = true;
+                    //    textBox_PDinfo.Enabled = true;
                     //    Delay_ms(500);
                     //    //关闭串口
                     //    portsettings_form.closePort();
@@ -1945,6 +1968,7 @@ namespace MOTINOVA_Motor_Factory_Set
                         开ToolStripMenuItem.Checked = false;
                         关ToolStripMenuItem.Checked = true;
                         button_Start.Enabled = true;
+                        textBox_PDinfo.Enabled = true;
                         Delay_ms(500);
                         //关闭串口
                         portsettings_form.closePort();
@@ -1976,6 +2000,7 @@ namespace MOTINOVA_Motor_Factory_Set
                         开ToolStripMenuItem.Checked = false;
                         关ToolStripMenuItem.Checked = true;
                         button_Start.Enabled = true;
+                        textBox_PDinfo.Enabled = true;
                         Delay_ms(500);
                         //关闭串口
                         portsettings_form.closePort();
@@ -2007,6 +2032,7 @@ namespace MOTINOVA_Motor_Factory_Set
                         开ToolStripMenuItem.Checked = false;
                         关ToolStripMenuItem.Checked = true;
                         button_Start.Enabled = true;
+                        textBox_PDinfo.Enabled = true;
                         Delay_ms(500);
                         //关闭串口
                         portsettings_form.closePort();
@@ -2038,6 +2064,7 @@ namespace MOTINOVA_Motor_Factory_Set
                         开ToolStripMenuItem.Checked = false;
                         关ToolStripMenuItem.Checked = true;
                         button_Start.Enabled = true;
+                        textBox_PDinfo.Enabled = true;
                         Delay_ms(500);
                         //关闭串口
                         portsettings_form.closePort();
@@ -2069,6 +2096,7 @@ namespace MOTINOVA_Motor_Factory_Set
                         开ToolStripMenuItem.Checked = false;
                         关ToolStripMenuItem.Checked = true;
                         button_Start.Enabled = true;
+                        textBox_PDinfo.Enabled = true;
                         Delay_ms(500);
                         //关闭串口
                         portsettings_form.closePort();
@@ -2112,6 +2140,7 @@ namespace MOTINOVA_Motor_Factory_Set
                         开ToolStripMenuItem.Checked = false;
                         关ToolStripMenuItem.Checked = true;
                         button_Start.Enabled = true;
+                        textBox_PDinfo.Enabled = true;
                         Delay_ms(500);
                         //关闭串口
                         portsettings_form.closePort();
@@ -2148,6 +2177,7 @@ namespace MOTINOVA_Motor_Factory_Set
                         开ToolStripMenuItem.Checked = false;
                         关ToolStripMenuItem.Checked = true;
                         button_Start.Enabled = true;
+                        textBox_PDinfo.Enabled = true;
                         Delay_ms(500);
                         //关闭串口
                         portsettings_form.closePort();
@@ -2167,6 +2197,7 @@ namespace MOTINOVA_Motor_Factory_Set
                     开ToolStripMenuItem.Checked = false;
                     关ToolStripMenuItem.Checked = true;
                     button_Start.Enabled = true;
+                    textBox_PDinfo.Enabled = true;
                     Delay_ms(500);
                     //关闭串口
                     portsettings_form.closePort();
@@ -2194,6 +2225,7 @@ namespace MOTINOVA_Motor_Factory_Set
                         开ToolStripMenuItem.Checked = false;
                         关ToolStripMenuItem.Checked = true;
                         button_Start.Enabled = true;
+                        textBox_PDinfo.Enabled = true;
                         Delay_ms(500);
                         //关闭串口
                         portsettings_form.closePort();
@@ -2228,6 +2260,7 @@ namespace MOTINOVA_Motor_Factory_Set
                     开ToolStripMenuItem.Checked = false;
                     关ToolStripMenuItem.Checked = true;
                     button_Start.Enabled = true;
+                    textBox_PDinfo.Enabled = true;
                     Delay_ms(500);
                     //关闭串口
                     portsettings_form.closePort();
@@ -2249,6 +2282,7 @@ namespace MOTINOVA_Motor_Factory_Set
                         开ToolStripMenuItem.Checked = false;
                         关ToolStripMenuItem.Checked = true;
                         button_Start.Enabled = true;
+                        textBox_PDinfo.Enabled = true;
                         Delay_ms(500);
                         //关闭串口
                         portsettings_form.closePort();
@@ -2297,6 +2331,7 @@ namespace MOTINOVA_Motor_Factory_Set
                             开ToolStripMenuItem.Checked = false;
                             关ToolStripMenuItem.Checked = true;
                             button_Start.Enabled = true;
+                            textBox_PDinfo.Enabled = true;
                             Delay_ms(500);
                             //关闭串口
                             portsettings_form.closePort();
@@ -2327,6 +2362,7 @@ namespace MOTINOVA_Motor_Factory_Set
                         开ToolStripMenuItem.Checked = false;
                         关ToolStripMenuItem.Checked = true;
                         button_Start.Enabled = true;
+                        textBox_PDinfo.Enabled = true;
                         Delay_ms(500);
                         //关闭串口
                         portsettings_form.closePort();
@@ -2401,6 +2437,7 @@ namespace MOTINOVA_Motor_Factory_Set
                 开ToolStripMenuItem.Checked = false;
                 关ToolStripMenuItem.Checked = true;
                 button_Start.Enabled = true;
+                textBox_PDinfo.Enabled = true;
                 Delay_ms(500);
                 //关闭串口
                 portsettings_form.closePort();
@@ -2424,6 +2461,7 @@ namespace MOTINOVA_Motor_Factory_Set
                             开ToolStripMenuItem.Checked = false;
                             关ToolStripMenuItem.Checked = true;
                             button_Start.Enabled = true;
+                            textBox_PDinfo.Enabled = true;
                             Delay_ms(500);
                             //关闭串口
                             portsettings_form.closePort();
@@ -2449,6 +2487,7 @@ namespace MOTINOVA_Motor_Factory_Set
                 开ToolStripMenuItem.Checked = false;
                 关ToolStripMenuItem.Checked = true;
                 button_Start.Enabled = true;
+                textBox_PDinfo.Enabled = true;
                 Delay_ms(500);
                 //关闭串口
                 portsettings_form.closePort();
@@ -2630,6 +2669,7 @@ namespace MOTINOVA_Motor_Factory_Set
                 开ToolStripMenuItem.Checked = false;
                 关ToolStripMenuItem.Checked = true;
                 button_Start.Enabled = true;
+                textBox_PDinfo.Enabled = true;
                 Delay_ms(500);
                 //关闭串口
                 portsettings_form.closePort();
@@ -2650,6 +2690,7 @@ namespace MOTINOVA_Motor_Factory_Set
             开ToolStripMenuItem.Checked = false;
             关ToolStripMenuItem.Checked = true;
             button_Start.Enabled = true;
+            textBox_PDinfo.Enabled = true;
             Delay_ms(500);
             //关闭串口
             portsettings_form.closePort();
@@ -2748,6 +2789,7 @@ namespace MOTINOVA_Motor_Factory_Set
             }
 
             //测试正常，清空扫码信息
+            Delay_ms(1000);
             textBox_PDinfo.Text = "";
         }
 
@@ -2896,6 +2938,7 @@ namespace MOTINOVA_Motor_Factory_Set
             }
 
             button_Start.Enabled = false;
+            textBox_PDinfo.Enabled = false;
 
             //创建线程，执行测试任务
             Thread th = new Thread(Thread_Task);

StartForm.Designer.cs

@@ -118,7 +118,7 @@
             this.label_Ver.Name = "label_Ver";
             this.label_Ver.Size = new System.Drawing.Size(316, 21);
             this.label_Ver.TabIndex = 2;
-            this.label_Ver.Text = "Ver: V1.4.3 Build Time: 2022-07-01 11:26";
+            this.label_Ver.Text = "Ver: V1.4.4 Build Time: 2022-07-07 15:02";
             // 
             // label_NetStatus
             // 

bin/Debug/CheckSerialNum

@@ -1,4 +1,4 @@
 流水号:
-25
+32
 合格计数:
-8
+11

bin/Debug/MOTINOVA_Motor_Factory_Set.application

@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>cxfz0W3/Ve/wgpuoQddCfzysEBmNUSk1XUJkKYwPSuI=</dsig:DigestValue>
+        <dsig:DigestValue>UsKnuOVhfvoA40pStgJjOK6pk4l+sl0keaxC8ZtbUr8=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

bin/Debug/MOTINOVA_Motor_Factory_Set.exe.manifest

@@ -78,14 +78,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="MOTINOVA_Motor_Factory_Set.exe" size="712192">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="MOTINOVA_Motor_Factory_Set.exe" size="714240">
       <assemblyIdentity name="MOTINOVA_Motor_Factory_Set" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>zm3Tfc/spe2YIo3dJRnvz2aUlMi6dXX9hIjG5jweULU=</dsig:DigestValue>
+        <dsig:DigestValue>vP4ks7OZntigyKqUa0TZ0F5nye5mNrl/tL80vMU+piQ=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

bin/Debug/TestSerialNum

@@ -1,4 +1,4 @@
 流水号:
-18
+31
 合格计数:
-4
+8

obj/Debug/MOTINOVA_Motor_Factory_Set.application

@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>cxfz0W3/Ve/wgpuoQddCfzysEBmNUSk1XUJkKYwPSuI=</dsig:DigestValue>
+        <dsig:DigestValue>UsKnuOVhfvoA40pStgJjOK6pk4l+sl0keaxC8ZtbUr8=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

obj/Debug/MOTINOVA_Motor_Factory_Set.exe.manifest

@@ -78,14 +78,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="MOTINOVA_Motor_Factory_Set.exe" size="712192">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="MOTINOVA_Motor_Factory_Set.exe" size="714240">
       <assemblyIdentity name="MOTINOVA_Motor_Factory_Set" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>zm3Tfc/spe2YIo3dJRnvz2aUlMi6dXX9hIjG5jweULU=</dsig:DigestValue>
+        <dsig:DigestValue>vP4ks7OZntigyKqUa0TZ0F5nye5mNrl/tL80vMU+piQ=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>