Explorar o código

增加判断阈值。

Dail hai 1 ano
pai
achega
817a7f3c27

BIN=BIN
.vs/Welling_Motor_Debug_Tool/v17/.suo


BIN=BIN
Welling_Motor_Debug_Tool/bin/Debug/Welling_Motor_Debug_Tool.exe


BIN=BIN
Welling_Motor_Debug_Tool/bin/Debug/Welling_Motor_Debug_Tool.pdb


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 488 - 314
Welling_Motor_Debug_Tool/mainForm.Designer.cs


+ 101 - 26
Welling_Motor_Debug_Tool/mainForm.cs

@@ -182,6 +182,17 @@ namespace Welling_Motor_Debug_Tool
                     //电机类型
                     中置电机ToolStripMenuItem.Checked = (array_CfgInfo[29].ToString().Split(':')[1] == "True");
                     轮毂电机ToolStripMenuItem.Checked = !中置电机ToolStripMenuItem.Checked;
+                    //检测阈值
+                    toolStripTextBox_ThVol.Text = array_CfgInfo[33].ToString().Split(':')[1];
+                    toolStripTextBox_ThCur.Text = array_CfgInfo[34].ToString().Split(':')[1];
+                    toolStripTextBox_ThSpeed.Text = array_CfgInfo[35].ToString().Split(':')[1];
+                    toolStripTextBox_ThTor.Text = array_CfgInfo[36].ToString().Split(':')[1];
+                    toolStripTextBox_ThCad.Text = array_CfgInfo[37].ToString().Split(':')[1];
+                    toolStripTextBox_ThBikeSpeed.Text = array_CfgInfo[38].ToString().Split(':')[1];
+                    toolStripTextBox_ThT_PCB.Text = array_CfgInfo[39].ToString().Split(':')[1];
+                    toolStripTextBox_ThT_MCU.Text = array_CfgInfo[40].ToString().Split(':')[1];
+                    toolStripTextBox_ThT_Motor.Text = array_CfgInfo[41].ToString().Split(':')[1];
+
                 }
                 catch (System.Exception)
                 {
@@ -209,6 +220,8 @@ namespace Welling_Motor_Debug_Tool
                         写入存储ToolStripMenuItem.Visible = false;
                         离线使用ToolStripMenuItem.Visible = false;
                         服务器配置ToolStripMenuItem.Visible = false;
+                        判断阈值ToolStripMenuItem.Visible = false;
+                        力矩传感器检验ToolStripMenuItem.Visible = false;
                         //显示生产信息
                         生产信息ToolStripMenuItem.Visible = true;
                         //显示电机类型,但不可编辑
@@ -227,7 +240,7 @@ namespace Welling_Motor_Debug_Tool
                         tabPage_OBC.Parent = null;
                         tabPage_RAMorFLASH.Parent = null;
                         tabPage_FactoryMode.Parent = null;
-                        tabPage_DebugInfo.Parent = null;                        
+                        tabPage_DebugInfo.Parent = null;
                         //显示运行信息
                         tabPage_RunInfo.Parent = tabControl2;
                         //根据电机类型修改生产信息和电机类型
@@ -255,7 +268,7 @@ namespace Welling_Motor_Debug_Tool
                             tabPage_ProductMode_Read.Parent = null;
                         }
                         else if (EnterForm1.comboBox_User.Text.Contains("检验"))
