Skip to content

TianYing_ty100
TianYing_ty100
Commit a64b45c7 authored by 李俭双's avatar 李俭双
Browse files
Options

Merge branch 'lijianshuang' into 'dev' 

Lijianshuang

See merge request !13
parents 14ec65c7 0545fb2e
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2732 additions and 2869 deletions
Firmware/Source/Application/Data_Coolant/Data_Coolant.c
View file @ a64b45c7
......@@ -106,7 +106,7 @@ void Data_Coolant_Temp_Display ( void )
{
if(SYS_OPR_STAT_IGN_ON)
{
if (Common_GetIgnOnTime() >= 3000)
if (Common_GetIgnOnTime() < 3000)
{
DataCoolantTemp_Dis.u8_Uptimer = CoolantSelfCheckFlashtimer;
DataCoolantTemp_Dis.u8_Downtimer = CoolantSelfCheckFlashtimer;
......@@ -184,7 +184,7 @@ void Data_Coolant_Temp_Display ( void )
{
DataCoolantTemp_Dis.u8_Warnflg = 2;
}
else if(DataCoolantTemp.Value >= 112)
else if(DataCoolantTemp.Value <= 112)
{
DataCoolantTemp_Dis.u8_Warnflg = 0;
}
......
Firmware/Source/Application/Data_TPMS/Data_TPMS.c
View file @ a64b45c7
......@@ -39,7 +39,7 @@ void Data_TPMS_Processing_Service ( void )
TPMS.Front_TPMS_Valid = 0;
TPMS.Rear_TPMS_Valid = 1;
TPMS.Front_Press_Value = 99;
TPMS.Rear_Press_Value *= Rear_TPMS ;
TPMS.Rear_Press_Value = Rear_TPMS * 275;
TPMS.Rear_Press_Value /= 10 ;
if(TPMS.Rear_Press_Value > 99)
{
......@@ -59,7 +59,7 @@ void Data_TPMS_Processing_Service ( void )
TPMS.Front_TPMS_Valid = 1;
TPMS.Rear_TPMS_Valid = 0;
TPMS.Rear_Press_Value = 99;
TPMS.Front_Press_Value *= Front_TPMS ;
TPMS.Front_Press_Value = Front_TPMS *275 ;
TPMS.Front_Press_Value /= 10 ;
if(TPMS.Front_Press_Value > 99)
{
......@@ -87,14 +87,14 @@ void Data_TPMS_Processing_Service ( void )
{
TPMS.Front_TPMS_Valid = 1;
TPMS.Rear_TPMS_Valid = 1;
TPMS.Front_Press_Value *= Front_TPMS ;
TPMS.Front_Press_Value = Front_TPMS * 275 ;
TPMS.Front_Press_Value /= 10 ;
if(TPMS.Front_Press_Value > 99)
{
TPMS.Front_Press_Value = 99;
}
TPMS.Rear_Press_Value *= Rear_TPMS ;
TPMS.Rear_Press_Value = Rear_TPMS * 275;
TPMS.Rear_Press_Value /= 10 ;
if(TPMS.Rear_Press_Value > 99)
{
......@@ -143,12 +143,13 @@ uint8_t Get_Rear_TPMS_Sig_Vaild (void)
{
return TPMS.Rear_TPMS_Valid;
}
//10倍
uint16_t Get_Front_TPMS_Sig_Value (void)
{
uint16_t value = 0;
if (TPMS.TPMS_Unit == 1)
{
value = Data_Bar_To_Psi(TPMS.Front_Press_Value);
value = Data_Bar_To_Psi(TPMS.Front_Press_Value) / 10;
if(value > 99)
{
value = 99;
......@@ -165,11 +166,12 @@ uint16_t Get_Rear_TPMS_Sig_Value (void)
uint16_t value = 0;
if (TPMS.TPMS_Unit == 1)
{
value = Data_Bar_To_Psi(TPMS.Rear_Press_Value) / 10;
if(value > 99)
{
value = 99;
}
value = Data_Bar_To_Psi(TPMS.Rear_Press_Value);
}
else
{
......
Firmware/Source/Application/FaultCode/FaultCode.c
View file @ a64b45c7
#include "FaultCode\FaultCode.h"
#include "Application.h"
uint8_t DTC_Amnt_Number = 0; //Diag402ReceiveDTCNumberTemp
uint8_t DTC_Amnt_Number_Count = 0; //Diag402ReceiveDTCCount
uint8_t FaultCode_Number = 0; //Diag402ReceiveDTCNumber
uint32_t DTC_Data[254] = {0}; //Diag402ReceiveDTC
uint32_t DTC_Data_Count[254] = {0}; //Diag402ReceiveDTCTemp
uint32_t FaultCode_Data[254] = {0}; //DtcCurFaultGrpup
uint8_t FaultCode_Compare(uint32_t FaultCode, uint32_t* CodeList, uint8_t len)
{
uint8_t i = 0;
uint8_t result = 0;
for(i = 0; i < len; i++)
{
if(FaultCode == CodeList[i])
{
result = 1;
}
}
return result;
}
void ECU_FaultCode_Processing_Service ( void )
{
uint8_t DTCH1 = 0;
uint8_t DTCM1 = 0;
uint8_t DTCH2 = 0;
uint8_t DTCM2 = 0;
uint32_t DTC1 = 0;
uint32_t DTC2 = 0;
uint32_t i = 0;
if ( Common_Get_IG_Sts() == COMMON_POWER_ON )
{
if(CAN_MSG_Status(&CAN_CH0_CanMsgOp, CAN_CH0_ID_CAN_0x402_Msg_Count) == CAN_SIG_LOST)
{
memset (FaultCode_Data, 0, FaultCode_Number);
FaultCode_Number = 0;
}
else
{
DTCH1 = Get_CAN_CH0_ID_402_Sig_ECU_DTCH1();
DTCM1 = Get_CAN_CH0_ID_402_Sig_ECU_DTCM1();
DTCH2 = Get_CAN_CH0_ID_402_Sig_ECU_DTCH2();
DTCM2 = Get_CAN_CH0_ID_402_Sig_ECU_DTCM2();
DTC_Amnt_Number = Get_CAN_CH0_ID_402_Sig_ECU_DTCAmnt();
if (((DTCH1 & 0xF0) >> 4) >= 0xA)
{
DTC1 |= ((DTCH1 & 0xF0) >> 4) + 3;
}
else
{
DTC1 |= (DTCH1 & 0xF0) >> 4 ;
}
DTC1 <<= 8;
if ((DTCH1 & 0xF) >= 0xA)
{
DTC1 |= (DTCH1 & 0xF) + 3;
}
else
{
DTC1 |= DTCH1 & 0xF ;
}
DTC1 <<= 8;
if (((DTCM1 & 0xF0) >> 4) >= 0xA)
{
DTC1 |= ((DTCM1 & 0xF0) >> 4) + 3;
}
else
{
DTC1 |= (DTCM1 & 0xF0) >> 4 ;
}
DTC1 <<= 8;
if ((DTCM1 & 0xF) >= 0xA)
{
DTC1 |= (DTCM1 & 0xF) + 3;
}
else
{
DTC1 |= DTCM1 & 0xF ;
}
if (((DTCH2 & 0xF0) >> 4) >= 0xA)
{
DTC2 |= ((DTCH2 & 0xF0) >> 4) + 3;
}
else
{
DTC2 |= (DTCH2 & 0xF0) >> 4 ;
}
DTC2 <<= 8;
if ((DTCH2 & 0xF) >= 0xA)
{
DTC2 |= (DTCH2 & 0xF) + 3;
}
else
{
DTC2 |= DTCH2 & 0xF ;
}
DTC2 <<= 8;
if (((DTCM2 & 0xF0) >> 4) >= 0xA)
{
DTC2 |= ((DTCM2 & 0xF0) >> 4) + 3;
}
else
{
DTC2 |= (DTCM2 & 0xF0) >> 4 ;
}
DTC2 <<= 8;
if ((DTCM2 & 0xF) >= 0xA)
{
DTC2 |= (DTCM2 & 0xF) + 3;
}
else
{
DTC2 |= DTCM2 & 0xF ;
}
if(DTC_Amnt_Number == 0)
{
for (i = 0; i < 255; i++)
{
FaultCode_Data[i] = 0;
}
}
if(DTC_Amnt_Number_Count < DTC_Amnt_Number)
{
if ((DTC1 != 0) && (FaultCode_Compare(DTC1, &DTC_Data_Count[0], DTC_Amnt_Number_Count) == 0))
{
DTC_Data_Count[DTC_Amnt_Number_Count] = DTC1;
DTC_Amnt_Number_Count ++;
}
}
if(DTC_Amnt_Number_Count < DTC_Amnt_Number)
{
if ((DTC2 != 0) && (FaultCode_Compare(DTC2, &DTC_Data_Count[0], DTC_Amnt_Number_Count) == 0))
{
DTC_Data_Count[DTC_Amnt_Number_Count] = DTC2;
DTC_Amnt_Number_Count ++;
}
}
if (DTC_Amnt_Number_Count == DTC_Amnt_Number)
{
for(i = 0; i < DTC_Amnt_Number_Count; i++)
{
DTC_Data[i] = DTC_Data_Count[i];
DTC_Data_Count[i] = 0;
}
FaultCode_Number = DTC_Amnt_Number;
DTC_Amnt_Number_Count = 0;
for(i = 0; i < FaultCode_Number; i++)
{
FaultCode_Data[i] = DTC_Data[i];
}
}
}
}
else
{
memset (FaultCode_Data, 0, FaultCode_Number);
FaultCode_Number = 0;
}
}
Firmware/Source/Application/FaultCode/FaultCode.h
View file @ a64b45c7
......@@ -3,7 +3,8 @@
#include "Application.h"
#include "common.h"
extern uint32_t FaultCode_Data[254] ;
extern uint8_t FaultCode_Number;
uint8_t FaultCode_Compare(uint32_t FaultCode, uint32_t* CodeList, uint8_t len);
void ECU_FaultCode_Processing_Service ( void );
#endif
\ No newline at end of file
Firmware/Source/Application/GUI_Display/GUI_Display.c
View file @ a64b45c7
#include "GUI_Display\GUI_Display.h"
#include "SEG_DISPLAY\SEG_DISPLAY.h"
#include "Application.h"
void Gauge_VSpeed_Display(void)
{
uint16_t VSpeedDisplayValue = 0;
if ( Common_Get_IG_Sts( ) == COMMON_POWER_ON )
{
if ( Get_VechileSpeedValid( ) == 1u )
{
VSpeedDisplayValue = Get_DispVechileSpeed( ) / 10u;
SEG_SET_VSpeed_NUM(1u, VSpeedDisplayValue);
}
else
{
VSpeedDisplayValue = 0u;
SEG_SET_VSpeed_NUM(1u, VSpeedDisplayValue);
}
}
else
{
VSpeedDisplayValue = 0u;
SEG_SET_VSpeed_NUM(0u, 0u);
}
}
void Gauge_Clock_Display(void)
{
uint8_t PageType_DIS = 0;
......@@ -31,7 +9,7 @@ void Gauge_Clock_Display(void)
{
PageType_DIS = Get_Current_PageType();
// LED_Driver_Channel_Set(LampChannel_0, LampCh0_06_Screen_Time, 100);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_07_Screen_Time, LED_ON);
if ( PageType_DIS == 1 )
{
......@@ -64,67 +42,14 @@ void Gauge_Clock_Display(void)
else
{
SEG_SET_Clock(0, 0, 0, 0, 0);
//LED_Driver_Channel_Set(LampChannel_0, LampCh0_06_Screen_Time, 0);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_07_Screen_Time, LED_OFF);
}
}
void Gauge_Trip_Display(void)
{
if ( Common_Get_IG_Sts( ) == COMMON_POWER_ON )
{
SEG_SET_TRIP_NUM(1u, Get_Trip_Value());
}
else
{
SEG_SET_TRIP_NUM(0u, 0u);
}
}
void Gauge_ODO_Display(void)
{
if ( Common_Get_IG_Sts( ) == COMMON_POWER_ON )
{
SEG_SET_ODO_NUM(1u, Get_ODO_Value() / 10u);
}
else
{
SEG_SET_ODO_NUM(0u, 0u);
}
}
void Gauge_FuelDial_Display(void)
{
if ( Common_Get_IG_Sts( ) == COMMON_POWER_ON )
{
SEG_SET_FuelDial(1, Get_CurFuelSetp());
}
else
{
SEG_SET_FuelDial(0, 0);
}
}
void Gauge_EspeedDial_Display(void)
{
if ( Common_Get_IG_Sts( ) == COMMON_POWER_ON )
{
SEG_SET_EspeedDial(1, Get_DispEngineSpeed()/1000, Get_DispEngineSpeed());
}
else
{
SEG_SET_EspeedDial(0, 0, 0);
}
}
void Gauge_Frame_Display(void)
{
if ( Common_Get_IG_Sts( ) == COMMON_POWER_ON )
{
SEG_SET_Frame(1);
}
else
{
SEG_SET_Frame(0);
}
}
void Clear_Bu98(void)
......@@ -141,7 +66,7 @@ void Clear_Bu98(void)
void Gauge_Service(void)
{
static uint16_t VSpeed_Count = 0u;
Gauge_Frame_Display();
uint32_t i = 0;
if (ClearODO_Flag == 1)
{
if ( Common_Get_IG_Sts( ) == COMMON_POWER_ON )
......@@ -151,16 +76,6 @@ void Gauge_Service(void)
else
{
Clear_Bu98();
//RTE_GPIO_Set_Level(VSPEED_TEN_OUT, 0);
//RTE_GPIO_Set_Level(VSPEED_HUNDREDS_OUT, 0);
//LED_Driver_Channel_Set(LampChannel_0, LampCh0_29_MPH, 0);
//LED_Driver_Channel_Set(LampChannel_0, LampCh0_30_KM_H, 0);
//LED_Driver_Channel_Set(LampChannel_0, LampCh0_07_Key_ISTOP, 0);
//LED_Driver_Channel_Set(LampChannel_0, LampCh0_02_Normal_Voltage, 0);
//LED_Driver_Channel_Set(LampChannel_0, LampCh0_03_High_Low_Voltage, 0);
//LED_Driver_Channel_Set(LampChannel_0, LampCh0_04_Fuel_W, 0);
//LED_Driver_Channel_Set(LampChannel_0, LampCh0_05_Fuel_Y, 0);
//LED_Driver_Channel_Set(LampChannel_0, LampCh0_06_Screen_Time, 0);
}
}
else
......@@ -169,6 +84,12 @@ void Gauge_Service(void)
{
if (Common_GetIgnOnTime() >= 3000)
{
//for(i = 0; i < BU98R10_DDRAM_SIZE; i ++)
//{
// BU98R10Chip0DDRAM.Byte[i] = 1;
// BU98R10Chip1DDRAM.Byte[i] = 1;
//}
i = Get_Trip_Value();
if (VSpeed_Count < 3)
{
VSpeed_Count++;
......@@ -176,14 +97,16 @@ void Gauge_Service(void)
else
{
VSpeed_Count = 0;
Gauge_VSpeed_Display();
SEG_SET_VSpeed_NUM(1u, Get_DispVechileSpeed( ) / 10u,Get_Dis_KM_Unit());
}
Gauge_ODO_Display();
SEG_SET_ODO_TRIP_FAULTCODE_TCS_DIS(Get_Dis_KM_Unit(), Get_ODO_Value() / 10u, Get_Trip_Value());
Gauge_Clock_Display();
Gauge_Trip_Display();
Gauge_FuelDial_Display();
Gauge_EspeedDial_Display();
SEG_SET_FuelDial(1, Get_CurFuelSetp());
SEG_SET_EspeedDial(1, Get_DispEngineSpeed()/500);
SEG_SET_CoolantDial(1, GET_DataCoolantTempSegDisp(), GET_DataCoolantTempValueDisp(), GET_DataCollantTempSegValid());
SEG_SET_Voltage_NUM(1, Get_Battery_Voltage());
SEG_SET_TPMS_NUM(1, Get_Front_TPMS_Sig_Value(), Get_Rear_TPMS_Sig_Value(), Get_Dis_Tpms_Unit(),Get_Front_TPMS_Sig_Vaild(), Get_Rear_TPMS_Sig_Vaild());
}
else
{
......@@ -193,16 +116,7 @@ void Gauge_Service(void)
else
{
Clear_Bu98();
//RTE_GPIO_Set_Level(VSPEED_TEN_OUT, 0);
//RTE_GPIO_Set_Level(VSPEED_HUNDREDS_OUT, 0);
//LED_Driver_Channel_Set(LampChannel_0, LampCh0_29_MPH, 0);
//LED_Driver_Channel_Set(LampChannel_0, LampCh0_30_KM_H, 0);
//LED_Driver_Channel_Set(LampChannel_0, LampCh0_07_Key_ISTOP, 0);
//LED_Driver_Channel_Set(LampChannel_0, LampCh0_02_Normal_Voltage, 0);
//LED_Driver_Channel_Set(LampChannel_0, LampCh0_03_High_Low_Voltage, 0);
//LED_Driver_Channel_Set(LampChannel_0, LampCh0_04_Fuel_W, 0);
//LED_Driver_Channel_Set(LampChannel_0, LampCh0_05_Fuel_Y, 0);
//LED_Driver_Channel_Set(LampChannel_0, LampCh0_06_Screen_Time, 0);
}
}
......
Firmware/Source/Application/SEG_DISPLAY/SEG_DISPLAY.h
View file @ a64b45c7
......@@ -7,57 +7,40 @@
typedef enum
{
SEG_LED_Voltage = 0u,
SEG_LED_Auto_Start_Stop,
SEG_LED_Fuel,
SEG_LED_MAX
em_SEG_High_Beam,
em_SEG_FAULT_ELECTROSPRAY,
em_SEG_ABS,
em_SEG_Oil_Pressure,
em_SEG_Bluetooth,
em_SEG_TCS,
em_SEG_Auto_Start_Stop,
//em_SEG_Keys,
em_SEG_Upkeep,
em_SEG_Low_Batt_Vol,
em_SEG_Lateral_Strut,
em_SEG_Tire_Pressure_Alarm,
em_SEG_Turn_Left,
em_SEG_Turn_Right,
em_SEG_Coolant,
em_SEG_Fuel,
SEG_LED_MAX,
} SEG_LED_Idx_t;
enum
{
Gear_P = 0, //P
Gear_R, //R
Gear_N, //N
Gear_D, //D
};
/**@brief 边框线显示函数*/
_Fun_Res SEG_SET_Frame(uint8_t m_Flag);
/**@brief 挡位显示函数*/
_Fun_Res SEG_SET_GEAR(uint8_t m_Gear_Flag,uint8_t m_Gear);
/**@brief 电量表盘显示函数*/
_Fun_Res SEG_SET_EleDial(uint8_t m_Flag,uint8_t m_SEG,uint8_t m_NUM);
/**@brief 燃油表盘显示函数*/
_Fun_Res SEG_SET_FuelDial(uint8_t m_Flag,uint8_t m_SEG);
/**@brief 转速表盘显示函数*/
_Fun_Res SEG_SET_EspeedDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_NUM);
/**@brief 功率表盘显示函数*/
_Fun_Res SEG_SET_PowerDial(uint8_t m_Flag,uint8_t m_SEG,uint8_t m_Sign,uint8_t m_NUM);
/**@brief 续航里程显示函数*/
_Fun_Res SEG_SET_DTE_NUM(uint8_t m_Flag, uint16_t m_NUM);
/**@brief 车速8字段显示函数*/
_Fun_Res SEG_SET_VSpeed_NUM(uint8_t m_Flag , uint16_t m_NUM);
/**@brief L8字段显示函数*/
_Fun_Res SEG_SET_L8_NUM(uint8_t m_Flag , uint8_t m_NUM);
/**@brief 总计里程显示函数*/
_Fun_Res SEG_SET_ODO_NUM(uint8_t m_Flag,uint32_t m_NUM);
/**@brief 小计里程显示函数*/
_Fun_Res SEG_SET_TRIP_NUM(uint8_t m_Flag,uint16_t m_NUM);
/**@brief 时间显示函数*/
_Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t m_Flag1, uint8_t m_Flag2 );
void SEG_SET_DTC_NUM(uint32_t num);
void SEG_SET_LED_STS(uint8_t LED_NUM, uint8_t m_Flag);
void SEG_SET_FuelDial(uint8_t m_Flag, uint8_t m_SEG);
void SEG_SET_EspeedDial(uint8_t m_Flag, uint8_t m_SEG);
void SEG_SET_CoolantDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_Num, uint8_t m_flash);
void SEG_SET_VSpeed_NUM(uint8_t m_Flag, uint16_t m_NUM, uint8_t m_Unit);
void SEG_SET_Voltage_NUM(uint8_t m_Flag, uint16_t m_NUM);
void SEG_SET_TPMS_NUM(uint8_t m_Flag, uint16_t m_NUM1, uint16_t m_NUM2, uint8_t m_Unit, uint8_t m_valid1, uint8_t m_valid2);
void SEG_SET_ODO_TRIP_FAULTCODE_TCS_DIS(uint8_t m_Uint, uint32_t m_NUM_ODO, uint32_t m_NUM_TRIP);
void SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t m_Flag1, uint8_t m_Flag2);
void Check_SEG_Display(void);
......@@ -69,14 +52,8 @@ extern uint8_t Espeed_check_SEG_step;
#define IC_SEG_ON 0x07u
#define IC_SEG_GREY 0x01u
/**@brief 指示灯显示函数*/
_Fun_Res SEG_SET_LED_STS(uint8_t LED_NUM , uint8_t m_Flag);
//扫盘用
_Fun_Res SEG_Scan_SET_EleDial(uint8_t m_SEG);
_Fun_Res SEG_Scan_SET_PowerDial(uint8_t m_SEG);
void SEG_Scan_SET_FuelDial(void);
void SEG_Scan_SET_Fuel_Coolant_Dial(uint8_t coolant);
void SEG_Scan_SET_EspeedDial(void);
extern void Checkself_Init (void);
......
Firmware/Source/Component/Key/Key_user.c
View file @ a64b45c7
......@@ -130,11 +130,11 @@ void Key_KL30_Init_EXample(void)
Key_KL30_Init(&u8KeyRamData[0], stKeyAttribute, &stKeyInitTem);
Key_Parameter_Set_Short_Press_1_Time(50U,1000U);
Key_Parameter_Set_Short_Press_2_Time(3000U,5000U);
Key_Parameter_Set_Short_Press_2_Time(3000U,9000U);
Key_Parameter_Set_Long_Press_1_Time(7000U);
Key_Parameter_Set_Long_Press_2_Time(8000U);
Key_Parameter_Set_Long_Press_3_Time(9000U);
//Key_Parameter_Set_Long_Press_1_Time(7000U);
//Key_Parameter_Set_Long_Press_2_Time(8000U);
//Key_Parameter_Set_Long_Press_3_Time(9000U);
Key_Parameter_Set_Long_Press_4_Time(10000U);
}
void Key_Wakeup_Init_EXample(void)
......@@ -146,11 +146,11 @@ void Key_Wakeup_Init_EXample(void)
Key_Wakeup_Init(&u8KeyRamData[0], stKeyAttribute, &stKeyInitTem);
Key_Parameter_Set_Short_Press_1_Time(50U,1000U);
Key_Parameter_Set_Short_Press_2_Time(3000U,5000U);
Key_Parameter_Set_Short_Press_2_Time(3000U,9000U);
Key_Parameter_Set_Long_Press_1_Time(7000U);
Key_Parameter_Set_Long_Press_2_Time(8000U);
Key_Parameter_Set_Long_Press_3_Time(9000U);
//Key_Parameter_Set_Long_Press_1_Time(7000U);
//Key_Parameter_Set_Long_Press_2_Time(8000U);
//Key_Parameter_Set_Long_Press_3_Time(9000U);
Key_Parameter_Set_Long_Press_4_Time(10000U);
}
......@@ -158,7 +158,7 @@ void Key_Wakeup_Init_EXample(void)
void KEY_LEFT_EVENT_NONE_Service(void)
{
MenuInfor.Back_Time_Left++;
if(MenuInfor.Back_Time_Left > BACK_MENU_TIME)
if((MenuInfor.Back_Time_Left > BACK_MENU_TIME) &&(PageType != Page_DTC))
{
MenuInfor.Back_Time_Left = BACK_MENU_TIME;
MenuInfor.Back_Time_Left_Flag = 1;
......@@ -305,6 +305,11 @@ void Key_Left_Long_Press(void)
MenuData.Tcs_Val = 0;//off
}
}
if(PageType == Page_Trip)
{
Data_Clear_Trip_All();
}
}
......@@ -359,6 +364,10 @@ void MenuData_Unit_Init(void)
MenuData.Tpms_Unit = 0;
MenuData.Tcs_Val = 1;
}
void MenuData_TCS_Init(void)
{
MenuData.Tcs_Val = 1;
}
uint8_t ClearODO_Flag = 0;
void TYW_RESET_ODO(void)
......
Firmware/Source/Component/Key/Key_user.h
View file @ a64b45c7
......@@ -63,4 +63,5 @@ uint8_t Get_Dis_Tcs_Val(void);
void Key_Check_Service(void);
void MenuData_Unit_Init(void);
void Maintain_Reset_Service(void);
void MenuData_TCS_Init(void);
#endif
Firmware/Source/Component/Line_In/Line_In_user.c
View file @ a64b45c7
......@@ -8,7 +8,7 @@ const Line_In_Attribute_st g_stLineInAttribute[LINE_IN_MAX] =
{
{LEVEL_LOW, LEVEL_HIGH, LINE_IN_IG_ON, 20U, 20U, Get_LINE_IN_TurnLeft, },
{LEVEL_LOW, LEVEL_HIGH, LINE_IN_IG_ON, 20U, 20U, Get_LINE_IN_TurnRight, },
{LEVEL_LOW, LEVEL_HIGH, LINE_IN_IG_ON, 60U, 20U, Get_LINE_IN_HighBeam, },
{LEVEL_HIGH, LEVEL_LOW, LINE_IN_IG_ON, 60U, 20U, Get_LINE_IN_HighBeam, },
{LEVEL_HIGH, LEVEL_LOW, LINE_IN_IG_ON, 100U, 20U, Get_LINE_IN_FAULT_ELECTROSPRAY, },
{LEVEL_HIGH, LEVEL_LOW, LINE_IN_IG_ON, 100U, 20U, Get_LINE_IN_Fault_ABS, },
{LEVEL_HIGH, LEVEL_LOW, LINE_IN_IG_ON, 100U, 20U, Get_LINE_IN_Oil_Pressure, },
......
Firmware/Source/Component/PowerManagement/PowerManag_user.c
View file @ a64b45c7
......@@ -104,6 +104,7 @@ static void Power_Wakeup_Init(void)
LINE_IN_Init();
Key_KL30_Init_EXample();
Line_In_KL15_ON_Init();
MenuData_TCS_Init();
//Light_Sensor_Init_Example();//注意顺序1
LED_Driver_Init_Example();//注意顺序2
Fuel_KL30_Init();
......@@ -145,6 +146,7 @@ static void Power_IG_ON_Init(void)
Telltales_UserInit();
Fuel_KL15_Init();
Data_Voltage_Init();
MenuData_TCS_Init();
Data_Coolant_Temp_KL15_Init();
}
......
Firmware/Source/System/Sys_Task_List.c
View file @ a64b45c7
......@@ -47,6 +47,7 @@ void Sys_10ms_Tasks(void)
Turn_Left_Right_Lamp();
Fuel_R_Cal(10u);
TYW_Check_Count();
Data_TPMS_Processing_Service();
}
void Sys_20ms_Tasks(void)
......@@ -56,7 +57,7 @@ void Sys_20ms_Tasks(void)
Data_Vehicle_Speed_Processing_Service();
Data_Engine_Speed_Processing_Service();
Data_Coolant_Temp_Processing_Service();
Data_TPMS_Processing_Service();
}
void Sys_50ms_Tasks(void)
......@@ -82,6 +83,7 @@ void Sys_100ms_Tasks(void)
Services_Mileage_Callback();
Data_Voltage_Processing_Service();
S3_ServerCNTT();
ECU_FaultCode_Processing_Service();
if (u8LEDDriverCheckCount >= 10U)
{
......
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