|
@@ -26,7 +26,7 @@ namespace Welling_Motor_Debug_Tool
|
|
|
{
|
|
|
#region 变量定义
|
|
|
//版本号
|
|
|
- public static string Version = "2.5.1";
|
|
|
+ public static string Version = "2.5.2";
|
|
|
//串口实例
|
|
|
Serial_Process mySerialProcess = new Serial_Process();
|
|
|
string PortNumSave = "";
|
|
@@ -7358,7 +7358,7 @@ namespace Welling_Motor_Debug_Tool
|
|
|
}
|
|
|
richTextBox_FacModeLog.AppendText(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "->" + "已进入WALK,开始检测" + "\r\n");
|
|
|
#endif
|
|
|
- Delay_ms(3000);
|
|
|
+ Delay_ms(5000);
|
|
|
} while (false);
|
|
|
|
|
|
//判断车速
|
|
@@ -7721,10 +7721,10 @@ namespace Welling_Motor_Debug_Tool
|
|
|
Max = Cadence;
|
|
|
if ((Max <= Convert.ToDouble(toolStripTextBox_ThCad.Text.Split(',')[1])) &&
|
|
|
(Max >= Convert.ToDouble(toolStripTextBox_ThCad.Text.Split(',')[0])) &&
|
|
|
- (ACK_WaitCnt >= 6))
|
|
|
+ (ACK_WaitCnt >= 6)) //3s内有踏频值达到阈值
|
|
|
{
|
|
|
label_FacModeCad.BackColor = Color.Green;
|
|
|
- richTextBox_FacModeLog.AppendText(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "->" + "踏频传感器正常" + " " + textBox_RunInfo_Cadence.Text + "\r\n");
|
|
|
+ richTextBox_FacModeLog.AppendText(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "->" + "踏频传感器正常" + " " + Max.ToString() + " rpm" + "\r\n");
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
@@ -7860,16 +7860,16 @@ namespace Welling_Motor_Debug_Tool
|
|
|
ACK_WaitCnt = 0;
|
|
|
while (ACK_WaitCnt <= 20)
|
|
|
{
|
|
|
- if ((Convert.ToInt32(textBox_RunInfo_MotorSpeed.Text.Split(' ')[0]) > 500) && (ACK_WaitCnt >= 10))
|
|
|
+ if ((Convert.ToInt32(textBox_RunInfo_MotorSpeed.Text.Split(' ')[0]) > 500) && (ACK_WaitCnt >= 10)) //5s
|
|
|
{
|
|
|
label_FacModeGas.BackColor = Color.Green;
|
|
|
- richTextBox_FacModeLog.AppendText(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "->" + "转把功能正常,松开转把" + "\r\n");
|
|
|
+ richTextBox_FacModeLog.AppendText(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "->" + "转把功能正常,电机转速:" + textBox_RunInfo_MotorSpeed.Text + ",请松开转把" + "\r\n");
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
if (ACK_WaitCnt >= 20) //转把超时
|
|
|
{
|
|
|
- richTextBox_FacModeLog.AppendText(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "->" + "转把功能异常,松开转把" + "\r\n");
|
|
|
+ richTextBox_FacModeLog.AppendText(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "->" + "转把功能异常,请松开转把" + "\r\n");
|
|
|
label_FacModeStatus.Text = "存在故障!";
|
|
|
label_FacModeResult.BackColor = Color.Red;
|
|
|
label_FacModeResult.Text = "测试异常";
|
|
@@ -8116,14 +8116,12 @@ namespace Welling_Motor_Debug_Tool
|
|
|
//提示检查灯压是否正确
|
|
|
if (MessageBox.Show("前后灯是否正常开启?", "前后灯判断", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
|
|
|
{
|
|
|
- label_FacModeLightF.BackColor = Color.Green;
|
|
|
- label_FacModeLightB.BackColor = Color.Green;
|
|
|
- richTextBox_FacModeLog.AppendText(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "->" + "前后灯正常" + "\r\n");
|
|
|
+ richTextBox_FacModeLog.AppendText(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "->" + "前后灯开启正常" + "\r\n");
|
|
|
Delay_ms(500);
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- richTextBox_FacModeLog.AppendText(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "->" + "前后灯异常" + "\r\n");
|
|
|
+ richTextBox_FacModeLog.AppendText(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "->" + "前后灯开启异常" + "\r\n");
|
|
|
label_FacModeStatus.Text = "存在故障!";
|
|
|
label_FacModeResult.BackColor = Color.Red;
|
|
|
label_FacModeResult.Text = "测试异常";
|
|
@@ -8165,8 +8163,26 @@ namespace Welling_Motor_Debug_Tool
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ //提示检查灯压是否关闭
|
|
|
+ if (MessageBox.Show("前后灯是否正常关闭?", "前后灯判断", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
|
|
|
+ {
|
|
|
+ label_FacModeLightF.BackColor = Color.Green;
|
|
|
+ label_FacModeLightB.BackColor = Color.Green;
|
|
|
+ richTextBox_FacModeLog.AppendText(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "->" + "前后灯关闭正常" + "\r\n");
|
|
|
+ Delay_ms(500);
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ richTextBox_FacModeLog.AppendText(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "->" + "前后灯关闭异常" + "\r\n");
|
|
|
+ label_FacModeStatus.Text = "存在故障!";
|
|
|
+ label_FacModeResult.BackColor = Color.Red;
|
|
|
+ label_FacModeResult.Text = "测试异常";
|
|
|
+ Delay_ms(500);
|
|
|
+ //存储异常并上传
|
|
|
+ FacMode_Stop(false);
|
|
|
+ return;
|
|
|
+ }
|
|
|
richTextBox_FacModeLog.AppendText(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "->" + "已关闭前后灯" + "\r\n");
|
|
|
- Delay_ms(500);
|
|
|
}
|
|
|
else
|
|
|
{
|