Commit ad596b87 authored by hu's avatar hu

同步BOOT的相关功能

parent c475457e
...@@ -955,7 +955,7 @@ void Popups_Polling(void) ...@@ -955,7 +955,7 @@ void Popups_Polling(void)
} }
/*59.--3--省油耗建议-请降低发动机转速*/ /*59.--3--省油耗建议-请降低发动机转速*/
variable_1 = Common_Get_OverSpeed_Status(); variable_1 = Common_Get_OverEpeed_Status();
if ((variable_1 == 1) && (User_App.User_Speed != 0xFF)) if ((variable_1 == 1) && (User_App.User_Speed != 0xFF))
{ {
......
...@@ -172,8 +172,7 @@ uint16_t Common_Get_Disp_E_Speed(void) ...@@ -172,8 +172,7 @@ uint16_t Common_Get_Disp_E_Speed(void)
return Disp_E_Speed; return Disp_E_Speed;
} }
/*获取超速报警状态*/ uint8_t Common_Get_OverEpeed_Status(void)
uint8_t Common_Get_OverSpeed_Status(void)
{ {
uint8_t OverSpeedStatus = 0u; uint8_t OverSpeedStatus = 0u;
uint16_t DispVSpeed = 0u; uint16_t DispVSpeed = 0u;
...@@ -203,6 +202,25 @@ uint8_t Common_Get_OverSpeed_Status(void) ...@@ -203,6 +202,25 @@ uint8_t Common_Get_OverSpeed_Status(void)
return OverSpeedStatus; return OverSpeedStatus;
} }
/*获取超速报警状态*/
uint8_t Common_Get_OverSpeed_Status(void)
{
uint8_t OverSpeedStatus = 0u;
uint16_t DispVSpeed = 0u;
DispVSpeed = Common_Get_Disp_V_Speed();
if (DispVSpeed >= 1000u)
{
OverSpeedStatus = 1u;
}
else if (DispVSpeed <= 960u)
{
OverSpeedStatus = 0u;
}
return OverSpeedStatus;
}
uint8_t Common_Get_OverSpeedLine_Status(void) uint8_t Common_Get_OverSpeedLine_Status(void)
{ {
uint8_t OverSpeedStatus = 0u; uint8_t OverSpeedStatus = 0u;
......
...@@ -16,6 +16,7 @@ extern uint16_t Common_Get_Act_V_Speed(void); ...@@ -16,6 +16,7 @@ extern uint16_t Common_Get_Act_V_Speed(void);
extern uint16_t Common_Get_Act_E_Speed(void); extern uint16_t Common_Get_Act_E_Speed(void);
extern uint16_t Common_Get_Disp_V_Speed(void); extern uint16_t Common_Get_Disp_V_Speed(void);
extern uint16_t Common_Get_Disp_E_Speed(void); extern uint16_t Common_Get_Disp_E_Speed(void);
extern uint8_t Common_Get_OverEpeed_Status(void);
extern uint8_t Common_Get_OverSpeed_Status(void); /*获取超速报警状态*/ extern uint8_t Common_Get_OverSpeed_Status(void); /*获取超速报警状态*/
extern uint8_t Common_Get_OverSpeedLine_Status(void); extern uint8_t Common_Get_OverSpeedLine_Status(void);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment