1、用户参数增加限速微调值。

CheckForm.cs

@@ -617,6 +617,8 @@ namespace MOTINOVA_Motor_Factory_Set
                                     richTextBox_ReadCfg.Text += "报警阈值," + ((ushort)(binary_data_1[11] * 256 + binary_data_1[10])).ToString() + "\r\n";
                                     richTextBox_ReadCfg.Text += "尾灯脉宽," + ((ushort)(binary_data_1[13] * 256 + binary_data_1[12])).ToString() + "\r\n";
                                     richTextBox_ReadCfg.Text += "尾灯周期," + ((ushort)(binary_data_1[15] * 256 + binary_data_1[14])).ToString() + "\r\n";
+                                    richTextBox_ReadCfg.Text += "起始限速," + binary_data_1[16].ToString() + "\r\n";
+                                    richTextBox_ReadCfg.Text += "结束限速," + binary_data_1[17].ToString() + "\r\n";
                                 }));
                             }
                             break;

ExportForm.Designer.cs

@@ -92,6 +92,12 @@
             this.label29 = new System.Windows.Forms.Label();
             this.comboBox_StartMode = new System.Windows.Forms.ComboBox();
             this.groupBox3 = new System.Windows.Forms.GroupBox();
+            this.label67 = new System.Windows.Forms.Label();
+            this.textBox_LightPeriod = new System.Windows.Forms.TextBox();
+            this.label66 = new System.Windows.Forms.Label();
+            this.textBox_LightPluse = new System.Windows.Forms.TextBox();
+            this.label65 = new System.Windows.Forms.Label();
+            this.textBox_AlarmSpeed = new System.Windows.Forms.TextBox();
             this.label59 = new System.Windows.Forms.Label();
             this.label58 = new System.Windows.Forms.Label();
             this.label3 = new System.Windows.Forms.Label();
@@ -172,12 +178,15 @@
             this.pictureBox2 = new System.Windows.Forms.PictureBox();
             this.pictureBox1 = new System.Windows.Forms.PictureBox();
             this.button_keyboard = new System.Windows.Forms.Button();
-            this.label65 = new System.Windows.Forms.Label();
-            this.textBox_AlarmSpeed = new System.Windows.Forms.TextBox();
-            this.label66 = new System.Windows.Forms.Label();
-            this.textBox_LightPluse = new System.Windows.Forms.TextBox();
-            this.label67 = new System.Windows.Forms.Label();
-            this.textBox_LightPeriod = new System.Windows.Forms.TextBox();
+            this.label68 = new System.Windows.Forms.Label();
+            this.textBox_LimitSpeedStop = new System.Windows.Forms.TextBox();
+            this.label69 = new System.Windows.Forms.Label();
+            this.textBox_LimitSpeedStart = new System.Windows.Forms.TextBox();
+            this.label_UnlockParams1 = new System.Windows.Forms.Label();
+            this.label_UnlockParams2 = new System.Windows.Forms.Label();
+            this.label_UnlockParams3 = new System.Windows.Forms.Label();
+            this.label_UnlockParams4 = new System.Windows.Forms.Label();
+            this.label74 = new System.Windows.Forms.Label();
             this.groupBox2.SuspendLayout();
             this.groupBox3.SuspendLayout();
             this.groupBox7.SuspendLayout();
@@ -195,7 +204,7 @@
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(113)))), ((int)(((byte)(185)))));
-            this.label2.Location = new System.Drawing.Point(8, 578);
+            this.label2.Location = new System.Drawing.Point(8, 647);
             this.label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(423, 21);
@@ -871,6 +880,10 @@
             // 
             // groupBox3
             // 
+            this.groupBox3.Controls.Add(this.label68);
+            this.groupBox3.Controls.Add(this.textBox_LimitSpeedStop);
+            this.groupBox3.Controls.Add(this.label69);
+            this.groupBox3.Controls.Add(this.textBox_LimitSpeedStart);
             this.groupBox3.Controls.Add(this.label67);
             this.groupBox3.Controls.Add(this.textBox_LightPeriod);
             this.groupBox3.Controls.Add(this.label66);
@@ -892,11 +905,68 @@
             this.groupBox3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(113)))), ((int)(((byte)(185)))));
             this.groupBox3.Location = new System.Drawing.Point(12, 413);
             this.groupBox3.Name = "groupBox3";
-            this.groupBox3.Size = new System.Drawing.Size(547, 139);
+            this.groupBox3.Size = new System.Drawing.Size(547, 182);
             this.groupBox3.TabIndex = 4;
             this.groupBox3.TabStop = false;
             this.groupBox3.Text = "用户参数2";
             // 
+            // label67
+            // 
+            this.label67.AutoSize = true;
+            this.label67.Location = new System.Drawing.Point(363, 102);
+            this.label67.Name = "label67";
+            this.label67.Size = new System.Drawing.Size(74, 21);
+            this.label67.TabIndex = 7;
+            this.label67.Text = "尾灯周期";
+            // 
+            // textBox_LightPeriod
+            // 
+            this.textBox_LightPeriod.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.textBox_LightPeriod.ForeColor = System.Drawing.Color.Black;
+            this.textBox_LightPeriod.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.textBox_LightPeriod.Location = new System.Drawing.Point(463, 98);
+            this.textBox_LightPeriod.Name = "textBox_LightPeriod";
+            this.textBox_LightPeriod.Size = new System.Drawing.Size(70, 29);
+            this.textBox_LightPeriod.TabIndex = 8;
+            // 
+            // label66
+            // 
+            this.label66.AutoSize = true;
+            this.label66.Location = new System.Drawing.Point(181, 102);
+            this.label66.Name = "label66";
+            this.label66.Size = new System.Drawing.Size(74, 21);
+            this.label66.TabIndex = 5;
+            this.label66.Text = "尾灯脉宽";
+            // 
+            // textBox_LightPluse
+            // 
+            this.textBox_LightPluse.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.textBox_LightPluse.ForeColor = System.Drawing.Color.Black;
+            this.textBox_LightPluse.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.textBox_LightPluse.Location = new System.Drawing.Point(288, 98);
+            this.textBox_LightPluse.Name = "textBox_LightPluse";
+            this.textBox_LightPluse.Size = new System.Drawing.Size(70, 29);
+            this.textBox_LightPluse.TabIndex = 6;
+            // 
+            // label65
+            // 
+            this.label65.AutoSize = true;
+            this.label65.Location = new System.Drawing.Point(6, 102);
+            this.label65.Name = "label65";
+            this.label65.Size = new System.Drawing.Size(74, 21);
+            this.label65.TabIndex = 3;
+            this.label65.Text = "报警阈值";
+            // 
+            // textBox_AlarmSpeed
+            // 
+            this.textBox_AlarmSpeed.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.textBox_AlarmSpeed.ForeColor = System.Drawing.Color.Black;
+            this.textBox_AlarmSpeed.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.textBox_AlarmSpeed.Location = new System.Drawing.Point(105, 98);
+            this.textBox_AlarmSpeed.Name = "textBox_AlarmSpeed";
+            this.textBox_AlarmSpeed.Size = new System.Drawing.Size(70, 29);
+            this.textBox_AlarmSpeed.TabIndex = 4;
+            // 
             // label59
             // 
             this.label59.AutoSize = true;
@@ -1055,7 +1125,7 @@
             this.groupBox7.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(113)))), ((int)(((byte)(185)))));
             this.groupBox7.Location = new System.Drawing.Point(565, 413);
             this.groupBox7.Name = "groupBox7";
-            this.groupBox7.Size = new System.Drawing.Size(298, 139);
+            this.groupBox7.Size = new System.Drawing.Size(298, 182);
             this.groupBox7.TabIndex = 4;
             this.groupBox7.TabStop = false;
             this.groupBox7.Text = "自定义信息";
@@ -1380,9 +1450,9 @@
             // 
             this.button_Generate.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(113)))), ((int)(((byte)(185)))));
             this.button_Generate.ForeColor = System.Drawing.Color.White;
-            this.button_Generate.Location = new System.Drawing.Point(1025, 560);
+            this.button_Generate.Location = new System.Drawing.Point(1008, 611);
             this.button_Generate.Name = "button_Generate";
-            this.button_Generate.Size = new System.Drawing.Size(80, 41);
+            this.button_Generate.Size = new System.Drawing.Size(95, 55);
             this.button_Generate.TabIndex = 6;
             this.button_Generate.Text = "生成";
             this.button_Generate.UseVisualStyleBackColor = false;
@@ -1392,9 +1462,9 @@
             // 
             this.button_Default.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(113)))), ((int)(((byte)(185)))));
             this.button_Default.ForeColor = System.Drawing.Color.White;
-            this.button_Default.Location = new System.Drawing.Point(905, 560);
+            this.button_Default.Location = new System.Drawing.Point(869, 611);
             this.button_Default.Name = "button_Default";
-            this.button_Default.Size = new System.Drawing.Size(80, 41);
+            this.button_Default.Size = new System.Drawing.Size(95, 55);
             this.button_Default.TabIndex = 6;
             this.button_Default.Text = "默认";
             this.button_Default.UseVisualStyleBackColor = false;
@@ -1583,7 +1653,7 @@
             this.groupBox8.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(113)))), ((int)(((byte)(185)))));
             this.groupBox8.Location = new System.Drawing.Point(869, 340);
             this.groupBox8.Name = "groupBox8";
-            this.groupBox8.Size = new System.Drawing.Size(236, 212);
+            this.groupBox8.Size = new System.Drawing.Size(236, 255);
             this.groupBox8.TabIndex = 5;
             this.groupBox8.TabStop = false;
             this.groupBox8.Text = "测试阈值";
@@ -1736,7 +1806,7 @@
             // pictureBox2
             // 
             this.pictureBox2.Image = global::MOTINOVA_Motor_Factory_Set.Properties.Resources._836618239619717251;
-            this.pictureBox2.Location = new System.Drawing.Point(565, 558);
+            this.pictureBox2.Location = new System.Drawing.Point(12, 601);
             this.pictureBox2.Name = "pictureBox2";
             this.pictureBox2.Size = new System.Drawing.Size(83, 43);
             this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
@@ -1746,7 +1816,7 @@
             // pictureBox1
             // 
             this.pictureBox1.Image = global::MOTINOVA_Motor_Factory_Set.Properties.Resources.title1;
-            this.pictureBox1.Location = new System.Drawing.Point(657, 568);
+            this.pictureBox1.Location = new System.Drawing.Point(104, 611);
             this.pictureBox1.Name = "pictureBox1";
             this.pictureBox1.Size = new System.Drawing.Size(136, 33);
             this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
@@ -1757,77 +1827,112 @@
             // 
             this.button_keyboard.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(113)))), ((int)(((byte)(185)))));
             this.button_keyboard.ForeColor = System.Drawing.Color.White;
-            this.button_keyboard.Location = new System.Drawing.Point(465, 560);
+            this.button_keyboard.Location = new System.Drawing.Point(465, 611);
             this.button_keyboard.Name = "button_keyboard";
-            this.button_keyboard.Size = new System.Drawing.Size(94, 41);
+            this.button_keyboard.Size = new System.Drawing.Size(95, 55);
             this.button_keyboard.TabIndex = 35;
             this.button_keyboard.Text = "屏幕键盘";
             this.button_keyboard.UseVisualStyleBackColor = false;
             this.button_keyboard.Click += new System.EventHandler(this.button_keyboard_Click);
             // 
-            // label65
-            // 
-            this.label65.AutoSize = true;
-            this.label65.Location = new System.Drawing.Point(6, 102);
-            this.label65.Name = "label65";
-            this.label65.Size = new System.Drawing.Size(74, 21);
-            this.label65.TabIndex = 3;
-            this.label65.Text = "报警阈值";
-            // 
-            // textBox_AlarmSpeed
-            // 
-            this.textBox_AlarmSpeed.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            this.textBox_AlarmSpeed.ForeColor = System.Drawing.Color.Black;
-            this.textBox_AlarmSpeed.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.textBox_AlarmSpeed.Location = new System.Drawing.Point(105, 98);
-            this.textBox_AlarmSpeed.Name = "textBox_AlarmSpeed";
-            this.textBox_AlarmSpeed.Size = new System.Drawing.Size(70, 29);
-            this.textBox_AlarmSpeed.TabIndex = 4;
-            // 
-            // label66
-            // 
-            this.label66.AutoSize = true;
-            this.label66.Location = new System.Drawing.Point(181, 102);
-            this.label66.Name = "label66";
-            this.label66.Size = new System.Drawing.Size(74, 21);
-            this.label66.TabIndex = 5;
-            this.label66.Text = "尾灯脉宽";
-            // 
-            // textBox_LightPluse
-            // 
-            this.textBox_LightPluse.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            this.textBox_LightPluse.ForeColor = System.Drawing.Color.Black;
-            this.textBox_LightPluse.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.textBox_LightPluse.Location = new System.Drawing.Point(288, 98);
-            this.textBox_LightPluse.Name = "textBox_LightPluse";
-            this.textBox_LightPluse.Size = new System.Drawing.Size(70, 29);
-            this.textBox_LightPluse.TabIndex = 6;
-            // 
-            // label67
-            // 
-            this.label67.AutoSize = true;
-            this.label67.Location = new System.Drawing.Point(363, 102);
-            this.label67.Name = "label67";
-            this.label67.Size = new System.Drawing.Size(74, 21);
-            this.label67.TabIndex = 7;
-            this.label67.Text = "尾灯周期";
-            // 
-            // textBox_LightPeriod
-            // 
-            this.textBox_LightPeriod.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            this.textBox_LightPeriod.ForeColor = System.Drawing.Color.Black;
-            this.textBox_LightPeriod.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.textBox_LightPeriod.Location = new System.Drawing.Point(463, 98);
-            this.textBox_LightPeriod.Name = "textBox_LightPeriod";
-            this.textBox_LightPeriod.Size = new System.Drawing.Size(70, 29);
-            this.textBox_LightPeriod.TabIndex = 8;
+            // label68
+            // 
+            this.label68.AutoSize = true;
+            this.label68.Location = new System.Drawing.Point(181, 136);
+            this.label68.Name = "label68";
+            this.label68.Size = new System.Drawing.Size(74, 21);
+            this.label68.TabIndex = 11;
+            this.label68.Text = "结束限速";
+            // 
+            // textBox_LimitSpeedStop
+            // 
+            this.textBox_LimitSpeedStop.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.textBox_LimitSpeedStop.ForeColor = System.Drawing.Color.Black;
+            this.textBox_LimitSpeedStop.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.textBox_LimitSpeedStop.Location = new System.Drawing.Point(288, 132);
+            this.textBox_LimitSpeedStop.Name = "textBox_LimitSpeedStop";
+            this.textBox_LimitSpeedStop.Size = new System.Drawing.Size(70, 29);
+            this.textBox_LimitSpeedStop.TabIndex = 12;
+            // 
+            // label69
+            // 
+            this.label69.AutoSize = true;
+            this.label69.Location = new System.Drawing.Point(6, 136);
+            this.label69.Name = "label69";
+            this.label69.Size = new System.Drawing.Size(74, 21);
+            this.label69.TabIndex = 9;
+            this.label69.Text = "起始限速";
+            // 
+            // textBox_LimitSpeedStart
+            // 
+            this.textBox_LimitSpeedStart.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.textBox_LimitSpeedStart.ForeColor = System.Drawing.Color.Black;
+            this.textBox_LimitSpeedStart.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.textBox_LimitSpeedStart.Location = new System.Drawing.Point(105, 132);
+            this.textBox_LimitSpeedStart.Name = "textBox_LimitSpeedStart";
+            this.textBox_LimitSpeedStart.Size = new System.Drawing.Size(70, 29);
+            this.textBox_LimitSpeedStart.TabIndex = 10;
+            // 
+            // label_UnlockParams1
+            // 
+            this.label_UnlockParams1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
+            this.label_UnlockParams1.Location = new System.Drawing.Point(645, 613);
+            this.label_UnlockParams1.Name = "label_UnlockParams1";
+            this.label_UnlockParams1.Size = new System.Drawing.Size(50, 50);
+            this.label_UnlockParams1.TabIndex = 3;
+            this.label_UnlockParams1.MouseHover += new System.EventHandler(this.label_UnlockParams1_MouseHover);
+            // 
+            // label_UnlockParams2
+            // 
+            this.label_UnlockParams2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
+            this.label_UnlockParams2.Location = new System.Drawing.Point(699, 613);
+            this.label_UnlockParams2.Name = "label_UnlockParams2";
+            this.label_UnlockParams2.Size = new System.Drawing.Size(50, 50);
+            this.label_UnlockParams2.TabIndex = 36;
+            this.label_UnlockParams2.MouseHover += new System.EventHandler(this.label_UnlockParams2_MouseHover);
+            // 
+            // label_UnlockParams3
+            // 
+            this.label_UnlockParams3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+            this.label_UnlockParams3.Location = new System.Drawing.Point(753, 613);
+            this.label_UnlockParams3.Name = "label_UnlockParams3";
+            this.label_UnlockParams3.Size = new System.Drawing.Size(50, 50);
+            this.label_UnlockParams3.TabIndex = 37;
+            this.label_UnlockParams3.MouseHover += new System.EventHandler(this.label_UnlockParams3_MouseHover);
+            // 
+            // label_UnlockParams4
+            // 
+            this.label_UnlockParams4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.label_UnlockParams4.Location = new System.Drawing.Point(807, 613);
+            this.label_UnlockParams4.Name = "label_UnlockParams4";
+            this.label_UnlockParams4.Size = new System.Drawing.Size(50, 50);
+            this.label_UnlockParams4.TabIndex = 38;
+            this.label_UnlockParams4.MouseHover += new System.EventHandler(this.label_UnlockParams4_MouseHover);
+            // 
+            // label74
+            // 
+            this.label74.AutoSize = true;
+            this.label74.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label74.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(113)))), ((int)(((byte)(185)))));
+            this.label74.Location = new System.Drawing.Point(571, 617);
+            this.label74.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.label74.Name = "label74";
+            this.label74.Size = new System.Drawing.Size(74, 42);
+            this.label74.TabIndex = 39;
+            this.label74.Text = "双击颜色\r\n块解锁";
+            this.label74.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // ExportForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.White;
-            this.ClientSize = new System.Drawing.Size(1115, 608);
+            this.ClientSize = new System.Drawing.Size(1115, 677);
+            this.Controls.Add(this.label74);
+            this.Controls.Add(this.label_UnlockParams4);
+            this.Controls.Add(this.label_UnlockParams3);
+            this.Controls.Add(this.label_UnlockParams2);
+            this.Controls.Add(this.label_UnlockParams1);
             this.Controls.Add(this.button_keyboard);
             this.Controls.Add(this.pictureBox2);
             this.Controls.Add(this.pictureBox1);
@@ -2025,5 +2130,14 @@
         private System.Windows.Forms.TextBox textBox_LightPeriod;
         private System.Windows.Forms.Label label66;
         private System.Windows.Forms.TextBox textBox_LightPluse;
+        private System.Windows.Forms.Label label68;
+        private System.Windows.Forms.TextBox textBox_LimitSpeedStop;
+        private System.Windows.Forms.Label label69;
+        private System.Windows.Forms.TextBox textBox_LimitSpeedStart;
+        private System.Windows.Forms.Label label_UnlockParams1;
+        private System.Windows.Forms.Label label_UnlockParams2;
+        private System.Windows.Forms.Label label_UnlockParams3;
+        private System.Windows.Forms.Label label_UnlockParams4;
+        private System.Windows.Forms.Label label74;
     }
 }

ExportForm.cs

@@ -88,6 +88,8 @@ namespace MOTINOVA_Motor_Factory_Set
             Params2.Add("报警阈值", 150);//放大10倍
             Params2.Add("尾灯脉宽", 70);
             Params2.Add("尾灯周期", 150);
+            Params2.Add("起始限速", 0);            
+            Params2.Add("结束限速", 0);
 
             //马达参数
             MotorParam.Clear();
@@ -232,7 +234,8 @@ namespace MOTINOVA_Motor_Factory_Set
             textBox_AlarmSpeed.Text = ((float)(Params2["报警阈值"]) / 10.0f).ToString("#0.0");
             textBox_LightPluse.Text = Params2["尾灯脉宽"].ToString();
             textBox_LightPeriod.Text = Params2["尾灯周期"].ToString();
-
+            textBox_LimitSpeedStart.Text = ((float)(Params2["起始限速"]) / 10.0f).ToString("#0.0");
+            textBox_LimitSpeedStop.Text = ((float)(Params2["结束限速"]) / 10.0f).ToString("#0.0");
 
             //马达参数
             textBox_RatePower.Text = MotorParam["额定功率"].ToString();
@@ -265,6 +268,9 @@ namespace MOTINOVA_Motor_Factory_Set
 
             //其它测试备注信息
             textBox_HW_Version.Text = MarkInfo["PCBA版号"];
+
+            //TE版本信息
+            textBox_TE_FW_Version.Text = "N_A";
         }
 
         private bool DisplaySetToParams()
@@ -395,7 +401,7 @@ namespace MOTINOVA_Motor_Factory_Set
                     MessageBox.Show("请检查速度信号来源设置！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning);
                     return false;
                 }
-                Params1.Add("周长微调", Convert.ToUInt16(textBox_WheelSizeAdj.Text));
+                Params1.Add("周长微调", Convert.ToUInt16((byte)(Convert.ToSByte(textBox_WheelSizeAdj.Text))));
                 Params1.Add("低压保护", Convert.ToUInt16(textBox_UV_Protect.Text));//mV
                 Params1.Add("推行限速", Convert.ToUInt16(float.Parse(textBox_Walk_SpeedLimit.Text) * 10));//放大10倍
                 Params1.Add("推行转速", Convert.ToUInt16(textBox_WalkSpeed.Text));
@@ -416,8 +422,8 @@ namespace MOTINOVA_Motor_Factory_Set
                     return false;
                 }
 
-                Params2.Add("俯仰角零偏", Convert.ToUInt16(float.Parse(textBox_Angle_P.Text) * 10));
-                Params2.Add("横滚角零偏", Convert.ToUInt16(float.Parse(textBox_Angle_R.Text) * 10));
+                Params2.Add("俯仰角零偏", Convert.ToUInt16((UInt16)(float.Parse(textBox_Angle_P.Text) * 10)));
+                Params2.Add("横滚角零偏", Convert.ToUInt16((UInt16)(float.Parse(textBox_Angle_R.Text) * 10)));
 
                 if (comboBox_LightMode.Text == "模式 1")
                 {
@@ -478,6 +484,8 @@ namespace MOTINOVA_Motor_Factory_Set
                 Params2.Add("报警阈值", Convert.ToUInt16(float.Parse(textBox_AlarmSpeed.Text) * 10));//放大10倍
                 Params2.Add("尾灯脉宽", Convert.ToUInt16(textBox_LightPluse.Text));
                 Params2.Add("尾灯周期", Convert.ToUInt16(textBox_LightPeriod.Text));
+                Params2.Add("起始限速", Convert.ToUInt16((byte)(float.Parse(textBox_LimitSpeedStart.Text) * 10)));
+                Params2.Add("结束限速", Convert.ToUInt16((byte)(float.Parse(textBox_LimitSpeedStop.Text) * 10)));
 
                 //马达参数
                 MotorParam.Clear();
@@ -655,7 +663,7 @@ namespace MOTINOVA_Motor_Factory_Set
             button_Generate.Text = "转换中";
 
             //保存为Excel文件
-            string importExcelName = "FOQC成机参数检验标准_Temple3.xls";
+            string importExcelName = "FOQC成机参数检验标准_Temple4.xls";
             string exportExcelName = FilePath + Datenow + textBox_Model.Text + "_" + textBox_Client.Text + "_" + ((textBox_Remark.Text == string.Empty) ? "" : textBox_Remark.Text + "_") + DateTime.Now.ToString("yyyy-MM-dd-HHmmss") + ".xls"; 
 
             try
@@ -798,9 +806,13 @@ namespace MOTINOVA_Motor_Factory_Set
                 row = sheet.GetRow(32);
                 row.GetCell(1).SetCellValue(textBox_LightPluse.Text + "\n" + ((float)Convert.ToDouble(textBox_LightPluse.Text) / 15000f).ToString("0.000") + " s");
                 row.GetCell(9).SetCellValue(textBox_LightPeriod.Text + "\n" + ((float)Convert.ToDouble(textBox_LightPeriod.Text) / 15000f).ToString("0.000") + " s");
-                //第34行，第2列超速报警阈值
+                //第34行，第2列超速报警阈值，第11列限速起始偏移
                 row = sheet.GetRow(33);
                 row.GetCell(1).SetCellValue(textBox_AlarmSpeed.Text + " km/h");
+                row.GetCell(9).SetCellValue(textBox_LimitSpeedStart.Text + " km/h");
+                //第35行，第2列限速结束偏移
+                row = sheet.GetRow(34);
+                row.GetCell(1).SetCellValue(textBox_LimitSpeedStop.Text + " km/h");
                 #endregion
 
                 using (FileStream file = File.OpenWrite(exportExcelName))
@@ -961,7 +973,7 @@ namespace MOTINOVA_Motor_Factory_Set
                 textBox_Serial.Text = "3";//系列号
                 textBox_MaxCurrent.Text = "17";//限流
                 textBox_RatePower.Text = "250";//额定功率
-                textBox_RateSpeed.Text = "1600";//额定转速
+                textBox_RateSpeed.Text = "1550";//额定转速
                 textBox_Rate_Vol.Text = "36";//额定电压
                 textBox_NC_Current.Text = "1000";//空载电流
                 textBox_Zero_Min.Text = "100";//零偏下限
@@ -977,7 +989,7 @@ namespace MOTINOVA_Motor_Factory_Set
                 textBox_Serial.Text = "4";//系列号
                 textBox_MaxCurrent.Text = "17";//限流
                 textBox_RatePower.Text = "500";//额定功率
-                textBox_RateSpeed.Text = "1800";//额定转速
+                textBox_RateSpeed.Text = "1650";//额定转速
                 textBox_Rate_Vol.Text = "48";//额定电压
                 textBox_NC_Current.Text = "1000";//空载电流
                 textBox_Zero_Min.Text = "100";//零偏下限
@@ -1074,5 +1086,69 @@ namespace MOTINOVA_Motor_Factory_Set
                 }
             }
         }
+
+        //参数1颜色块
+        private void label_UnlockParams1_MouseHover(object sender, EventArgs e)
+        {
+            // 创建the ToolTip 
+            ToolTip toolTip1 = new ToolTip();
+
+            // 设置显示样式
+            toolTip1.AutoPopDelay = 5000;//提示信息的可见时间
+            toolTip1.InitialDelay = 20;//事件触发多久后出现提示
+            toolTip1.ReshowDelay = 20;//指针从一个控件移向另一个控件时，经过多久才会显示下一个提示框
+            toolTip1.ShowAlways = true;//是否显示提示框
+
+            //  设置伴随的对象.
+            toolTip1.SetToolTip(this.label_UnlockParams1, "依据订单评审表填写");//设置提示按钮和提示内容
+        }
+
+        //参数颜色块2
+        private void label_UnlockParams2_MouseHover(object sender, EventArgs e)
+        {
+            // 创建the ToolTip 
+            ToolTip toolTip1 = new ToolTip();
+
+            // 设置显示样式
+            toolTip1.AutoPopDelay = 5000;//提示信息的可见时间
+            toolTip1.InitialDelay = 20;//事件触发多久后出现提示
+            toolTip1.ReshowDelay = 20;//指针从一个控件移向另一个控件时，经过多久才会显示下一个提示框
+            toolTip1.ShowAlways = true;//是否显示提示框
+
+            //  设置伴随的对象.
+            toolTip1.SetToolTip(this.label_UnlockParams2, "依据产品规格书填写");//设置提示按钮和提示内容
+        }
+
+        //参数颜色块3
+        private void label_UnlockParams3_MouseHover(object sender, EventArgs e)
+        {
+            // 创建the ToolTip 
+            ToolTip toolTip1 = new ToolTip();
+
+            // 设置显示样式
+            toolTip1.AutoPopDelay = 5000;//提示信息的可见时间
+            toolTip1.InitialDelay = 20;//事件触发多久后出现提示
+            toolTip1.ReshowDelay = 100;//指针从一个控件移向另一个控件时，经过多久才会显示下一个提示框
+            toolTip1.ShowAlways = true;//是否显示提示框
+
+            //  设置伴随的对象.
+            toolTip1.SetToolTip(this.label_UnlockParams3, "客户非标准需求");//设置提示按钮和提示内容
+        }
+
+        //参数颜色块4
+        private void label_UnlockParams4_MouseHover(object sender, EventArgs e)
+        {
+            // 创建the ToolTip 
+            ToolTip toolTip1 = new ToolTip();
+
+            // 设置显示样式
+            toolTip1.AutoPopDelay = 5000;//提示信息的可见时间
+            toolTip1.InitialDelay = 20;//事件触发多久后出现提示
+            toolTip1.ReshowDelay = 20;//指针从一个控件移向另一个控件时，经过多久才会显示下一个提示框
+            toolTip1.ShowAlways = true;//是否显示提示框
+
+            //  设置伴随的对象.
+            toolTip1.SetToolTip(this.label_UnlockParams4, "预留参数");//设置提示按钮和提示内容
+        }
     }
 }

ImportForm.Designer.cs

@@ -121,7 +121,7 @@
             this.textBox_Cadence = new System.Windows.Forms.TextBox();
             this.textBox_Torque = new System.Windows.Forms.TextBox();
             this.textBox_MotorSpeed = new System.Windows.Forms.TextBox();
-            this.textBox_MCU = new System.Windows.Forms.TextBox();
+            this.textBox_MOS = new System.Windows.Forms.TextBox();
             this.textBox_Cur = new System.Windows.Forms.TextBox();
             this.textBox_Coil = new System.Windows.Forms.TextBox();
             this.textBox_Vol = new System.Windows.Forms.TextBox();
@@ -1118,7 +1118,7 @@
             this.groupBox9.Controls.Add(this.textBox_Cadence);
             this.groupBox9.Controls.Add(this.textBox_Torque);
             this.groupBox9.Controls.Add(this.textBox_MotorSpeed);
-            this.groupBox9.Controls.Add(this.textBox_MCU);
+            this.groupBox9.Controls.Add(this.textBox_MOS);
             this.groupBox9.Controls.Add(this.textBox_Cur);
             this.groupBox9.Controls.Add(this.textBox_Coil);
             this.groupBox9.Controls.Add(this.textBox_Vol);
@@ -1192,15 +1192,15 @@
             this.textBox_MotorSpeed.Size = new System.Drawing.Size(68, 29);
             this.textBox_MotorSpeed.TabIndex = 8;
             // 
-            // textBox_MCU
+            // textBox_MOS
             // 
