Browse Source

增加三力矩标准差判断标准。

Dail 1 year ago
parent
commit
20dd307430

BIN
.vs/MOTINOVA_Motor_Factory_Set/v17/.suo


+ 70 - 42
CheckForm.Designer.cs

@@ -36,6 +36,10 @@
             this.系统开关ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.开ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.关ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.功能选择ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.运行测试ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.运行测试执行ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.运行测试不执行ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.工具箱ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.屏幕键盘ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.查看文件ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -83,10 +87,8 @@
             this.label31 = new System.Windows.Forms.Label();
             this.label7 = new System.Windows.Forms.Label();
             this.label_OK_Count = new System.Windows.Forms.Label();
-            this.功能选择ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.运行测试ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.运行测试执行ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.运行测试不执行ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.label8 = new System.Windows.Forms.Label();
+            this.textBox_TQ_K_Sqrd = new System.Windows.Forms.TextBox();
             this.menuStrip1.SuspendLayout();
             this.groupBox4.SuspendLayout();
             this.groupBox2.SuspendLayout();
@@ -130,7 +132,7 @@
             // 
             this.端口设置ToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(113)))), ((int)(((byte)(185)))));
             this.端口设置ToolStripMenuItem.Name = "端口设置ToolStripMenuItem";
-            this.端口设置ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
+            this.端口设置ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
             this.端口设置ToolStripMenuItem.Text = "端口设置";
             this.端口设置ToolStripMenuItem.Click += new System.EventHandler(this.端口设置ToolStripMenuItem_Click);
             // 
@@ -141,14 +143,14 @@
             this.关ToolStripMenuItem});
             this.系统开关ToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(113)))), ((int)(((byte)(185)))));
             this.系统开关ToolStripMenuItem.Name = "系统开关ToolStripMenuItem";
-            this.系统开关ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
+            this.系统开关ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
             this.系统开关ToolStripMenuItem.Text = "系统开关";
             // 
             // 开ToolStripMenuItem
             // 
             this.开ToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(113)))), ((int)(((byte)(185)))));
             this.开ToolStripMenuItem.Name = "开ToolStripMenuItem";
-            this.开ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
+            this.开ToolStripMenuItem.Size = new System.Drawing.Size(96, 26);
             this.开ToolStripMenuItem.Text = "开";
             this.开ToolStripMenuItem.Click += new System.EventHandler(this.开ToolStripMenuItem_Click);
             // 
@@ -158,10 +160,47 @@
             this.关ToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
             this.关ToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(113)))), ((int)(((byte)(185)))));
             this.关ToolStripMenuItem.Name = "关ToolStripMenuItem";
-            this.关ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
+            this.关ToolStripMenuItem.Size = new System.Drawing.Size(96, 26);
             this.关ToolStripMenuItem.Text = "关";
             this.关ToolStripMenuItem.Click += new System.EventHandler(this.关ToolStripMenuItem_Click);
             // 
