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
8c774b36
Commit
8c774b36
authored
Mar 31, 2025
by
李冠华
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🐞
fix:修改需要判断3帧信号才能触发的指示灯,当三帧有效信号之间的时间间隔大于超时市场,三帧信号需要重新判断
parent
3e1a7caf
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
64 additions
and
7 deletions
+64
-7
CAN_CH0_CAN_Communication_Matrix.c
...ce/Application/CAN_APP/CAN_CH0_CAN_Communication_Matrix.c
+13
-7
Can_RX_User.c
Firmware/Source/Application/CAN_User/Can_RX_User.c
+43
-0
Can_RX_User.h
Firmware/Source/Application/CAN_User/Can_RX_User.h
+8
-0
No files found.
Firmware/Source/Application/CAN_APP/CAN_CH0_CAN_Communication_Matrix.c
View file @
8c774b36
...
@@ -507,7 +507,7 @@ const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] =
...
@@ -507,7 +507,7 @@ const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] =
0x225ul
,
0x225ul
,
((
void
*
)
0
),
((
void
*
)
0
),
(
CAN_0x225_Receive
),
(
CAN_0x225_Receive
),
(
(
void
*
)
0
),
(
CAN_0x225_Lost_CallBack
),
},
},
{
{
{
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
},
{
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
},
...
@@ -627,7 +627,7 @@ const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] =
...
@@ -627,7 +627,7 @@ const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] =
0x170ul
,
0x170ul
,
((
void
*
)
0
),
((
void
*
)
0
),
(
CAN_0x170_Receive
),
(
CAN_0x170_Receive
),
(
(
void
*
)
0
),
(
CAN_0x170_Lost_CallBack
),
},
},
{
{
{
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
},
{
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
},
...
@@ -637,7 +637,7 @@ const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] =
...
@@ -637,7 +637,7 @@ const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] =
0x16Bul
,
0x16Bul
,
((
void
*
)
0
),
((
void
*
)
0
),
(
CAN_0x16B_Receive
),
(
CAN_0x16B_Receive
),
(
(
void
*
)
0
),
(
CAN_0x16B_Lost_CallBack
),
},
},
{
{
{
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
},
{
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
},
...
@@ -667,7 +667,7 @@ const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] =
...
@@ -667,7 +667,7 @@ const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] =
0x234ul
,
0x234ul
,
((
void
*
)
0
),
((
void
*
)
0
),
(
CAN_0x234_Receive
),
(
CAN_0x234_Receive
),
(
(
void
*
)
0
),
(
CAN_0x234_Lost_CallBack
),
},
},
{
{
{
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
},
{
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
},
...
@@ -677,7 +677,7 @@ const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] =
...
@@ -677,7 +677,7 @@ const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] =
0x22Ful
,
0x22Ful
,
((
void
*
)
0
),
((
void
*
)
0
),
(
CAN_0x22F_Receive
),
(
CAN_0x22F_Receive
),
(
(
void
*
)
0
),
(
CAN_0x22F_Lost_CallBack
),
},
},
{
{
{
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
},
{
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
},
...
@@ -687,7 +687,7 @@ const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] =
...
@@ -687,7 +687,7 @@ const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] =
0x18Eul
,
0x18Eul
,
((
void
*
)
0
),
((
void
*
)
0
),
(
CAN_0x18E_Receive
),
(
CAN_0x18E_Receive
),
(
(
void
*
)
0
),
(
CAN_0x18E_Lost_CallBack
),
},
},
{
{
{
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
},
{
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
},
...
@@ -707,7 +707,7 @@ const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] =
...
@@ -707,7 +707,7 @@ const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] =
0x38Eul
,
0x38Eul
,
((
void
*
)
0
),
((
void
*
)
0
),
(
CAN_0x38E_Receive
),
(
CAN_0x38E_Receive
),
(
(
void
*
)
0
),
(
CAN_0x38E_Lost_CallBack
),
},
},
{
{
{
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
},
{
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
},
...
@@ -731,6 +731,12 @@ void System_Indicator_OFF_callback(canlib_uint8_t CopyData[])
...
@@ -731,6 +731,12 @@ void System_Indicator_OFF_callback(canlib_uint8_t CopyData[])
{
{
LED_Driver_Channel_Set
(
LampChannel_0
,
i
,
LED_OFF
);
LED_Driver_Channel_Set
(
LampChannel_0
,
i
,
LED_OFF
);
}
}
g_GrassSwCount
=
0U
;
g_SeatCount
=
0U
;
g_KeyCount
=
0U
;
g_ReadyCount
=
0U
;
g_PtoSwCount
=
0U
;
g_SysFltLampCount
=
0U
;
}
}
uint8_t
Get_CAN_CH0_ID_225_Sig_VCU_VoltLow
(
void
)
uint8_t
Get_CAN_CH0_ID_225_Sig_VCU_VoltLow
(
void
)
...
...
Firmware/Source/Application/CAN_User/Can_RX_User.c
View file @
8c774b36
...
@@ -672,3 +672,46 @@ void CAN_0x17A_Receive(uint8_t CopyData [])
...
@@ -672,3 +672,46 @@ void CAN_0x17A_Receive(uint8_t CopyData [])
{
{
g_Msg0x17AFlag
=
1U
;
g_Msg0x17AFlag
=
1U
;
}
}
void
CAN_0x18E_Lost_CallBack
(
uint8_t
CopyData
[])
{
Fuel
.
FuelStatusCount
=
0U
;
}
void
CAN_0x225_Lost_CallBack
(
uint8_t
CopyData
[])
{
g_u8EmsFltLv3Count
=
0U
;
g_VoltLowCount
=
0U
;
g_BmsFltCount
[
0
]
=
0U
;
g_BmsFltCount
[
1
]
=
0U
;
}
void
CAN_0x234_Lost_CallBack
(
uint8_t
CopyData
[])
{
g_EngineOilLowCount
=
0U
;
}
void
CAN_0x38E_Lost_CallBack
(
uint8_t
CopyData
[])
{
for
(
uint8_t
i
=
0U
;
i
<
9U
;
i
++
)
{
g_OverLoadCount
[
i
]
=
0U
;
}
}
void
CAN_0x16B_Lost_CallBack
(
uint8_t
CopyData
[])
{
g_ChgModeCount
=
0U
;
}
void
CAN_0x22F_Lost_CallBack
(
uint8_t
CopyData
[])
{
g_WorkCount
=
0U
;
}
void
CAN_0x170_Lost_CallBack
(
uint8_t
CopyData
[])
{
g_TOTALSigChargeCount
=
0U
;
}
Firmware/Source/Application/CAN_User/Can_RX_User.h
View file @
8c774b36
...
@@ -48,4 +48,12 @@ extern void CAN_0x170_Receive(uint8_t CopyData []);
...
@@ -48,4 +48,12 @@ extern void CAN_0x170_Receive(uint8_t CopyData []);
extern
void
CAN_0x339_Receive
(
uint8_t
CopyData
[]);
extern
void
CAN_0x339_Receive
(
uint8_t
CopyData
[]);
extern
void
CAN_0x17A_Receive
(
uint8_t
CopyData
[]);
extern
void
CAN_0x17A_Receive
(
uint8_t
CopyData
[]);
extern
void
CAN_0x18E_Lost_CallBack
(
uint8_t
CopyData
[]);
extern
void
CAN_0x225_Lost_CallBack
(
uint8_t
CopyData
[]);
extern
void
CAN_0x234_Lost_CallBack
(
uint8_t
CopyData
[]);
extern
void
CAN_0x38E_Lost_CallBack
(
uint8_t
CopyData
[]);
extern
void
CAN_0x16B_Lost_CallBack
(
uint8_t
CopyData
[]);
extern
void
CAN_0x22F_Lost_CallBack
(
uint8_t
CopyData
[]);
extern
void
CAN_0x170_Lost_CallBack
(
uint8_t
CopyData
[]);
#endif
#endif
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