-            this.textBox_MCU.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
-            this.textBox_MCU.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(113)))), ((int)(((byte)(185)))));
-            this.textBox_MCU.Location = new System.Drawing.Point(351, 99);
-            this.textBox_MCU.Name = "textBox_MCU";
-            this.textBox_MCU.ReadOnly = true;
-            this.textBox_MCU.Size = new System.Drawing.Size(68, 29);
-            this.textBox_MCU.TabIndex = 5;
+            this.textBox_MOS.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+            this.textBox_MOS.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(113)))), ((int)(((byte)(185)))));
+            this.textBox_MOS.Location = new System.Drawing.Point(351, 99);
+            this.textBox_MOS.Name = "textBox_MOS";
+            this.textBox_MOS.ReadOnly = true;
+            this.textBox_MOS.Size = new System.Drawing.Size(68, 29);
+            this.textBox_MOS.TabIndex = 5;
             // 
             // textBox_Cur
             // 
@@ -1400,9 +1400,9 @@
             this.label27.AutoSize = true;
             this.label27.Location = new System.Drawing.Point(250, 103);
             this.label27.Name = "label27";
-            this.label27.Size = new System.Drawing.Size(97, 21);
+            this.label27.Size = new System.Drawing.Size(96, 21);
             this.label27.TabIndex = 0;
-            this.label27.Text = "MCU温度：";
+            this.label27.Text = "MOS温度：";
             // 
             // label25
             // 
@@ -1691,7 +1691,7 @@
         private System.Windows.Forms.TextBox textBox_Cadence;
         private System.Windows.Forms.TextBox textBox_Torque;
         private System.Windows.Forms.TextBox textBox_MotorSpeed;
-        private System.Windows.Forms.TextBox textBox_MCU;
+        private System.Windows.Forms.TextBox textBox_MOS;
         private System.Windows.Forms.TextBox textBox_Cur;
         private System.Windows.Forms.TextBox textBox_Coil;
         private System.Windows.Forms.TextBox textBox_Vol;

ImportForm.cs

@@ -218,9 +218,8 @@ namespace MOTINOVA_Motor_Factory_Set
                 return;
             }
             //更新推行模式测试判断标准
-            MotorRadeSpeed = Convert.ToUInt16(array_CfgInfo[45].ToString().Split(',')[1]);
-            //RateCadence = (ushort)(MotorRadeSpeed / 11U);
-            RateVoltage = (ushort)(Convert.ToByte(array_CfgInfo[50].ToString().Split(',')[1]) * 1000);
+            MotorRadeSpeed = Convert.ToUInt16(array_CfgInfo[47].ToString().Split(',')[1]);
+            RateVoltage = (ushort)(Convert.ToByte(array_CfgInfo[52].ToString().Split(',')[1]) * 1000);
 
             //更新指拨和速度传感器测试标志
             byte temp = Convert.ToByte(array_CfgInfo[25].ToString().Split(',')[1]);
@@ -231,9 +230,9 @@ namespace MOTINOVA_Motor_Factory_Set
             //更新空载电流和车速传感器判断阈值
             if (array_CfgInfo.Count > 56)//旧版本无改配置项，采用默认值
             {
-                No_load_Current = Convert.ToUInt16(array_CfgInfo[62].ToString().Split(',')[1]);
-                SpeedSensorThData = Convert.ToUInt16(array_CfgInfo[63].ToString().Split(',')[1]);
-                GasModeSpeed = Convert.ToUInt16(array_CfgInfo[64].ToString().Split(',')[1]);
+                No_load_Current = Convert.ToUInt16(array_CfgInfo[64].ToString().Split(',')[1]);
+                SpeedSensorThData = Convert.ToUInt16(array_CfgInfo[65].ToString().Split(',')[1]);
+                GasModeSpeed = Convert.ToUInt16(array_CfgInfo[66].ToString().Split(',')[1]);
             }
         }
         #endregion
@@ -592,7 +591,7 @@ namespace MOTINOVA_Motor_Factory_Set
 
                                     //MCU温度
                                     DataTemp = (ushort)(binary_data_1[25]);
-                                    textBox_MCU.Text = Convert.ToString((int)(DataTemp - 40));
+                                    textBox_MOS.Text = Convert.ToString((int)(DataTemp - 40));
 
                                     Ack_Flag = true;
                                     StepTestFlag = StepTestResult_Enum.StepTestResult_OK;
@@ -1391,13 +1390,13 @@ namespace MOTINOVA_Motor_Factory_Set
             richTextBox_TestRecord.Text += DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "->" + "写入用户参数2" + "\r\n";
             Array.Clear(Code, 0, 32);
             //俯仰角零偏
-            DataTemp_Int16 = (short)(decimal.Parse(array_CfgInfo[34].ToString().Split(',')[1]) * 10);
-            Code[0] = (byte)(DataTemp_Int16 & 0xFF);
-            Code[1] = (byte)(DataTemp_Int16 >> 8);
+            DataTemp = Convert.ToUInt16(array_CfgInfo[34].ToString().Split(',')[1]);
+            Code[0] = (byte)(DataTemp & 0xFF);
+            Code[1] = (byte)(DataTemp >> 8);
             //横滚角零偏
-            DataTemp_Int16 = (short)(decimal.Parse(array_CfgInfo[35].ToString().Split(',')[1]) * 10);
-            Code[2] = (byte)(DataTemp_Int16 & 0xFF);
-            Code[3] = (byte)(DataTemp_Int16 >> 8);
+            DataTemp = Convert.ToUInt16(array_CfgInfo[35].ToString().Split(',')[1]);
+            Code[2] = (byte)(DataTemp & 0xFF);
+            Code[3] = (byte)(DataTemp >> 8);
             //支持姿态传感器
             Code[4] = Convert.ToByte(array_CfgInfo[33].ToString().Split(',')[1]);
             //尾灯模式
@@ -1418,6 +1417,10 @@ namespace MOTINOVA_Motor_Factory_Set
             DataTemp = Convert.ToUInt16(array_CfgInfo[41].ToString().Split(',')[1]);
             Code[12] = (byte)(DataTemp & 0xFF);
             Code[13] = (byte)(DataTemp >> 8);
+            //起始限速
+            Code[14] = Convert.ToByte(array_CfgInfo[42].ToString().Split(',')[1]);
+            //结束限速
+            Code[15] = Convert.ToByte(array_CfgInfo[43].ToString().Split(',')[1]);
             SendCmd((ushort)0x751, (byte)0x16, (ushort)0x3120, Code);
             Ack_Flag = false;
             Ack_Cnt = 0;
@@ -1452,31 +1455,31 @@ namespace MOTINOVA_Motor_Factory_Set
             richTextBox_TestRecord.Text += DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "->" + "写入马达参数" + "\r\n";
             Array.Clear(Code, 0, 32);
             //额定功率
