Merge branch 'jinshuo' into 'dev'

🐞 fix:修改版本号开启OTA升级

See merge request !105

Firmware/Source/Application/BlueTooth.h

@@ -23,7 +23,7 @@ typedef struct {
     uint16_t Vaild;
 }TEXT_STRUCT;
 
-#define INFORMATION_VERSION_DATE   "20241015"
+#define INFORMATION_VERSION_DATE   "20241111"
 #define SW_EXTERNAL_VERSION        "100"
 #define POWER_STATE_IGN_OFF 0u
 #define POWER_STATE_IGN_ON 1u

Firmware/Source/Component/AMT630H/AMT630H_Datas.c

@@ -5285,6 +5285,17 @@ void AMT630H_GUI_Display_Navigation_Area(void)
             SetPagePic(GRAPHICS_PAGE_0, Pic_0495_655_197);
             SetPagePic(GRAPHICS_PAGE_0, Pic_0496_410_197);
             SetPagePic(GRAPHICS_PAGE_0, Pic_0498_411_252);  /*UUID*/
+
+            /*0.0.0.0和已激活*/
+            SetPagePic(GRAPHICS_PAGE_0, Pic_0479_242_313);
+            SetPagePic(GRAPHICS_PAGE_0, Pic_0480_255_326);
+            SetPagePic(GRAPHICS_PAGE_0, Pic_0479_260_313);
+            SetPagePic(GRAPHICS_PAGE_0, Pic_0480_272_326);
+            SetPagePic(GRAPHICS_PAGE_0, Pic_0479_277_313);
+            SetPagePic(GRAPHICS_PAGE_0, Pic_0480_289_326);
+            SetPagePic(GRAPHICS_PAGE_0, Pic_0479_294_313);
+            SetPagePic(GRAPHICS_PAGE_0, Pic_0479_242_313);
+            SetPagePic(GRAPHICS_PAGE_0, Pic_0492_243_344);
             if(Get_UUID_UDSStatus() == 1)
             {
                 DisplayNumPara.NumList = NumbeList_UUID_DAY;//数组
@@ -5311,6 +5322,17 @@ void AMT630H_GUI_Display_Navigation_Area(void)
             SetPagePic(GRAPHICS_PAGE_0, Pic_1032_655_197);
             SetPagePic(GRAPHICS_PAGE_0, Pic_1033_410_197);
             SetPagePic(GRAPHICS_PAGE_0, Pic_1035_411_252);  /*UUID*/
+
+            /*0.0.0.0和已激活*/
+            SetPagePic(GRAPHICS_PAGE_0, Pic_1016_242_313);
+            SetPagePic(GRAPHICS_PAGE_0, Pic_1017_255_326);
+            SetPagePic(GRAPHICS_PAGE_0, Pic_1016_260_313);
+            SetPagePic(GRAPHICS_PAGE_0, Pic_1017_272_326);
+            SetPagePic(GRAPHICS_PAGE_0, Pic_1016_277_313);
+            SetPagePic(GRAPHICS_PAGE_0, Pic_1017_289_326);
+            SetPagePic(GRAPHICS_PAGE_0, Pic_1016_294_313);
+            SetPagePic(GRAPHICS_PAGE_0, Pic_1029_243_344);
+            
             if(Get_UUID_UDSStatus() == 1)
             {
                 DisplayNumPara.NumList = NumbeList_UUID_NIGHT;//数组

Firmware/Source/System/Sys_Task_List.c

@@ -20,7 +20,7 @@ void Sys_2ms_Tasks(void)
     Sys_Status_Update_Service();
     Analog_Signal_Conv_Service();
     AMT630H_Main();
-    // Check_MCU_Info_in_630H(); 
+    Check_MCU_Info_in_630H(); 
     DoCAN_Timer_Update(2000u);
     //Can_Write_Fun(&CAN_CH0_CanMsgTxOp, 2000u);无外发
     CanMSg_XMS_Analysis(&CAN_CH0_CanMsgOp, 2u);

Firmware/Source/UDS/UDS_ISO14229_Services.h

@@ -29,12 +29,12 @@
 /******************************************************************************
     program version
 *******************************************************************************/
-#define SWV 0x108 // 0x100 = 1.00 software version 软件版本号
-#define HWV 0x110 // 0x100 = 1.00 hardware version 硬件版本号
-#define BTV 0x104 // 0x100 = 1.00 bootloader version boot程序版本号
+#define SWV 0x109 // 0x100 = 1.00 software version 软件版本号
+#define HWV 0x120 // 0x100 = 1.00 hardware version 硬件版本号
+#define BTV 0x105 // 0x100 = 1.00 bootloader version boot程序版本号
 
-#define internal_version (108UL) /* 内部版本号 105 -> 1.05 */
-#define internal_date    (20241015UL) /* 内部版本日期 20240805 -> 2024.08.05 */
+#define internal_version (109UL) /* 内部版本号 105 -> 1.05 */
+#define internal_date    (20241111UL) /* 内部版本日期 20240805 -> 2024.08.05 */
 
 /**
  *DFlash

Firmware/utility/诊断工具/Option/Option.properties

 #new Option
-#Wed Aug 21 20:04:42 CST 2024
+#Mon Nov 11 18:37:13 CST 2024
 IsSort=true
 MergeFlashIsCompression=false
 ChangeAppFilePath=
@@ -7,7 +7,7 @@ MergeCanXLSPath=
 RH850_D1M1AGPIOJSONpath=
 DBFFilePath=
 MergeCrcTtpe=29
-MergeBootFilePath=D\:\\git\\haojin750tft\\Firmware\\utility\\Boot_Release\\HaoJin_750TFT_HJYB-7500TFT_BV1.04_20240821.hex
+MergeBootFilePath=D\:\\git\\haojin750tft\\Firmware\\utility\\Boot_Release\\HaoJin_750TFT_HJYB-7500TFT_BV1.05_20241031.hex
 IsMergeChangeAddress=false
 MergeFlashOutPutFilePath=
 GPIOOutPutPath=
@@ -47,7 +47,7 @@ IsMergeCreateHex=false
 MergeFlashIsCreateREC=false
 TTFExtractTTFpath=
 MergeImageFilePath=
-IsMergeCreateUpdateBin=false
+IsMergeCreateUpdateBin=true
 MergeImageSize=128M
 CRCFilePath=
 MergeFlashCompressionFormat=
@@ -56,7 +56,7 @@ IsHexDisplay=true
 MergeLineInXLSPath=
 MergeFlashInPutFilePath=
 MergeFlashIsInternal=false
-MergeOutPutFilePath=D\:\\\u9879\u76EE\\\u8C6A\u8FDB\\haojin750TFT\\srec-8.21
+MergeOutPutFilePath=D\:\\\u9879\u76EE\\\u8C6A\u8FDB\\haojin750TFT\\srec-shuo\\srec-11.11
 MergeAppFilePath=D\:\\git\\haojin750tft\\Firmware\\Project\\Cmsemicon\\BAT32A279\\MDK_ARM\\Objects\\HaoJin750TFT.hex
 MergeTelltalesXLSPath=
 FillingByte=-86