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
33aadbbb
Commit
33aadbbb
authored
Oct 14, 2024
by
张金硕
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
✨
feat:新增只有写入UUID才显示UUID
parent
b8131a55
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
36 additions
and
12 deletions
+36
-12
BlueTooth.c
Firmware/Source/Application/BlueTooth.c
+17
-7
BlueTooth.h
Firmware/Source/Application/BlueTooth.h
+1
-0
AMT630H_Datas.c
Firmware/Source/Component/AMT630H/AMT630H_Datas.c
+18
-5
No files found.
Firmware/Source/Application/BlueTooth.c
View file @
33aadbbb
...
...
@@ -352,15 +352,15 @@ void TextService(void)
TextPara
[
TEXT_NUM_FAUULT_CODE
].
Vaild
=
0x01
;
}
if
(((
memcmp
(
LastUUIDDisplay
,
UUIDConfigBuf
,
sizeof
(
LastUUIDDisplay
)))
!=
0
))
{
for
(
uint8_t
i
=
0
;
i
<
(
sizeof
(
UUIDConfigBuf
));
i
++
)
{
for
(
uint8_t
i
=
0
;
i
<
(
sizeof
(
UUIDConfigBuf
));
i
++
)
{
UUIDDisplay
[
i
*
2
]
=
UUIDConfigBuf
[
i
];
UUIDDisplay
[(
i
*
2
)
+
1
]
=
0x00
;
}
memcpy
(
LastUUIDDisplay
,
UUIDConfigBuf
,
sizeof
(
LastUUIDDisplay
));
TextPara
[
TEXT_NUM_INFORMATION_UUID
].
Vaild
=
0X01
;
UUIDDisplay
[
i
*
2
]
=
UUIDConfigBuf
[
i
];
UUIDDisplay
[(
i
*
2
)
+
1
]
=
0x00
;
}
memcpy
(
LastUUIDDisplay
,
UUIDConfigBuf
,
sizeof
(
LastUUIDDisplay
));
TextPara
[
TEXT_NUM_INFORMATION_UUID
].
Vaild
=
0X01
;
}
}
uint8_t
Get_Talking_PhoneBookValid
(
void
)
...
...
@@ -373,5 +373,15 @@ uint8_t Get_Talking_PhoneBookValid(void)
return
0
;
}
uint8_t
Get_UUID_UDSStatus
(
void
)
{
for
(
uint8_t
i
=
0
;
i
<
21
;
i
++
)
{
if
(
UUIDConfigBuf
[
i
]
!=
0xFF
)
return
1
;
}
return
0
;
}
Firmware/Source/Application/BlueTooth.h
View file @
33aadbbb
...
...
@@ -40,6 +40,7 @@ static const uint8_t SW_Version[3] = {SW_EXTERNAL_VERSION};
extern
void
BlueToothService
(
void
);
extern
uint8_t
Get_Talking_PhoneBookValid
(
void
);
extern
uint8_t
Get_UUID_UDSStatus
(
void
);
extern
_PICID_Struct
PicObj
;
extern
_QRCODE_RECT
QRCode_Rect
;
extern
uint8_t
PhoneNumber
[
40
];
...
...
Firmware/Source/Component/AMT630H/AMT630H_Datas.c
View file @
33aadbbb
...
...
@@ -5167,9 +5167,15 @@ void AMT630H_GUI_Display_Navigation_Area(void)
SetPagePic
(
GRAPHICS_PAGE_0
,
Pic_0495_655_197
);
SetPagePic
(
GRAPHICS_PAGE_0
,
Pic_0496_410_197
);
SetPagePic
(
GRAPHICS_PAGE_0
,
Pic_0498_411_252
);
/*UUID*/
PackedTransfer_LabelsList
(
0x4014
,(
uint8_t
*
)
UUIDDisplay
,
42
);
SetPageText
(
GRAPHICS_PAGE_0
,
0x4014
,
486
,
248
,
800
,
ALIGN_LEFT
,
200
,
TEXT_COLOR
(
0
,
0
,
0
,
0XFF
),
TEXT_LINE_OFFSET
(
1
,
1
));
if
(
Get_UUID_UDSStatus
()
==
1
)
{
PackedTransfer_LabelsList
(
0x4014
,(
uint8_t
*
)
UUIDDisplay
,
42
);
SetPageText
(
GRAPHICS_PAGE_0
,
0x4014
,
486
,
248
,
800
,
ALIGN_LEFT
,
200
,
TEXT_COLOR
(
0
,
0
,
0
,
0XFF
),
TEXT_LINE_OFFSET
(
1
,
1
));
}
else
{
;
}
}
if
(
g_u8Display_Mode
==
ModeNIGHT
)
{
...
...
@@ -5183,8 +5189,15 @@ void AMT630H_GUI_Display_Navigation_Area(void)
SetPagePic
(
GRAPHICS_PAGE_0
,
Pic_1032_655_197
);
SetPagePic
(
GRAPHICS_PAGE_0
,
Pic_1033_410_197
);
SetPagePic
(
GRAPHICS_PAGE_0
,
Pic_1035_411_252
);
/*UUID*/
PackedTransfer_LabelsList
(
0x4014
,(
uint8_t
*
)
UUIDDisplay
,
42
);
SetPageText
(
GRAPHICS_PAGE_0
,
0x4014
,
486
,
248
,
800
,
ALIGN_LEFT
,
200
,
TEXT_COLOR
(
0XFF
,
0XFF
,
0XFF
,
0XFF
),
TEXT_LINE_OFFSET
(
1
,
1
));
if
(
Get_UUID_UDSStatus
()
==
1
)
{
PackedTransfer_LabelsList
(
0x4014
,(
uint8_t
*
)
UUIDDisplay
,
42
);
SetPageText
(
GRAPHICS_PAGE_0
,
0x4014
,
486
,
248
,
800
,
ALIGN_LEFT
,
200
,
TEXT_COLOR
(
0XFF
,
0XFF
,
0XFF
,
0XFF
),
TEXT_LINE_OFFSET
(
1
,
1
));
}
else
{
;
}
}
...
...
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