浏览代码

增加故障日志读取,转把参数按照十进制显示。

dd 2 月之前
父节点
当前提交
457d703841

二进制
.vs/MOTINOVA_MC_Test/v17/.suo


+ 183 - 126
MOTINOVA_MC_Test/Form1.Designer.cs

@@ -250,6 +250,13 @@
             this.label64 = new System.Windows.Forms.Label();
             this.textBox_Config_Angle_Pitch = new System.Windows.Forms.TextBox();
             this.groupBox12 = new System.Windows.Forms.GroupBox();
+            this.label160 = new System.Windows.Forms.Label();
+            this.textBox_RideInfo_CalOnce = new System.Windows.Forms.TextBox();
+            this.textBox_RideInfo_CalTrip = new System.Windows.Forms.TextBox();
+            this.label159 = new System.Windows.Forms.Label();
+            this.textBox_RideInfo_SpeedMax = new System.Windows.Forms.TextBox();
+            this.label158 = new System.Windows.Forms.Label();
+            this.textBox_RideInfo_SpeedAvg = new System.Windows.Forms.TextBox();
             this.checkBox_ReadRideInfo = new System.Windows.Forms.CheckBox();
             this.button_Read_RidedInfo = new System.Windows.Forms.Button();
             this.label71 = new System.Windows.Forms.Label();
@@ -425,13 +432,10 @@
             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.tabControl2 = new System.Windows.Forms.TabControl();
+            this.tabPage3 = new System.Windows.Forms.TabPage();
+            this.tabPage4 = new System.Windows.Forms.TabPage();
+            this.button_ReadErrorLogAddr = new System.Windows.Forms.Button();
             this.groupBox1.SuspendLayout();
             this.groupBox2.SuspendLayout();
             this.groupBox5.SuspendLayout();
@@ -453,6 +457,9 @@
             this.tabControl1.SuspendLayout();
             this.tabPage1.SuspendLayout();
             this.tabPage2.SuspendLayout();
+            this.tabControl2.SuspendLayout();
+            this.tabPage3.SuspendLayout();
+            this.tabPage4.SuspendLayout();
             this.SuspendLayout();
             // 
             // groupBox1
@@ -2292,7 +2299,7 @@
             this.label59.Name = "label59";
             this.label59.Size = new System.Drawing.Size(65, 20);
             this.label59.TabIndex = 2;
-            this.label59.Text = "指拨模式";
+            this.label59.Text = "指拨参数";
             // 
             // label10
             // 
@@ -2837,23 +2844,9 @@
             // 
             // 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.tabControl2);
             this.groupBox12.Controls.Add(this.checkBox_ReadRideInfo);
             this.groupBox12.Controls.Add(this.button_Read_RidedInfo);
-            this.groupBox12.Controls.Add(this.label71);
-            this.groupBox12.Controls.Add(this.label67);
-            this.groupBox12.Controls.Add(this.textBox_RideInfo_Trip_Time);
-            this.groupBox12.Controls.Add(this.textBox_RideInfo_Trip_Km);
-            this.groupBox12.Controls.Add(this.label68);
-            this.groupBox12.Controls.Add(this.textBox_RideInfo_ODO_Time);
-            this.groupBox12.Controls.Add(this.label69);
-            this.groupBox12.Controls.Add(this.textBox_RideInfo_ODO_Km);
             this.groupBox12.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.groupBox12.Location = new System.Drawing.Point(896, 13);
             this.groupBox12.Name = "groupBox12";
@@ -2863,12 +2856,85 @@
             this.groupBox12.Text = "骑行信息";
             this.groupBox12.Visible = false;
             // 
