Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
flow3r firmware
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
flow3r
flow3r firmware
Commits
07508de3
Commit
07508de3
authored
1 year ago
by
q3k
Browse files
Options
Downloads
Patches
Plain Diff
st3m/io: fix badge link enable
st3m_io_badge_link_set would squash previous state.
parent
5deb8bc6
No related branches found
No related tags found
No related merge requests found
Pipeline
#5743
passed
1 year ago
Stage: build
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
components/st3m/st3m_io.c
+10
-1
10 additions, 1 deletion
components/st3m/st3m_io.c
with
10 additions
and
1 deletion
components/st3m/st3m_io.c
+
10
−
1
View file @
07508de3
...
@@ -75,6 +75,8 @@ static int8_t st3m_io_badge_link_set(uint8_t mask, bool state) {
...
@@ -75,6 +75,8 @@ static int8_t st3m_io_badge_link_set(uint8_t mask, bool state) {
bool
left_ring
=
(
mask
&
BADGE_LINK_PIN_MASK_LINE_OUT_RING
)
>
0
;
bool
left_ring
=
(
mask
&
BADGE_LINK_PIN_MASK_LINE_OUT_RING
)
>
0
;
bool
right_tip
=
(
mask
&
BADGE_LINK_PIN_MASK_LINE_IN_TIP
)
>
0
;
bool
right_tip
=
(
mask
&
BADGE_LINK_PIN_MASK_LINE_IN_TIP
)
>
0
;
bool
right_ring
=
(
mask
&
BADGE_LINK_PIN_MASK_LINE_IN_RING
)
>
0
;
bool
right_ring
=
(
mask
&
BADGE_LINK_PIN_MASK_LINE_IN_RING
)
>
0
;
// Apply request to badge_link_enabled.
if
(
state
)
{
if
(
state
)
{
if
(
left_tip
||
left_ring
)
{
if
(
left_tip
||
left_ring
)
{
if
(
!
st3m_audio_headphones_are_connected
())
{
if
(
!
st3m_audio_headphones_are_connected
())
{
...
@@ -94,6 +96,13 @@ static int8_t st3m_io_badge_link_set(uint8_t mask, bool state) {
...
@@ -94,6 +96,13 @@ static int8_t st3m_io_badge_link_set(uint8_t mask, bool state) {
if
(
!
right_ring
)
badge_link_enabled
&=
~
BADGE_LINK_PIN_MASK_LINE_IN_RING
;
if
(
!
right_ring
)
badge_link_enabled
&=
~
BADGE_LINK_PIN_MASK_LINE_IN_RING
;
}
}
// Convert badge_link_enabled back to {left,right}_{tip,ring}, but this
// time as requested state.
left_tip
=
(
badge_link_enabled
&
BADGE_LINK_PIN_MASK_LINE_OUT_TIP
)
>
0
;
left_ring
=
(
badge_link_enabled
&
BADGE_LINK_PIN_MASK_LINE_OUT_RING
)
>
0
;
right_tip
=
(
badge_link_enabled
&
BADGE_LINK_PIN_MASK_LINE_IN_TIP
)
>
0
;
right_ring
=
(
badge_link_enabled
&
BADGE_LINK_PIN_MASK_LINE_IN_RING
)
>
0
;
flow3r_bsp_spio_badgelink_left_enable
(
left_tip
,
left_ring
);
flow3r_bsp_spio_badgelink_left_enable
(
left_tip
,
left_ring
);
flow3r_bsp_spio_badgelink_right_enable
(
right_tip
,
right_ring
);
flow3r_bsp_spio_badgelink_right_enable
(
right_tip
,
right_ring
);
return
st3m_io_badge_link_get_active
(
mask
);
return
st3m_io_badge_link_get_active
(
mask
);
...
...
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