Merge branch 'dev' into 'master'

Dev

See merge request !14

code/Sources/Application/src/Menus.c

@@ -52,7 +52,7 @@ void Menu_Processing_Service(void)
     { 
       if (SetMenu == 0)                 //设置界面
       {
-        TFT_LCD_Clear_Multi_Layer(LAYER_MENU05, LAYER_MENU14);
+        TFT_LCD_Clear_Multi_Layer(LAYER_MENU01, LAYER_MENU14);
         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_MENU03, SN_menu03_png, 337, 218, 64);

code/Sources/Application/src/Telltales.c

@@ -461,7 +461,7 @@ void Telltales_Management(void)
     }		 		
 		else
 		{
-      if ((DataCoolantOilSegDisp < 60) && (EngOilPress < 15) && ((EFLP1_STATUS & CAN_MSG_LOST) == 0) /* || ((EngOilPress * 2) > 325)*/) /* 60kPa */
+      if ((DataCoolantOilSegDisp < 60) && (EngOilPress < 15) && (!(EFLP1_STATUS & CAN_MSG_LOST))) /* 20240821 修改禅道QAC问题56949 */
 		  {
 			  BD83790A |= BD8379_D6;
 			  

code/Sources/Diagnostic/src/UDS_ISO14229_Services.c

@@ -1625,7 +1625,7 @@ void UDS_Service_22_Indication ( uint32_t A_TA_type, uint16_t A_Length, uint8_t
           UDS_ISO14229_Transfer[ 8] = '0';
           UDS_ISO14229_Transfer[ 9] = '.';
           UDS_ISO14229_Transfer[10] = '1';
-          UDS_ISO14229_Transfer[11] = '1';
+          UDS_ISO14229_Transfer[11] = '2';
           UDS_Service_Response ( 0x22, POSITIVE_RSP, DIAG_ID_Tx, 12, UDS_ISO14229_Transfer );    
       break;
 	  case 0xF191:

code/Sources/System/src/main.c

@@ -35,7 +35,13 @@
 
 //20240812 屏蔽EBS报警
 //20240813 油压报警加油压目标值也满足条件
-//20240817 增加报文掉线油压报警灯灭逻辑
+//20240817 增加报文掉线和值无效，油压报警灯灭逻辑
+//20240821 修改禅道QAC问题56949
+
+//V00.12
+//20240828 修改禅道问题58225 软件版本号错误；
+//         修改禅道问题58042 一级菜单--进入胎压监测信息后退出，一级菜单显示多出一个横杠
+//         修改禅道问题58046 一级菜单--进入用户设置后点击任一二级菜单进入三级菜单后退出到一级菜单，一级菜单界面出现显示残留
 
 #include "main.h"
 #include "fuelconfig.h"

code/TBDML.ini

@@ -77,22 +77,22 @@ NV_AUTO_ID=1
 
 
 [Recent HI-WAVE FindProcedure Search]
-Search0=Telltales_Management
-Search1=CanLoseDetected
-Search2=MSCAN0_L_Data_Request
-Search3=Power_On_System_Init
-Search4=Power_Management_Init
-Search5=API_ISR
-Search6=Sys_Status_Update_Service
-Search7=MSCAN0_TX_ISR
-Search8=Power_Wake_Up_Init
-Search9=IGN_OFF_State_Keep
-Search10=Power_Sleep_Init
-Search11=CoCAN_Init_Mode_Tx_ISR
-Search12=Popups_Management_Service
-Search13=Analog_Signal_Conversion_Service
-Search14=IO_Management_Service
-Search15=Drive_Info_Display_Update_Service
+Search0=Time_Seting
+Search1=Telltales_Management
+Search2=CanLoseDetected
+Search3=MSCAN0_L_Data_Request
+Search4=Power_On_System_Init
+Search5=Power_Management_Init
+Search6=API_ISR
+Search7=Sys_Status_Update_Service
+Search8=MSCAN0_TX_ISR
+Search9=Power_Wake_Up_Init
+Search10=IGN_OFF_State_Keep
+Search11=Power_Sleep_Init
+Search12=CoCAN_Init_Mode_Tx_ISR
+Search13=Popups_Management_Service
+Search14=Analog_Signal_Conversion_Service
+Search15=IO_Management_Service
 
 
 

utility/诊断工具1.10.11 x64/Option/Option.properties

 #new Option
-#Sat Aug 17 15:42:09 CST 2024
+#Wed Aug 28 09:25:06 CST 2024
 IsSort=true
 MergeFlashIsCompression=false
 ChangeAppFilePath=