-            DataTemp = Convert.ToUInt16(array_CfgInfo[44].ToString().Split(',')[1]);
+            DataTemp = Convert.ToUInt16(array_CfgInfo[46].ToString().Split(',')[1]);
             Code[0] = (byte)(DataTemp & 0xFF);
             Code[1] = (byte)(DataTemp >> 8);
             //额定转速
-            DataTemp = Convert.ToUInt16(array_CfgInfo[45].ToString().Split(',')[1]);
+            DataTemp = Convert.ToUInt16(array_CfgInfo[47].ToString().Split(',')[1]);
             Code[2] = (byte)(DataTemp & 0xFF);
             Code[3] = (byte)(DataTemp >> 8);
             //定子电阻
-            DataTemp = Convert.ToUInt16(array_CfgInfo[46].ToString().Split(',')[1]);
+            DataTemp = Convert.ToUInt16(array_CfgInfo[48].ToString().Split(',')[1]);
             Code[4] = (byte)(DataTemp & 0xFF);
             Code[5] = (byte)(DataTemp >> 8);
             //Lq
-            DataTemp = Convert.ToUInt16(array_CfgInfo[47].ToString().Split(',')[1]);
+            DataTemp = Convert.ToUInt16(array_CfgInfo[49].ToString().Split(',')[1]);
             Code[6] = (byte)(DataTemp & 0xFF);
             Code[7] = (byte)(DataTemp >> 8);
             //Ld
-            DataTemp = Convert.ToUInt16(array_CfgInfo[48].ToString().Split(',')[1]);
+            DataTemp = Convert.ToUInt16(array_CfgInfo[50].ToString().Split(',')[1]);
             Code[8] = (byte)(DataTemp & 0xFF);
             Code[9] = (byte)(DataTemp >> 8);
             //反电动势
-            DataTemp = Convert.ToUInt16(array_CfgInfo[49].ToString().Split(',')[1]);
+            DataTemp = Convert.ToUInt16(array_CfgInfo[51].ToString().Split(',')[1]);
             Code[10] = (byte)(DataTemp & 0xFF);
             Code[11] = (byte)(DataTemp >> 8);
             //额定电压
-            Code[12] = Convert.ToByte(array_CfgInfo[50].ToString().Split(',')[1]);
+            Code[12] = Convert.ToByte(array_CfgInfo[52].ToString().Split(',')[1]);
             SendCmd((ushort)0x751, (byte)0x16, (ushort)0x1D10, Code);
             Ack_Flag = false;
             Ack_Cnt = 0;
@@ -1511,17 +1514,17 @@ namespace MOTINOVA_Motor_Factory_Set
             Delay_ms(200);
             richTextBox_TestRecord.Text += DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "->" + "写入生产信息" + "\r\n";
             Array.Clear(Code, 0, 32);
-            string MAC_Info = array_CfgInfo[53].ToString().Split(',')[1];
+            string MAC_Info = array_CfgInfo[55].ToString().Split(',')[1];
             for (ushort i = 0; i < ((MAC_Info.Length > 8) ? 8 : MAC_Info.Length); i++)
             {
                 Code[i] = (byte)MAC_Info[i];
             }
-            MAC_Info = array_CfgInfo[54].ToString().Split(',')[1];
+            MAC_Info = array_CfgInfo[56].ToString().Split(',')[1];
             for (ushort i = 0; i < ((MAC_Info.Length > 8) ? 8 : MAC_Info.Length); i++)
             {
                 Code[8 + i] = (byte)MAC_Info[i];
             }
-            MAC_Info = array_CfgInfo[55].ToString().Split(',')[1];
+            MAC_Info = array_CfgInfo[57].ToString().Split(',')[1];
             for (ushort i = 0; i < ((MAC_Info.Length > 8) ? 8 : MAC_Info.Length); i++)
             {
                 Code[16 + i] = (byte)MAC_Info[i];
@@ -1559,9 +1562,9 @@ namespace MOTINOVA_Motor_Factory_Set
             Delay_ms(200);
             richTextBox_TestRecord.Text += DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "->" + "写入校验密钥" + "\r\n";
             Array.Clear(Code, 0, 32);
-            if (array_CfgInfo[56].ToString().EndsWith(",") == false)
+            if (array_CfgInfo[58].ToString().EndsWith(",") == false)
             {
-                string KeyString = array_CfgInfo[56].ToString().Split(',')[1];
+                string KeyString = array_CfgInfo[58].ToString().Split(',')[1];
                 for (ushort i = 0; i < ((KeyString.Length > 8) ? 8 : KeyString.Length); i++)
                 {
                     Code[i] = (byte)KeyString[i];
@@ -1605,7 +1608,7 @@ namespace MOTINOVA_Motor_Factory_Set
             Delay_ms(200);
             richTextBox_TestRecord.Text += DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "->" + "写入自定义信息1" + "\r\n";
             Array.Clear(Code, 0, 32);
-            if (array_CfgInfo[57].ToString().EndsWith(",") == false)
+            if (array_CfgInfo[59].ToString().EndsWith(",") == false)
             {
                 string UserInfo1String = array_CfgInfo[57].ToString().Split(',')[1];
                 for (ushort i = 0; i < (UserInfo1String.Length > 16 ? 16 : UserInfo1String.Length); i++)
@@ -1648,7 +1651,7 @@ namespace MOTINOVA_Motor_Factory_Set
             Delay_ms(200);
             richTextBox_TestRecord.Text += DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "->" + "写入自定义信息2" + "\r\n";
             Array.Clear(Code, 0, 32);
-            if (array_CfgInfo[58].ToString().EndsWith(",") == false)
+            if (array_CfgInfo[60].ToString().EndsWith(",") == false)
             {
                 string UserInfo2String = array_CfgInfo[58].ToString().Split(',')[1];
                 for (ushort i = 0; i < (UserInfo2String.Length > 16 ? 16 : UserInfo2String.Length); i++)
@@ -1691,7 +1694,7 @@ namespace MOTINOVA_Motor_Factory_Set
             Delay_ms(200);
             richTextBox_TestRecord.Text += DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "->" + "写入自定义信息3" + "\r\n";
             Array.Clear(Code, 0, 32);
-            if (array_CfgInfo[59].ToString().EndsWith(",") == false)
+            if (array_CfgInfo[61].ToString().EndsWith(",") == false)
             {
                 string UserInfo3String = array_CfgInfo[59].ToString().Split(',')[1];
                 for (ushort i = 0; i < (UserInfo3String.Length > 16 ? 16 : UserInfo3String.Length); i++)
@@ -2098,7 +2101,7 @@ namespace MOTINOVA_Motor_Factory_Set
                     //MCU温度 7
                     try
                     {
-                        DataTemp_Int16 = Convert.ToInt16(textBox_MCU.Text);
+                        DataTemp_Int16 = Convert.ToInt16(textBox_MOS.Text);
                     }
                     catch (System.Exception ex)
                     {

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.5.0 Build Time: 2023-03-06 16:00";
+            this.label_Ver.Text = "Ver: V1.6.0 Build Time: 2023-05-17 16:00";
             // 
             // label_NetStatus
             // 

bin/Debug/CheckSerialNum

@@ -1,4 +1,4 @@
 流水号:
-0
+6
 合格计数:
-0
+2

bin/Debug/MOTINOVA_Motor_Factory_Set.application

@@ -14,11 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-<<<<<<< HEAD
-        <dsig:DigestValue>q3UclZkadzz95gj9jqLilfFz4H8QKfVMbGCCjomBUcQ=</dsig:DigestValue>
-=======
-        <dsig:DigestValue>fuSeEFk+f6Kq5OqLPGI+B0zbrEqxjWCmJZk7m9/tJQY=</dsig:DigestValue>
->>>>>>> b12e3d67c5c78c2904e6021547fbea7bda7d253c
+        <dsig:DigestValue>fLvczHAe0d6vSLN0Uz0BVi9AmouqIvvNKnwVYTmWMxQ=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

bin/Debug/MOTINOVA_Motor_Factory_Set.exe.manifest

@@ -66,38 +66,26 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-<<<<<<< HEAD
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Microsoft.mshtml.dll" size="8027464">
-=======
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Microsoft.mshtml.dll" size="8027488">
->>>>>>> b12e3d67c5c78c2904e6021547fbea7bda7d253c
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Microsoft.mshtml.dll" size="8027528">
       <assemblyIdentity name="Microsoft.mshtml" version="7.0.3300.0" publicKeyToken="B03F5F7F11D50A3A" language="neutral" />
       <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" />
-<<<<<<< HEAD
-        <dsig:DigestValue>/H806e/4Jx3a5N7ZCRuyIMdykbCfxomNpkv/qcWx9mE=</dsig:DigestValue>
-=======
-        <dsig:DigestValue>xGXpNz0OCYHUD32mNSf9FXVUv11fEmyldeXzyfDdDw8=</dsig:DigestValue>
->>>>>>> b12e3d67c5c78c2904e6021547fbea7bda7d253c
+        <dsig:DigestValue>iImaEsY4Ajoi2RrsoJYZA8vV2qeezV/nnmEYjymY4C4=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="MOTINOVA_Motor_Factory_Set.exe" size="721408">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="MOTINOVA_Motor_Factory_Set.exe" size="724480">
       <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" />
-<<<<<<< HEAD
-        <dsig:DigestValue>whDiJbUshzeGVNSX12JbxbWy4tiZF/s7yCfEF4N/HU8=</dsig:DigestValue>
-=======
-        <dsig:DigestValue>hkwnEIQSNnOYaqEgEYwOa4GPSVL7P88IOhICwa0jC4Q=</dsig:DigestValue>
->>>>>>> b12e3d67c5c78c2904e6021547fbea7bda7d253c
+        <dsig:DigestValue>A58RlcmUw0gmHcSNcdGRTc0M4iP23tqyrme5YVMguD0=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

bin/Debug/TestSerialNum

@@ -1,4 +1,4 @@
 流水号:
-46
+57
 合格计数:
-15
+19

obj/Debug/MOTINOVA_Motor_Factory_Set.application

@@ -14,11 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-<<<<<<< HEAD
-        <dsig:DigestValue>q3UclZkadzz95gj9jqLilfFz4H8QKfVMbGCCjomBUcQ=</dsig:DigestValue>
-=======
-        <dsig:DigestValue>fuSeEFk+f6Kq5OqLPGI+B0zbrEqxjWCmJZk7m9/tJQY=</dsig:DigestValue>
->>>>>>> b12e3d67c5c78c2904e6021547fbea7bda7d253c
+        <dsig:DigestValue>fLvczHAe0d6vSLN0Uz0BVi9AmouqIvvNKnwVYTmWMxQ=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

obj/Debug/MOTINOVA_Motor_Factory_Set.exe.manifest

@@ -66,38 +66,26 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-<<<<<<< HEAD
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Microsoft.mshtml.dll" size="8027464">
-=======
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Microsoft.mshtml.dll" size="8027488">
->>>>>>> b12e3d67c5c78c2904e6021547fbea7bda7d253c
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Microsoft.mshtml.dll" size="8027528">
       <assemblyIdentity name="Microsoft.mshtml" version="7.0.3300.0" publicKeyToken="B03F5F7F11D50A3A" language="neutral" />
       <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" />
-<<<<<<< HEAD
-        <dsig:DigestValue>/H806e/4Jx3a5N7ZCRuyIMdykbCfxomNpkv/qcWx9mE=</dsig:DigestValue>
-=======
-        <dsig:DigestValue>xGXpNz0OCYHUD32mNSf9FXVUv11fEmyldeXzyfDdDw8=</dsig:DigestValue>
->>>>>>> b12e3d67c5c78c2904e6021547fbea7bda7d253c
+        <dsig:DigestValue>iImaEsY4Ajoi2RrsoJYZA8vV2qeezV/nnmEYjymY4C4=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="MOTINOVA_Motor_Factory_Set.exe" size="721408">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="MOTINOVA_Motor_Factory_Set.exe" size="724480">
       <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" />
-<<<<<<< HEAD
-        <dsig:DigestValue>whDiJbUshzeGVNSX12JbxbWy4tiZF/s7yCfEF4N/HU8=</dsig:DigestValue>
-=======
-        <dsig:DigestValue>hkwnEIQSNnOYaqEgEYwOa4GPSVL7P88IOhICwa0jC4Q=</dsig:DigestValue>
->>>>>>> b12e3d67c5c78c2904e6021547fbea7bda7d253c
+        <dsig:DigestValue>A58RlcmUw0gmHcSNcdGRTc0M4iP23tqyrme5YVMguD0=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>