Skip to content

V
VC66_7C
Commit fe6c93ad authored by hu's avatar hu
Browse files
Options

调整EEPbug

parent 64bf146d
withBoot_Test Buzzer_Test PopupTest development developmentEn menutest withBoot withBoot_ENCN
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 99 deletions
source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c
View file @ fe6c93ad
......@@ -405,6 +405,10 @@ void Can_Set_Buff_18FF2A17(uint8_t CopyData[])
uint8_t Range_Air_Cut_Warning = 0u;
uint8_t IRIS_Warning_Lamp_Status = 0u;
uint8_t Temperature = 0u;
uint16_t E_Speed = 0u;
E_Speed = Common_Get_Act_E_Speed(); /*转速*/
/*手刹状态*/
if (Line_In_Get_Status(LINE_IN_PARK_BRAKE) == 1u)
{
......@@ -459,9 +463,37 @@ void Can_Set_Buff_18FF2A17(uint8_t CopyData[])
Meter_Malfunction = 0u;
SRS_Input = 0u;
SW_Rear_Body_Warning = 0u;
SW_Sheetbelt = 0u;
SW_Oil_Pressure = 0u;
SW_Coolant_Level = 0u;
/*安全带外发报文*/
if (Line_In_Get_Status(LINE_IN_SEAT_BELT) == 1)
{
SW_Sheetbelt = 1u;
}
else
{
SW_Sheetbelt = 0u;
}
/*油压外发报文*/
if ((Line_In_Get_Status(LINE_IN_ENG_OIL) == 1) && (E_Speed >= 350u))
{
SW_Oil_Pressure = 1u;
}
else
{
SW_Oil_Pressure = 0u;
}
/*冷却水不足外发报文*/
if (CD4051_COM5_X4_IN == 0)
{
SW_Coolant_Level = 1u;
}
else
{
SW_Coolant_Level = 0u;
}
SW_Water_Separator = 0u;
SW_Clutch = 0u;
SW_Air_Low_Pressure = 0u;
......@@ -476,7 +508,17 @@ void Can_Set_Buff_18FF2A17(uint8_t CopyData[])
EBS_Warning_Red = 0u;
EBS_Warning_Yellow = 0u;
ESC_Operating = 0u;
Air_Sus_Warning = 0u;
/*AIR SUS灯外发*/
if (Line_In_Get_Status(LINE_IN_AIR_SUS) == 1)
{
Air_Sus_Warning = 1u;
}
else
{
Air_Sus_Warning = 0u;
}
Roll_Warning = 0u;
ROWS_Warning = 0u;
Mult_Indication = 0u;
......
source/Application/K_BUS/kwp2000_service.c
View file @ fe6c93ad
......@@ -14,7 +14,7 @@
* structure
*********************************************************************
*/
#define TEST_TYPE 0
/*
*********************************************************************
* variable
......@@ -31,9 +31,6 @@ unsigned char Recvseed3;
unsigned char Recvseed4;
unsigned char Seed1, Seed2, Seed3, Seed4;
unsigned char DTCstatusCHGFFK_Line = 0u;
unsigned char AccessMode2701KeyTimeFlag;
unsigned char AccessMode2701KeyTime;
......@@ -49,6 +46,7 @@ _K_LINE_SIGNAL_FLAG K_LINE_SIGNAL_FLAG;
#pragma ghs section bss=".myNonInitArea"
unsigned long SeedKey = 0;
unsigned long EOLSeedRandomNumber = 0x727u;
unsigned char DTCstatusCHGFFK_Line = 0u;
#pragma ghs section bss=default
/*
*********************************************************************
......@@ -1453,7 +1451,6 @@ void Common_Set_DTCstatusCHGFFK_Flag(unsigned char Val)
* Return : None
* onther :
--------------------------------------------------------------------------*/
#if TEST_TYPE == 0
void K_LINE_EOL_InitVal(void)
{
K_Line_Set.Flag = 0x7AA7A55Au;
......@@ -1533,86 +1530,4 @@ void K_LINE_EOL_InitVal(void)
K_Line_Set.TesterECUCAN = 0x00u; /* 20 */
K_Line_Set.User_Light1 = 10u; /*背光亮度等级*/
K_Line_Set.User_Light2 = 10u; /*背光亮度等级*/
}
#else
void K_LINE_EOL_InitVal(void)
{
K_Line_Set.Flag = 0x7AA7A55Bu;
K_Line_Set.K_Line_LID20 = 0x00u; /* 00 应对ECE R13 //0：非应对、1：应对 */
K_Line_Set.K_Line_LID21 = 0x01u; /* 00 EBS/ABS //0：无、1：EBS、2：ABS(CAN应对) 3：ABS (CAN非应对) */
K_Line_Set.K_Line_LID22 = 0x01u; /* 00 EVSC //0：无、1：有 */
K_Line_Set.K_Line_LID23 = 0x00u; /* 00 驻车锁定 //0：无、1：有 */
K_Line_Set.K_Line_LID24 = 0x00u; /* 00 HSA //0：无、1：有 */
K_Line_Set.K_Line_LID25 = 0x00u; /* 00 AEBS //0：无、1：有 */
K_Line_Set.K_Line_LID26 = 0x00u; /* 00 ACC //0：无、1：有 */
K_Line_Set.K_Line_LID27 = 0x01u; /* 00 LDWS //0：无、1：有 */
K_Line_Set.K_Line_LID28 = 0x01u; /* 01 车辆间报警 //0：无、1：有 */
K_Line_Set.K_Line_LID29 = 0x01u; /* 01 有无巡航 //0：无、1：有 /*初值1*/
K_Line_Set.K_Line_LID2A = 0x01u; /* 00 气悬 //0：Reef、1：Rear air、2：Full air */
K_Line_Set.K_Line_LID2B = 0x00u; /* 00 ISS //0：无、1： eco stop、 2：Idle Stop */
K_Line_Set.K_Line_LID2C = 0x01u; /* 00 装货台工作警报蜂鸣 //0：无、1：有 */
K_Line_Set.K_Line_LID2D = 0x00u; /* 00 ROWS //0：无、1：ROWS有、2LOCAL警报有 */
K_Line_Set.K_Line_LID2E = 0x00u; /* 00 行车记录仪 //0：模拟记录仪、１：数字记录仪或行车记录仪 */
K_Line_Set.K_Line_LID2F = 0x00u; /* 00 车型 //0：单车、1：拖车、2：全拖车 */
K_Line_Set.K_Line_LID30 = 0x00u; /* 00 缓速器 //0：无、1：有(C&E)、2：有(F) */
K_Line_Set.K_Line_LID31 = 0x01u; /* -- 定速巡航 //0：无、1：有 */
K_Line_Set.K_Line_LID32 = 0x00u; /* 00 装货台种类 //0：一般、1：侧翼、2：倾倒 */
K_Line_Set.K_Line_LID33 = 0x00u; /* 01 SCR?DPD //0：SCR无/DPD有、1：SCR有/DPD有、2：SCR无/DPD无、3：SCR有/DPD无 /*初值1*/
K_Line_Set.K_Line_LID34 = 0x00u; /* 00 驻车种类 //0：FULL AIR、1：AOH /*初值1*/
K_Line_Set.K_Line_LID35 = 0x00u; /* -- 气压计 //0：2针式、1：1针式 */
K_Line_Set.K_Line_LID36 = 0x00u; /* -- 低压警报压 //0：一般输出（539kPa）、1：ADR（588kPa） */
K_Line_Set.K_Line_LID37 = 0x01u; /* -- 超限警报 //0：无、1：有 */
K_Line_Set.K_Line_LID38 = 0x01u; /* -- 速度警报 //0：无、1：有 */
K_Line_Set.K_Line_LID39 = 0x01u; /* 00 可变SLD //0：无、1：1车速、2：2车速 /*初值1*/
K_Line_Set.K_Line_LID3A = 0x00u; /* -- OEM //0：ISZ、1：UDT */
K_Line_Set.K_Line_LID3B = 0x00u; /* -- 预留 */
K_Line_Set.K_Line_LID3C = 0x00u; /* -- 预留 */
K_Line_Set.K_Line_LID3D = 0x00u; /* -- 预留 */
K_Line_Set.K_Line_LID3E = 0x01u; /* 01 胎压匹配功能 //0：胎压功能未匹配 1：匹配 */
K_Line_Set.K_Line_LID3F = 0x00u; /* -- 预留 */
K_Line_Set.K_Line_LID40 = 0x00u; /* 00 发动机种类 */
K_Line_Set.K_Line_LID41 = 0x13u; /* 50 变速器种类＆控制 /*初值50*/
K_Line_Set.K_Line_LID42 = 0x00u; /* 00 驻车管道 /*初值 0*/
K_Line_Set.K_Line_LID43 = 0x82u; /* 82 车型 /*初值44*/
K_Line_Set.K_Line_LID44 = 0xFFu; /* FF 速度警报 /*初值FF*/
K_Line_Set.K_Line_LID45 = 0xFFu; /* FF 发动机转速 /*初值FF*/
K_Line_Set.K_Line_LID46 = 0xFFu; /* FF 急加速 /*初FF*/
K_Line_Set.K_Line_LID47 = 0xFFu; /* FF 急减速 /*初值FF*/
K_Line_Set.K_Line_LID48 = 0xFFu; /* FF 长时间怠速 /*初值FF*/
K_Line_Set.K_Line_LID49 = 0xFFu; /* FF 辅助驻车 /*初值FF*/
K_Line_Set.K_Line_LID4A = 0x32u; /* 37 变速箱油 55000 */
K_Line_Set.K_Line_LID4B = 0x32u; /* 37 差速器油 55000 */
K_Line_Set.K_Line_LID4C = 0x32u; /* 37 离合器油 55000 */
K_Line_Set.K_Line_LID4D = 0x64u; /* 37 动力转向油 55000 */
K_Line_Set.K_Line_LID4E = 0x3Cu; /* 32 轮胎 50000 */
K_Line_Set.K_Line_LID4F = 0x1Eu; /* 34 机油＆滤清器 22000 */
K_Line_Set.K_Line_LID50 = 0x00u; /* -- 预留 */
K_Line_Set.K_Line_LID51 = 0x01u; /* 01 工作模式 */
K_Line_Set.K_Line_LID52 = 0x00u; /* 00 电子部件设定 */
K_Line_Set.KLINE = 0x00u;
K_Line_Set.No_Digit1 = 0x38u; /* 01 */
K_Line_Set.No_Digit2 = 0x39u; /* 02 */
K_Line_Set.No_Digit3 = 0x38u; /* 03 */
K_Line_Set.No_Digit4 = 0x31u; /* 04 */
K_Line_Set.No_Digit5 = 0x38u; /* 05 */
K_Line_Set.No_Digit6 = 0x30u; /* 06 */
K_Line_Set.No_Digit7 = 0x36u; /* 07 */
K_Line_Set.No_Digit8 = 0x35u; /* 08 */
K_Line_Set.No_Digit9 = 0x33u; /* 09 */
K_Line_Set.No_Digit10 = 0x30u; /* 10 */
K_Line_Set.ECUStatus1 = 0x00u; /* 11 */
K_Line_Set.ECUStatus2 = 0x00u; /* 12 */
K_Line_Set.ECUStatus3 = 0x00u; /* 13 */
K_Line_Set.ECUStatus4 = 0x00u; /* 14 */
K_Line_Set.ECUStatus5 = 0x00u; /* 15 */
K_Line_Set.METERCOUNT = 0x00u; /* 16 */
K_Line_Set.NoOfDTCFF00 = 0x00u; /* 17 */
K_Line_Set.NoOfDTC8000 = 0x00u; /* 18 */
K_Line_Set.TesterECU = 0x00u; /* 19 */
K_Line_Set.TesterECUCAN = 0x00u; /* 20 */
K_Line_Set.User_Light1 = 10u; /*背光亮度等级*/
K_Line_Set.User_Light2 = 10u; /*背光亮度等级*/
}
#endif
\ No newline at end of file
}
\ No newline at end of file
source/Application/RTE/Common_Interface.c
View file @ fe6c93ad
......@@ -872,13 +872,13 @@ void Common_Set_K_Line_Value(void)
{
Common_Set_DTCstatusCHGFFK_Flag(0);
/*存储*/
if (EEPROM_Get_Block_Status (EEPROM_BLOCK_EOL_K_LINE) != EEPROM_STAT_ERROR)
//if (EEPROM_Get_Block_Status (EEPROM_BLOCK_EOL_K_LINE) != EEPROM_STAT_ERROR)
//{
while (EEPROM_Get_Status() == EEPROM_STAT_BUSY)
{
while (EEPROM_Get_Status() == EEPROM_STAT_BUSY)
{
WDT_Clear();
}
enResult = EEPROM_Write_Data(EEPROM_BLOCK_EOL_K_LINE, &K_Line_Set, (sizeof(K_Line_Set) / 4u));
WDT_Clear();
}
enResult = EEPROM_Write_Data(EEPROM_BLOCK_EOL_K_LINE, &K_Line_Set, (sizeof(K_Line_Set) / 4u));
//}
}
}
\ No newline at end of file
source/Driver/Memory/Emulated_EEPROM.c
View file @ fe6c93ad
......@@ -53,7 +53,7 @@ static const EEPROM_Block_st_t g_stEEPROMBlockTable[] =
{0xFF200A80UL, 0xFF200F7FUL, EEPROM_BLOCK7_BUFFER_SIZE, g_u32EEPROMBlock7Buffer,}, /*EEPROM_BLOCK_ODO_STAMP*/
{0xFF200F80UL, 0xFF20377FUL, EEPROM_BLOCK8_BUFFER_SIZE, g_u32EEPROMBlock8Buffer,}, /*EEPROM_BLOCK_TRIP_STAMP*/
{0xFF203780UL, 0xFF2037FFUL, EEPROM_BLOCK9_BUFFER_SIZE, g_u32EEPROMBlock9Buffer,}, /*EEPROM_BLOCK_SERVICE_INFO*/
{0xFF203800UL, 0xFF203940UL, EEPROM_BLOCK10_BUFFER_SIZE, g_u32EEPROMBlock10Buffer,}, /*EEPROM_BLOCK_EOL_K_LINE*/
{0xFF203800UL, 0xFF20397FUL, EEPROM_BLOCK10_BUFFER_SIZE, g_u32EEPROMBlock10Buffer,}, /*EEPROM_BLOCK_EOL_K_LINE*/
};
/****************************************************************************
......
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