Merge branch 'lijianshuang' into 'dev'

Lijianshuang

See merge request !18

Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/RTE/Device/BAT32G139GK64FB/userdefine.h

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

Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/TianYing.uvprojx

@@ -138,7 +138,7 @@
           </Flash1>
           <bUseTDR>1</bUseTDR>
           <Flash2>BIN\UL2CM3.DLL</Flash2>
-          <Flash3></Flash3>
+          <Flash3>"" ()</Flash3>
           <Flash4></Flash4>
           <pFcarmOut></pFcarmOut>
           <pFcarmGrp></pFcarmGrp>
@@ -275,7 +275,7 @@
               </OCR_RVCT3>
               <OCR_RVCT4>
                 <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
+                <StartAddress>0x8000</StartAddress>
                 <Size>0x40000</Size>
               </OCR_RVCT4>
               <OCR_RVCT5>

Firmware/Source/UDS/UDS_ISO14229_Services.h

@@ -310,13 +310,13 @@
 #define CheckSumErr       7    // Checksum Error
 #define UnknownPartID     8    // Unknown Part ID
 
-#define SWV 0x101 // 0x100 = 1.00 software version 软件版本号
+#define SWV 0x100 // 0x100 = 1.00 software version 软件版本号
 #define HWV 0x100 // 0x100 = 1.00 hardware version 硬件版本号
 #define BTV 0x100 // 0x100 = 1.00 bootloader version boot程序版本号
-#define INTLV 0x101 // 0x100 = 1.00 internal version 内部版本号
+#define INTLV 0x100 // 0x100 = 1.00 internal version 内部版本号
 #define PROG_Y 0x24 // 0x24 = 2024年, program year
-#define PROG_M 0x04 // 0x03 = 3月, program month
-#define PROG_D 0x24 // 0x19 = 19日, program day
+#define PROG_M 0x05 // 0x03 = 3月, program month
+#define PROG_D 0x15 // 0x19 = 19日, program day
 
 /******************************************************************************
  Bootloader Variable

Firmware/utility/程序释放/命名.txt

+TY_TY200.080000b_BAT32G139GK64FB_BootApp_S1.00_240515
+TY_TY200.080000b_BAT32G139GK64FB_UpdateApp_S1.00_240515
+
+TY_TY200.080000b_ESP32-D0WD-V3_BootApp_S1.00_240515
+TY_TY200.080000b_ESP32-D0WD-V3_UpdateApp_S1.00_240515
\ No newline at end of file

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

 #new Option
-#Fri May 10 15:30:10 CST 2024
+#Wed May 15 11:59:36 CST 2024
 IsSort=true
 MergeFlashIsCompression=false
 ChangeAppFilePath=
@@ -7,7 +7,7 @@ MergeCanXLSPath=
 RH850_D1M1AGPIOJSONpath=
 DBFFilePath=
 MergeCrcTtpe=21
-MergeBootFilePath=D\:\\Git\\tianying_ty100\\Firmware\\utility\\Boot_Release\\TianYing_TY200.080000b_Boot_B1.00_240510.hex
+MergeBootFilePath=D\:\\Git\\\u5929\u9E70\\tianying_ty100\\Firmware\\utility\\Boot_Release\\TianYing_TY200.080000b_Boot_B1.00_240513.hex
 IsMergeChangeAddress=false
 MergeFlashOutPutFilePath=
 GPIOOutPutPath=
@@ -56,8 +56,8 @@ IsHexDisplay=true
 MergeLineInXLSPath=
 MergeFlashInPutFilePath=
 MergeFlashIsInternal=false
-MergeOutPutFilePath=D\:\\\u5237\u5199\u6587\u4EF6\\\u5929\u9E70100\\20240507
-MergeAppFilePath=D\:\\Git\\tianying_ty100\\Firmware\\Project\\Cmsemicon\\BAT32A239\\MDK_ARM\\Objects\\TianYing.hex
+MergeOutPutFilePath=D\:\\Git\\\u5929\u9E70\\tianying_ty100\\Firmware\\utility\\\u7A0B\u5E8F\u91CA\u653E\\20240515
+MergeAppFilePath=D\:\\Git\\\u5929\u9E70\\tianying_ty100\\Firmware\\utility\\\u7A0B\u5E8F\u91CA\u653E\\20240515\\TianYing.hex
 MergeTelltalesXLSPath=
 FillingByte=-86
 ImageVersion=0