-                        {                            
+                        {
                             tabPage_ProductMode_Read.Parent = tabControl1;
                             tabPage_ProductMode_Read.Select();
                             tabPage_ProductMode_Write.Parent = null;
@@ -267,14 +280,38 @@ namespace Welling_Motor_Debug_Tool
                     {
                         //隐藏工作台内容,新建窗口完成配置
                         groupBox1.Visible = false;
-                        groupBox2.Visible = false;
                         groupBox3.Visible = false;
+                        tabControl2.Visible = false;
                         //隐藏提示信息
                         label_StarInfo.Visible = false;
                         //打开参数配置框
                         MessageBox.Show("开发中", "提示", MessageBoxButtons.OK, MessageBoxIcon.Error);
                         System.Environment.Exit(0);
                     }
+                    else if (EnterForm1.comboBox_User.Text.Contains("样机"))
+                    {
+                        //隐藏量产界面
+                        tabPage_ProductMode_Read.Parent = null;
+                        tabPage_ProductMode_Write.Parent = null;
+                        判断阈值ToolStripMenuItem.Visible = false;
+                        力矩传感器检验ToolStripMenuItem.Visible = false;
+                        if (EnterForm1.comboBox_User.Text.Contains("中置"))
+                        {
+                            中置电机ToolStripMenuItem.Checked = true;
+                            轮毂电机ToolStripMenuItem.Checked = false;
+                            toolStripTextBox_MACPD.Text = "MM_MC1";
+                            toolStripTextBox_ServerPath.Text = "MIGIC_TEST";
+                            ConfigFileSave(false, localInfo.LocalPath + localInfo.ConfigFileName);
+                        }
+                        else if (EnterForm1.comboBox_User.Text.Contains("轮毂"))
+                        {
+                            中置电机ToolStripMenuItem.Checked = false;
+                            轮毂电机ToolStripMenuItem.Checked = true;
+                            toolStripTextBox_MACPD.Text = "GF_250_1";
+                            toolStripTextBox_ServerPath.Text = "HUB_Control_TEST";
+                            ConfigFileSave(false, localInfo.LocalPath + localInfo.ConfigFileName);
+                        }
+                    }
                     else if (EnterForm1.comboBox_User.Text == "研发测试")
                     {
                         //隐藏量产界面
@@ -4563,11 +4600,7 @@ namespace Welling_Motor_Debug_Tool
         {
             byte[] Data = new byte[1];
             Data[0] = 0xF1;
-            if (mySerialProcess.SendCmd(0x7FF, 0x16, 0x2201, Data))
-            {
-                开机ToolStripMenuItem.Checked = true;
-                关机ToolStripMenuItem.Checked = false;
-            }
+            mySerialProcess.SendCmd(0x7FF, 0x16, 0x2201, Data);      
         }
 
         /// <summary>
@@ -4579,11 +4612,7 @@ namespace Welling_Motor_Debug_Tool
         {
             byte[] Data = new byte[1];
             Data[0] = 0xF0;
-            if (mySerialProcess.SendCmd(0x7FF, 0x16, 0x2201, Data))
-            {
-                开机ToolStripMenuItem.Checked = false;
-                关机ToolStripMenuItem.Checked = true;
-            }
+            mySerialProcess.SendCmd(0x7FF, 0x16, 0x2201, Data);       
         }
 
         /// <summary>
@@ -4730,6 +4759,18 @@ namespace Welling_Motor_Debug_Tool
             CfgFileInfo += "[MotorType]" + "\r\n";
             CfgFileInfo += "MidMotor:" + 中置电机ToolStripMenuItem.Checked.ToString() + "\r\n";
             CfgFileInfo += "HubMotor:" + 轮毂电机ToolStripMenuItem.Checked.ToString() + "\r\n";
+            CfgFileInfo += "\r\n";
+            CfgFileInfo += "[CheckValue]" + "\r\n";
+            CfgFileInfo += "Voltage:" + toolStripTextBox_ThVol.Text + "\r\n";
+            CfgFileInfo += "Current:" + toolStripTextBox_ThCur.Text + "\r\n";
+            CfgFileInfo += "MotorSpeed:" + toolStripTextBox_ThSpeed.Text + "\r\n";
+            CfgFileInfo += "Torque:" + toolStripTextBox_ThTor.Text + "\r\n";
+            CfgFileInfo += "Cadence:" + toolStripTextBox_ThCad.Text + "\r\n";
+            CfgFileInfo += "BikeSpeed:" + toolStripTextBox_ThBikeSpeed.Text + "\r\n";
+            CfgFileInfo += "T_PCB:" + toolStripTextBox_ThT_PCB.Text + "\r\n";
+            CfgFileInfo += "T_MCU:" + toolStripTextBox_ThT_MCU.Text + "\r\n";
+            CfgFileInfo += "T_Motor:" + toolStripTextBox_ThT_Motor.Text + "\r\n";
+
             System.IO.File.WriteAllText(FileName, CfgFileInfo);
         }
 
@@ -4750,7 +4791,30 @@ namespace Welling_Motor_Debug_Tool
         {
             if (e.KeyCode == Keys.Enter)
             {
-                ConfigFileSave(true, localInfo.LocalPath + localInfo.ConfigFileName);
+                //输入用户名
+                EnterForm1.ShowDialog();
+                try
+                {
+                    if (EnterForm1.textBox_Passwd.Text == EnterForm1.UserAccount[EnterForm1.comboBox_User.Text])//检验模式所有用户支持
+                    {
+                        if ((EnterForm1.comboBox_User.Text == "工程配置") || (EnterForm1.comboBox_User.Text == "研发测试"))
+                        {                            
+                            ConfigFileSave(true, localInfo.LocalPath + localInfo.ConfigFileName);
+                        }
+                        else
+                        {
+                            MessageBox.Show("权限不支持", "提示", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                        }
+                    }
+                    else
+                    {
+                        MessageBox.Show("密码错误", "提示", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    }
+                }
+                catch (Exception)
+                {
+                    MessageBox.Show("用户不存在或密码错误", "提示", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                }
             }
         }
 
@@ -5619,7 +5683,8 @@ namespace Welling_Motor_Debug_Tool
             {
                 if (label_FacModeBMS.BackColor == Color.Red)
                 {
-                    label_FacModeStatus.Text = "BMS通讯异常!";
+                    richTextBox_FacModeLog.AppendText(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "->" + "BMS通讯异常" + "\r\n");
+                    label_FacModeStatus.Text = "存在故障!";
                     label_FacModeResult.BackColor = Color.Red;
                     label_FacModeResult.Text = "测试异常";
                     Delay_ms(500);
@@ -5717,7 +5782,8 @@ namespace Welling_Motor_Debug_Tool
                 } while (false);
 
                 //判断车速
-                if (Convert.ToDouble(textBox_RunInfo_BikeSpeed.Text.Split(' ')[0]) != 0)
+                if ((Convert.ToDouble(textBox_RunInfo_BikeSpeed.Text.Split(' ')[0]) <= Convert.ToDouble( toolStripTextBox_ThBikeSpeed.Text.Split(',')[1])) && 
+                    (Convert.ToDouble(textBox_RunInfo_BikeSpeed.Text.Split(' ')[0]) >= Convert.ToDouble(toolStripTextBox_ThBikeSpeed.Text.Split(',')[0])))
                 {
                     label_FacModeSpeed.BackColor = Color.Green;
                     richTextBox_FacModeLog.AppendText(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "->" + "车速传感器正常" + " " + textBox_RunInfo_BikeSpeed.Text + "\r\n");
@@ -5735,8 +5801,8 @@ namespace Welling_Motor_Debug_Tool
                 }
 
                 //判断电压
-                if (((Convert.ToInt32(textBox_RunInfo_Vol.Text.Split(' ')[0]) > 35000) || (Convert.ToInt32(textBox_RunInfo_Vol.Text.Split(' ')[0]) < 37000)) ||
-                    ((Convert.ToInt32(textBox_RunInfo_Vol.Text.Split(' ')[0]) > 47000) || (Convert.ToInt32(textBox_RunInfo_Vol.Text.Split(' ')[0]) < 49000)))
+                if ((Convert.ToDouble(textBox_RunInfo_Vol.Text.Split(' ')[0]) <= Convert.ToDouble(toolStripTextBox_ThVol.Text.Split(',')[1])) &&
+                    (Convert.ToDouble(textBox_RunInfo_Vol.Text.Split(' ')[0]) >= Convert.ToDouble(toolStripTextBox_ThVol.Text.Split(',')[0])))
                 {
                     label_FacModeVolTest.BackColor = Color.Green;
                     richTextBox_FacModeLog.AppendText(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "->" + "电压测量正常" + " " + textBox_RunInfo_Vol.Text + "\r\n");
@@ -5754,7 +5820,8 @@ namespace Welling_Motor_Debug_Tool
                 }
 
                 //判断电流
-                if ((Convert.ToInt32(textBox_RunInfo_Current.Text.Split(' ')[0]) > 0) && (Convert.ToInt32(textBox_RunInfo_Current.Text.Split(' ')[0]) < 3000))
+                if ((Convert.ToDouble(textBox_RunInfo_Current.Text.Split(' ')[0]) <= Convert.ToDouble(toolStripTextBox_ThCur.Text.Split(',')[1])) &&
+                    (Convert.ToDouble(textBox_RunInfo_Current.Text.Split(' ')[0]) >= Convert.ToDouble(toolStripTextBox_ThCur.Text.Split(',')[0])))
                 {
                     label_FacModeCurrentTest.BackColor = Color.Green;
                     richTextBox_FacModeLog.AppendText(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "->" + "电流测量正常" + " " + textBox_RunInfo_Current.Text + "\r\n");
@@ -5771,10 +5838,13 @@ namespace Welling_Motor_Debug_Tool
                     return;
                 }
 
-                //判断温度                
-                if (((Convert.ToInt32(textBox_RunInfo_T_PCB.Text.Split(' ')[0]) > -20) && (Convert.ToInt32(textBox_RunInfo_T_PCB.Text.Split(' ')[0]) < 100)) &&
-                    ((Convert.ToInt32(textBox_RunInfo_T_MCU.Text.Split(' ')[0]) > -20) && (Convert.ToInt32(textBox_RunInfo_T_MCU.Text.Split(' ')[0]) < 100)) &&
-                    ((Convert.ToInt32(textBox_RunInfo_T_Coil.Text.Split(' ')[0]) > -20) && (Convert.ToInt32(textBox_RunInfo_T_Coil.Text.Split(' ')[0]) < 100)))
+                //判断温度
+                if ((Convert.ToDouble(textBox_RunInfo_T_PCB.Text.Split(' ')[0]) <= Convert.ToDouble(toolStripTextBox_ThT_PCB.Text.Split(',')[1])) &&
+                    (Convert.ToDouble(textBox_RunInfo_T_PCB.Text.Split(' ')[0]) >= Convert.ToDouble(toolStripTextBox_ThT_PCB.Text.Split(',')[0])) &&
+                    (Convert.ToDouble(textBox_RunInfo_T_MCU.Text.Split(' ')[0]) <= Convert.ToDouble(toolStripTextBox_ThT_MCU.Text.Split(',')[1])) &&
+                    (Convert.ToDouble(textBox_RunInfo_T_MCU.Text.Split(' ')[0]) >= Convert.ToDouble(toolStripTextBox_ThT_MCU.Text.Split(',')[0])) &&
+                    (Convert.ToDouble(textBox_RunInfo_T_Coil.Text.Split(' ')[0]) <= Convert.ToDouble(toolStripTextBox_ThT_Motor.Text.Split(',')[1])) &&
+                    (Convert.ToDouble(textBox_RunInfo_T_Coil.Text.Split(' ')[0]) >= Convert.ToDouble(toolStripTextBox_ThT_Motor.Text.Split(',')[0])))
                 {
                     label_FacModeNTC.BackColor = Color.Green;
                     richTextBox_FacModeLog.AppendText(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "->" + "温度传感器正常" + " " + textBox_RunInfo_T_PCB.Text + " " + textBox_RunInfo_T_MCU.Text + " " + textBox_RunInfo_T_Coil.Text + "\r\n");
@@ -5792,7 +5862,8 @@ namespace Welling_Motor_Debug_Tool
                 }
 
                 //判断转速
-                if ((Convert.ToInt32(textBox_RunInfo_MotorSpeed.Text.Split(' ')[0]) > 200) && (Convert.ToInt32(textBox_RunInfo_MotorSpeed.Text.Split(' ')[0]) < 6000))
+                if ((Convert.ToDouble(textBox_RunInfo_MotorSpeed.Text.Split(' ')[0]) <= Convert.ToDouble(toolStripTextBox_ThSpeed.Text.Split(',')[1])) &&
+                    (Convert.ToDouble(textBox_RunInfo_MotorSpeed.Text.Split(' ')[0]) >= Convert.ToDouble(toolStripTextBox_ThSpeed.Text.Split(',')[0])))
                 {
                     label_FacModeMotorSpeed.BackColor = Color.Green;
                     richTextBox_FacModeLog.AppendText(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "->" + "电机转速正常" + " " + textBox_RunInfo_MotorSpeed.Text + "\r\n");
@@ -5906,7 +5977,9 @@ namespace Welling_Motor_Debug_Tool
                     Torque = (ushort)Convert.ToInt16(textBox_RunInfo_Torque.Text.Split(' ')[0]);
                     if (Torque > Max)
                         Max = Torque;
-                    if ((Max >= 70) && (Max <= 85) && (ACK_WaitCnt >= 6))
+                    if ((Max <= Convert.ToDouble(toolStripTextBox_ThTor.Text.Split(',')[1])) &&
+                        (Max >= Convert.ToDouble(toolStripTextBox_ThTor.Text.Split(',')[0])) &&
+                        (ACK_WaitCnt >= 6))
                     {
                         label_FacModeTq.BackColor = Color.Green;
                         richTextBox_FacModeLog.AppendText(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "->" + "力矩传感器正常" + " " + textBox_RunInfo_Torque.Text + "\r\n");
@@ -5978,7 +6051,9 @@ namespace Welling_Motor_Debug_Tool
                     Cadence = (ushort)Convert.ToInt16(textBox_RunInfo_Cadence.Text.Split(' ')[0]);
                     if (Cadence > Max)
                         Max = Cadence;
-                    if ((Max >= 35) && (Max <= 45) && (ACK_WaitCnt >= 6))
+                    if ((Max <= Convert.ToDouble(toolStripTextBox_ThCad.Text.Split(',')[1])) &&
+                        (Max >= Convert.ToDouble(toolStripTextBox_ThCad.Text.Split(',')[0])) &&
+                        (ACK_WaitCnt >= 6))
                     {
                         label_FacModeCad.BackColor = Color.Green;
                         richTextBox_FacModeLog.AppendText(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "->" + "踏频传感器正常" + " " + textBox_RunInfo_Cadence.Text + "\r\n");

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


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


BIN=BIN
Welling_Motor_Debug_Tool/obj/Debug/Welling_Motor_Debug_Tool.exe


BIN=BIN
Welling_Motor_Debug_Tool/obj/Debug/Welling_Motor_Debug_Tool.pdb


Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio