Merge branch 'shihao' into 'dev'

✨ feat:上传完整版程序和变更记录,增加合成方式

See merge request !35

Firmware/Project/Cmsemicon/BAT32A279/MDK_ARM/HaoJin750TFT.uvprojx

@@ -275,7 +275,7 @@
               </OCR_RVCT3>
               <OCR_RVCT4>
                 <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
+                <StartAddress>0xc400</StartAddress>
                 <Size>0x73c00</Size>
               </OCR_RVCT4>
               <OCR_RVCT5>
@@ -361,7 +361,7 @@
             </VariousControls>
           </Aads>
           <LDads>
-            <umfTarg>1</umfTarg>
+            <umfTarg>0</umfTarg>
             <Ropi>0</Ropi>
             <Rwpi>0</Rwpi>
             <noStLib>0</noStLib>

Firmware/Project/Cmsemicon/BAT32A279/MDK_ARM/Objects/HaoJin750TFT.sct

@@ -2,8 +2,8 @@
 ; *** Scatter-Loading Description File generated by uVision ***
 ; *************************************************************
 
-LR_IROM1 0x00000000 0x00073C00  {    ; load region size_region
-  ER_IROM1 0x00000000 0x00073C00  {  ; load address = execution address
+LR_IROM1 0x0000c400 0x00073C00  {    ; load region size_region
+  ER_IROM1 0x0000c400 0x00073C00  {  ; load address = execution address
    *.o (RESET, +First)
    *(InRoot$$Sections)
    .ANY (+RO)

Firmware/Project/Cmsemicon/BAT32A279/MDK_ARM/RTE/Device/BAT32A279KM64FB/userdefine.h

@@ -20,7 +20,7 @@ User definitions
 
 typedef unsigned short 	MD_STATUS;
 
-#define HAS_BOOTLOADER (0u) // 仅仿真App时设置为0
+#define HAS_BOOTLOADER (1u) // 仅仿真App时设置为0
 #define APP_BASE (0x0000C400ul)
 
 /* Status list definition */

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

+#new Option
+#Tue Aug 13 23:16:37 CST 2024
+IsSort=true
+MergeFlashIsCompression=false
+ChangeAppFilePath=
+MergeCanXLSPath=
+RH850_D1M1AGPIOJSONpath=
+DBFFilePath=
+MergeCrcTtpe=29
+MergeBootFilePath=C\:\\Users\\Lenovo\\Desktop\\haojin750_TFT\\haojin750tft\\Firmware\\utility\\Boot_Release\\HaoJin_750TFT_HJYB-7500TFT_BV1.01_20240808.hex
+IsMergeChangeAddress=false
+MergeFlashOutPutFilePath=
+GPIOOutPutPath=
+MergeCanDBCPath=
+IsFilling=true
+RxID=789
+MergeAudioInPutPath=
+MergeAudioIndex=3
+IsFastSend=true
+MergeBinFilePath=
+MsgMaxBc=0
+UDS_22_2E_DID_FilePath=
+SoftwareVersion=0
+MsgSTmin=0
+MergeLineInOutPutPath=
+Leave2ID=17
+PHYID=781
+BaudRate=500K
+AppUpdateFilePath=C\:\\Users\\Lenovo\\Desktop\\haojin750tft_2024-8-13\\APP_20240813230755344371.srec
+FUNID=7DF
+IsMergeCreateBin=false
+IsOverWrite=true
+DllFilePath=C\:\\Users\\Lenovo\\Desktop\\haojin750_TFT\\haojin750tft\\Firmware\\utility\\\u8BCA\u65AD\u5DE5\u5177\\\u89E3\u9501\u6587\u4EF6\\default_64.dll
+MergeAudioOutPutPath=
+MergeCanOutPutPath=
+ChangeOutPutFilePath=
+MergeTelltalesOutPutPath=
+TTFExtractTXTpath=
+JieFaRH850GPIOJSONpath=
+MergeFlashIsMandatory=false
+UpdateProcess=\u9ED8\u8BA4
+Driver=Kvaser
+MergeFlashImageFormat=
+RH850_F1KMGPIOJSONpath=
+DriverFilePath=C\:\\Users\\Lenovo\\Desktop\\haojin750_TFT\\haojin750tft\\Firmware\\utility\\\u8BCA\u65AD\u5DE5\u5177\\FlashDriver\\R5_FlashDriver.srec
+IsMergeCreateHex=false
+MergeFlashIsCreateREC=false
+TTFExtractTTFpath=
+MergeImageFilePath=
+IsMergeCreateUpdateBin=false
+MergeImageSize=128M
+CRCFilePath=
+MergeFlashCompressionFormat=
+IsPlayMusic=false
+IsHexDisplay=true
+MergeLineInXLSPath=
+MergeFlashInPutFilePath=
+MergeFlashIsInternal=false
+MergeOutPutFilePath=C\:\\Users\\Lenovo\\Desktop\\haojin750tft_2024-8-13
+MergeAppFilePath=C\:\\Users\\Lenovo\\Desktop\\haojin750tft_2024-8-13\\HaoJin750TFT.hex
+MergeTelltalesXLSPath=
+FillingByte=-86
+ImageVersion=0
+XHYGPIOJSONpath=
+Leave1ID=1
+TTFExtractOUTpath=
+MergeAudioPWMMax=2000