Skip to content

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

调整测试BUG

parent 8475b4be
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 41 deletions
source/Application/APP/Telltales/Telltales_user.c
View file @ 9520d132
......@@ -1286,6 +1286,7 @@ uint8_t LED_EVSC_L_Judgement(void)
uint8_t m_Condition3 = 0u;
uint8_t m_Condition4 = 0u;
uint8_t m_Condition5 = 0u;
uint8_t m_Condition8 = 0u;
uint16_t m_Condition6 = 0u;
uint16_t m_Condition7 = 0u;
uint8_t m_AirSta1 = 0u;
......@@ -1295,9 +1296,10 @@ uint8_t LED_EVSC_L_Judgement(void)
CanStatus2 = CAN_MSG_Status(ID_CanMsg18F0010B_Msg_Count);
m_Condition1 = (uint8_t)Line_In_Get_Status(LINE_IN_BRAKE_AIR_EBS); /*A28*/
m_Condition2 = (uint8_t)Get_ID_18F0010B_Sig_EBS_Red_Warning_Lamp_State(); /*byte6 34*/
m_Condition3 = (uint8_t)Get_ID_18F0010B_Sig_ATC_or_ASR_Lamp_State();
m_Condition4 = (uint8_t)Get_ID_18FE4F0B_Sig_VDC_Lamp_State();
m_Condition5 = (uint8_t)Get_ID_18FE4F0B_Sig_VDC_Fully_operational();
m_Condition8 = (uint8_t)Get_ID_18F0010B_Sig_EBS_Amber_Warning_State();/*byte6 56*/
m_Condition3 = (uint8_t)Get_ID_18F0010B_Sig_ATC_or_ASR_Lamp_State();/*byte6 78*/
m_Condition4 = (uint8_t)Get_ID_18FE4F0B_Sig_VDC_Lamp_State();/*byte1 12*/
m_Condition5 = (uint8_t)Get_ID_18FE4F0B_Sig_VDC_Fully_operational();/*byte1 34*/
m_Condition6 = Common_Get_Air1_Data(); /*气压1 1.89以下*/
m_Condition7 = Common_Get_Air2_Data(); /*气压1 1.89以下*/
m_AirSta1 = Common_Get_Air1_Valid();
......@@ -1323,7 +1325,7 @@ uint8_t LED_EVSC_L_Judgement(void)
{
u8Result = 1u;
}
else if (((m_Condition3 == 1u) && (K_Line_Set.K_Line_LID21 == 0x01u)) ||
else if (((m_Condition8 == 1u) && (K_Line_Set.K_Line_LID21 == 0x01u)) ||
((m_Condition4 == 1u) && (K_Line_Set.K_Line_LID22 == 0x01u)))
{
u8Result = FLASH_SYNC_2Hz;
......
source/Application/Alarm/Popups.c
View file @ 9520d132
......@@ -1143,7 +1143,8 @@ void Popup_Alone_Sound_Server(void)
if ((u32IG_ON_Timer <= PopupStart) && (u32IG_ON_Timer >= 2u))
{
;
/*00 忘拔钥匙*/
Sound_Delete(SND_Key_Notremoved);
}
else
{
......@@ -1453,7 +1454,7 @@ void Popup_Alone_Sound_Server(void)
{
/*A3-28 A20-GND B39-OPEN A2-OPEN*/
variable_1 = Line_In_Get_Status(LINE_IN_ACC);
if ((CD4051_COM3_X7_IN == 1u) && (CD4051_COM3_X5_IN == 0u) && (variable_1 == 1u))
if ((CD4051_COM3_X7_IN == 1u) && (CD4051_COM3_X5_IN == 0u) && (variable_1 == 0u))
{
Sound_Request(SND_Key_Notremoved, 1u); /*00 忘拔钥匙*/
}
......
source/Application/CAN_APP_NM/CAN_App/CAN_Communication_Matrix.c
View file @ 9520d132
......@@ -316,7 +316,7 @@ const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] =
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
5000ul,
2000ul,
0x18FEE518ul,
(( void * )0),
(( void * )0),
......
source/Application/Graphic/GUI/GUI.c
View file @ 9520d132
......@@ -1772,33 +1772,33 @@ void GUI_DPD_Display_Display(uint8_t Mode)
GUI_General_Display(MultiPurpose_Sprite, CN_DPD_zaishengjindu, GUI_BLENDMODE_SRC_OVER); /*DPD再生黄*/
}
if (value <= 100u)
if (value <= 165u)
{
GUI_General_Display(MultiPurpose_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
else if ((value > 100u) && (value <= 200u))
else if ((value >= 166u) && (value <= 333u))
{
GUI_General_Display(MultiPurpose_Sprite, CN_DPD_zouge1, GUI_BLENDMODE_SRC_OVER);
}
else if ((value > 200u) && (value <= 300u))
else if ((value >= 334u) && (value <= 499u))
{
GUI_General_Display(MultiPurpose_Sprite, CN_DPD_zouge1, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MultiPurpose_Sprite, CN_DPD_zouge2, GUI_BLENDMODE_SRC_OVER);
}
else if ((value > 300u) && (value <= 450u))
else if ((value >= 500u) && (value <= 666u))
{
GUI_General_Display(MultiPurpose_Sprite, CN_DPD_zouge1, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MultiPurpose_Sprite, CN_DPD_zouge2, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MultiPurpose_Sprite, CN_DPD_zouge3, GUI_BLENDMODE_SRC_OVER);
}
else if ((value > 450u) && (value <= 600u))
else if ((value >= 667u) && (value <= 833u))
{
GUI_General_Display(MultiPurpose_Sprite, CN_DPD_zouge1, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MultiPurpose_Sprite, CN_DPD_zouge2, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MultiPurpose_Sprite, CN_DPD_zouge3, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MultiPurpose_Sprite, CN_DPD_zouge4, GUI_BLENDMODE_SRC_OVER);
}
else if ((value > 600u) && (value <= 1000u))
else if ((value >= 834u) && (value <= 1000u))
{
GUI_General_Display(MultiPurpose_Sprite, CN_DPD_zouge1, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MultiPurpose_Sprite, CN_DPD_zouge2, GUI_BLENDMODE_SRC_OVER);
......
source/Application/Sound_Alarm/Sound_Source.h
View file @ 9520d132
......@@ -88,25 +88,25 @@ static const SndAttributeStruct SndAttributeTable[SND_SRC_INDEX_MAX] =
{/*04 SND_SRC_Parking_Brake */ 0x05u, 5, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*04 停车制动忘记复位*/
{/*05 SND_SRC_Car_Dump_SPEED */ 0x06u, 6, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*05 车厢报警自卸蜂鸣器*/
{/*06 SND_SRC_Temp_High */ 0x01u, 7, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*06 连续 2 水温过热 */
{/*07 SND_SRC_Coolant_Low */ 0x00u, 8, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*07 连续 1 冷却水量 */
{/*08 SND_SRC_Oil_pressure_Low*/ 0x09u, 9, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*08 -(预留：油压)*/
{/*09 SND_SRC_ACC_AIR */ 0x01u, 0, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*09 连续 2 ACC AIR */
{/*10 SND_SRC_BackUP_SPEED */ 0x04u, 1, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*10 1HZ 5 倒车警报 */
{/*11 SND_SRC_DS_SPEED */ 0x00u, 2, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*11 DS 警报 */
{/*12 SND_SRC_ROWS_SPEED */ 0x00u, 3, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*12 ROWS 警报 */
{/*13 SND_SRC_Roll_SPEED */ 0x00u, 4, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*13 Roll 警报 */
{/*14 SND_SRC_EVSC_SPEED */ 0x01u, 5, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 250u, },/*14 4HZ 2 EVSC */
{/*15 SND_SRC_DPD_SPEED */ 0x03u, 6, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*15 1HZ 4 DPD 手动再生 */
{/*15 SND_SRC_DPD_SPEED */ 0x03u, 6, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 500u, },/*15 2HZ 4 DPD 手动再生 */
{/*15 SND_SRC_DPD_SPEED */ 0x03u, 6, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 250u, },/*15 4HZ 4 DPD 手动再生 */
{/*16 SND_SRC_NEES */ 0x00u, 7, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*16 NEES */
{/*17 SND_SRC_ECO_STOP */ 0x00u, 8, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*17 eco stop */
{/*18 SND_SRC_Cyclone_High */ 0x03u, 9, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 250u, },/*18 4HZ 4 气悬车高调整 */
{/*18 SND_SRC_Cyclone_High */ 0x03u, 9, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 2000u, },/*18 0.5HZ 4 气悬车高调整 */
{/*19 SND_SRC_SEATBELT_SPEED */ 0x02u, 0, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 500u, },/*19 2HZ 3 安全带 */
{/*20 SND_SRC_Fuel_Saving */ 0x03u, 1, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*20 1HZ 4 省油耗建议 */
{/*21 SND_SRC_TICK */ 0x0Du, 2, 1, SND_MODE_SINGLE, 100u, },
{/*22 SND_SRC_TOCK */ 0x0Eu, 3, 1, SND_MODE_SINGLE, 100u, },
{/*07 SND_SRC_Coolant_Low */ 0x01u, 8, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*07 连续 1 冷却水量 */
{/*08 SND_SRC_Oil_pressure_Low*/ 0x00u, 9, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*08 -(预留：油压)*/
{/*09 SND_SRC_ACC_AIR */ 0x01u, 10, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*09 连续 2 ACC AIR */
{/*10 SND_SRC_BackUP_SPEED */ 0x04u, 11, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*10 1HZ 5 倒车警报 */
{/*11 SND_SRC_DS_SPEED */ 0x00u, 12, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*11 DS 警报 */
{/*12 SND_SRC_ROWS_SPEED */ 0x00u, 13, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*12 ROWS 警报 */
{/*13 SND_SRC_Roll_SPEED */ 0x00u, 14, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*13 Roll 警报 */
{/*14 SND_SRC_EVSC_SPEED */ 0x01u, 15, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 250u, },/*14 4HZ 2 EVSC */
{/*15 SND_SRC_DPD_SPEED */ 0x03u, 16, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*15 1HZ 4 DPD 手动再生 */
{/*15 SND_SRC_DPD_SPEED */ 0x03u, 16, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 500u, },/*15 2HZ 4 DPD 手动再生 */
{/*15 SND_SRC_DPD_SPEED */ 0x03u, 16, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 250u, },/*15 4HZ 4 DPD 手动再生 */
{/*16 SND_SRC_NEES */ 0x00u, 17, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*16 NEES */
{/*17 SND_SRC_ECO_STOP */ 0x00u, 18, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*17 eco stop */
{/*18 SND_SRC_Cyclone_High */ 0x03u, 19, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 250u, },/*18 4HZ 4 气悬车高调整 */
{/*18 SND_SRC_Cyclone_High */ 0x03u, 19, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 2000u, },/*18 0.5HZ 4 气悬车高调整 */
{/*19 SND_SRC_SEATBELT_SPEED */ 0x02u, 20, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 500u, },/*19 2HZ 3 安全带 */
{/*20 SND_SRC_Fuel_Saving */ 0x03u, 21, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*20 1HZ 4 省油耗建议 */
{/*21 SND_SRC_TICK */ 0x0Du, 22, 1, SND_MODE_SINGLE, 100u, },
{/*22 SND_SRC_TOCK */ 0x0Eu, 23, 1, SND_MODE_SINGLE, 100u, },
/*==============================================================================================*/
};
......
source/Driver/Buzzer/Sound_Tracks.h
View file @ 9520d132
......@@ -49,7 +49,7 @@ static const SndTrackStruct SndTracks[] =
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 3900, 500, 450, 0,
/* 1 */ 3900, 500, 300, 100,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
......@@ -67,7 +67,7 @@ static const SndTrackStruct SndTracks[] =
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 2300, 500, 450, 0,
/* 1 */ 2300, 500, 300, 100,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
......@@ -85,7 +85,7 @@ static const SndTrackStruct SndTracks[] =
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 3900, 280, 450, 0,
/* 1 */ 3900, 280, 300, 100,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
......@@ -103,7 +103,7 @@ static const SndTrackStruct SndTracks[] =
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 2300, 280, 450, 0,
/* 1 */ 2300, 280, 300, 100,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
......@@ -121,7 +121,7 @@ static const SndTrackStruct SndTracks[] =
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 3900, 190, 450, 0,
/* 1 */ 3900, 190, 300, 100,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
......@@ -139,7 +139,7 @@ static const SndTrackStruct SndTracks[] =
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 2600, 167, 450, 0,
/* 1 */ 2600, 167, 300, 100,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
......@@ -157,7 +157,7 @@ static const SndTrackStruct SndTracks[] =
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 2000, 500, 450, 0,
/* 1 */ 2000, 500, 300, 100,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
......@@ -175,7 +175,7 @@ static const SndTrackStruct SndTracks[] =
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 800, 500, 450, 0,
/* 1 */ 800, 500, 300, 100,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
......@@ -194,7 +194,7 @@ static const SndTrackStruct SndTracks[] =
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 2380, 210, 450, 0,
/* 1 */ 2380, 210, 450, 0,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
......
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