Commit 308e20e1 authored by hu's avatar hu

调整水温自检期间只显示白色

parent bf81d2a2
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include "BGLInterface.h" #include "BGLInterface.h"
#include "GPIO.h" #include "GPIO.h"
#include "Data_CoolantTemperature.h" #include "Data_CoolantTemperature.h"
#include "kwp2000_service.h"
#include "Telltales.h" #include "Telltales.h"
#include "Menu.h" #include "Menu.h"
...@@ -405,7 +405,7 @@ void BackLightDeal(BL_USER_PARA BL_FunPara, BL_STATE_PARA BLFunStatePara) ...@@ -405,7 +405,7 @@ void BackLightDeal(BL_USER_PARA BL_FunPara, BL_STATE_PARA BLFunStatePara)
SetBacklightDestVal(BL_DIAL, BL_FunPara.BL_User_GaugesDuty); SetBacklightDestVal(BL_DIAL, BL_FunPara.BL_User_GaugesDuty);
/*燃油报警*/ /*燃油报警*/
if (((LED_Fuel_Judgement() == 1u) && (K_Line_Set.K_Line_LID43 == 0x82u)) || (MenuFlag.Menu_Popup_Flag == 4u)) if ((LED_Fuel_Judgement() == 1u) || (MenuFlag.Menu_Popup_Flag == 4u))
{ {
SetBacklightDestVal(LED_FUEL, 0); SetBacklightDestVal(LED_FUEL, 0);
} }
...@@ -414,7 +414,7 @@ void BackLightDeal(BL_USER_PARA BL_FunPara, BL_STATE_PARA BLFunStatePara) ...@@ -414,7 +414,7 @@ void BackLightDeal(BL_USER_PARA BL_FunPara, BL_STATE_PARA BLFunStatePara)
SetBacklightDestVal(LED_FUEL, BL_FunPara.BL_User_GaugesDuty); SetBacklightDestVal(LED_FUEL, BL_FunPara.BL_User_GaugesDuty);
} }
/*水温报警*/ /*水温报警*/
if ((LED_Temp_Judgement() == 1u) && (K_Line_Set.K_Line_LID43 == 0x82u)) if (LED_Temp_Judgement() == 1u)
{ {
SetBacklightDestVal(LED_TEMP, 0); SetBacklightDestVal(LED_TEMP, 0);
//SetBacklightDestVal(LED_TEMPBL, 0); //SetBacklightDestVal(LED_TEMPBL, 0);
...@@ -427,7 +427,8 @@ void BackLightDeal(BL_USER_PARA BL_FunPara, BL_STATE_PARA BLFunStatePara) ...@@ -427,7 +427,8 @@ void BackLightDeal(BL_USER_PARA BL_FunPara, BL_STATE_PARA BLFunStatePara)
//Water_Temp_Led_R_MCU_OUT = 0u; //Water_Temp_Led_R_MCU_OUT = 0u;
} }
/*水温背光灯*/ /*水温背光灯*/
if ((Coolant_Get_CurSeg() >= 11) && (K_Line_Set.K_Line_LID43 == 0x82u)) //if (Coolant_Get_CurSeg() >= 11)
if (LED_Temp_Judgement() == 1u)
{ {
SetBacklightDestVal(LED_TEMPBL, 0); SetBacklightDestVal(LED_TEMPBL, 0);
Water_Temp_Led_R_MCU_OUT = 1u; Water_Temp_Led_R_MCU_OUT = 1u;
...@@ -438,7 +439,6 @@ void BackLightDeal(BL_USER_PARA BL_FunPara, BL_STATE_PARA BLFunStatePara) ...@@ -438,7 +439,6 @@ void BackLightDeal(BL_USER_PARA BL_FunPara, BL_STATE_PARA BLFunStatePara)
Water_Temp_Led_R_MCU_OUT = 0u; Water_Temp_Led_R_MCU_OUT = 0u;
} }
for ( i = 0u; i < BACKLIGHT_TOTAL; i++) for ( i = 0u; i < BACKLIGHT_TOTAL; i++)
{ {
if ((BackLightPara[i].DestBackLightDuty != 0u) && (PwmStopFlag[i] == 1u)) if ((BackLightPara[i].DestBackLightDuty != 0u) && (PwmStopFlag[i] == 1u))
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include "FuelConfig.h" #include "FuelConfig.h"
#include "Data_Fuel_User.h" #include "Data_Fuel_User.h"
#include "kwp2000_service.h" #include "kwp2000_service.h"
#include "Common_Interface.h"
static uint8_t L12_Air_Sta ; static uint8_t L12_Air_Sta ;
...@@ -1939,13 +1940,13 @@ Temp ...@@ -1939,13 +1940,13 @@ Temp
uint8_t LED_Temp_Judgement(void) uint8_t LED_Temp_Judgement(void)
{ {
static uint8_t u8Result = 0u; static uint8_t u8Result = 0u;
uint32_t u32IG_ON_Timer = 0x00u;
uint8_t m_Condition1 = 0u; uint8_t m_Condition1 = 0u;
m_Condition1 = Coolant_Get_CurSeg(); m_Condition1 = Coolant_Get_CurSeg();
u32IG_ON_Timer = Common_GetIgnOnTime();
if (K_Line_Set.K_Line_LID43 == 0x82u) if ((m_Condition1 >= 11u) && (Coolant_Get_Valid() == 1u) && (u32IG_ON_Timer >= 5500))// && (K_Line_Set.K_Line_LID43 == 0x82u))
{
if ((m_Condition1 >= 11u) && (Coolant_Get_Valid() == 1u))
{ {
u8Result = 1u; u8Result = 1u;
} }
...@@ -1953,23 +1954,17 @@ uint8_t LED_Temp_Judgement(void) ...@@ -1953,23 +1954,17 @@ uint8_t LED_Temp_Judgement(void)
{ {
u8Result = 0u; u8Result = 0u;
} }
}
else
{
u8Result = 0u;
}
return u8Result; return u8Result;
} }
void LED_Temp_Execution(uint8_t led_status) void LED_Temp_Execution(uint8_t led_status)
{ {
COMMON_PowerStatus_t u8IG_st; COMMON_PowerStatus_t u8IG_st;
u8IG_st = Common_Get_IG_Sts(); u8IG_st = Common_Get_IG_Sts();
if (u8IG_st == COMMON_POWER_ON) if (u8IG_st == COMMON_POWER_ON)
{ {
if ((led_status == 1u) && (K_Line_Set.K_Line_LID43 == 0x82u)) if (led_status == 1u)
{ {
TEMP_R_LED_OUT = 1u ;/*水温红灯*/ TEMP_R_LED_OUT = 1u ;/*水温红灯*/
//Water_Temp_Led_R_MCU_OUT = 1u; //Water_Temp_Led_R_MCU_OUT = 1u;
...@@ -2013,7 +2008,7 @@ uint8_t LED_Fuel_Judgement(void) ...@@ -2013,7 +2008,7 @@ uint8_t LED_Fuel_Judgement(void)
variable_2 = GetFuelSensorState();/*燃油状态*/ variable_2 = GetFuelSensorState();/*燃油状态*/
variable_5 = GetFuelResistance(); /*采集的阻值*/ variable_5 = GetFuelResistance(); /*采集的阻值*/
if ((variable_1 <= 1 ) && (variable_2 == FuelSensorNormal) && (variable_5 != 65535) && (K_Line_Set.K_Line_LID43 == 0x82u)) if ((variable_1 <= 1 ) && (variable_2 == FuelSensorNormal) && (variable_5 != 65535))//&& (K_Line_Set.K_Line_LID43 == 0x82u))
{ {
u8Result = 1u; u8Result = 1u;
} }
...@@ -2033,7 +2028,7 @@ void LED_Fuel_Execution(uint8_t led_status) ...@@ -2033,7 +2028,7 @@ void LED_Fuel_Execution(uint8_t led_status)
if (u8IG_st == COMMON_POWER_ON) if (u8IG_st == COMMON_POWER_ON)
{ {
if ((led_status == 1u) && (K_Line_Set.K_Line_LID43 == 0x82u)) if (led_status == 1u)
{ {
FUEL_LED_Y_MCU = 1u ; FUEL_LED_Y_MCU = 1u ;
//FUEL_W_LED_OUT = 0u ; //FUEL_W_LED_OUT = 0u ;
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#define FState_COilTimeOutNum 60u /*3S*/ #define FState_COilTimeOutNum 60u /*3S*/
#define SystemSupplierECUHardwareVersionNumberApp ((uint16_t)(10201)) /*硬件版本号 HV:01.02.00*/ #define SystemSupplierECUHardwareVersionNumberApp ((uint16_t)(10201)) /*硬件版本号 HV:01.02.00*/
#define SystemSupplierECUSoftwareInformationApp ((uint16_t)(10101)) /*软件版本号 SV:01.01.00*/ #define SystemSupplierECUSoftwareInformationApp ((uint16_t)(10102)) /*软件版本号 SV:01.01.02*/
#define systemSupplierECUFlashInformationApp ((uint16_t)(12)) /*FLASH版本号 FV:00.11*/ #define systemSupplierECUFlashInformationApp ((uint16_t)(12)) /*FLASH版本号 FV:00.12*/
typedef struct typedef struct
{ {
......
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