Skip to content

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

调整外发报文

parent a22a0940
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 23151 additions and 23284 deletions
ghs/project
View file @ b7030a59
No preview for this file type
ghs/project.hex
View file @ b7030a59
This diff is collapsed.
ghs/project.siz
View file @ b7030a59
project .intvect 1536
project .text 321916
project .text 322364
project .rodata 411103
project .secinfo 120
project .syscall 6
......
source/Application/APP/Data_AirPressure/Data_AirPressure.c
View file @ b7030a59
......@@ -377,4 +377,20 @@ uint8_t Common_Get_Air2_Valid(void)
uint8_t Common_Get_WET_Valid(void)
{
return DataStrWET.Valid;
}
\ No newline at end of file
}
uint16_t Common_Get_Air1_Data(void)
{
return DataStrGas1.DataDisplay;
}
uint16_t Common_Get_Air2_Data(void)
{
return DataStrGas2.DataDisplay;
}
uint16_t Common_Get_WET_Data(void)
{
return DataStrWET.DataDisplay;
}
source/Application/APP/Data_AirPressure/Data_AirPressure.h
View file @ b7030a59
......@@ -18,8 +18,13 @@ extern void AirPressure_Processing_Service(void);
void Data_Gas1_Processing_Service(void);
void Data_Gas2_Processing_Service(void);
void Data_WET_Processing_Service(void);
uint8_t Common_Get_Air1_Valid(void);
uint8_t Common_Get_Air2_Valid(void);
uint8_t Common_Get_WET_Valid(void);
uint16_t Common_Get_Air1_Data(void);
uint16_t Common_Get_Air2_Data(void);
uint16_t Common_Get_WET_Data(void);
#endif
\ No newline at end of file
source/Application/APP/Data_ODO/Services_ODO_user.c
View file @ b7030a59
......@@ -54,7 +54,7 @@ void Data_User_Mileage_KL30Init(void)
TripInit[EM_TRIP_A].Stamp = TempBuf[3];
TripInit[EM_TRIP_A].MaxValue = 9999999u;
TripInit[EM_TRIP_A].IsRestart = 1u;
TripInit[EM_TRIP_A].IsRestart = 1u; /*1-循环 0-最大值保持*/
TripInit[EM_TRIP_B].Stamp = TempBuf[4];
TripInit[EM_TRIP_B].MaxValue = 9999999u;
......
source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c
View file @ b7030a59
......@@ -26,77 +26,74 @@ USER_ECU User_ECU;
/*-------------------------------------------------------------------------
* Function Name : Can_Set_Buff_18FEAE17
* Description :
* Input : None
* Input : None 18FEAE17
* Output : None
* Return : None
* onther : None
--------------------------------------------------------------------------*/
typedef union
{
uint8_t Data[8] ;
struct
{
//0～FA:0～2000 [kPa] FB～FF:Not used // Factor:8
uint8_t Main_Air_Pressure : 8 ;//WET 预留
uint8_t Not_used0 : 2 ;
uint8_t Not_used1 : 2 ;
uint8_t Not_used2 : 2 ;
uint8_t Not_used3 : 2 ;
//0～FA:0～2000 [kPa] FB～FF:Not used // Factor:8
uint8_t Service_Brake_Circuit1_AirPressure : 8 ;
//0～FA:0～2000 [kPa] FB～FF:Not used // Factor:8
uint8_t Service_Brake_Circuit2_AirPressure : 8 ;
uint8_t Not_used4 : 8 ;
//0～2D0:0～36 [V] 2D1～FFFF:Not used // Factor:0.05
uint8_t Power_Supply_Voltage_L : 8 ;
uint8_t Power_Supply_Voltage_H : 8 ;
uint8_t SW_ECONO : 2 ;
uint8_t Rader_Stain_Information : 2 ;
uint8_t Not_used5 : 2 ;
uint8_t Parking_Brake_Switch : 2 ;
} bit;
} _Msg18FEAE17Map;
void Can_Set_Buff_18FEAE17(uint8_t CopyData [])
{
uint8_t i ;
_Msg18FEAE17Map MsgMap ;
for (i = 0 ; i < 8 ; i ++)
{
MsgMap.Data[ i ] = 0xff ;
}
//MsgMap.bit.Service_Brake_Circuit1_AirPressure = (uint8_t)(AirPressure_Get_kPa(0) >> 3) ;
//MsgMap.bit.Service_Brake_Circuit2_AirPressure = (uint8_t)(AirPressure_Get_kPa(1) >> 3) ;
if (RTE_Read_KL30_Valid())
{
MsgMap.bit.Power_Supply_Voltage_L = (uint8_t)(RTE_Read_KL30_Voltage() / 50);
MsgMap.bit.Power_Supply_Voltage_H = (uint8_t)((RTE_Read_KL30_Voltage() / 50) >> 8);
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倍*/
uint16_t Service_Brake_Circuit2_AirPressure = 0u; /*0～FA:0～2000 [kPa] FB～FF:Not used 8倍*/
uint16_t Power_Supply_Voltage = 0u; /*0～2D0:0～36 [V] 2D1～FFFF:Not used*/
uint8_t Parking_Brake_Switch = 0u;
uint8_t Rader_Stain_Information = 0u;
uint8_t SW_ECONO = 0u;
/*WET*/
Main_Air_Pressure = 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) ;
else
Service_Brake_Circuit1_AirPressure = 0u ;
if (Common_Get_Air2_Data() != 0u)
Service_Brake_Circuit2_AirPressure = (uint8_t)((Common_Get_Air2_Data() - 500u) / 20u) ;
else
Service_Brake_Circuit2_AirPressure = 0u ;
}
else
else if ((K_Line_Set.K_Line_LID42 == 0x01u) || (K_Line_Set.K_Line_LID42 == 0x02u))
{
MsgMap.bit.Power_Supply_Voltage_L = 0;
MsgMap.bit.Power_Supply_Voltage_H = 0;
if (Common_Get_Air2_Data() != 0u)
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) ;
else
Service_Brake_Circuit2_AirPressure = 0u;
}
if (Line_In_Get_Status(LINE_IN_PARK_BRAKE))
/*电源电压*/
Power_Supply_Voltage = 0u;
/*驻车制动外发*/
if (Line_In_Get_Status(LINE_IN_PARK_BRAKE) == 0)
{
MsgMap.bit.Parking_Brake_Switch = 1 ;
Parking_Brake_Switch = 1u;
}
else
{
MsgMap.bit.Parking_Brake_Switch = 0 ;
Parking_Brake_Switch = 0u;
}
for (i = 0 ; i < 8 ; i ++)
{
CopyData[ i ] = MsgMap.Data[ i ] ;
}
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[7] = (uint8_t)(((Parking_Brake_Switch << 6u) & 0xC0u) |
((Rader_Stain_Information << 2u) & 0x0Cu) |
((SW_ECONO) & 0x03u)) ; /* 8 */
}
/*-------------------------------------------------------------------------
......
source/Application/Graphic/GUI/GUI.c
View file @ b7030a59
......@@ -207,176 +207,7 @@ void GUI_Display_Value_Init(void)
User_set_Num.User_IDLING = User_App.User_IDLING ;
User_set_Num.User_Parking = User_App.User_Parking ;
//MenuFlag.Sig.Menu_Flag = 0;
#if 0
User_TPMS12.Tire_Pressure = 0 ;
User_TPMS12.Tire_Temperature_Sign = 0 ;
User_TPMS12.Tire_Temperature = 0 ;
User_TPMS12.Data_updating = 0 ;
User_TPMS12.Data_invalid = 0 ;
User_TPMS12.Low_Presure_Alarm = 0 ;
User_TPMS12.High_Presure_Alarm = 0 ;
User_TPMS12.High_Temperature_Alarm = 0 ;
User_TPMS12.Fast_air_leakage_Alarm = 0 ;
User_TPMS12.Low_Voltage_Alarm = 0 ;
User_TPMS12.No_signal_Alarm = 0 ;
User_TPMS12.Sensor_fault_information = 0 ;
User_TPMS13.Tire_Pressure = 0 ;
User_TPMS13.Tire_Temperature_Sign = 0 ;
User_TPMS13.Tire_Temperature = 0 ;
User_TPMS13.Data_updating = 0 ;
User_TPMS13.Data_invalid = 0 ;
User_TPMS13.Low_Presure_Alarm = 0 ;
User_TPMS13.High_Presure_Alarm = 0 ;
User_TPMS13.High_Temperature_Alarm = 0 ;
User_TPMS13.Fast_air_leakage_Alarm = 0 ;
User_TPMS13.Low_Voltage_Alarm = 0 ;
User_TPMS13.No_signal_Alarm = 0 ;
User_TPMS13.Sensor_fault_information = 0 ;
User_TPMS22.Tire_Pressure = 0 ;
User_TPMS22.Tire_Temperature_Sign = 0 ;
User_TPMS22.Tire_Temperature = 0 ;
User_TPMS22.Data_updating = 0 ;
User_TPMS22.Data_invalid = 0 ;
User_TPMS22.Low_Presure_Alarm = 0 ;
User_TPMS22.High_Presure_Alarm = 0 ;
User_TPMS22.High_Temperature_Alarm = 0 ;
User_TPMS22.Fast_air_leakage_Alarm = 0 ;
User_TPMS22.Low_Voltage_Alarm = 0 ;
User_TPMS22.No_signal_Alarm = 0 ;
User_TPMS22.Sensor_fault_information = 0 ;
User_TPMS23.Tire_Pressure = 0 ;
User_TPMS23.Tire_Temperature_Sign = 0 ;
User_TPMS23.Tire_Temperature = 0 ;
User_TPMS23.Data_updating = 0 ;
User_TPMS23.Data_invalid = 0 ;
User_TPMS23.Low_Presure_Alarm = 0 ;
User_TPMS23.High_Presure_Alarm = 0 ;
User_TPMS23.High_Temperature_Alarm = 0 ;
User_TPMS23.Fast_air_leakage_Alarm = 0 ;
User_TPMS23.Low_Voltage_Alarm = 0 ;
User_TPMS23.No_signal_Alarm = 0 ;
User_TPMS23.Sensor_fault_information = 0 ;
User_TPMS31.Tire_Pressure = 0 ;
User_TPMS31.Tire_Temperature_Sign = 0 ;
User_TPMS31.Tire_Temperature = 0 ;
User_TPMS31.Data_updating = 0 ;
User_TPMS31.Data_invalid = 0 ;
User_TPMS31.Low_Presure_Alarm = 0 ;
User_TPMS31.High_Presure_Alarm = 0 ;
User_TPMS31.High_Temperature_Alarm = 0 ;
User_TPMS31.Fast_air_leakage_Alarm = 0 ;
User_TPMS31.Low_Voltage_Alarm = 0 ;
User_TPMS31.No_signal_Alarm = 0 ;
User_TPMS31.Sensor_fault_information = 0 ;
User_TPMS32.Tire_Pressure = 0 ;
User_TPMS32.Tire_Temperature_Sign = 0 ;
User_TPMS32.Tire_Temperature = 0 ;
User_TPMS32.Data_updating = 0 ;
User_TPMS32.Data_invalid = 0 ;
User_TPMS32.Low_Presure_Alarm = 0 ;
User_TPMS32.High_Presure_Alarm = 0 ;
User_TPMS32.High_Temperature_Alarm = 0 ;
User_TPMS32.Fast_air_leakage_Alarm = 0 ;
User_TPMS32.Low_Voltage_Alarm = 0 ;
User_TPMS32.No_signal_Alarm = 0 ;
User_TPMS32.Sensor_fault_information = 0 ;
User_TPMS33.Tire_Pressure = 0 ;
User_TPMS33.Tire_Temperature_Sign = 0 ;
User_TPMS33.Tire_Temperature = 0 ;
User_TPMS33.Data_updating = 0 ;
User_TPMS33.Data_invalid = 0 ;
User_TPMS33.Low_Presure_Alarm = 0 ;
User_TPMS33.High_Presure_Alarm = 0 ;
User_TPMS33.High_Temperature_Alarm = 0 ;
User_TPMS33.Fast_air_leakage_Alarm = 0 ;
User_TPMS33.Low_Voltage_Alarm = 0 ;
User_TPMS33.No_signal_Alarm = 0 ;
User_TPMS33.Sensor_fault_information = 0 ;
User_TPMS34.Tire_Pressure = 0 ;
User_TPMS34.Tire_Temperature_Sign = 0 ;
User_TPMS34.Tire_Temperature = 0 ;
User_TPMS34.Data_updating = 0 ;
User_TPMS34.Data_invalid = 0 ;
User_TPMS34.Low_Presure_Alarm = 0 ;
User_TPMS34.High_Presure_Alarm = 0 ;
User_TPMS34.High_Temperature_Alarm = 0 ;
User_TPMS34.Fast_air_leakage_Alarm = 0 ;
User_TPMS34.Low_Voltage_Alarm = 0 ;
User_TPMS34.No_signal_Alarm = 0 ;
User_TPMS34.Sensor_fault_information = 0 ;
User_TPMS41.Tire_Pressure = 0 ;
User_TPMS41.Tire_Temperature_Sign = 0 ;
User_TPMS41.Tire_Temperature = 0 ;
User_TPMS41.Data_updating = 0 ;
User_TPMS41.Data_invalid = 0 ;
User_TPMS41.Low_Presure_Alarm = 0 ;
User_TPMS41.High_Presure_Alarm = 0 ;
User_TPMS41.High_Temperature_Alarm = 0 ;
User_TPMS41.Fast_air_leakage_Alarm = 0 ;
User_TPMS41.Low_Voltage_Alarm = 0 ;
User_TPMS41.No_signal_Alarm = 0 ;
User_TPMS41.Sensor_fault_information = 0 ;
User_TPMS42.Tire_Pressure = 0 ;
User_TPMS42.Tire_Temperature_Sign = 0 ;
User_TPMS42.Tire_Temperature = 0 ;
User_TPMS42.Data_updating = 0 ;
User_TPMS42.Data_invalid = 0 ;
User_TPMS42.Low_Presure_Alarm = 0 ;
User_TPMS42.High_Presure_Alarm = 0 ;
User_TPMS42.High_Temperature_Alarm = 0 ;
User_TPMS42.Fast_air_leakage_Alarm = 0 ;
User_TPMS42.Low_Voltage_Alarm = 0 ;
User_TPMS42.No_signal_Alarm = 0 ;
User_TPMS42.Sensor_fault_information = 0 ;
User_TPMS43.Tire_Pressure = 0 ;
User_TPMS43.Tire_Temperature_Sign = 0 ;
User_TPMS43.Tire_Temperature = 0 ;
User_TPMS43.Data_updating = 0 ;
User_TPMS43.Data_invalid = 0 ;
User_TPMS43.Low_Presure_Alarm = 0 ;
User_TPMS43.High_Presure_Alarm = 0 ;
User_TPMS43.High_Temperature_Alarm = 0 ;
User_TPMS43.Fast_air_leakage_Alarm = 0 ;
User_TPMS43.Low_Voltage_Alarm = 0 ;
User_TPMS43.No_signal_Alarm = 0 ;
User_TPMS43.Sensor_fault_information = 0 ;
User_TPMS44.Tire_Pressure = 0 ;
User_TPMS44.Tire_Temperature_Sign = 0 ;
User_TPMS44.Tire_Temperature = 0 ;
User_TPMS44.Data_updating = 0 ;
User_TPMS44.Data_invalid = 0 ;
User_TPMS44.Low_Presure_Alarm = 0 ;
User_TPMS44.High_Presure_Alarm = 0 ;
User_TPMS44.High_Temperature_Alarm = 0 ;
User_TPMS44.Fast_air_leakage_Alarm = 0 ;
User_TPMS44.Low_Voltage_Alarm = 0 ;
User_TPMS44.No_signal_Alarm = 0 ;
User_TPMS44.Sensor_fault_information = 0 ;
#endif
MenuFlag.Menu_Flag = 0; /*菜单初始化位置*/
}
/*-------------------------------------------------------------------------
* Function Name : GUI_Display_OftenShow_Group
......@@ -388,6 +219,8 @@ void GUI_Display_Value_Init(void)
--------------------------------------------------------------------------*/
void GUI_OftenShow_Display(void)
{
uint8_t Trip_Type = 0u;
GUI_AC_Temp_Dispaly(GUI_DISP_MODE_BLANK);
GUI_Time_Dispaly(GUI_DISP_MODE_NORMAL);
GUI_Data_Dispaly(GUI_DISP_MODE_NORMAL);
......@@ -396,7 +229,7 @@ void GUI_OftenShow_Display(void)
GUI_AdBlue_Dispaly(GUI_DISP_MODE_NORMAL);
Gui_ODO_Display(GUI_DISP_MODE_NORMAL);
if (1)
if (Trip_Type == TRAPA)
{
Gui_TRIPA_Display(GUI_DISP_MODE_NORMAL);
}
......@@ -1331,16 +1164,15 @@ void Gui_Gear_Display(uint8_t Mode)
--------------------------------------------------------------------------*/
void GUI_AVG_FuelSpeed_Display(uint8_t Mode)
{
uint8_t Trip_Type = 0u;
if (Mode == GUI_DISP_MODE_NORMAL)
{
}
else if (Mode == GUI_DISP_MODE_BLANK)
{
GUI_General_Display(MultiPurpose_Sprite, CN_TRIPAB, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MultiPurpose_Sprite, CN_PJyouhao, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MultiPurpose_Sprite, CN_PJchesu, GUI_BLENDMODE_SRC_OVER);
switch (0u)
switch (Trip_Type)
{
case TRAPA:
GUI_General_Display(MultiPurpose_Sprite, CN_TRIPAB_A, GUI_BLENDMODE_SRC_OVER);
......@@ -1360,6 +1192,9 @@ void GUI_AVG_FuelSpeed_Display(uint8_t Mode)
break;
}
}
else if (Mode == GUI_DISP_MODE_BLANK)
{
}
else
{
GUI_General_Display(MultiPurpose_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
......
source/Application/Graphic/Menu/Menu_user.c
View file @ b7030a59
......@@ -195,7 +195,7 @@ void Level1Menu_1Do(void)
{
GUI_OftenShow_Display();
GUI_Dynamic_DIsplay();
GUI_AVG_FuelSpeed_Display(GUI_DISP_MODE_BLANK);
GUI_AVG_FuelSpeed_Display(GUI_DISP_MODE_NORMAL);
}
void Level1Menu_1Exit(void)
{}
......
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