Merge b078325ada
into 805dd4a53b
This commit is contained in:
commit
1ed33f1b19
1 changed files with 14 additions and 4 deletions
|
@ -302,7 +302,7 @@ int zmk_rgb_underglow_get_state(bool *on_off) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int zmk_rgb_underglow_on() {
|
static int zmk_rgb_underglow_on_immediate() {
|
||||||
if (!led_strip)
|
if (!led_strip)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
||||||
|
@ -319,10 +319,15 @@ int zmk_rgb_underglow_on() {
|
||||||
state.animation_step = 0;
|
state.animation_step = 0;
|
||||||
k_timer_start(&underglow_tick, K_NO_WAIT, K_MSEC(50));
|
k_timer_start(&underglow_tick, K_NO_WAIT, K_MSEC(50));
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int zmk_rgb_underglow_on() {
|
||||||
|
zmk_rgb_underglow_on_immediate();
|
||||||
return zmk_rgb_underglow_save_state();
|
return zmk_rgb_underglow_save_state();
|
||||||
}
|
}
|
||||||
|
|
||||||
int zmk_rgb_underglow_off() {
|
static int zmk_rgb_underglow_off_immediate() {
|
||||||
if (!led_strip)
|
if (!led_strip)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
||||||
|
@ -344,6 +349,11 @@ int zmk_rgb_underglow_off() {
|
||||||
k_timer_stop(&underglow_tick);
|
k_timer_stop(&underglow_tick);
|
||||||
state.on = false;
|
state.on = false;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int zmk_rgb_underglow_off() {
|
||||||
|
zmk_rgb_underglow_off_immediate();
|
||||||
return zmk_rgb_underglow_save_state();
|
return zmk_rgb_underglow_save_state();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -468,11 +478,11 @@ static int rgb_underglow_auto_state(bool *prev_state, bool new_state) {
|
||||||
if (new_state) {
|
if (new_state) {
|
||||||
state.on = *prev_state;
|
state.on = *prev_state;
|
||||||
*prev_state = false;
|
*prev_state = false;
|
||||||
return zmk_rgb_underglow_on();
|
return zmk_rgb_underglow_on_immediate();
|
||||||
} else {
|
} else {
|
||||||
state.on = false;
|
state.on = false;
|
||||||
*prev_state = true;
|
*prev_state = true;
|
||||||
return zmk_rgb_underglow_off();
|
return zmk_rgb_underglow_off_immediate();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue