Skip to content

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

增加界面

parent 68168d2d
Show whitespace changes
Inline Side-by-side
Showing with 22730 additions and 23473 deletions
ghs/group/Application.gpj
View file @ 11846833
...@@ -49,12 +49,6 @@ ...@@ -49,12 +49,6 @@
.\APP\Data_EngineSpeed\Data_EngineSpeed.h .\APP\Data_EngineSpeed\Data_EngineSpeed.h
.\APP\Data_Gear\Data_Gear.c .\APP\Data_Gear\Data_Gear.c
.\APP\Data_Gear\Data_Gear.h .\APP\Data_Gear\Data_Gear.h
.\APP\ADAS\Data_ADAS.c
.\APP\ADAS\Data_ADAS.h
.\APP\Data_DrivingSupport\Data_DrivingSupport.c
.\APP\Data_DrivingSupport\Data_DrivingSupport.h
.\APP\Data_AdBule\Data_AdBule.c
.\APP\Data_AdBule\Data_AdBule.h
.\APP\Data_AirPressure\Data_AirPressure.c .\APP\Data_AirPressure\Data_AirPressure.c
.\APP\Data_AirPressure\Data_AirPressure.h .\APP\Data_AirPressure\Data_AirPressure.h
.\APP\Data_Voltmeter\Data_Voltmeter.c .\APP\Data_Voltmeter\Data_Voltmeter.c
......
ghs/project
View file @ 11846833
No preview for this file type
ghs/project.hex
View file @ 11846833
This source diff could not be displayed because it is too large. You can view the blob instead.
ghs/project.siz
View file @ 11846833
project .intvect 1536 project .intvect 1536
project .text 306412 project .text 305596
project .rodata 410871 project .rodata 410871
project .secinfo 120 project .secinfo 120
project .syscall 6 project .syscall 6
......
source/Application/APP/ADAS/Data_ADAS.c deleted 100644 → 0
View file @ 68168d2d
#include "Data_ADAS.h"
#include "CAN_Communication_Matrix.h"
//-------------------------------------------
//ADAS数据处理 wangboyu
//-------------------------------------------
//区域4显示逻辑
//-------------------------------------------
//344 - 3.3 ADAS显示区域
//-------------------------------------------
static struct
{
uint8_t Gui_WorkshopScope ;
uint8_t Gui_LDWS_Left ;
uint8_t Gui_LDWS_Right ;
}ADASVariable ;
static void Data_WorkshopScope_2_Gui(void);
static void Data_LDWS_2_Gui(void);
/*-------------------------------------------------------------------------
* Function Name : ADAS_KL30_Init
* Description :
* Input : None
* Output : None
* Return : None
* onther : None
--------------------------------------------------------------------------*/
void ADAS_KL30_Init(void)
{
ADASVariable.Gui_WorkshopScope = 0 ;
ADASVariable.Gui_LDWS_Left = 0 ;
ADASVariable.Gui_LDWS_Right = 0 ;
}
void ADAS_KL15_ON_Init(void)
{
}
void ADAS_KL15_OFF_Init(void)
{
}
void ADAS_Wakeup_Init(void)
{
}
void ADAS_Sleep_Init(void)
{
}
/*-------------------------------------------------------------------------
* Function Name : ADAS_Processing_Service
* Description :
* Input : None
* Output : None
* Return : None
* onther : None
--------------------------------------------------------------------------*/
void ADAS_Processing_Service(void)
{
Data_WorkshopScope_2_Gui();
Data_LDWS_2_Gui();
}
/*-------------------------------------------------------------------------
* Function Name : Data_WorkshopScope_2_Gui
* Description : 车间范围逻辑处理
* Input : None
* Output : None
* Return : None
* onther : None
--------------------------------------------------------------------------*/
static void Data_WorkshopScope_2_Gui(void)
{
uint8_t u8GuiMode = 0 ;
uint8_t Msg_A1_AEBSS = 0 ;
uint8_t Msg_2A_AEBSS = 0 ;
uint8_t Msg_A0_AEBSS = 0 ;
uint8_t Msg_A1_Ro_AEBSS = 0 ;
uint8_t Msg_2A_Ro_AEBSS = 0 ;
uint8_t Msg_A0_Ro_AEBSS = 0 ;
Msg_A1_AEBSS = Get_ID_CF02FA1_Sig_Advanced_Emerg_Braking_Sys_Sta();//Byte1,Bit1‐4
Msg_2A_AEBSS = Get_ID_CF02F2A_Sig_Advanced_Emerg_Braking_Sys_Sta();//Byte1,Bit1‐4
Msg_A0_AEBSS = Get_ID_CF02FA0_Sig_Advanced_Emerg_Braking_Sys_Sta();//Byte1,Bit1‐4
Msg_A1_Ro_AEBSS = Get_ID_CF02FA1_Sig_Relevant_objected_for_AEBS();//Byte2,Bit1‐3
Msg_2A_Ro_AEBSS = Get_ID_CF02F2A_Sig_Relevant_objected_for_AEBS();//Byte2,Bit1‐3
Msg_A0_Ro_AEBSS = Get_ID_CF02FA0_Sig_Relevant_objected_for_AEBS();//Byte2,Bit1‐3
if(Msg_A1_AEBSS == 0x01 || Msg_A1_AEBSS == 0x02 || Msg_A1_AEBSS == 0x0C || Msg_A1_AEBSS == 0x0F ||\
Msg_2A_AEBSS == 0x01 || Msg_2A_AEBSS == 0x02 || Msg_2A_AEBSS == 0x0C || Msg_2A_AEBSS == 0x0F ||\
Msg_A0_AEBSS == 0x01 || Msg_A0_AEBSS == 0x02 || Msg_A0_AEBSS == 0x0C || Msg_A0_AEBSS == 0x0F) \
{
u8GuiMode = 0 ;
}
if(Msg_A1_AEBSS == 0x00 || Msg_A1_AEBSS == 0x04 ||\
Msg_2A_AEBSS == 0x00 || Msg_2A_AEBSS == 0x04 ||\
Msg_A0_AEBSS == 0x00 || Msg_A0_AEBSS == 0x04 \
)
{
u8GuiMode = 1 ;
}
if(((Msg_A1_AEBSS == 0x03)&&(Msg_A1_Ro_AEBSS == 0x00 || Msg_A1_Ro_AEBSS == 0x02))|| \
((Msg_2A_AEBSS == 0x03)&&(Msg_2A_Ro_AEBSS == 0x00 || Msg_2A_Ro_AEBSS == 0x02))|| \
((Msg_A0_AEBSS == 0x03)&&(Msg_A0_Ro_AEBSS == 0x00 || Msg_A0_Ro_AEBSS == 0x02)) \
)
{
u8GuiMode = 2 ;
}
if((Msg_A1_AEBSS == 0x03 && Msg_A1_Ro_AEBSS == 0x01)|| \
(Msg_2A_AEBSS == 0x03 && Msg_2A_Ro_AEBSS == 0x01)|| \
(Msg_A0_AEBSS == 0x03 && Msg_A0_Ro_AEBSS == 0x01) \
)
{
u8GuiMode = 3 ;
}
ADASVariable.Gui_WorkshopScope = u8GuiMode ;
}
/*-------------------------------------------------------------------------
* Function Name : Data_LDWS_2_Gui
* Description : LDWS逻辑处理
* Input : None
* Output : None
* Return : None
* onther : None
--------------------------------------------------------------------------*/
static void Data_LDWS_2_Gui(void)
{
uint8_t u8Left_GuiMode = 0 ;
uint8_t u8Right_GuiMode = 0 ;
uint8_t Msg_LDWS = 0 ;
uint8_t Msg_Lane_Left = 0 ;
uint8_t Msg_Lane_Right = 0 ;
uint8_t Msg_Tracking_Left = 0 ;
uint8_t Msg_Tracking_Right = 0 ;
uint8_t Msg_Departure_Left = 0 ;
uint8_t Msg_Departure_Right = 0 ;
Msg_LDWS = Get_ID_18FE5BE8_Sig_Lane_Departure_Warning_Sys_Sta();
Msg_Tracking_Left = Get_ID_18FE5BE8_Sig_Lane_Tracking_Status_Left_Side() ;
Msg_Tracking_Right = Get_ID_18FE5BE8_Sig_Lane_Tracking_Status_Right_Side() ;
Msg_Departure_Left = Get_ID_10F007E8_Sig_Lane_Departure_Imminent_Left() ;
Msg_Departure_Right = Get_ID_10F007E8_Sig_Lane_Departure_Imminent_Right() ;
if(Msg_LDWS == 0)
{
u8Left_GuiMode = 1 ;
u8Right_GuiMode = 1 ;
}
else if(Msg_LDWS == 3)
{
if(Msg_Tracking_Left == 0)
{
u8Left_GuiMode = 2 ;
}
else if(Msg_Tracking_Left == 1)
{
u8Left_GuiMode = 3 ;
}
else
{
u8Left_GuiMode = 0u;
}
if(Msg_Tracking_Right == 0)
{
u8Right_GuiMode = 2 ;
}
else if(Msg_Tracking_Right == 1)
{
u8Right_GuiMode = 3 ;
}
else
{
u8Right_GuiMode = 0u ;
}
}
else if(Msg_LDWS == 5)
{
if(Msg_Departure_Left == 1)
{
u8Left_GuiMode = 4 ;
}
else
{
u8Left_GuiMode = 0u ;
}
if(Msg_Departure_Right == 1)
{
u8Right_GuiMode = 4 ;
}
else
{
u8Right_GuiMode = 0u ;
}
}
else
{
u8Left_GuiMode = 0 ;
u8Right_GuiMode = 0 ;
}
ADASVariable.Gui_LDWS_Left = u8Left_GuiMode ;
ADASVariable.Gui_LDWS_Right = u8Right_GuiMode ;
}
/*-------------------------------------------------------------------------
* Function Name : Gui_Get_WorkshopScope_DisplayMode
* Description : 车间范围显示模式
* Input : None
* Output : None
* Return : None
* onther : 刷图时使用
--------------------------------------------------------------------------*/
uint8_t Gui_Get_WorkshopScope_DisplayMode(void)
{
uint8_t u8Result = 0 ;
u8Result = ADASVariable.Gui_WorkshopScope ;
return u8Result ;
}
/*-------------------------------------------------------------------------
* Function Name : Gui_Get_LDWS_DisplayMode
* Description : LDWS显示模式_左车线
* Input : None
* Output : None
* Return : None
* onther : 刷图时使用
--------------------------------------------------------------------------*/
uint8_t Gui_Get_LDWS_Left_DisplayMode(void)
{
uint8_t u8Result = 0 ;
u8Result = ADASVariable.Gui_LDWS_Left ;
return u8Result ;
}
/*-------------------------------------------------------------------------
* Function Name : Gui_Get_LDWS_Right_DisplayMode
* Description : LDWS显示模式_右车线
* Input : None
* Output : None
* Return : None
* onther : 刷图时使用
--------------------------------------------------------------------------*/
uint8_t Gui_Get_LDWS_Right_DisplayMode(void)
{
uint8_t u8Result = 0 ;
u8Result = ADASVariable.Gui_LDWS_Right ;
return u8Result ;
}
source/Application/APP/ADAS/Data_ADAS.h deleted 100644 → 0
View file @ 68168d2d
#ifndef DATA_ADAS_H
#define DATA_ADAS_H
#include "TYW_stdint.h"
void ADAS_KL30_Init(void);
void ADAS_KL15_ON_Init(void);
void ADAS_KL15_OFF_Init(void);
void ADAS_Wakeup_Init(void);
void ADAS_Sleep_Init(void);
void ADAS_Processing_Service(void);
extern uint8_t Gui_Get_WorkshopScope_DisplayMode(void) ;
extern uint8_t Gui_Get_LDWS_Left_DisplayMode(void);
extern uint8_t Gui_Get_LDWS_Right_DisplayMode(void);
#endif
source/Application/APP/Data_AdBule/Data_AdBule.c deleted 100644 → 0
View file @ 68168d2d
#include "Data_AdBule.h"
#include "Gauges.h"
#include "GaugesInterface.h"
#include "CAN_Communication_Matrix.h"
//-------------------------------------------
//尿素 数据处理 wangboyu
//-------------------------------------------
//区域1显示逻辑
//-------------------------------------------
//342 - 4.3.DS油位显示器
//-------------------------------------------
static struct
{
uint8_t Number ;
en_ADBULE_Sta DisplaySta ;
} AdBuleVariable ;
/*-------------------------------------------------------------------------
* Function Name : AdBule_KL30_Init
* Description :
* Input : None
* Output : None
* Return : None
* onther : None
--------------------------------------------------------------------------*/
void AdBule_KL30_Init(void)
{
AdBuleVariable.Number = 0u;
AdBuleVariable.DisplaySta = ADBULE_LED_OFF;
}
void AdBule_KL15_ON_Init(void)
{
AdBuleVariable.Number = 0u;
AdBuleVariable.DisplaySta = ADBULE_LED_OFF;
}
void AdBule_KL15_OFF_Init(void)
{
AdBuleVariable.Number = 0u;
AdBuleVariable.DisplaySta = ADBULE_LED_OFF;
}
void AdBule_Wakeup_Init(void)
{
AdBuleVariable.Number = 0u;
AdBuleVariable.DisplaySta = ADBULE_LED_OFF;
}
void AdBule_Sleep_Init(void)
{
AdBuleVariable.Number = 0u;
AdBuleVariable.DisplaySta = ADBULE_LED_OFF;
}
/*-------------------------------------------------------------------------
* Function Name : AdBule_Processing_Service
* Description :
* Input : None
* Output : None
* Return : None
* onther : None
--------------------------------------------------------------------------*/
void AdBule_Processing_Service(void)
{
uint8_t Msg_Tank_Level = 0 ;
uint8_t Msg_Level_blinking = 0 ;
uint8_t u8Number = 0 ;
en_ADBULE_Sta u8DisplaySta = ADBULE_LED_OFF ;
Msg_Tank_Level = Get_ID_18FF2300_Sig_Tank_Level();
Msg_Level_blinking = Get_ID_18FF2300_Sig_Level_blinking();
//if(Get_CanFirstRecv_Event(ID_CanMsg18FF2300_Msg_Count) == 0)
//{
// u8Number = 0u;
// u8DisplaySta = ADBULE_LED_OFF;
//}
//else if (CAN_MSG_Status(ID_CanMsg18FF2300_Msg_Count) == CAN_SIG_LOST)
if (CAN_MSG_Status(ID_CanMsg18FF2300_Msg_Count) == CAN_SIG_LOST)
{
u8Number = 0u;
u8DisplaySta = ADBULE_LED_OFF;
}
else
{
if (Msg_Tank_Level == 0x3C)
{
u8Number = 5u;
}
else if (Msg_Tank_Level == 0x1C)
{
u8Number = 4u;
}
else if (Msg_Tank_Level == 0x0C)
{
u8Number = 3u;
}
else if (Msg_Tank_Level == 0x04)
{
u8Number = 2u;
}
else if (Msg_Tank_Level == 0x02)
{
u8Number = 1u;
}
else
{
u8Number = 0u;
}
if (Msg_Level_blinking == 0x03)
{
u8DisplaySta = ADBULE_LED_3HZ_FLASH ;
}
else if (Msg_Level_blinking == 0x01)
{
u8DisplaySta = ADBULE_LED_1HZ_FLASH ;
}
else
{
u8DisplaySta = ADBULE_LED_ON ;
}
}
AdBuleVariable.Number = u8Number ;
AdBuleVariable.DisplaySta = u8DisplaySta ;
}
/*-------------------------------------------------------------------------
* Function Name : AdBule_Get_Number
* Description : 返回尿素当前格数
* Input : None
* Output : None
* Return : None
* onther : None
--------------------------------------------------------------------------*/
uint8_t AdBule_Get_Number(void)
{
uint8_t u8Result = 0u;
u8Result = AdBuleVariable.Number;
return u8Result;
}
/*-------------------------------------------------------------------------
* Function Name : AdBule_Get_Display_Sta
* Description : 返回尿素当前显示模式(最后一格的显示模式)
* Input : None
* Output : None
* Return : None
* onther : None
--------------------------------------------------------------------------*/
en_ADBULE_Sta AdBule_Get_Display_Sta(void)
{
en_ADBULE_Sta u8Result = ADBULE_LED_OFF;
u8Result = AdBuleVariable.DisplaySta;
return u8Result;
}
\ No newline at end of file
source/Application/APP/Data_AdBule/Data_AdBule.h deleted 100644 → 0
View file @ 68168d2d
#ifndef DATA_ADBULE_H
#define DATA_ADBULE_H
#include "TYW_stdint.h"
typedef enum
{
ADBULE_LED_OFF = 0 ,
ADBULE_LED_1HZ_FLASH ,
ADBULE_LED_3HZ_FLASH ,
ADBULE_LED_ON ,
}en_ADBULE_Sta ;
void AdBule_KL30_Init(void);
void AdBule_KL15_ON_Init(void);
void AdBule_KL15_OFF_Init(void);
void AdBule_Wakeup_Init(void);
void AdBule_Sleep_Init(void);
void AdBule_Processing_Service(void);
uint8_t AdBule_Get_Number(void);
en_ADBULE_Sta AdBule_Get_Display_Sta(void);
#endif
source/Application/APP/Data_DrivingSupport/Data_DrivingSupport.c deleted 100644 → 0
View file @ 68168d2d
#include "Data_DrivingSupport.h"
#include "CAN_Communication_Matrix.h"
//-------------------------------------------
//驾驶支援数据处理 wangboyu
//-------------------------------------------
//区域6显示逻辑
//-------------------------------------------
//344 - 3.3 驾驶支援显示区域
//-------------------------------------------
static struct
{
uint8_t Gui_SysRunSta ;
uint8_t Gui_SetSpeed ;
}DrivSupVariable ;
static void Data_SystemRunningState_2_Gui(void);
static void Data_SetSpeed_2_Gui(void);
/*-------------------------------------------------------------------------
* Function Name : ADAS_KL30_Init
* Description :
* Input : None
* Output : None
* Return : None
* onther : None
--------------------------------------------------------------------------*/
void DrivingSupport_KL30_Init(void)
{
DrivSupVariable.Gui_SysRunSta = 0 ;
DrivSupVariable.Gui_SetSpeed = 0 ;
}
void DrivingSupport_KL15_ON_Init(void)
{
}
void DrivingSupport_KL15_OFF_Init(void)
{
}
void DrivingSupport_Wakeup_Init(void)
{
}
void DrivingSupport_Sleep_Init(void)
{
}
/*-------------------------------------------------------------------------
* Function Name : DrivingSupport_Processing_Service
* Description :
* Input : None
* Output : None
* Return : None
* onther : None
--------------------------------------------------------------------------*/
void DrivingSupport_Processing_Service(void)
{
Data_SystemRunningState_2_Gui();
Data_SetSpeed_2_Gui();
}
/*-------------------------------------------------------------------------
* Function Name : Data_SystemRunningState_2_Gui
* Description : 系统运行状态逻辑处理
* Input : None
* Output : None
* Return : None
* onther : None
--------------------------------------------------------------------------*/
static void Data_SystemRunningState_2_Gui(void)
{
uint8_t u8GuiMode = 0 ;
uint8_t EOL = 0x01 ;
uint8_t Msg_Cruise_VariableSLD_Disp = 0 ;
uint8_t Msg_Cruise_VariableSLD_Cont_Staus = 0 ;
Msg_Cruise_VariableSLD_Disp = Get_ID_18FF4100_Sig_Cruise_VariableSLD_Disp();
Msg_Cruise_VariableSLD_Cont_Staus = Get_ID_18FF4100_Sig_Cruise_VariableSLD_Cont_Staus();
if(Msg_Cruise_VariableSLD_Disp == 0x01)
{//定速巡航
if(EOL != 0x01)
{
u8GuiMode = 0 ;
}
else
{
if(Msg_Cruise_VariableSLD_Cont_Staus == 0x00)
{
u8GuiMode = 1 ;
}
else if(Msg_Cruise_VariableSLD_Cont_Staus == 0x01)
{
u8GuiMode = 2 ;
}
else if(Msg_Cruise_VariableSLD_Cont_Staus == 0x02)
{
u8GuiMode = 3;
}
else if(Msg_Cruise_VariableSLD_Cont_Staus == 0x03)
{
u8GuiMode = 4;
}
else
{
u8GuiMode = 0 ;
}
}
}
else if(Msg_Cruise_VariableSLD_Disp == 0x03)
{//SLD
if(EOL == 0x00)
{
u8GuiMode = 0 ;
}
else if(EOL == 0x01)
{
if(Msg_Cruise_VariableSLD_Cont_Staus == 0x00)
{
u8GuiMode = 5 ;
}
else if(Msg_Cruise_VariableSLD_Cont_Staus == 0x01)
{
u8GuiMode = 6 ;
}
else if(Msg_Cruise_VariableSLD_Cont_Staus == 0x02)
{
u8GuiMode = 7 ;
}
else if(Msg_Cruise_VariableSLD_Cont_Staus == 0x03)
{
u8GuiMode = 8 ;
}
else
{
u8GuiMode = 0 ;
}
}
else
{
u8GuiMode = 0 ;
}
}
else
{
u8GuiMode = 0 ;
}
DrivSupVariable.Gui_SysRunSta = u8GuiMode ;
}
/*-------------------------------------------------------------------------
* Function Name : Data_SetSpeed_2_Gui
* Description : 设定车速逻辑处理
* Input : None
* Output : None
* Return : None
* onther : None
--------------------------------------------------------------------------*/
static void Data_SetSpeed_2_Gui(void)
{
uint8_t u8GuiMode = 0 ;
uint8_t Msg_Indicate_Lamp_Speed = 0xff ;
Msg_Indicate_Lamp_Speed = Get_ID_18FF4100_Sig_Indicate_Lamp_Speed();
if (CAN_MSG_Status(ID_CanMsg18FF4100_Msg_Count) == CAN_SIG_LOST)
{
u8GuiMode = 0xff ;
}
else
{
if(Msg_Indicate_Lamp_Speed == 0x00)
{
u8GuiMode = 0 ;
}
else if(Msg_Indicate_Lamp_Speed <= 0xFA)
{
u8GuiMode = Msg_Indicate_Lamp_Speed ;
}
else
{
u8GuiMode = 0xff ;
}
}
DrivSupVariable.Gui_SetSpeed = u8GuiMode ;
}
/*-------------------------------------------------------------------------
* Function Name : Gui_Get_SystemRunningState_DisplayMode
* Description : 系统运行状态显示模式
* Input : None
* Output : None
* Return : None
* onther : 刷图时使用
--------------------------------------------------------------------------*/
uint8_t Gui_Get_SystemRunningState_DisplayMode(void)
{
uint8_t u8Result = 0 ;
u8Result = DrivSupVariable.Gui_SysRunSta ;
return u8Result ;
}
/*-------------------------------------------------------------------------
* Function Name : Gui_Get_SetSpeed_DisplayMode
* Description : 设定车速显示模式
* Input : None
* Output : None
* Return : None
* onther : 刷图时使用
--------------------------------------------------------------------------*/
uint8_t Gui_Get_SetSpeed_DisplayMode(void)
{
uint8_t u8Result = 0 ;
u8Result = DrivSupVariable.Gui_SetSpeed ;
return u8Result ;
}
source/Application/APP/Data_DrivingSupport/Data_DrivingSupport.h deleted 100644 → 0
View file @ 68168d2d
#ifndef DATA_DRIVINGSUPPORT_H
#define DATA_DRIVINGSUPPORT_H
#include "TYW_stdint.h"
void DrivingSupport_KL30_Init(void);
void DrivingSupport_KL15_ON_Init(void);
void DrivingSupport_KL15_OFF_Init(void);
void DrivingSupport_Wakeup_Init(void);
void DrivingSupport_Sleep_Init(void);
void DrivingSupport_Processing_Service(void);
extern uint8_t Gui_Get_SystemRunningState_DisplayMode(void);
extern uint8_t Gui_Get_SetSpeed_DisplayMode(void);
#endif
source/Application/APP/PowerManagement/PowerManagement_user.c
View file @ 11846833
...@@ -16,8 +16,6 @@ ...@@ -16,8 +16,6 @@
#include "Seg_Ref.h" #include "Seg_Ref.h"
#include "Seatbelt.h" #include "Seatbelt.h"
#include "Door.h" #include "Door.h"
#include "Data_ADAS.h"
#include "Data_AdBule.h"
#include "Data_AirPressure.h" #include "Data_AirPressure.h"
#include "Key.h" #include "Key.h"
#include "Menu.h" #include "Menu.h"
...@@ -107,9 +105,7 @@ Power_Status_t Power_KL30_Init ( void ) ...@@ -107,9 +105,7 @@ Power_Status_t Power_KL30_Init ( void )
RTE_PWM_Init(); RTE_PWM_Init();
/*按键部分 杨真东维护结束*/ /*按键部分 杨真东维护结束*/
ADAS_KL30_Init();
AirPressure_KL30_Init(); AirPressure_KL30_Init();
AdBule_KL30_Init();
Individual_ECU_Comm_KL30_Init(); Individual_ECU_Comm_KL30_Init();
/*报警调度初始化*/ /*报警调度初始化*/
Popup_Scheduler_Init(); Popup_Scheduler_Init();
...@@ -166,7 +162,6 @@ Power_Status_t Power_Wakeup_Init ( void ) ...@@ -166,7 +162,6 @@ Power_Status_t Power_Wakeup_Init ( void )
/*车速 转速 水温表头 初始化 田雨 维护开始*/ /*车速 转速 水温表头 初始化 田雨 维护开始*/
UserGaugeK30Init(); UserGaugeK30Init();
/*车速 转速 水温表头 初始化 田雨 维护开始*/ /*车速 转速 水温表头 初始化 田雨 维护开始*/
ADAS_Wakeup_Init();
Data_User_Mileage_KL15Init(); Data_User_Mileage_KL15Init();
Maintenance_WakeUp_Init(); Maintenance_WakeUp_Init();
/*安全带 车门部分 李茂军维护开始*/ /*安全带 车门部分 李茂军维护开始*/
......
source/Application/CAN_APP_NM/CAN_App/CAN_Communication_Matrix.c
View file @ 11846833
...@@ -47,7 +47,7 @@ const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] = ...@@ -47,7 +47,7 @@ const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] =
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
5000ul, 2000ul,
0x18FED900ul, 0x18FED900ul,
(( void * )0), (( void * )0),
(( void * )0), (( void * )0),
...@@ -487,12 +487,7 @@ uint8_t Get_ID_18FED900_Sig_DPF_Regeneration_Status(void) ...@@ -487,12 +487,7 @@ uint8_t Get_ID_18FED900_Sig_DPF_Regeneration_Status(void)
uint8_t Get_ID_18FED900_Sig_DPF_storage(void) uint8_t Get_ID_18FED900_Sig_DPF_storage(void)
{ {
return (((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18FED900_Msg_Count, 7u) >> 5u) & 0x07u)); return (((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18FED900_Msg_Count, 6u) >> 0u) & 0xFFu));
}
uint8_t Get_ID_18FED900_Sig_ID18FED900_byte7_bit5_6(void)
{
return (((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18FED900_Msg_Count, 6u) >> 4u) & 0x03u));
} }
uint8_t Get_ID_18FED900_Sig_SVS_Lamp_Status(void) uint8_t Get_ID_18FED900_Sig_SVS_Lamp_Status(void)
......
source/Application/CAN_APP_NM/CAN_App/CAN_Communication_Matrix.h
View file @ 11846833
...@@ -127,7 +127,6 @@ extern uint8_t Get_ID_18FF2300_Sig_Exh_Lamp(void); ...@@ -127,7 +127,6 @@ extern uint8_t Get_ID_18FF2300_Sig_Exh_Lamp(void);
extern uint8_t Get_ID_18FED900_Sig_PTO_SW(void); extern uint8_t Get_ID_18FED900_Sig_PTO_SW(void);
extern uint8_t Get_ID_18FED900_Sig_DPF_Regeneration_Status(void); extern uint8_t Get_ID_18FED900_Sig_DPF_Regeneration_Status(void);
extern uint8_t Get_ID_18FED900_Sig_DPF_storage(void); extern uint8_t Get_ID_18FED900_Sig_DPF_storage(void);
extern uint8_t Get_ID_18FED900_Sig_ID18FED900_byte7_bit5_6(void);
extern uint8_t Get_ID_18FED900_Sig_SVS_Lamp_Status(void); extern uint8_t Get_ID_18FED900_Sig_SVS_Lamp_Status(void);
extern uint8_t Get_ID_18FE5BE8_Sig_Camera_Status(void); extern uint8_t Get_ID_18FE5BE8_Sig_Camera_Status(void);
extern uint8_t Get_ID_18FE5BE8_Sig_Lane_Tracking_Status_Right_Side(void); extern uint8_t Get_ID_18FE5BE8_Sig_Lane_Tracking_Status_Right_Side(void);
......
source/Application/Graphic/GUI/GUI.c
View file @ 11846833
...@@ -27,6 +27,8 @@ ...@@ -27,6 +27,8 @@
#define TRAPA 0u #define TRAPA 0u
#define TRAPB 1u #define TRAPB 1u
uint32_t HYQ_TEST = 3;
volatile _Display_State_Flag State_Flag; volatile _Display_State_Flag State_Flag;
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
...@@ -216,6 +218,7 @@ void GUI_Time_Dispaly(uint8_t Mode) ...@@ -216,6 +218,7 @@ void GUI_Time_Dispaly(uint8_t Mode)
{ {
/*时*/ /*时*/
Time_Hours = Get_RTC_HOUR(); Time_Hours = Get_RTC_HOUR();
if (0u) /*12小时*/ if (0u) /*12小时*/
{ {
if (Time_Hours == 0) if (Time_Hours == 0)
...@@ -233,11 +236,12 @@ void GUI_Time_Dispaly(uint8_t Mode) ...@@ -233,11 +236,12 @@ void GUI_Time_Dispaly(uint8_t Mode)
} }
else else
{ {
GUI_General_Digit_Display(Time_Sprite, Time_Hours, Nb_21_0, 2u, 1u, GUI_DISP_Hours, 37, GUI_BLENDMODE_SRC_OVER); /*显示小时*/ GUI_General_Digit_Display(Time_Sprite, Time_Hours, Nb_21_0, 2u, 0u, GUI_DISP_Hours, 37, GUI_BLENDMODE_SRC_OVER); /*显示小时*/
} }
/*分钟*/ /*分钟*/
Time_Minutes = Get_RTC_MINUTE(); Time_Minutes = Get_RTC_MINUTE();
GUI_General_Digit_Display(Time_Sprite, Time_Minutes, Nb_21_0, 2u, 0u, GUI_DISP_Minutes, 37, GUI_BLENDMODE_SRC_OVER); /*显示分钟*/ GUI_General_Digit_Display(Time_Sprite, Time_Minutes, Nb_21_0, 2u, 0u, GUI_DISP_Minutes, 37, GUI_BLENDMODE_SRC_OVER); /*显示分钟*/
if (FLASH_SYNC_1Hz) if (FLASH_SYNC_1Hz)
...@@ -333,7 +337,6 @@ void GUI_TFTTelltales_Display(uint8_t Mode) ...@@ -333,7 +337,6 @@ void GUI_TFTTelltales_Display(uint8_t Mode)
* Return : None * Return : None
* onther : 区域 * onther : 区域
--------------------------------------------------------------------------*/ --------------------------------------------------------------------------*/
uint32_t HYQ_TEST = 3;
void GUI_WetGas_Dispaly(uint8_t Mode) void GUI_WetGas_Dispaly(uint8_t Mode)
{ {
uint8_t current_value = 0u; uint8_t current_value = 0u;
...@@ -1350,14 +1353,14 @@ void GUI_Battery_Display_Display(uint8_t Mode) ...@@ -1350,14 +1353,14 @@ void GUI_Battery_Display_Display(uint8_t Mode)
void GUI_DPD_Display_Display(uint8_t Mode) void GUI_DPD_Display_Display(uint8_t Mode)
{ {
uint16_t value = 0u; uint16_t value = 0u;
// value = AUXIO_DPF_Status * 20 / 5;
if (Mode == GUI_DISP_MODE_NORMAL) if (Mode == GUI_DISP_MODE_NORMAL)
{ {
if ((K_Line_Set.K_Line_LID33 == 0x00u) || (K_Line_Set.K_Line_LID33 == 0x01u)) if ((K_Line_Set.K_Line_LID33 == 0x00u) || (K_Line_Set.K_Line_LID33 == 0x01u))
{ {
value = HYQ_TEST; value = Get_ID_18FED900_Sig_DPF_storage();
value = value * 20u / 5u;
//Get_ID_18FED900_Sig_DPF_Regeneration_Status();/*8 4-5*/
if (1) if (1)
{ {
GUI_General_Display(MultiPurpose_Sprite, CN_DPD_duijiliang, GUI_BLENDMODE_SRC_OVER); /*DPD堆积绿*/ GUI_General_Display(MultiPurpose_Sprite, CN_DPD_duijiliang, GUI_BLENDMODE_SRC_OVER); /*DPD堆积绿*/
...@@ -1367,9 +1370,6 @@ void GUI_DPD_Display_Display(uint8_t Mode) ...@@ -1367,9 +1370,6 @@ void GUI_DPD_Display_Display(uint8_t Mode)
GUI_General_Display(MultiPurpose_Sprite, CN_DPD_zaishengjindu, GUI_BLENDMODE_SRC_OVER); /*DPD再生黄*/ GUI_General_Display(MultiPurpose_Sprite, CN_DPD_zaishengjindu, GUI_BLENDMODE_SRC_OVER); /*DPD再生黄*/
} }
GUI_General_Display(MultiPurpose_Sprite, CN_DPD_L, GUI_BLENDMODE_SRC_OVER); /*L*/
GUI_General_Display(MultiPurpose_Sprite, CN_DPD_H, GUI_BLENDMODE_SRC_OVER); /*H*/
if ((value >= 0u) && (value <= 100u)) if ((value >= 0u) && (value <= 100u))
{ {
GUI_General_Display(MultiPurpose_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER); GUI_General_Display(MultiPurpose_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
...@@ -1408,6 +1408,9 @@ void GUI_DPD_Display_Display(uint8_t Mode) ...@@ -1408,6 +1408,9 @@ void GUI_DPD_Display_Display(uint8_t Mode)
{ {
GUI_General_Display(MultiPurpose_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER); GUI_General_Display(MultiPurpose_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
} }
GUI_General_Display(MultiPurpose_Sprite, CN_DPD_L, GUI_BLENDMODE_SRC_OVER); /*L*/
GUI_General_Display(MultiPurpose_Sprite, CN_DPD_H, GUI_BLENDMODE_SRC_OVER); /*H*/
} }
} }
else else
...@@ -1580,7 +1583,7 @@ void GUI_Year_Month_Data_Display(uint8_t Mode) ...@@ -1580,7 +1583,7 @@ void GUI_Year_Month_Data_Display(uint8_t Mode)
} }
else else
{ {
GUI_General_Digit_Display(MultiPurpose_Sprite, Time_Hours, Nb_17_0, 2u, 1u, GUI_DISP_MENUHours, 279u, GUI_BLENDMODE_SRC_OVER); GUI_General_Digit_Display(MultiPurpose_Sprite, Time_Hours, Nb_17_0, 2u, 0u, GUI_DISP_MENUHours, 279u, GUI_BLENDMODE_SRC_OVER);
} }
Time_Minutes = Get_RTC_MINUTE(); Time_Minutes = Get_RTC_MINUTE();
......
source/Application/Graphic/GUI/GUI.h
View file @ 11846833
...@@ -58,8 +58,6 @@ typedef struct ...@@ -58,8 +58,6 @@ typedef struct
extern volatile _Display_State_Flag State_Flag; extern volatile _Display_State_Flag State_Flag;
static const uint32_t GUIWedk[7u] = {CN_xingqiyi, CN_xingqier, CN_xingqisan, CN_xingqisi, CN_xingqiwu, CN_xingqiliu, CN_xingqiri}; static const uint32_t GUIWedk[7u] = {CN_xingqiyi, CN_xingqier, CN_xingqisan, CN_xingqisi, CN_xingqiwu, CN_xingqiliu, CN_xingqiri};
static const uint32_t GUIMenuWedk[7u] = {CN_Mon, CN_Tue, CN_Wed, CN_Thu, CN_Fri, CN_Sat, CN_ri}; static const uint32_t GUIMenuWedk[7u] = {CN_Mon, CN_Tue, CN_Wed, CN_Thu, CN_Fri, CN_Sat, CN_ri};
static const uint32_t GUIGear[12u] = {CN_dangwei_1, CN_dangwei_2, CN_dangwei_3, CN_dangwei_4, CN_dangwei_5, CN_dangwei_6, CN_dangwei_7, CN_dangwei_8, CN_dangwei_9, CN_dangwei_10, CN_dangwei_11, CN_dangwei_12}; static const uint32_t GUIGear[12u] = {CN_dangwei_1, CN_dangwei_2, CN_dangwei_3, CN_dangwei_4, CN_dangwei_5, CN_dangwei_6, CN_dangwei_7, CN_dangwei_8, CN_dangwei_9, CN_dangwei_10, CN_dangwei_11, CN_dangwei_12};
......
source/Application/RTE/Common_Interface.c
View file @ 11846833
...@@ -340,7 +340,7 @@ void K_LINE_EOL_InitVal(void) ...@@ -340,7 +340,7 @@ void K_LINE_EOL_InitVal(void)
K_Line_Set.K_Line_LID24 = 0x00u; /* 00 HSA //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_LID25 = 0x00u; /* 00 AEBS //0：无、1：有 */
K_Line_Set.K_Line_LID26 = 0x00u; /* 00 ACC //0：无、1：有 */ K_Line_Set.K_Line_LID26 = 0x00u; /* 00 ACC //0：无、1：有 */
K_Line_Set.K_Line_LID27 = 0x00u; /* 00 LDWS //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_LID28 = 0x01u; /* 01 车辆间报警 //0：无、1：有 */
K_Line_Set.K_Line_LID29 = 0x01u; /* 01 有无巡航 //0：无、1：有 /*初值1*/ K_Line_Set.K_Line_LID29 = 0x01u; /* 01 有无巡航 //0：无、1：有 /*初值1*/
K_Line_Set.K_Line_LID2A = 0x00u; /* 00 气悬 //0：Reef、1：Rear air、2：Full air */ K_Line_Set.K_Line_LID2A = 0x00u; /* 00 气悬 //0：Reef、1：Rear air、2：Full air */
......
source/System/tasks.c
View file @ 11846833
...@@ -39,11 +39,8 @@ ...@@ -39,11 +39,8 @@
#include "AC_TEMP.h" #include "AC_TEMP.h"
#include "Data_Time.h" #include "Data_Time.h"
#include "Data_Gear.h" #include "Data_Gear.h"
#include "Data_AdBule.h"
#include "Data_ADAS.h"
#include "Data_Voltmeter.h" #include "Data_Voltmeter.h"
#include "Data_WET.h" #include "Data_WET.h"
#include "Data_DrivingSupport.h"
#include "Data_AirPressure.h" #include "Data_AirPressure.h"
#include "Data_Fuel_User.h" #include "Data_Fuel_User.h"
#include "Services_Mileage.h" #include "Services_Mileage.h"
...@@ -168,9 +165,6 @@ void Sys_Run_Mode_20ms_Tasks(void) ...@@ -168,9 +165,6 @@ void Sys_Run_Mode_20ms_Tasks(void)
Tacho_Processing_Service(); Tacho_Processing_Service();
Speed_Processing_Service(); Speed_Processing_Service();
Telltales_Left_Right_Management_Service(); Telltales_Left_Right_Management_Service();
AdBule_Processing_Service();
ADAS_Processing_Service();
DrivingSupport_Processing_Service();
AirPressure_Processing_Service(); AirPressure_Processing_Service();
Voltmeter_Processing_Service(); Voltmeter_Processing_Service();
Sound_Management_Service(); Sound_Management_Service();
......
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