Skip to content

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

Merge branch 'CHENJIALE' into 'dev' 

Chenjiale

See merge request !60
parents 4dc403ba 446f8adb
Expand all Show whitespace changes
Inline Side-by-side
Showing with 28 additions and 24 deletions
Firmware/Source/Application/CAN_User/Can_App.c
View file @ dbc36701
......@@ -110,7 +110,7 @@ void Can_Set_Buff_450(canlib_uint8_t CopyData[])
{
p450->Msg [ i ] = 0x0u;
}
if(MenuData.TPMS_Front_Learn == 0)
if(MenuData.TPMS_Front_Learn != 2)
{
p450 -> Sig.Front_Pressure_TX_H = 0;
p450 -> Sig.Front_Pressure_TX_L = 0;
......@@ -120,7 +120,7 @@ void Can_Set_Buff_450(canlib_uint8_t CopyData[])
p450 -> Sig.Front_Pressure_TX_H = ((Get_Front_TPMS_TX() + 146) >> 8) & 0xFF;
p450 -> Sig.Front_Pressure_TX_L = (Get_Front_TPMS_TX() + 146) & 0xFF;
}
if(MenuData.TPMS_Rear_Learn == 0)
if(MenuData.TPMS_Rear_Learn != 2)
{
p450 -> Sig.Rear_Pressure_TX_H = 0;
p450 -> Sig.Rear_Pressure_TX_L = 0;
......
Firmware/Source/Application/Data_Coolant/Data_Coolant.c
View file @ dbc36701
......@@ -40,10 +40,10 @@ void Data_Coolant_Temp_KL15_Init ( void )
void Data_Coolant_Temp_Processing_Service ( void )
{
uint16_t Coolant_Temperature;
uint8_t Coolant_Temperature_State;
uint32_t Temp;
uint8_t i;
uint16_t Coolant_Temperature = 0;
uint8_t Coolant_Temperature_State = 0;
uint32_t Temp = 0;
uint8_t i = 0;
Coolant_Temperature = Get_CAN_CH0_ID_101_Sig_ECU_Engine_Temperature();
Coolant_Temperature_State = Get_CAN_CH0_ID_101_Sig_ECU_Engine_Temperature_State();
......@@ -155,6 +155,10 @@ void Data_Coolant_Temp_Display ( void )
DataCoolantTemp_Dis.u8_UpFlashtimer = DataCoolantTemp_Dis.u8_Uptimer;
DataCoolantTemp_Dis.u8_DownFlashtimer = DataCoolantTemp_Dis.u8_Downtimer;
}
else
{
;
}
}
}
......@@ -221,7 +225,7 @@ void Data_Coolant_Temp_Display ( void )
void Get_Coolant_Temp_Seg(uint16_t Temp_Value)
{
uint8_t TempSeg;
uint8_t CurTempSeg;
//uint8_t CurTempSeg;
if(Temp_Value < 50)
{
......
Firmware/Source/Application/Fuel/Data_Fuel.c
View file @ dbc36701
......@@ -6,7 +6,7 @@
#define FUEL_CAL_START 15u /*数据排序后取中间部分计算平均：起始*/
#define FUEL_CAL_END 25u /*数据排序后取中间部分计算平均：结束*/
#define RETURN_DIFFERENCE 15u /*判断上升或下降的回差，精度0.1*/
#define RETURN_DIFFERENCE 10u /*判断上升或下降的回差，精度0.1*/
#define FUEL_SEG_UP 0u
#define FUEL_SEG_DOWN 1u
......@@ -62,8 +62,8 @@ uint16_t TestFuelR = 1100u;
void Fuel_R_Cal(uint8_t deltaTime)
{
uint16_t FuelRes = 0;
uint8_t i, j;
uint32_t temp32;
uint8_t i = 0, j = 0;
uint32_t temp32 = 0;
static uint16_t timeCount = 0;
......@@ -148,7 +148,7 @@ void Fuel_State_Check(uint8_t deltaTime)
{ /*断路 320*/
FuelSensorShortTime = 0;
FuelSensorNormalTime = 0;
if ((FuelSensorOpenTime > 2800) || ((FuelStateInitFlag) && (FuelSensorOpenTime <= 2800)))
if ((FuelSensorOpenTime > 3000) || ((FuelStateInitFlag) && (FuelSensorOpenTime <= 3000)))
{
FuelSensorState = FuelSensorOpenCircuit;
DesFuelSetp = 0;
......@@ -236,22 +236,22 @@ void Fuel_Gauges_Cal(uint8_t deltaTime)
{
DesFuelSetp = 3;
}
else if (((DesFuelSetp == 1) || FuelInitFlag) && (FuelR < 710))
else if (((DesFuelSetp == 1) || FuelInitFlag) && (FuelR < 700))
{
DesFuelSetp = 2;
}
else if (((DesFuelSetp == 0) || FuelInitFlag) && (FuelR < 910))
else if (((DesFuelSetp == 0) || FuelInitFlag) && (FuelR < 900))
{
DesFuelSetp = 1;
}
}
else if (FuelDir == FUEL_SEG_DOWN)
{
if (((DesFuelSetp == 1) || FuelInitFlag) && (FuelR >= 910))
if (((DesFuelSetp == 1) || FuelInitFlag) && (FuelR >= 900))
{
DesFuelSetp = 0;
}
else if (((DesFuelSetp == 2) || FuelInitFlag) && (FuelR >= 710))
else if (((DesFuelSetp == 2) || FuelInitFlag) && (FuelR >= 700))
{
DesFuelSetp = 1;
}
......
Firmware/Source/Application/GPIO_USER/GpioUser.h
View file @ dbc36701
......@@ -46,8 +46,8 @@
#define SEG2_SCL RTE_GPIO_PORT07_PIN00
#define SEG2_CSB RTE_GPIO_PORT07_PIN01
#define SEG2_SD RTE_GPIO_PORT07_PIN02
#define Auto_StartStop_IN RTE_GPIO_PORT07_PIN03
#define Low_Batt_Vol_IN RTE_GPIO_PORT07_PIN04
#define Low_Batt_Vol_IN RTE_GPIO_PORT07_PIN03
#define Auto_StartStop_IN RTE_GPIO_PORT07_PIN04
#define Fault_Diagnosis_IN RTE_GPIO_PORT07_PIN05
#define Oil_Pressure_IN RTE_GPIO_PORT07_PIN06
#define Fault_ABS_IN RTE_GPIO_PORT07_PIN07
......
Firmware/Source/Device/Cmsemicon/BAT32A239/RTE/RTC/RTE_RTC.c
View file @ dbc36701
......@@ -161,7 +161,7 @@ void RTE_RTC_Init(RTC_Information_st_t g_stRTCInformation)
RTC_InitStructure.RTC_1HZ_Output = DISABLE; //RTC1HZ diable output
RTC_Init(&RTC_InitStructure);
RTC->SUBCUD = 0x1A;
RTC->SUBCUD = 0x1D;
ISR_Register(RTC_IRQn, rtc_interrupt); //RTC????��????��??��??��
......
Firmware/Source/UDS/UDS_ISO14229_Services.h
View file @ dbc36701
......@@ -314,10 +314,10 @@
#define SWV 0x100 // 0x100 = 1.00 software version 软件版本号
#define HWV 0x101 // 0x100 = 1.00 hardware version 硬件版本号
#define BTV 0x100 // 0x100 = 1.00 bootloader version boot程序版本号
#define INTLV 0x110 // 0x100 = 1.00 internal version 内部版本号
#define INTLV 0x111 // 0x100 = 1.00 internal version 内部版本号
#define PROG_Y 0x24 // 0x24 = 2024年, program year
#define PROG_M 0x07 // 0x03 = 3月, program month
#define PROG_D 0x31 // 0x19 = 19日, program day
#define PROG_M 0x08 // 0x03 = 3月, program month
#define PROG_D 0x03 // 0x19 = 19日, program day
/******************************************************************************
Bootloader Variable
......
Firmware/utility/程序释放/20240731/TianYing.hex 0 → 100644
View file @ dbc36701
This diff is collapsed.
Firmware/utility/程序释放/20240803/TianYing.hex 0 → 100644
View file @ dbc36701
This diff is collapsed.
Firmware/utility/诊断工具/Option/Option.properties
View file @ dbc36701
#new Option
#Wed Jul 24 09:13:14 CST 2024
#Sat Aug 03 16:25:18 CST 2024
IsSort=true
MergeFlashIsCompression=false
ChangeAppFilePath=
......@@ -56,8 +56,8 @@ IsHexDisplay=true
MergeLineInXLSPath=
MergeFlashInPutFilePath=
MergeFlashIsInternal=false
MergeOutPutFilePath=D\:\\git\\tianying_ty100
MergeAppFilePath=D\:\\git\\tianying_ty100\\TianYing.hex
MergeOutPutFilePath=D\:\\git\\tianying_ty100\\Firmware\\utility\\\u7A0B\u5E8F\u91CA\u653E\\20240803
MergeAppFilePath=D\:\\git\\tianying_ty100\\Firmware\\utility\\\u7A0B\u5E8F\u91CA\u653E\\20240803\\TianYing.hex
MergeTelltalesXLSPath=
FillingByte=-86
ImageVersion=0
......
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