Merge branch 'zhengping' into 'dev'

✨ feat:1.04版程序释放 See merge request !18

Merge branch 'zhengping' into 'dev'
✨ feat:1.04版程序释放 See merge request !18
1d28d596 · 时昊 · 14073170 · 53f4cf19 · 1d28d596 · 1d28d596
Commit 1d28d596 authored Jul 26, 2024 by 时昊
5 changed files
--- a/Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/RMR42E.uvprojx
+++ b/Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/RMR42E.uvprojx
@@ -275,7 +275,7 @@
              </OCR_RVCT3>
              <OCR_RVCT4>
                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
+                <StartAddress>0x8000</StartAddress>
                <Size>0x40000</Size>
              </OCR_RVCT4>
              <OCR_RVCT5>

--- a/Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/RTE/Device/BAT32G139GK64FB/userdefine.h
+++ b/Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/RTE/Device/BAT32G139GK64FB/userdefine.h
@@ -16,7 +16,7 @@ User definitions
 ***********************************************************************************************************************/
 #ifndef __TYPEDEF__
-#define HAS_BOOTLOADER (0u) // 仅仿真App时设置为0
+#define HAS_BOOTLOADER (1u) // 仅仿真App时设置为0
 #define APP_BASE (0x00008000ul)
 typedef unsigned short 	MD_STATUS;

--- a/Firmware/utility/程序释放/RT_RMRE42-60-20240726/RT_RMRE42-60_BootApp_S1.04_240726.srec
+++ b/Firmware/utility/程序释放/RT_RMRE42-60-20240726/RT_RMRE42-60_BootApp_S1.04_240726.srec
--- a/Firmware/utility/程序释放/RT_RMRE42-60-20240726/RT_RMRE42-60_UpdateApp_S1.04_240726.srec
+++ b/Firmware/utility/程序释放/RT_RMRE42-60-20240726/RT_RMRE42-60_UpdateApp_S1.04_240726.srec
--- a/Firmware/utility/诊断工具/Option/Option.properties
+++ b/Firmware/utility/诊断工具/Option/Option.properties
 #new Option
-#Wed Jul 24 11:13:11 CST 2024
+#Fri Jul 26 15:51:28 CST 2024
 IsSort=true
 MergeFlashIsCompression=false
 ChangeAppFilePath=
@@ -26,7 +26,7 @@ MergeLineInOutPutPath=
 Leave2ID=1
 PHYID=781
 BaudRate=250K
-AppUpdateFilePath=C\:\\Users\\Administrator\\Desktop\\RT_RMRE42-60-20240722\\APP_20240724110408367358.srec
+AppUpdateFilePath=C\:\\Users\\Administrator\\Desktop\\RT_RMRE42-60-20240726\\APP_20240726154929509340.srec
 FUNID=7DF
 IsMergeCreateBin=false
 IsOverWrite=false
@@ -56,8 +56,8 @@ IsHexDisplay=true
 MergeLineInXLSPath=
 MergeFlashInPutFilePath=
 MergeFlashIsInternal=false
-MergeOutPutFilePath=C\:\\Users\\Administrator\\Desktop\\RT_RMRE42-60-20240722
+MergeOutPutFilePath=C\:\\Users\\Administrator\\Desktop\\RT_RMRE42-60-20240726
-MergeAppFilePath=C\:\\Users\\Administrator\\Desktop\\RT_RMRE42-60-20240722\\RMR42E.hex
+MergeAppFilePath=C\:\\Users\\Administrator\\Desktop\\RT_RMRE42-60-20240726\\RMR42E.hex
 MergeTelltalesXLSPath=
 FillingByte=-86
 ImageVersion=0