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
Merge requests
!403
fix(ble): Use the term "pairing" in the UI
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
fix(ble): Use the term "pairing" in the UI
schneider/bonding-naming
into
master
Overview
1
Commits
1
Pipelines
1
Changes
1
Merged
schneider
requested to merge
schneider/bonding-naming
into
master
4 years ago
Overview
1
Commits
1
Pipelines
1
Changes
1
Expand
User study:
https://twitter.com/schne1der_/status/1310698476108476418
0
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
bb39c4f7
1 commit,
4 years ago
1 file
+
4
−
4
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
preload/apps/ble/__init__.py
+
4
−
4
Options
@@ -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
)
Loading