Skip to content

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

调整生硬播放部分，FV00.09,调整报警BUG

parent ae44a4c2
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 163 additions and 144 deletions
source/Application/APP/SEG_LCD/SEG_DISPLAY.c
View file @ 6caede18
...@@ -1018,7 +1018,7 @@ static void Seg_General_Digit_Display(uint32_t Digit, uint8_t Len, uint8_t Blank ...@@ -1018,7 +1018,7 @@ static void Seg_General_Digit_Display(uint32_t Digit, uint8_t Len, uint8_t Blank
static uint8_t wbyTestSeg = 0; static uint8_t wbyTestSeg = 0;
static uint16_t wbyTestNum; static uint16_t wbyTestNum;
static uint8_t IC_TEST = 0; static uint8_t IC_TEST = 1;
/****************************************************************************** /******************************************************************************
Seg_Display_Service 在 20MS任务中 Seg_Display_Service 在 20MS任务中
信号接口： 信号接口：
...@@ -1031,9 +1031,24 @@ void Seg_Display_Service(void) ...@@ -1031,9 +1031,24 @@ void Seg_Display_Service(void)
Ign_Time = Common_GetIgnOnTime(); Ign_Time = Common_GetIgnOnTime();
if (Common_Get_IG_Sts() == COMMON_POWER_ON) if (Common_Get_IG_Sts() == COMMON_POWER_ON)
{ {
if (IC_TEST == 1)/*测试用点亮全部断码*/ if (IC_TEST == 1)
{ {
Seg_Display_ON(); /*测试用点亮全部断码*/
/*Seg_Display_ON();*/
SEG_A25_Disp(7u); /*左侧弧线*/
SEG_C25_Disp(7u); /*右侧弧线*/
SEG_PRI_Display (20 , GUI_DISP_MODE_NORMAL, 7u); /*PRI气压格*/
SEG_SEC_Display (20 , GUI_DISP_MODE_NORMAL, 7u); /*SEC气压格*/
SEG_Coolant_Display (12 , GUI_DISP_MODE_NORMAL, 7u); /*水温格*/
SEG_Fuel_Display (12 , GUI_DISP_MODE_NORMAL, 7u); /*燃油格*/
SEG_Tacho_Display (27 , GUI_DISP_MODE_NORMAL, 7u); /*转速格*/
SEG_VehicleSpeed_Display(30 , GUI_DISP_MODE_NORMAL, 7u); /*车速格*/
Seg_Digit_1_Disp(12);
Seg_Digit_2_Disp(12);
Seg_Digit_3_Disp(12);
} }
else else
{ {
...@@ -1092,8 +1107,8 @@ void Seg_Display_Service(void) ...@@ -1092,8 +1107,8 @@ void Seg_Display_Service(void)
SEG_Tacho_Display(Tacho_Get_CurSeg(), GUI_DISP_MODE_NORMAL, 7u); //转速格 SEG_Tacho_Display(Tacho_Get_CurSeg(), GUI_DISP_MODE_NORMAL, 7u); //转速格
SEG_VehicleSpeed_Display(Speed_Get_CurSeg(), GUI_DISP_MODE_NORMAL, 7u); //车速格 SEG_VehicleSpeed_Display(Speed_Get_CurSeg(), GUI_DISP_MODE_NORMAL, 7u); //车速格
wbyTestNum = Common_Get_Disp_V_Speed(); wbyTestNum = Common_Get_Disp_V_Speed();
// Speed_Get_Display_Value()
SEG_VehicleSpeed_Num(wbyTestNum, GUI_DISP_MODE_NORMAL); //车速值 SEG_VehicleSpeed_Num(wbyTestNum, GUI_DISP_MODE_NORMAL); //车速值
// SEG_PRI_Display(wbyTestSeg,GUI_DISP_MODE_NORMAL,7u) ;//PRI气压格 // SEG_PRI_Display(wbyTestSeg,GUI_DISP_MODE_NORMAL,7u) ;//PRI气压格
......
source/Application/Alarm/Popups.c
View file @ 6caede18
...@@ -557,7 +557,7 @@ void Popups_Polling(void) ...@@ -557,7 +557,7 @@ void Popups_Polling(void)
/*34.--16--摄像头有污染-请与五十铃公司联系 ID：18FE5BE8 Byte7 Bit5-8 0010(B) 0011(B) LID $27: 0x01*/ /*34.--16--摄像头有污染-请与五十铃公司联系 ID：18FE5BE8 Byte7 Bit5-8 0010(B) 0011(B) LID $27: 0x01*/
variable_1 = Get_ID_18FE5BE8_Sig_Camera_Status(); variable_1 = Get_ID_18FE5BE8_Sig_Camera_Status();
if ((K_Line_Set.K_Line_LID27 == 0x01u) && ((variable_1 == 0x02u) || (variable_2 == 0x03u))) if ((K_Line_Set.K_Line_LID27 == 0x01u) && ((variable_1 == 0x02u) || (variable_1 == 0x03u)))
{ {
Popup_Request(POPUP5_CAMERA_POLLUTION); Popup_Request(POPUP5_CAMERA_POLLUTION);
} }
......
source/Application/Graphic/GUI/GUI.c
View file @ 6caede18
...@@ -469,15 +469,6 @@ void GUI_WetGas_Dispaly(uint8_t Mode) ...@@ -469,15 +469,6 @@ void GUI_WetGas_Dispaly(uint8_t Mode)
current_value = GetGaugesCurrentPos(WETGasGauges); current_value = GetGaugesCurrentPos(WETGasGauges);
current_Flag = Common_Get_WET_Valid(); /*有效性判断用*/ current_Flag = Common_Get_WET_Valid(); /*有效性判断用*/
if ((current_value <= 17u) && (current_Flag == 1u))
{
GUI_General_Display(WET_Sprite, CN_qiya, GUI_BLENDMODE_SRC_OVER); /*刷长条的气压表框。*/
}
else
{
GUI_General_Display(WET_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
switch (current_value) switch (current_value)
{ {
case 0x14u: /*20*/ case 0x14u: /*20*/
...@@ -526,7 +517,16 @@ void GUI_WetGas_Dispaly(uint8_t Mode) ...@@ -526,7 +517,16 @@ void GUI_WetGas_Dispaly(uint8_t Mode)
break; break;
} }
GUI_General_Display(WET_Sprite, CN_qiyafuhaodeng, GUI_BLENDMODE_SRC_OVER); /*气压符号灯。*/ if ((current_value <= 17u) && (current_Flag == 1u))
{
GUI_General_Display(WET_Sprite, CN_qiyafuhaodeng, GUI_BLENDMODE_SRC_OVER); /*气压符号灯。*/
GUI_General_Display(WET_Sprite, CN_qiya, GUI_BLENDMODE_SRC_OVER); /*刷长条的气压表框。*/
}
else
{
GUI_General_Display(WET_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
} }
else else
{ {
......
source/Driver/Buzzer/Sound_Tracks.h
View file @ 6caede18
...@@ -68,7 +68,7 @@ static const SndTrackStruct SndTracks[] = ...@@ -68,7 +68,7 @@ static const SndTrackStruct SndTracks[] =
/*-------------------------------------------------------------- /*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms) 音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/ --------------------------------------------------------------*/
/* 1 */ 2300, 50, 930, 850, /* 1 */ 2300, 500, 930, 850,
/* 2 */ 0, 0, 0, 0, /* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0, /* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0, /* 4 */ 0, 0, 0, 0,
...@@ -87,7 +87,7 @@ static const SndTrackStruct SndTracks[] = ...@@ -87,7 +87,7 @@ static const SndTrackStruct SndTracks[] =
/*-------------------------------------------------------------- /*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms) 音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/ --------------------------------------------------------------*/
/* 1 */ 800, 50, 500, 0, /* 1 */ 800, 500, 500, 0,
/* 2 */ 0, 0, 0, 0, /* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0, /* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0, /* 4 */ 0, 0, 0, 0,
...@@ -106,7 +106,7 @@ static const SndTrackStruct SndTracks[] = ...@@ -106,7 +106,7 @@ static const SndTrackStruct SndTracks[] =
/*-------------------------------------------------------------- /*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms) 音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/ --------------------------------------------------------------*/
/* 1 */ 800, 50, 250, 0, /* 1 */ 800, 500, 250, 0,
/* 2 */ 0, 0, 0, 0, /* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0, /* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0, /* 4 */ 0, 0, 0, 0,
...@@ -125,7 +125,7 @@ static const SndTrackStruct SndTracks[] = ...@@ -125,7 +125,7 @@ static const SndTrackStruct SndTracks[] =
/*-------------------------------------------------------------- /*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms) 音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/ --------------------------------------------------------------*/
/* 1 */ 800, 50, 125, 0, /* 1 */ 800, 500, 125, 0,
/* 2 */ 0, 0, 0, 0, /* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0, /* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0, /* 4 */ 0, 0, 0, 0,
...@@ -144,7 +144,7 @@ static const SndTrackStruct SndTracks[] = ...@@ -144,7 +144,7 @@ static const SndTrackStruct SndTracks[] =
/*-------------------------------------------------------------- /*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms) 音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/ --------------------------------------------------------------*/
/* 1 */ 780, 50, 3, 0, /* 1 */ 780, 500, 3, 0,
/* 2 */ 0, 0, 0, 0, /* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0, /* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0, /* 4 */ 0, 0, 0, 0,
...@@ -163,7 +163,7 @@ static const SndTrackStruct SndTracks[] = ...@@ -163,7 +163,7 @@ static const SndTrackStruct SndTracks[] =
/*-------------------------------------------------------------- /*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms) 音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/ --------------------------------------------------------------*/
/* 1 */ 780, 25, 3, 0, /* 1 */ 780, 250, 3, 0,
/* 2 */ 0, 0, 0, 0, /* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0, /* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0, /* 4 */ 0, 0, 0, 0,
...@@ -182,7 +182,7 @@ static const SndTrackStruct SndTracks[] = ...@@ -182,7 +182,7 @@ static const SndTrackStruct SndTracks[] =
/*-------------------------------------------------------------- /*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms) 音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/ --------------------------------------------------------------*/
/* 1 */ 660, 50, 930, 850, /* 1 */ 660, 500, 930, 850,
/* 2 */ 0, 0, 0, 0, /* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0, /* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0, /* 4 */ 0, 0, 0, 0,
...@@ -201,7 +201,7 @@ static const SndTrackStruct SndTracks[] = ...@@ -201,7 +201,7 @@ static const SndTrackStruct SndTracks[] =
/*-------------------------------------------------------------- /*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms) 音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/ --------------------------------------------------------------*/
/* 1 */ 784, 50, 930, 850, /* 1 */ 784, 500, 930, 850,
/* 2 */ 0, 0, 0, 0, /* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0, /* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0, /* 4 */ 0, 0, 0, 0,
...@@ -220,7 +220,7 @@ static const SndTrackStruct SndTracks[] = ...@@ -220,7 +220,7 @@ static const SndTrackStruct SndTracks[] =
/*-------------------------------------------------------------- /*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms) 音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/ --------------------------------------------------------------*/
/* 1 */ 1000, 50, 930, 850, /* 1 */ 1000, 500, 930, 850,
/* 2 */ 0, 0, 0, 0, /* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0, /* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0, /* 4 */ 0, 0, 0, 0,
...@@ -239,7 +239,7 @@ static const SndTrackStruct SndTracks[] = ...@@ -239,7 +239,7 @@ static const SndTrackStruct SndTracks[] =
/*-------------------------------------------------------------- /*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms) 音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/ --------------------------------------------------------------*/
/* 1 */ 1000, 50, 200, 150, /* 1 */ 1000, 500, 200, 150,
/* 2 */ 0, 0, 20, 0, /* 2 */ 0, 0, 20, 0,
/* 3 */ 784, 50, 710, 620, /* 3 */ 784, 50, 710, 620,
/* 4 */ 0, 0, 0, 0, /* 4 */ 0, 0, 0, 0,
...@@ -258,7 +258,7 @@ static const SndTrackStruct SndTracks[] = ...@@ -258,7 +258,7 @@ static const SndTrackStruct SndTracks[] =
/*-------------------------------------------------------------- /*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms) 音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/ --------------------------------------------------------------*/
/* 1 */ 850, 50, 450, 0, /* 1 */ 850, 500, 450, 0,
/* 2 */ 0, 0, 0, 0, /* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0, /* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0, /* 4 */ 0, 0, 0, 0,
......
source/System/tasks.c
View file @ 6caede18
...@@ -140,9 +140,9 @@ void Sys_Run_Mode_10ms_Tasks(void) ...@@ -140,9 +140,9 @@ void Sys_Run_Mode_10ms_Tasks(void)
Data_Mileage_Write_EEPROM(); Data_Mileage_Write_EEPROM();
Line_In_Debounce_Service(); Line_In_Debounce_Service();
Popup_Alone_Sound_Server(); Popup_Alone_Sound_Server();
Telltales_Left_Right_Management_Service(); //Telltales_Left_Right_Management_Service();
Telltales_Management(); //Telltales_Management();
//Test_LED_AllLight(); Test_LED_AllLight();
Key_Service(); Key_Service();
CAN_BUSOFF_Recover(); CAN_BUSOFF_Recover();
......
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