+            // 功能选择ToolStripMenuItem
+            // 
+            this.功能选择ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.运行测试ToolStripMenuItem});
+            this.功能选择ToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.功能选择ToolStripMenuItem.Name = "功能选择ToolStripMenuItem";
+            this.功能选择ToolStripMenuItem.Size = new System.Drawing.Size(86, 25);
+            this.功能选择ToolStripMenuItem.Text = "功能选择";
+            // 
+            // 运行测试ToolStripMenuItem
+            // 
+            this.运行测试ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.运行测试执行ToolStripMenuItem,
+            this.运行测试不执行ToolStripMenuItem});
+            this.运行测试ToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(113)))), ((int)(((byte)(185)))));
+            this.运行测试ToolStripMenuItem.Name = "运行测试ToolStripMenuItem";
+            this.运行测试ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
+            this.运行测试ToolStripMenuItem.Text = "运行测试";
+            // 
+            // 运行测试执行ToolStripMenuItem
+            // 
+            this.运行测试执行ToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(113)))), ((int)(((byte)(185)))));
+            this.运行测试执行ToolStripMenuItem.Name = "运行测试执行ToolStripMenuItem";
+            this.运行测试执行ToolStripMenuItem.Size = new System.Drawing.Size(128, 26);
+            this.运行测试执行ToolStripMenuItem.Text = "执行";
+            this.运行测试执行ToolStripMenuItem.Click += new System.EventHandler(this.运行测试执行ToolStripMenuItem_Click);
+            // 
+            // 运行测试不执行ToolStripMenuItem
+            // 
+            this.运行测试不执行ToolStripMenuItem.Checked = true;
+            this.运行测试不执行ToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.运行测试不执行ToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(113)))), ((int)(((byte)(185)))));
+            this.运行测试不执行ToolStripMenuItem.Name = "运行测试不执行ToolStripMenuItem";
+            this.运行测试不执行ToolStripMenuItem.Size = new System.Drawing.Size(128, 26);
+            this.运行测试不执行ToolStripMenuItem.Text = "不执行";
+            this.运行测试不执行ToolStripMenuItem.Click += new System.EventHandler(this.运行测试不执行ToolStripMenuItem_Click);
+            // 
             // 工具箱ToolStripMenuItem
             // 
             this.工具箱ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -175,7 +214,7 @@
             // 
             this.屏幕键盘ToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(113)))), ((int)(((byte)(185)))));
             this.屏幕键盘ToolStripMenuItem.Name = "屏幕键盘ToolStripMenuItem";
-            this.屏幕键盘ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
+            this.屏幕键盘ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
             this.屏幕键盘ToolStripMenuItem.Text = "屏幕键盘";
             this.屏幕键盘ToolStripMenuItem.Click += new System.EventHandler(this.屏幕键盘ToolStripMenuItem_Click_1);
             // 
@@ -563,6 +602,8 @@
             // 
             // groupBox7
             // 
+            this.groupBox7.Controls.Add(this.label8);
+            this.groupBox7.Controls.Add(this.textBox_TQ_K_Sqrd);
             this.groupBox7.Controls.Add(this.label3);
             this.groupBox7.Controls.Add(this.label6);
             this.groupBox7.Controls.Add(this.textBox_TQ_Start);
@@ -686,42 +727,27 @@
             this.label_OK_Count.Text = "0";
             this.label_OK_Count.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // 功能选择ToolStripMenuItem
-            // 
-            this.功能选择ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.运行测试ToolStripMenuItem});
-            this.功能选择ToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            this.功能选择ToolStripMenuItem.Name = "功能选择ToolStripMenuItem";
-            this.功能选择ToolStripMenuItem.Size = new System.Drawing.Size(86, 25);
-            this.功能选择ToolStripMenuItem.Text = "功能选择";
-            // 
-            // 运行测试ToolStripMenuItem
-            // 
-            this.运行测试ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.运行测试执行ToolStripMenuItem,
-            this.运行测试不执行ToolStripMenuItem});
-            this.运行测试ToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(113)))), ((int)(((byte)(185)))));
-            this.运行测试ToolStripMenuItem.Name = "运行测试ToolStripMenuItem";
-            this.运行测试ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
-            this.运行测试ToolStripMenuItem.Text = "运行测试";
-            // 
-            // 运行测试执行ToolStripMenuItem
+            // label8
             // 
-            this.运行测试执行ToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(113)))), ((int)(((byte)(185)))));
-            this.运行测试执行ToolStripMenuItem.Name = "运行测试执行ToolStripMenuItem";
-            this.运行测试执行ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
-            this.运行测试执行ToolStripMenuItem.Text = "执行";
-            this.运行测试执行ToolStripMenuItem.Click += new System.EventHandler(this.运行测试执行ToolStripMenuItem_Click);
+            this.label8.AutoSize = true;
+            this.label8.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(113)))), ((int)(((byte)(185)))));
+            this.label8.Location = new System.Drawing.Point(150, 60);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(58, 21);
+            this.label8.TabIndex = 18;
+            this.label8.Text = "启动值";
             // 
