Skip to content

TianYing_ty100
TianYing_ty100
Commit ac942dd8 authored by 高士达's avatar 高士达
Browse files
Options

Merge branch 'CJL' into 'dev' 

Cjl

See merge request !121
parents 9f16ce0e cac9797a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 60 deletions
Firmware/Source/Application/BackLight/BackLight.c
View file @ ac942dd8
...@@ -48,7 +48,7 @@ void BackLight_Process(void) ...@@ -48,7 +48,7 @@ void BackLight_Process(void)
// } // }
//} //}
//if ( LED_Turnon == 5 ) //if ( LED_Turnon == 5 )
if (Common_GetIgnOnTime() >= 3030) if (Common_GetIgnOnTime() >= CHEAKTIME)
{ {
if (Line_In_Get_Status(LINE_IN_Little_Lamp)) if (Line_In_Get_Status(LINE_IN_Little_Lamp))
{ {
......
Firmware/Source/Application/Data_Coolant/Data_Coolant.c
View file @ ac942dd8
...@@ -255,7 +255,7 @@ void Data_Coolant_Temp_Display ( void ) ...@@ -255,7 +255,7 @@ void Data_Coolant_Temp_Display ( void )
{ {
if(Common_Get_IG_Sts( ) == COMMON_POWER_ON) if(Common_Get_IG_Sts( ) == COMMON_POWER_ON)
{ {
if (Common_GetIgnOnTime() < 3030) if (Common_GetIgnOnTime() < CHEAKTIME)
{ {
DataCoolantTemp_Dis.u8_Uptimer = CoolantSelfCheckFlashtimer; DataCoolantTemp_Dis.u8_Uptimer = CoolantSelfCheckFlashtimer;
DataCoolantTemp_Dis.u8_Downtimer = CoolantSelfCheckFlashtimer; DataCoolantTemp_Dis.u8_Downtimer = CoolantSelfCheckFlashtimer;
...@@ -315,7 +315,7 @@ void Data_Coolant_Temp_Display ( void ) ...@@ -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 ) if(DataCoolantTemp_Dis.u8_CurSeg > DataCoolantTemp_Dis.u8_DestSeg )
{ {
......
Firmware/Source/Application/Fuel/Data_Fuel.c
View file @ ac942dd8
...@@ -274,7 +274,7 @@ void Fuel_Gauges_Cal(uint8_t deltaTime) ...@@ -274,7 +274,7 @@ void Fuel_Gauges_Cal(uint8_t deltaTime)
} }
/*IGN ON 1秒/故障恢复后，开始走格 立即指向当前格 20220704*/ /*IGN ON 1秒/故障恢复后，开始走格 立即指向当前格 20220704*/
if (Common_GetIgnOnTime() >= 3030) if (Common_GetIgnOnTime() >= CHEAKTIME)
{ {
time += deltaTime; time += deltaTime;
if (FuelInitFlag) if (FuelInitFlag)
......
Firmware/Source/Application/GPIO_USER/GpioUser.c
View file @ ac942dd8
#include "GpioUser.h" #include "GpioUser.h"
#include "Components.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_High RTE_GPIO_DIR_OUT | RTE_GPIO_LEVEL_HIGH
#define GpioOut_Low RTE_GPIO_DIR_OUT | RTE_GPIO_LEVEL_LOW #define GpioOut_Low RTE_GPIO_DIR_OUT | RTE_GPIO_LEVEL_LOW
......
Firmware/Source/Application/GUI_Display/GUI_Display.c
View file @ ac942dd8
...@@ -87,7 +87,7 @@ void Gauge_Service(void) ...@@ -87,7 +87,7 @@ void Gauge_Service(void)
} }
else else
{ {
if (Common_GetIgnOnTime() >= 3030) if (Common_GetIgnOnTime() >= CHEAKTIME)
{ {
if(u8VspeedCount < 3) if(u8VspeedCount < 3)
{ {
......
Firmware/Source/Application/SEG_DISPLAY/SEG_DISPLAY.c
View file @ ac942dd8
...@@ -338,7 +338,7 @@ void SEG_SET_Navigation_STS(uint8_t m_Flag, uint8_t m_Code, uint32_t m_Mileage) ...@@ -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; uint32_t Num = 0;
uint8_t m8 = 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_SEG164 = IC_SEG_ON;
IC2_SEG165 = 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) ...@@ -677,12 +677,12 @@ void SEG_SET_Navigation_STS(uint8_t m_Flag, uint8_t m_Code, uint32_t m_Mileage)
break; 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_17_Length2, LED_ON);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_18_Length1, 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_SEG030 = IC_SEG_ON;
IC1_SEG130 = 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) ...@@ -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; Num = m_Mileage / 100000;
} }
if ((ClearODO_Flag == 1) || (Common_GetIgnOnTime() < 3030)) if ((ClearODO_Flag == 1) || (Common_GetIgnOnTime() < CHEAKTIME))
{ {
m8 = SEG_DISPLAY_NUMBER0[Num]; 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) ...@@ -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) if (m_Mileage < 1000)
{ {
Num = m_Mileage / 100; Num = m_Mileage / 100;
if ((ClearODO_Flag == 1) || (Common_GetIgnOnTime() < 3030)) if ((ClearODO_Flag == 1) || (Common_GetIgnOnTime() < CHEAKTIME))
{ {
m8 = SEG_DISPLAY_NUMBER0[Num]; 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) ...@@ -794,7 +794,7 @@ void SEG_SET_Navigation_STS(uint8_t m_Flag, uint8_t m_Code, uint32_t m_Mileage)
else else
{ {
Num = ((m_Mileage + 50) / 100) % 1000 / 100; 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]; 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) ...@@ -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) if (m_Mileage < 1000)
{ {
Num = (m_Mileage / 10) % 10; 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]; m8 = SEG_DISPLAY_NUMBER0[Num];
} }
...@@ -1069,7 +1069,7 @@ void SEG_SET_FuelDial(uint8_t m_Flag, uint8_t m_SEG) ...@@ -1069,7 +1069,7 @@ void SEG_SET_FuelDial(uint8_t m_Flag, uint8_t m_SEG)
IC2_SEG102 = IC_SEG_GREY; IC2_SEG102 = IC_SEG_GREY;
IC2_SEG101 = IC_SEG_GREY; IC2_SEG101 = IC_SEG_GREY;
if (((Get_Fuel_Sensor_State() == FuelSensorOpenCircuit) || (Get_Fuel_Sensor_State() == FuelSensorShortCircuit)) && (ClearODO_Flag != 1) && (Common_GetIgnOnTime() >= 3000)) if (((Get_Fuel_Sensor_State() == FuelSensorOpenCircuit) || (Get_Fuel_Sensor_State() == FuelSensorShortCircuit)) && (ClearODO_Flag != 1) && (Common_GetIgnOnTime() >= CHEAKTIME))
{ {
if (FLASH_SYNC_1Hz) if (FLASH_SYNC_1Hz)
{ {
...@@ -1097,7 +1097,7 @@ void SEG_SET_FuelDial(uint8_t m_Flag, uint8_t m_SEG) ...@@ -1097,7 +1097,7 @@ void SEG_SET_FuelDial(uint8_t m_Flag, uint8_t m_SEG)
else else
{ {
if ((Get_CurFuelSetp() == 0) && (Common_GetIgnOnTime() >= 3030)) if ((Get_CurFuelSetp() == 0) && (Common_GetIgnOnTime() >= CHEAKTIME))
{ {
if (FLASH_SYNC_1Hz) if (FLASH_SYNC_1Hz)
{ {
...@@ -1115,7 +1115,7 @@ void SEG_SET_FuelDial(uint8_t m_Flag, uint8_t m_SEG) ...@@ -1115,7 +1115,7 @@ void SEG_SET_FuelDial(uint8_t m_Flag, uint8_t m_SEG)
IC2_SEG108 = IC_SEG_ON; IC2_SEG108 = IC_SEG_ON;
IC2_SEG100 = 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_SEG108 = IC_SEG_ON;
IC2_SEG100 = 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 ...@@ -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; uint8_t m8;
if (m_Flag == 1u) 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) 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 ...@@ -1400,7 +1400,7 @@ void SEG_SET_CoolantDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_Num, uint8_t
default: default:
break; 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_SEG128 = IC_SEG_OFF;
IC1_SEG125 = 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) ...@@ -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); 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) if (Get_Current_PageType() == Page_Km_Unit)
{ {
...@@ -1847,7 +1847,7 @@ void SEG_SET_Voltage_NUM(uint8_t m_Flag, uint16_t m_NUM) ...@@ -1847,7 +1847,7 @@ void SEG_SET_Voltage_NUM(uint8_t m_Flag, uint16_t m_NUM)
{ {
IC1_SEG079 = IC_SEG_ON; IC1_SEG079 = IC_SEG_ON;
IC1_SEG086 = 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; IC1_SEG088 = IC_SEG_ON;
...@@ -1876,7 +1876,7 @@ void SEG_SET_Voltage_NUM(uint8_t m_Flag, uint16_t m_NUM) ...@@ -1876,7 +1876,7 @@ void SEG_SET_Voltage_NUM(uint8_t m_Flag, uint16_t m_NUM)
else else
{ {
Num = m_NUM / 100; Num = m_NUM / 100;
if ((ClearODO_Flag == 1) || (Common_GetIgnOnTime() <= 3030)) if ((ClearODO_Flag == 1) || (Common_GetIgnOnTime() <= CHEAKTIME))
{ {
m8 = SEG_DISPLAY_NUMBER0[Num]; 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 ...@@ -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_SEG142 = IC_SEG_ON;
IC2_SEG122 = 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) //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 ...@@ -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; uint8_t m8;
RTE_GPIO_Set_Level(ODO_TenThousand, 1); RTE_GPIO_Set_Level(ODO_TenThousand, 1);
RTE_GPIO_Set_Level(ODO_Thousand, 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))) 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 ...@@ -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); 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) if (m_NUM_ODO > 99999)
{ {
...@@ -4538,7 +4538,7 @@ void Checkself_SEG_Display(void) ...@@ -4538,7 +4538,7 @@ void Checkself_SEG_Display(void)
uint32_t ODO = 0; uint32_t ODO = 0;
uint32_t Mileage = 0; uint32_t Mileage = 0;
if (Common_GetIgnOnTime() >= 30) if (Common_GetIgnOnTime() >= 200)
{ {
if (Checkself_SEG_step_count < 60) if (Checkself_SEG_step_count < 60)
{ {
......
Firmware/Source/Component/Components.h
View file @ ac942dd8
#ifndef COMPONENTS_H__ #ifndef COMPONENTS_H__
#define COMPONENTS_H__ #define COMPONENTS_H__
#define CHEAKTIME 3030
#include "Simulated_IIC_master\Simulated_IIC_master.h" #include "Simulated_IIC_master\Simulated_IIC_master.h"
#include "Flash_synchronizer\Flash_synchronizer.h" #include "Flash_synchronizer\Flash_synchronizer.h"
#include "GenDelay\GenDelay.h" #include "GenDelay\GenDelay.h"
......
Firmware/Source/Component/Key/Key_user.c
View file @ ac942dd8
...@@ -29,14 +29,14 @@ void Key_Operation_Left(Key_Event_en_t enKeyEvent)//Mode ...@@ -29,14 +29,14 @@ void Key_Operation_Left(Key_Event_en_t enKeyEvent)//Mode
switch (enKeyEvent) switch (enKeyEvent)
{ {
case KEY_EVENT_SHORT_PRESS_1://1s case KEY_EVENT_SHORT_PRESS_1://1s
if (Common_GetIgnOnTime() >= 3030) if (Common_GetIgnOnTime() >= CHEAKTIME)
{ {
Key_Left_Short_Press(); Key_Left_Short_Press();
} }
Key_Clear_Time(); Key_Clear_Time();
break; break;
case KEY_EVENT_SHORT_PRESS_2://3-5s case KEY_EVENT_SHORT_PRESS_2://3-5s
if (Common_GetIgnOnTime() >= 3030) if (Common_GetIgnOnTime() >= CHEAKTIME)
{ {
Key_Left_Long_Press(); Key_Left_Long_Press();
TYW_RESET_ODO(); TYW_RESET_ODO();
...@@ -51,7 +51,7 @@ void Key_Operation_Left(Key_Event_en_t enKeyEvent)//Mode ...@@ -51,7 +51,7 @@ void Key_Operation_Left(Key_Event_en_t enKeyEvent)//Mode
case KEY_EVENT_LONG_PRESS_3: //9s case KEY_EVENT_LONG_PRESS_3: //9s
break; break;
case KEY_EVENT_LONG_PRESS_4: //10s case KEY_EVENT_LONG_PRESS_4: //10s
if (Common_GetIgnOnTime() >= 3030) if (Common_GetIgnOnTime() >= CHEAKTIME)
{ {
Maintain_Reset_Service(); Maintain_Reset_Service();
......
Firmware/Source/Component/Line_In/Line_In_user.c
View file @ ac942dd8
...@@ -10,7 +10,7 @@ const Line_In_Attribute_st g_stLineInAttribute[LINE_IN_MAX] = ...@@ -10,7 +10,7 @@ const Line_In_Attribute_st g_stLineInAttribute[LINE_IN_MAX] =
{LEVEL_LOW, LEVEL_HIGH, LINE_IN_IG_ON, 20U, 20U, Get_LINE_IN_TurnRight, }, {LEVEL_LOW, LEVEL_HIGH, LINE_IN_IG_ON, 20U, 20U, Get_LINE_IN_TurnRight, },
{LEVEL_HIGH, LEVEL_LOW, LINE_IN_IG_ON, 40U, 20U, Get_LINE_IN_HighBeam, }, {LEVEL_HIGH, LEVEL_LOW, LINE_IN_IG_ON, 40U, 20U, Get_LINE_IN_HighBeam, },
{LEVEL_HIGH, LEVEL_LOW, LINE_IN_IG_ON, 120U, 20U, Get_LINE_IN_FAULT_ELECTROSPRAY, }, {LEVEL_HIGH, LEVEL_LOW, LINE_IN_IG_ON, 120U, 20U, Get_LINE_IN_FAULT_ELECTROSPRAY, },
{LEVEL_HIGH, LEVEL_LOW, LINE_IN_IG_ON, 170U, 20U, Get_LINE_IN_Fault_ABS, }, {LEVEL_HIGH, LEVEL_LOW, LINE_IN_IG_ON, 130U, 20U, Get_LINE_IN_Fault_ABS, },
{LEVEL_HIGH, LEVEL_LOW, LINE_IN_IG_ON, 500U, 20U, Get_LINE_IN_Oil_Pressure, }, {LEVEL_HIGH, LEVEL_LOW, LINE_IN_IG_ON, 500U, 20U, Get_LINE_IN_Oil_Pressure, },
{LEVEL_HIGH, LEVEL_LOW, LINE_IN_IG_ON, 140U, 20U, Get_LINE_IN_Auto_Start_Stop, }, {LEVEL_HIGH, LEVEL_LOW, LINE_IN_IG_ON, 140U, 20U, Get_LINE_IN_Auto_Start_Stop, },
{LEVEL_LOW, LEVEL_HIGH, LINE_IN_IG_ON, 500U, 500U, Get_LINE_IN_Little_Lamp, }, {LEVEL_LOW, LEVEL_HIGH, LINE_IN_IG_ON, 500U, 500U, Get_LINE_IN_Little_Lamp, },
......
Firmware/Source/Component/Mileage/Services_Mileage_User.c
View file @ ac942dd8
...@@ -40,7 +40,7 @@ void Data_User_Mileage_KL30Init(void) ...@@ -40,7 +40,7 @@ void Data_User_Mileage_KL30Init(void)
{ {
MileInit.Mileage = TempBuf[0]; MileInit.Mileage = TempBuf[0];
} }
Func.Get_Sys_IG_Sts = Common_Get_IG_Sts; Func.Get_Sys_IG_Sts = Common_Get_IG_Sts;
Func.Get_Act_V_Speed_Valid = Common_Get_Act_V_Speed_Valid; Func.Get_Act_V_Speed_Valid = Common_Get_Act_V_Speed_Valid;
Func.Get_Act_V_Speed = Common_Get_Act_V_Speed_ODO; Func.Get_Act_V_Speed = Common_Get_Act_V_Speed_ODO;
Func.Get_TireSize = (void *)0; Func.Get_TireSize = (void *)0;
...@@ -64,7 +64,7 @@ void Data_User_Mileage_KL30Init(void) ...@@ -64,7 +64,7 @@ void Data_User_Mileage_KL30Init(void)
{ {
ODOInit.Offset = TempBuf[1]; ODOInit.Offset = TempBuf[1];
} }
ODOInit.MaxValue = 3218672;//英里199999 ODOInit.MaxValue = 3219999;//英里199999
Data_ODO_KL30_Init(DataODOBuf, &ODOInit, Func.EEPromWrite_Cbk); Data_ODO_KL30_Init(DataODOBuf, &ODOInit, Func.EEPromWrite_Cbk);
(void)Data_User_EEPROM_Read(EM_TRIP_BLOCK, TempBuf + 3, 2); (void)Data_User_EEPROM_Read(EM_TRIP_BLOCK, TempBuf + 3, 2);
...@@ -319,9 +319,9 @@ uint32_t Get_ODO_Value(void) ...@@ -319,9 +319,9 @@ uint32_t Get_ODO_Value(void)
{ {
ODO = Data_ODO_Read(); ODO = Data_ODO_Read();
} }
if(ODO >= 199999) if(ODO >= 1999999)
{ {
ODO = 199999; ODO = 1999999;
} }
return ODO; return ODO;
} }
......
Firmware/Source/Component/Telltales/Telltales_user.c
View file @ ac942dd8
...@@ -51,21 +51,21 @@ __align(4) ...@@ -51,21 +51,21 @@ __align(4)
const LED_Attribute_st LED_Attribute [ LED_Max ] = { 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_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, 3030ul, LED_FAULT_ELECTROSPRAY_Judgement, LED_FAULT_ELECTROSPRAY_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, 3030ul, LED_ABS_Judgement, LED_ABS_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, 3030ul, LED_Oil_Pressure_Judgement, LED_Oil_Pressure_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, 3030ul, LED_Fuel_Judgement, LED_Fuel_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, 3030ul, LED_Coolant_Judgement, LED_Coolant_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, 3030ul, LED_Bluetooth_Judgement, LED_Bluetooth_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, 3030ul, LED_TCS_Judgement, LED_TCS_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, 3030ul, LED_Auto_Start_Judgement, LED_Auto_Start_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, 0u, 3000ul, LED_Keys_Judgement, LED_Keys_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, 3030ul, LED_Maintain_Judgement, LED_Maintain_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, 3030ul, LED_Low_Batt_Judgement, LED_Low_Batt_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, 3030ul, LED_Lateral_Strut_Judgement, LED_Lateral_Strut_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) #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 #endif
//{em_LED_Navigator, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Navigato_Judgement, LED_Navigato_Execution}, //{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) ...@@ -227,7 +227,7 @@ static void LED_Oil_Pressure_Execution(Tellib_uint16_t led_status)
static Tellib_uint16_t LED_Fuel_Judgement(void) static Tellib_uint16_t LED_Fuel_Judgement(void)
{ {
Tellib_uint16_t LED_STATE = 0u; Tellib_uint16_t LED_STATE = 0u;
if (Common_GetIgnOnTime() >= 3030) if (Common_GetIgnOnTime() >= CHEAKTIME)
{ {
if(Get_Fuel_Sensor_State() == FuelSensorNormal) if(Get_Fuel_Sensor_State() == FuelSensorNormal)
{ {
...@@ -763,7 +763,7 @@ void Turn_Left_Right_Lamp(void) ...@@ -763,7 +763,7 @@ void Turn_Left_Right_Lamp(void)
{ {
if ( Common_Get_IG_Sts( ) == COMMON_POWER_ON ) 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)) if (Line_In_Get_Status(LINE_IN_TurnLeft))
{ {
......
Firmware/Source/Device/Cmsemicon/BAT32A239/Library/Driver/src/adc.c
View file @ ac942dd8
...@@ -121,7 +121,7 @@ uint16_t ADC_Converse_Scan(ADC_Channel_t ch, uint32_t times, uint16_t *buf) ...@@ -121,7 +121,7 @@ uint16_t ADC_Converse_Scan(ADC_Channel_t ch, uint32_t times, uint16_t *buf)
uint32_t i,j; uint32_t i,j;
volatile uint8_t flag; volatile uint8_t flag;
uint32_t total = 0; uint32_t total = 0;
uint16_t *buff = buf;
if(times == 0) if(times == 0)
{ {
return 0; return 0;
...@@ -149,7 +149,7 @@ uint16_t ADC_Converse_Scan(ADC_Channel_t ch, uint32_t times, uint16_t *buf) ...@@ -149,7 +149,7 @@ uint16_t ADC_Converse_Scan(ADC_Channel_t ch, uint32_t times, uint16_t *buf)
while(INTC_GetPendingIRQ(ADC_IRQn) == 0); while(INTC_GetPendingIRQ(ADC_IRQn) == 0);
INTC_ClearPendingIRQ(ADC_IRQn); // clear INTAD interrupt flag INTC_ClearPendingIRQ(ADC_IRQn); // clear INTAD interrupt flag
*buf++ = ADC->ADCR; *buff++ = ADC->ADCR;
total += ADC->ADCR; total += ADC->ADCR;
......
Firmware/Source/Device/Cmsemicon/BAT32A239/Library/Driver/src/can.c
View file @ ac942dd8
...@@ -735,10 +735,10 @@ uint8_t CAN_Transmit(CANMSG_Type *CANxMSGy, CanTxRxMsg* TxMessage) ...@@ -735,10 +735,10 @@ uint8_t CAN_Transmit(CANMSG_Type *CANxMSGy, CanTxRxMsg* TxMessage)
CANxMSGy->CMCTRL = CAN_MCTRL_CLR_RDY; CANxMSGy->CMCTRL = CAN_MCTRL_CLR_RDY;
/* Wait the operate complete */ /* Wait the operate complete */
while (((CANxMSGy->CMCTRL & CAN_MCTRL_RDY_MASK) != 0x00) && (timeout != 0)) //while (((CANxMSGy->CMCTRL & CAN_MCTRL_RDY_MASK) != 0x00) && (timeout != 0))
{ //{
timeout--; // timeout--;
} //}
} }
/* check RDY clear is or not success */ /* check RDY clear is or not success */
......
Firmware/Source/System/Sys_Task_List.c
View file @ ac942dd8
...@@ -43,7 +43,7 @@ void Sys_5ms_Tasks(void) ...@@ -43,7 +43,7 @@ void Sys_5ms_Tasks(void)
void Sys_10ms_Tasks(void) void Sys_10ms_Tasks(void)
{ {
Line_In_Debounce_Service(10u); Line_In_Debounce_Service(10u);
if(Common_GetIgnOnTime() >= 3030) if(Common_GetIgnOnTime() >= CHEAKTIME)
{ {
Key_Service(); Key_Service();
} }
...@@ -137,7 +137,7 @@ void Sys_Exact_50us_Tasks(void) ...@@ -137,7 +137,7 @@ void Sys_Exact_50us_Tasks(void)
task_100ms++; task_100ms++;
if(task_100ms >= 1996) if(task_100ms >= 1996)
{ {
task_100ms = 0u; task_100ms = 0u;
if(Get_MileageInit_Status() == 0X5AA53AA3UL) if(Get_MileageInit_Status() == 0X5AA53AA3UL)
{ {
Data_Mileage_ISR(); Data_Mileage_ISR();
......
Firmware/Source/UDS/UDS_ISO14229_Services.h
View file @ ac942dd8
...@@ -312,13 +312,13 @@ ...@@ -312,13 +312,13 @@
#define CheckSumErr 7 // Checksum Error #define CheckSumErr 7 // Checksum Error
#define UnknownPartID 8 // Unknown Part ID #define UnknownPartID 8 // Unknown Part ID
#define SWV 0x127 // 0x100 = 1.00 software version 软件版本号 #define SWV 0x128 // 0x100 = 1.00 software version 软件版本号
#define HWV 0x103 // 0x100 = 1.00 hardware version 硬件版本号 #define HWV 0x103 // 0x100 = 1.00 hardware version 硬件版本号
#define BTV 0x100 // 0x100 = 1.00 bootloader version boot程序版本号 #define BTV 0x100 // 0x100 = 1.00 bootloader version boot程序版本号
#define INTLV 0x127 // 0x100 = 1.00 internal version 内部版本号 #define INTLV 0x128 // 0x100 = 1.00 internal version 内部版本号
#define PROG_Y 0x24 // 0x24 = 2024年, program year #define PROG_Y 0x24 // 0x24 = 2024年, program year
#define PROG_M 0x11 // 0x03 = 3月, program month #define PROG_M 0x11 // 0x03 = 3月, program month
#define PROG_D 0x07 // 0x19 = 19日, program day #define PROG_D 0x26 // 0x19 = 19日, program day
/****************************************************************************** /******************************************************************************
Bootloader Variable Bootloader Variable
......
Firmware/utility/程序释放/20241126/TianYing.hex 0 → 100644
View file @ ac942dd8
This diff is collapsed.
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