Skip to content

TianYing_ty100
TianYing_ty100
Commit 9f59ed0e authored by 陈家乐's avatar 陈家乐
1 Browse files
Options

🐞 fix:66803 大计里程最大值改为199999。 

69806 优化自检效果。
59129 QAC问题
parent 934a0db6
Show whitespace changes
Inline Side-by-side
Showing with 48 additions and 47 deletions
Firmware/Source/Application/BackLight/BackLight.c
View file @ 9f59ed0e
......@@ -48,7 +48,7 @@ void BackLight_Process(void)
// }
//}
//if ( LED_Turnon == 5 )
if (Common_GetIgnOnTime() >= 3030)
if (Common_GetIgnOnTime() >= CHEAKTIME)
{
if (Line_In_Get_Status(LINE_IN_Little_Lamp))
{
......
Firmware/Source/Application/Data_Coolant/Data_Coolant.c
View file @ 9f59ed0e
......@@ -255,7 +255,7 @@ void Data_Coolant_Temp_Display ( void )
{
if(Common_Get_IG_Sts( ) == COMMON_POWER_ON)
{
if (Common_GetIgnOnTime() < 3030)
if (Common_GetIgnOnTime() < CHEAKTIME)
{
DataCoolantTemp_Dis.u8_Uptimer = CoolantSelfCheckFlashtimer;
DataCoolantTemp_Dis.u8_Downtimer = CoolantSelfCheckFlashtimer;
......@@ -315,7 +315,7 @@ void Data_Coolant_Temp_Display ( void )
}
}
if (Common_GetIgnOnTime() >= 3030)
if (Common_GetIgnOnTime() >= CHEAKTIME)
{
if(DataCoolantTemp_Dis.u8_CurSeg > DataCoolantTemp_Dis.u8_DestSeg )
{
......
Firmware/Source/Application/Fuel/Data_Fuel.c
View file @ 9f59ed0e
......@@ -274,7 +274,7 @@ void Fuel_Gauges_Cal(uint8_t deltaTime)
}
/*IGN ON 1秒/故障恢复后，开始走格 立即指向当前格 20220704*/
if (Common_GetIgnOnTime() >= 3030)
if (Common_GetIgnOnTime() >= CHEAKTIME)
{
time += deltaTime;
if (FuelInitFlag)
......
Firmware/Source/Application/GPIO_USER/GpioUser.c
View file @ 9f59ed0e
#include "GpioUser.h"
#include "Components.h"
#define Gpio_Max 59 /* 64Pin */
#define Gpio_Max 48 /* 64Pin */
#define GpioOut_High RTE_GPIO_DIR_OUT | RTE_GPIO_LEVEL_HIGH
#define GpioOut_Low RTE_GPIO_DIR_OUT | RTE_GPIO_LEVEL_LOW
......
Firmware/Source/Application/GUI_Display/GUI_Display.c
View file @ 9f59ed0e
......@@ -87,7 +87,7 @@ void Gauge_Service(void)
}
else
{
if (Common_GetIgnOnTime() >= 3030)
if (Common_GetIgnOnTime() >= CHEAKTIME)
{
if(u8VspeedCount < 3)
{
......
Firmware/Source/Application/SEG_DISPLAY/SEG_DISPLAY.c
View file @ 9f59ed0e
......@@ -338,7 +338,7 @@ void SEG_SET_Navigation_STS(uint8_t m_Flag, uint8_t m_Code, uint32_t m_Mileage)
{
uint32_t Num = 0;
uint8_t m8 = 0;
if ((ClearODO_Flag == 1) || (Common_GetIgnOnTime() < 3030))
if ((ClearODO_Flag == 1) || (Common_GetIgnOnTime() < CHEAKTIME))
{
IC2_SEG164 = IC_SEG_ON;
IC2_SEG165 = IC_SEG_ON;
......@@ -677,12 +677,12 @@ void SEG_SET_Navigation_STS(uint8_t m_Flag, uint8_t m_Code, uint32_t m_Mileage)
break;
}
}
if ((m_Flag && BlueTooth.BLE_St) || (Common_GetIgnOnTime() < 3030) || ClearODO_Flag == 1)
if ((m_Flag && BlueTooth.BLE_St) || (Common_GetIgnOnTime() < CHEAKTIME) || ClearODO_Flag == 1)
{
LED_Driver_Channel_Set(LampChannel_0, LampCh0_17_Length2, LED_ON);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_18_Length1, LED_ON);
if ((ClearODO_Flag == 1) || (Common_GetIgnOnTime() < 3030))
if ((ClearODO_Flag == 1) || (Common_GetIgnOnTime() < CHEAKTIME))
{
IC1_SEG030 = IC_SEG_ON;
IC1_SEG130 = IC_SEG_ON;
......@@ -713,7 +713,7 @@ void SEG_SET_Navigation_STS(uint8_t m_Flag, uint8_t m_Code, uint32_t m_Mileage)
{
Num = m_Mileage / 100000;
}
if ((ClearODO_Flag == 1) || (Common_GetIgnOnTime() < 3030))
if ((ClearODO_Flag == 1) || (Common_GetIgnOnTime() < CHEAKTIME))
{
m8 = SEG_DISPLAY_NUMBER0[Num];
}
......@@ -782,7 +782,7 @@ void SEG_SET_Navigation_STS(uint8_t m_Flag, uint8_t m_Code, uint32_t m_Mileage)
if (m_Mileage < 1000)
{
Num = m_Mileage / 100;
if ((ClearODO_Flag == 1) || (Common_GetIgnOnTime() < 3030))
if ((ClearODO_Flag == 1) || (Common_GetIgnOnTime() < CHEAKTIME))
{
m8 = SEG_DISPLAY_NUMBER0[Num];
}
......@@ -794,7 +794,7 @@ void SEG_SET_Navigation_STS(uint8_t m_Flag, uint8_t m_Code, uint32_t m_Mileage)
else
{
Num = ((m_Mileage + 50) / 100) % 1000 / 100;
if ((m_Mileage >= 10000) || (ClearODO_Flag == 1) || (Common_GetIgnOnTime() < 3030))
if ((m_Mileage >= 10000) || (ClearODO_Flag == 1) || (Common_GetIgnOnTime() < CHEAKTIME))
{
m8 = SEG_DISPLAY_NUMBER0[Num];
}
......@@ -863,7 +863,7 @@ void SEG_SET_Navigation_STS(uint8_t m_Flag, uint8_t m_Code, uint32_t m_Mileage)
if (m_Mileage < 1000)
{
Num = (m_Mileage / 10) % 10;
if ((m_Mileage >= 10) || (ClearODO_Flag == 1) || (Common_GetIgnOnTime() < 3030))
if ((m_Mileage >= 10) || (ClearODO_Flag == 1) || (Common_GetIgnOnTime() < CHEAKTIME))
{
m8 = SEG_DISPLAY_NUMBER0[Num];
}
......@@ -1097,7 +1097,7 @@ void SEG_SET_FuelDial(uint8_t m_Flag, uint8_t m_SEG)
else
{
if ((Get_CurFuelSetp() == 0) && (Common_GetIgnOnTime() >= 3030))
if ((Get_CurFuelSetp() == 0) && (Common_GetIgnOnTime() >= CHEAKTIME))
{
if (FLASH_SYNC_1Hz)
{
......@@ -1115,7 +1115,7 @@ void SEG_SET_FuelDial(uint8_t m_Flag, uint8_t m_SEG)
IC2_SEG108 = IC_SEG_ON;
IC2_SEG100 = IC_SEG_ON;
}
if ((Get_CurFuelSetp() == 1) && (ClearODO_Flag != 1) && (Common_GetIgnOnTime() >= 3030))
if ((Get_CurFuelSetp() == 1) && (ClearODO_Flag != 1) && (Common_GetIgnOnTime() >= CHEAKTIME))
{
IC2_SEG108 = IC_SEG_ON;
IC2_SEG100 = IC_SEG_ON;
......@@ -1355,7 +1355,7 @@ void SEG_SET_CoolantDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_Num, uint8_t
uint8_t m8;
if (m_Flag == 1u)
{
if ((m_flash == 0) && (ClearODO_Flag != 1) && (Common_GetIgnOnTime() >= 3030))
if ((m_flash == 0) && (ClearODO_Flag != 1) && (Common_GetIgnOnTime() >= CHEAKTIME))
{
if (FLASH_SYNC_1Hz)
{
......@@ -1400,7 +1400,7 @@ void SEG_SET_CoolantDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_Num, uint8_t
default:
break;
}
if ((m_flash == 0) && (ClearODO_Flag != 1) && (Common_GetIgnOnTime() >= 3030))
if ((m_flash == 0) && (ClearODO_Flag != 1) && (Common_GetIgnOnTime() >= CHEAKTIME))
{
IC1_SEG128 = IC_SEG_OFF;
IC1_SEG125 = IC_SEG_OFF;
......@@ -1612,7 +1612,7 @@ void SEG_SET_VSpeed_NUM(uint8_t m_Flag, uint16_t m_NUM, uint8_t m_Unit)
RTE_GPIO_Set_Level(VSpeed_Hundreds, 0);
}
if ((ClearODO_Flag != 1) && (Common_GetIgnOnTime() >= 3030))
if ((ClearODO_Flag != 1) && (Common_GetIgnOnTime() >= CHEAKTIME))
{
if (Get_Current_PageType() == Page_Km_Unit)
{
......@@ -1847,7 +1847,7 @@ void SEG_SET_Voltage_NUM(uint8_t m_Flag, uint16_t m_NUM)
{
IC1_SEG079 = IC_SEG_ON;
IC1_SEG086 = IC_SEG_ON;
if ((Get_Battery_Voltage_Valid() != 1) && (ClearODO_Flag != 1) && (Common_GetIgnOnTime() >= 3030))
if ((Get_Battery_Voltage_Valid() != 1) && (ClearODO_Flag != 1) && (Common_GetIgnOnTime() >= CHEAKTIME))
{
IC1_SEG088 = IC_SEG_ON;
......@@ -1876,7 +1876,7 @@ void SEG_SET_Voltage_NUM(uint8_t m_Flag, uint16_t m_NUM)
else
{
Num = m_NUM / 100;
if ((ClearODO_Flag == 1) || (Common_GetIgnOnTime() <= 3030))
if ((ClearODO_Flag == 1) || (Common_GetIgnOnTime() <= CHEAKTIME))
{
m8 = SEG_DISPLAY_NUMBER0[Num];
}
......@@ -2091,7 +2091,7 @@ void SEG_SET_TPMS_DISPLAY(uint8_t m_Flag, uint16_t m_NUM1, uint16_t m_NUM2, uint
{
IC2_SEG142 = IC_SEG_ON;
IC2_SEG122 = IC_SEG_ON;
if ((ClearODO_Flag != 1) && (Common_GetIgnOnTime() >= 3030))
if ((ClearODO_Flag != 1) && (Common_GetIgnOnTime() >= CHEAKTIME))
{
//if (Get_Current_PageType() == Page_Tpms_Unit)
//{
......@@ -3341,7 +3341,7 @@ void SEG_SET_ODO_TRIP_FAULTCODE_TCS_DIS(uint8_t m_Uint, uint32_t m_NUM_ODO, uint
uint8_t m8;
RTE_GPIO_Set_Level(ODO_TenThousand, 1);
RTE_GPIO_Set_Level(ODO_Thousand, 1);
if ((ClearODO_Flag != 1) && (Common_GetIgnOnTime() >= 3030))
if ((ClearODO_Flag != 1) && (Common_GetIgnOnTime() >= CHEAKTIME))
{
if ((Get_Current_PageType() == Page_Km_Unit) && ((Get_Current_PageMenu() == Page_Odo) || (Get_Current_PageMenu() == Page_Trip)))
{
......@@ -3431,7 +3431,7 @@ void SEG_SET_ODO_TRIP_FAULTCODE_TCS_DIS(uint8_t m_Uint, uint32_t m_NUM_ODO, uint
LED_Driver_Channel_Set(LampChannel_0, LampCh0_34_TRIP, LED_ON);
}
if ((Get_Current_PageMenu() == Page_Odo) || (ClearODO_Flag == 1) || (Common_GetIgnOnTime() < 3030))
if ((Get_Current_PageMenu() == Page_Odo) || (ClearODO_Flag == 1) || (Common_GetIgnOnTime() < CHEAKTIME))
{
if (m_NUM_ODO > 99999)
{
......@@ -4538,7 +4538,7 @@ void Checkself_SEG_Display(void)
uint32_t ODO = 0;
uint32_t Mileage = 0;
if (Common_GetIgnOnTime() >= 30)
if (Common_GetIgnOnTime() >= 200)
{
if (Checkself_SEG_step_count < 60)
{
......
Firmware/Source/Component/Components.h
View file @ 9f59ed0e
#ifndef COMPONENTS_H__
#define COMPONENTS_H__
#define CHEAKTIME 3200
#include "Simulated_IIC_master\Simulated_IIC_master.h"
#include "Flash_synchronizer\Flash_synchronizer.h"
#include "GenDelay\GenDelay.h"
......
Firmware/Source/Component/Key/Key_user.c
View file @ 9f59ed0e
......@@ -29,14 +29,14 @@ void Key_Operation_Left(Key_Event_en_t enKeyEvent)//Mode
switch (enKeyEvent)
{
case KEY_EVENT_SHORT_PRESS_1://1s
if (Common_GetIgnOnTime() >= 3030)
if (Common_GetIgnOnTime() >= CHEAKTIME)
{
Key_Left_Short_Press();
}
Key_Clear_Time();
break;
case KEY_EVENT_SHORT_PRESS_2://3-5s
if (Common_GetIgnOnTime() >= 3030)
if (Common_GetIgnOnTime() >= CHEAKTIME)
{
Key_Left_Long_Press();
TYW_RESET_ODO();
......@@ -51,7 +51,7 @@ void Key_Operation_Left(Key_Event_en_t enKeyEvent)//Mode
case KEY_EVENT_LONG_PRESS_3: //9s
break;
case KEY_EVENT_LONG_PRESS_4: //10s
if (Common_GetIgnOnTime() >= 3030)
if (Common_GetIgnOnTime() >= CHEAKTIME)
{
Maintain_Reset_Service();
......
Firmware/Source/Component/Mileage/Services_Mileage_User.c
View file @ 9f59ed0e
......@@ -319,9 +319,9 @@ uint32_t Get_ODO_Value(void)
{
ODO = Data_ODO_Read();
}
if(ODO >= 199999)
if(ODO >= 1999999)
{
ODO = 199999;
ODO = 1999999;
}
return ODO;
}
......
Firmware/Source/Component/Telltales/Telltales_user.c
View file @ 9f59ed0e
......@@ -51,21 +51,21 @@ __align(4)
const LED_Attribute_st LED_Attribute [ LED_Max ] = {
/* 指示灯索引 是否自检 外部信号自检 工作电源状态 自检开始时间 自检持续时间 指示灯点亮条件 指示灯执行函数 */
{em_LED_High_Beam, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3030ul, LED_High_Beam_Judgement, LED_High_Beam_Execution},
{em_LED_FAULT_ELECTROSPRAY, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3030ul, LED_FAULT_ELECTROSPRAY_Judgement, LED_FAULT_ELECTROSPRAY_Execution},
{em_LED_ABS, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3030ul, LED_ABS_Judgement, LED_ABS_Execution},
{em_LED_Oil_Pressure, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3030ul, LED_Oil_Pressure_Judgement, LED_Oil_Pressure_Execution},
{em_LED_Fuel, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3030ul, LED_Fuel_Judgement, LED_Fuel_Execution},
{em_LED_Coolant, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3030ul, LED_Coolant_Judgement, LED_Coolant_Execution},
{em_LED_Bluetooth, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3030ul, LED_Bluetooth_Judgement, LED_Bluetooth_Execution},
{em_LED_TCS, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3030ul, LED_TCS_Judgement, LED_TCS_Execution},
{em_LED_Auto_Start_Stop, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3030ul, LED_Auto_Start_Judgement, LED_Auto_Start_Execution},
//{em_LED_Keys, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Keys_Judgement, LED_Keys_Execution},
{em_LED_Maintain, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3030ul, LED_Maintain_Judgement, LED_Maintain_Execution},
{em_LED_Low_Batt_Vol, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3030ul, LED_Low_Batt_Judgement, LED_Low_Batt_Execution},
{em_LED_Lateral_Strut, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3030ul, LED_Lateral_Strut_Judgement, LED_Lateral_Strut_Execution},
{em_LED_High_Beam, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, CHEAKTIME, LED_High_Beam_Judgement, LED_High_Beam_Execution},
{em_LED_FAULT_ELECTROSPRAY, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, CHEAKTIME, LED_FAULT_ELECTROSPRAY_Judgement, LED_FAULT_ELECTROSPRAY_Execution},
{em_LED_ABS, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, CHEAKTIME, LED_ABS_Judgement, LED_ABS_Execution},
{em_LED_Oil_Pressure, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, CHEAKTIME, LED_Oil_Pressure_Judgement, LED_Oil_Pressure_Execution},
{em_LED_Fuel, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, CHEAKTIME, LED_Fuel_Judgement, LED_Fuel_Execution},
{em_LED_Coolant, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, CHEAKTIME, LED_Coolant_Judgement, LED_Coolant_Execution},
{em_LED_Bluetooth, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, CHEAKTIME, LED_Bluetooth_Judgement, LED_Bluetooth_Execution},
{em_LED_TCS, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, CHEAKTIME, LED_TCS_Judgement, LED_TCS_Execution},
{em_LED_Auto_Start_Stop, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, CHEAKTIME, LED_Auto_Start_Judgement, LED_Auto_Start_Execution},
//{em_LED_Keys, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0 0u, CHEAKTIMEul, LED_Keys_Judgement, LED_Keys_Execution},
{em_LED_Maintain, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, CHEAKTIME, LED_Maintain_Judgement, LED_Maintain_Execution},
{em_LED_Low_Batt_Vol, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, CHEAKTIME, LED_Low_Batt_Judgement, LED_Low_Batt_Execution},
{em_LED_Lateral_Strut, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, CHEAKTIME, LED_Lateral_Strut_Judgement, LED_Lateral_Strut_Execution},
#if(IC_Current == TY200_080000b_ty)
{em_LED_Tire_Pressure_Alarm, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3030ul, LED_Tire_Pressure_Judgement, LED_Tire_Pressure_Execution},
{em_LED_Tire_Pressure_Alarm, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, CHEAKTIME, LED_Tire_Pressure_Judgement, LED_Tire_Pressure_Execution},
#endif
//{em_LED_Navigator, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Navigato_Judgement, LED_Navigato_Execution},
......@@ -227,7 +227,7 @@ static void LED_Oil_Pressure_Execution(Tellib_uint16_t led_status)
static Tellib_uint16_t LED_Fuel_Judgement(void)
{
Tellib_uint16_t LED_STATE = 0u;
if (Common_GetIgnOnTime() >= 3030)
if (Common_GetIgnOnTime() >= CHEAKTIME)
{
if(Get_Fuel_Sensor_State() == FuelSensorNormal)
{
......@@ -763,7 +763,7 @@ void Turn_Left_Right_Lamp(void)
{
if ( Common_Get_IG_Sts( ) == COMMON_POWER_ON )
{
if ((Common_GetIgnOnTime() >= 3030) && (ClearODO_Flag == 0))
if ((Common_GetIgnOnTime() >= CHEAKTIME) && (ClearODO_Flag == 0))
{
if (Line_In_Get_Status(LINE_IN_TurnLeft))
{
......
Firmware/Source/System/Sys_Task_List.c
View file @ 9f59ed0e
......@@ -43,7 +43,7 @@ void Sys_5ms_Tasks(void)
void Sys_10ms_Tasks(void)
{
Line_In_Debounce_Service(10u);
if(Common_GetIgnOnTime() >= 3030)
if(Common_GetIgnOnTime() >= CHEAKTIME)
{
Key_Service();
}
......
  • 陈家乐 @chenjiale ·
    Developer

    59129 QAC问题 69806 【天鹰TY200】【自检】：下15电和下30电自检均显示错误

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