Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
TianYing_ty100
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
TY
TianYing_ty100
Commits
566f9f36
Commit
566f9f36
authored
May 16, 2024
by
李俭双
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🐞
fix:43124,更改里程外发
parent
ebe3be53
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
5 deletions
+14
-5
Can_App.c
Firmware/Source/Application/CAN_User/Can_App.c
+9
-3
Can_App.h
Firmware/Source/Application/CAN_User/Can_App.h
+5
-2
No files found.
Firmware/Source/Application/CAN_User/Can_App.c
View file @
566f9f36
...
...
@@ -23,6 +23,7 @@ void Can_Set_Buff_6EE(canlib_uint8_t CopyData[])
CANMsg6EEUnion
*
p6EE
;
uint8_t
i
=
0
;
uint16_t
Vspeed_tx
=
0
;
uint32_t
ODO_tx
=
Data_ODO_Read
()
/
10
;
Vspeed_tx
=
Get_DispVechileSpeed_TX
()
/
10
;
p6EE
=
(
CANMsg6EEUnion
*
)
CopyData
;
...
...
@@ -35,7 +36,9 @@ void Can_Set_Buff_6EE(canlib_uint8_t CopyData[])
}
p6EE
->
Sig
.
Vsppe_H3_TX
=
(
Vspeed_tx
>>
8
)
&
0x7u
;
p6EE
->
Sig
.
Vsppe_L8_TX
=
Vspeed_tx
&
0xFF
;
p6EE
->
Sig
.
ODO_TX
=
Data_ODO_Read
();
p6EE
->
Sig
.
ODO_TX_H
=
(
ODO_tx
>>
16
)
&
0xFF
;
p6EE
->
Sig
.
ODO_TX_M
=
(
ODO_tx
>>
8
)
&
0xFF
;
p6EE
->
Sig
.
ODO_TX_L
=
ODO_tx
&
0xFF
;
p6EE
->
Sig
.
Uint_TX
=
Get_Dis_KM_Unit
()
;
p6EE
->
Sig
.
Coolant_Seg_TX
=
GET_DataCoolantTempSegDisp
()
;
if
(
GET_DataCollantTempWarnflg
()
==
2
)
...
...
@@ -63,7 +66,9 @@ void Can_Set_Buff_6EF(canlib_uint8_t CopyData[])
CANMsg6EFUnion
*
p6EF
;
uint8_t
i
=
0
;
uint16_t
Espeed_tx
=
0
;
uint16_t
TripA_tx
=
0
;
Espeed_tx
=
Get_DispEngineSpeed
()
/
100
;
TripA_tx
=
Data_Read_Trip
(
EM_TRIP_A
);
p6EF
=
(
CANMsg6EFUnion
*
)
CopyData
;
if
(
p6EF
!=
(
void
*
)
0
)
{
...
...
@@ -73,7 +78,8 @@ void Can_Set_Buff_6EF(canlib_uint8_t CopyData[])
}
}
p6EF
->
Sig
.
Espeed_TX
=
Espeed_tx
;
p6EF
->
Sig
.
TripA
=
Data_Read_Trip
(
EM_TRIP_A
);
p6EF
->
Sig
.
TripA_H
=
(
TripA_tx
>>
8
)
&
0xFF
;
p6EF
->
Sig
.
TripA_L
=
TripA_tx
&
0xFF
;
p6EF
->
Sig
.
Coolant_TX
=
GET_DataCoolantTempValueDisp
()
+
40
;
}
void
Can_Set_Buff_450
(
canlib_uint8_t
CopyData
[])
...
...
Firmware/Source/Application/CAN_User/Can_App.h
View file @
566f9f36
...
...
@@ -41,7 +41,9 @@ typedef union
uint32_t
Vsppe_L8_TX
:
8
;
uint32_t
ODO_TX
:
24
;
uint32_t
ODO_TX_H
:
8
;
uint32_t
ODO_TX_M
:
8
;
uint32_t
ODO_TX_L
:
8
;
}
Sig
;
}
CANMsg6EEUnion
;
...
...
@@ -55,7 +57,8 @@ typedef union
uint32_t
Coolant_TX
:
8
;
uint32_t
TripA
:
16
;
uint32_t
TripA_H
:
8
;
uint32_t
TripA_L
:
8
;
uint32_t
TripB
:
16
;
...
...
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