Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
R
RT_RMR42E
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
时昊
RT_RMR42E
Commits
381beb17
Commit
381beb17
authored
Jul 07, 2024
by
李秉薇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:修改诊断外发buff,修改keyInfo零件号,修改139带有boot的向量起始地址
parent
9b6ee223
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
5 deletions
+11
-5
RMR42E.uvprojx
Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/RMR42E.uvprojx
+2
-2
system_BAT32G139.c
...239/MDK_ARM/RTE/Device/BAT32G139GK64FB/system_BAT32G139.c
+4
-1
userdefine.h
...BAT32A239/MDK_ARM/RTE/Device/BAT32G139GK64FB/userdefine.h
+3
-0
DoCAN_ISO15765.c
Firmware/Source/UDS/DoCAN_ISO15765.c
+1
-1
UDS_ISO14229_Services.c
Firmware/Source/UDS/UDS_ISO14229_Services.c
+1
-1
No files found.
Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/RMR42E.uvprojx
View file @
381beb17
...
@@ -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>
0x
800
0
</StartAddress>
<Size>
0x40000
</Size>
<Size>
0x40000
</Size>
</OCR_RVCT4>
</OCR_RVCT4>
<OCR_RVCT5>
<OCR_RVCT5>
...
...
Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/RTE/Device/BAT32G139GK64FB/system_BAT32G139.c
View file @
381beb17
...
@@ -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.
...
...
Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/RTE/Device/BAT32G139GK64FB/userdefine.h
View file @
381beb17
...
@@ -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)
...
...
Firmware/Source/UDS/DoCAN_ISO15765.c
View file @
381beb17
...
@@ -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
(
CAN0MSG
09
,
&
msg_diag_tx
);
CAN_Transmit
(
CAN0MSG
15
,
&
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
;
...
...
Firmware/Source/UDS/UDS_ISO14229_Services.c
View file @
381beb17
...
@@ -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
"R
YB-1
"
,
"R
MRE42-60
"
,
"BAT32A139KK64FB"
,
// 中微芯片
"BAT32A139KK64FB"
,
// 中微芯片
{
{
"CAN_STD"
,
"CAN_STD"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment