Bladeren bron

解决单力矩标定问题。

dd 3 maanden geleden
bovenliggende
commit
aa466807e7

BIN
.vs/MOTINOVA_MC_Test/v17/.suo


+ 120 - 18
MOTINOVA_MC_Test/Form1.Designer.cs

@@ -425,6 +425,13 @@
             this.label153 = new System.Windows.Forms.Label();
             this.label154 = new System.Windows.Forms.Label();
             this.label155 = new System.Windows.Forms.Label();
+            this.label158 = new System.Windows.Forms.Label();
+            this.textBox_RideInfo_SpeedAvg = new System.Windows.Forms.TextBox();
+            this.label159 = new System.Windows.Forms.Label();
+            this.textBox_RideInfo_SpeedMax = new System.Windows.Forms.TextBox();
+            this.textBox_RideInfo_CalTrip = new System.Windows.Forms.TextBox();
+            this.textBox_RideInfo_CalOnce = new System.Windows.Forms.TextBox();
+            this.label160 = new System.Windows.Forms.Label();
             this.groupBox1.SuspendLayout();
             this.groupBox2.SuspendLayout();
             this.groupBox5.SuspendLayout();
@@ -2830,6 +2837,13 @@
             // 
             // groupBox12
             // 
+            this.groupBox12.Controls.Add(this.label160);
+            this.groupBox12.Controls.Add(this.textBox_RideInfo_CalOnce);
+            this.groupBox12.Controls.Add(this.textBox_RideInfo_CalTrip);
+            this.groupBox12.Controls.Add(this.label159);
+            this.groupBox12.Controls.Add(this.textBox_RideInfo_SpeedMax);
+            this.groupBox12.Controls.Add(this.label158);
+            this.groupBox12.Controls.Add(this.textBox_RideInfo_SpeedAvg);
             this.groupBox12.Controls.Add(this.checkBox_ReadRideInfo);
             this.groupBox12.Controls.Add(this.button_Read_RidedInfo);
             this.groupBox12.Controls.Add(this.label71);
@@ -2854,7 +2868,7 @@
             this.checkBox_ReadRideInfo.AutoSize = true;
             this.checkBox_ReadRideInfo.Checked = true;
             this.checkBox_ReadRideInfo.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.checkBox_ReadRideInfo.Location = new System.Drawing.Point(102, 155);
+            this.checkBox_ReadRideInfo.Location = new System.Drawing.Point(108, 0);
             this.checkBox_ReadRideInfo.Margin = new System.Windows.Forms.Padding(2, 4, 2, 4);
             this.checkBox_ReadRideInfo.Name = "checkBox_ReadRideInfo";
             this.checkBox_ReadRideInfo.Size = new System.Drawing.Size(56, 24);
@@ -2864,10 +2878,10 @@
             // 
             // button_Read_RidedInfo
             // 
-            this.button_Read_RidedInfo.Location = new System.Drawing.Point(17, 151);
+            this.button_Read_RidedInfo.Location = new System.Drawing.Point(9, 189);
             this.button_Read_RidedInfo.Margin = new System.Windows.Forms.Padding(2, 4, 2, 4);
             this.button_Read_RidedInfo.Name = "button_Read_RidedInfo";
-            this.button_Read_RidedInfo.Size = new System.Drawing.Size(67, 35);
+            this.button_Read_RidedInfo.Size = new System.Drawing.Size(55, 26);
             this.button_Read_RidedInfo.TabIndex = 2;
             this.button_Read_RidedInfo.Text = "查询";
             this.button_Read_RidedInfo.UseVisualStyleBackColor = true;
@@ -2876,77 +2890,85 @@
             // label71
             // 
             this.label71.AutoSize = true;
-            this.label71.Location = new System.Drawing.Point(6, 118);
+            this.label71.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label71.Location = new System.Drawing.Point(6, 98);
             this.label71.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label71.Name = "label71";
-            this.label71.Size = new System.Drawing.Size(67, 20);
+            this.label71.Size = new System.Drawing.Size(58, 17);
             this.label71.TabIndex = 2;
             this.label71.Text = "TRIP时间";
             // 
             // label67
             // 
             this.label67.AutoSize = true;
-            this.label67.Location = new System.Drawing.Point(6, 88);
+            this.label67.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label67.Location = new System.Drawing.Point(6, 75);
             this.label67.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label67.Name = "label67";
