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
c6de3392
Commit
c6de3392
authored
Sep 14, 2024
by
张金硕
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🐞
fix:OTA界面只有重上KL30\15电或升级成功后可退出
parent
72f99ad8
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
9 deletions
+11
-9
BlueTooth.c
Firmware/Source/Application/BlueTooth.c
+7
-5
Key_user.c
Firmware/Source/Component/Key/Key_user.c
+4
-4
No files found.
Firmware/Source/Application/BlueTooth.c
View file @
c6de3392
...
@@ -105,10 +105,10 @@ void BlueToothService(void)
...
@@ -105,10 +105,10 @@ void BlueToothService(void)
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
);
if
(
Menu_Get_Current_Cursor_Information
()
!=
MENU_ITEM_FAULT_INFORMATION
)
//
if(Menu_Get_Current_Cursor_Information() != MENU_ITEM_FAULT_INFORMATION)
{
//
{
OTA_Update_Flag
=
0
;
//
OTA_Update_Flag = 0;
}
//
}
if
(
OTA_Update_Flag
==
1
)
if
(
OTA_Update_Flag
==
1
)
{
{
if
(
OTA_Update_Count_Open
<
5
)
if
(
OTA_Update_Count_Open
<
5
)
...
@@ -133,8 +133,10 @@ void BlueToothService(void)
...
@@ -133,8 +133,10 @@ void BlueToothService(void)
}
}
else
else
{
{
SetBluetoothTurnXX
(
0
);
GetBlueToothVaild
=
0
;
GetBlueToothVaild
=
0
;
OTA_Update_Flag
=
0
;
SetBluetoothTurnXX
(
0
);
SetUpdateCtrl
(
0
,
QRCode_Rect
);
}
}
}
}
...
...
Firmware/Source/Component/Key/Key_user.c
View file @
c6de3392
...
@@ -306,7 +306,7 @@ void Get_Into_OTA_Update_Mode(void)
...
@@ -306,7 +306,7 @@ void Get_Into_OTA_Update_Mode(void)
{
{
if
(
Menu_Get_Current_Cursor_Information
()
==
MENU_ITEM_FAULT_INFORMATION
)
if
(
Menu_Get_Current_Cursor_Information
()
==
MENU_ITEM_FAULT_INFORMATION
)
{
{
OTA_Update_Flag
=
!
OTA_Update_Flag
;
OTA_Update_Flag
=
1U
;
}
}
}
}
void
KEY_LEFT_EVENT_NONE_Service
(
void
)
void
KEY_LEFT_EVENT_NONE_Service
(
void
)
...
@@ -387,8 +387,8 @@ void Get_DisTime_Service(void)
...
@@ -387,8 +387,8 @@ void Get_DisTime_Service(void)
void
My_Key_Service
(
void
)
void
My_Key_Service
(
void
)
{
{
/* 自检时不可操作按键 */
/* 自检
和OTA界面
时不可操作按键 */
if
(
g_u8SelfCheck
)
if
(
(
g_u8SelfCheck
)
&&
(
OTA_Update_Flag
==
0
))
{
{
if
((
Get_ActualVechileSpeed
()
==
0
)
||
((
Get_DispVechileSpeed
()
>=
1990
)
&&
(
Get_DispEngineSpeed
()
>=
12000
)))
if
((
Get_ActualVechileSpeed
()
==
0
)
||
((
Get_DispVechileSpeed
()
>=
1990
)
&&
(
Get_DispEngineSpeed
()
>=
12000
)))
{
{
...
...
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