Эх сурвалжийг харах

1,量产测试界面下勾选样机测试时不用选择配置文件,标签用两个空格把型号和SN分割;
2,导出参数时增加重发机制;
3,测试结束自动断开串口,测试开始时自动连接串口。

dd 2 сар өмнө
parent
commit
1715ef059f

BIN
.vs/Welling_Motor_Debug_Tool/v17/.suo


+ 1 - 0
Welling_Motor_Debug_Tool/LocalInfo.cs

@@ -29,5 +29,6 @@ namespace Welling_Motor_Debug_Tool
         public string HelpFilename = "Welling_Motor_Debug_Tool使用说明书_V1.0.html"; //帮助文件名
         public string OfflineUseLogFileName = "offlg";
         public string OffLineUseKeyFileName = "offkey";
+        public string PowerTimesFilename = "PowerTimes";
     }
 }

+ 39 - 13
Welling_Motor_Debug_Tool/mainForm.Designer.cs

@@ -73,6 +73,7 @@ namespace Welling_Motor_Debug_Tool
             this.toolStripTextBox_MACPD = new System.Windows.Forms.ToolStripTextBox();
             this.电机类型ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.中置电机MIGIC_ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.中置电机VP_ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.轮毂电机ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
             this.判断阈值ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -115,6 +116,8 @@ namespace Welling_Motor_Debug_Tool
             this.uARTToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.UART协议ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.协议类型ToolStripMenuItem = new System.Windows.Forms.ToolStripComboBox();
+            this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
+            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();
@@ -701,7 +704,7 @@ namespace Welling_Motor_Debug_Tool
             this.label124 = new System.Windows.Forms.Label();
             this.label46 = new System.Windows.Forms.Label();
             this.pictureBox2 = new System.Windows.Forms.PictureBox();
-            this.中置电机VP_ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.timer_AckWait = new System.Windows.Forms.Timer(this.components);
             this.menuStrip_Set.SuspendLayout();
             this.statusStrip1.SuspendLayout();
             this.groupBox1.SuspendLayout();
@@ -936,7 +939,9 @@ namespace Welling_Motor_Debug_Tool
             this.位置校准偏差范围ToolStripMenuItem,
             this.toolStripSeparator5,
             this.协议类型ToolStripMenuItem1,
-            this.UART协议ToolStripMenuItem});
+            this.UART协议ToolStripMenuItem,
+            this.toolStripSeparator6,
+            this.样机测试ToolStripMenuItem});
             this.配置ToolStripMenuItem.ForeColor = System.Drawing.Color.White;
             this.配置ToolStripMenuItem.Name = "配置ToolStripMenuItem";
             this.配置ToolStripMenuItem.Size = new System.Drawing.Size(54, 25);
@@ -970,7 +975,7 @@ namespace Welling_Motor_Debug_Tool
             this.存储路径ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripTextBox_ServerPath});
             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 = "存储路径";
             // 
             // toolStripTextBox_ServerPath
@@ -985,7 +990,7 @@ namespace Welling_Motor_Debug_Tool
             // 
             this.重置ToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlText;
             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);
             // 
@@ -1010,7 +1015,7 @@ namespace Welling_Motor_Debug_Tool
             this.生产商ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripTextBox_MAC});
             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 = "生产商";
             // 
             // toolStripTextBox_MAC
@@ -1026,7 +1031,7 @@ namespace Welling_Motor_Debug_Tool
             this.生产地ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripTextBoxMACAddr});
             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 = "生产地";
             // 
             // toolStripTextBoxMACAddr
@@ -1042,7 +1047,7 @@ namespace Welling_Motor_Debug_Tool
             this.生产日期ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripTextBox_MACDate});
             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 = "生产日期";
             // 
             // toolStripTextBox_MACDate
@@ -1058,7 +1063,7 @@ namespace Welling_Motor_Debug_Tool
             this.产品标识ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripTextBox_MACPD});
             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 = "产品标识";
             // 
             // toolStripTextBox_MACPD
@@ -1088,6 +1093,13 @@ namespace Welling_Motor_Debug_Tool
             this.中置电机MIGIC_ToolStripMenuItem.Text = "中置电机(MIGIC)";
             this.中置电机MIGIC_ToolStripMenuItem.Click += new System.EventHandler(this.中置电机ToolStripMenuItem_Click);
             // 
