变更禅道问题修改

source/Application/APP/FlashCheckSum/FlashCheckSum.h

 #ifndef __FLASHCHECKSUM_H_
 #define __FLASHCHECKSUM_H_
 
-#define REAL_FLASHCHECKSUM      0x89E555F4ul
+#define REAL_FLASHCHECKSUM      0x2FA125C6ul
 
 #define SPI_START_ADDR 0x10000000ul
-#define SPI_ADDR_RANGE 0x02308170ul
+#define SPI_ADDR_RANGE 0x02305EF0ul
 
 unsigned char CheckSpiFlashCRC(void);
 

source/Application/Alarm/Popups.c

@@ -183,7 +183,7 @@ void Popups_Polling(void)
         DTC_Count[3u] = Get_ID_18F141F3_Sig_BMS_BMSTtlFlt(); //故障总数
     }
     Popups_Polling_Sub(code, POPUP_BMS_BMS1, SND_BMS_BMS1, 101u);
- 
+  #if 0
     //Maintenance
     code = Get_ID_18F101D0_Sig_VCU_GrMntnRmnd();
     
@@ -213,7 +213,7 @@ void Popups_Polling(void)
         Popup_Delete(POPUP_COM_Maintenance);
         Sound_Delete(SND_Maintenance);
     }
-
+  #endif
     //OvrSpd
     uint32_t speed = 0;
     uint32_t Limit_Speed_Set = 89ul;

source/Application/Graphic/GUI/GUI.c

@@ -853,7 +853,7 @@ void GUI_Middle_001_09(void)
     {
         GUI_Translate_Display(Middle_Sprite, Set_Menu2_24_Word0, 509U, 106U, 2u); /*二级菜单 辅助控制器*/
         GUI_Translate_Display(Middle_Sprite, Set_Menu2_16_Word0, 496U, 150U, 2u); /*二级菜单 ABS*/
-        GUI_Translate_Display(Middle_Sprite, Set_Menu2_28_Word1, 469U, 196U, 2u); /*二级菜单 软件版本*/
+        GUI_Translate_Display(Middle_Sprite, Set_Menu2_28_Word1, 491U, 196U, 2u); /*二级菜单 软件版本*/
         GUI_Translate_Display(Middle_Sprite, Yy_2_word1, 593U, 253U, 2u); /*二级菜单 语言*/
         GUI_Translate_Display(Middle_Sprite, Set_Menu2_27_Word0, 508U, 297U, 2u); /*二级菜单 返回*/
     }
@@ -5456,6 +5456,10 @@ void GUI_Middle(void)
             uint32_t minute = Get_ID_18F141F3_Sig_BMS_ChgRemnderM(); //m
             
             minute *= 5u;
+            if (minute > 55u)
+            {
+                minute = 55u;
+            }
             
             GUI_Translate_Display(Middle_Sprite, ImageID_Number_18_white[hour / 10], 433u, 152u, 0u); /*十位*/
             GUI_Translate_Display(Middle_Sprite, ImageID_Number_18_white[hour % 10], 451u, 152u, 0u); /*个位*/
@@ -5658,8 +5662,8 @@ void GUI_Middle(void)
                     }
                     else
                     {
-                        GUI_Translate_Display(Middle_Sprite, Set_Arrow_L, 455U, 202U, 0); /*二级菜单 箭头*/
-                        GUI_Translate_Display(Middle_Sprite, Set_Arrow_R, 807U, 201U, 0); /*二级菜单 箭头*/
+                        GUI_Translate_Display(Middle_Sprite, Set_Arrow_L, 455U + 15U, 202U, 0); /*二级菜单 箭头*/
+                        GUI_Translate_Display(Middle_Sprite, Set_Arrow_R, 807U - 15U, 201U, 0); /*二级菜单 箭头*/
                     }
                     
                     switch (VhlInfTyp_Get())

source/Driver/Graphic/loc_graphics_data.h

@@ -229,7 +229,7 @@ static const SpritesHandler_t SpriteHandler[Max_Sprite] =
     {Bottm3_Sprite,    {292,  434, 96,  30,  1},  TARGET_VRAM, &Bottm3SpriteBuf,  &Bottm3Index,  Bottm3LogicLayerAttr,  MAX_Bottm3_SUP_LAYER,  &Bottm3Update,  &Bottm3En,  /*NULL*/GUI_Bottm3 },
     {Bottm4_Sprite,    {408,  412, 204, 30,  1},  TARGET_VRAM, &Bottm4SpriteBuf,  &Bottm4Index,  Bottm4LogicLayerAttr,  MAX_Bottm4_SUP_LAYER,  &Bottm4Update,  &Bottm4En,  /*NULL*/GUI_Bottm4 },
     {Bottm5_Sprite,    {408,  444, 230, 30,  1},  TARGET_VRAM, &Bottm5SpriteBuf,  &Bottm5Index,  Bottm5LogicLayerAttr,  MAX_Bottm5_SUP_LAYER,  &Bottm5Update,  &Bottm5En,  /*NULL*/GUI_Bottm5 },
-    {Bottm6_Sprite,    {673,  412, 178, 30,  1},  TARGET_VRAM, &Bottm6SpriteBuf,  &Bottm6Index,  Bottm6LogicLayerAttr,  MAX_Bottm6_SUP_LAYER,  &Bottm6Update,  &Bottm6En,  /*NULL*/GUI_Bottm6 },
+    {Bottm6_Sprite,    {673,  412, 188, 30,  1},  TARGET_VRAM, &Bottm6SpriteBuf,  &Bottm6Index,  Bottm6LogicLayerAttr,  MAX_Bottm6_SUP_LAYER,  &Bottm6Update,  &Bottm6En,  /*NULL*/GUI_Bottm6 },
     {Bottm7_Sprite,    {673,  444, 218, 30,  1},  TARGET_VRAM, &Bottm7SpriteBuf,  &Bottm7Index,  Bottm7LogicLayerAttr,  MAX_Bottm7_SUP_LAYER,  &Bottm7Update,  &Bottm7En,  /*NULL*/GUI_Bottm7 },
     //{Bottm8_Sprite,    {579,  408, 122, 64,  1},  TARGET_SDRAM, &Bottm8SpriteBuf,  &Bottm8Index,  Bottm8LogicLayerAttr,  MAX_Bottm8_SUP_LAYER,  &Bottm8Update,  &Bottm8En,  /*NULL*/GUI_Bottm8 },
     {Bottm9_Sprite,    {891,  434, 90,  30,  1},  TARGET_VRAM, &Bottm9SpriteBuf,  &Bottm9Index,  Bottm9LogicLayerAttr,  MAX_Bottm9_SUP_LAYER,  &Bottm9Update,  &Bottm9En,  /*NULL*/GUI_Bottm9 },

source/System/main.c

@@ -107,6 +107,8 @@
 //V1.3.1
 //20240112 同步0038加英文变更程序修改，去掉菜单自动退出（查看信息不方便）
 //20240505 菜单自动退出恢复，不合格英文图片替换
+//20240515 修改电池最高单位摄氏度显示不全问题
+//20240522 修改选中模块版本英文图片，调整对三角号位置；屏蔽保养弹出报警；预计充电时间分钟最大由75改为55
 
 #include "r_typedefs.h"
 #include "sys_scheduler.h"

utility/工程文件（释放绥化）/释放软件说明.txt

-1、SQ_0037_BootApp_S1.3.1_F1.1.2_240505.srec，完整版，适用于新生产的无程序仪表
-2、SQ_0037_UpdateApp_S1.3.1_F1.1.2_240505.bin，APP版，适用于烧过完整版程序仪表，需配合诊断工具使用
+1、SQ_0037_BootApp_S1.3.1_F1.1.2_240522.srec，完整版，适用于新生产的无程序仪表
+2、SQ_0037_UpdateApp_S1.3.1_F1.1.2_240522.bin，APP版，适用于烧过完整版程序仪表，需配合诊断工具使用
+3、SQ_0037.bin，APP版，适用于烧过完整版程序仪表，一键升级小白盒用