-            // 运行测试不执行ToolStripMenuItem
+            // textBox_TQ_K_Sqrd
             // 
-            this.运行测试不执行ToolStripMenuItem.Checked = true;
-            this.运行测试不执行ToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.运行测试不执行ToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(113)))), ((int)(((byte)(185)))));
-            this.运行测试不执行ToolStripMenuItem.Name = "运行测试不执行ToolStripMenuItem";
-            this.运行测试不执行ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
-            this.运行测试不执行ToolStripMenuItem.Text = "不执行";
-            this.运行测试不执行ToolStripMenuItem.Click += new System.EventHandler(this.运行测试不执行ToolStripMenuItem_Click);
+            this.textBox_TQ_K_Sqrd.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.textBox_TQ_K_Sqrd.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.textBox_TQ_K_Sqrd.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(113)))), ((int)(((byte)(185)))));
+            this.textBox_TQ_K_Sqrd.Location = new System.Drawing.Point(214, 57);
+            this.textBox_TQ_K_Sqrd.Name = "textBox_TQ_K_Sqrd";
+            this.textBox_TQ_K_Sqrd.ReadOnly = true;
+            this.textBox_TQ_K_Sqrd.Size = new System.Drawing.Size(80, 26);
+            this.textBox_TQ_K_Sqrd.TabIndex = 17;
+            this.textBox_TQ_K_Sqrd.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
             // CheckForm
             // 
@@ -844,5 +870,7 @@
         private System.Windows.Forms.ToolStripMenuItem 运行测试ToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem 运行测试执行ToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem 运行测试不执行ToolStripMenuItem;
+        private System.Windows.Forms.Label label8;
+        private System.Windows.Forms.TextBox textBox_TQ_K_Sqrd;
     }
 }

+ 2 - 1
CheckForm.cs

@@ -862,6 +862,7 @@ namespace MOTINOVA_Motor_Factory_Set
             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_K_Sqrd.Text = TorqueCheck.Cal_K_Sqrd.ToString("#0.000");
 
             //加载PCBA检测值
             try
