pwarren/zmk_mf68
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(rgb): check if settings enabled

Browse source
This commit is contained in:
Nick 2020-08-23 15:56:18 -05:00
parent c5c21022a2
commit 979a5bffff
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/CMakeLists.txt
View file

@ -55,5 +55,5 @@ target_sources_ifdef(CONFIG_ZMK_BLE app PRIVATE src/hog.c)
target_sources_ifdef(CONFIG_ZMK_RGB_UNDERGLOW app PRIVATE src/rgb_underglow.c) target_sources_ifdef(CONFIG_ZMK_RGB_UNDERGLOW app PRIVATE src/rgb_underglow.c)
target_sources(app PRIVATE src/endpoints.c) target_sources(app PRIVATE src/endpoints.c)
target_sources(app PRIVATE src/hid_listener.c) target_sources(app PRIVATE src/hid_listener.c)
target_sources(app PRIVATE src/settings.c) target_sources_ifdef(CONFIG_SETTINGS app PRIVATE src/settings.c)
target_sources(app PRIVATE src/main.c) target_sources(app PRIVATE src/main.c)

8
app/src/rgb_underglow.c
View file

@ -51,6 +51,7 @@ struct led_rgb pixels[STRIP_NUM_PIXELS];
struct rgb_underglow_state state; struct rgb_underglow_state state;
#if IS_ENABLED(CONFIG_SETTINGS)
static int rgb_settings_set(const char *name, size_t len, static int rgb_settings_set(const char *name, size_t len,
settings_read_cb read_cb, void *cb_arg) settings_read_cb read_cb, void *cb_arg)
{ {
@ -77,6 +78,7 @@ struct settings_handler rgb_conf = {
.name = "rgb/underglow", .name = "rgb/underglow",
.h_set = rgb_settings_set .h_set = rgb_settings_set
}; };
#endif
static struct led_rgb hsb_to_rgb(struct led_hsb hsb) static struct led_rgb hsb_to_rgb(struct led_hsb hsb)
{ {
@ -242,7 +244,9 @@ static int zmk_rgb_underglow_init(struct device *_arg)
on: IS_ENABLED(CONFIG_ZMK_RGB_UNDERGLOW_ON_START) on: IS_ENABLED(CONFIG_ZMK_RGB_UNDERGLOW_ON_START)
}; };
#if IS_ENABLED(CONFIG_SETTINGS)
settings_register(&rgb_conf); settings_register(&rgb_conf);
#endif
k_timer_start(&underglow_tick, K_NO_WAIT, K_MSEC(50)); k_timer_start(&underglow_tick, K_NO_WAIT, K_MSEC(50));
@ -251,7 +255,11 @@ static int zmk_rgb_underglow_init(struct device *_arg)
int zmk_rgb_underglow_save_state() int zmk_rgb_underglow_save_state()
{ {
#if IS_ENABLED(CONFIG_SETTINGS)
return settings_save_one("rgb/underglow/state", &state, sizeof(state)); return settings_save_one("rgb/underglow/state", &state, sizeof(state));
#else
return 0;
#endif
} }
int zmk_rgb_underglow_cycle_effect(int direction) int zmk_rgb_underglow_cycle_effect(int direction)