+            // label160
+            // 
+            this.label160.AutoSize = true;
+            this.label160.Font = new System.Drawing.Font("微软雅黑", 10.5F);
+            this.label160.Location = new System.Drawing.Point(3, 71);
+            this.label160.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label160.Name = "label160";
+            this.label160.Size = new System.Drawing.Size(51, 20);
+            this.label160.TabIndex = 15;
+            this.label160.Text = "卡路里";
+            // 
+            // textBox_RideInfo_CalOnce
+            // 
+            this.textBox_RideInfo_CalOnce.Font = new System.Drawing.Font("微软雅黑", 10.5F);
+            this.textBox_RideInfo_CalOnce.Location = new System.Drawing.Point(78, 96);
+            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(66, 26);
+            this.textBox_RideInfo_CalOnce.TabIndex = 14;
+            // 
+            // textBox_RideInfo_CalTrip
+            // 
+            this.textBox_RideInfo_CalTrip.Font = new System.Drawing.Font("微软雅黑", 10.5F);
+            this.textBox_RideInfo_CalTrip.Location = new System.Drawing.Point(78, 68);
+            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(66, 26);
+            this.textBox_RideInfo_CalTrip.TabIndex = 13;
+            // 
+            // label159
+            // 
+            this.label159.AutoSize = true;
+            this.label159.Font = new System.Drawing.Font("微软雅黑", 10.5F);
+            this.label159.Location = new System.Drawing.Point(3, 43);
+            this.label159.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label159.Name = "label159";
+            this.label159.Size = new System.Drawing.Size(65, 20);
+            this.label159.TabIndex = 11;
+            this.label159.Text = "最高车速";
+            // 
+            // textBox_RideInfo_SpeedMax
+            // 
+            this.textBox_RideInfo_SpeedMax.Font = new System.Drawing.Font("微软雅黑", 10.5F);
+            this.textBox_RideInfo_SpeedMax.Location = new System.Drawing.Point(78, 40);
+            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(66, 26);
+            this.textBox_RideInfo_SpeedMax.TabIndex = 12;
+            // 
+            // label158
+            // 
+            this.label158.AutoSize = true;
+            this.label158.Font = new System.Drawing.Font("微软雅黑", 10.5F);
+            this.label158.Location = new System.Drawing.Point(3, 15);
+            this.label158.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label158.Name = "label158";
+            this.label158.Size = new System.Drawing.Size(65, 20);
+            this.label158.TabIndex = 9;
+            this.label158.Text = "平均车速";
+            // 
+            // textBox_RideInfo_SpeedAvg
+            // 
+            this.textBox_RideInfo_SpeedAvg.Font = new System.Drawing.Font("微软雅黑", 10.5F);
+            this.textBox_RideInfo_SpeedAvg.Location = new System.Drawing.Point(78, 12);
+            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(66, 26);
+            this.textBox_RideInfo_SpeedAvg.TabIndex = 10;
+            // 
             // checkBox_ReadRideInfo
             // 
             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(108, 0);
+            this.checkBox_ReadRideInfo.Location = new System.Drawing.Point(106, 196);
             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);
@@ -2878,7 +2944,7 @@
             // 
             // button_Read_RidedInfo
             // 
-            this.button_Read_RidedInfo.Location = new System.Drawing.Point(9, 189);
+            this.button_Read_RidedInfo.Location = new System.Drawing.Point(6, 195);
             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(55, 26);
@@ -2890,85 +2956,85 @@
             // label71
             // 
             this.label71.AutoSize = true;
-            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.Font = new System.Drawing.Font("微软雅黑", 10.5F);
+            this.label71.Location = new System.Drawing.Point(3, 99);
             this.label71.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label71.Name = "label71";
-            this.label71.Size = new System.Drawing.Size(58, 17);
+            this.label71.Size = new System.Drawing.Size(67, 20);
             this.label71.TabIndex = 2;
             this.label71.Text = "TRIP时间";
             // 
             // label67
             // 
             this.label67.AutoSize = true;
-            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.Font = new System.Drawing.Font("微软雅黑", 10.5F);
+            this.label67.Location = new System.Drawing.Point(3, 71);
             this.label67.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label67.Name = "label67";
-            this.label67.Size = new System.Drawing.Size(58, 17);
+            this.label67.Size = new System.Drawing.Size(67, 20);
             this.label67.TabIndex = 2;
             this.label67.Text = "TRIP里程";
             // 
             // textBox_RideInfo_Trip_Time
             // 
-            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.Font = new System.Drawing.Font("微软雅黑", 10.5F);
+            this.textBox_RideInfo_Trip_Time.Location = new System.Drawing.Point(78, 96);
             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, 23);
+            this.textBox_RideInfo_Trip_Time.Size = new System.Drawing.Size(66, 26);
             this.textBox_RideInfo_Trip_Time.TabIndex = 2;
             // 
             // textBox_RideInfo_Trip_Km
             // 
-            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.Font = new System.Drawing.Font("微软雅黑", 10.5F);
+            this.textBox_RideInfo_Trip_Km.Location = new System.Drawing.Point(78, 68);
             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, 23);
+            this.textBox_RideInfo_Trip_Km.Size = new System.Drawing.Size(66, 26);
             this.textBox_RideInfo_Trip_Km.TabIndex = 2;
             // 
             // label68
             // 
             this.label68.AutoSize = true;
-            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.Font = new System.Drawing.Font("微软雅黑", 10.5F);
+            this.label68.Location = new System.Drawing.Point(3, 43);
             this.label68.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label68.Name = "label68";
-            this.label68.Size = new System.Drawing.Size(61, 17);
+            this.label68.Size = new System.Drawing.Size(70, 20);
             this.label68.TabIndex = 2;
             this.label68.Text = "ODO时间";
             // 
             // textBox_RideInfo_ODO_Time
             // 
-            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.Font = new System.Drawing.Font("微软雅黑", 10.5F);
+            this.textBox_RideInfo_ODO_Time.Location = new System.Drawing.Point(78, 40);
             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, 23);
+            this.textBox_RideInfo_ODO_Time.Size = new System.Drawing.Size(66, 26);
             this.textBox_RideInfo_ODO_Time.TabIndex = 2;
             // 
             // label69
             // 
             this.label69.AutoSize = true;
-            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.Font = new System.Drawing.Font("微软雅黑", 10.5F);
+            this.label69.Location = new System.Drawing.Point(3, 15);
             this.label69.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label69.Name = "label69";
-            this.label69.Size = new System.Drawing.Size(61, 17);
+            this.label69.Size = new System.Drawing.Size(70, 20);
             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.Font = new System.Drawing.Font("微软雅黑", 10.5F);
+            this.textBox_RideInfo_ODO_Km.Location = new System.Drawing.Point(78, 12);
             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, 23);
+            this.textBox_RideInfo_ODO_Km.Size = new System.Drawing.Size(66, 26);
             this.textBox_RideInfo_ODO_Km.TabIndex = 2;
             // 
             // groupBox13
@@ -3125,6 +3191,7 @@
             // 
             // groupBox14
             // 
+            this.groupBox14.Controls.Add(this.button_ReadErrorLogAddr);
             this.groupBox14.Controls.Add(this.textBox_LogAddrEnd);
             this.groupBox14.Controls.Add(this.label99);
             this.groupBox14.Controls.Add(this.textBox_LogAddrBegin);
@@ -3237,7 +3304,7 @@
             this.button_ReadErrorLog.Name = "button_ReadErrorLog";
             this.button_ReadErrorLog.Size = new System.Drawing.Size(80, 28);
             this.button_ReadErrorLog.TabIndex = 2;
-            this.button_ReadErrorLog.Text = "记录导出";
+            this.button_ReadErrorLog.Text = "日志导出";
             this.button_ReadErrorLog.UseVisualStyleBackColor = true;
             this.button_ReadErrorLog.Click += new System.EventHandler(this.button_ReadErrorLog_Click);
             this.button_ReadErrorLog.MouseHover += new System.EventHandler(this.button_ReadErrorLog_MouseHover);
@@ -3254,7 +3321,7 @@
             // 
             // button_ReadRunLog
             // 
-            this.button_ReadRunLog.Location = new System.Drawing.Point(152, 454);
+            this.button_ReadRunLog.Location = new System.Drawing.Point(11, 454);
             this.button_ReadRunLog.Margin = new System.Windows.Forms.Padding(2, 4, 2, 4);
             this.button_ReadRunLog.Name = "button_ReadRunLog";
             this.button_ReadRunLog.Size = new System.Drawing.Size(70, 28);
