Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
H
haoJin750TFT
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
时昊
haoJin750TFT
Commits
81e1cf57
Commit
81e1cf57
authored
Nov 18, 2024
by
张金硕
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🐞
fix:优化蓝牙关闭时的逻辑,修改零件号
parent
90c88a1f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
BlueTooth.c
Firmware/Source/Application/BlueTooth.c
+2
-1
UDS_ISO14229_Services.c
Firmware/Source/UDS/UDS_ISO14229_Services.c
+3
-3
No files found.
Firmware/Source/Application/BlueTooth.c
View file @
81e1cf57
...
...
@@ -71,7 +71,6 @@ void BlueToothService(void)
}
else
{
SetBluetoothCloseCount
++
;
if
(
GetBlueToothVaild
==
1
)
{
// if(SetBluetoothCloseCount < 30)
...
...
@@ -86,7 +85,9 @@ void BlueToothService(void)
// SetBluetoothCloseCount++;
SetBluetoothTurnXX
(
0
);
GetBlueToothVaild
=
0
;
SetBluetoothCloseCount
=
0
;
}
SetBluetoothCloseCount
++
;
if
(
SetBluetoothCloseCount
>=
5
)
{
SetBluetoothTurnXX
(
0
);
...
...
Firmware/Source/UDS/UDS_ISO14229_Services.c
View file @
81e1cf57
...
...
@@ -78,7 +78,7 @@ uint8_t MCU_HWversion[6] = {'H', 'V', (uint8_t)((HWV >> 8u) & 0x0Fu) + 0x30u, '.
uint8_t
MCU_FBLversion
[
6
]
=
{
'B'
,
'V'
,
(
uint8_t
)((
BTV
>>
8u
)
&
0x0Fu
)
+
0x30u
,
'.'
,
(
uint8_t
)((
BTV
>>
4u
)
&
0x0Fu
)
+
0x30u
,
(
uint8_t
)(
BTV
&
0x0Fu
)
+
0x30u
};
//零件号信息 F187
uint8_t
MCU_PartNumber
[
12
]
=
{
'H'
,
'J'
,
'Y'
,
'B'
,
'-'
,
'7'
,
'5'
,
'0'
,
'0'
,
'T'
,
'F'
,
'T
'
};
uint8_t
MCU_PartNumber
[
20
]
=
{
'3'
,
'7'
,
'1'
,
'0'
,
'0'
,
'0'
,
'-'
,
'7'
,
'5'
,
'0'
,
'0'
,
'-'
,
'0'
,
'2'
,
'T'
,
'Y'
,
'0'
,
'0'
,
'0'
,
'0
'
};
/* internal program info */
const
uint8_t
DID_1024
[
13
]
=
...
...
@@ -671,11 +671,11 @@ void UDS_Service_22_Indication(uint16_t A_TA_type, uint16_t A_Length, uint8_t *A
break
;
case
0xF187
:
// 读零件号
for
(
i
=
0
;
i
<
12
;
i
++
)
for
(
i
=
0
;
i
<
20
;
i
++
)
{
UDS_ISO14229_Transfer
[
i
+
2
]
=
MCU_PartNumber
[
i
];
}
UDS_Service_Response
(
si
,
POSITIVE_RSP
,
DIAG_ID_Tx
,
2
+
12
,
UDS_ISO14229_Transfer
);
UDS_Service_Response
(
si
,
POSITIVE_RSP
,
DIAG_ID_Tx
,
2
+
20
,
UDS_ISO14229_Transfer
);
break
;
case
0x5000U
:
// 读UUID
...
...
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