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

Put animation control settings code behind config flags

Browse source
This commit is contained in:
Kuba Birecki 2022-01-30 14:01:47 +01:00
parent 331573471d
commit e2cdd017e3
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/animation/animation_control.c
View file

@ -46,6 +46,7 @@ struct animation_control_data {
static int animation_control_load_settings(const struct device *dev, const char *name, size_t len, static int animation_control_load_settings(const struct device *dev, const char *name, size_t len,
settings_read_cb read_cb, void *cb_arg) { settings_read_cb read_cb, void *cb_arg) {
#if IS_ENABLED(CONFIG_SETTINGS)
const char *next; const char *next;
int rc; int rc;
@ -63,8 +64,12 @@ static int animation_control_load_settings(const struct device *dev, const char
} }
return -ENOENT; return -ENOENT;
#else
return 0;
#endif /* IS_ENABLED(CONFIG_SETTINGS) */
} }
#if IS_ENABLED(CONFIG_SETTINGS)
static void animation_control_save_work(struct k_work *work) { static void animation_control_save_work(struct k_work *work) {
struct animation_control_work_context *ctx = struct animation_control_work_context *ctx =
CONTAINER_OF(work, struct animation_control_work_context, save_work); CONTAINER_OF(work, struct animation_control_work_context, save_work);
@ -84,6 +89,7 @@ static int animation_control_save_settings(const struct device *dev) {
return k_delayed_work_submit(&ctx->save_work, K_MSEC(CONFIG_ZMK_SETTINGS_SAVE_DEBOUNCE)); return k_delayed_work_submit(&ctx->save_work, K_MSEC(CONFIG_ZMK_SETTINGS_SAVE_DEBOUNCE));
} }
#endif /* IS_ENABLED(CONFIG_SETTINGS) */
int animation_control_handle_command(const struct device *dev, uint8_t command, uint8_t param) { int animation_control_handle_command(const struct device *dev, uint8_t command, uint8_t param) {
const struct animation_control_config *config = dev->config; const struct animation_control_config *config = dev->config;
@ -145,8 +151,9 @@ int animation_control_handle_command(const struct device *dev, uint8_t command,
break; break;
} }
// Save the new settings #if IS_ENABLED(CONFIG_SETTINGS)
animation_control_save_settings(dev); animation_control_save_settings(dev);
#endif /* IS_ENABLED(CONFIG_SETTINGS) */
// Force refresh // Force refresh
zmk_animation_request_frames(1); zmk_animation_request_frames(1);
@ -197,6 +204,7 @@ static void animation_control_stop(const struct device *dev) {
} }
static int animation_control_init(const struct device *dev) { static int animation_control_init(const struct device *dev) {
#if IS_ENABLED(CONFIG_SETTINGS)
const struct animation_control_config *config = dev->config; const struct animation_control_config *config = dev->config;
settings_subsys_init(); settings_subsys_init();
@ -206,6 +214,7 @@ static int animation_control_init(const struct device *dev) {
k_delayed_work_init(&config->work->save_work, animation_control_save_work); k_delayed_work_init(&config->work->save_work, animation_control_save_work);
settings_load_subtree(dev->name); settings_load_subtree(dev->name);
#endif /* IS_ENABLED(CONFIG_SETTINGS) */
return 0; return 0;
} }