Skip to content

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

调整测试问题

parent 7d53c76f
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 26 deletions
source/Application/APP/GaugesMode/Gauges.c
View file @ 8475b4be
......@@ -426,7 +426,7 @@ void GaugeMoveing(uint8_t GaugesNum)
/*水温表上升最后一格需要调整时间*/
if ((GaugesNum == TempGauges) && (DirecSign[TempGauges] == 1u) && (GaugesCurrentPos[TempGauges] == (DestPostion[TempGauges] - 10u)))
{
GaugesMoveTimesTmp = 2000u;
GaugesMoveTimesTmp = 4000u;
}
else
{
......
source/Application/APP/LINE_IN/Line_In_user.c
View file @ 8475b4be
......@@ -45,7 +45,7 @@ const Line_In_Attribute_st_t g_stLineInAttribute[LINE_IN_MAX] =
{ LINE_IN_LEVEL_HIGH, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_HI_BEAM,}, /*A25 HI BEAM*/
{ LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_BRAKE_AIR_EBS,}, /*A28 BRAKE AIR/EBS*/
{ LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_SEAT_BELT,}, /*A30 SEAT BELT*/
{ LINE_IN_LEVEL_HIGH, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_MIL,}, /*A31 MIL*/
{ LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_MIL,}, /*A31 MIL*/
{ LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_ENG_OIL,}, /*A32 ENG OIL*/
{ LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_CHARGE,}, /*A34 CHARGE*/
{ LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_TRAILER_ABS_INFO,}, /*B03 TRAILER ABS INFO*/
......
source/Application/APP/Telltales/Telltales_user.c
View file @ 8475b4be
......@@ -367,7 +367,7 @@ void LED_FOUR_MUL_FOUR_T_Execution(uint8_t led_status)
/******************************************************************************
T4 EXH BRAKE
信号接口： 0x18FF2300 Byte:2,bit:2-1==00(B)
信号接口： 0x18FF2300 Byte:2,bit:2-1==01(B) 功能调整----2022.05.10----
信号定义：
输出信号：
******************************************************************************/
......@@ -378,7 +378,8 @@ uint8_t LED_EXH_BRAKE_T_Judgement(void)
m_Condition1 = (uint8_t)Get_ID_18FF2300_Sig_Exh_Lamp();
if (m_Condition1 == 0x00u)
if (m_Condition1 == 0x01u)
{
u8Result = 1u;
}
......@@ -518,7 +519,7 @@ void LED_Rr_FOG_LAMP_T_Execution(uint8_t led_status)
/******************************************************************************
T8 MIL
信号接口： A31 HIGH
信号接口： A31 GND 2022-05-10
信号定义：
输出信号：
******************************************************************************/
......@@ -1302,12 +1303,14 @@ uint8_t LED_EVSC_L_Judgement(void)
m_AirSta1 = Common_Get_Air1_Valid();
m_AirSta2 = Common_Get_Air2_Valid();
/*做个回差，去抖*/
if (((m_Condition6 < 1890u) && (m_AirSta1 == 1u)) || ((m_Condition7 < 1890u) && (m_AirSta2 == 1u)))
{
L12_Air_Sta = 1u;
}
else if (((m_Condition6 >= 1990u) && (m_Condition7 >= 1990u)) || ((m_AirSta1 == 0u) && (m_AirSta2 == 0u)))
else if (((m_Condition6 >= 1990u) && (m_Condition7 >= 1990u)) ||
((m_Condition6 >= 1990u) && (m_AirSta2 == 0u)) ||
((m_Condition7 >= 1990u) && (m_AirSta1 == 0u)) ||
((m_AirSta1 == 0u) && (m_AirSta2 == 0u)))
{
L12_Air_Sta = 0u;
}
......@@ -1940,7 +1943,7 @@ uint8_t LED_Temp_Judgement(void)
if (K_Line_Set.K_Line_LID43 == 0x82u)
{
if ((m_Condition1 >= 12u) && (Coolant_Get_Valid() == 1u))
if ((m_Condition1 >= 11u) && (Coolant_Get_Valid() == 1u))
{
u8Result = 1u;
}
......
source/Application/Alarm/Popups.c
View file @ 8475b4be
......@@ -25,6 +25,8 @@
#include "kwp2000_service.h"
static uint8_t Water_Temp_Level_Flag;
/*-------------------------------------------------------------------------
* Function Name : Popups_Management_Service
* Description :
......@@ -372,10 +374,12 @@ void Popups_Polling(void)
if ((variable_1 == 1u) && (variable_2 >= 12u))
{
Popup_Request(POPUP5_OVER_HEAT);
Water_Temp_Level_Flag = 1u;
}
else if (variable_2 <= 9u)
{
Popup_Delete(POPUP5_OVER_HEAT);
Water_Temp_Level_Flag = 0u;
}
}
else
......@@ -481,7 +485,7 @@ void Popups_Polling(void)
}
/*29.--11--AMT异常(气压低下)-图1 ID：18FF8503 Byte：2 Bit：6,5 01(B) LID $41 : 0x13 PGN：65413 TC2DIS*/
variable_1 = Get_ID_18FF2300_Sig_Glow_Lamp();
variable_1 = Get_ID_18FF8503_Sig_Low_air_warning();
if (variable_1 == 1)
{
......@@ -694,7 +698,7 @@ void Popups_Polling(void)
variable_1 = Line_In_Get_Status(LINE_IN_CHARGE);
variable_2 = Common_Get_VolWarning_Sta();
if ((variable_1 == 0x01u) || ((variable_2 == 0x01u) && (E_Speed > 350u)))
if (((variable_1 == 0x01u) || (variable_2 == 0x01u)) && (E_Speed > 350u))
{
Popup_Request(POPUP7_CHARGE_ABNORMAL);
}
......@@ -798,11 +802,11 @@ void Popups_Polling(void)
if (variable_1 == LINE_IN_LOGIC_VALID)
{
Popup_Request(POPUP1_BRAKE_BRAKE);
Popup_Request(POPUP8_BRAKE_BLOCKR);
}
else
{
Popup_Delete(POPUP1_BRAKE_BRAKE);
Popup_Delete(POPUP8_BRAKE_BLOCKR);
}
/*53.--7--前蹄片磨损*/
......@@ -810,11 +814,11 @@ void Popups_Polling(void)
if (variable_1 == LINE_IN_LOGIC_VALID)
{
Popup_Request(POPUP1_BRAKE_BRAKE);
Popup_Request(POPUP8_BRAKE_BLOCKF);
}
else
{
Popup_Delete(POPUP1_BRAKE_BRAKE);
Popup_Delete(POPUP8_BRAKE_BLOCKF);
}
/*54.--8--DPD自动再生-DPD自动再生中 ID：18FED900 (AUXIO) Byte：8 bit：5,4 01(B) Engine Speed ： 350rpm以上*/
......@@ -1484,3 +1488,9 @@ void Popup_Alone_Sound_Server(void)
}
}
}
uint8_t Common_Get_Water_Temp_Level_Flag(void)
{
return Water_Temp_Level_Flag ;
}
\ No newline at end of file
source/Application/Alarm/Popups.h
View file @ 8475b4be
......@@ -25,4 +25,6 @@ void Popups_Displaying ( uint16_t PopupID );
void Popups_Sound_Playing ( uint8_t PopupID );
void Popup_Alone_Sound_Server(void);
uint8_t Common_Get_Water_Temp_Level_Flag(void);
#endif
\ No newline at end of file
source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c
View file @ 8475b4be
......@@ -20,12 +20,13 @@
#include "Menu.h"
#include "kwp2000_service.h"
static uint8_t User_BCM_Flag;
#include "Popups.h"
uint8_t TpmsMsg18033317SendFlag = 0;
uint8_t Msg_18021733[8];
static uint8_t TXNum_18033317;
static uint8_t User_BCM_Flag;
uint32_t DisDTCNumber[50];
uint8_t DisDTCNum;
......@@ -411,21 +412,24 @@ void Can_Set_Buff_18FF2A17(uint8_t CopyData[])
(CAN_SIG_LOST == CAN_MSG_Status(ID_CanMsg18FEEE00_Msg_Count)))
{
Water_Temp_Level = 2;
Over_Heat_Warning_Status = 0;
}
else if ((Coolant_Get_CurSeg() >= 0) && (Coolant_Get_CurSeg() < 12))
else if ((Coolant_Get_CurSeg() >= 0) && (Coolant_Get_CurSeg() < 11))
{
Water_Temp_Level = 0 ;
Over_Heat_Warning_Status = 0 ;
}
else if ((Coolant_Get_CurSeg() >= 12) && (Coolant_Get_CurSeg() <= 13))
else if ((Coolant_Get_CurSeg() >= 11) && (Coolant_Get_CurSeg() <= 12))
{
Water_Temp_Level = 1 ;
}
if (Common_Get_Disp_V_Speed() > 20)
Over_Heat_Warning_Status = 0 ;
else
Over_Heat_Warning_Status = 1 ;
if ((Common_Get_Water_Temp_Level_Flag() == 1) && (Common_Get_Disp_V_Speed() > 20))
{
Over_Heat_Warning_Status = 1 ;
}
else
{
Over_Heat_Warning_Status = 0 ;
}
/*电源电压*/
......
source/Application/Graphic/GUI/GUI.c
View file @ 8475b4be
......@@ -510,6 +510,8 @@ void GUI_Data_Dispaly(uint8_t Mode)
void GUI_TFTTelltales_Display(uint8_t Mode)
{
uint32_t Veh_SpeedLim = 0u;
uint32_t Veh_SpeedLim1 = 0u;
uint32_t Veh_SpeedLim2 = 0u;
uint32_t Veh_Speed = 0u;
uint8_t CanStatus2 = 0u;
......@@ -520,7 +522,9 @@ void GUI_TFTTelltales_Display(uint8_t Mode)
/*超速报警指示灯*/
Veh_Speed = Common_Get_Disp_V_Speed();
Veh_Speed = Veh_Speed / 10u;
Veh_SpeedLim = Get_ID_18EA0021_Sig_CruiseControl_VehicleSpeedSetup();
Veh_SpeedLim1 = Get_ID_18EA0021_Sig_CruiseControl_VehicleSpeedSetup();
Veh_SpeedLim2 = (uint32_t)Get_ID_18FEED00_Sig_Maximum_Vehicle_Speed_Limit();
Veh_SpeedLim = Veh_SpeedLim1 / Veh_SpeedLim2;
if (Veh_Speed >= Veh_SpeedLim)
{
......
source/Application/Graphic/GUI/GUI.h
View file @ 8475b4be
......@@ -220,7 +220,7 @@ static const GUIGeneralPopupStruct GUIGeneralPopupTable[] =
{CN_Alarm_G5_17_18_21_image, CN_Alarm_G5_17_18_21_wenzi3, SpriteSize, CN_Alarm_G5_17_18_21_wenzi5, SpriteSize}, /*36. 尿素喷射异常（消耗量）*/
{CN_Alarm_G5_12_25_image, CN_Alarm_G5_12_25_wenzi4, SpriteSize, CN_Alarm_G5_12_25_wenzi4, SpriteSize}, /*37. 高圧警報-轮胎高压警告*/
{CN_Alarm_G5_12_25_image, CN_Alarm_G5_12_25_wenzi9, SpriteSize, CN_Alarm_G5_12_25_wenzi9, SpriteSize}, /*38. 高温警報-轮胎高温警告*/
{CN_Alarm_G5_12_23_image, CN_Alarm_G5_12_23_wenzi2, SpriteSize, CN_Alarm_G5_12_23_wenzi1, SpriteSize}, /*39. DPD手动再生要求1-请按下DPD开关*/
{CN_Alarm_G5_12_23_image, CN_Alarm_G5_12_23_wenzi2, CN_Alarm_G5_17_18_21_wenzi4,CN_Alarm_G5_12_23_wenzi1, SpriteSize}, /*39. DPD手动再生要求1-请按下DPD开关*/
{CN_Alarm_G5_12_23_image, CN_Alarm_G5_12_23_wenzi2, SpriteSize, CN_Alarm_G5_12_23_wenzi1, SpriteSize}, /*40. DPD手动再生要求2-请按下DPD开关*/
{CN_Alarm_G5_12_25_image, CN_Alarm_G5_12_25_wenzi7, SpriteSize, CN_Alarm_G5_12_25_wenzi7, SpriteSize}, /*41. TPMS故障*/
{CN_Alarm_G5_12_25_image, CN_Alarm_G5_12_25_wenzi6, SpriteSize, CN_Alarm_G5_12_25_wenzi6, SpriteSize}, /*42. TPMS電池低下-轮胎监控传感器电压下降*/
......
source/Driver/Graphic/images.c
View file @ 8475b4be
......@@ -942,7 +942,7 @@ static const t_PicStruct Pic_Attribute[] =
{ /*CN_User_Menu3_02_7 X330_Y182.png*/ 330u, 182u, 244u, 32u, ARGB8888, 0x124F0880u },
{ /*CN_User_Menu3_02_8 X330_Y182.png*/ 330u, 182u, 244u, 32u, ARGB8888, 0x124F8280u },
{ /*CN_User_Menu3_02_9 X233_Y183.png*/ 233u, 183u, 84u, 28u, ARGB8888, 0x124FFC80u },
{ /*CN_User_Menu3_02_km X547_Y250.png*/ 547u, 250u, 40u, 24u, ARGB8888, 0x12502140u },
{ /*CN_User_Menu3_02_km X547_Y250.png*/ 547u, 254u, 40u, 24u, ARGB8888, 0x12502140u },
{ /*CN_User_Menu3_02_kuang X351_Y242.png*/ 351u, 242u, 192u, 44u, ARGB8888, 0x12503040u },
{ /*CN_User_Menu3_02_wenzi X202_Y97.png*/ 202u, 97u, 500u, 40u, ARGB8888, 0x1250B440u },
{ /*CN_User_Menu3_03_10black X225_Y294.png*/ 225u, 294u, 448u, 40u, ARGB8888, 0x1251ECC0u },
......
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