@@ -1378,7 +1379,7 @@ namespace MOTINOVA_Motor_Factory_Set
                     case "校正系数标准差":
                         {
                             double std = Convert.ToDouble(richTextBox_TQ.Lines[i].Split(':')[1]);
-                            if (std > 0.3f)
+                            if (std > TorqueCheck.Cal_K_Sqrd)
                             {
                                 richTextBox_TestRecord.Text += DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "->" + "校正系数差异大" + "\r\n";
                                 label_Step.Text = "校正系数标准差超范围,测试结束!";

+ 99 - 113
ExportForm.Designer.cs

@@ -92,6 +92,10 @@
             this.label29 = new System.Windows.Forms.Label();
             this.comboBox_StartMode = new System.Windows.Forms.ComboBox();
             this.groupBox3 = new System.Windows.Forms.GroupBox();
+            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.label67 = new System.Windows.Forms.Label();
             this.textBox_LightPeriod = new System.Windows.Forms.TextBox();
             this.label66 = new System.Windows.Forms.Label();
@@ -178,15 +182,10 @@
             this.pictureBox2 = new System.Windows.Forms.PictureBox();
             this.pictureBox1 = new System.Windows.Forms.PictureBox();
             this.button_keyboard = new System.Windows.Forms.Button();
-            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.label70 = new System.Windows.Forms.Label();
+            this.textBox_CadenceTh = new System.Windows.Forms.TextBox();
+            this.label71 = new System.Windows.Forms.Label();
+            this.textBox_K_Sqrd = new System.Windows.Forms.TextBox();
             this.groupBox2.SuspendLayout();
             this.groupBox3.SuspendLayout();
             this.groupBox7.SuspendLayout();
@@ -910,6 +909,44 @@
             this.groupBox3.TabStop = false;
             this.groupBox3.Text = "用户参数2";
             // 
+            // 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;
+            // 
             // label67
             // 
             this.label67.AutoSize = true;
@@ -1635,6 +1672,10 @@
             // 
             // groupBox8
             // 
+            this.groupBox8.Controls.Add(this.textBox_K_Sqrd);
+            this.groupBox8.Controls.Add(this.label71);
+            this.groupBox8.Controls.Add(this.label70);
+            this.groupBox8.Controls.Add(this.textBox_CadenceTh);
             this.groupBox8.Controls.Add(this.label54);
             this.groupBox8.Controls.Add(this.label62);
             this.groupBox8.Controls.Add(this.textBox_Start_Max);
@@ -1653,7 +1694,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, 255);
+            this.groupBox8.Size = new System.Drawing.Size(236, 265);
             this.groupBox8.TabIndex = 5;
             this.groupBox8.TabStop = false;
             this.groupBox8.Text = "测试阈值";
@@ -1670,7 +1711,7 @@
             // label62
             // 
             this.label62.AutoSize = true;
-            this.label62.Location = new System.Drawing.Point(6, 180);
+            this.label62.Location = new System.Drawing.Point(6, 206);
             this.label62.Name = "label62";
             this.label62.Size = new System.Drawing.Size(58, 21);
             this.label62.TabIndex = 0;
@@ -1681,7 +1722,7 @@
             this.textBox_Start_Max.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
             this.textBox_Start_Max.ForeColor = System.Drawing.Color.Black;
             this.textBox_Start_Max.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.textBox_Start_Max.Location = new System.Drawing.Point(161, 176);
+            this.textBox_Start_Max.Location = new System.Drawing.Point(162, 202);
             this.textBox_Start_Max.Name = "textBox_Start_Max";
             this.textBox_Start_Max.Size = new System.Drawing.Size(69, 29);
             this.textBox_Start_Max.TabIndex = 2;
@@ -1689,7 +1730,7 @@
             // label61
             // 
             this.label61.AutoSize = true;
-            this.label61.Location = new System.Drawing.Point(6, 149);
+            this.label61.Location = new System.Drawing.Point(6, 176);
             this.label61.Name = "label61";
             this.label61.Size = new System.Drawing.Size(74, 21);
             this.label61.TabIndex = 0;
@@ -1700,7 +1741,7 @@
             this.textBox_K_Max.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
             this.textBox_K_Max.ForeColor = System.Drawing.Color.Black;
             this.textBox_K_Max.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.textBox_K_Max.Location = new System.Drawing.Point(161, 145);
+            this.textBox_K_Max.Location = new System.Drawing.Point(162, 172);
             this.textBox_K_Max.Name = "textBox_K_Max";
             this.textBox_K_Max.Size = new System.Drawing.Size(69, 29);
             this.textBox_K_Max.TabIndex = 2;
@@ -1710,7 +1751,7 @@
             this.textBox_Start_Min.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
             this.textBox_Start_Min.ForeColor = System.Drawing.Color.Black;
             this.textBox_Start_Min.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.textBox_Start_Min.Location = new System.Drawing.Point(82, 176);
+            this.textBox_Start_Min.Location = new System.Drawing.Point(84, 202);
             this.textBox_Start_Min.Name = "textBox_Start_Min";
             this.textBox_Start_Min.Size = new System.Drawing.Size(69, 29);
             this.textBox_Start_Min.TabIndex = 2;
@@ -1718,7 +1759,7 @@
             // label60
             // 
             this.label60.AutoSize = true;
-            this.label60.Location = new System.Drawing.Point(6, 118);
+            this.label60.Location = new System.Drawing.Point(6, 146);
             this.label60.Name = "label60";
             this.label60.Size = new System.Drawing.Size(42, 21);
             this.label60.TabIndex = 0;
@@ -1729,7 +1770,7 @@
             this.textBox_K_Min.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
             this.textBox_K_Min.ForeColor = System.Drawing.Color.Black;
             this.textBox_K_Min.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.textBox_K_Min.Location = new System.Drawing.Point(82, 145);
+            this.textBox_K_Min.Location = new System.Drawing.Point(84, 172);
             this.textBox_K_Min.Name = "textBox_K_Min";
             this.textBox_K_Min.Size = new System.Drawing.Size(69, 29);
             this.textBox_K_Min.TabIndex = 2;
@@ -1739,7 +1780,7 @@
             this.textBox_Zero_Max.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
             this.textBox_Zero_Max.ForeColor = System.Drawing.Color.Black;
             this.textBox_Zero_Max.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.textBox_Zero_Max.Location = new System.Drawing.Point(161, 114);
+            this.textBox_Zero_Max.Location = new System.Drawing.Point(162, 142);
             this.textBox_Zero_Max.Name = "textBox_Zero_Max";
             this.textBox_Zero_Max.Size = new System.Drawing.Size(69, 29);
             this.textBox_Zero_Max.TabIndex = 2;
@@ -1749,7 +1790,7 @@
             this.textBox_Zero_Min.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
             this.textBox_Zero_Min.ForeColor = System.Drawing.Color.Black;
             this.textBox_Zero_Min.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.textBox_Zero_Min.Location = new System.Drawing.Point(82, 114);
+            this.textBox_Zero_Min.Location = new System.Drawing.Point(84, 142);
             this.textBox_Zero_Min.Name = "textBox_Zero_Min";
             this.textBox_Zero_Min.Size = new System.Drawing.Size(69, 29);
             this.textBox_Zero_Min.TabIndex = 2;
@@ -1757,7 +1798,7 @@
             // label56
             // 
             this.label56.AutoSize = true;
-            this.label56.Location = new System.Drawing.Point(6, 87);
+            this.label56.Location = new System.Drawing.Point(6, 116);
             this.label56.Name = "label56";
             this.label56.Size = new System.Drawing.Size(74, 21);
             this.label56.TabIndex = 0;
@@ -1768,7 +1809,7 @@
             this.textBox_GasSpeedTh.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
             this.textBox_GasSpeedTh.ForeColor = System.Drawing.Color.Black;
             this.textBox_GasSpeedTh.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.textBox_GasSpeedTh.Location = new System.Drawing.Point(82, 83);
+            this.textBox_GasSpeedTh.Location = new System.Drawing.Point(84, 112);
             this.textBox_GasSpeedTh.Name = "textBox_GasSpeedTh";
             this.textBox_GasSpeedTh.Size = new System.Drawing.Size(148, 29);
             this.textBox_GasSpeedTh.TabIndex = 2;
@@ -1777,7 +1818,7 @@
             // label55
             // 
             this.label55.AutoSize = true;
-            this.label55.Location = new System.Drawing.Point(6, 56);
+            this.label55.Location = new System.Drawing.Point(6, 86);
             this.label55.Name = "label55";
             this.label55.Size = new System.Drawing.Size(42, 21);
             this.label55.TabIndex = 0;
@@ -1788,7 +1829,7 @@
             this.textBox_SpeedTh.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
             this.textBox_SpeedTh.ForeColor = System.Drawing.Color.Black;
             this.textBox_SpeedTh.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.textBox_SpeedTh.Location = new System.Drawing.Point(82, 52);
+            this.textBox_SpeedTh.Location = new System.Drawing.Point(84, 82);
             this.textBox_SpeedTh.Name = "textBox_SpeedTh";
             this.textBox_SpeedTh.Size = new System.Drawing.Size(148, 29);
             this.textBox_SpeedTh.TabIndex = 2;
@@ -1798,7 +1839,7 @@
             this.textBox_NC_Current.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
             this.textBox_NC_Current.ForeColor = System.Drawing.Color.Black;
             this.textBox_NC_Current.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.textBox_NC_Current.Location = new System.Drawing.Point(82, 22);
+            this.textBox_NC_Current.Location = new System.Drawing.Point(84, 22);
             this.textBox_NC_Current.Name = "textBox_NC_Current";
             this.textBox_NC_Current.Size = new System.Drawing.Size(148, 29);
             this.textBox_NC_Current.TabIndex = 2;
@@ -1835,92 +1876,43 @@
             this.button_keyboard.UseVisualStyleBackColor = false;
             this.button_keyboard.Click += new System.EventHandler(this.button_keyboard_Click);
             // 
-            // label68
+            // label70
             // 
-            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 = "结束限速";
+            this.label70.AutoSize = true;
+            this.label70.Location = new System.Drawing.Point(6, 56);
+            this.label70.Name = "label70";
+            this.label70.Size = new System.Drawing.Size(42, 21);
+            this.label70.TabIndex = 3;
+            this.label70.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;
+            // textBox_CadenceTh
             // 
-            // label69
+            this.textBox_CadenceTh.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
+            this.textBox_CadenceTh.ForeColor = System.Drawing.Color.Black;
+            this.textBox_CadenceTh.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.textBox_CadenceTh.Location = new System.Drawing.Point(84, 52);
+            this.textBox_CadenceTh.Name = "textBox_CadenceTh";
+            this.textBox_CadenceTh.Size = new System.Drawing.Size(148, 29);
+            this.textBox_CadenceTh.TabIndex = 4;
             // 
-            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 = "起始限速";
+            // label71
             // 
-            // textBox_LimitSpeedStart
+            this.label71.AutoSize = true;
+            this.label71.Location = new System.Drawing.Point(6, 236);
+            this.label71.Name = "label71";
+            this.label71.Size = new System.Drawing.Size(58, 21);
+            this.label71.TabIndex = 5;
+            this.label71.Text = "标准差";
             // 
-            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;
+            // textBox_K_Sqrd
             // 
-            // 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;
+            this.textBox_K_Sqrd.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
+            this.textBox_K_Sqrd.ForeColor = System.Drawing.Color.Black;
+            this.textBox_K_Sqrd.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.textBox_K_Sqrd.Location = new System.Drawing.Point(84, 232);
+            this.textBox_K_Sqrd.Name = "textBox_K_Sqrd";
+            this.textBox_K_Sqrd.Size = new System.Drawing.Size(69, 29);
+            this.textBox_K_Sqrd.TabIndex = 6;
             // 
             // ExportForm
             // 
@@ -1928,11 +1920,6 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.White;
             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);
@@ -2134,10 +2121,9 @@
         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;
+        private System.Windows.Forms.Label label70;
+        private System.Windows.Forms.TextBox textBox_CadenceTh;
+        private System.Windows.Forms.TextBox textBox_K_Sqrd;
+        private System.Windows.Forms.Label label71;
     }
 }

+ 7 - 63
ExportForm.cs

@@ -104,7 +104,7 @@ namespace MOTINOVA_Motor_Factory_Set
             //其它信息
             Otherinfo.Clear();
             Otherinfo.Add("生产商", "TTIUM");
-            Otherinfo.Add("生产地", "WUHAN");
+            Otherinfo.Add("生产地", "Wuhan");
             Otherinfo.Add("生产日期", DateTime.Now.ToString("yyyyMMdd"));
             Otherinfo.Add("校验密钥", "AVONITOM");
             Otherinfo.Add("信息1", "");
@@ -114,6 +114,7 @@ namespace MOTINOVA_Motor_Factory_Set
             //测试阈值
             TestThData.Clear();
             TestThData.Add("空载电流", 1000);
+            TestThData.Add("踏频", 120);
             TestThData.Add("车速", 150);
             TestThData.Add("指拨转速", 1225);
             TestThData.Add("零偏最小值", 100);
@@ -122,6 +123,7 @@ namespace MOTINOVA_Motor_Factory_Set
             TestThData.Add("标定系数最大值", 75);
             TestThData.Add("启动值最小值", 350);
             TestThData.Add("启动值最大值", 750);
