Merge branch 'CHENJIALE' into 'dev'

Chenjiale

See merge request ty/tianying_ty100!54

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>

Firmware/Source/Application/BLUETOOTH/BlueTooth.c

 #include "BlueTooth.h"
+#include "UDS_ISO14229_Services.h"
 BlueTooth_t  BlueTooth;
 uint8_t UUIDData[32] = {"tywtywtywtywtywtywtywtywtywtyw03"};
-
+extern Ser2EDFlashData Ser2EDataForDFlash;
 void BlueTooth_KL30_KL15_Wakeup_Init(void)
 {
     BlueTooth.BLE_St = BLUE_STATE_Starting;
@@ -11,8 +12,8 @@ void BlueTooth_KL30_KL15_Wakeup_Init(void)
 }
 void Send_UUID_To_Esp32(void)
 {
-   Protocol_Send(MCU_ESP32_0x03, UUIDData, 32);
-   //Protocol_Send(MCU_ESP32_0x03, Ser2EDataForDFlash.DID_F184, 32);
+   //Protocol_Send(MCU_ESP32_0x03, UUIDData, 32);
+   Protocol_Send(MCU_ESP32_0x03, Ser2EDataForDFlash.DID_F184, 32);
    
 }
 

Firmware/Source/UDS/UDS_ISO14229_Services.h

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

Firmware/utility/诊断工具/Option/BackStack.json

@@ -10,5 +10,8 @@
   "31 01 02 03",
   "31 01 02 03",
   "22 F1 F1",
-  "22 F1 F1"
+  "22 F1 F1",
+  "22 F1 84",
+  "2E F1 84 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11",
+  "22 F1 84"
 ]
\ No newline at end of file

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

 #new Option
-#Sat Jul 06 10:25:35 CST 2024
+#Thu Jul 18 09:36:34 CST 2024
 IsSort=true
 MergeFlashIsCompression=false
 ChangeAppFilePath=
@@ -7,13 +7,13 @@ MergeCanXLSPath=
 RH850_D1M1AGPIOJSONpath=
 DBFFilePath=
 MergeCrcTtpe=21
-MergeBootFilePath=D\:\\Git\\\u5929\u9E70\\tianying_ty100\\Firmware\\utility\\Boot_Release\\TY200.080000b(ty)\\TY_TY200.080000b(ty)_Boot_B1.01_240620.hex
+MergeBootFilePath=D\:\\git\\tianying_ty100\\Firmware\\utility\\Boot_Release\\TY200.080000b(ty)\\TY_TY200.080000b(ty)_Boot_B1.01_240620.hex
 IsMergeChangeAddress=false
 MergeFlashOutPutFilePath=
 GPIOOutPutPath=
-MergeCanDBCPath=D\:\\Git\\\u5929\u9E70\\tianying_ty100\\Firmware\\utility\\Can_BDF\\tianying.dbc
+MergeCanDBCPath=
 IsFilling=true
-RxID=789
+RxID=7E8
 MergeAudioInPutPath=
 MergeAudioIndex=3
 IsFastSend=true
@@ -23,23 +23,23 @@ UDS_22_2E_DID_FilePath=
 SoftwareVersion=0
 MsgSTmin=0
 MergeLineInOutPutPath=
-Leave2ID=1
-PHYID=781
+Leave2ID=9
+PHYID=7E0
 BaudRate=500K
 AppUpdateFilePath=
 FUNID=7DF
 IsMergeCreateBin=false
 IsOverWrite=false
-DllFilePath=
+DllFilePath=D\:\\git\\tianying_ty100\\Firmware\\utility\\\u8BCA\u65AD\u5DE5\u5177\\\u89E3\u9501\u6587\u4EF6\\TY100 x64.dll
 MergeAudioOutPutPath=
-MergeCanOutPutPath=D\:\\Git\\\u5929\u9E70\\tianying_ty100\\Firmware\\utility\\Can_BDF
+MergeCanOutPutPath=
 ChangeOutPutFilePath=
 MergeTelltalesOutPutPath=
 TTFExtractTXTpath=
 JieFaRH850GPIOJSONpath=
 MergeFlashIsMandatory=false
 UpdateProcess=\u6BD4\u4E9A\u8FEA
-Driver=Kvaser
+Driver=PCAN
 MergeFlashImageFormat=
 RH850_F1KMGPIOJSONpath=
 DriverFilePath=
@@ -56,12 +56,12 @@ IsHexDisplay=true
 MergeLineInXLSPath=
 MergeFlashInPutFilePath=
 MergeFlashIsInternal=false
-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
+MergeOutPutFilePath=D\:\\git\\tianying_ty100\\Firmware\\utility\\\u7A0B\u5E8F\u91CA\u653E\\20240718\\TY_TY200.080000b_ty_BAT32G139GK64FB_BootApp_S1.08_240718
+MergeAppFilePath=D\:\\git\\tianying_ty100\\Firmware\\utility\\\u7A0B\u5E8F\u91CA\u653E\\20240718\\TianYing.hex
 MergeTelltalesXLSPath=
 FillingByte=-86
 ImageVersion=0
 XHYGPIOJSONpath=
-Leave1ID=1
+Leave1ID=9
 TTFExtractOUTpath=
 MergeAudioPWMMax=2000