@@ -4025,7 +4092,6 @@
             this.radioButton_ThreeSensor.Text = "三力矩";
             this.radioButton_ThreeSensor.UseVisualStyleBackColor = false;
             this.radioButton_ThreeSensor.CheckedChanged += new System.EventHandler(this.radioButton_ThreeSensor_CheckedChanged);
-            this.radioButton_ThreeSensor.Click += new System.EventHandler(this.radioButton_Gear_TURBO_Click);
             // 
             // radioButton_SingleSensor
             // 
@@ -4039,7 +4105,6 @@
             this.radioButton_SingleSensor.Text = "单力矩";
             this.radioButton_SingleSensor.UseVisualStyleBackColor = false;
             this.radioButton_SingleSensor.CheckedChanged += new System.EventHandler(this.radioButton_SingleSensor_CheckedChanged);
-            this.radioButton_SingleSensor.Click += new System.EventHandler(this.radioButton_Gear_TURBO_Click);
             // 
             // label115
             // 
@@ -4800,78 +4865,61 @@
             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 = "卡路里";
+            // tabControl2
+            // 
+            this.tabControl2.Controls.Add(this.tabPage3);
+            this.tabControl2.Controls.Add(this.tabPage4);
+            this.tabControl2.Location = new System.Drawing.Point(6, 26);
+            this.tabControl2.Name = "tabControl2";
+            this.tabControl2.SelectedIndex = 0;
+            this.tabControl2.Size = new System.Drawing.Size(158, 164);
+            this.tabControl2.TabIndex = 94;
+            // 
+            // tabPage3
+            // 
+            this.tabPage3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(46)))), ((int)(((byte)(193)))), ((int)(((byte)(144)))));
+            this.tabPage3.Controls.Add(this.label69);
+            this.tabPage3.Controls.Add(this.textBox_RideInfo_ODO_Km);
+            this.tabPage3.Controls.Add(this.textBox_RideInfo_ODO_Time);
+            this.tabPage3.Controls.Add(this.label68);
+            this.tabPage3.Controls.Add(this.textBox_RideInfo_Trip_Km);
+            this.tabPage3.Controls.Add(this.textBox_RideInfo_Trip_Time);
+            this.tabPage3.Controls.Add(this.label67);
+            this.tabPage3.Controls.Add(this.label71);
+            this.tabPage3.Location = new System.Drawing.Point(4, 29);
+            this.tabPage3.Name = "tabPage3";
+            this.tabPage3.Padding = new System.Windows.Forms.Padding(3);
+            this.tabPage3.Size = new System.Drawing.Size(150, 131);
+            this.tabPage3.TabIndex = 0;
+            this.tabPage3.Text = "记录1";
+            // 
+            // tabPage4
+            // 
+            this.tabPage4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(46)))), ((int)(((byte)(193)))), ((int)(((byte)(144)))));
+            this.tabPage4.Controls.Add(this.label158);
+            this.tabPage4.Controls.Add(this.label160);
+            this.tabPage4.Controls.Add(this.textBox_RideInfo_SpeedAvg);
+            this.tabPage4.Controls.Add(this.textBox_RideInfo_CalOnce);
+            this.tabPage4.Controls.Add(this.textBox_RideInfo_SpeedMax);
+            this.tabPage4.Controls.Add(this.textBox_RideInfo_CalTrip);
+            this.tabPage4.Controls.Add(this.label159);
+            this.tabPage4.Location = new System.Drawing.Point(4, 29);
+            this.tabPage4.Name = "tabPage4";
+            this.tabPage4.Padding = new System.Windows.Forms.Padding(3);
+            this.tabPage4.Size = new System.Drawing.Size(150, 131);
+            this.tabPage4.TabIndex = 1;
+            this.tabPage4.Text = "记录2";
+            // 
+            // button_ReadErrorLogAddr
+            // 
+            this.button_ReadErrorLogAddr.Location = new System.Drawing.Point(142, 454);
+            this.button_ReadErrorLogAddr.Margin = new System.Windows.Forms.Padding(2, 4, 2, 4);
+            this.button_ReadErrorLogAddr.Name = "button_ReadErrorLogAddr";
+            this.button_ReadErrorLogAddr.Size = new System.Drawing.Size(80, 28);
+            this.button_ReadErrorLogAddr.TabIndex = 13;
+            this.button_ReadErrorLogAddr.Text = "日志地址";
+            this.button_ReadErrorLogAddr.UseVisualStyleBackColor = true;
+            this.button_ReadErrorLogAddr.Click += new System.EventHandler(this.button_ReadErrorLogAddr_Click);
             // 
             // Form1
             // 
