Skip to content

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

调整菜单显示

parent 7c419289
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 22636 additions and 24047 deletions
ghs/group/Application.gpj
View file @ d8fbf34c
......@@ -5,8 +5,6 @@
.\common\devassert.h
.\common\TYW_Config.h
.\common\TYW_stdint.h
.\Graphic\UE\DispSch.h
.\Graphic\UE\UE_Lib.a
.\UDS\APP\Common\libhello.h
.\UDS\APP\Common\libhello.a
.\Graphic\GUI_VC66\GUI_VC66_General.c
......@@ -46,8 +44,6 @@
.\Graphic\GUI\GUI.h
.\Graphic\GUI\GUI_Interface.c
.\Graphic\GUI\GUI_Interface.h
.\Graphic\GUI\GUI_Menu_Energy.c
.\Graphic\GUI\GUI_Menu_Energy.h
.\Alarm\AlarmGeneralFilie.c
.\Alarm\AlarmGeneralFilie.h
.\Alarm\Door.c
......@@ -172,13 +168,12 @@
.\APP\Telltales\Telltales.h
.\APP\Telltales\Telltales_user.c
.\APP\Telltales\Telltales_user.h
.\Graphic\Menu\Menu_V2.4.a
.\Graphic\Menu\Menu.h
.\Graphic\Menu\Menu_Interface.c
.\Graphic\Menu\Menu_user.c
.\Graphic\UE\DisplaySch.c
.\Graphic\UE\DisplaySch.h
.\Graphic\UE\UE_Lib.a
.\Graphic\UE\DispSch.h
.\Graphic\UE\DisplaySch_user.c
.\Graphic\UE\DisplaySch_user.h
.\RTE\Common_Interface.c
.\RTE\Common_Interface.h
.\RTE\RTE_ADC.c
......
ghs/project
View file @ d8fbf34c
No preview for this file type
ghs/project.hex
View file @ d8fbf34c
This diff is collapsed.
ghs/project.siz
View file @ d8fbf34c
project .intvect 1536
project .text 297884
project .rodata 412311
project .text 291052
project .rodata 406279
project .secinfo 120
project .syscall 6
project .romdata 7765
project .romdata 7717
project .ROM.ramfunc 208
project .ramfunc 208
source/Application/APP/BackLight/BackLight_APP.c
View file @ d8fbf34c
#include "BackLight_APP.h"
#include "RTE_PWM_OUT.h"
#include "Common_Interface.h"
#include "DisplaySch.h"
#include "Popup_List.h"
#include "Popup_Scheduler.h"
#include "GPIO.h"
......@@ -231,4 +230,4 @@ void SEG_LCD_Window_Control_Service ( void )
SEG0_MCU_OUT = 0;
COMM_MCU_OUT = 0;
}
}
\ No newline at end of file
}
source/Application/APP/LINE_IN/Line_In_user.c
View file @ d8fbf34c
......@@ -48,7 +48,7 @@ const Line_In_Attribute_st_t g_stLineInAttribute[LINE_IN_MAX] =
{ LINE_IN_LEVEL_HIGH, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_HI_BEAM,}, /*A25 HI BEAM*/
{ LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_BRAKE_AIR_EBS,}, /*A28 BRAKE AIR/EBS*/
{ LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_SEAT_BELT,}, /*A30 SEAT BELT*/
{ LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_MIL,}, /*A31 MIL*/
{ LINE_IN_LEVEL_HIGH, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_MIL,}, /*A31 MIL*/
{ LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_ENG_OIL,}, /*A32 ENG OIL*/
{ LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_CHARGE,}, /*A34 CHARGE*/
{ LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_TRAILER_ABS_INFO,}, /*B03 TRAILER ABS INFO*/
......@@ -56,7 +56,7 @@ const Line_In_Attribute_st_t g_stLineInAttribute[LINE_IN_MAX] =
{ LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_ACC_AIR,}, /*B15 ACC AIR*/
{ LINE_IN_LEVEL_HIGH, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_AIR_SUS,}, /*B30 AIR SUS*/
{ LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_TRAILER_BRAKE,}, /*B31 TRAILER BRAKE*/
{ LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_TRAILER_ABS,}, /*B33 TRAILER ABS*/
{ LINE_IN_LEVEL_HIGH, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_TRAILER_ABS,}, /*B33 TRAILER ABS*/
{ LINE_IN_LEVEL_HIGH, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_RR_DIFF_LOCK,}, /*B36 RR DIFF LOCK*/
{ LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_WEAR_IND,}, /*B38 WEAR IND*/
......
source/Application/APP/PowerManagement/PowerManagement_user.c
View file @ d8fbf34c
......@@ -12,7 +12,6 @@
#include "Service_OFF_Time.h"
#include "RTE_CAN_NM.h"
#include "Telltales.h"
#include "DisplaySch.h"
#include "Line_in.h"
#include "Seg_Ref.h"
#include "Seatbelt.h"
......@@ -57,8 +56,6 @@ static uint8_t PowerGetNMStatus(void);
Power_Status_t Power_KL30_Init ( void )
{
Power_Status_t u8PowerSts;
Menu_Init_st_t pstMenuInit;
/*电源 指示灯 硬线 通用信息部分 赵建智 维护开始*/
ClearNoInitArea();
Common_DataInit();
......@@ -96,13 +93,6 @@ Power_Status_t Power_KL30_Init ( void )
/*按键部分 杨真东维护开始*/
Key_Init();
pstMenuInit.enMenuItemLen = MENU_ITEM_MAX ;
pstMenuInit.enMenuInterfaceLen = MENU_INTERFACE_MAX ;
pstMenuInit.enMenuBranchLen = MENU_BRANCH_MAX ;
pstMenuInit.u32MenuConfig = 0u ;
Menu_Init(u8MenuRamData, stMenuItemAttribute, &pstMenuInit);
VCC12V0_OUT_EN = 1U; /*12V 电源使能*/
VCC05V0_OUT_EN = 1U; /*外设5V 电源使能*/
D1530_EN_MCU_OUT = 1U; /*1530 使能*/
......@@ -162,15 +152,6 @@ void Power_Sleep_Init(void)
Power_Status_t Power_Wakeup_Init ( void )
{
Power_Status_t u8PowerSts;
Menu_Init_st_t pstMenuInit;
pstMenuInit.enMenuItemLen = MENU_ITEM_MAX ;
pstMenuInit.enMenuInterfaceLen = MENU_INTERFACE_MAX ;
pstMenuInit.enMenuBranchLen = MENU_BRANCH_MAX ;
pstMenuInit.u32MenuConfig = 0u ;
Menu_Wake_Up_Init(u8MenuRamData, stMenuItemAttribute, &pstMenuInit);
/*电源 指示灯 硬线 通用信息部分 赵建智 维护开始*/
Common_DataInit();
Sys_WakeUp_Init();
......
source/Application/APP/Telltales/Telltales_user.c
View file @ d8fbf34c
......@@ -317,9 +317,10 @@ uint8_t LED_EXH_BRAKE_T_Judgement(void)
{
uint8_t u8Result = 0u;
uint8_t m_Condition1 = 0u;
m_Condition1 = (uint8_t)Get_ID_18FF2300_Sig_Exh_Lamp();
if (m_Condition1 == 0u)
if (m_Condition1 == 0x01u)
{
u8Result = 1u;
}
......@@ -489,11 +490,11 @@ uint8_t LED_MIL_T_Judgement(void)
if (m_Condition1 == 1u)
{
u8Result = 0u;
u8Result = 1u;
}
else
{
u8Result = 1u;
u8Result = 0u;
}
return u8Result;
......@@ -627,19 +628,22 @@ uint8_t LED_RETARDER_T_Judgement(void)
m_Condition1 = (uint8_t)Get_ID_18FF5510_Sig_Intarder_Pilot_Lamp_State();
if (m_Condition1 == 1u)
{
u8Result = 1u;
}
else if (m_Condition1 == 2u)
if (K_Line_Set.K_Line_LID41 == 0x13u)
{
if (FLASH_SYNC_1Hz == 1u)
if (m_Condition1 == 1u)
{
u8Result = 2u;
u8Result = 1u;
}
else
else if (m_Condition1 == 2u)
{
u8Result = 0u;
if (FLASH_SYNC_1Hz == 1u)
{
u8Result = 2u;
}
else
{
u8Result = 0u;
}
}
}
else
......@@ -827,13 +831,16 @@ uint8_t LED_AEBS_OFF_L_Judgement(void)
m_Condition2 = (uint8_t)Get_ID_CF02FA1_Sig_Advanced_Emerg_Braking_Sys_Sta();
m_Condition3 = (uint8_t)Get_ID_CF02FA0_Sig_Advanced_Emerg_Braking_Sys_Sta();
if ((m_Condition1 == 2u) || (m_Condition2 == 2u) || (m_Condition3 == 2u))
{
u8Result = 1u;
}
else if ((m_Condition1 == 14u) || (m_Condition2 == 14u) || (m_Condition3 == 14u))
if (K_Line_Set.K_Line_LID28 == 0x01u)
{
u8Result = FLASH_SYNC_1Hz;
if ((m_Condition1 == 2u) || (m_Condition2 == 2u) || (m_Condition3 == 2u))
{
u8Result = 1u;
}
else if ((m_Condition1 == 14u) || (m_Condition2 == 14u) || (m_Condition3 == 14u))
{
u8Result = FLASH_SYNC_1Hz;
}
}
else
{
......@@ -874,17 +881,30 @@ uint8_t LED_LDWS_L_Judgement(void)
uint8_t u8Result = 0u;
uint8_t m_Condition1 = 0u;
uint8_t m_Condition2 = 0u;
uint8_t CanStatus1 = 0u;
uint8_t CanStatus2 = 0u;
m_Condition1 = (uint8_t)Get_ID_18FE5BE8_Sig_Lane_Departure_Warning_Sys_Sta();
m_Condition2 = (uint8_t)Get_ID_18FECAE8_Sig_Amber_Warning_Lamp_Status();
if ((m_Condition1 == 2u) || (m_Condition2 == 1u))
{
u8Result = 1u;
}
else if ((m_Condition1 == 5u) || (m_Condition1 == 14u) || (m_Condition1 == 0u))
CanStatus1 = CAN_MSG_Status(ID_CanMsg18FE5BE8_Msg_Count);
CanStatus2 = CAN_MSG_Status(ID_CanMsg18FECAE8_Msg_Count);
if (K_Line_Set.K_Line_LID27 == 0x01u)
{
u8Result = FLASH_SYNC_1Hz;
/*LDWS与FCW同时掉线闪烁*/
if ((CanStatus1 == CAN_SIG_LOST) && (CanStatus2 == CAN_SIG_LOST))
{
u8Result = FLASH_SYNC_1Hz;
}
else if ((m_Condition1 == 0x02u) || (m_Condition2 == 0x01u))
{
u8Result = 1u;
}
else if ((m_Condition1 == 0x00u) || (m_Condition1 == 0x05u) || (m_Condition1 == 0x0Eu))
{
u8Result = FLASH_SYNC_1Hz;
}
}
else
{
......@@ -1886,7 +1906,7 @@ uint8_t LED_TRAILER_ABS_INFO_U_Judgement(void)
uint8_t m_Condition1 = 0u;
m_Condition1 = (uint8_t)Line_In_Get_Status(LINE_IN_TRAILER_ABS_INFO);
if (m_Condition1 == 1u)
if (m_Condition1 == 0x01u)
{
u8Result = 1u;
}
......
source/Application/Graphic/GUI/GUI.c
View file @ d8fbf34c
#include "GUI.h"
#include "r_typedefs.h"
//#include "r_ddb_api.h"
//#include "r_cdi_api.h"
//#include "r_wm_api.h"
//#include "davehd_driver.h"
//#include "main.h"
//#include "Graphic.h"
//#include "r_drw2d_os.h"
//#include "r_drw2d_api.h"
//#include "r_config_drw2d.h"
//#include "r_drw2d_ctx_dhd.h"
//#include "r_jcua_api.h"
//#include "r_gpio_api.h"
//#include "r_dev_pin_types.h"
//#include "r_dev_api.h"
////#include "sflash.h"
#include "loc_graphics.h"
//#include "write.h"
#include "images.h"
#include "jcua.h"
#include "Watchdog.h"
#include "Menu.h"
#include "GUI_Interface.h"
#include "CAN_Communication_Matrix.h"
#include "Services_Mileage.h"
#include "RTE_ADC.h"
#include "GaugesInterface.h"
#include "Service_TPMS.h"
#include "DisplaySch_user.h"
#include "CD4051.h"
#include "Data_Gear.h"
#include "Maintenance.h"
#include "Data_FuelConsump.h"
#include "Common_Interface.h"
#include "System_Monitor.h"
#include "Flash_synchronizer.h"
#include "GUI_VC66_Include.h"
#include "Popups.h"
#include "Data_Fuel_User.h"
/*-------------------------------------------------------------------------
* Function Name : GUI_Display_KL15_ON_Init
* Description :
* Description :
* Input : None
* Output : None
* Return : None
......@@ -62,12 +34,12 @@
--------------------------------------------------------------------------*/
void GUI_Display_KL15_ON_Init(void)
{
loc_enable_mem(WET_Sprite, Calendar_Sprite);
GUI_Display_background();
loc_enable_mem(WET_Sprite, Calendar_Sprite);
GUI_Display_background();
}
/*-------------------------------------------------------------------------
* Function Name : GUI_Display_KL15_OFF_Init
* Description :
* Description :
* Input : None
* Output : None
* Return : None
......@@ -89,7 +61,7 @@ void GUI_Display_KL15_OFF_Init(void)
--------------------------------------------------------------------------*/
void GUI_Display_background(void)
{
GUI_General_Display(WET_Sprite, ditu, GUI_BLENDMODE_CUSTOM);
GUI_General_Display(WET_Sprite, ditu, GUI_BLENDMODE_CUSTOM);
}
/*-------------------------------------------------------------------------
* Function Name : GUI_Display_OftenShow_Group
......@@ -112,6 +84,7 @@ void GUI_Display_OftenShow_Group(void)
Gui_Display_Time();
Gui_Display_TRIPA();
}
/*-------------------------------------------------------------------------
* Function Name : GUI_Display_UsuallyConv
* Description : 通常显示选择
......@@ -119,111 +92,4 @@ void GUI_Display_OftenShow_Group(void)
* Output : None
* Return : None
* onther : None
--------------------------------------------------------------------------*/
void GUI_Display_UsuallyConv(en_USUALLY_GROUP Type)
{
switch(Type)
{
case USUALLY_NULL:
break ;
case USUALLY_BLANK:
GUI_General_Display(MultiPurpose_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
break ;
case USUALLY_TRIPA:
GUI_Display_Usually_AvrFuelCons(0);
GUI_Display_Usually_AvrSpeed(0);
break ;
case USUALLY_TRIPB:
GUI_Display_Usually_AvrFuelCons(1);
GUI_Display_Usually_AvrSpeed(1);
break ;
case USUALLY_VOLTMETER:
GUI_Display_Usually_VoltMeter();
break ;
case USUALLY_CALENDAR:
GUI_Display_Usually_Calendar();
break ;
case USUALLY_TIME_TABLE:
GUI_Display_Usually_TimeTable();
break ;
case USUALLY_DPD_ACCUMULATION:
GUI_Display_Usually_DPD(0);
break ;
case USUALLY_DPD_REGENERATION:
GUI_Display_Usually_DPD(1);
break ;
default:
break ;
}
}
/*-------------------------------------------------------------------------
* Function Name : GUI_wby_test_Display
* Description : 测试
* Input : None
* Output : None
* Return : None
* onther : None
--------------------------------------------------------------------------*/
uint8_t wbyTestflag = 0 ;
uint16_t TestUnicode[4u] = {0x5ba4,0x5916,0x6e29,0x5ea6};
void GUI_wby_test_Display(void)
{
//GUI_Unicode_Display(Temp_Sprite, 106, 45, TestUnicode, 4, 0xFFFFFFFF);
GUI_Display_OftenShow_Group();
switch(wbyTestflag)
{
case 0 :
GUI_Display_UsuallyConv(USUALLY_BLANK);
break ;
case 1 :
GUI_Display_UsuallyConv(USUALLY_TRIPA);
break ;
case 2 :
GUI_Display_UsuallyConv(USUALLY_TRIPB);
break ;
case 3 :
GUI_Display_UsuallyConv(USUALLY_VOLTMETER);
break ;
case 4 :
GUI_Display_UsuallyConv(USUALLY_CALENDAR);
break ;
case 5 :
GUI_Display_UsuallyConv(USUALLY_TIME_TABLE);
break ;
case 6 :
GUI_Display_UsuallyConv(USUALLY_DPD_ACCUMULATION);
break ;
case 7 :
GUI_Display_UsuallyConv(USUALLY_DPD_REGENERATION);
break ;
case 8 :
GUI_General_Popup();
break ;
case 9 :
break ;
case 10 :
break ;
case 11 :
break ;
case 12 :
break ;
case 13 :
break ;
}
//测试用
uint16_t xx[4] = {75,60,45,30} ;
//GUI_General_Digit_Display(WarningLight_Sprite, Fuel_Get_Res(), Nb_12_0, 4u, 3u, xx, 150, GUI_BLENDMODE_SRC_OVER);
//GUI_General_Digit_Display(WarningLight_Sprite, Fuel_Get_Step(), Nb_12_0, 3u, 2u, xx, 200, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(WarningLight_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
\ No newline at end of file
--------------------------------------------------------------------------*/
\ No newline at end of file
source/Application/Graphic/GUI/GUI.h
View file @ d8fbf34c
......@@ -8,26 +8,10 @@
#include "images.h"
#include "TYW_stdint.h"
typedef enum
{
USUALLY_NULL = 0 ,//无动作
USUALLY_BLANK ,//清图
USUALLY_TRIPA ,//TRIPA 平均油耗／平均车速显示画面
USUALLY_TRIPB ,//TRIPB 平均油耗／平均车速显示画面
USUALLY_VOLTMETER ,//电压计显示画面
USUALLY_CALENDAR ,//日期/时钟显示画面
USUALLY_TIME_TABLE ,//计时表／油温计显示画面
USUALLY_DPD_ACCUMULATION,//DPD堆积量显示画面
USUALLY_DPD_REGENERATION,//DPD再生进度显示画面
USUALLY_MAX_NUM ,
}en_USUALLY_GROUP ;
extern void GUI_Display_KL15_ON_Init(void);
extern void GUI_Display_KL15_OFF_Init(void);
extern void GUI_Display_background(void);
extern void GUI_Display_OftenShow_Group(void);
extern void GUI_Display_UsuallyConv(en_USUALLY_GROUP Type) ;
extern void GUI_wby_test_Display(void) ;
#endif
......
source/Application/Graphic/GUI/GUI_Menu_Energy.h deleted 100644 → 0
View file @ 7c419289
#ifndef _GUI_MENU_ENERGY_H_
#define _GUI_MENU_ENERGY_H_
#include "GUI_Interface.h"
#endif
source/Application/Graphic/Menu/Menu.h
View file @ d8fbf34c
This diff is collapsed.
source/Application/Graphic/Menu/Menu_Interface.c deleted 100644 → 0
View file @ 7c419289
#include "Menu.h"
/*-------------------------------------------------------*/
/*-----------------------------------------------------------------*/
/*-------------------Logic_Operation Call Back---------------------*/
/*---------------------------------------------------------------------------------------*/
//const Menu_Item_Attribute_st_t stMenuItemAttribute[MENU_ITEM_MAX] =
// {
// /*MENU_ITEM_ENTRANCE_FIX */ {0, 0, 0, 0U, 2U, 2U, 0U, 0, 0, 0XFFU, 0, 0, 0, 0, 0, 0, 0U},
//};
/*-------------------------------------------------------------------------------------------------*/
/*--------------------------The following usage is recommended, but not required--------------------------------*/
/*--------------------------The following usage is recommended, but not required--------------------------------*/
/*--------------------------The following usage is recommended, but not required--------------------------------*/
static void Menu_Cursor_Preprocess(Menu_Key_en_t enMenuKey);
static void Menu_Cursor_Postprocess(Menu_Key_en_t enMenuKey);
void Menu_Service(Menu_Key_en_t enMenuKey);
/*传入按键动作执行之前需要预先处理的动作*/
static void Menu_Cursor_Preprocess(Menu_Key_en_t enMenuKey)
{
/*预处理中执行过本次按键了，后续不必执行时调用一次*/
/*u8MenuKeyExecute = 0U;*/
}
/*传入按键动作执行之后需要后置处理的动作*/
static void Menu_Cursor_Postprocess(Menu_Key_en_t enMenuKey)
{
}
/*------------传入按键类型-----------------------*/
void Menu_Service(Menu_Key_en_t enMenuKey)
{
/*功能回调函数的调用*/
Menu_Logic_Process(enMenuKey);
/*--------------------------------------------------*/
/*按键动作对光标的处理*/
Menu_Cursor_Preprocess(enMenuKey);
Menu_Cursor_Process(enMenuKey);
Menu_Cursor_Postprocess(enMenuKey);
/*--------------------------------------------------*/
}
/*-------------------------------------*/
/*-------------------------------------*/
/*-------------------------------------*/
#pragma ghs section bss = ".myNonInitArea"
uint8_t u8MenuRamData[MENU_RAM_DATA_LEN];
#pragma ghs section bss = default
/*---------------------------------------*/
/*---------------------------------------*/
/*---------------------------------------*/
source/Application/Graphic/Menu/Menu_user.c
View file @ d8fbf34c
This diff is collapsed.
source/Application/Graphic/UE/DisplaySch.c deleted 100644 → 0
View file @ 7c419289
#include "DisplaySch.h"
#include "Popup_Scheduler.h"
#include "Popup_List.h"
#include "Key.h"
#include "Menu.h"
#include "CAN_Lib.h"
#include "GUI.h"
#include "Services_ODO_User.h" /*清空总计里程函数*/
#include "CAN_Communication_Matrix.h" /*按键信息获取*/
#include "Menu.h"
source/Driver/Graphic/loc_graphics_data.h
View file @ d8fbf34c
......@@ -8,23 +8,11 @@
#ifndef LOC_GRAPHICS_DATA_H_
#define LOC_GRAPHICS_DATA_H_
//#include "r_typedefs.h"
//#include "r_ddb_api.h"
//#include "r_cdi_api.h"
//#include "r_wm_api.h"
//#include "r_drw2d_os.h"
//#include "r_drw2d_api.h"
//#include "loc_graphics.h"
//#include "GUI.h"
#include "loc_graphics_def.h"
#include "images.h"
#include "DisplaySch_user.h"
/*AutoCreateBegin*/
/*区域1 WET*/
#define MAX_WET_SUP_LAYER 20
MultiBufferSprite_t WETSpriteBuf;
uint8_t WETIndex = 0u;
......@@ -32,6 +20,7 @@ uint8_t WETUpdate = 0u;
uint8_t WETEn = 0u;
LogicLayerAttr_t WETLogicLayerAttr[MAX_WET_SUP_LAYER];
/*区域1 AdBlue*/
#define MAX_ADBLUE_SUP_LAYER 10
MultiBufferSprite_t AdBlueSpriteBuf;
uint8_t AdBlueIndex = 0u;
......@@ -39,6 +28,7 @@ uint8_t AdBlueUpdate = 0u;
uint8_t AdBlueEn = 0u;
LogicLayerAttr_t AdBlueLogicLayerAttr[MAX_ADBLUE_SUP_LAYER];
/*区域2 TRIP*/
#define MAX_TRIP_SUP_LAYER 10
MultiBufferSprite_t TRIPSpriteBuf;
uint8_t TRIPIndex = 0u;
......@@ -46,6 +36,7 @@ uint8_t TRIPUpdate = 0u;
uint8_t TRIPEn = 0u;
LogicLayerAttr_t TRIPLogicLayerAttr[MAX_TRIP_SUP_LAYER];
/*区域2 ODO*/
#define MAX_ODO_SUP_LAYER 10
MultiBufferSprite_t ODOSpriteBuf;
uint8_t ODOIndex = 0u;
......@@ -53,6 +44,7 @@ uint8_t ODOUpdate = 0u;
uint8_t ODOEn = 0u;
LogicLayerAttr_t ODOLogicLayerAttr[MAX_ODO_SUP_LAYER];
/*区域3 警告灯*/
#define MAX_WARNINGLIGHT_SUP_LAYER 10
MultiBufferSprite_t WarningLightSpriteBuf;
uint8_t WarningLightIndex = 0u;
......@@ -60,6 +52,7 @@ uint8_t WarningLightUpdate = 0u;
uint8_t WarningLightEn = 0u;
LogicLayerAttr_t WarningLightLogicLayerAttr[MAX_WARNINGLIGHT_SUP_LAYER];
/*区域4 ADAS*/
#define MAX_ADAS_SUP_LAYER 15
MultiBufferSprite_t ADASSpriteBuf;
uint8_t ADASIndex = 0u;
......@@ -67,6 +60,7 @@ uint8_t ADASUpdate = 0u;
uint8_t ADASEn = 0u;
LogicLayerAttr_t ADASLogicLayerAttr[MAX_ADAS_SUP_LAYER];
/*区域5 行车电脑*/
#define MAX_MULTIPURPOSE_SUP_LAYER 20
MultiBufferSprite_t MultiPurposeSpriteBuf;
uint8_t MultiPurposeIndex = 0u;
......@@ -74,6 +68,7 @@ uint8_t MultiPurposeUpdate = 0u;
uint8_t MultiPurposeEn = 0u;
LogicLayerAttr_t MultiPurposeLogicLayerAttr[MAX_MULTIPURPOSE_SUP_LAYER];
/*区域6 定速巡航车速*/
#define MAX_SETSPEED_SUP_LAYER 5
MultiBufferSprite_t SetSpeedSpriteBuf;
uint8_t SetSpeedIndex = 0u;
......@@ -81,6 +76,7 @@ uint8_t SetSpeedUpdate = 0u;
uint8_t SetSpeedEn = 0u;
LogicLayerAttr_t SetSpeedLogicLayerAttr[MAX_SETSPEED_SUP_LAYER];
/*区域6 定速巡航图标*/
#define MAX_CRUISE_SUP_LAYER 3
MultiBufferSprite_t CruiseSpriteBuf;
uint8_t CruiseIndex = 0u;
......@@ -88,6 +84,7 @@ uint8_t CruiseUpdate = 0u;
uint8_t CruiseEn = 0u;
LogicLayerAttr_t CruiseLogicLayerAttr[MAX_CRUISE_SUP_LAYER];
/*区域7 挡位*/
#define MAX_GEAR_SUP_LAYER 5
MultiBufferSprite_t GearSpriteBuf;
uint8_t GearIndex = 0u;
......@@ -95,6 +92,7 @@ uint8_t GearUpdate = 0u;
uint8_t GearEn = 0u;
LogicLayerAttr_t GearLogicLayerAttr[MAX_GEAR_SUP_LAYER];
/*区域8 室外温度*/
#define MAX_TEMP_SUP_LAYER 10
MultiBufferSprite_t TempSpriteBuf;
uint8_t TempIndex = 0u;
......@@ -102,6 +100,7 @@ uint8_t TempUpdate = 0u;
uint8_t TempEn = 0u;
LogicLayerAttr_t TempLogicLayerAttr[MAX_TEMP_SUP_LAYER];
/*区域8 时间*/
#define MAX_TIME_SUP_LAYER 5
MultiBufferSprite_t TimeSpriteBuf;
uint8_t TimeIndex = 0u;
......@@ -109,6 +108,7 @@ uint8_t TimeUpdate = 0u;
uint8_t TimeEn = 0u;
LogicLayerAttr_t TimeLogicLayerAttr[MAX_TIME_SUP_LAYER];
/*区域8 年月日*/
#define MAX_CALENDAR_SUP_LAYER 15
MultiBufferSprite_t CalendarSpriteBuf;
uint8_t CalendarIndex = 0u;
......@@ -116,37 +116,32 @@ uint8_t CalendarUpdate = 0u;
uint8_t CalendarEn = 0u;
LogicLayerAttr_t CalendarLogicLayerAttr[MAX_CALENDAR_SUP_LAYER];
static const SpritesHandler_t SpriteHandler[Max_Sprite] =
{
{WET_Sprite, {38,364,326,60,1},TARGET_SDRAM, &WETSpriteBuf, &WETIndex, WETLogicLayerAttr, MAX_WET_SUP_LAYER ,&WETUpdate, &WETEn, GUI_DisplayServices},
{AdBlue_Sprite, {38,428,326,48,1},TARGET_SDRAM, &AdBlueSpriteBuf, &AdBlueIndex, AdBlueLogicLayerAttr, MAX_ADBLUE_SUP_LAYER ,&AdBlueUpdate, &AdBlueEn, R_NULL},
{TRIP_Sprite, {438,374,322,48,1},TARGET_SDRAM, &TRIPSpriteBuf, &TRIPIndex, TRIPLogicLayerAttr, MAX_TRIP_SUP_LAYER ,&TRIPUpdate, &TRIPEn, R_NULL},
{ODO_Sprite, {438,424,324,42,1},TARGET_SDRAM, &ODOSpriteBuf, &ODOIndex, ODOLogicLayerAttr, MAX_ODO_SUP_LAYER ,&ODOUpdate, &ODOEn, R_NULL},
{WarningLight_Sprite, {8,88,82,264,1},TARGET_SDRAM, &WarningLightSpriteBuf, &WarningLightIndex, WarningLightLogicLayerAttr, MAX_WARNINGLIGHT_SUP_LAYER ,&WarningLightUpdate, &WarningLightEn, R_NULL},
{ADAS_Sprite, {112,94,254,260,1},TARGET_SDRAM, &ADASSpriteBuf, &ADASIndex, ADASLogicLayerAttr, MAX_ADAS_SUP_LAYER ,&ADASUpdate, &ADASEn, R_NULL},
{MultiPurpose_Sprite, {382,182,410,170,1},TARGET_SDRAM, &MultiPurposeSpriteBuf, &MultiPurposeIndex, MultiPurposeLogicLayerAttr, MAX_MULTIPURPOSE_SUP_LAYER ,&MultiPurposeUpdate , &MultiPurposeEn, R_NULL},
{SetSpeed_Sprite, {414,92,112,82,1},TARGET_SDRAM, &SetSpeedSpriteBuf, &SetSpeedIndex, SetSpeedLogicLayerAttr, MAX_SETSPEED_SUP_LAYER ,&SetSpeedUpdate, &SetSpeedEn, R_NULL},
{Cruise_Sprite, {520,90,90,87,1},TARGET_SDRAM, &CruiseSpriteBuf, &CruiseIndex, CruiseLogicLayerAttr, MAX_CRUISE_SUP_LAYER ,&CruiseUpdate, &CruiseEn, R_NULL},
{Gear_Sprite, {622,86,170,94,1},TARGET_SDRAM, &GearSpriteBuf, &GearIndex, GearLogicLayerAttr, MAX_GEAR_SUP_LAYER ,&GearUpdate, &GearEn, R_NULL},
{Temp_Sprite, {26,12,258,70,1},TARGET_SDRAM, &TempSpriteBuf, &TempIndex, TempLogicLayerAttr, MAX_TEMP_SUP_LAYER ,&TempUpdate, &TempEn, R_NULL},
{Time_Sprite, {330,14,140,66,1},TARGET_SDRAM, &TimeSpriteBuf, &TimeIndex, TimeLogicLayerAttr, MAX_TIME_SUP_LAYER ,&TimeUpdate, &TimeEn, R_NULL},
{Calendar_Sprite, {508,16,284,64,1},TARGET_SDRAM, &CalendarSpriteBuf, &CalendarIndex, CalendarLogicLayerAttr, MAX_CALENDAR_SUP_LAYER ,&CalendarUpdate, &CalendarEn, R_NULL},
{WET_Sprite, { 38, 364, 326, 60, 1}, TARGET_SDRAM, &WETSpriteBuf, &WETIndex, WETLogicLayerAttr, MAX_WET_SUP_LAYER , &WETUpdate, &WETEn, GUI_DisplayServices},
{AdBlue_Sprite, { 38, 428, 326, 48, 1}, TARGET_SDRAM, &AdBlueSpriteBuf, &AdBlueIndex, AdBlueLogicLayerAttr, MAX_ADBLUE_SUP_LAYER , &AdBlueUpdate, &AdBlueEn, R_NULL},
{TRIP_Sprite, {438, 374, 322, 48, 1}, TARGET_SDRAM, &TRIPSpriteBuf, &TRIPIndex, TRIPLogicLayerAttr, MAX_TRIP_SUP_LAYER , &TRIPUpdate, &TRIPEn, R_NULL},
{ODO_Sprite, {438, 424, 324, 42, 1}, TARGET_SDRAM, &ODOSpriteBuf, &ODOIndex, ODOLogicLayerAttr, MAX_ODO_SUP_LAYER , &ODOUpdate, &ODOEn, R_NULL},
{WarningLight_Sprite, { 8, 88, 82, 264, 1}, TARGET_SDRAM, &WarningLightSpriteBuf, &WarningLightIndex, WarningLightLogicLayerAttr, MAX_WARNINGLIGHT_SUP_LAYER, &WarningLightUpdate, &WarningLightEn, R_NULL},
{ADAS_Sprite, {112, 94, 254, 260, 1}, TARGET_SDRAM, &ADASSpriteBuf, &ADASIndex, ADASLogicLayerAttr, MAX_ADAS_SUP_LAYER , &ADASUpdate, &ADASEn, R_NULL},
{MultiPurpose_Sprite, {382, 182, 410, 170, 1}, TARGET_SDRAM, &MultiPurposeSpriteBuf, &MultiPurposeIndex, MultiPurposeLogicLayerAttr, MAX_MULTIPURPOSE_SUP_LAYER, &MultiPurposeUpdate , &MultiPurposeEn, R_NULL},
{SetSpeed_Sprite, {414, 92, 112, 82, 1}, TARGET_SDRAM, &SetSpeedSpriteBuf, &SetSpeedIndex, SetSpeedLogicLayerAttr, MAX_SETSPEED_SUP_LAYER , &SetSpeedUpdate, &SetSpeedEn, R_NULL},
{Cruise_Sprite, {520, 90, 90, 87, 1}, TARGET_SDRAM, &CruiseSpriteBuf, &CruiseIndex, CruiseLogicLayerAttr, MAX_CRUISE_SUP_LAYER , &CruiseUpdate, &CruiseEn, R_NULL},
{Gear_Sprite, {622, 86, 170, 94, 1}, TARGET_SDRAM, &GearSpriteBuf, &GearIndex, GearLogicLayerAttr, MAX_GEAR_SUP_LAYER , &GearUpdate, &GearEn, R_NULL},
{Temp_Sprite, { 26, 12, 258, 70, 1}, TARGET_SDRAM, &TempSpriteBuf, &TempIndex, TempLogicLayerAttr, MAX_TEMP_SUP_LAYER , &TempUpdate, &TempEn, R_NULL},
{Time_Sprite, {330, 14, 140, 66, 1}, TARGET_SDRAM, &TimeSpriteBuf, &TimeIndex, TimeLogicLayerAttr, MAX_TIME_SUP_LAYER , &TimeUpdate, &TimeEn, R_NULL},
{Calendar_Sprite, {508, 16, 284, 64, 1}, TARGET_SDRAM, &CalendarSpriteBuf, &CalendarIndex, CalendarLogicLayerAttr, MAX_CALENDAR_SUP_LAYER , &CalendarUpdate, &CalendarEn, R_NULL},
};
/*AutoCreateEnd*/
static const r_screen_attr_t ScreenAttr =
{
800, 480, 896, /* JEPG Window*/
800, 480, 896, /* Loc Window*/
5, /* 刷新时间，50ms*/
Max_Sprite, /* 主屏幕Sprite数量*/
13, /* 主屏幕Sprite数量*/
Max_Sprite, /* 全部Sprite数量*/
SpriteSize /* 最大的图片数量*/
};
#endif
#endif
\ No newline at end of file
source/System/tasks.c
View file @ d8fbf34c
......@@ -57,7 +57,6 @@
#include "Flash_synchronizer.h"
#include "Line_in.h"
#include "Telltales.h"
#include "DisplaySch.h"
#include "GUI.h"
#include "Key.h"
#include "Menu.h"
......
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