Skip to content

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

Merge branch 'menutest' into withBoot_ENCN

parents 14150bb6 bf58bbf3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 625 additions and 238 deletions
source/Application/APP/GaugesMode/GaugesInterface.c
View file @ f2f34f65
......@@ -16,9 +16,9 @@ static const uint16_t GaugesDataInInit[GaugesTotal][3][25] =
{1, 5, 9, 13, 17, 21, 25, 29, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
},
/*转速*/
{ {0u, 900, 1400, 1900, 2400, 2900, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
{0u, 1000, 1500, 2000, 2500, 3000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
{1u, 6, 11, 16, 21, 27, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
{ {0u, 900, 1400, 1900, 2400, 2900, 3000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
{0u, 1000, 1500, 2000, 2500, 3000, 3100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
{1u, 6, 11, 16, 21, 26, 27, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
},
/*水温*/
{ { 0, 50, 55, 61, 66, 72, 77, 102, 104, 106, 108, 110, 111, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
......@@ -26,14 +26,14 @@ static const uint16_t GaugesDataInInit[GaugesTotal][3][25] =
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
},
/*PRI气压*/
{ {500, 720, 940, 1160, 1380, 1600, 1820, 2040, 2260, 2480, 2700, 2920, 3140, 3360, 3580, 3800, 4020, 4240, 4500, 0, 0, 0, 0, 0},
{610, 830, 1050, 1270, 1490, 1710, 1930, 2150, 2370, 2590, 2810, 3030, 3250, 3470, 3690, 3910, 4130, 4350, 4500, 0, 0, 0, 0, 0},
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 0, 0, 0, 0, 0}
{ {500, 720, 940, 1160, 1380, 1600, 1820, 2040, 2260, 2480, 2700, 2920, 3140, 3360, 3580, 3800, 4020, 4240, 4500, 0, 0, 0, 0, 0, 0},
{610, 830, 1050, 1270, 1490, 1710, 1930, 2150, 2370, 2590, 2810, 3030, 3250, 3470, 3690, 3910, 4130, 4350, 4500, 0, 0, 0, 0, 0, 0},
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 0, 0, 0, 0, 0, 0}
},
/*SEC气压*/
{ {500, 720, 940, 1160, 1380, 1600, 1820, 2040, 2260, 2480, 2700, 2920, 3140, 3360, 3580, 3800, 4020, 4240, 4500, 0, 0, 0, 0, 0},
{610, 830, 1050, 1270, 1490, 1710, 1930, 2150, 2370, 2590, 2810, 3030, 3250, 3470, 3690, 3910, 4130, 4350, 4500, 0, 0, 0, 0, 0},
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 0, 0, 0, 0, 0}
{ {500, 720, 940, 1160, 1380, 1600, 1820, 2040, 2260, 2480, 2700, 2920, 3140, 3360, 3580, 3800, 4020, 4240, 4500, 0, 0, 0, 0, 0, 0},
{610, 830, 1050, 1270, 1490, 1710, 1930, 2150, 2370, 2590, 2810, 3030, 3250, 3470, 3690, 3910, 4130, 4350, 4500, 0, 0, 0, 0, 0, 0},
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 0, 0, 0, 0, 0, 0}
},
/*WET气压*/
{ {500, 730, 960, 1190, 1420, 1650, 1880, 2100, 2330, 2560, 2790, 3020, 3250, 3480, 3710, 3940, 4170, 4400, 4500, 0, 0, 0, 0, 0, 0},
......@@ -51,7 +51,7 @@ static const uint16_t GaugesDataInInit[GaugesTotal][3][25] =
/*指示类型*/ /*表头1 表头2 表头3 表头4*/ /*表头5*/ /*表头6*/ /*表头7*/
static const uint8_t GaugesIndicatType[GaugesTotal] = {LEDOtherType, LEDOtherType, LEDTempType, LEDGasType, LEDGasType, LEDGasType, LEDBattery}; /*初始化表头显示类型，例如水温，气压*/
/*每个表头包含的参数个数*/ /*表头1 表头2 表头3 表头4*/
static const uint8_t GaugesParaNum[GaugesTotal] = {8, 6, 13, 19, 19, 19, 14};
static const uint8_t GaugesParaNum[GaugesTotal] = {8, 7, 13, 19, 19, 19, 14};
/*每个表头IGON后开始走动时间*/ /*表头1 表头2 表头3 表头4 表头5 表头6*/
static const uint16_t GaugesStarMoveTime[GaugesTotal] = {0, 0, 0, 0, 0, 0, 0,}; /*0是上电就开始走动，其他参数是ms*/
......
source/Application/APP/Key/Key_user.c
View file @ f2f34f65
......@@ -62,6 +62,11 @@ void Key_Operation_Up(Key_Event_en_t enKeyEvent)
{
NextMenu(_MN_DSP_LEVEL2MENU_4);
}
/*背光调节----20240323*/
else if ((bCurMenuIDX == _MN_DSP_LEVEL2_4_MENU_7) && (K_Line_Set.K_Line_LID2E == 0))
{
NextMenu(_MN_DSP_LEVEL2_4_MENU_2);
}
/*TPMS轮胎设定*/
else if ((bCurMenuIDX == _MN_DSP_LEVEL2_4_MENU_6) && (K_Line_Set.K_Line_LID3E != 0x01u))
{
......@@ -1202,8 +1207,13 @@ void Key_Operation_Enter(Key_Event_en_t enKeyEvent)
if (((bCurMenuIDX >= _MN_DSP_LEVEL2MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL2_5_MENU_4)) ||
((bCurMenuIDX >= _MN_DSP_LEVEL3_4_MENU_41) && (bCurMenuIDX <= _MN_DSP_LEVEL3_4_MENU_47)))
{
/*用户设定----20240323*/
if ((bCurMenuIDX == _MN_DSP_LEVEL2MENU_4) && (K_Line_Set.K_Line_LID2E == 0))
{
NextMenu(_MN_DSP_LEVEL2_4_MENU_1);
}
/*系统演示模式*/
if (bCurMenuIDX == _MN_DSP_LEVEL2MENU_5)
else if (bCurMenuIDX == _MN_DSP_LEVEL2MENU_5)
{
if (K_Line_Set.K_Line_LID27 == 0x01u)
{
......@@ -1379,6 +1389,7 @@ void Key_Operation_Return(Key_Event_en_t enKeyEvent)
if ((bCurMenuIDX >= _MN_DSP_LEVEL2_1_MENU_1) && (bCurMenuIDX < _MN_DSP_ENTER_MENU))
{
if (
((bCurMenuIDX >= _MN_DSP_LEVEL3_4_MENU_11) && (bCurMenuIDX <= _MN_DSP_LEVEL3_4_MENU_22)) ||/*日期时间*/
(bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_3) || /*语言设定*/
(bCurMenuIDX == _MN_DSP_LEVEL3_7_MENU_1) || (bCurMenuIDX == _MN_DSP_LEVEL3_7_MENU_2) || /*亮度调节*/
((bCurMenuIDX >= _MN_DSP_LEVEL3_4_MENU_41) && (bCurMenuIDX <= _MN_DSP_LEVEL3_4_MENU_47)) /*省油设定子菜单*/
......
source/Application/APP/PowerManagement/System_Monitor_user.c
View file @ f2f34f65
......@@ -4,15 +4,15 @@
#include "System_Monitor.h"
#include "Analog_Signals.h"
#define u16Base_Vol 0u // 0
#define u16ENTER_LOW_N_RANGE 6500U // 1
#define u16EXIT_LOW_N_RANGE 7000U // 2
#define u16ENTER_LOW_Y_RANGE 19500U // 3
#define u16EXIT_LOW_Y_RANGE 20000U // 4
#define u16EXIT_HIGH_Y_RANGE 32000U // 5
#define u16ENTER_HIGH_Y_RANGE 32500U // 6
#define u16EXIT_HIGH_N_RANGE 33000U // 7
#define u16ENTER_HIGH_N_RANGE 33500U // 8
#define u16Base_Vol 0u // 0
#define u16ENTER_LOW_N_RANGE 6500u // 1
#define u16EXIT_LOW_N_RANGE 7000u // 2
#define u16ENTER_LOW_Y_RANGE 17500u // 3
#define u16EXIT_LOW_Y_RANGE 18500u // 4
#define u16EXIT_HIGH_Y_RANGE 32000u // 5
#define u16ENTER_HIGH_Y_RANGE 32500u // 6
#define u16EXIT_HIGH_N_RANGE 33000u // 7
#define u16ENTER_HIGH_N_RANGE 33500u // 8
#define u16Top_Vol 0xffffu
#pragma alignvar(8)
......
source/Application/Alarm/Popups.c
View file @ f2f34f65
......@@ -843,50 +843,59 @@ void Popups_Polling(void)
Popup_Delete(POPUP8_TemperatureThigh);
}
/* 未检测到GW*/
variable_1 = CAN_MSG_Status(ID_CanMsg18FF064A_Msg_Count);
if (variable_1 == CAN_SIG_LOST)
if (K_Line_Set.K_Line_LID43 == 0x40u)
{
Popup_Request(POPUP8_TBOX_GW_Sta);
}
else
{
Popup_Delete(POPUP8_TBOX_GW_Sta);
}
/* 未检测到GW*/
variable_1 = CAN_MSG_Status(ID_CanMsg18FF064A_Msg_Count);
if (variable_1 == CAN_SIG_LOST)
{
Popup_Request(POPUP8_TBOX_GW_Sta);
}
else
{
Popup_Delete(POPUP8_TBOX_GW_Sta);
}
/* 未检测到TBOX*/
variable_1 = (uint8_t)Get_ID_18FF064A_Sig_TBOX_Sta();
if ((variable_1 == 1) || (variable_1 == 2) || (variable_1 == 3))
{
Popup_Request(POPUP8_TBOX_Sta);
}
else
{
Popup_Delete(POPUP8_TBOX_Sta);
}
/* 未检测到TBOX*/
variable_1 = (uint8_t)Get_ID_18FF064A_Sig_TBOX_Sta();
if ((variable_1 == 1) || (variable_1 == 2) || (variable_1 == 3))
{
Popup_Request(POPUP8_TBOX_Sta);
}
else
{
Popup_Delete(POPUP8_TBOX_Sta);
}
/* TBOX通信异常*/
variable_1 = (uint8_t)Get_ID_18FF064A_Sig_TBOX_Sig();
if (variable_1 == 1)
{
Popup_Request(POPUP8_TBOX_Sig);
}
else
{
Popup_Delete(POPUP8_TBOX_Sig);
}
/* TBOX通信异常*/
variable_1 = (uint8_t)Get_ID_18FF064A_Sig_TBOX_Sig();
if (variable_1 == 1)
{
Popup_Request(POPUP8_TBOX_Sig);
}
else
{
Popup_Delete(POPUP8_TBOX_Sig);
}
/* 平台通信异常*/
variable_1 = (uint8_t)Get_ID_18FF064A_Sig_TBOX_Sig_Error();
if (variable_1 == 1)
{
Popup_Request(POPUP8_TBOX_Sig_Error);
/* 平台通信异常*/
variable_1 = (uint8_t)Get_ID_18FF064A_Sig_TBOX_Sig_Error();
if (variable_1 == 1)
{
Popup_Request(POPUP8_TBOX_Sig_Error);
}
else
{
Popup_Delete(POPUP8_TBOX_Sig_Error);
}
}
else
{
Popup_Delete(POPUP8_TBOX_Sig_Error);
Popup_Clear (POPUP8_TBOX_GW_Sta );/*56.未检测到GW*/
Popup_Clear (POPUP8_TBOX_Sta );/*57.未检测到TBOX*/
Popup_Clear (POPUP8_TBOX_Sig );/*58.TBOX通信异常*/
Popup_Clear (POPUP8_TBOX_Sig_Error);/*59.平台通信异常*/
}
/*54.--8--DPD自动再生-DPD自动再生中 ID：18FED900 (AUXIO) Byte：8 bit：5,4 01(B) Engine Speed ： 350rpm以上*/
variable_1 = Get_ID_18FED900_Sig_DPF_Regeneration_Status();
......
source/Application/Graphic/GUI/FlashCheckSum.h
View file @ f2f34f65
#ifndef __FLASHCHECKSUM_H_
#define __FLASHCHECKSUM_H_
#define REAL_FLASHCHECKSUM 0x825000AFu
#define REAL_FLASHCHECKSUM 0xFBBA5D2Du
#define SPI_START_ADDR 0x10000000u
#define SPI_ADDR_RANGE 0x0699ADC0u
......
source/Application/Graphic/GUI/GUI.c
View file @ f2f34f65
This diff is collapsed.
source/Application/Graphic/GUI/GUI.h
View file @ f2f34f65
......@@ -17,8 +17,8 @@
#define FState_COilTimeOutNum 60u /*3S*/
#define SystemSupplierECUHardwareVersionNumberApp ((uint16_t)(10301)) /*硬件版本号 HV:01.02.02*/
#define SystemSupplierECUSoftwareInformationApp ((uint16_t)(10009)) /*软件版本号 SV:01.01.05*/
#define systemSupplierECUFlashInformationApp ((uint16_t)(6)) /*FLASH版本号 FV:00.14*/
#define SystemSupplierECUSoftwareInformationApp ((uint16_t)(10010)) /*软件版本号 SV:01.01.05*/
#define systemSupplierECUFlashInformationApp ((uint16_t)(7)) /*FLASH版本号 FV:00.14*/
typedef struct
{
......@@ -401,6 +401,11 @@ static const uint16_t GUIUsetSetYPosX[2] = {358u, 337u};
static const uint16_t GUIUsetSetMPosX[2] = {463u, 440u};
static const uint16_t GUIUsetSetDPosX[2] = {570u, 547u};
static const uint16_t GUIUsetSetYPos_En[2] = {304u, 282u};
static const uint16_t GUIUsetSetYPosX_En[2] = {358u, 337u};
static const uint16_t GUIUsetSetMPosX_En[2] = {466u, 443u};
static const uint16_t GUIUsetSetDPosX_En[2] = {574u, 551u};
static const uint16_t GUIUsetSetHPosX[2] = {414u, 391u};
static const uint16_t GUIUsetSetMiPosX[2] = {490u, 467u};
......@@ -479,6 +484,7 @@ void GUI_BG_RepSetMenu6_Display(uint8_t Mode); /**/
void GUI_BG_RepSetMenu7_Display(uint8_t Mode); /**/
void GUI_BG_RepSetMenu8_Display(uint8_t Mode); /**/
void GUI_BG_UserSet_Menu_Display(uint8_t Mode); /*二级菜单--用户设定*/
void GUI_BG_UserSet_Menu1_Display(uint8_t Mode);
void GUI_BG_UserSetMenu1_Display(uint8_t Mode); /**/
void GUI_BG_UserSetMenu2_Display(uint8_t Mode); /**/
void GUI_BG_UserSetMenu3_Display(uint8_t Mode); /**/
......
source/Application/Graphic/Menu/Menu_user.c
View file @ f2f34f65
......@@ -879,7 +879,14 @@ void Level2_4Menu_1Enter(void)
void Level2_4Menu_1Do(void)
{
GUI_OftenShow_Display();
GUI_BG_UserSet_Menu_Display(GUI_DISP_MODE_NORMAL);
if (K_Line_Set.K_Line_LID2E == 0x01u)
{
GUI_BG_UserSet_Menu_Display(GUI_DISP_MODE_NORMAL);
}
else
{
GUI_BG_UserSet_Menu1_Display(GUI_DISP_MODE_NORMAL);
}
GUI_BG_UserSetMenu1_Display(GUI_DISP_MODE_NORMAL);
}
void Level2_4Menu_1Exit(void)
......@@ -892,7 +899,14 @@ void Level2_4Menu_2Enter(void)
void Level2_4Menu_2Do(void)
{
GUI_OftenShow_Display();
GUI_BG_UserSet_Menu_Display(GUI_DISP_MODE_NORMAL);
if (K_Line_Set.K_Line_LID2E == 0x01u)
{
GUI_BG_UserSet_Menu_Display(GUI_DISP_MODE_NORMAL);
}
else
{
GUI_BG_UserSet_Menu1_Display(GUI_DISP_MODE_NORMAL);
}
GUI_BG_UserSetMenu2_Display(GUI_DISP_MODE_NORMAL);
}
void Level2_4Menu_2Exit(void)
......@@ -905,7 +919,14 @@ void Level2_4Menu_3Enter(void)
void Level2_4Menu_3Do(void)
{
GUI_OftenShow_Display();
GUI_BG_UserSet_Menu_Display(GUI_DISP_MODE_NORMAL);
if (K_Line_Set.K_Line_LID2E == 0x01u)
{
GUI_BG_UserSet_Menu_Display(GUI_DISP_MODE_NORMAL);
}
else
{
GUI_BG_UserSet_Menu1_Display(GUI_DISP_MODE_NORMAL);
}
GUI_BG_UserSetMenu3_Display(GUI_DISP_MODE_NORMAL);
}
void Level2_4Menu_3Exit(void)
......@@ -918,7 +939,14 @@ void Level2_4Menu_7Enter(void)
void Level2_4Menu_7Do(void)
{
GUI_OftenShow_Display();
GUI_BG_UserSet_Menu_Display(GUI_DISP_MODE_NORMAL);
if (K_Line_Set.K_Line_LID2E == 0x01u)
{
GUI_BG_UserSet_Menu_Display(GUI_DISP_MODE_NORMAL);
}
else
{
GUI_BG_UserSet_Menu1_Display(GUI_DISP_MODE_NORMAL);
}
GUI_BG_UserSetMenu8_Display(GUI_DISP_MODE_NORMAL);
}
void Level2_4Menu_7Exit(void)
......@@ -930,7 +958,14 @@ void Level2_4Menu_4Enter(void)
void Level2_4Menu_4Do(void)
{
GUI_OftenShow_Display();
GUI_BG_UserSet_Menu_Display(GUI_DISP_MODE_NORMAL);
if (K_Line_Set.K_Line_LID2E == 0x01u)
{
GUI_BG_UserSet_Menu_Display(GUI_DISP_MODE_NORMAL);
}
else
{
GUI_BG_UserSet_Menu1_Display(GUI_DISP_MODE_NORMAL);
}
GUI_BG_UserSetMenu4_Display(GUI_DISP_MODE_NORMAL);
}
void Level2_4Menu_4Exit(void)
......@@ -943,7 +978,14 @@ void Level2_4Menu_5Enter(void)
void Level2_4Menu_5Do(void)
{
GUI_OftenShow_Display();
GUI_BG_UserSet_Menu_Display(GUI_DISP_MODE_NORMAL);
if (K_Line_Set.K_Line_LID2E == 0x01u)
{
GUI_BG_UserSet_Menu_Display(GUI_DISP_MODE_NORMAL);
}
else
{
GUI_BG_UserSet_Menu1_Display(GUI_DISP_MODE_NORMAL);
}
GUI_BG_UserSetMenu5_Display(GUI_DISP_MODE_NORMAL);
}
void Level2_4Menu_5Exit(void)
......@@ -956,7 +998,14 @@ void Level2_4Menu_6Enter(void)
void Level2_4Menu_6Do(void)
{
GUI_OftenShow_Display();
GUI_BG_UserSet_Menu_Display(GUI_DISP_MODE_NORMAL);
if (K_Line_Set.K_Line_LID2E == 0x01u)
{
GUI_BG_UserSet_Menu_Display(GUI_DISP_MODE_NORMAL);
}
else
{
GUI_BG_UserSet_Menu1_Display(GUI_DISP_MODE_NORMAL);
}
GUI_BG_UserSetMenu6_Display(GUI_DISP_MODE_NORMAL);
}
void Level2_4Menu_6Exit(void)
......@@ -1631,8 +1680,8 @@ void Level3_4Menu_3Exit(void)
{
if (MenuFlag.Menu_Return)
{
MenuFlag.Menu_Return = 0;
User_App.User_Language = User_set_Num.User_Language ;
MenuFlag.Menu_Return = 0;
User_App.User_Language = User_set_Num.User_Language ;
K_Line_Set.User_Language = User_set_Num.User_Language ;
Common_Set_DTCstatusCHGFFK_Flag(1);
}
......
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