Merge branch 'dev' of http://tyw-server.synology.me:12345/shihao/rt_rmr42e into dev

.gitignore

@@ -11,3 +11,4 @@
 Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/RunTong.uvoptx
 /Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/*.uvoptx
 /Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/*.VMW10
+/Firmware/utility/诊断工具/Option

Firmware/Source/UDS/UDS_ISO14229_Services.c

@@ -27,13 +27,13 @@ extern void UDS_Service_Response(uint8_t si, uint8_t RspType, uint16_t A_TA_type
 /*诊断使用, 判断App一致性, 禁止修改（内部版本号除外）*/
 extern const ProjectInfoStruct ProjectInfo __attribute__((section(".ARM.__at_0x00007800"))) =
 {
-    "RMR42E",    // 豪进232
+    "RMR42E",    //
     "RMRE42-60",
     "BAT32A139KK64FB", // 中微芯片
     {
         "CAN_STD",
         "CAN_CH_0",
-        "CAN_250Kbps",
+        "CAN_500Kbps",
         {DIAG_ID_Tx, DIAG_ID_Rx_PHY, DIAG_ID_Rx_FUN}
     }
 };

Firmware/utility/BootRelease/变更记录.txt

+1.500kCAN option byte 7c73f8ff
+RT_RMR42E_RMRE42-60_Boot_BV1.02_20241210.hex
\ No newline at end of file

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

-[
-  "31 01 02 03",
-  "31 01 02 03",
-  "34",
-  "34",
-  "14",
-  "14 FF FF FF",
-  "31 01 02 03",
-  "31 01 02 03",
-  "31 01 02 03",
-  "31 01 02 03",
-  "22 F1 F1",
-  "22 F1 F1"
-]
\ No newline at end of file

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

-#new Option
-#Fri Jul 26 15:51:28 CST 2024
-IsSort=true
-MergeFlashIsCompression=false
-ChangeAppFilePath=
-MergeCanXLSPath=
-RH850_D1M1AGPIOJSONpath=
-DBFFilePath=
-MergeCrcTtpe=21
-MergeBootFilePath=D\:\\\u5DE5\u4F5C\\\u6DA6\u901A\u8349\u5730\\new\\rt_rmr42e\\Firmware\\utility\\BootRelease\\RT_RMR42E_RMRE42-60_Boot_BV1.01_20240709.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=1
-PHYID=781
-BaudRate=250K
-AppUpdateFilePath=C\:\\Users\\Administrator\\Desktop\\RT_RMRE42-60-20240726\\APP_20240726154929509340.srec
-FUNID=7DF
-IsMergeCreateBin=false
-IsOverWrite=false
-DllFilePath=D\:\\\u5DE5\u4F5C\\\u6DA6\u901A\u8349\u5730\\new\\rt_rmr42e\\Firmware\\utility\\\u8BCA\u65AD\u5DE5\u5177\\\u89E3\u9501\u6587\u4EF6\\HJ232 x64.dll
-MergeAudioOutPutPath=
-MergeCanOutPutPath=
-ChangeOutPutFilePath=
-MergeTelltalesOutPutPath=
-TTFExtractTXTpath=
-JieFaRH850GPIOJSONpath=
-MergeFlashIsMandatory=false
-UpdateProcess=\u6BD4\u4E9A\u8FEA
-Driver=PCAN
-MergeFlashImageFormat=
-RH850_F1KMGPIOJSONpath=
-DriverFilePath=D\:\\\u5DE5\u4F5C\\\u6DA6\u901A\u8349\u5730\\new\\rt_rmr42e\\Firmware\\utility\\\u8BCA\u65AD\u5DE5\u5177\\FlashDriver\\R5_FlashDriver.srec
-IsMergeCreateHex=false
-MergeFlashIsCreateREC=false
-TTFExtractTTFpath=
-MergeImageFilePath=
-IsMergeCreateUpdateBin=false
-MergeImageSize=64M
-CRCFilePath=
-MergeFlashCompressionFormat=
-IsPlayMusic=false
-IsHexDisplay=true
-MergeLineInXLSPath=
-MergeFlashInPutFilePath=
-MergeFlashIsInternal=false
-MergeOutPutFilePath=C\:\\Users\\Administrator\\Desktop\\RT_RMRE42-60-20240726
-MergeAppFilePath=C\:\\Users\\Administrator\\Desktop\\RT_RMRE42-60-20240726\\RMR42E.hex
-MergeTelltalesXLSPath=
-FillingByte=-86
-ImageVersion=0
-XHYGPIOJSONpath=
-Leave1ID=1
-TTFExtractOUTpath=
-MergeAudioPWMMax=2000