-            this.label67.Size = new System.Drawing.Size(67, 20);
+            this.label67.Size = new System.Drawing.Size(58, 17);
             this.label67.TabIndex = 2;
             this.label67.Text = "TRIP里程";
             // 
             // textBox_RideInfo_Trip_Time
             // 
-            this.textBox_RideInfo_Trip_Time.Location = new System.Drawing.Point(79, 114);
+            this.textBox_RideInfo_Trip_Time.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.textBox_RideInfo_Trip_Time.Location = new System.Drawing.Point(79, 95);
             this.textBox_RideInfo_Trip_Time.Margin = new System.Windows.Forms.Padding(2, 4, 2, 4);
             this.textBox_RideInfo_Trip_Time.Name = "textBox_RideInfo_Trip_Time";
             this.textBox_RideInfo_Trip_Time.ReadOnly = true;
-            this.textBox_RideInfo_Trip_Time.Size = new System.Drawing.Size(85, 26);
+            this.textBox_RideInfo_Trip_Time.Size = new System.Drawing.Size(85, 23);
             this.textBox_RideInfo_Trip_Time.TabIndex = 2;
             // 
             // textBox_RideInfo_Trip_Km
             // 
-            this.textBox_RideInfo_Trip_Km.Location = new System.Drawing.Point(79, 84);
+            this.textBox_RideInfo_Trip_Km.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.textBox_RideInfo_Trip_Km.Location = new System.Drawing.Point(79, 72);
             this.textBox_RideInfo_Trip_Km.Margin = new System.Windows.Forms.Padding(2, 4, 2, 4);
             this.textBox_RideInfo_Trip_Km.Name = "textBox_RideInfo_Trip_Km";
             this.textBox_RideInfo_Trip_Km.ReadOnly = true;
-            this.textBox_RideInfo_Trip_Km.Size = new System.Drawing.Size(85, 26);
+            this.textBox_RideInfo_Trip_Km.Size = new System.Drawing.Size(85, 23);
             this.textBox_RideInfo_Trip_Km.TabIndex = 2;
             // 
             // label68
             // 
             this.label68.AutoSize = true;
-            this.label68.Location = new System.Drawing.Point(6, 59);
+            this.label68.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label68.Location = new System.Drawing.Point(6, 52);
             this.label68.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label68.Name = "label68";
-            this.label68.Size = new System.Drawing.Size(70, 20);
+            this.label68.Size = new System.Drawing.Size(61, 17);
             this.label68.TabIndex = 2;
             this.label68.Text = "ODO时间";
             // 
             // textBox_RideInfo_ODO_Time
             // 
-            this.textBox_RideInfo_ODO_Time.Location = new System.Drawing.Point(79, 55);
+            this.textBox_RideInfo_ODO_Time.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.textBox_RideInfo_ODO_Time.Location = new System.Drawing.Point(79, 49);
             this.textBox_RideInfo_ODO_Time.Margin = new System.Windows.Forms.Padding(2, 4, 2, 4);
             this.textBox_RideInfo_ODO_Time.Name = "textBox_RideInfo_ODO_Time";
             this.textBox_RideInfo_ODO_Time.ReadOnly = true;
-            this.textBox_RideInfo_ODO_Time.Size = new System.Drawing.Size(85, 26);
+            this.textBox_RideInfo_ODO_Time.Size = new System.Drawing.Size(85, 23);
             this.textBox_RideInfo_ODO_Time.TabIndex = 2;
             // 
             // label69
             // 
             this.label69.AutoSize = true;
-            this.label69.Location = new System.Drawing.Point(6, 30);
+            this.label69.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label69.Location = new System.Drawing.Point(6, 29);
             this.label69.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label69.Name = "label69";
-            this.label69.Size = new System.Drawing.Size(70, 20);
+            this.label69.Size = new System.Drawing.Size(61, 17);
             this.label69.TabIndex = 2;
             this.label69.Text = "ODO里程";
             // 
             // textBox_RideInfo_ODO_Km
             // 
+            this.textBox_RideInfo_ODO_Km.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.textBox_RideInfo_ODO_Km.Location = new System.Drawing.Point(79, 26);
             this.textBox_RideInfo_ODO_Km.Margin = new System.Windows.Forms.Padding(2, 4, 2, 4);
             this.textBox_RideInfo_ODO_Km.Name = "textBox_RideInfo_ODO_Km";
             this.textBox_RideInfo_ODO_Km.ReadOnly = true;
-            this.textBox_RideInfo_ODO_Km.Size = new System.Drawing.Size(85, 26);
+            this.textBox_RideInfo_ODO_Km.Size = new System.Drawing.Size(85, 23);
             this.textBox_RideInfo_ODO_Km.TabIndex = 2;
             // 
             // groupBox13
@@ -4778,6 +4800,79 @@
             this.label155.TabIndex = 66;
             this.label155.Text = "状态机1";
             // 
+            // label158
+            // 
+            this.label158.AutoSize = true;
+            this.label158.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label158.Location = new System.Drawing.Point(6, 121);
+            this.label158.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label158.Name = "label158";
+            this.label158.Size = new System.Drawing.Size(56, 17);
+            this.label158.TabIndex = 9;
+            this.label158.Text = "平均车速";
+            // 
+            // textBox_RideInfo_SpeedAvg
+            // 
+            this.textBox_RideInfo_SpeedAvg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.textBox_RideInfo_SpeedAvg.Location = new System.Drawing.Point(79, 118);
+            this.textBox_RideInfo_SpeedAvg.Margin = new System.Windows.Forms.Padding(2, 4, 2, 4);
+            this.textBox_RideInfo_SpeedAvg.Name = "textBox_RideInfo_SpeedAvg";
+            this.textBox_RideInfo_SpeedAvg.ReadOnly = true;
+            this.textBox_RideInfo_SpeedAvg.Size = new System.Drawing.Size(85, 23);
+            this.textBox_RideInfo_SpeedAvg.TabIndex = 10;
+            // 
+            // label159
+            // 
+            this.label159.AutoSize = true;
+            this.label159.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label159.Location = new System.Drawing.Point(6, 144);
+            this.label159.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label159.Name = "label159";
+            this.label159.Size = new System.Drawing.Size(56, 17);
+            this.label159.TabIndex = 11;
+            this.label159.Text = "最高车速";
+            // 
+            // textBox_RideInfo_SpeedMax
+            // 
+            this.textBox_RideInfo_SpeedMax.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.textBox_RideInfo_SpeedMax.Location = new System.Drawing.Point(79, 141);
+            this.textBox_RideInfo_SpeedMax.Margin = new System.Windows.Forms.Padding(2, 4, 2, 4);
+            this.textBox_RideInfo_SpeedMax.Name = "textBox_RideInfo_SpeedMax";
+            this.textBox_RideInfo_SpeedMax.ReadOnly = true;
+            this.textBox_RideInfo_SpeedMax.Size = new System.Drawing.Size(85, 23);
+            this.textBox_RideInfo_SpeedMax.TabIndex = 12;
+            // 
+            // textBox_RideInfo_CalTrip
+            // 
+            this.textBox_RideInfo_CalTrip.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.textBox_RideInfo_CalTrip.Location = new System.Drawing.Point(79, 164);
+            this.textBox_RideInfo_CalTrip.Margin = new System.Windows.Forms.Padding(2, 4, 2, 4);
+            this.textBox_RideInfo_CalTrip.Name = "textBox_RideInfo_CalTrip";
+            this.textBox_RideInfo_CalTrip.ReadOnly = true;
+            this.textBox_RideInfo_CalTrip.Size = new System.Drawing.Size(85, 23);
+            this.textBox_RideInfo_CalTrip.TabIndex = 13;
+            // 
+            // textBox_RideInfo_CalOnce
+            // 
+            this.textBox_RideInfo_CalOnce.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.textBox_RideInfo_CalOnce.Location = new System.Drawing.Point(79, 187);
+            this.textBox_RideInfo_CalOnce.Margin = new System.Windows.Forms.Padding(2, 4, 2, 4);
+            this.textBox_RideInfo_CalOnce.Name = "textBox_RideInfo_CalOnce";
+            this.textBox_RideInfo_CalOnce.ReadOnly = true;
+            this.textBox_RideInfo_CalOnce.Size = new System.Drawing.Size(85, 23);
+            this.textBox_RideInfo_CalOnce.TabIndex = 14;
+            // 
+            // label160
+            // 
+            this.label160.AutoSize = true;
+            this.label160.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label160.Location = new System.Drawing.Point(6, 167);
+            this.label160.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label160.Name = "label160";
+            this.label160.Size = new System.Drawing.Size(44, 17);
+            this.label160.TabIndex = 15;
+            this.label160.Text = "卡路里";
+            // 
             // Form1
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -5261,6 +5356,13 @@
         private System.Windows.Forms.TextBox textBox_LogAddrBegin;
         private System.Windows.Forms.Label label156;
         private System.Windows.Forms.Label label157;
+        private System.Windows.Forms.Label label160;
+        private System.Windows.Forms.TextBox textBox_RideInfo_CalOnce;
+        private System.Windows.Forms.TextBox textBox_RideInfo_CalTrip;
+        private System.Windows.Forms.Label label159;
+        private System.Windows.Forms.TextBox textBox_RideInfo_SpeedMax;
+        private System.Windows.Forms.Label label158;
+        private System.Windows.Forms.TextBox textBox_RideInfo_SpeedAvg;
     }
 }
 

+ 41 - 9
MOTINOVA_MC_Test/Form1.cs

@@ -248,7 +248,7 @@ namespace MOTINOVA_MC_Test
                 CfgFileInfo += "User:" + ServerUser + "\r\n";
                 CfgFileInfo += "Password:" + ServerPasswd + "\r\n";
                 CfgFileInfo += "PathName:" + ServerPath + "\r\n";
-                CfgFileInfo += "Offline:" + "FALSE" + "\r\n";
+                CfgFileInfo += "Offline:" + "TRUE" + "\r\n";
                 aes.EncryptToFile(CfgFileInfo, ConfigFileName, "2D820F88F60A39D5", "3687C5216B19D16B");                
             }
             //配置网络FTP服务器
@@ -672,9 +672,9 @@ namespace MOTINOVA_MC_Test
                 }
                 else
                 {
-                    if ((textBox_Sensor1_Avg.Text != "---") && (textBox_Sensor1_Avg.Text != string.Empty))
+                    if ((textBox_TorqueData.Text != "---") && (textBox_TorqueData.Text != string.Empty))
                     {
-                        DataTemp = textBox_Sensor1_Avg.Text;
+                        DataTemp = textBox_TorqueData.Text;
                         DataTemp = System.Text.RegularExpressions.Regex.Replace(DataTemp, @"[^0-9]+", "");
                         K = float.Parse(DataTemp) / 75f;
                         textBox_Sensor1_K.Text = K.ToString("#0.00");
@@ -1794,12 +1794,20 @@ namespace MOTINOVA_MC_Test
                                     {
                                         textBox_TorqueData.Text = Convert.ToString(GetAvg(TorqueArray, 25)) + " N.m";
                                         textBox_Torque_Stdev.Text = Convert.ToString(GetStDev(TorqueArray, 25));
-                                        textBox_Sensor1_Avg.Text = Convert.ToString(GetAvg(Sensor1Array, 25)) + " N.m";
-                                        textBox_Sensor1_Std.Text = Convert.ToString(GetStDev(Sensor1Array, 25));
-                                        textBox_Sensor2_Avg.Text = Convert.ToString(GetAvg(Sensor2Array, 25)) + " N.m";
-                                        textBox_Sensor2_Std.Text = Convert.ToString(GetStDev(Sensor2Array, 25));
-                                        textBox_Sensor3_Avg.Text = Convert.ToString(GetAvg(Sensor3Array, 25)) + " N.m";
-                                        textBox_Sensor3_Std.Text = Convert.ToString(GetStDev(Sensor3Array, 25));
+                                        if (radioButton_SingleSensor.Checked) //单力矩
+                                        {
+                                            textBox_Sensor1_Avg.Text = Convert.ToString(GetAvg(TorqueArray, 25)) + " N.m";
+                                            textBox_Sensor1_Std.Text = Convert.ToString(GetStDev(TorqueArray, 25));
+                                        }
+                                        else if (radioButton_ThreeSensor.Checked) //三力矩
+                                        {
+                                            textBox_Sensor1_Avg.Text = Convert.ToString(GetAvg(Sensor1Array, 25)) + " N.m";
+                                            textBox_Sensor1_Std.Text = Convert.ToString(GetStDev(Sensor1Array, 25));
+                                            textBox_Sensor2_Avg.Text = Convert.ToString(GetAvg(Sensor2Array, 25)) + " N.m";
+                                            textBox_Sensor2_Std.Text = Convert.ToString(GetStDev(Sensor2Array, 25));
+                                            textBox_Sensor3_Avg.Text = Convert.ToString(GetAvg(Sensor3Array, 25)) + " N.m";
+                                            textBox_Sensor3_Std.Text = Convert.ToString(GetStDev(Sensor3Array, 25));
+                                        }                                        
                                         TorqueArray_Index = 0;
                                     }
 
@@ -2467,6 +2475,30 @@ namespace MOTINOVA_MC_Test
                             }
                             break;
                         }
+                    case 0x1A10:
+                        {
+                            unchecked
+                            {
+                                this.Invoke((EventHandler)(delegate
+                                {
+                                    long DataTemp32;
+                                    MC_RideInfo_Refresh = true;
+                                    //平均车速
+                                    DataTemp = (ushort)(binary_data_1[3] * 256 + binary_data_1[2]);
+                                    textBox_RideInfo_SpeedAvg.Text = ((float)DataTemp / 10f).ToString("0.0") + " km/h";
+                                    //最高车速
+                                    DataTemp = (ushort)(binary_data_1[5] * 256 + binary_data_1[4]);
+                                    textBox_RideInfo_SpeedMax.Text = ((float)DataTemp / 10f).ToString("0.0") + " km/h";
+                                    //卡路里Trip
+                                    DataTemp32 = (long)((binary_data_1[9] << 24) + (binary_data_1[8] << 16) + (binary_data_1[7] << 8) + binary_data_1[6]);
+                                    textBox_RideInfo_CalTrip.Text = DataTemp32.ToString() + " kcal";
+                                    //卡路里Once
+                                    DataTemp = (ushort)(binary_data_1[11] * 256 + binary_data_1[10]);
+                                    textBox_RideInfo_CalOnce.Text = DataTemp.ToString() + " kcal";
+                                }));
+                            }
+                            break;
+                        }
                     case 0xBA20: //调试信息
                         {
                             unchecked

+ 7 - 7
MOTINOVA_MC_Test/Form1.resx

@@ -112,24 +112,24 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="serialPort1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="serialPort1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>13, 17</value>
   </metadata>
-  <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>127, 17</value>
   </metadata>
-  <metadata name="timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>217, 17</value>
   </metadata>
-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>37</value>
   </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <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">
     <value>
         AAABAAkAEBAQAAAAAAAoAQAAlgAAABAQAAABAAgAaAUAAL4BAAAQEAAAAQAYAGgDAAAmBwAAICAAAAEA

+ 1 - 1
MOTINOVA_MC_Test/bin/Debug/MOTINOVA_MC_Test.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>t6TsoGzaYRa5uveFLgD0LF382ge3snCnW7Uf7l0fwvs=</dsig:DigestValue>
+        <dsig:DigestValue>9mYZEHEkvWF/Q2I8bvxdaKAjvyVXxwcigNIClbZ/5e4=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

BIN
MOTINOVA_MC_Test/bin/Debug/MOTINOVA_MC_Test.exe


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

@@ -43,14 +43,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="MOTINOVA_MC_Test.exe" size="275968">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="MOTINOVA_MC_Test.exe" size="278528">
       <assemblyIdentity name="MOTINOVA_MC_Test" 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>VHpicJlnGughC4uL4Bqff8u3+mIF4u7gHsxtXP/Ry0Q=</dsig:DigestValue>
+        <dsig:DigestValue>d9t5uAnfo7RwRff58QGRZzzCtywBtsrN1vTh6RffuGs=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

BIN
MOTINOVA_MC_Test/bin/Debug/MOTINOVA_MC_Test.pdb


BIN
MOTINOVA_MC_Test/bin/Debug/Server


BIN
MOTINOVA_MC_Test/bin/Debug/Server-Offline


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


BIN
MOTINOVA_MC_Test/obj/Debug/DesignTimeResolveAssemblyReferences.cache


BIN
MOTINOVA_MC_Test/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache


+ 1 - 1
MOTINOVA_MC_Test/obj/Debug/MOTINOVA_MC_Test.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>t6TsoGzaYRa5uveFLgD0LF382ge3snCnW7Uf7l0fwvs=</dsig:DigestValue>
+        <dsig:DigestValue>9mYZEHEkvWF/Q2I8bvxdaKAjvyVXxwcigNIClbZ/5e4=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

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


BIN
MOTINOVA_MC_Test/obj/Debug/MOTINOVA_MC_Test.exe


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

@@ -43,14 +43,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="MOTINOVA_MC_Test.exe" size="275968">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="MOTINOVA_MC_Test.exe" size="278528">
       <assemblyIdentity name="MOTINOVA_MC_Test" 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>VHpicJlnGughC4uL4Bqff8u3+mIF4u7gHsxtXP/Ry0Q=</dsig:DigestValue>
+        <dsig:DigestValue>d9t5uAnfo7RwRff58QGRZzzCtywBtsrN1vTh6RffuGs=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

BIN
MOTINOVA_MC_Test/obj/Debug/MOTINOVA_MC_Test.pdb