+            TestThData.Add("标定系数标准差", 250);
 
             //其它测试备注信息
             MarkInfo.Clear();
@@ -258,6 +260,7 @@ namespace MOTINOVA_Motor_Factory_Set
             //测试阈值
             textBox_NC_Current.Text = TestThData["空载电流"].ToString();
             textBox_SpeedTh.Text = TestThData["车速"].ToString();
+            textBox_CadenceTh.Text = TestThData["踏频"].ToString();
             textBox_GasSpeedTh.Text = TestThData["指拨转速"].ToString();
             textBox_Zero_Min.Text = TestThData["零偏最小值"].ToString();
             textBox_Zero_Max.Text = TestThData["零偏最大值"].ToString();
@@ -265,6 +268,7 @@ 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_K_Sqrd.Text= ((float)(TestThData["标定系数标准差"]) / 1000.0f).ToString("#0.000");
 
             //其它测试备注信息
             textBox_HW_Version.Text = MarkInfo["PCBA版号"];
@@ -511,6 +515,7 @@ namespace MOTINOVA_Motor_Factory_Set
                 TestThData.Clear();
                 TestThData.Add("空载电流", Convert.ToUInt16(textBox_NC_Current.Text));
                 TestThData.Add("车速", Convert.ToUInt16(textBox_SpeedTh.Text));
