aboutsummaryrefslogtreecommitdiff
path: root/keyboards/merge
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2021-11-01 15:42:50 -0700
committerGitHub <noreply@github.com>2021-11-02 09:42:50 +1100
commit9d235d4fc5c34f372b0c393f41686b5ef4f8dc13 (patch)
treec155fae4cd6043c3c32aa185eb05c5d1a4a5700e /keyboards/merge
parentf775da96b17ceec66bac279434325b4da5cb9467 (diff)
downloadqmk_firmware-9d235d4fc5c34f372b0c393f41686b5ef4f8dc13.tar.gz
qmk_firmware-9d235d4fc5c34f372b0c393f41686b5ef4f8dc13.zip
[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.c3
-rw-r--r--keyboards/merge/um70/keymaps/via/keymap.c3
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 0a775929d..926f7836a 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) {
169 // WPM counter End 169 // WPM counter End
170} 170}
171 171
172void oled_task_user(void) { 172bool oled_task_user(void) {
173 current_wpm = get_current_wpm(); 173 current_wpm = get_current_wpm();
174 if (is_keyboard_master()) { 174 if (is_keyboard_master()) {
175 print_status_narrow(); 175 print_status_narrow();
@@ -178,6 +178,7 @@ void oled_task_user(void) {
178 render_logo(); 178 render_logo();
179 //print_status_narrow(); 179 //print_status_narrow();
180 } 180 }
181 return false;
181} 182}
182 183
183#endif 184#endif
diff --git a/keyboards/merge/um70/keymaps/via/keymap.c b/keyboards/merge/um70/keymaps/via/keymap.c
index aaf682ffd..f7255eacf 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) {
173 // WPM counter End 173 // WPM counter End
174} 174}
175 175
176void oled_task_user(void) { 176bool oled_task_user(void) {
177 current_wpm = get_current_wpm(); 177 current_wpm = get_current_wpm();
178 if (is_keyboard_master()) { 178 if (is_keyboard_master()) {
179 print_status_narrow(); 179 print_status_narrow();
@@ -182,6 +182,7 @@ void oled_task_user(void) {
182 render_logo(); 182 render_logo();
183 //print_status_narrow(); 183 //print_status_narrow();
184 } 184 }
185 return false;
185} 186}
186 187
187#endif 188#endif