Commit 872dee2d authored by hu's avatar hu

调整故障码显示BUG

parent 328eadc3
...@@ -111,10 +111,8 @@ void BackLightDamp(uint8_t TimeX) ...@@ -111,10 +111,8 @@ void BackLightDamp(uint8_t TimeX)
{ {
if (BLEffectFlag == BGL_GRADUAL) if (BLEffectFlag == BGL_GRADUAL)
{ {
if (BackLightPara[i].CurBackLightDuty < BackLightPara[i].DestBackLightDuty) if (BackLightPara[i].CurBackLightDuty < BackLightPara[i].DestBackLightDuty)
{ {
BackLightModifyTimer[i] = (uint16_t)(400u / (BackLightPara[i].DestBackLightDuty - BackLightPara[i].CurBackLightDuty) + 2u); BackLightModifyTimer[i] = (uint16_t)(400u / (BackLightPara[i].DestBackLightDuty - BackLightPara[i].CurBackLightDuty) + 2u);
if ((BackLightPara[i].DestBackLightDuty - BackLightPara[i].CurBackLightDuty) >= TmpStep) if ((BackLightPara[i].DestBackLightDuty - BackLightPara[i].CurBackLightDuty) >= TmpStep)
{ {
......
...@@ -32,19 +32,19 @@ ...@@ -32,19 +32,19 @@
#include "Popups.h" #include "Popups.h"
#include "kwp2000_service.h" #include "kwp2000_service.h"
volatile _Display_State_Flag State_Flag; /*0-常态 1-小于0 2-小于1000 3-无此功能*/ #pragma alignvar(8)
_TPMS TPMS_Matching;
_UserSet User_set_Num;
_UserSet User_App;
Display_Modular_St Display_DTC[DTCNumeber + 1u]; Display_Modular_St Display_DTC[DTCNumeber + 1u];
#pragma alignvar(8) #pragma alignvar(8)
uint8_t EolNUM[10u][8u]; uint32_t EolNUM[10u][8u];
uint8_t DTCNumTime = 0u; uint8_t DTCNumTime = 0u;
static uint8_t GUIDTCNumDis = 0u; static uint8_t GUIDTCNumDis = 0u;
_Display_State_Flag State_Flag; /*0-常态 1-小于0 2-小于1000 3-无此功能*/
_TPMS TPMS_Matching;
_UserSet User_set_Num;
_UserSet User_App;
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* Function Name : GUI_Display_KL15_ON_Init * Function Name : GUI_Display_KL15_ON_Init
* Description : * Description :
...@@ -6641,7 +6641,6 @@ void GUI_BG_FacMenu6_Display(uint8_t Mode) ...@@ -6641,7 +6641,6 @@ void GUI_BG_FacMenu6_Display(uint8_t Mode)
* Return : None * Return : None
* onther : 区域 * onther : 区域
--------------------------------------------------------------------------*/ --------------------------------------------------------------------------*/
uint8_t HYQ_TEST = 1;
void GUI_Display_DTC_Server(void) void GUI_Display_DTC_Server(void)
{ {
uint8_t i = 0u; uint8_t i = 0u;
...@@ -6651,7 +6650,7 @@ void GUI_Display_DTC_Server(void) ...@@ -6651,7 +6650,7 @@ void GUI_Display_DTC_Server(void)
Display_DTC[0u].Disp_True_False = 1u; Display_DTC[0u].Disp_True_False = 1u;
/*SRC故障*/ /*SRC故障*/
Display_DTC[1u].Disp_True_False = HYQ_TEST; Display_DTC[1u].Disp_True_False = 0u;
/*AMT故障*/ /*AMT故障*/
if ((K_Line_Set.K_Line_LID41 == 0x10u) || (K_Line_Set.K_Line_LID41 == 0x11u) || (K_Line_Set.K_Line_LID41 == 0x12u)) if ((K_Line_Set.K_Line_LID41 == 0x10u) || (K_Line_Set.K_Line_LID41 == 0x11u) || (K_Line_Set.K_Line_LID41 == 0x12u))
...@@ -6736,11 +6735,9 @@ void GUI_Display_DTC_Server(void) ...@@ -6736,11 +6735,9 @@ void GUI_Display_DTC_Server(void)
* Return : None * Return : None
* onther : 区域 * onther : 区域
--------------------------------------------------------------------------*/ --------------------------------------------------------------------------*/
uint8_t DTCNum = 0u;
void GUI_BG_DTCEngine_Display(uint8_t Mode) void GUI_BG_DTCEngine_Display(uint8_t Mode)
{ {
//uint8_t DTCNum = 0u; uint8_t DTCNum = 0u;
if (Mode == GUI_DISP_MODE_NORMAL) if (Mode == GUI_DISP_MODE_NORMAL)
{ {
......
...@@ -92,7 +92,8 @@ typedef struct ...@@ -92,7 +92,8 @@ typedef struct
} _Display_State_Flag; } _Display_State_Flag;
extern volatile _Display_State_Flag State_Flag; extern _Display_State_Flag State_Flag;
typedef struct typedef struct
{ {
uint16_t Year; /* 年 */ uint16_t Year; /* 年 */
...@@ -155,6 +156,9 @@ typedef struct ...@@ -155,6 +156,9 @@ typedef struct
uint8_t T11; uint8_t T11;
uint8_t T12; uint8_t T12;
uint8_t FLAG; uint8_t FLAG;
uint8_t Reserve1;
uint8_t Reserve2;
uint8_t Reserve3;
} _TPMS; } _TPMS;
extern _TPMS TPMS_Matching; extern _TPMS TPMS_Matching;
......
...@@ -90,7 +90,7 @@ void Sys_Tick_Timer_ISR(void) ...@@ -90,7 +90,7 @@ void Sys_Tick_Timer_ISR(void)
uint16_t u16Counter; uint16_t u16Counter;
UDS_50us_Service(); UDS_50us_Service();
if (pfnSysTickCallBack[SYS_TICK_50us_CB] != NULL ) if (pfnSysTickCallBack[SYS_TICK_50us_CB] != NULL )
{ {
pfnSysTickCallBack[SYS_TICK_50us_CB](); pfnSysTickCallBack[SYS_TICK_50us_CB]();
...@@ -116,7 +116,7 @@ void Sys_Tick_Timer_ISR(void) ...@@ -116,7 +116,7 @@ void Sys_Tick_Timer_ISR(void)
{ {
pfnSysTickCallBack[SYS_TICK_100ms_CB](); pfnSysTickCallBack[SYS_TICK_100ms_CB]();
} }
g_stSysTickTimer.u32DstVal100ms = g_stSysTickTimer.u32MainCnt + (100000UL / SYS_TICK_INT_INTERVAL); g_stSysTickTimer.u32DstVal100ms = g_stSysTickTimer.u32MainCnt + (100000UL / SYS_TICK_INT_INTERVAL);
} }
......
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