+                TestThData.Add("踏频", Convert.ToUInt16(textBox_CadenceTh.Text));
                 TestThData.Add("指拨转速", Convert.ToUInt16(textBox_GasSpeedTh.Text));
                 TestThData.Add("零偏最小值", Convert.ToUInt16(textBox_Zero_Min.Text));
                 TestThData.Add("零偏最大值", Convert.ToUInt16(textBox_Zero_Max.Text));
@@ -518,6 +523,7 @@ 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));
+                TestThData.Add("标定系数标准差", Convert.ToUInt16(float.Parse(textBox_K_Sqrd.Text) * 1000));
 
                 //其它测试备注信息
                 MarkInfo.Clear();
@@ -1087,68 +1093,6 @@ 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, "预留参数");//设置提示按钮和提示内容
-        }
     }
 }

+ 5 - 4
ImportForm.cs

@@ -23,14 +23,14 @@ namespace MOTINOVA_Motor_Factory_Set
 
         #region 测试参数配置
         //以下值在根据电机测试的配置文件中更改
-        ushort MotorRadeSpeed = 1200;  //空载转速
-        ushort RateCadence = 120;      //最高踏频
+        ushort MotorRadeSpeed = 1200;  //空载转速       
         ushort RateVoltage = 36000;    //额定电压
         bool GasModeTest = true;       //转把模式检测开关
         bool SpeedSensorTest = true;   //速度传感器检测开关
         //以下值在软件测试文件params.cfg文件中修改
         ushort No_load_Current = 1000; //空载电流
         ushort SpeedSensorThData = 60; //车速传感器判断阈值
+        ushort RateCadence = 120;      //踏频
         ushort GasModeSpeed = 1200;    //指拨模式测试转速
         #endregion
 
@@ -232,7 +232,8 @@ namespace MOTINOVA_Motor_Factory_Set
             {
                 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]);
+                RateCadence = Convert.ToUInt16(array_CfgInfo[66].ToString().Split(',')[1]);
+                GasModeSpeed = Convert.ToUInt16(array_CfgInfo[67].ToString().Split(',')[1]);
             }
         }
         #endregion
@@ -2025,7 +2026,7 @@ namespace MOTINOVA_Motor_Factory_Set
                         ErrorSaveLog();
                         return;
                     }
-                    if ((DataTemp > (RateCadence - 40)) && (DataTemp < (RateCadence + 40)))
+                    if ((DataTemp > (RateCadence - 20)) && (DataTemp < (RateCadence + 20)))
                     {
                         if (label_sensor_cadence.BackColor == Color.Red)
                         {

+ 8 - 6
TorqueCheckParam.cs

@@ -13,6 +13,7 @@ namespace MOTINOVA_Motor_Factory_Set
         public float Cal_K_Max;
         public UInt16 Start_Min;
         public UInt16 Start_Max;
+        public float Cal_K_Sqrd;
 
         public void CheckParam_Load(string fileName)
         {
@@ -37,12 +38,13 @@ namespace MOTINOVA_Motor_Factory_Set
                 }
             }
             //设定判断范围值
-            Zero_Min = Convert.ToUInt16(array_CfgInfo[Num + 4].Split(',')[1]);
-            Zero_Max = Convert.ToUInt16(array_CfgInfo[Num + 5].Split(',')[1]);
-            Cal_K_Min = (Convert.ToUInt16(array_CfgInfo[Num + 6].Split(',')[1])) / 100.0f;
-            Cal_K_Max = (Convert.ToUInt16(array_CfgInfo[Num + 7].Split(',')[1])) / 100.0f;
-            Start_Min = Convert.ToUInt16(array_CfgInfo[Num + 8].Split(',')[1]);
-            Start_Max = Convert.ToUInt16(array_CfgInfo[Num + 9].Split(',')[1]);
+            Zero_Min = Convert.ToUInt16(array_CfgInfo[Num + 5].Split(',')[1]);
+            Zero_Max = Convert.ToUInt16(array_CfgInfo[Num + 6].Split(',')[1]);
+            Cal_K_Min = (Convert.ToUInt16(array_CfgInfo[Num + 7].Split(',')[1])) / 100.0f;
+            Cal_K_Max = (Convert.ToUInt16(array_CfgInfo[Num + 8].Split(',')[1])) / 100.0f;
+            Start_Min = Convert.ToUInt16(array_CfgInfo[Num + 9].Split(',')[1]);
+            Start_Max = Convert.ToUInt16(array_CfgInfo[Num + 10].Split(',')[1]);
+            Cal_K_Sqrd = (Convert.ToUInt16(array_CfgInfo[Num + 11].Split(',')[1])) / 1000.0f;
         }
     }
 }

+ 1 - 1
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>fLvczHAe0d6vSLN0Uz0BVi9AmouqIvvNKnwVYTmWMxQ=</dsig:DigestValue>
+        <dsig:DigestValue>E2ddNUl4oN/XOGjUVOz5l4TpbtdeWdhprWCRH4cIOPE=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

BIN
bin/Debug/MOTINOVA_Motor_Factory_Set.exe


+ 1 - 1
bin/Debug/MOTINOVA_Motor_Factory_Set.exe.manifest

@@ -85,7 +85,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>A58RlcmUw0gmHcSNcdGRTc0M4iP23tqyrme5YVMguD0=</dsig:DigestValue>
+        <dsig:DigestValue>FwwoArtjqoDRfA315ra9wR24TiDF//vosaQTCpOt30w=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

BIN
bin/Debug/MOTINOVA_Motor_Factory_Set.pdb


BIN
bin/Debug/app.publish/MOTINOVA_Motor_Factory_Set.exe


+ 1 - 1
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>fLvczHAe0d6vSLN0Uz0BVi9AmouqIvvNKnwVYTmWMxQ=</dsig:DigestValue>
+        <dsig:DigestValue>E2ddNUl4oN/XOGjUVOz5l4TpbtdeWdhprWCRH4cIOPE=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

BIN
obj/Debug/MOTINOVA_Motor_Factory_Set.csproj.GenerateResource.cache


BIN
obj/Debug/MOTINOVA_Motor_Factory_Set.exe


+ 1 - 1
obj/Debug/MOTINOVA_Motor_Factory_Set.exe.manifest

@@ -85,7 +85,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>A58RlcmUw0gmHcSNcdGRTc0M4iP23tqyrme5YVMguD0=</dsig:DigestValue>
+        <dsig:DigestValue>FwwoArtjqoDRfA315ra9wR24TiDF//vosaQTCpOt30w=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

BIN
obj/Debug/MOTINOVA_Motor_Factory_Set.pdb