@@ -4886,7 +4934,6 @@
             this.Controls.Add(this.groupBox17);
             this.Controls.Add(this.groupBox16);
             this.Controls.Add(this.groupBox15);
-            this.Controls.Add(this.groupBox14);
             this.Controls.Add(this.label_DateTime);
             this.Controls.Add(this.label_BiuldTime);
             this.Controls.Add(this.label77);
@@ -4905,6 +4952,7 @@
             this.Controls.Add(this.groupBox2);
             this.Controls.Add(this.groupBox1);
             this.Controls.Add(this.label1_Welcom);
+            this.Controls.Add(this.groupBox14);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Margin = new System.Windows.Forms.Padding(2, 4, 2, 4);
@@ -4954,6 +5002,11 @@
             this.tabPage1.PerformLayout();
             this.tabPage2.ResumeLayout(false);
             this.tabPage2.PerformLayout();
+            this.tabControl2.ResumeLayout(false);
+            this.tabPage3.ResumeLayout(false);
+            this.tabPage3.PerformLayout();
+            this.tabPage4.ResumeLayout(false);
+            this.tabPage4.PerformLayout();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -5363,6 +5416,10 @@
         private System.Windows.Forms.TextBox textBox_RideInfo_SpeedMax;
         private System.Windows.Forms.Label label158;
         private System.Windows.Forms.TextBox textBox_RideInfo_SpeedAvg;
+        private System.Windows.Forms.TabControl tabControl2;
+        private System.Windows.Forms.TabPage tabPage3;
+        private System.Windows.Forms.TabPage tabPage4;
+        private System.Windows.Forms.Button button_ReadErrorLogAddr;
     }
 }
 

+ 28 - 2
MOTINOVA_MC_Test/Form1.cs

@@ -1825,7 +1825,7 @@ namespace MOTINOVA_MC_Test
                                 {
                                     //指拨模式
                                     DataTemp = (ushort)(binary_data_1[2]);
-                                    textBox_Config_GasMode.Text = Convert.ToString(DataTemp, 16).PadLeft(2, '0').ToUpper();                                   
+                                    textBox_Config_GasMode.Text = Convert.ToString(DataTemp);                                   
                                     //启动模式
                                     DataTemp = (ushort)(binary_data_1[3]);
                                     if (DataTemp == 0x01)
@@ -2555,6 +2555,21 @@ namespace MOTINOVA_MC_Test
                             }
                             break;
                         }
+                    case 0xC008: //故障日志地址
+                        {
+                            unchecked
+                            {
+                                this.Invoke((EventHandler)(delegate
+                                {
+                                    uint Addr_Begin = 0, Addr_End = 0;
+                                    Addr_Begin = (uint)((binary_data_1[2] << 24) + (binary_data_1[3] << 16) + (binary_data_1[4] << 8) + binary_data_1[5]);
+                                    Addr_End = (uint)((binary_data_1[6] << 24) + (binary_data_1[7] << 16) + (binary_data_1[8] << 8) + binary_data_1[9]);
+                                    textBox_LogAddrBegin.Text = Convert.ToString(Addr_Begin, 16).PadLeft(8, '0').ToUpper();
+                                    textBox_LogAddrEnd.Text = Convert.ToString(Addr_End, 16).PadLeft(8, '0').ToUpper();
+                                }));
+                            }
+                            break;
+                        }
                     default: break;
                 }
                 //存储器导出数据显示
@@ -2744,7 +2759,7 @@ namespace MOTINOVA_MC_Test
             ushort DataTemp;
 
             //指拨参数
