tgrosinger/zmk
1
0
Fork 0
Code Actions Packages

fix(rgb): auto-off logic

Browse Source
This commit is contained in:
Pablo Martínez 2024-04-25 10:55:42 +02:00 committed by GitHub
parent f4a070aacf
commit 4d566853af
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
app/src/rgb_underglow.c
View File

@ -468,17 +468,31 @@ int zmk_rgb_underglow_change_spd(int direction) {
#if IS_ENABLED(CONFIG_ZMK_RGB_UNDERGLOW_AUTO_OFF_IDLE) || \ #if IS_ENABLED(CONFIG_ZMK_RGB_UNDERGLOW_AUTO_OFF_IDLE) || \
IS_ENABLED(CONFIG_ZMK_RGB_UNDERGLOW_AUTO_OFF_USB) IS_ENABLED(CONFIG_ZMK_RGB_UNDERGLOW_AUTO_OFF_USB)
static int rgb_underglow_auto_state(bool *prev_state, bool new_state) { struct rgb_underglow_sleep_state {
if (state.on == new_state) { bool is_awake;
bool rgb_state_before_sleeping;
};
static int rgb_underglow_auto_state(bool target_wake_state) {
static struct rgb_underglow_sleep_state sleep_state = {
is_awake : true,
rgb_state_before_sleeping : false
};
// wake up event while awake, or sleep event while sleeping -> no-op
if (target_wake_state == sleep_state.is_awake) {
return 0; return 0;
} }
if (new_state) { sleep_state.is_awake = target_wake_state;
state.on = *prev_state;
*prev_state = false; if (sleep_state.is_awake) {
return zmk_rgb_underglow_on(); if (sleep_state.rgb_state_before_sleeping) {
return zmk_rgb_underglow_on();
} else {
return zmk_rgb_underglow_off();
}
} else { } else {
state.on = false; sleep_state.rgb_state_before_sleeping = sleep_state.on;
*prev_state = true;
return zmk_rgb_underglow_off(); return zmk_rgb_underglow_off();
} }
} }
@ -487,16 +501,13 @@ static int rgb_underglow_event_listener(const zmk_event_t *eh) {
#if IS_ENABLED(CONFIG_ZMK_RGB_UNDERGLOW_AUTO_OFF_IDLE) #if IS_ENABLED(CONFIG_ZMK_RGB_UNDERGLOW_AUTO_OFF_IDLE)
if (as_zmk_activity_state_changed(eh)) { if (as_zmk_activity_state_changed(eh)) {
static bool prev_state = false; return rgb_underglow_auto_state(zmk_activity_get_state() == ZMK_ACTIVITY_ACTIVE);
return rgb_underglow_auto_state(&prev_state,
zmk_activity_get_state() == ZMK_ACTIVITY_ACTIVE);
} }
#endif #endif
#if IS_ENABLED(CONFIG_ZMK_RGB_UNDERGLOW_AUTO_OFF_USB) #if IS_ENABLED(CONFIG_ZMK_RGB_UNDERGLOW_AUTO_OFF_USB)
if (as_zmk_usb_conn_state_changed(eh)) { if (as_zmk_usb_conn_state_changed(eh)) {
static bool prev_state = false; return rgb_underglow_auto_state(zmk_usb_is_powered());
return rgb_underglow_auto_state(&prev_state, zmk_usb_is_powered());
} }
#endif #endif