Skip to content

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

调整外发

parent b7030a59
Show whitespace changes
Inline Side-by-side
Showing with 23687 additions and 23765 deletions
ghs/project
View file @ fe7244ef
No preview for this file type
ghs/project.hex
View file @ fe7244ef
This source diff could not be displayed because it is too large. You can view the blob instead.
ghs/project.siz
View file @ fe7244ef
project .intvect 1536
project .text 322364
project .text 322892
project .rodata 411103
project .secinfo 120
project .syscall 6
......
source/Application/APP/Data_AirPressure/Data_AirPressure.c
View file @ fe7244ef
......@@ -109,7 +109,7 @@ void Data_Gas1_Processing_Service(void)
if ((Common_Get_IG_Sts_Valid() == 1u) && (Common_Get_IG_Sts() == COMMON_POWER_ON))
{
if ((Gas_Value < 500u) || (Gas_Value > 4250u))
if ((Gas_Value < 250u) || (Gas_Value > 4250u))
{
if (DataStrGas1.LostTimer < 200u)
{
......@@ -195,7 +195,7 @@ void Data_Gas2_Processing_Service(void)
if ((Common_Get_IG_Sts_Valid() == 1u) && (Common_Get_IG_Sts() == COMMON_POWER_ON))
{
if ((Gas_Value < 500u) || (Gas_Value > 4250u))
if ((Gas_Value < 250u) || (Gas_Value > 4250u))
{
if (DataStrGas2.LostTimer < 200u)
{
......@@ -281,7 +281,7 @@ void Data_WET_Processing_Service(void)
if ((Common_Get_IG_Sts_Valid() == 1u) && (Common_Get_IG_Sts() == COMMON_POWER_ON))
{
if ((Gas_Value < 500u) || (Gas_Value > 4250u))
if ((Gas_Value < 500u) || (Gas_Value > 4500u))
{
if (DataStrWET.LostTimer < 200u)
{
......
source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c
View file @ fe7244ef
......@@ -31,7 +31,7 @@ USER_ECU User_ECU;
* Return : None
* onther : None
--------------------------------------------------------------------------*/
void Can_Set_Buff_18FEAE17(uint8_t CopyData [])
void Can_Set_Buff_18FEAE17(uint8_t CopyData[])
{
uint16_t Main_Air_Pressure = 0u; /*0～FA:0～2000 [kPa] FB～FF:Not used 8倍*/
uint16_t Service_Brake_Circuit1_AirPressure = 0u; /*0～FA:0～2000 [kPa] FB～FF:Not used 8倍*/
......@@ -42,28 +42,28 @@ void Can_Set_Buff_18FEAE17(uint8_t CopyData [])
uint8_t SW_ECONO = 0u;
/*WET*/
Main_Air_Pressure = Common_Get_WET_Data() - 500u / 20u;
Main_Air_Pressure = (uint8_t)((Common_Get_WET_Data() - 500u) / 20u);
/*气压状态*/
if ((K_Line_Set.K_Line_LID42 == 0x00u) || (K_Line_Set.K_Line_LID42 == 0x03u))
{
if (Common_Get_Air1_Data() != 0u)
Service_Brake_Circuit1_AirPressure = (uint8_t)((Common_Get_Air1_Data() - 500u) / 20u) ;
Service_Brake_Circuit1_AirPressure = (uint8_t)((Common_Get_Air1_Data() - 500u) / 20u);
else
Service_Brake_Circuit1_AirPressure = 0u ;
Service_Brake_Circuit1_AirPressure = 0u;
if (Common_Get_Air2_Data() != 0u)
Service_Brake_Circuit2_AirPressure = (uint8_t)((Common_Get_Air2_Data() - 500u) / 20u) ;
Service_Brake_Circuit2_AirPressure = (uint8_t)((Common_Get_Air2_Data() - 500u) / 20u);
else
Service_Brake_Circuit2_AirPressure = 0u ;
Service_Brake_Circuit2_AirPressure = 0u;
}
else if ((K_Line_Set.K_Line_LID42 == 0x01u) || (K_Line_Set.K_Line_LID42 == 0x02u))
{
if (Common_Get_Air2_Data() != 0u)
Service_Brake_Circuit1_AirPressure = (uint8_t)((Common_Get_Air2_Data() - 500u) / 20u) ;
Service_Brake_Circuit1_AirPressure = (uint8_t)((Common_Get_Air2_Data() - 500u) / 20u);
else
Service_Brake_Circuit1_AirPressure = 0u;
if (Common_Get_Air1_Data() != 0u)
Service_Brake_Circuit2_AirPressure = (uint8_t)((Common_Get_Air1_Data() - 500u) / 20u) ;
Service_Brake_Circuit2_AirPressure = (uint8_t)((Common_Get_Air1_Data() - 500u) / 20u);
else
Service_Brake_Circuit2_AirPressure = 0u;
}
......@@ -72,7 +72,7 @@ void Can_Set_Buff_18FEAE17(uint8_t CopyData [])
Power_Supply_Voltage = 0u;
/*驻车制动外发*/
if (Line_In_Get_Status(LINE_IN_PARK_BRAKE) == 0)
if (Line_In_Get_Status(LINE_IN_PARK_BRAKE) == 0u)
{
Parking_Brake_Switch = 1u;
}
......@@ -84,452 +84,359 @@ void Can_Set_Buff_18FEAE17(uint8_t CopyData [])
Rader_Stain_Information = 0u;
SW_ECONO = 0u;
CopyData[0] = (uint8_t)(Main_Air_Pressure & 0xFFu) ; /* 1 */
CopyData[1] = 0u ; /* 2 */
CopyData[2] = (uint8_t)(Service_Brake_Circuit1_AirPressure & 0xFFu) ; /* 3 */
CopyData[3] = (uint8_t)(Service_Brake_Circuit2_AirPressure & 0xFFu) ; /* 4 */
CopyData[4] = 0u ; /* 5 */
CopyData[5] = (uint8_t)(Power_Supply_Voltage & 0xFFU) ; /* 6 */
CopyData[6] = (uint8_t)((Power_Supply_Voltage >> 8u) & 0xFFu) ; /* 7 */
CopyData[0] = (uint8_t)(Main_Air_Pressure & 0xFFu); /* 1 */
CopyData[1] = 0u; /* 2 */
CopyData[2] = (uint8_t)(Service_Brake_Circuit1_AirPressure & 0xFFu); /* 3 */
CopyData[3] = (uint8_t)(Service_Brake_Circuit2_AirPressure & 0xFFu); /* 4 */
CopyData[4] = 0u; /* 5 */
CopyData[5] = (uint8_t)(Power_Supply_Voltage & 0xFFU); /* 6 */
CopyData[6] = (uint8_t)((Power_Supply_Voltage >> 8u) & 0xFFu); /* 7 */
CopyData[7] = (uint8_t)(((Parking_Brake_Switch << 6u) & 0xC0u) |
((Rader_Stain_Information << 2u) & 0x0Cu) |
((SW_ECONO) & 0x03u)) ; /* 8 */
(SW_ECONO & 0x03u)); /* 8 */
}
/*-------------------------------------------------------------------------
* Function Name : Can_Set_Buff_18FF3E17
* Description :
* Input : None
* Input : None 18FF3E17
* Output : None
* Return : None
* onther : None
--------------------------------------------------------------------------*/
typedef union
{
uint8_t Data[8] ;
struct
{
uint16_t Pulse_Correction_Facor : 16 ;
uint8_t Not_used0 : 1 ;
uint8_t HID_Auto_Leveling : 1 ;
uint8_t Not_used1 : 1 ;
uint8_t Not_used2 : 1 ;
uint8_t AEBS_ON_OFF_Info : 2 ;
uint8_t Not_used3 : 1 ;
uint8_t SW_PTO : 1 ;
uint8_t Not_used4 : 7 ;
uint8_t MIL_Lamp_Status : 1 ;
uint8_t Fuel_Gauges_AD_Value : 8 ;
uint8_t Not_used5 : 8 ;
uint8_t Not_used6 : 8 ;
uint8_t DstWarnVolume_Set : 3 ;
uint8_t Not_used7 : 1 ;
uint8_t Not_used8 : 1 ;
uint8_t TURN_L_Lamp_Status : 1 ;
uint8_t Not_used9 : 1 ;
uint8_t Not_used10 : 1 ;
} bit;
} _Msg18FF3E17Map;
void Can_Set_Buff_18FF3E17(uint8_t CopyData [])
void Can_Set_Buff_18FF3E17(uint8_t CopyData[])
{
uint8_t i ;
_Msg18FF3E17Map MsgMap ;
for (i = 0 ; i < 8 ; i ++)
{
MsgMap.Data[ i ] = 0xff ;
}
for (i = 0 ; i < 8 ; i ++)
{
CopyData[ i ] = MsgMap.Data[ i ] ;
}
uint32_t Pulse_Correction_Facor = 0u;
uint8_t SW_PTO = 0u;
uint8_t AEBS_ON_OFF_Info = 0u;
uint8_t HID_Auto_Leveling = 0u;
uint8_t MIL_Lamp_Status = 0u;
uint16_t Fuel_Gauges_AD_Value = 0u;
uint8_t TURN_L_Lamp_Status = 0u;
uint8_t DstWarnVolume_Set = 0u;
CopyData[0] = (uint8_t)((Pulse_Correction_Facor) & 0xFFu); /* 1 */
CopyData[1] = (uint8_t)((Pulse_Correction_Facor >> 8u) & 0xFFu); /* 2 */
CopyData[2] = (uint8_t)(((SW_PTO << 7u) & 0x80u) |
((AEBS_ON_OFF_Info << 4u) & 0x30u) |
((HID_Auto_Leveling << 1u) & 0x02u)); /* 3 */
CopyData[3] = (uint8_t)(((MIL_Lamp_Status << 7u) & 0x80u) | 0x7Fu); /* 4 */
CopyData[4] = (uint8_t)(Fuel_Gauges_AD_Value & 0xFFu); /* 5 */
CopyData[5] = 0u; /* 6 */
CopyData[6] = 0u; /* 7 */
CopyData[7] = (uint8_t)(((TURN_L_Lamp_Status << 5u) & 0x10u) |
((DstWarnVolume_Set & 0x07))); /* 8 */
}
/*-------------------------------------------------------------------------
* Function Name : Can_Set_Buff_18FED917
* Description :
* Input : None
* Input : None 18FED917
* Output : None
* Return : None
* onther : None
--------------------------------------------------------------------------*/
typedef union
{
uint8_t Data[8] ;
struct
{
uint8_t Not_used0 : 4 ;
uint8_t BlendingSwitchPosition : 2 ;
uint8_t Not_used1 : 2 ;
uint8_t Not_used2 : 2 ;
uint8_t TralierABSFullyOperational : 2 ;
uint8_t TralierABSDitected : 2 ;
uint8_t TralierConnected : 2 ;
uint8_t Not_used3 : 8 ;
uint8_t Not_used4 : 8 ;
uint8_t Not_used5 : 8 ;
uint8_t Not_used6 : 8 ;
uint8_t Not_used7 : 8 ;
uint8_t Not_used8 : 8 ;
} bit;
} _Msg18FED917Map;
void Can_Set_Buff_18FED917(uint8_t CopyData [])
void Can_Set_Buff_18FED917(uint8_t CopyData[])
{
uint8_t i ;
_Msg18FED917Map MsgMap ;
for (i = 0 ; i < 8 ; i ++)
{
MsgMap.Data[ i ] = 0xff ;
}
uint8_t Blanding_SW_Signal = 0u;
uint8_t Tralier_ABS_Fully_Operational = 0u;
uint8_t Tlailer_ABS_Detect = 0u;
uint8_t Tlailer_Connected = 0u;
Blanding_SW_Signal = Line_In_Get_Status(LINE_IN_RET_BLENDING); /*A10*/
Tlailer_Connected = Line_In_Get_Status(LINE_IN_TRAILER_CONNECT); /*B6*/
for (i = 0 ; i < 8 ; i ++)
if (Line_In_Get_Status(LINE_IN_TRAILER_CONNECT) == 1u)
{
CopyData[ i ] = MsgMap.Data[ i ] ;
}
}
Tlailer_ABS_Detect = Line_In_Get_Status(LINE_IN_ABS_DETECT); /*A33*/
/*-------------------------------------------------------------------------
* Function Name : Can_Set_Buff_18FEE617
* Description :
* Input : None
* Output : None
* Return : None
* onther : None
--------------------------------------------------------------------------*/
typedef union
{
uint8_t Data[8] ;
struct
{
uint8_t Seconds : 8 ;//Factor 0.25
uint8_t Minutes : 8 ;
uint8_t Hours : 8 ;
uint8_t Month : 8 ;
uint8_t Day : 8 ;//Factor 0.25
uint8_t Year : 8 ;//Offset 1985
uint8_t Not_used : 8 ;
uint8_t Not_used1 : 8 ;
} bit;
} _Msg18FEE617Map;
void Can_Set_Buff_18FEE617(uint8_t CopyData [])
{
uint8_t i ;
_Msg18FEE617Map MsgMap ;
for (i = 0 ; i < 8 ; i ++)
if (Line_In_Get_Status(LINE_IN_ABS_DETECT) == 1u)
{
MsgMap.Data[ i ] = 0xff ;
Tralier_ABS_Fully_Operational = Line_In_Get_Status(LINE_IN_TRAILER_ABS); /*B33*/
}
MsgMap.bit.Seconds = Get_RTC_SECOND() << 2;
MsgMap.bit.Minutes = Get_RTC_MINUTE();
MsgMap.bit.Hours = Get_RTC_HOUR();
MsgMap.bit.Day = Get_RTC_DATE() << 2 ;
MsgMap.bit.Month = Get_RTC_MONTH();
MsgMap.bit.Year = Get_RTC_YEAR() + 15;
for (i = 0 ; i < 8 ; i ++)
else
{
CopyData[ i ] = MsgMap.Data[ i ] ;
Tralier_ABS_Fully_Operational = 0u;
}
}
else
{
Tlailer_ABS_Detect = 3u;
Tralier_ABS_Fully_Operational = 3u;
}
CopyData[0] = (uint8_t)(((Blanding_SW_Signal << 4u) & 0x30u) |
0xCFu); /* 1 */
CopyData[1] = (uint8_t)(((Tralier_ABS_Fully_Operational << 2u) & 0x0Cu) |
((Tlailer_ABS_Detect << 4u) & 0x30u) |
((Tlailer_Connected << 6u) & 0xC0u) |
0x03u); /* 2 */
CopyData[2] = 0u; /* 3 */
CopyData[3] = 0u; /* 4 */
CopyData[4] = 0u; /* 5 */
CopyData[5] = 0u; /* 6 */
CopyData[6] = 0u; /* 7 */
CopyData[7] = 0u; /* 8 */
}
/*-------------------------------------------------------------------------
* Function Name : Can_Set_Buff_18EF1817
* Function Name : Can_Set_Buff_18FEE617
* Description :
* Input : None
* Input : None 18FEE617
* Output : None
* Return : None
* onther : None
--------------------------------------------------------------------------*/
//Byte：6为最高级别Byte，Byte：3为最低级别Byte
void Can_Set_Buff_18EF1817(uint8_t CopyData [])
void Can_Set_Buff_18FEE617(uint8_t CopyData[])
{
uint8_t Seconds = 0u;
uint8_t Minutes = 0u;
uint8_t Hours = 0u;
uint8_t Month = 0u;
uint8_t Day = 0u;
uint8_t Year = 0u;
Seconds = Get_RTC_SECOND() * 4u;
Minutes = Get_RTC_MINUTE();
Hours = Get_RTC_HOUR();
Month = Get_RTC_MONTH();
Day = Get_RTC_DATE() * 4u;
Year = (uint8_t)((Get_RTC_YEAR() + 2000u - 1985u) & 0xFFu);
CopyData[0] = (uint8_t)Seconds; /* 1 */
CopyData[1] = (uint8_t)Minutes; /* 2 */
CopyData[2] = (uint8_t)Hours; /* 3 */
CopyData[3] = (uint8_t)Month; /* 4 */
CopyData[4] = (uint8_t)Day; /* 5 */
CopyData[5] = (uint8_t)Year; /* 6 */
CopyData[6] = 0u; /* 7 */
CopyData[7] = 0u; /* 8 */
}
/*-------------------------------------------------------------------------
* Function Name : Can_Set_Buff_18FEE017
* Description :
* Input : None
* Input : None 18FEE017
* Output : None
* Return : None
* onther : None
--------------------------------------------------------------------------*/
typedef union
{
uint8_t Data[8] ;
struct
{
//uint32_t Not_used : 32 ;
//uint32_t Total_Vehicle_Distance : 32 ; //Factor 0.125
uint8_t Not_used : 8 ;
uint8_t : 8 ;
uint8_t : 8 ;
uint8_t : 8 ;
uint8_t : 8 ;
uint8_t : 8 ;
uint8_t : 8 ;
uint8_t : 8 ;
} bit;
} _Msg18FEE017Map;
void Can_Set_Buff_18FEE017(uint8_t CopyData [])
void Can_Set_Buff_18FEE017(uint8_t CopyData[])
{
uint8_t i ;
_Msg18FEE017Map MsgMap ;
for (i = 0 ; i < 8 ; i ++)
{
MsgMap.Data[ i ] = 0xff ;
}
//MsgMap.bit.Total_Vehicle_Distance = (Data_ODO_Read()/10) << 3 ;
for (i = 0 ; i < 8 ; i ++)
{
CopyData[ i ] = MsgMap.Data[ i ] ;
}
uint32_t Total_Vehicle_Distance = 0u; /*总计里程*/
Total_Vehicle_Distance = Data_ODO_Read();
CopyData[0] = 0xFFu; /* 1 */
CopyData[1] = 0xFFu; /* 2 */
CopyData[2] = 0xFFu; /* 3 */
CopyData[3] = 0xFFu; /* 4 */
CopyData[4] = (uint8_t)((Total_Vehicle_Distance * 8u / 10u) & 0xFFu); /* 5 */
CopyData[5] = (uint8_t)(((Total_Vehicle_Distance * 8u / 10u) >> 8u) & 0xFFu); /* 6 */
CopyData[6] = (uint8_t)(((Total_Vehicle_Distance * 8u / 10u) >> 16u) & 0xFFu); /* 7 */
CopyData[7] = (uint8_t)(((Total_Vehicle_Distance * 8u / 10u) >> 24u) & 0xFFu); /* 8 */
}
/*-------------------------------------------------------------------------
* Function Name : Can_Set_Buff_18FEFC17
* Description :
* Input : None
* Input : None 18FEFC17
* Output : None
* Return : None
* onther : None
--------------------------------------------------------------------------*/
typedef union
void Can_Set_Buff_18FEFC17(uint8_t CopyData[])
{
uint8_t Data[8] ;
struct
{
uint8_t WasherFluidLevel : 8 ;//Factor 0.4
uint8_t FuelLevel_1 : 8 ;//Factor 0.4
uint8_t EngFuelFilterDiffPressure : 8 ;//Factor 2
uint8_t EngOilFilterDiffPressure : 8 ;//Factor 0.5
uint16_t CargoAmbientTemperature : 16;//Factor 0.03125 Offset -273
uint8_t FuelLevel_2 : 8 ;//Factor 0.4
uint8_t EngOilFilterDiffPressure_ExtRange : 8 ;//Factor 5
} bit;
} _Msg18FEFC17Map;
void Can_Set_Buff_18FEFC17(uint8_t CopyData [])
{
uint8_t i ;
_Msg18FEFC17Map MsgMap ;
for (i = 0 ; i < 8 ; i ++)
uint8_t Washer_Fluid_Level = 0u;
uint8_t Fuel_Level_1 = 0u; /*仪表外发*/
uint8_t Engine_Fuel_Filter_Differential_Pressure = 0u;
uint8_t Engine_Oil_Filter_Differential_Pressure = 0u;
uint16_t Cargo_Ambient_Temperature = 0u;
uint8_t Fuel_Level_2 = 0u;
uint8_t Engine_Oil_Filter_Differential = 0u;
if (Fuel_Get_Step() > 10u)
{
MsgMap.Data[ i ] = 0xff ;
Fuel_Level_1 = (uint8_t)((Fuel_Get_Step() - 10u) * 50u / 24u);
}
for (i = 0 ; i < 8 ; i ++)
else
{
CopyData[ i ] = MsgMap.Data[ i ] ;
Fuel_Level_1 = 0u;
}
CopyData[0] = (uint8_t)Washer_Fluid_Level; /* 1 */
CopyData[1] = (uint8_t)Fuel_Level_1; /* 2 */
CopyData[2] = (uint8_t)Engine_Fuel_Filter_Differential_Pressure; /* 3 */
CopyData[3] = (uint8_t)Engine_Oil_Filter_Differential_Pressure; /* 4 */
CopyData[4] = (uint8_t)(Cargo_Ambient_Temperature & 0xFFu); /* 5 */
CopyData[5] = (uint8_t)((Cargo_Ambient_Temperature >> 8u) & 0xFFu); /* 6 */
CopyData[6] = (uint8_t)Fuel_Level_2; /* 7 */
CopyData[7] = (uint8_t)Engine_Oil_Filter_Differential; /* 8 */
}
/*-------------------------------------------------------------------------
* Function Name : Can_Set_Buff_18FF2517
* Description :
* Input : None
* Input : None 18FF2517
* Output : None
* Return : None
* onther : None
--------------------------------------------------------------------------*/
typedef union
void Can_Set_Buff_18FF2517(uint8_t CopyData[])
{
uint8_t Data[8] ;
struct
{
uint8_t Year : 8 ;//0～63: 0～99 [Year]
uint8_t Month : 8 ;//1～C: 1～12 [Month]
uint8_t Day : 8 ;//1～1F: 1～31 [Day]
uint8_t Hour : 8 ;//0～18:0～24 [Hour]
uint8_t Minute : 8 ;//0～3B: 0～59 [Minute]
uint8_t ODOMeter_L : 8 ;
uint8_t ODOMeter_M : 8 ;
uint8_t ODOMeter_H : 8 ;
} bit;
} _Msg18FF2517Map;
void Can_Set_Buff_18FF2517(uint8_t CopyData [])
{
uint8_t i ;
_Msg18FF2517Map MsgMap ;
for (i = 0 ; i < 8 ; i ++)
{
MsgMap.Data[ i ] = 0xff ;
}
MsgMap.bit.Year = Get_RTC_YEAR() ;
MsgMap.bit.Month = Get_RTC_MONTH() ;
MsgMap.bit.Hour = Get_RTC_HOUR() ;
MsgMap.bit.Day = Get_RTC_DATE() ;
MsgMap.bit.Year = Get_RTC_YEAR() ;
MsgMap.bit.Minute = Get_RTC_MINUTE() ;
MsgMap.bit.ODOMeter_L = (uint8_t)(Data_ODO_Read() / 10) ;
MsgMap.bit.ODOMeter_M = (uint8_t)((Data_ODO_Read() / 10) >> 8) ;
MsgMap.bit.ODOMeter_H = (uint8_t)((Data_ODO_Read() / 10) >> 16) ;
for (i = 0 ; i < 8 ; i ++)
{
CopyData[ i ] = MsgMap.Data[ i ] ;
}
uint16_t Year = 0u;
uint8_t Month = 0u;
uint8_t Day = 0u;
uint8_t Hour = 0u;
uint8_t Minute = 0u;
uint32_t ODO_Meter = 0u;
Year = Get_RTC_YEAR();
Month = Get_RTC_MONTH();
Day = Get_RTC_DATE();
Hour = Get_RTC_HOUR();
Minute = Get_RTC_MINUTE();
CopyData[0] = (uint8_t)(Year & 0xFFu); /* 1 */
CopyData[1] = (uint8_t)Month; /* 2 */
CopyData[2] = (uint8_t)Day; /* 3 */
CopyData[3] = (uint8_t)Hour; /* 4 */
CopyData[4] = (uint8_t)Minute; /* 5 */
CopyData[5] = (uint8_t)(ODO_Meter & 0xFFu); /* 6 */
CopyData[6] = (uint8_t)((ODO_Meter >> 8u) & 0xFFu); /* 7 */
CopyData[7] = (uint8_t)((ODO_Meter >> 16u) & 0xFFu); /* 8 */
}
/*-------------------------------------------------------------------------
* Function Name : Can_Set_Buff_18FF2A17
* Description :
* Input : None
* Input : None 18FF2A17
* Output : None
* Return : None
* onther : None
--------------------------------------------------------------------------*/
typedef union
void Can_Set_Buff_18FF2A17(uint8_t CopyData[])
{
uint8_t Data[8] ;
struct
{
uint8_t Meter_Malfunction : 2 ;
uint8_t Over_Heat_Warning_Status : 1 ;
uint8_t Battery_Maintenance_Warning : 2 ;
uint8_t Remining_Fuel_Warning : 1 ;
uint8_t Water_Temp_Level : 2 ;
uint8_t SW_Air_Low_Pressure : 1 ;
uint8_t SW_Clutch : 1 ;
uint8_t SW_Water_Separator : 1 ;
uint8_t SW_Coolant_Level : 1 ;
uint8_t SW_Oil_Pressure : 1 ;
uint8_t SW_Sheetbelt : 1 ;
uint8_t SW_Rear_Body_Warning : 1 ;
uint8_t SRS_Input : 1 ;
uint8_t EDS_Smoother_WL_Status : 1 ;
uint8_t SW_Dr_Door : 1 ;
uint8_t Reserve : 1 ;
uint8_t ACG_L_Terminal : 1 ;
uint8_t SW_DefLock : 1 ;
uint8_t SW_KickDrive : 1 ;
uint8_t SW_MT_Spriter : 1 ;
uint8_t SW_MT_Range : 1 ;
uint8_t Mult_Indication : 2 ;
uint8_t ROWS_Warning : 1 ;
uint8_t Roll_Warning : 1 ;
uint8_t Air_Sus_Warning : 1 ;
uint8_t ESC_Operating : 1 ;
uint8_t EBS_Warning_Yellow : 1 ;
uint8_t EBS_Warning_Red : 1 ;
uint8_t SW_Accessory_Air : 1 ;
uint8_t SW_SpotLamp : 1 ;
uint8_t Not_used : 1 ;
uint8_t SW_Illmi : 1 ;
uint8_t Not_used0 : 1 ;
uint8_t TURN_R_Lamp_Status : 1 ;
uint8_t SW_Hi_Beam : 1 ;
uint8_t SW_KeyRemind : 1 ;
uint8_t SW_Parking : 2 ;
uint8_t Not_used1 : 1 ;
uint8_t SW_Coupler_Lock : 1 ;
uint8_t Input_Trailer_ABS : 1 ;
uint8_t Input_Trailer_Info : 1 ;
uint8_t SW_Trailer_Brake : 2 ;
uint8_t IGN_Voltage : 8 ;
uint8_t Not_used2 : 1 ;
uint8_t Not_used3 : 1 ;
uint8_t Not_used4 : 1 ;
uint8_t Not_used5 : 1 ;
uint8_t Not_used6 : 1 ;
uint8_t IRIS_Warning_Lamp_Status : 1 ;
uint8_t Range_Air_Cut_Warning : 1 ;
uint8_t MJX_MEB9_Manual_TM_Range_Low : 1 ;
} bit;
} _Msg18FF2A17Map;
void Can_Set_Buff_18FF2A17(uint8_t CopyData [])
{
uint32_t Ign_Time ;
uint8_t i = 0 ;
uint16_t Voltage = 0 ;
Ign_Time = Common_GetIgnOnTime();
_Msg18FF2A17Map MsgMap ;
for (i = 0 ; i < 8 ; i ++)
{
MsgMap.Data[ i ] = 0xff ;
}
//Byte:0
if (Coolant_Get_Valid())
{
if (Ign_Time < 3000)
{
MsgMap.bit.Water_Temp_Level = 0 ;
MsgMap.bit.Over_Heat_Warning_Status = 0 ;
}
uint8_t Water_Temp_Level = 0u; /*水温状态*/
uint8_t Remining_Fuel_Warning = 0u; /*剩余燃料报警*/
uint8_t Battery_Maintenance_Warning = 0u; /*电池维护报警*/
uint8_t Over_Heat_Warning_Status = 0u; /*水温状态*/
uint8_t Meter_Malfunction = 0u; /*仪表故障*/
uint8_t SRS_Input = 0u;
uint8_t SW_Rear_Body_Warning = 0u;
uint8_t SW_Sheetbelt = 0u;
uint8_t SW_Oil_Pressure = 0u;
uint8_t SW_Coolant_Level = 0u;
uint8_t SW_Water_Separator = 0u;
uint8_t SW_Clutch = 0u;
uint8_t SW_Air_Low_Pressure = 0u;
uint8_t SW_MT_Range = 0u;
uint8_t SW_MT_Spriter = 0u;
uint8_t SW_KickDrive = 0u;
uint8_t SW_DefLock = 0u;
uint8_t ACG_L_Terminal = 0u;
uint8_t Reserve = 0u;
uint8_t SW_Dr_Door = 0u;
uint8_t EDS_Smoother_WL_Status = 0u;
uint8_t EBS_Warning_Red = 0u;
uint8_t EBS_Warning_Yellow = 0u;
uint8_t ESC_Operating = 0u;
uint8_t Air_Sus_Warning = 0u;
uint8_t Roll_Warning = 0u;
uint8_t ROWS_Warning = 0u;
uint8_t Mult_Indication = 0u;
uint8_t SW_KeyRemind = 0u;
uint8_t SW_Hi_Beam = 0u;
uint8_t TURN_R_Lamp_Status = 0u;
uint8_t SW_Illmi = 0u;
uint8_t SW_SpotLamp = 0u;
uint8_t SW_Accessory_Air = 0u;
uint8_t SW_Trailer_Brake = 0u;
uint8_t Input_Trailer_Info = 0u;
uint8_t Input_Trailer_ABS = 0u;
uint8_t SW_Coupler_Lock = 0u;
uint8_t SW_Parking = 0u;
uint8_t IGN_Voltage = 0u;
uint8_t MJX_MEB9_Manual_TM_Range_Low = 0u;
uint8_t Range_Air_Cut_Warning = 0u;
uint8_t IRIS_Warning_Lamp_Status = 0u;
#if 0
/*手刹状态*/
if (LINK_PARK_BRAKE_IN_LG32_P03 == 0)
SW_Parking = 1 ;
else
{
if (Coolant_Get_CurSeg() <= 10)
{
MsgMap.bit.Water_Temp_Level = 0 ;
MsgMap.bit.Over_Heat_Warning_Status = 0 ;
}
else if (Coolant_Get_CurSeg() == 11 || Coolant_Get_CurSeg() == 12)
{
MsgMap.bit.Water_Temp_Level = 1 ;
MsgMap.bit.Over_Heat_Warning_Status = 1 ;
}
SW_Parking = 0 ;
}
}
else
/*水温状态*/
if ((ET1_Engine_Coolant_Temperature > 0xFA) || (ET1_STATUS & CAN_MSG_LOST))
{
MsgMap.bit.Water_Temp_Level = 2 ;
MsgMap.bit.Over_Heat_Warning_Status = 0 ;
Water_Temp_Level = 2;
Over_Heat_Warning_Status = 0;
}
//Get_Voltmeter_Valid();
if (Get_Voltmeter_AvrVoltage())
{
//0x00～0xFA : 9～34 [V]
Voltage = Get_Voltmeter_AvrVoltage();
Voltage += 50 ;
Voltage /= 100 ;
if (Voltage >= 90)
else if ((DataCoolantTempSegDisp >= 0) && (DataCoolantTempSegDisp < 12))
{
Voltage -= 90 ;
Water_Temp_Level = 0 ;
Over_Heat_Warning_Status = 0 ;
}
else
else if ((DataCoolantTempSegDisp >= 12) && (DataCoolantTempSegDisp <= 13))
{
Voltage = 0 ;
}
}
MsgMap.bit.IGN_Voltage = Voltage ;
Water_Temp_Level = 1 ;
for (i = 0 ; i < 8 ; i ++)
{
CopyData[ i ] = MsgMap.Data[ i ] ;
if (DataVSpeedDisp > 20)
Over_Heat_Warning_Status = 0 ;
else
Over_Heat_Warning_Status = 1 ;
}
/*电源电压*/
IGN_Voltage = (9 + DataCoolantVolSegDisp) * 10 ;
#endif
CopyData[0] = (uint8_t)(((Water_Temp_Level << 6u) & 0xC0u) |
((Remining_Fuel_Warning << 5u) & 0x20u) |
((Battery_Maintenance_Warning << 3u) & 0x18u) |
((Over_Heat_Warning_Status << 2u) & 0x04u) |
(Meter_Malfunction & 0x03u)); /* 1 */
CopyData[1] = (uint8_t)(((SRS_Input << 7u) & 0x80u) |
((SW_Rear_Body_Warning << 6u) & 0x040u) |
((SW_Sheetbelt << 5u) & 0x20u) |
((SW_Oil_Pressure << 4u) & 0x10u) |
((SW_Coolant_Level << 3u) & 0x08u) |
((SW_Water_Separator << 2u) & 0x04u) |
((SW_Clutch << 1u) & 0x02u) |
(SW_Air_Low_Pressure & 0x01u)); /* 2 */
CopyData[2] = (uint8_t)(((SW_MT_Range << 7u) & 0x80u) |
((SW_MT_Spriter << 6u) & 0x040u) |
((SW_KickDrive << 5u) & 0x20u) |
((SW_DefLock << 4u) & 0x10u) |
((ACG_L_Terminal << 3u) & 0x08u) |
((SW_Dr_Door << 1u) & 0x02u) |
(EDS_Smoother_WL_Status & 0x01u)); /* 3 */
CopyData[3] = (uint8_t)(((EBS_Warning_Red << 7u) & 0x80u) |
((EBS_Warning_Yellow << 6u) & 0x040u) |
((ESC_Operating << 5u) & 0x20u) |
((Air_Sus_Warning << 4u) & 0x10u) |
((Roll_Warning << 3u) & 0x08u) |
((ROWS_Warning << 2u) & 0x04u) |
(Mult_Indication & 0x03u)); /* 4 */
CopyData[4] = (uint8_t)(((SW_KeyRemind << 7u) & 0x80u) |
((SW_Hi_Beam << 6u) & 0x040u) |
((TURN_R_Lamp_Status << 5u) & 0x20u) |
((SW_Illmi << 3u) & 0x08u) |
((SW_SpotLamp << 1u) & 0x02u) |
(SW_Accessory_Air & 0x01u)); /* 5 */
CopyData[5] = (uint8_t)(((SW_Trailer_Brake << 6u) & 0xC0u) |
((Input_Trailer_Info << 5u) & 0x20u) |
((Input_Trailer_ABS << 4u) & 0x10u) |
((SW_Coupler_Lock << 3u) & 0x04u) |
(SW_Parking & 0x03)); /* 6 */
CopyData[6] = (uint8_t)(IGN_Voltage & 0xFFu); /* 7 */
CopyData[7] = (uint8_t)(((MJX_MEB9_Manual_TM_Range_Low << 7u) & 0x80u) |
((Range_Air_Cut_Warning << 6u) & 0x40u) |
((IRIS_Warning_Lamp_Status << 5u) & 0x20u)); /* 8 */
}
/*-------------------------------------------------------------------------
* Function Name : Can_Set_Buff_18FF9D17
* Description :
......@@ -538,36 +445,16 @@ void Can_Set_Buff_18FF2A17(uint8_t CopyData [])
* Return : None
* onther : None
--------------------------------------------------------------------------*/
typedef union
{
uint8_t Data[8] ;
struct
{
uint8_t Fuel_Level : 8 ;//0～64:0～100[%] FE:failure
uint8_t NotUsed : 8 ;
uint8_t NotUsed1 : 8 ;
uint8_t NotUsed2 : 8 ;
uint8_t NotUsed3 : 8 ;
uint8_t NotUsed4 : 8 ;
uint8_t NotUsed5 : 8 ;
uint8_t NotUsed6 : 8 ;
} bit;
} _Msg18FF9D17Map;
void Can_Set_Buff_18FF9D17(uint8_t CopyData [])
void Can_Set_Buff_18FF9D17(uint8_t CopyData[])
{
uint8_t i ;
_Msg18FF9D17Map MsgMap ;
for (i = 0 ; i < 8 ; i ++)
{
MsgMap.Data[ i ] = 0xff ;
}
MsgMap.bit.Fuel_Level = Fuel_Get_Percent() ;
for (i = 0 ; i < 8 ; i ++)
{
CopyData[ i ] = MsgMap.Data[ i ] ;
}
CopyData[0] = 0u; /* 1 */
CopyData[1] = 0u; /* 2 */
CopyData[2] = 0u; /* 3 */
CopyData[3] = 0u; /* 4 */
CopyData[4] = 0u; /* 5 */
CopyData[5] = 0u; /* 6 */
CopyData[6] = 0u; /* 7 */
CopyData[7] = 0u; /* 8 */
}
/*-------------------------------------------------------------------------
......@@ -578,36 +465,16 @@ void Can_Set_Buff_18FF9D17(uint8_t CopyData [])
* Return : None
* onther : Event triggered
--------------------------------------------------------------------------*/
typedef union
{
uint8_t Data[8] ;
struct
{
uint8_t DTC_Clear_Request : 8 ;
uint8_t Req_0Point : 8 ;
uint8_t System_Demonstration_Request : 7 ;
uint8_t Ferry_Mode_Cancel : 1 ;
uint8_t Not_used : 8 ;
uint8_t Not_used1 : 8 ;
uint8_t Not_used2 : 8 ;
uint8_t Not_used3 : 8 ;
uint8_t Not_used4 : 8 ;
} bit;
} _Msg18FFE517Map;
void Can_Set_Buff_18FFE517(uint8_t CopyData [])
void Can_Set_Buff_18FFE517(uint8_t CopyData[])
{
uint8_t i ;
_Msg18FFE517Map MsgMap ;
for (i = 0 ; i < 8 ; i ++)
{
MsgMap.Data[ i ] = 0xff ;
}
for (i = 0 ; i < 8 ; i ++)
{
CopyData[ i ] = MsgMap.Data[ i ] ;
}
CopyData[0] = 0u; /* 1 */
CopyData[1] = 0u; /* 2 */
CopyData[2] = 0u; /* 3 */
CopyData[3] = 0u; /* 4 */
CopyData[4] = 0u; /* 5 */
CopyData[5] = 0u; /* 6 */
CopyData[6] = 0u; /* 7 */
CopyData[7] = 0u; /* 8 */
}
/*-------------------------------------------------------------------------
* Function Name : Can_Set_Buff_18EF2D17
......@@ -617,13 +484,16 @@ void Can_Set_Buff_18FFE517(uint8_t CopyData [])
* Return : None
* onther : None
--------------------------------------------------------------------------*/
void Can_Set_Buff_18EF2D17(uint8_t CopyData [])
void Can_Set_Buff_18EF2D17(uint8_t CopyData[])
{
uint8_t i ;
for (i = 0 ; i < 8 ; i ++)
{
CopyData[ i ] = 0xff ;
}
CopyData[0] = 0u; /* 1 */
CopyData[1] = 0u; /* 2 */
CopyData[2] = 0u; /* 3 */
CopyData[3] = 0u; /* 4 */
CopyData[4] = 0u; /* 5 */
CopyData[5] = 0u; /* 6 */
CopyData[6] = 0u; /* 7 */
CopyData[7] = 0u; /* 8 */
}
/*-------------------------------------------------------------------------
* Function Name : Can_Set_Buff_18033317
......@@ -633,29 +503,16 @@ void Can_Set_Buff_18EF2D17(uint8_t CopyData [])
* Return : None
* onther : None
--------------------------------------------------------------------------*/
typedef union
void Can_Set_Buff_18033317(uint8_t CopyData[])
{
uint8_t Data[8] ;
struct
{
uint8_t PairCmd : 8 ;
uint8_t TireNumber : 8 ;
uint8_t Not_used : 8 ;
uint8_t Not_used1 : 8 ;
uint8_t Not_used2 : 8 ;
uint8_t Not_used3 : 8 ;
uint8_t Not_used4 : 8 ;
uint8_t Not_used5 : 8 ;
} bit;
} _Msg18033317Map;
void Can_Set_Buff_18033317(uint8_t CopyData [])
{
uint8_t i ;
for (i = 0 ; i < 8 ; i ++)
{
CopyData[ i ] = 0xff ;
}
CopyData[0] = 0u; /* 1 */
CopyData[1] = 0u; /* 2 */
CopyData[2] = 0u; /* 3 */
CopyData[3] = 0u; /* 4 */
CopyData[4] = 0u; /* 5 */
CopyData[5] = 0u; /* 6 */
CopyData[6] = 0u; /* 7 */
CopyData[7] = 0u; /* 8 */
}
/*-------------------------------------------------------------------------
* Function Name : Can_Set_Buff_180433A2
......@@ -665,32 +522,46 @@ void Can_Set_Buff_18033317(uint8_t CopyData [])
* Return : None
* onther : None
--------------------------------------------------------------------------*/
typedef union
void Can_Set_Buff_180433A2(uint8_t CopyData[])
{
uint8_t Data[8] ;
struct
{
uint8_t SetupCmd : 8 ;
uint8_t Not_used : 8 ;
uint8_t Not_used1 : 8 ;
uint8_t Not_used2 : 8 ;
uint8_t Not_used3 : 8 ;
uint8_t Not_used4 : 8 ;
uint8_t Not_used5 : 8 ;
uint8_t Not_used6 : 8 ;
} bit;
} _Msg180433A2Map;
void Can_Set_Buff_180433A2(uint8_t CopyData [])
CopyData[0] = 0u; /* 1 */
CopyData[1] = 0u; /* 2 */
CopyData[2] = 0u; /* 3 */
CopyData[3] = 0u; /* 4 */
CopyData[4] = 0u; /* 5 */
CopyData[5] = 0u; /* 6 */
CopyData[6] = 0u; /* 7 */
CopyData[7] = 0u; /* 8 */
}
/*-------------------------------------------------------------------------
* Function Name : Can_Set_Buff_18EF1817
* Description :
* Input : None
* Output : None
* Return : None
* onther : None
--------------------------------------------------------------------------*/
void Can_Set_Buff_18EF1817(uint8_t CopyData[])
{
uint8_t i ;
for (i = 0 ; i < 8 ; i ++)
{
CopyData[ i ] = 0xff ;
}
CopyData[0] = 0u; /* 1 */
CopyData[1] = 0u; /* 2 */
CopyData[2] = 0u; /* 3 */
CopyData[3] = 0u; /* 4 */
CopyData[4] = 0u; /* 5 */
CopyData[5] = 0u; /* 6 */
CopyData[6] = 0u; /* 7 */
CopyData[7] = 0u; /* 8 */
}
/*CAN接收处理*/
/*-------------------------------------------------------------------------
* Function Name : Drive_Info_IC1_STATUS_Rx
* Description : 18EF1718 报文循环接收处理
* Input : None
* Output : None
* Return : None
* onther : None
--------------------------------------------------------------------------*/
void Drive_Info_IC1_STATUS_Rx(void)
{
uint32_t Temp = 0u;
......@@ -706,38 +577,38 @@ void Drive_Info_IC1_STATUS_Rx(void)
case 0x81:
switch (Data_Type)
{
case 0x50 :
User_ECU.TripA_Fuel = Temp ;
case 0x50:
User_ECU.TripA_Fuel = Temp;
break;
case 0x51 :
User_ECU.TripA_Average_Speed = Temp ;
case 0x51:
User_ECU.TripA_Average_Speed = Temp;
break;
case 0x52 :
User_ECU.TripA_Fuel_Consume = Temp ;
case 0x52:
User_ECU.TripA_Fuel_Consume = Temp;
break;
case 0x53 :
User_ECU.TripA_Idling = Temp ;
case 0x53:
User_ECU.TripA_Idling = Temp;
break;
case 0x54 :
User_ECU.TripA_Runing = Temp ;
case 0x54:
User_ECU.TripA_Runing = Temp;
break;
case 0x60 :
User_ECU.TripB_Fuel = Temp ;
case 0x60:
User_ECU.TripB_Fuel = Temp;
break;
case 0x61 :
User_ECU.TripB_Average_Speed = Temp ;
case 0x61:
User_ECU.TripB_Average_Speed = Temp;
break;
case 0x62 :
User_ECU.TripB_Fuel_Consume = Temp ;
case 0x62:
User_ECU.TripB_Fuel_Consume = Temp;
break;
case 0x63 :
User_ECU.TripB_Idling = Temp ;
case 0x63:
User_ECU.TripB_Idling = Temp;
break;
case 0x64 :
User_ECU.TripB_Runing = Temp ;
case 0x64:
User_ECU.TripB_Runing = Temp;
break;
case 0x22 :
User_ECU.Engine_Surplus = Temp ;
case 0x22:
User_ECU.Engine_Surplus = Temp;
break;
default:
break;
......@@ -746,38 +617,38 @@ void Drive_Info_IC1_STATUS_Rx(void)
case 0x40:
switch (Data_Type)
{
case 0x50 :
User_ECU.TripA_Fuel = Temp ;
case 0x50:
User_ECU.TripA_Fuel = Temp;
break;
case 0x51 :
User_ECU.TripA_Average_Speed = Temp ;
case 0x51:
User_ECU.TripA_Average_Speed = Temp;
break;
case 0x52 :
User_ECU.TripA_Fuel_Consume = Temp ;
case 0x52:
User_ECU.TripA_Fuel_Consume = Temp;
break;
case 0x53 :
User_ECU.TripA_Idling = Temp ;
case 0x53:
User_ECU.TripA_Idling = Temp;
break;
case 0x54 :
User_ECU.TripA_Runing = Temp ;
case 0x54:
User_ECU.TripA_Runing = Temp;
break;
case 0x60 :
User_ECU.TripB_Fuel = Temp ;
case 0x60:
User_ECU.TripB_Fuel = Temp;
break;
case 0x61 :
User_ECU.TripB_Average_Speed = Temp ;
case 0x61:
User_ECU.TripB_Average_Speed = Temp;
break;
case 0x62 :
User_ECU.TripB_Fuel_Consume = Temp ;
case 0x62:
User_ECU.TripB_Fuel_Consume = Temp;
break;
case 0x63 :
User_ECU.TripB_Idling = Temp ;
case 0x63:
User_ECU.TripB_Idling = Temp;
break;
case 0x64 :
User_ECU.TripB_Runing = Temp ;
case 0x64:
User_ECU.TripB_Runing = Temp;
break;
case 0x22 :
User_ECU.Engine_Surplus = Temp ;
case 0x22:
User_ECU.Engine_Surplus = Temp;
break;
default:
break;
......@@ -787,30 +658,64 @@ void Drive_Info_IC1_STATUS_Rx(void)
break;
}
//if (State_Flag.FState_COilTimeOut < FState_COilTimeOutNum)
// if (State_Flag.FState_COilTimeOut < FState_COilTimeOutNum)
//{
// State_Flag.FState_COilTimeOut++;
//}
//if (Data_Sig == 0x40u)
// }
// if (Data_Sig == 0x40u)
//{
// State_Flag.FState_ClearOilRx == 1;
//}
// }
}
/*-------------------------------------------------------------------------
* Function Name : Common_Data_Get_TripA_Fuel
* Description :
* Input : None
* Output : None
* Return : None
* onther : None
--------------------------------------------------------------------------*/
uint32_t Common_Data_Get_TripA_Fuel(void)
{
return User_ECU.TripA_Fuel ;
return User_ECU.TripA_Fuel;
}
/*-------------------------------------------------------------------------
* Function Name : Common_Data_Get_TripA_Average_Speed
* Description :
* Input : None
* Output : None
* Return : None
* onther : None
--------------------------------------------------------------------------*/
uint32_t Common_Data_Get_TripA_Average_Speed(void)
{
return User_ECU.TripA_Average_Speed ;
return User_ECU.TripA_Average_Speed;
}
/*-------------------------------------------------------------------------
* Function Name : Common_Data_Get_TripB_Fuel
* Description :
* Input : None
* Output : None
* Return : None
* onther : None
--------------------------------------------------------------------------*/
uint32_t Common_Data_Get_TripB_Fuel(void)
{
return User_ECU.TripB_Fuel ;
return User_ECU.TripB_Fuel;
}
/*-------------------------------------------------------------------------
* Function Name : Common_Data_Get_TripB_Average_Speed
* Description :
* Input : None
* Output : None
* Return : None
* onther : None
--------------------------------------------------------------------------*/
uint32_t Common_Data_Get_TripB_Average_Speed(void)
{
return User_ECU.TripB_Average_Speed ;
return User_ECU.TripB_Average_Speed;
}
source/Application/Graphic/GUI/GUI.c
View file @ fe7244ef
......@@ -438,7 +438,7 @@ void GUI_WetGas_Dispaly(uint8_t Mode)
if (Mode == GUI_DISP_MODE_NORMAL)
{
current_value = GetGaugesCurrentPos(WETGasGauges);
//current_Flag = Common_Get_WET_Valid(); /*有效性判断用*/
current_Flag = Common_Get_WET_Valid(); /*有效性判断用*/
if ((current_value <= 17u) && (current_Flag == 1u))
{
......
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