Skip to content

V
VC66_7C
Commit ae4620da authored by hu's avatar hu
Browse files
Options

调整报警显示以及上一版本BUG

parent f93342cd
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 47 deletions
source/Application/Alarm/Popups.c
View file @ ae4620da
......@@ -22,7 +22,7 @@
#include "FuelConfig.h"
#include "Service_TPMS.h"
#include "Telltales.h"
#include "DisplaySch_user.h"
#include "kwp2000_service.h"
#include "CAN_FUNC.h"
......@@ -673,7 +673,7 @@ void Popups_Polling(void)
}
/*----第六组---------------------------------------------------------------------*/
if (V_Speed < 66u)
if (V_Speed <= DISPSPEEDNULLMAX)
{
/*43.--1--遥控车辆高度调整中(无车速) B30 28V*/
variable_1 = Line_In_Get_Status(LINE_IN_AIR_SUS);
......@@ -934,53 +934,62 @@ void Popups_Polling(void)
}
/*----第十组---------------------------------------------------------------------*/
/*57.--1--省油耗建议-急加速*/
if ((AccSubSpeed.AccSpeed_Flag == 1) && (User_App.User_JADD != 0xFF))
if (V_Speed > DISPSPEEDNULLMAX)
{
Popup_Request(POPUP10_RAPID_ACC);
}
else
{
Popup_Delete(POPUP10_RAPID_ACC);
}
/*57.--1--省油耗建议-急加速*/
if ((AccSubSpeed.AccSpeed_Flag == 1) && (User_App.User_JADD != 0xFF))
{
Popup_Request(POPUP10_RAPID_ACC);
}
else
{
Popup_Delete(POPUP10_RAPID_ACC);
}
/*58.--2--省油耗建议-急减速*/
if ((AccSubSpeed.SubSpeed_Flag == 1) && (User_App.User_JSUB != 0xFF))
{
Popup_Request(POPUP10_RAPID_SUB);
}
else
{
Popup_Delete(POPUP10_RAPID_SUB);
}
/*58.--2--省油耗建议-急减速*/
if ((AccSubSpeed.SubSpeed_Flag == 1) && (User_App.User_JSUB != 0xFF))
{
Popup_Request(POPUP10_RAPID_SUB);
}
else
{
Popup_Delete(POPUP10_RAPID_SUB);
}
/*59.--3--省油耗建议-请降低发动机转速*/
variable_1 = Common_Get_OverEpeed_Status();
/*59.--3--省油耗建议-请降低发动机转速*/
variable_1 = Common_Get_OverEpeed_Status();
if ((variable_1 == 1) && (User_App.User_Speed != 0xFF))
{
Popup_Request(POPUP10_REVAL_ENGINE);
}
else
{
Popup_Delete(POPUP10_REVAL_ENGINE);
}
if ((variable_1 == 1) && (User_App.User_Speed != 0xFF))
{
Popup_Request(POPUP10_REVAL_ENGINE);
}
else
{
Popup_Delete(POPUP10_REVAL_ENGINE);
}
/*60.--4--省油耗建议-请降低速度*/
variable_1 = Common_Get_OverSpeedLine_Status();
/*60.--4--省油耗建议-请降低速度*/
variable_1 = Common_Get_OverSpeedLine_Status();
if (
((variable_1 == 1) && (K_Line_Set.K_Line_LID44 != 0xFF)) ||
((AccSubSpeed.GslSpeed_Flag == 0x01u) && (User_App.User_Gsl == 0x01u)) ||
((AccSubSpeed.YblSpeed_Flag == 0x01u) && (User_App.User_Ybl == 0x01u)))
{
Popup_Request(POPUP10_REVAL_SPEED);
if (
((variable_1 == 1) && (K_Line_Set.K_Line_LID44 != 0xFF)) ||
((AccSubSpeed.GslSpeed_Flag == 0x01u) && (User_App.User_Gsl == 0x01u)) ||
((AccSubSpeed.YblSpeed_Flag == 0x01u) && (User_App.User_Ybl == 0x01u)))
{
Popup_Request(POPUP10_REVAL_SPEED);
}
else
{
Popup_Delete(POPUP10_REVAL_SPEED);
}
}
else
{
Popup_Delete(POPUP10_REVAL_SPEED);
Popup_Clear(POPUP10_RAPID_ACC );
Popup_Clear(POPUP10_RAPID_SUB );
Popup_Clear(POPUP10_REVAL_ENGINE );
Popup_Clear(POPUP10_REVAL_SPEED );
}
/*----第十一组---------------------------------------------------------------------*/
/*61.--1--发动机机油＆滤清器*/
if (((State_Flag.User_FDJYLQQ_FLAG == 1) || (State_Flag.User_FDJYLQQ_FLAG == 2)) && (Common_Get_FDJYLQQ_Sta() == 0x01u))
......@@ -1485,7 +1494,7 @@ void Popup_Alone_Sound_Server(void)
/*19 安全带*/
V_Speed = Common_Get_Disp_V_Speed(); /*车速*/
if ((CD4051_COM2_X3_IN == 0u) && (V_Speed >= 67))
if ((CD4051_COM2_X3_IN == 0u) && (V_Speed > DISPSPEEDNULLMAX))
{
Sound_Request(SND_SEATBELT_SPEED, 1u);
}
......
source/Application/Graphic/GUI/GUI.c
View file @ ae4620da
......@@ -6874,7 +6874,7 @@ void GUI_General_Popup_Display(uint16_t PopupMsg)
V_Speed = Common_Get_Disp_V_Speed();
if (V_Speed > 66u) /*有车速*/
if (V_Speed > DISPSPEEDNULLMAX) /*有车速*/
{
if ((PopupMsg == POPUP1_MSG_BRAKE_BLACK) || (PopupMsg == POPUP1_MSG_BRAKE_BRAKE))
{
......
source/Application/Graphic/GUI/GUI.h
View file @ ae4620da
......@@ -247,10 +247,10 @@ static const GUIGeneralPopupStruct GUIGeneralPopupTable[] =
{CN_Alarm_drive_41_image, CN_Alarm_drive_41_wenzi, SpriteSize, CN_Alarm_stop_43_wenzi1, CN_Alarm_stop_43_wenzi2}, /*54. DPD自动再生-再生将自动完成，不需要操作开关*/
{CN_Alarm_drive_42_image, CN_Alarm_drive_42_wenzi1, SpriteSize, CN_Alarm_stop_44_wenzi1_1, CN_Alarm_stop_44_wenzi1_2}, /*55.第九组 气压过低-请冲入空气*/
{CN_Alarm_drive_42_image, CN_Alarm_drive_42_wenzi2_2, CN_Alarm_drive_42_wenzi2_1, CN_Alarm_stop_44_wenzi2_1, CN_Alarm_stop_44_wenzi2_2}, /*56. EBS故障（红）-请与五十铃公司联系*/
{CN_Alarm_drive_43_image, CN_Alarm_drive_43_wenzi1, SpriteSize, SpriteSize, SpriteSize}, /*57.第十组 省油耗建议-急加速*/
{CN_Alarm_drive_43_image, CN_Alarm_drive_43_wenzi2, SpriteSize, SpriteSize, SpriteSize}, /*58. 省油耗建议-急减速*/
{CN_Alarm_drive_43_image, CN_Alarm_drive_43_wenzi3, SpriteSize, SpriteSize, SpriteSize}, /*59. 省油耗建议-请降低发动机转速*/
{CN_Alarm_drive_43_image, CN_Alarm_drive_43_wenzi4, SpriteSize, SpriteSize, SpriteSize}, /*60. 省油耗建议-请降低速度*/
{SpriteSize, CN_Alarm_drive_43_image, CN_Alarm_drive_43_wenzi1, SpriteSize, SpriteSize}, /*57.第十组 省油耗建议-急加速*/
{SpriteSize, CN_Alarm_drive_43_image, CN_Alarm_drive_43_wenzi2, SpriteSize, SpriteSize}, /*58. 省油耗建议-急减速*/
{SpriteSize, CN_Alarm_drive_43_image, CN_Alarm_drive_43_wenzi3, SpriteSize, SpriteSize}, /*59. 省油耗建议-请降低发动机转速*/
{SpriteSize, CN_Alarm_drive_43_image, CN_Alarm_drive_43_wenzi4, SpriteSize, SpriteSize}, /*60. 省油耗建议-请降低速度*/
{CN_Alarm_drive_44_image, CN_Alarm_drive_44_wenzi1_1, CN_Alarm_drive_44_wenzi1, CN_Alarm_drive_44_wenzi1_1, CN_Alarm_drive_44_wenzi1}, /*61.第11组 发动机机油＆滤清器*/
{CN_Alarm_drive_44_image, CN_Alarm_drive_44_wenzi1_2, CN_Alarm_drive_44_wenzi1, CN_Alarm_drive_44_wenzi1_2, CN_Alarm_drive_44_wenzi1}, /*62. 燃油滤清器*/
{CN_Alarm_drive_44_image, CN_Alarm_drive_44_wenzi1_3, CN_Alarm_drive_44_wenzi1, CN_Alarm_drive_44_wenzi1_3, CN_Alarm_drive_44_wenzi1}, /*63. 变速箱油*/
......
source/Application/K_BUS/kwp2000_service.c
View file @ ae4620da
......@@ -532,7 +532,7 @@ unsigned char kwp_writeDataByLocalIdentifier(unsigned char *TxData, unsigned cha
break;
case 0x49: /* 辅助驻车 */
K_Line_Set.K_Line_LID49 = RequestData[2];
User_App.User_Parking = K_Line_Set.K_Line_LID49
User_App.User_Parking = K_Line_Set.K_Line_LID49;
(*TxData++) = KWP2000_WRITEDATABYLOCALIDENTIFIER_REQUEST + KWP2000_POSITIVE_RESPONSE_OFFSET;
(*TxData++) = 0x49;
Tx_Len = 2;
......@@ -1538,4 +1538,4 @@ void K_LINE_EOL_InitVal(void)
K_Line_Set.TesterECUCAN = 0x00u; /* 20 */
K_Line_Set.User_Light1 = 10u; /*背光亮度等级*/
K_Line_Set.User_Light2 = 10u; /*背光亮度等级*/
}
\ No newline at end of file
}
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