Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
card10
firmware
Commits
cb1712d5
Commit
cb1712d5
authored
Jan 24, 2020
by
schneider
Browse files
fix(leds): Consolidate led locking
parent
9c5d8003
Pipeline
#4464
passed with stages
in 47 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
epicardium/modules/leds.c
View file @
cb1712d5
...
...
@@ -99,9 +99,7 @@ void epic_leds_dim_top(uint8_t value)
{
leds_set_dim_top
(
value
);
if
(
personal_state_enabled
()
==
0
)
{
hwlock_acquire
(
HWLOCK_I2C
);
leds_update
();
hwlock_release
(
HWLOCK_I2C
);
do_update
();
}
}
...
...
@@ -109,9 +107,7 @@ void epic_leds_dim_bottom(uint8_t value)
{
leds_set_dim_bottom
(
value
);
if
(
personal_state_enabled
()
==
0
)
{
hwlock_acquire
(
HWLOCK_I2C
);
leds_update
();
hwlock_release
(
HWLOCK_I2C
);
do_update
();
}
}
...
...
epicardium/modules/personal_state.c
View file @
cb1712d5
...
...
@@ -31,13 +31,8 @@ int epic_personal_state_set(uint8_t state, bool persistent)
personal_state_persistent
=
persistent
;
if
(
was_enabled
&&
!
_personal_state_enabled
)
{
hwlock_acquire
(
HWLOCK_LED
);
leds_prep
(
PERSONAL_STATE_LED
,
0
,
0
,
0
);
leds_update_power
();
leds_update
();
hwlock_release
(
HWLOCK_LED
);
epic_leds_update
();
}
return
0
;
...
...
@@ -58,8 +53,6 @@ void vLedTask(void *pvParameters)
const
int
led_animation_rate
=
1000
/
25
;
/* 25Hz -> 40ms*/
while
(
1
)
{
if
(
_personal_state_enabled
)
{
hwlock_acquire
(
HWLOCK_LED
);
led_animation_ticks
++
;
if
(
personal_state
==
STATE_NO_CONTACT
)
{
leds_prep
(
PERSONAL_STATE_LED
,
255
,
0
,
0
);
...
...
@@ -126,13 +119,7 @@ void vLedTask(void *pvParameters)
led_animation_rate
))));
}
hwlock_acquire
(
HWLOCK_I2C
);
leds_update_power
();
leds_update
();
hwlock_release
(
HWLOCK_I2C
);
hwlock_release
(
HWLOCK_LED
);
epic_leds_update
();
}
vTaskDelay
(
led_animation_rate
/
portTICK_PERIOD_MS
);
...
...
Write
Preview
Supports
Markdown
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