Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
F
firmware
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
card10
firmware
Commits
6b91b1a7
Commit
6b91b1a7
authored
4 years ago
by
schneider
Browse files
Options
Downloads
Plain Diff
Merge branch 'schneider/bonding-naming' into 'master'
fix(ble): Use the term "pairing" in the UI See merge request
!403
parents
d788c494
bb39c4f7
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!403
fix(ble): Use the term "pairing" in the UI
Pipeline
#4731
passed
4 years ago
Stage: build
Stage: deploy
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
preload/apps/ble/__init__.py
+4
-4
4 additions, 4 deletions
preload/apps/ble/__init__.py
with
4 additions
and
4 deletions
preload/apps/ble/__init__.py
+
4
−
4
View file @
6b91b1a7
...
...
@@ -106,7 +106,7 @@ while True:
# print confirmation value
compare_value
=
sys_ble
.
get_compare_value
()
disp
.
clear
()
disp
.
print
(
"
BLE:
Bond
?
"
,
posy
=
0
,
fg
=
[
0
,
0
,
255
])
disp
.
print
(
"
BLE:
Pair
?
"
,
posy
=
0
,
fg
=
[
0
,
0
,
255
])
disp
.
print
(
"
Code:
"
,
posy
=
20
,
fg
=
[
0
,
255
,
255
])
disp
.
print
(
"
%06d
"
%
compare_value
,
posy
=
40
,
fg
=
[
255
,
255
,
255
])
disp
.
print
(
"
Yes
"
,
posy
=
60
,
fg
=
[
0
,
255
,
0
])
...
...
@@ -122,7 +122,7 @@ while True:
if
v
&
buttons
.
BOTTOM_LEFT
:
sys_ble
.
confirm_compare_value
(
True
)
disp
.
clear
()
disp
.
print
(
"
BLE
Bond
ing
"
,
posy
=
0
,
fg
=
[
0
,
0
,
255
])
disp
.
print
(
"
BLE
Pair
ing
"
,
posy
=
0
,
fg
=
[
0
,
0
,
255
])
disp
.
print
(
"
Please Wait
"
,
posy
=
40
,
fg
=
[
255
,
255
,
255
])
disp
.
update
()
state
=
5
...
...
@@ -138,7 +138,7 @@ while True:
elif
ble_event
==
sys_ble
.
EVENT_PAIRING_COMPLETE
:
ble_event
=
None
disp
.
clear
()
disp
.
print
(
"
BLE
Bond
ing
"
,
posy
=
0
,
fg
=
[
0
,
0
,
255
])
disp
.
print
(
"
BLE
Pair
ing
"
,
posy
=
0
,
fg
=
[
0
,
0
,
255
])
disp
.
print
(
"
Success
"
,
posy
=
40
,
fg
=
[
0
,
255
,
0
])
disp
.
update
()
time
.
sleep
(
5
)
...
...
@@ -147,7 +147,7 @@ while True:
elif
state
==
6
:
# display fail screen and wait 5 seconds
disp
.
clear
()
disp
.
print
(
"
BLE
Bond
ing
"
,
posy
=
0
,
fg
=
[
0
,
0
,
255
])
disp
.
print
(
"
BLE
Pair
ing
"
,
posy
=
0
,
fg
=
[
0
,
0
,
255
])
disp
.
print
(
"
Fail
"
,
posy
=
40
,
fg
=
[
255
,
0
,
0
])
disp
.
update
()
time
.
sleep
(
5
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment