Skip to content

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

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

parent ae44a4c2
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/APP/Telltales/Telltales_user.c
View file @ 6caede18
//ZH修改2021年8月27日16:58:42
#include "GPIO.h" #include "GPIO.h"
#include "Telltales.h" #include "Telltales.h"
...@@ -78,10 +77,70 @@ void Telltales_Left_Right_KL30_Init(void) ...@@ -78,10 +77,70 @@ void Telltales_Left_Right_KL30_Init(void)
L12_Air_Sta = 0u; L12_Air_Sta = 0u;
} }
/*************************************
测试用
**************************************/
void Test_LED_AllLight(void)
{
LED_Left_Right_Execution();
LED_INTER_DIFF_LOCK_T_Execution(LED_ON_State);
LED_FOUR_MUL_FOUR_T_Execution(LED_ON_State);
LED_EXH_BRAKE_T_Execution(LED_ON_State);
LED_QOS_GLOW_T_Execution(LED_ON_State);
LED_HI_BEAM_T_Execution(LED_ON_State);
LED_Rr_FOG_LAMP_T_Execution(LED_ON_State);
LED_MIL_T_Execution(LED_ON_State);
LED_SVS_T_Execution(LED_ON_State);
LED_H_S_A_T_Execution(LED_ON_State);
LED_RETARDER_T_Execution(LED_ON_State);
LED_AUTO_LEVELING_T_Execution(LED_ON_State);
LED_ROWS_L_Execution(LED_ON_State);
LED_BSM_OFF_L_Execution(LED_ON_State);
LED_AEBS_OFF_L_Execution(LED_ON_State);
LED_LDWS_L_Execution(LED_ON_State);
LED_SRS_L_Execution(LED_ON_State);
LED_ENG_OIL_L_Execution(LED_ON_State);
LED_CHARG_L_Execution(LED_ON_State);
LED_SEAT_BELT_L_Execution(LED_ON_State);
LED_RR_DIFF_LOCK_L_Execution(LED_ON_State);
LED_TPMS_L_Execution(LED_ON_State);
LED_ASR_or_EVSC_OFF_L_Execution(LED_ON_State);
LED_EVSC_L_Execution(LED_ON_State);
LED_eco_stop_OFF_L_Execution(LED_ON_State);
LED_AMT_L_Execution(LED_ON_State);
LED_WEAR_IND_L_Execution(LED_ON_State);
LED_TRAILER_BRAKE_R_Execution(LED_ON_State);
LED_BRAKE_AIR_or_EBS_YELLOW_R_Execution(LED_ON_State);
LED_ACC_AIR_R_Execution(LED_ON_State);
LED_ABS_R_Execution(LED_ON_State);
LED_PARK_BRAKE_R_Execution(LED_ON_State);
LED_BRAKE_AIR_or_EBS_RED_R_Execution(LED_ON_State);
LED_BRAKE_LOCK_R_Execution(LED_ON_State);
LED_AIR_SUS_R_Execution(LED_ON_State);
LED_TRAILER_ABS_U_Execution(LED_ON_State);
LED_WORKING_LAMP_U_Execution(LED_ON_State);
LED_TRAILER_ABS_INFO_U_Execution(LED_ON_State);
LED_Temp_Execution(LED_ON_State);
LED_Fuel_Execution(LED_ON_State);
}
/*---------------------------------------------------------------------------*/
#define XXXX 0u
#define LED_BRIGHTNESSR 0x3Fu
#define LED_BRIGHTNESSG 0x3Fu
#define LED_BRIGHTNESSY 0x3Fu
#define LED_BRIGHTNESSB 0x3Fu
/****************************************************************************** /******************************************************************************
T3 L16 U1 U4 U5无灯 左右转向单独 气压1 气压2 指示灯是背光 T3 L16 U1 U4 U5无灯 左右转向单独 气压1 气压2 指示灯是背光
R L5 L6 L7 L8 R1 R3 R4 (R2 水温)
G T0 T2 T4 T10 T11 T13 L13 (T11例外)
B T7
Y (T1 T7 R2 R8 U2 燃油)
******************************************************************************/ ******************************************************************************/
/****************************************************************************** /******************************************************************************
T0 左转向 T13 右转向 T0 左转向 T13 右转向
信号接口： 信号接口：
...@@ -102,7 +161,7 @@ void Telltales_Left_Right_Management_Service(void) /*10ms*/ ...@@ -102,7 +161,7 @@ void Telltales_Left_Right_Management_Service(void) /*10ms*/
if (LEFT_ST == 1u)//左转向 if (LEFT_ST == 1u)//左转向
{ {
SEG_LED_TURN_LEFT(7);//左转向断码屏开 SEG_LED_TURN_LEFT(7);//左转向断码屏开
IS31_CHIP0_CHANNEL36 = 0x3Fu; IS31_CHIP0_CHANNEL36 = LED_BRIGHTNESSG;
} }
else else
{ {
...@@ -118,7 +177,7 @@ void Telltales_Left_Right_Management_Service(void) /*10ms*/ ...@@ -118,7 +177,7 @@ void Telltales_Left_Right_Management_Service(void) /*10ms*/
if (RIGHT_ST == 1u)//右转向 if (RIGHT_ST == 1u)//右转向
{ {
SEG_LED_TURN_RIGHT(7);//右转向断码屏开 SEG_LED_TURN_RIGHT(7);//右转向断码屏开
IS31_CHIP0_CHANNEL24 = 0x3Fu; IS31_CHIP0_CHANNEL24 = LED_BRIGHTNESSG;
} }
else else
{ {
...@@ -162,63 +221,11 @@ void Telltales_Left_Right_Management_Service(void) /*10ms*/ ...@@ -162,63 +221,11 @@ void Telltales_Left_Right_Management_Service(void) /*10ms*/
void LED_Left_Right_Execution(void) void LED_Left_Right_Execution(void)
{ {
SEG_LED_TURN_LEFT(7);/*左转向断码屏开*/ SEG_LED_TURN_LEFT(7);/*左转向断码屏开*/
IS31_CHIP0_CHANNEL36 = 0x3Fu; IS31_CHIP0_CHANNEL36 = LED_BRIGHTNESSG;
SEG_LED_TURN_RIGHT(7);/*右转向断码屏开*/ SEG_LED_TURN_RIGHT(7);/*右转向断码屏开*/
IS31_CHIP0_CHANNEL24 = 0x3Fu; IS31_CHIP0_CHANNEL24 = LED_BRIGHTNESSG;
} }
/*************************************
测试用
**************************************/
void Test_LED_AllLight(void)
{
LED_Left_Right_Execution();
LED_INTER_DIFF_LOCK_T_Execution(LED_ON_State);
LED_FOUR_MUL_FOUR_T_Execution(LED_ON_State);
LED_EXH_BRAKE_T_Execution(LED_ON_State);
LED_QOS_GLOW_T_Execution(LED_ON_State);
LED_HI_BEAM_T_Execution(LED_ON_State);
LED_Rr_FOG_LAMP_T_Execution(LED_ON_State);
LED_MIL_T_Execution(LED_ON_State);
LED_SVS_T_Execution(LED_ON_State);
LED_H_S_A_T_Execution(LED_ON_State);
LED_RETARDER_T_Execution(LED_ON_State);
LED_AUTO_LEVELING_T_Execution(LED_ON_State);
LED_ROWS_L_Execution(LED_ON_State);
LED_BSM_OFF_L_Execution(LED_ON_State);
LED_AEBS_OFF_L_Execution(LED_ON_State);
LED_LDWS_L_Execution(LED_ON_State);
LED_SRS_L_Execution(LED_ON_State);
LED_ENG_OIL_L_Execution(LED_ON_State);
LED_CHARG_L_Execution(LED_ON_State);
LED_SEAT_BELT_L_Execution(LED_ON_State);
LED_RR_DIFF_LOCK_L_Execution(LED_ON_State);
LED_TPMS_L_Execution(LED_ON_State);
LED_ASR_or_EVSC_OFF_L_Execution(LED_ON_State);
LED_EVSC_L_Execution(LED_ON_State);
LED_eco_stop_OFF_L_Execution(LED_ON_State);
LED_AMT_L_Execution(LED_ON_State);
LED_WEAR_IND_L_Execution(LED_ON_State);
LED_TRAILER_BRAKE_R_Execution(LED_ON_State);
LED_BRAKE_AIR_or_EBS_YELLOW_R_Execution(LED_ON_State);
LED_ACC_AIR_R_Execution(LED_ON_State);
LED_ABS_R_Execution(LED_ON_State);
LED_PARK_BRAKE_R_Execution(LED_ON_State);
LED_BRAKE_AIR_or_EBS_RED_R_Execution(LED_ON_State);
LED_BRAKE_LOCK_R_Execution(LED_ON_State);
LED_AIR_SUS_R_Execution(LED_ON_State);
LED_TRAILER_ABS_U_Execution(LED_ON_State);
LED_WORKING_LAMP_U_Execution(LED_ON_State);
LED_TRAILER_ABS_INFO_U_Execution(LED_ON_State);
LED_Temp_Execution(LED_ON_State);
LED_Fuel_Execution(LED_ON_State);
}
/*---------------------------------------------------------------------------*/
#define XXXX 0u
#define LED_BRIGHTNESS 0x3Fu
/****************************************************************************** /******************************************************************************
T1 INTER DIFF LOCK T1 INTER DIFF LOCK
...@@ -244,7 +251,6 @@ uint8_t LED_INTER_DIFF_LOCK_T_Judgement(void) ...@@ -244,7 +251,6 @@ uint8_t LED_INTER_DIFF_LOCK_T_Judgement(void)
return u8Result; return u8Result;
} }
void LED_INTER_DIFF_LOCK_T_Execution(uint8_t led_status) void LED_INTER_DIFF_LOCK_T_Execution(uint8_t led_status)
{ {
RR_DIFF_LOCK_MCU = led_status; RR_DIFF_LOCK_MCU = led_status;
...@@ -269,6 +275,7 @@ uint8_t LED_FOUR_MUL_FOUR_T_Judgement(void) ...@@ -269,6 +275,7 @@ uint8_t LED_FOUR_MUL_FOUR_T_Judgement(void)
{ {
uint8_t u8Result = 0u; uint8_t u8Result = 0u;
uint8_t m_Condition1 = 0u; uint8_t m_Condition1 = 0u;
m_Condition1 = (uint8_t)XXXX; m_Condition1 = (uint8_t)XXXX;
if (m_Condition1 == 1u) if (m_Condition1 == 1u)
...@@ -286,7 +293,7 @@ void LED_FOUR_MUL_FOUR_T_Execution(uint8_t led_status) ...@@ -286,7 +293,7 @@ void LED_FOUR_MUL_FOUR_T_Execution(uint8_t led_status)
{ {
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL35 = LED_BRIGHTNESS; IS31_CHIP0_CHANNEL35 = LED_BRIGHTNESSG;
} }
else else
{ {
...@@ -331,7 +338,7 @@ void LED_EXH_BRAKE_T_Execution(uint8_t led_status) ...@@ -331,7 +338,7 @@ void LED_EXH_BRAKE_T_Execution(uint8_t led_status)
{ {
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL34 = LED_BRIGHTNESS; IS31_CHIP0_CHANNEL34 = LED_BRIGHTNESSG;
} }
else else
{ {
...@@ -376,7 +383,7 @@ void LED_QOS_GLOW_T_Execution(uint8_t led_status) ...@@ -376,7 +383,7 @@ void LED_QOS_GLOW_T_Execution(uint8_t led_status)
{ {
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL33 = LED_BRIGHTNESS; IS31_CHIP0_CHANNEL33 = LED_BRIGHTNESSY;
} }
else else
{ {
...@@ -420,7 +427,7 @@ void LED_HI_BEAM_T_Execution(uint8_t led_status) ...@@ -420,7 +427,7 @@ void LED_HI_BEAM_T_Execution(uint8_t led_status)
{ {
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL32 = LED_BRIGHTNESS; IS31_CHIP0_CHANNEL32 = LED_BRIGHTNESSY;
} }
else else
{ {
...@@ -503,7 +510,7 @@ void LED_MIL_T_Execution(uint8_t led_status) ...@@ -503,7 +510,7 @@ void LED_MIL_T_Execution(uint8_t led_status)
{ {
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL31 = LED_BRIGHTNESS; IS31_CHIP0_CHANNEL31 = LED_BRIGHTNESSY;
} }
else else
{ {
...@@ -548,7 +555,7 @@ void LED_SVS_T_Execution(uint8_t led_status) ...@@ -548,7 +555,7 @@ void LED_SVS_T_Execution(uint8_t led_status)
{ {
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL30 = LED_BRIGHTNESS; IS31_CHIP0_CHANNEL30 = LED_BRIGHTNESSY;
} }
else else
{ {
...@@ -575,12 +582,17 @@ uint8_t LED_H_S_A_T_Judgement(void) ...@@ -575,12 +582,17 @@ uint8_t LED_H_S_A_T_Judgement(void)
{ {
uint8_t u8Result = 0u; uint8_t u8Result = 0u;
uint8_t m_Condition1 = 0u; uint8_t m_Condition1 = 0u;
m_Condition1 = (uint8_t)XXXX; m_Condition1 = (uint8_t)XXXX;
if (m_Condition1 == 1u) if (m_Condition1 == 1u)
{ {
u8Result = 1u; u8Result = 1u;
} }
else if (m_Condition1 == 2u)
{
u8Result = 2u;
}
else else
{ {
u8Result = 0u; u8Result = 0u;
...@@ -590,15 +602,15 @@ uint8_t LED_H_S_A_T_Judgement(void) ...@@ -590,15 +602,15 @@ uint8_t LED_H_S_A_T_Judgement(void)
} }
void LED_H_S_A_T_Execution(uint8_t led_status) void LED_H_S_A_T_Execution(uint8_t led_status)
{ {
if (led_status == 1) if (led_status == 1u)
{ {
IS31_CHIP0_CHANNEL28 = LED_BRIGHTNESS; /*绿灯 亮*/ IS31_CHIP0_CHANNEL28 = 0x00; /*绿灯 灭*/
IS31_CHIP0_CHANNEL29 = 0x00; /*黄灯 灭*/ IS31_CHIP0_CHANNEL29 = LED_BRIGHTNESSY; /*黄灯 亮*/
} }
else if (led_status == 2) else if (led_status == 2u)
{ {
IS31_CHIP0_CHANNEL28 = 0x00; /*绿灯 灭*/ IS31_CHIP0_CHANNEL28 = LED_BRIGHTNESSG; /*绿灯 亮*/
IS31_CHIP0_CHANNEL29 = LED_BRIGHTNESS; /*黄灯 亮*/ IS31_CHIP0_CHANNEL29 = 0x00; /*黄灯 灭*/
} }
else else
{ {
...@@ -633,18 +645,11 @@ uint8_t LED_RETARDER_T_Judgement(void) ...@@ -633,18 +645,11 @@ uint8_t LED_RETARDER_T_Judgement(void)
{ {
if (m_Condition1 == 1u) if (m_Condition1 == 1u)
{ {
u8Result = 1u; u8Result = 2u;
} }
else if (m_Condition1 == 2u) else if (m_Condition1 == 2u)
{ {
if (FLASH_SYNC_1Hz == 1u) u8Result = FLASH_SYNC_1Hz;
{
u8Result = 2u;
}
else
{
u8Result = 0u;
}
} }
} }
else else
...@@ -654,19 +659,20 @@ uint8_t LED_RETARDER_T_Judgement(void) ...@@ -654,19 +659,20 @@ uint8_t LED_RETARDER_T_Judgement(void)
return u8Result; return u8Result;
} }
void LED_RETARDER_T_Execution(uint8_t led_status) void LED_RETARDER_T_Execution(uint8_t led_status)
{ {
if (K_Line_Set.K_Line_LID41 == 0x13u) if (K_Line_Set.K_Line_LID41 == 0x13u)
{ {
if (led_status == 1) if (led_status == 1u)
{ {
IS31_CHIP0_CHANNEL27 = LED_BRIGHTNESS; /* 绿灯 亮 */ IS31_CHIP0_CHANNEL27 = 0x00u; /* 绿灯 灭 */
IS31_CHIP0_CHANNEL26 = 0x00u; /* 黄灯 灭 */ IS31_CHIP0_CHANNEL26 = 0xFFu;//LED_BRIGHTNESSY; /* 黄灯 亮 闪 */
} }
else if (led_status == 2) else if (led_status == 2u)
{ {
IS31_CHIP0_CHANNEL27 = 0x00u; /* 绿灯 灭 */ IS31_CHIP0_CHANNEL27 = LED_BRIGHTNESSG; /* 绿灯 亮 */
IS31_CHIP0_CHANNEL26 = LED_BRIGHTNESS; /* 黄灯 亮 闪 */ IS31_CHIP0_CHANNEL26 = 0x00u; /* 黄灯 灭 */
} }
else else
{ {
...@@ -680,7 +686,6 @@ void LED_RETARDER_T_Execution(uint8_t led_status) ...@@ -680,7 +686,6 @@ void LED_RETARDER_T_Execution(uint8_t led_status)
} }
else else
{ {
SEG_LED_RETARDER_T(0); SEG_LED_RETARDER_T(0);
} }
} }
...@@ -721,7 +726,7 @@ void LED_AUTO_LEVELING_T_Execution(uint8_t led_status) ...@@ -721,7 +726,7 @@ void LED_AUTO_LEVELING_T_Execution(uint8_t led_status)
{ {
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL25 = LED_BRIGHTNESS; IS31_CHIP0_CHANNEL25 = LED_BRIGHTNESSY;
} }
else else
{ {
...@@ -766,7 +771,7 @@ void LED_ROWS_L_Execution(uint8_t led_status) ...@@ -766,7 +771,7 @@ void LED_ROWS_L_Execution(uint8_t led_status)
{ {
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL01 = LED_BRIGHTNESS; IS31_CHIP0_CHANNEL01 = LED_BRIGHTNESSY;
} }
else else
{ {
...@@ -811,7 +816,7 @@ void LED_BSM_OFF_L_Execution(uint8_t led_status) ...@@ -811,7 +816,7 @@ void LED_BSM_OFF_L_Execution(uint8_t led_status)
{ {
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL02 = LED_BRIGHTNESS; IS31_CHIP0_CHANNEL02 = LED_BRIGHTNESSY;
} }
else else
{ {
...@@ -869,7 +874,7 @@ void LED_AEBS_OFF_L_Execution(uint8_t led_status) ...@@ -869,7 +874,7 @@ void LED_AEBS_OFF_L_Execution(uint8_t led_status)
{ {
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL03 = LED_BRIGHTNESS; IS31_CHIP0_CHANNEL03 = LED_BRIGHTNESSY;
} }
else else
{ {
...@@ -920,14 +925,14 @@ uint8_t LED_LDWS_L_Judgement(void) ...@@ -920,14 +925,14 @@ uint8_t LED_LDWS_L_Judgement(void)
{ {
u8Result = FLASH_SYNC_1Hz; u8Result = FLASH_SYNC_1Hz;
} }
else if ((m_Condition1 == 0x02u) || (m_Condition2 == 0x01u))
{
u8Result = 1u;
}
else if ((m_Condition1 == 0x00u) || (m_Condition1 == 0x05u) || (m_Condition1 == 0x0Eu)) else if ((m_Condition1 == 0x00u) || (m_Condition1 == 0x05u) || (m_Condition1 == 0x0Eu))
{ {
u8Result = FLASH_SYNC_1Hz; u8Result = FLASH_SYNC_1Hz;
} }
else if ((m_Condition1 == 0x02u) || (m_Condition2 == 0x01u))
{
u8Result = 1u;
}
} }
else else
{ {
...@@ -938,12 +943,11 @@ uint8_t LED_LDWS_L_Judgement(void) ...@@ -938,12 +943,11 @@ uint8_t LED_LDWS_L_Judgement(void)
} }
void LED_LDWS_L_Execution(uint8_t led_status) void LED_LDWS_L_Execution(uint8_t led_status)
{ {
if (K_Line_Set.K_Line_LID28 == 0x01u) if (K_Line_Set.K_Line_LID28 == 0x01u)
{ {
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL04 = LED_BRIGHTNESS; IS31_CHIP0_CHANNEL04 = LED_BRIGHTNESSY;
} }
else else
{ {
...@@ -994,7 +998,7 @@ void LED_SRS_L_Execution(uint8_t led_status) ...@@ -994,7 +998,7 @@ void LED_SRS_L_Execution(uint8_t led_status)
{ {
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL20 = LED_BRIGHTNESS; IS31_CHIP0_CHANNEL20 = LED_BRIGHTNESSR;
} }
else else
{ {
...@@ -1039,7 +1043,7 @@ void LED_ENG_OIL_L_Execution(uint8_t led_status) ...@@ -1039,7 +1043,7 @@ void LED_ENG_OIL_L_Execution(uint8_t led_status)
{ {
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL21 = LED_BRIGHTNESS; IS31_CHIP0_CHANNEL21 = LED_BRIGHTNESSR;
} }
else else
{ {
...@@ -1084,7 +1088,7 @@ void LED_CHARG_L_Execution(uint8_t led_status) ...@@ -1084,7 +1088,7 @@ void LED_CHARG_L_Execution(uint8_t led_status)
{ {
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL22 = LED_BRIGHTNESS; IS31_CHIP0_CHANNEL22 = LED_BRIGHTNESSB;
} }
else else
{ {
...@@ -1129,7 +1133,7 @@ void LED_SEAT_BELT_L_Execution(uint8_t led_status) ...@@ -1129,7 +1133,7 @@ void LED_SEAT_BELT_L_Execution(uint8_t led_status)
{ {
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL23 = LED_BRIGHTNESS; IS31_CHIP0_CHANNEL23 = LED_BRIGHTNESSR;
} }
else else
{ {
...@@ -1173,7 +1177,7 @@ void LED_RR_DIFF_LOCK_L_Execution(uint8_t led_status) ...@@ -1173,7 +1177,7 @@ void LED_RR_DIFF_LOCK_L_Execution(uint8_t led_status)
{ {
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL16 = LED_BRIGHTNESS; IS31_CHIP0_CHANNEL16 = LED_BRIGHTNESSY;
} }
else else
{ {
...@@ -1241,7 +1245,7 @@ void LED_TPMS_L_Execution(uint8_t led_status) ...@@ -1241,7 +1245,7 @@ void LED_TPMS_L_Execution(uint8_t led_status)
{ {
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL17 = LED_BRIGHTNESS; IS31_CHIP0_CHANNEL17 = LED_BRIGHTNESSY;
} }
else else
{ {
...@@ -1301,7 +1305,7 @@ void LED_ASR_or_EVSC_OFF_L_Execution(uint8_t led_status) ...@@ -1301,7 +1305,7 @@ void LED_ASR_or_EVSC_OFF_L_Execution(uint8_t led_status)
{ {
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL18 = LED_BRIGHTNESS; IS31_CHIP0_CHANNEL18 = LED_BRIGHTNESSY;
} }
else else
{ {
...@@ -1392,7 +1396,7 @@ void LED_EVSC_L_Execution(uint8_t led_status) ...@@ -1392,7 +1396,7 @@ void LED_EVSC_L_Execution(uint8_t led_status)
{ {
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL19 = LED_BRIGHTNESS; IS31_CHIP0_CHANNEL19 = LED_BRIGHTNESSY;
} }
else else
{ {
...@@ -1436,13 +1440,13 @@ void LED_eco_stop_OFF_L_Execution(uint8_t led_status) ...@@ -1436,13 +1440,13 @@ void LED_eco_stop_OFF_L_Execution(uint8_t led_status)
{ {
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL12 = LED_BRIGHTNESS; /* 绿灯 亮 */ IS31_CHIP0_CHANNEL12 = LED_BRIGHTNESSG; /* 绿灯 亮 */
IS31_CHIP0_CHANNEL13 = 0x00u; /* 黄灯 灭 */ IS31_CHIP0_CHANNEL13 = 0x00u; /* 黄灯 灭 */
} }
else if (led_status == 2) else if (led_status == 2)
{ {
IS31_CHIP0_CHANNEL12 = 0x00u; /* 绿灯 灭 */ IS31_CHIP0_CHANNEL12 = 0x00u; /* 绿灯 灭 */
IS31_CHIP0_CHANNEL13 = LED_BRIGHTNESS; /* 黄灯 亮 */ IS31_CHIP0_CHANNEL13 = LED_BRIGHTNESSY; /* 黄灯 亮 */
} }
else else
{ {
...@@ -1503,7 +1507,7 @@ void LED_AMT_L_Execution(uint8_t led_status) ...@@ -1503,7 +1507,7 @@ void LED_AMT_L_Execution(uint8_t led_status)
{ {
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL14 = LED_BRIGHTNESS; IS31_CHIP0_CHANNEL14 = LED_BRIGHTNESSY;
} }
else else
{ {
...@@ -1556,7 +1560,7 @@ void LED_WEAR_IND_L_Execution(uint8_t led_status) ...@@ -1556,7 +1560,7 @@ void LED_WEAR_IND_L_Execution(uint8_t led_status)
{ {
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL15 = LED_BRIGHTNESS; IS31_CHIP0_CHANNEL15 = LED_BRIGHTNESSY;
} }
else else
{ {
...@@ -1600,7 +1604,7 @@ void LED_PARK_BRAKE_R_Execution(uint8_t led_status) ...@@ -1600,7 +1604,7 @@ void LED_PARK_BRAKE_R_Execution(uint8_t led_status)
{ {
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL08 = LED_BRIGHTNESS; IS31_CHIP0_CHANNEL08 = LED_BRIGHTNESSR;
} }
else else
{ {
...@@ -1689,7 +1693,7 @@ void LED_BRAKE_LOCK_R_Execution(uint8_t led_status) ...@@ -1689,7 +1693,7 @@ void LED_BRAKE_LOCK_R_Execution(uint8_t led_status)
{ {
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL07 = LED_BRIGHTNESS; IS31_CHIP0_CHANNEL07 = LED_BRIGHTNESSR;
} }
else else
{ {
...@@ -1734,7 +1738,7 @@ void LED_AIR_SUS_R_Execution(uint8_t led_status) ...@@ -1734,7 +1738,7 @@ void LED_AIR_SUS_R_Execution(uint8_t led_status)
{ {
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL06 = LED_BRIGHTNESS; IS31_CHIP0_CHANNEL06 = LED_BRIGHTNESSR;
} }
else else
{ {
...@@ -1779,7 +1783,7 @@ void LED_TRAILER_BRAKE_R_Execution(uint8_t led_status) ...@@ -1779,7 +1783,7 @@ void LED_TRAILER_BRAKE_R_Execution(uint8_t led_status)
{ {
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL10 = LED_BRIGHTNESS; IS31_CHIP0_CHANNEL10 = LED_BRIGHTNESSY;
} }
else else
{ {
...@@ -1824,7 +1828,7 @@ void LED_BRAKE_AIR_or_EBS_YELLOW_R_Execution(uint8_t led_status) ...@@ -1824,7 +1828,7 @@ void LED_BRAKE_AIR_or_EBS_YELLOW_R_Execution(uint8_t led_status)
{ {
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL09 = LED_BRIGHTNESS; IS31_CHIP0_CHANNEL09 = LED_BRIGHTNESSY;
} }
else else
{ {
...@@ -1993,7 +1997,7 @@ void LED_WORKING_LAMP_U_Execution(uint8_t led_status) ...@@ -1993,7 +1997,7 @@ void LED_WORKING_LAMP_U_Execution(uint8_t led_status)
{ {
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL11 = LED_BRIGHTNESS; IS31_CHIP0_CHANNEL11 = LED_BRIGHTNESSY;
} }
else else
{ {
...@@ -2038,7 +2042,7 @@ void LED_TRAILER_ABS_INFO_U_Execution(uint8_t led_status) ...@@ -2038,7 +2042,7 @@ void LED_TRAILER_ABS_INFO_U_Execution(uint8_t led_status)
{ {
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL05 = LED_BRIGHTNESS; IS31_CHIP0_CHANNEL05 = LED_BRIGHTNESSY;
} }
else else
{ {
......
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