Merge branch 'lijianshuang' into 'dev'

Lijianshuang See merge request !45

Merge branch 'lijianshuang' into 'dev'
Lijianshuang See merge request !45
d3606946 · 高士达 · 75fa840f · eb35e817 · d3606946 · d3606946
Commit d3606946 authored Jul 07, 2024 by 高士达
7 changed files
--- a/Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/TianYing.uvprojx
+++ b/Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/TianYing.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/Source/UDS/UDS_ISO14229_Services.h
+++ b/Firmware/Source/UDS/UDS_ISO14229_Services.h
@@ -312,12 +312,12 @@
 #define UnknownPartID     8    // Unknown Part ID

 #define SWV 0x100 // 0x100 = 1.00 software version 软件版本号
-#define HWV 0x100 // 0x100 = 1.00 hardware version 硬件版本号
+#define HWV 0x101 // 0x100 = 1.00 hardware version 硬件版本号
 #define BTV 0x100 // 0x100 = 1.00 bootloader version boot程序版本号
-#define INTLV 0x106 // 0x100 = 1.00 internal version 内部版本号
+#define INTLV 0x107 // 0x100 = 1.00 internal version 内部版本号
 #define PROG_Y 0x24 // 0x24 = 2024年, program year
 #define PROG_M 0x07 // 0x03 = 3月, program month
-#define PROG_D 0x02 // 0x19 = 19日, program day
+#define PROG_D 0x06 // 0x19 = 19日, program day

 /******************************************************************************
 Bootloader Variable

--- a/Firmware/utility/程序释放/20240706/TY_TY200.080000b_ty_BAT32G139GK64FB_BootApp_S1.07_240706/TY_TY200.080000b_ty_BAT32G139GK64FB_BootApp_S1.07_240706.srec
+++ b/Firmware/utility/程序释放/20240706/TY_TY200.080000b_ty_BAT32G139GK64FB_BootApp_S1.07_240706/TY_TY200.080000b_ty_BAT32G139GK64FB_BootApp_S1.07_240706.srec
--- a/Firmware/utility/程序释放/20240706/TY_TY200.080000b_ty_BAT32G139GK64FB_BootApp_S1.07_240706/TY_TY200.080000b_ty_BAT32G139GK64FB_UpdateApp_S1.07_240706.srec
+++ b/Firmware/utility/程序释放/20240706/TY_TY200.080000b_ty_BAT32G139GK64FB_BootApp_S1.07_240706/TY_TY200.080000b_ty_BAT32G139GK64FB_UpdateApp_S1.07_240706.srec
--- a/Firmware/utility/程序释放/20240706/TianYing.hex
+++ b/Firmware/utility/程序释放/20240706/TianYing.hex
--- a/Firmware/utility/程序释放/软件变更记录(天鹰项目139).xlsx
+++ b/Firmware/utility/程序释放/软件变更记录(天鹰项目139).xlsx
--- a/Firmware/utility/诊断工具/Option/Option.properties
+++ b/Firmware/utility/诊断工具/Option/Option.properties
 #new Option
-#Tue Jul 02 09:52:52 CST 2024
+#Sat Jul 06 10:25:35 CST 2024
 IsSort=true
 MergeFlashIsCompression=false
 ChangeAppFilePath=
@@ -56,8 +56,8 @@ IsHexDisplay=true
 MergeLineInXLSPath=
 MergeFlashInPutFilePath=
 MergeFlashIsInternal=false
-MergeOutPutFilePath=D\:\\Git\\\u5929\u9E70\\tianying_ty100\\Firmware\\utility\\\u7A0B\u5E8F\u91CA\u653E\\20240702
-MergeAppFilePath=D\:\\Git\\\u5929\u9E70\\tianying_ty100\\Firmware\\utility\\\u7A0B\u5E8F\u91CA\u653E\\20240702\\TianYing.hex
+MergeOutPutFilePath=D\:\\Git\\\u5929\u9E70\\tianying_ty100\\Firmware\\utility\\\u7A0B\u5E8F\u91CA\u653E\\20240706
+MergeAppFilePath=D\:\\Git\\\u5929\u9E70\\tianying_ty100\\Firmware\\utility\\\u7A0B\u5E8F\u91CA\u653E\\20240706\\TianYing.hex
 MergeTelltalesXLSPath=
 FillingByte=-86
 ImageVersion=0