Commit 381beb17 authored by 李秉薇's avatar 李秉薇

fix:修改诊断外发buff,修改keyInfo零件号,修改139带有boot的向量起始地址

parent 9b6ee223
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
</Flash1> </Flash1>
<bUseTDR>1</bUseTDR> <bUseTDR>1</bUseTDR>
<Flash2>BIN\UL2CM3.DLL</Flash2> <Flash2>BIN\UL2CM3.DLL</Flash2>
<Flash3></Flash3> <Flash3>"" ()</Flash3>
<Flash4></Flash4> <Flash4></Flash4>
<pFcarmOut></pFcarmOut> <pFcarmOut></pFcarmOut>
<pFcarmGrp></pFcarmGrp> <pFcarmGrp></pFcarmGrp>
...@@ -275,7 +275,7 @@ ...@@ -275,7 +275,7 @@
</OCR_RVCT3> </OCR_RVCT3>
<OCR_RVCT4> <OCR_RVCT4>
<Type>1</Type> <Type>1</Type>
<StartAddress>0x0</StartAddress> <StartAddress>0x8000</StartAddress>
<Size>0x40000</Size> <Size>0x40000</Size>
</OCR_RVCT4> </OCR_RVCT4>
<OCR_RVCT5> <OCR_RVCT5>
......
...@@ -64,9 +64,12 @@ typedef enum { ...@@ -64,9 +64,12 @@ typedef enum {
following is an example for different system frequencies */ following is an example for different system frequencies */
//-------- <<< Use Configuration Wizard in Context Menu >>> ------------------ //-------- <<< 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"))) = const uint8_t user_opt_data[4] __attribute__((used)) __attribute__((section(".ARM.__AT_0x000000C0"))) =
#endif
{ {
/** /**
* @brief WDT Control BYTE * @brief WDT Control BYTE
* Please refer to the user manual for details. * Please refer to the user manual for details.
......
...@@ -16,6 +16,9 @@ User definitions ...@@ -16,6 +16,9 @@ User definitions
***********************************************************************************************************************/ ***********************************************************************************************************************/
#ifndef __TYPEDEF__ #ifndef __TYPEDEF__
#define HAS_BOOTLOADER (1u) // 仅仿真App时设置为0
#define APP_BASE (0x00008000ul)
typedef unsigned short MD_STATUS; typedef unsigned short MD_STATUS;
/* Status list definition */ /* Status list definition */
#define MD_STATUSBASE (0x00U) #define MD_STATUSBASE (0x00U)
......
...@@ -243,7 +243,7 @@ void DoCAN_L_Data_Request(uint16_t Identifier, uint8_t dlc, uint8_t *Data) ...@@ -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] ; msg_diag_tx.Data[i] = LinkTxCtrl.Data[i] ;
} }
CAN_Transmit(CAN0MSG09, &msg_diag_tx); CAN_Transmit(CAN0MSG15, &msg_diag_tx);
// Can_Write(&msg); // Can_Write(&msg);
//CANFD_Ch1_L_Data_Request(LinkTxCtrl.Identifier,8,LinkTxCtrl.Data); //CANFD_Ch1_L_Data_Request(LinkTxCtrl.Identifier,8,LinkTxCtrl.Data);
LinkTxCtrl.Busy = 1; LinkTxCtrl.Busy = 1;
......
...@@ -28,7 +28,7 @@ extern void UDS_Service_Response(uint8_t si, uint8_t RspType, uint16_t A_TA_type ...@@ -28,7 +28,7 @@ extern void UDS_Service_Response(uint8_t si, uint8_t RspType, uint16_t A_TA_type
extern const ProjectInfoStruct ProjectInfo __attribute__((section(".ARM.__at_0x00007800"))) = extern const ProjectInfoStruct ProjectInfo __attribute__((section(".ARM.__at_0x00007800"))) =
{ {
"RMR42E", // 豪进232 "RMR42E", // 豪进232
"RYB-1", "RMRE42-60",
"BAT32A139KK64FB", // 中微芯片 "BAT32A139KK64FB", // 中微芯片
{ {
"CAN_STD", "CAN_STD",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment