Merge branch 'LBW' into 'zhengping'

Lbw

See merge request !2

Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/RMR42E.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/Project/Cmsemicon/BAT32A239/MDK_ARM/RTE/Device/BAT32G139GK64FB/system_BAT32G139.c

@@ -64,9 +64,12 @@ typedef enum {
          following is an example for different system frequencies */
 
 //-------- <<< Use Configuration Wizard in Context Menu >>> ------------------
+#if HAS_BOOTLOADER
+const uint8_t user_opt_data[4] __attribute__((used)) __attribute__((section(".ARM.__AT_0x000080C0"))) =
+#else
 const uint8_t user_opt_data[4] __attribute__((used)) __attribute__((section(".ARM.__AT_0x000000C0"))) =
+#endif
 {
-
 /**
  * @brief WDT Control BYTE
  * Please refer to the user manual for details.

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

@@ -16,6 +16,9 @@ User definitions
 ***********************************************************************************************************************/
 #ifndef __TYPEDEF__
 
+#define HAS_BOOTLOADER (1u) // 仅仿真App时设置为0
+#define APP_BASE (0x00008000ul)
+
 typedef unsigned short 	MD_STATUS;
 /* Status list definition */
 #define MD_STATUSBASE        (0x00U)

Firmware/Source/UDS/DoCAN_ISO15765.c

@@ -243,7 +243,7 @@ void DoCAN_L_Data_Request(uint16_t Identifier, uint8_t dlc, uint8_t *Data)
           msg_diag_tx.Data[i] =  LinkTxCtrl.Data[i] ;
         }
 
-        CAN_Transmit(CAN0MSG09, &msg_diag_tx);
+        CAN_Transmit(CAN0MSG15, &msg_diag_tx);
         // Can_Write(&msg);
     //CANFD_Ch1_L_Data_Request(LinkTxCtrl.Identifier,8,LinkTxCtrl.Data);
     LinkTxCtrl.Busy  = 1;

Firmware/Source/UDS/UDS_ISO14229_Services.c

@@ -27,8 +27,8 @@ 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",    // 润通RMR42E
-    "RMR42E-60",
+    "RMR42E",    // 豪进232
+    "RMRE42-60",
     "BAT32A139KK64FB", // 中微芯片
     {
         "CAN_STD",