🧪 test:ota测试相关

Firmware/Source/Application/BlueTooth.c

@@ -10,6 +10,8 @@ uint8_t SetUUIDTimes = 0;
 _PICID_Struct PicObj;
 _QRCODE_RECT QRCode_Rect;
 const uint8_t HJBlueToothName[9]= {"HJ750"};
+// const uint8_t HJVersionNum[15]= {"HJ750TFT_TEST_W"};
+const uint8_t HJVersionNum[15]= {"HJ750TFT_TEST_B"};
 uint8_t UUIDConfigBuf[22] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00};
 
 // uint8_t sjhja[20] = {0};
@@ -151,6 +153,7 @@ void OTAUpdateService(void)
     {
         if(OTA_Update_Count_Open < 5)
         {
+            Set_Pro_Unique_Identifier((uint8_t *)HJVersionNum,sizeof(HJVersionNum));
             SetUpdateCtrl(1,QRCode_Rect);
             OTA_Update_Count_Open++;
         }  

Firmware/Source/Component/AMT630H/AMT630H_Datas.c

@@ -4252,7 +4252,14 @@ void AMT630H_GUI_ReadPosittion_Display(void)
     }
     else
     {       
-        SetPagePic(GRAPHICS_PAGE_0, Pic_0002_0_0);
+        PicObj.qr_logo_id = 0;
+        PicObj.main_pic_id = Pic_0382; 
+        PicObj.qr_pic_id = Pic_0316;
+        PicObj.update_pic_id = Pic_0233;
+        PicObj.second_menu = 0;
+        PicObj.navigation_task_id = 0;
+        // SetPagePic(GRAPHICS_PAGE_0, Pic_0002_0_0);//white
+        SetPagePic(GRAPHICS_PAGE_0, Pic_0193_0_0);//black
         SetPagePic(GRAPHICS_PAGE_0, Pic_0477_178_130);
         SetPagePic(GRAPHICS_PAGE_0, Pic_0233_605_289);
         PackedTransfer_DisplayPhoneMirrorQRcode(0, PicObj);   

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/utility/诊断工具/Option/Option.properties

 #new Option
-#Wed Aug 21 20:04:42 CST 2024
+#Mon Aug 26 14:03:45 CST 2024
 IsSort=true
 MergeFlashIsCompression=false
 ChangeAppFilePath=
@@ -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-8.21
 MergeAppFilePath=D\:\\git\\haojin750tft\\Firmware\\Project\\Cmsemicon\\BAT32A279\\MDK_ARM\\Objects\\HaoJin750TFT.hex
 MergeTelltalesXLSPath=
 FillingByte=-86