+            // 中置电机VP_ToolStripMenuItem
+            // 
+            this.中置电机VP_ToolStripMenuItem.Name = "中置电机VP_ToolStripMenuItem";
+            this.中置电机VP_ToolStripMenuItem.Size = new System.Drawing.Size(225, 26);
+            this.中置电机VP_ToolStripMenuItem.Text = "中置电机(VP)";
+            this.中置电机VP_ToolStripMenuItem.Click += new System.EventHandler(this.中置电机小牙盘ToolStripMenuItem_Click);
+            // 
             // 轮毂电机ToolStripMenuItem
             // 
             this.轮毂电机ToolStripMenuItem.Name = "轮毂电机ToolStripMenuItem";
@@ -1435,6 +1447,18 @@ namespace Welling_Motor_Debug_Tool
             this.协议类型ToolStripMenuItem.Size = new System.Drawing.Size(180, 29);
             this.协议类型ToolStripMenuItem.SelectedIndexChanged += new System.EventHandler(this.协议类型ToolStripMenuItem_SelectedIndexChanged);
             // 
+            // toolStripSeparator6
+            // 
+            this.toolStripSeparator6.Name = "toolStripSeparator6";
+            this.toolStripSeparator6.Size = new System.Drawing.Size(211, 6);
+            // 
+            // 样机测试ToolStripMenuItem
+            // 
+            this.样机测试ToolStripMenuItem.Name = "样机测试ToolStripMenuItem";
+            this.样机测试ToolStripMenuItem.Size = new System.Drawing.Size(214, 26);
+            this.样机测试ToolStripMenuItem.Text = "样机测试";
+            this.样机测试ToolStripMenuItem.Click += new System.EventHandler(this.样机测试ToolStripMenuItem_Click);
+            // 
             // 工具箱ToolStripMenuItem
             // 
             this.工具箱ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -7994,12 +8018,11 @@ namespace Welling_Motor_Debug_Tool
             this.pictureBox2.TabIndex = 16;
             this.pictureBox2.TabStop = false;
             // 
-            // 中置电机VP_ToolStripMenuItem
+            // timer_AckWait
             // 
-            this.中置电机VP_ToolStripMenuItem.Name = "中置电机VP_ToolStripMenuItem";
-            this.中置电机VP_ToolStripMenuItem.Size = new System.Drawing.Size(225, 26);
-            this.中置电机VP_ToolStripMenuItem.Text = "中置电机(VP)";
-            this.中置电机VP_ToolStripMenuItem.Click += new System.EventHandler(this.中置电机小牙盘ToolStripMenuItem_Click);
+            this.timer_AckWait.Enabled = true;
+            this.timer_AckWait.Interval = 500;
+            this.timer_AckWait.Tick += new System.EventHandler(this.timer_AckWait_Tick);
             // 
             // mainForm
             // 
@@ -8811,5 +8834,8 @@ namespace Welling_Motor_Debug_Tool
         private DataGridViewTextBoxColumn 参数8;
         private Label label165;
         private ToolStripMenuItem 中置电机VP_ToolStripMenuItem;
+        private ToolStripSeparator toolStripSeparator6;
+        private ToolStripMenuItem 样机测试ToolStripMenuItem;
+        private Timer timer_AckWait;
     }
 }

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 668 - 121
Welling_Motor_Debug_Tool/mainForm.cs


+ 4 - 1
Welling_Motor_Debug_Tool/mainForm.resx

@@ -174,8 +174,11 @@
   <metadata name="timer_500ms.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>275, 17</value>
   </metadata>
+  <metadata name="timer_AckWait.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>403, 17</value>
+  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>79</value>
+    <value>40</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

BIN
Welling_Motor_Debug_Tool/obj/Debug/Welling_Motor_Debug_Tool.csproj.AssemblyReference.cache


+ 2 - 2
Welling_Motor_Debug_Tool/obj/Debug/Welling_Motor_Debug_Tool.csproj.FileListAbsolute.txt

@@ -87,10 +87,10 @@ C:\Users\hero\Documents\Work\SoftDesign\Welling-MidMotor\Welling_Motor_Debug_Too
 C:\Users\hero\Documents\Work\SoftDesign\Welling-MidMotor\Welling_Motor_Debug_Tool\obj\Debug\Welling_Motor_Debug_Tool.exe.manifest
 C:\Users\hero\Documents\Work\SoftDesign\Welling-MidMotor\Welling_Motor_Debug_Tool\obj\Debug\Welling_Motor_Debug_Tool.application
 C:\Users\hero\Documents\Work\SoftDesign\Welling-MidMotor\Welling_Motor_Debug_Tool\obj\Debug\Welling_Motor_Debug_Tool.csproj.CopyComplete
+D:\笔记本20221223\zhouxiong9\Documents\Tools\motor-debug\Welling_Motor_Debug_Tool\bin\Debug\Welling_Motor_Debug_Tool.exe
 D:\笔记本20221223\zhouxiong9\Documents\Tools\motor-debug\Welling_Motor_Debug_Tool\bin\Debug\Welling_Motor_Debug_Tool.exe.config
 D:\笔记本20221223\zhouxiong9\Documents\Tools\motor-debug\Welling_Motor_Debug_Tool\bin\Debug\Welling_Motor_Debug_Tool.exe.manifest
 D:\笔记本20221223\zhouxiong9\Documents\Tools\motor-debug\Welling_Motor_Debug_Tool\bin\Debug\Welling_Motor_Debug_Tool.application
-D:\笔记本20221223\zhouxiong9\Documents\Tools\motor-debug\Welling_Motor_Debug_Tool\bin\Debug\Welling_Motor_Debug_Tool.exe
 D:\笔记本20221223\zhouxiong9\Documents\Tools\motor-debug\Welling_Motor_Debug_Tool\bin\Debug\Welling_Motor_Debug_Tool.pdb
 D:\笔记本20221223\zhouxiong9\Documents\Tools\motor-debug\Welling_Motor_Debug_Tool\bin\Debug\NPOI.dll
 D:\笔记本20221223\zhouxiong9\Documents\Tools\motor-debug\Welling_Motor_Debug_Tool\bin\Debug\NPOI.OOXML.dll
@@ -113,6 +113,7 @@ D:\笔记本20221223\zhouxiong9\Documents\Tools\motor-debug\Welling_Motor_Debug_
 D:\笔记本20221223\zhouxiong9\Documents\Tools\motor-debug\Welling_Motor_Debug_Tool\obj\Debug\Welling_Motor_Debug_Tool.csproj.AssemblyReference.cache
 D:\笔记本20221223\zhouxiong9\Documents\Tools\motor-debug\Welling_Motor_Debug_Tool\obj\Debug\Welling_Motor_Debug_Tool.DebugForm.resources
 D:\笔记本20221223\zhouxiong9\Documents\Tools\motor-debug\Welling_Motor_Debug_Tool\obj\Debug\Welling_Motor_Debug_Tool.GenerateParams.resources
+D:\笔记本20221223\zhouxiong9\Documents\Tools\motor-debug\Welling_Motor_Debug_Tool\obj\Debug\Welling_Motor_Debug_Tool.Licences.resources
 D:\笔记本20221223\zhouxiong9\Documents\Tools\motor-debug\Welling_Motor_Debug_Tool\obj\Debug\Welling_Motor_Debug_Tool.Login.resources
 D:\笔记本20221223\zhouxiong9\Documents\Tools\motor-debug\Welling_Motor_Debug_Tool\obj\Debug\Welling_Motor_Debug_Tool.mainForm.resources
 D:\笔记本20221223\zhouxiong9\Documents\Tools\motor-debug\Welling_Motor_Debug_Tool\obj\Debug\Welling_Motor_Debug_Tool.Properties.Resources.resources
@@ -127,4 +128,3 @@ D:\笔记本20221223\zhouxiong9\Documents\Tools\motor-debug\Welling_Motor_Debug_
 D:\笔记本20221223\zhouxiong9\Documents\Tools\motor-debug\Welling_Motor_Debug_Tool\obj\Debug\Welling_.6AF7A538.Up2Date
 D:\笔记本20221223\zhouxiong9\Documents\Tools\motor-debug\Welling_Motor_Debug_Tool\obj\Debug\Welling_Motor_Debug_Tool.exe
 D:\笔记本20221223\zhouxiong9\Documents\Tools\motor-debug\Welling_Motor_Debug_Tool\obj\Debug\Welling_Motor_Debug_Tool.pdb
-D:\笔记本20221223\zhouxiong9\Documents\Tools\motor-debug\Welling_Motor_Debug_Tool\obj\Debug\Welling_Motor_Debug_Tool.Licences.resources

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


BIN
Welling_Motor_Debug_Tool/obj/Debug/Welling_Motor_Debug_Tool.exe


BIN
Welling_Motor_Debug_Tool/obj/Debug/Welling_Motor_Debug_Tool.pdb


Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно