diff options
| author | Drashna Jaelre <drashna@live.com> | 2021-11-01 15:42:50 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-02 09:42:50 +1100 |
| commit | 9d235d4fc5c34f372b0c393f41686b5ef4f8dc13 (patch) | |
| tree | c155fae4cd6043c3c32aa185eb05c5d1a4a5700e /keyboards/merge | |
| parent | f775da96b17ceec66bac279434325b4da5cb9467 (diff) | |
[Core] Change OLED task function to be boolean (#14864)
* [Core] Add kb level callbacks to OLED driver * Update keyboards and keymaps * Update docs * Update userspace configs * Add fix for my keymap ... * update lefty
Diffstat (limited to 'keyboards/merge')
| -rw-r--r-- | keyboards/merge/um70/keymaps/default/keymap.c | 3 | ||||
| -rw-r--r-- | keyboards/merge/um70/keymaps/via/keymap.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/keyboards/merge/um70/keymaps/default/keymap.c b/keyboards/merge/um70/keymaps/default/keymap.c index 0a775929d0..926f7836aa 100644 --- a/keyboards/merge/um70/keymaps/default/keymap.c +++ b/keyboards/merge/um70/keymaps/default/keymap.c @@ -169,7 +169,7 @@ static void print_status_narrow(void) { // WPM counter End } -void oled_task_user(void) { +bool oled_task_user(void) { current_wpm = get_current_wpm(); if (is_keyboard_master()) { print_status_narrow(); @@ -178,6 +178,7 @@ void oled_task_user(void) { render_logo(); //print_status_narrow(); } + return false; } #endif diff --git a/keyboards/merge/um70/keymaps/via/keymap.c b/keyboards/merge/um70/keymaps/via/keymap.c index aaf682ffd1..f7255eacf2 100644 --- a/keyboards/merge/um70/keymaps/via/keymap.c +++ b/keyboards/merge/um70/keymaps/via/keymap.c @@ -173,7 +173,7 @@ static void print_status_narrow(void) { // WPM counter End } -void oled_task_user(void) { +bool oled_task_user(void) { current_wpm = get_current_wpm(); if (is_keyboard_master()) { print_status_narrow(); @@ -182,6 +182,7 @@ void oled_task_user(void) { render_logo(); //print_status_narrow(); } + return false; } #endif |