afiqzudinhadi/zmk
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

fix: ZMK_RGB_UNDERGLOW_AUTO_OFF_IDLE not required for underglow-layer

Browse source
This commit is contained in:
darknao 2024-05-22 13:19:28 +02:00 • committed by afiqzudinhadi
parent bd5e07f842
commit a1d67a4e92
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
app/src/rgb_underglow.c
View file

@ -53,7 +53,7 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
#endif #endif
#if DT_HAS_COMPAT_STATUS_OKAY(zmk_underglow_layer) #if DT_HAS_COMPAT_STATUS_OKAY(zmk_underglow_layer)
#define UNDERGLOW_LAYER_ENABLED #define UNDERGLOW_LAYER_ENABLED 1
#endif #endif
#define STRIP_CHOSEN DT_CHOSEN(zmk_underglow) #define STRIP_CHOSEN DT_CHOSEN(zmk_underglow)
@ -442,7 +442,7 @@ static inline struct led_rgb hue_sat(int hue, int sat) {
return hsb_to_rgb(hsb_scale_min_max(hsb)); return hsb_to_rgb(hsb_scale_min_max(hsb));
} }
#ifdef UNDERGLOW_LAYER_ENABLED #if IS_ENABLED(UNDERGLOW_LAYER_ENABLED)
static struct led_rgb hex_to_rgb(uint8_t r, uint8_t g, uint8_t b) { static struct led_rgb hex_to_rgb(uint8_t r, uint8_t g, uint8_t b) {
struct zmk_led_hsb hsb = state.color; struct zmk_led_hsb hsb = state.color;
@ -488,7 +488,7 @@ static void zmk_rgb_underglow_set_layer(uint8_t layer) {
zmk_rgb_underglow_transient_off(); zmk_rgb_underglow_transient_off();
} }
} }
#endif /* UNDERGLOW_LAYER_ENABLED */ #endif /* IS_ENABLED(UNDERGLOW_LAYER_ENABLED) */
static void zmk_rgb_underglow_tick(struct k_work *work) { static void zmk_rgb_underglow_tick(struct k_work *work) {
switch (state.current_effect) { switch (state.current_effect) {
@ -850,7 +850,7 @@ 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) || IS_ENABLED(UNDERGLOW_LAYER_ENABLED)
struct rgb_underglow_sleep_state { struct rgb_underglow_sleep_state {
bool is_awake; bool is_awake;
bool rgb_state_before_sleeping; bool rgb_state_before_sleeping;
@ -869,7 +869,7 @@ static int rgb_underglow_auto_state(bool target_wake_state) {
sleep_state.is_awake = target_wake_state; sleep_state.is_awake = target_wake_state;
if (sleep_state.is_awake) { if (sleep_state.is_awake) {
#ifdef UNDERGLOW_LAYER_ENABLED #if IS_ENABLED(UNDERGLOW_LAYER_ENABLED)
zmk_rgb_underglow_set_layer(rgb_underglow_top_layer()); zmk_rgb_underglow_set_layer(rgb_underglow_top_layer());
return 0; return 0;
#else #else
@ -893,7 +893,7 @@ static int rgb_underglow_event_listener(const zmk_event_t *eh) {
} }
#endif #endif
#ifdef UNDERGLOW_LAYER_ENABLED #if IS_ENABLED(UNDERGLOW_LAYER_ENABLED)
if (as_zmk_split_peripheral_layer_changed(eh)) { if (as_zmk_split_peripheral_layer_changed(eh)) {
const struct zmk_split_peripheral_layer_changed *ev = const struct zmk_split_peripheral_layer_changed *ev =
as_zmk_split_peripheral_layer_changed(eh); as_zmk_split_peripheral_layer_changed(eh);
@ -919,17 +919,19 @@ static int rgb_underglow_event_listener(const zmk_event_t *eh) {
ZMK_LISTENER(rgb_underglow, rgb_underglow_event_listener); ZMK_LISTENER(rgb_underglow, rgb_underglow_event_listener);
#endif // IS_ENABLED(CONFIG_ZMK_RGB_UNDERGLOW_AUTO_OFF_IDLE) || #endif // 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) ||
// IS_ENABLED(UNDERGLOW_LAYER_ENABLED)
#if IS_ENABLED(CONFIG_ZMK_RGB_UNDERGLOW_AUTO_OFF_IDLE) #if IS_ENABLED(CONFIG_ZMK_RGB_UNDERGLOW_AUTO_OFF_IDLE)
ZMK_SUBSCRIPTION(rgb_underglow, zmk_activity_state_changed); ZMK_SUBSCRIPTION(rgb_underglow, zmk_activity_state_changed);
#ifdef UNDERGLOW_LAYER_ENABLED
ZMK_SUBSCRIPTION(rgb_underglow, zmk_split_peripheral_layer_changed);
#endif
#endif #endif
#if IS_ENABLED(CONFIG_ZMK_RGB_UNDERGLOW_AUTO_OFF_USB) #if IS_ENABLED(CONFIG_ZMK_RGB_UNDERGLOW_AUTO_OFF_USB)
ZMK_SUBSCRIPTION(rgb_underglow, zmk_usb_conn_state_changed); ZMK_SUBSCRIPTION(rgb_underglow, zmk_usb_conn_state_changed);
#endif #endif
#if IS_ENABLED(UNDERGLOW_LAYER_ENABLED)
ZMK_SUBSCRIPTION(rgb_underglow, zmk_split_peripheral_layer_changed);
#endif
SYS_INIT(zmk_rgb_underglow_init, APPLICATION, CONFIG_APPLICATION_INIT_PRIORITY); SYS_INIT(zmk_rgb_underglow_init, APPLICATION, CONFIG_APPLICATION_INIT_PRIORITY);