summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick <nick.win999@gmail.com>2020-11-23 10:58:54 -0600
committerPete Johanson <peter@peterjohanson.com>2020-11-23 12:42:27 -0500
commit248b360f479d7e20f1ddcd5d3c491717b022e8f8 (patch)
treec5027904c480316d291afa33e7a95b509cb770e5
parent076fcc1f701b81e70506fdf9d5db93a44f485deb (diff)
fix(ug): Start tick without settings state available
-rw-r--r--app/src/rgb_underglow.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/app/src/rgb_underglow.c b/app/src/rgb_underglow.c
index 3e2c254..84eb32d 100644
--- a/app/src/rgb_underglow.c
+++ b/app/src/rgb_underglow.c
@@ -220,7 +220,6 @@ static int rgb_settings_set(const char *name, size_t len, settings_read_cb read_
rc = read_cb(cb_arg, &state, sizeof(state));
if (rc >= 0) {
- k_timer_start(&underglow_tick, K_NO_WAIT, K_MSEC(50));
return 0;
}
@@ -268,10 +267,12 @@ static int zmk_rgb_underglow_init(struct device *_arg) {
#if IS_ENABLED(CONFIG_SETTINGS)
settings_register(&rgb_conf);
k_delayed_work_init(&underglow_save_work, zmk_rgb_underglow_save_state_work);
-#else
- k_timer_start(&underglow_tick, K_NO_WAIT, K_MSEC(50));
+
+ settings_load_subtree("rgb/underglow");
#endif
+ k_timer_start(&underglow_tick, K_NO_WAIT, K_MSEC(50));
+
return 0;
}