Commit 5b9ee610 authored by 崔立宝's avatar 崔立宝

五征EF01软件变更申请单20240807变更点1:屏蔽续航里程,平均油耗,瞬时油耗

parent a35590a5
...@@ -850,7 +850,7 @@ ...@@ -850,7 +850,7 @@
<SETTING><NAME>Options</NAME><VALUE>-MapFLASH </VALUE></SETTING> <SETTING><NAME>Options</NAME><VALUE>-MapFLASH </VALUE></SETTING>
<SETTING><NAME>LinkParameterFilename</NAME><VALUE>out.prm</VALUE></SETTING> <SETTING><NAME>LinkParameterFilename</NAME><VALUE>out.prm</VALUE></SETTING>
<SETTING><NAME>EchoCommandLine</NAME><VALUE>0</VALUE></SETTING> <SETTING><NAME>EchoCommandLine</NAME><VALUE>0</VALUE></SETTING>
<SETTING><NAME>OutputFilename</NAME><VALUE>WuZhengProject7.0.abs</VALUE></SETTING> <SETTING><NAME>OutputFilename</NAME><VALUE>WZ_EF01</VALUE></SETTING>
<SETTING><NAME>UseTemplate</NAME><VALUE>2</VALUE></SETTING> <SETTING><NAME>UseTemplate</NAME><VALUE>2</VALUE></SETTING>
<SETTING><NAME>PrmTemplateName</NAME><VALUE>mc9S12xhy256.prm</VALUE></SETTING> <SETTING><NAME>PrmTemplateName</NAME><VALUE>mc9S12xhy256.prm</VALUE></SETTING>
<SETTING><NAME>RunPreprocessor</NAME><VALUE>0</VALUE></SETTING> <SETTING><NAME>RunPreprocessor</NAME><VALUE>0</VALUE></SETTING>
......
...@@ -55,7 +55,7 @@ void Menu_Processing_Service(void) ...@@ -55,7 +55,7 @@ void Menu_Processing_Service(void)
TFT_LCD_Clear_Multi_Layer(LAYER_MENU05, LAYER_MENU14); TFT_LCD_Clear_Multi_Layer(LAYER_MENU05, LAYER_MENU14);
TFT_LCD_Display_Sprite(LAYER_MENU01, SN_menu04_png, 337, 150, 64); TFT_LCD_Display_Sprite(LAYER_MENU01, SN_menu04_png, 337, 150, 64);
TFT_LCD_Display_Sprite(LAYER_MENU02, SN_menu02_png, 337, 184, 64); TFT_LCD_Display_Sprite(LAYER_MENU02, SN_menu02_png, 337, 184, 64);
TFT_LCD_Display_Sprite(LAYER_MENU03, SN_menu03_png, 337, 218, 64); //TFT_LCD_Display_Sprite(LAYER_MENU03, SN_menu03_png, 337, 218, 64);
switch (SetMenupage) switch (SetMenupage)
{ {
...@@ -227,7 +227,7 @@ void Time_Seting(void) ...@@ -227,7 +227,7 @@ void Time_Seting(void)
keytime = 0; keytime = 0;
IO_CAN_KEY_RIGHT = IO_KEY_IDLE; IO_CAN_KEY_RIGHT = IO_KEY_IDLE;
SetMenupage++; SetMenupage++;
if (SetMenupage > 2) if (SetMenupage > 1)
SetMenupage = 0; SetMenupage = 0;
} }
if (IO_CAN_KEY_LEFT == IO_KEY_PRESS) if (IO_CAN_KEY_LEFT == IO_KEY_PRESS)
...@@ -235,7 +235,7 @@ void Time_Seting(void) ...@@ -235,7 +235,7 @@ void Time_Seting(void)
keytime = 0; keytime = 0;
IO_CAN_KEY_LEFT = IO_KEY_IDLE; IO_CAN_KEY_LEFT = IO_KEY_IDLE;
if (SetMenupage == 0) if (SetMenupage == 0)
SetMenupage = 2; SetMenupage = 1;
else else
SetMenupage--; SetMenupage--;
} }
......
...@@ -192,6 +192,7 @@ void IO_Management_Service(void) ...@@ -192,6 +192,7 @@ void IO_Management_Service(void)
IOTFTLCDAccessRight = 0x00; IOTFTLCDAccessRight = 0x00;
IOTFTLCDAccessRight = (IO_TIME_BIT | IO_BG_INFO_BIT); IOTFTLCDAccessRight = (IO_TIME_BIT | IO_BG_INFO_BIT);
} }
#if 0
if ((IO_DRIVE_INFO_DISPLAY_ENABLE) && (!IO_POPUP_DISPLAY_ENABLE) && (IO_CAN_KEY_LEFT == IO_KEY_LONG)) if ((IO_DRIVE_INFO_DISPLAY_ENABLE) && (!IO_POPUP_DISPLAY_ENABLE) && (IO_CAN_KEY_LEFT == IO_KEY_LONG))
{ {
IO_CAN_KEY_LEFT = IO_KEY_IDLE; IO_CAN_KEY_LEFT = IO_KEY_IDLE;
...@@ -199,6 +200,7 @@ void IO_Management_Service(void) ...@@ -199,6 +200,7 @@ void IO_Management_Service(void)
IOTFTLCDAccessRight = (IO_TIME_BIT | IO_BG_INFO_BIT); IOTFTLCDAccessRight = (IO_TIME_BIT | IO_BG_INFO_BIT);
SetMenu = 3; SetMenu = 3;
} }
#endif
if ((IO_DRIVE_INFO_DISPLAY_ENABLE) && (!IO_POPUP_DISPLAY_ENABLE) && (IO_CAN_KEY_RIGHT == IO_KEY_LONG)) if ((IO_DRIVE_INFO_DISPLAY_ENABLE) && (!IO_POPUP_DISPLAY_ENABLE) && (IO_CAN_KEY_RIGHT == IO_KEY_LONG))
{ {
IO_CAN_KEY_RIGHT = IO_KEY_IDLE; IO_CAN_KEY_RIGHT = IO_KEY_IDLE;
......
...@@ -31,6 +31,8 @@ ...@@ -31,6 +31,8 @@
//20240515 修改禅道QAC高危问题:42983、42982、42979 //20240515 修改禅道QAC高危问题:42983、42982、42979
//20240522 修改禅道QAC高危问题:43378 //20240522 修改禅道QAC高危问题:43378
//20240807 屏蔽行车信息显示
#include "main.h" #include "main.h"
#include "fuelconfig.h" #include "fuelconfig.h"
#include "UDS_ISO14229_Services.h" #include "UDS_ISO14229_Services.h"
......
1、WZ_EF01_BootApp_S0.11_FV0.08_240522.s19,完整版,适用于新生产的无程序仪表 1、WZ_EF01_BootApp_S0.11_FV0.08_240813.s19,完整版,适用于新生产的无程序仪表
2、WZ_EF01_UpdateApp_S0.11_F0.08_240522.s19,APP版,适用于烧过完整版程序仪表,需配合诊断工具使用 2、WZ_EF01_UpdateApp_S0.11_F0.08_240813.s19,APP版,适用于烧过完整版程序仪表,需配合诊断工具使用
#new Option #new Option
#Wed May 22 16:01:36 CST 2024 #Tue Aug 13 17:05:17 CST 2024
IsSort=true IsSort=true
MergeFlashIsCompression=false MergeFlashIsCompression=false
ChangeAppFilePath= ChangeAppFilePath=
...@@ -56,8 +56,8 @@ IsHexDisplay=true ...@@ -56,8 +56,8 @@ IsHexDisplay=true
MergeLineInXLSPath= MergeLineInXLSPath=
MergeFlashInPutFilePath= MergeFlashInPutFilePath=
MergeFlashIsInternal=false MergeFlashIsInternal=false
MergeOutPutFilePath=H\:\\\u4E94\u5F81\\\u4E94\u5F81EF01\\\u53D8\u66F4\\\u65B0\u5EFA\u6587\u4EF6\u5939 MergeOutPutFilePath=H\:\\\u4E94\u5F81\\\u4E94\u5F81EF01\\\u53D8\u66F4240807\\\u5DE5\u7A0B\u6587\u4EF6
MergeAppFilePath=H\:\\\u4E94\u5F81\\\u4E94\u5F81EF01\\\u53D8\u66F4\\\u539F\u7A0B\u5E8F\\bin\\WuZhengProject7.0.abs.s19 MergeAppFilePath=H\:\\\u4E94\u5F81\\\u4E94\u5F81EF01\\\u53D8\u66F4240807\\code-\u53D8\u66F4\u540E\\code\\bin\\WZ_EF01.s19
MergeTelltalesXLSPath= MergeTelltalesXLSPath=
FillingByte=-86 FillingByte=-86
ImageVersion=0 ImageVersion=0
......
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