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
867b358b
Commit
867b358b
authored
Sep 03, 2024
by
张金硕
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
✨
feat:新增互联二维码,投屏导航功能
parent
6b079117
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
49 additions
and
25 deletions
+49
-25
BlueTooth.c
Firmware/Source/Application/BlueTooth.c
+15
-9
BlueTooth.h
Firmware/Source/Application/BlueTooth.h
+2
-2
AMT630H_Datas.c
Firmware/Source/Component/AMT630H/AMT630H_Datas.c
+32
-14
No files found.
Firmware/Source/Application/BlueTooth.c
View file @
867b358b
...
@@ -10,12 +10,9 @@ uint8_t SetUUIDTimes = 0;
...
@@ -10,12 +10,9 @@ uint8_t SetUUIDTimes = 0;
_PICID_Struct
PicObj
;
_PICID_Struct
PicObj
;
_QRCODE_RECT
QRCode_Rect
;
_QRCODE_RECT
QRCode_Rect
;
const
uint8_t
HJBlueToothName
[
9
]
=
{
"HJ750"
};
const
uint8_t
HJBlueToothName
[
9
]
=
{
"HJ750"
};
uint8_t
UUIDConfigBuf
[
22
]
=
{
0xff
,
0xff
,
0xff
,
0xff
,
0xff
,
0xff
,
0xff
,
0xff
,
0xff
,
0xff
,
0xff
,
0xff
,
0xff
,
0xff
,
0xff
,
0xff
,
0xff
,
0xff
,
0xff
,
0xff
,
0xff
,
0x00
};
uint8_t
UUIDConfigBuf
[
22
]
=
{
"800082024071700000001"
};
// 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00
// uint8_t sjhja[20] = {0};
// uint8_t PhoneName[100] = {0};
// uint8_t BlueConnectStatus;
// ee_uint16_t juasfha;
void
TextService
(
void
);
void
TextService
(
void
);
...
@@ -54,9 +51,18 @@ void BlueToothService()
...
@@ -54,9 +51,18 @@ void BlueToothService()
Menu_Change_Branch_To_Item
(
MENU_BRANCH_ANIMATION
,
MENU_ITEM_MAIN_ITEM
);
Menu_Change_Branch_To_Item
(
MENU_BRANCH_ANIMATION
,
MENU_ITEM_MAIN_ITEM
);
}
}
SetUUIDData
((
char
*
)
UUIDConfigBuf
,
22
);
SetUUIDData
((
char
*
)
UUIDConfigBuf
,
22
);
if
(
OTA_Update_Flag
==
1
)
QRCode_Rect
.
x
=
650
;
{
QRCode_Rect
.
y
=
210
;
QRCode_Rect
.
x
=
650
;
QRCode_Rect
.
y
=
210
;
}
else
{
QRCode_Rect
.
x
=
QRCode_X
;
QRCode_Rect
.
y
=
QRCode_Y
;
}
// QRCode_Rect.x = 650;
// QRCode_Rect.y = 210;
QRCode_Rect
.
height
=
240
;
QRCode_Rect
.
height
=
240
;
QRCode_Rect
.
width
=
240
;
QRCode_Rect
.
width
=
240
;
SetScreenType
(
QRCode_TYPE
,
QRCode_Rect
);
SetScreenType
(
QRCode_TYPE
,
QRCode_Rect
);
...
@@ -82,7 +88,7 @@ void BlueToothService()
...
@@ -82,7 +88,7 @@ void BlueToothService()
}
}
OTA_Update_Count_Open
=
0
;
OTA_Update_Count_Open
=
0
;
}
}
//
SetTaskbarHeight(150);
SetTaskbarHeight
(
150
);
SetBlueToothName
((
uint8_t
*
)
HJBlueToothName
,
sizeof
(
HJBlueToothName
));
SetBlueToothName
((
uint8_t
*
)
HJBlueToothName
,
sizeof
(
HJBlueToothName
));
TextService
();
TextService
();
...
...
Firmware/Source/Application/BlueTooth.h
View file @
867b358b
...
@@ -24,8 +24,8 @@ typedef struct {
...
@@ -24,8 +24,8 @@ typedef struct {
}
TEXT_STRUCT
;
}
TEXT_STRUCT
;
/*QRCode X Y height Width*/
/*QRCode X Y height Width*/
#define QRCode_X
457
#define QRCode_X
178
#define QRCode_Y 13
4
#define QRCode_Y 13
0
#define QRCode_HEIGHT 240
#define QRCode_HEIGHT 240
#define QRCode_WIDTH 240
#define QRCode_WIDTH 240
#define QRCode_TYPE Square_Instrument
#define QRCode_TYPE Square_Instrument
...
...
Firmware/Source/Component/AMT630H/AMT630H_Datas.c
View file @
867b358b
...
@@ -4165,7 +4165,7 @@ void AMT630H_GUI_DisplayProc(void)
...
@@ -4165,7 +4165,7 @@ void AMT630H_GUI_DisplayProc(void)
PackedTransfer_Page
();
PackedTransfer_Page
();
}
}
uint8_t
shuotestflag
=
0
;
void
AMT630H_GUI_ReadPosittion_Display
(
void
)
void
AMT630H_GUI_ReadPosittion_Display
(
void
)
{
{
switch
(
g_u8Cursor_Posittion
)
switch
(
g_u8Cursor_Posittion
)
...
@@ -4335,20 +4335,38 @@ void AMT630H_GUI_ReadPosittion_Display(void)
...
@@ -4335,20 +4335,38 @@ void AMT630H_GUI_ReadPosittion_Display(void)
AMT630H_GUI_Phone_Connect_Win
();
AMT630H_GUI_Phone_Connect_Win
();
break
;
break
;
case
MENU_ITEM_PHONE_CONNECT_APP
:
case
MENU_ITEM_PHONE_CONNECT_APP
:
// PicObj.qr_logo_id = Pic_0234;//小数字9
PicObj
.
qr_logo_id
=
0
;
//Pic_0234 小数字9 EA
// PicObj.main_pic_id = Pic_0382; //大白背景图
PicObj
.
main_pic_id
=
Pic_0382
;
//大白背景图 17E
// PicObj.qr_pic_id = Pic_0479;//小数字0
PicObj
.
qr_pic_id
=
Pic_0479
;
//小数字0 1DF
// PicObj.update_pic_id = Pic_0233;//小数字8
PicObj
.
update_pic_id
=
Pic_0233
;
//小数字8 E9
// PicObj.second_menu = 0;
PicObj
.
second_menu
=
0
;
// PicObj.navigation_task_id = Pic_0411;//红色小e
PicObj
.
navigation_task_id
=
Pic_0411
;
//红色小e 19B
// PackedTransfer_DisplayPhoneMirrorQRcode(1, PicObj);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0001_0_0);
uint8_t
kjdshdfdha
=
GetPhoneMirrorst
();
// SetPagePic(GRAPHICS_PAGE_0, Pic_0476_0_0);
if
(
kjdshdfdha
==
0
)
// SetPagePic(GRAPHICS_PAGE_0, Pic_0477_178_130);
{
SetPagePic
(
GRAPHICS_PAGE_0
,
Pic_0001_0_0
);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0234_605_289);
SetPagePic
(
GRAPHICS_PAGE_0
,
Pic_0476_0_0
);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0479_242_313);
PackedTransfer_DisplayPhoneMirrorQRcode
(
1
,
PicObj
);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0411_56_533);
}
else
{
// SetPagePic(GRAPHICS_PAGE_0, Pic_0476_0_0);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0476_0_0);
PackedTransfer_DisplayPhoneMirrorQRcode
(
0
,
PicObj
);
}
// SetPagePic(GRAPHICS_PAGE_0, Pic_0477_178_130);
SetPagePic
(
GRAPHICS_PAGE_0
,
Pic_0234_605_289
);
SetPagePic
(
GRAPHICS_PAGE_0
,
Pic_0479_242_313
);
if
(
shuotestflag
==
0
)
{
SetPagePic
(
GRAPHICS_PAGE_0
,
Pic_0411_56_533
);
}
else
{
SetPagePic
(
GRAPHICS_PAGE_0
,
Pic_0470_687_486
);
}
shuotestflag
=
!
shuotestflag
;
break
;
break
;
default:
default:
break
;
break
;
...
...
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