Procházet zdrojové kódy

1、导出配置文件时,Boot版本后增加波特率标识;
2、导出配置文件时,若配置为随电池,增加电压内容

dail před 3 roky
rodič
revize
1c50201ba9

binární
.vs/MOTINOVA_Motor_Factory_Set/v17/.suo


+ 3 - 3
CheckForm.Designer.cs

@@ -188,7 +188,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(160, 26);
+            this.合格ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
             this.合格ToolStripMenuItem.Text = "合格记录";
             this.合格ToolStripMenuItem.Click += new System.EventHandler(this.合格ToolStripMenuItem_Click);
             // 
@@ -196,7 +196,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(160, 26);
+            this.不合格ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
             this.不合格ToolStripMenuItem.Text = "不合格记录";
             this.不合格ToolStripMenuItem.Click += new System.EventHandler(this.不合格ToolStripMenuItem_Click);
             // 
@@ -615,7 +615,7 @@
             this.groupBox8.Size = new System.Drawing.Size(265, 592);
             this.groupBox8.TabIndex = 14;
             this.groupBox8.TabStop = false;
-            this.groupBox8.Text = "电机配置信息(根据订单生)";
+            this.groupBox8.Text = "电机配置信息(根据订单生)";
             // 
             // pictureBox2
             // 

+ 19 - 3
ExportForm.cs

@@ -642,7 +642,7 @@ namespace MOTINOVA_Motor_Factory_Set
                 row.GetCell(9).SetCellValue(textBox_SMART_Acc.Text);
                 //第10行,第2列BOOT版本,第10列额定功率
                 row = sheet.GetRow(9);
-                row.GetCell(1).SetCellValue(comboBox_Baudrate.SelectedIndex == 0 ? "V1.2.2" : "V2.0.0");
+                row.GetCell(1).SetCellValue(comboBox_Baudrate.SelectedIndex == 0 ? "V1.2.2 125K" : "V2.0.0 250K");
                 row.GetCell(9).SetCellValue(textBox_RatePower.Text + " W");
                 //第11行,第2列静态电压,第10列额定转速
                 row = sheet.GetRow(10);
@@ -691,11 +691,11 @@ namespace MOTINOVA_Motor_Factory_Set
                 //第22行,第2列温度保护,第10列前灯电压
                 row = sheet.GetRow(21);
                 row.GetCell(1).SetCellValue(textBox_NTC_Ptotect.Text + " ℃");
-                row.GetCell(9).SetCellValue(comboBox_HeadLightVol.Text);
+                row.GetCell(9).SetCellValue(comboBox_HeadLightVol.Text.Contains("随电池") ? comboBox_HeadLightVol.Text + " " + textBox_Rate_Vol.Text + " V" : comboBox_HeadLightVol.Text);
                 //第23行,第2列码表,第10列后灯电压
                 row = sheet.GetRow(22);
                 row.GetCell(1).SetCellValue(comboBox_NoPBU.Text);
-                row.GetCell(9).SetCellValue(comboBox_TailLightVol.Text);
+                row.GetCell(9).SetCellValue(comboBox_TailLightVol.Text.Contains("随电池") ? comboBox_TailLightVol.Text + " " + textBox_Rate_Vol.Text + " V" : comboBox_TailLightVol.Text);
                 //第24行,第2列轮胎周长,第10列启动值
                 row = sheet.GetRow(23);
                 row.GetCell(1).SetCellValue(textBox_WheelSize.Text + " cm");
@@ -870,6 +870,22 @@ namespace MOTINOVA_Motor_Factory_Set
                 textBox_Start_Min.Text = "350";//启动值下限
                 textBox_Start_Max.Text = "750";//启动值上限
             }
+            else if (textBox_Model.Text.Contains("VR"))
+            {
+                textBox_Serial.Text = "2";//系列号
+                textBox_MaxCurrent.Text = "15";//限流
+                textBox_RatePower.Text = "250";//额定功率
+                textBox_RateSpeed.Text = "1200";//额定转速
+                textBox_Rate_Vol.Text = "36";//额定电压
+                textBox_NC_Current.Text = "1000";//空载电流
+                textBox_GasSpeedTh.Text = "1000";//指拨转速
+                textBox_Zero_Min.Text = "200";//零偏下限
+                textBox_Zero_Max.Text = "1800";//零偏上限
+                textBox_K_Min.Text = "0.25";//传感器标定值下限
+                textBox_K_Max.Text = "0.75";//传感器标定值下限
+                textBox_Start_Min.Text = "350";//启动值下限
+                textBox_Start_Max.Text = "750";//启动值上限
+            }
             else if (textBox_Model.Text.Contains("PG"))
             {
                 textBox_Serial.Text = "3";//系列号

+ 1 - 1
StartForm.Designer.cs

@@ -118,7 +118,7 @@
             this.label_Ver.Name = "label_Ver";
             this.label_Ver.Size = new System.Drawing.Size(316, 21);
             this.label_Ver.TabIndex = 2;
-            this.label_Ver.Text = "Ver: V1.4.1 Build Time: 2022-06-27 17:26";
+            this.label_Ver.Text = "Ver: V1.4.2 Build Time: 2022-06-30 10:26";
             // 
             // label_NetStatus
             // 

binární
bin/Debug/FOQC成机参数检验标准_Temple.xls


+ 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>LY2RNwxY1RPtID7HGyhVDdsuTkxl5KdK4KeeJoepSKE=</dsig:DigestValue>
+        <dsig:DigestValue>1DkTo53O9IyhM4LxEQA6hspCXZZRtzzJ7yiGFb6+F6s=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

binární
bin/Debug/MOTINOVA_Motor_Factory_Set.exe


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

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

binární
bin/Debug/MOTINOVA_Motor_Factory_Set.pdb


binární
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>LY2RNwxY1RPtID7HGyhVDdsuTkxl5KdK4KeeJoepSKE=</dsig:DigestValue>
+        <dsig:DigestValue>1DkTo53O9IyhM4LxEQA6hspCXZZRtzzJ7yiGFb6+F6s=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

binární
obj/Debug/MOTINOVA_Motor_Factory_Set.csproj.GenerateResource.cache


binární
obj/Debug/MOTINOVA_Motor_Factory_Set.exe


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

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

binární
obj/Debug/MOTINOVA_Motor_Factory_Set.pdb