-            ConfigParam[0] = byte.Parse(textBox_Config_GasMode.Text, System.Globalization.NumberStyles.HexNumber);
+            ConfigParam[0] = Convert.ToByte(textBox_Config_GasMode.Text);
             //启动模式
             if (comboBox_StartMode.Text == "柔和")
                 ConfigParam[1] = 0x01;
@@ -4288,6 +4303,8 @@ namespace MOTINOVA_MC_Test
             this.BackColor = System.Drawing.Color.FromArgb((int)0, (int)192, (int)192);
             tabPage1.BackColor = System.Drawing.Color.FromArgb((int)0, (int)192, (int)192);
             tabPage2.BackColor = System.Drawing.Color.FromArgb((int)0, (int)192, (int)192);
+            tabPage3.BackColor = System.Drawing.Color.FromArgb((int)0, (int)192, (int)192);
+            tabPage4.BackColor = System.Drawing.Color.FromArgb((int)0, (int)192, (int)192);
             textBox_RevCnt.BackColor = System.Drawing.Color.FromArgb((int)0, (int)192, (int)192);
         }
 
@@ -4315,6 +4332,8 @@ namespace MOTINOVA_MC_Test
             this.BackColor = System.Drawing.Color.FromArgb((int)46, (int)193, (int)144);
             tabPage1.BackColor = System.Drawing.Color.FromArgb((int)46, (int)193, (int)144);
             tabPage2.BackColor = System.Drawing.Color.FromArgb((int)46, (int)193, (int)144);
+            tabPage3.BackColor = System.Drawing.Color.FromArgb((int)46, (int)193, (int)144);
+            tabPage4.BackColor = System.Drawing.Color.FromArgb((int)46, (int)193, (int)144);
             textBox_RevCnt.BackColor = System.Drawing.Color.FromArgb((int)46, (int)193, (int)144);
         }
 
@@ -4328,5 +4347,12 @@ namespace MOTINOVA_MC_Test
 
             checkBox_AutoSend.Checked = false;
         }
+
+        private void button_ReadErrorLogAddr_Click(object sender, EventArgs e)
+        {
+            SendCmd((ushort)0x751, (byte)0x11, (ushort)0x5200, null);
+            textBox_LogAddrBegin.Text = "";
+            textBox_LogAddrEnd.Text = "";
+        }
     }
 }

+ 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>9mYZEHEkvWF/Q2I8bvxdaKAjvyVXxwcigNIClbZ/5e4=</dsig:DigestValue>
+        <dsig:DigestValue>rAH7vZbib+KQuBmezlG/ailq5eGMfyNwlj7Ksbv63LM=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

二进制
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="278528">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="MOTINOVA_MC_Test.exe" size="280064">
       <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>d9t5uAnfo7RwRff58QGRZzzCtywBtsrN1vTh6RffuGs=</dsig:DigestValue>
+        <dsig:DigestValue>0uoI7cCJv91qqaH5aVlw2yH21F7or4CZpnNiMJ46W+U=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

二进制
MOTINOVA_MC_Test/bin/Debug/MOTINOVA_MC_Test.pdb


二进制
MOTINOVA_MC_Test/bin/Debug/app.publish/MOTINOVA_MC_Test.exe


+ 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>9mYZEHEkvWF/Q2I8bvxdaKAjvyVXxwcigNIClbZ/5e4=</dsig:DigestValue>
+        <dsig:DigestValue>rAH7vZbib+KQuBmezlG/ailq5eGMfyNwlj7Ksbv63LM=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

二进制
MOTINOVA_MC_Test/obj/Debug/MOTINOVA_MC_Test.csproj.AssemblyReference.cache


二进制
MOTINOVA_MC_Test/obj/Debug/MOTINOVA_MC_Test.csproj.GenerateResource.cache


二进制
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="278528">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="MOTINOVA_MC_Test.exe" size="280064">
       <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>d9t5uAnfo7RwRff58QGRZzzCtywBtsrN1vTh6RffuGs=</dsig:DigestValue>
+        <dsig:DigestValue>0uoI7cCJv91qqaH5aVlw2yH21F7or4CZpnNiMJ46W+U=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

二进制
MOTINOVA_MC_Test/obj/Debug/MOTINOVA_MC_Test.pdb