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/splitkb | |
parent | f775da96b17ceec66bac279434325b4da5cb9467 (diff) | |
download | qmk_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/splitkb')
22 files changed, 60 insertions, 27 deletions
diff --git a/keyboards/splitkb/kyria/keymaps/asapjockey/keymap.c b/keyboards/splitkb/kyria/keymaps/asapjockey/keymap.c index 8ba098eed..baf46eeac 100644 --- a/keyboards/splitkb/kyria/keymaps/asapjockey/keymap.c +++ b/keyboards/splitkb/kyria/keymaps/asapjockey/keymap.c | |||
@@ -246,12 +246,13 @@ static void render_status(void) { | |||
246 | oled_write_P(led_state.scroll_lock ? PSTR("SCRLCK ") : PSTR(" "), false); | 246 | oled_write_P(led_state.scroll_lock ? PSTR("SCRLCK ") : PSTR(" "), false); |
247 | } | 247 | } |
248 | 248 | ||
249 | void oled_task_user(void) { | 249 | bool oled_task_user(void) { |
250 | if (is_keyboard_master()) { | 250 | if (is_keyboard_master()) { |
251 | render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc) | 251 | render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc) |
252 | } else { | 252 | } else { |
253 | render_kyria_logo(); | 253 | render_kyria_logo(); |
254 | } | 254 | } |
255 | return false; | ||
255 | } | 256 | } |
256 | #endif | 257 | #endif |
257 | 258 | ||
diff --git a/keyboards/splitkb/kyria/keymaps/benji/keymap.c b/keyboards/splitkb/kyria/keymaps/benji/keymap.c index a670b7761..1ad50e5fc 100644 --- a/keyboards/splitkb/kyria/keymaps/benji/keymap.c +++ b/keyboards/splitkb/kyria/keymaps/benji/keymap.c | |||
@@ -200,12 +200,13 @@ static void render_status(void) { | |||
200 | oled_write_P(led_usb_state.scroll_lock ? PSTR("SCRLCK ") : PSTR(" "), false); | 200 | oled_write_P(led_usb_state.scroll_lock ? PSTR("SCRLCK ") : PSTR(" "), false); |
201 | } | 201 | } |
202 | 202 | ||
203 | void oled_task_user(void) { | 203 | bool oled_task_user(void) { |
204 | if (is_keyboard_master()) { | 204 | if (is_keyboard_master()) { |
205 | render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc) | 205 | render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc) |
206 | } else { | 206 | } else { |
207 | render_kyria_logo(); | 207 | render_kyria_logo(); |
208 | } | 208 | } |
209 | return false; | ||
209 | } | 210 | } |
210 | #endif | 211 | #endif |
211 | 212 | ||
diff --git a/keyboards/splitkb/kyria/keymaps/cjuniet/keymap.c b/keyboards/splitkb/kyria/keymaps/cjuniet/keymap.c index d0620309b..7e485a7be 100644 --- a/keyboards/splitkb/kyria/keymaps/cjuniet/keymap.c +++ b/keyboards/splitkb/kyria/keymaps/cjuniet/keymap.c | |||
@@ -117,11 +117,12 @@ static void render_status(void) { | |||
117 | oled_write_ln_P(PSTR(" Layer\n"), false); | 117 | oled_write_ln_P(PSTR(" Layer\n"), false); |
118 | } | 118 | } |
119 | 119 | ||
120 | void oled_task_user(void) { | 120 | bool oled_task_user(void) { |
121 | if (is_keyboard_master()) { | 121 | if (is_keyboard_master()) { |
122 | render_status(); | 122 | render_status(); |
123 | render_status_bar(); | 123 | render_status_bar(); |
124 | } else { | 124 | } else { |
125 | render_kyria_logo(); | 125 | render_kyria_logo(); |
126 | } | 126 | } |
127 | return false; | ||
127 | } | 128 | } |
diff --git a/keyboards/splitkb/kyria/keymaps/cwebster2/keymap.c b/keyboards/splitkb/kyria/keymaps/cwebster2/keymap.c index 25a58038d..1abf86501 100644 --- a/keyboards/splitkb/kyria/keymaps/cwebster2/keymap.c +++ b/keyboards/splitkb/kyria/keymaps/cwebster2/keymap.c | |||
@@ -391,12 +391,13 @@ static void render_status(void) { | |||
391 | 391 | ||
392 | } | 392 | } |
393 | 393 | ||
394 | void oled_task_user(void) { | 394 | bool oled_task_user(void) { |
395 | if (is_keyboard_master()) { | 395 | if (is_keyboard_master()) { |
396 | render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc) | 396 | render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc) |
397 | } else { | 397 | } else { |
398 | render_logo(); | 398 | render_logo(); |
399 | } | 399 | } |
400 | return false; | ||
400 | } | 401 | } |
401 | #endif | 402 | #endif |
402 | 403 | ||
diff --git a/keyboards/splitkb/kyria/keymaps/default/keymap.c b/keyboards/splitkb/kyria/keymaps/default/keymap.c index 243104afc..20cb279ff 100644 --- a/keyboards/splitkb/kyria/keymaps/default/keymap.c +++ b/keyboards/splitkb/kyria/keymaps/default/keymap.c | |||
@@ -226,7 +226,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
226 | #ifdef OLED_ENABLE | 226 | #ifdef OLED_ENABLE |
227 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_180; } | 227 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_180; } |
228 | 228 | ||
229 | void oled_task_user(void) { | 229 | bool oled_task_user(void) { |
230 | if (is_keyboard_master()) { | 230 | if (is_keyboard_master()) { |
231 | // QMK Logo and version information | 231 | // QMK Logo and version information |
232 | // clang-format off | 232 | // clang-format off |
@@ -287,6 +287,7 @@ void oled_task_user(void) { | |||
287 | // clang-format on | 287 | // clang-format on |
288 | oled_write_raw_P(kyria_logo, sizeof(kyria_logo)); | 288 | oled_write_raw_P(kyria_logo, sizeof(kyria_logo)); |
289 | } | 289 | } |
290 | return false; | ||
290 | } | 291 | } |
291 | #endif | 292 | #endif |
292 | 293 | ||
diff --git a/keyboards/splitkb/kyria/keymaps/ghidalgo93/keymap.c b/keyboards/splitkb/kyria/keymaps/ghidalgo93/keymap.c index 67881b03e..df542977a 100644 --- a/keyboards/splitkb/kyria/keymaps/ghidalgo93/keymap.c +++ b/keyboards/splitkb/kyria/keymaps/ghidalgo93/keymap.c | |||
@@ -214,12 +214,13 @@ static void render_status(void) { | |||
214 | oled_write_P(led_state.scroll_lock ? PSTR("SCRLCK ") : PSTR(" "), false); | 214 | oled_write_P(led_state.scroll_lock ? PSTR("SCRLCK ") : PSTR(" "), false); |
215 | } | 215 | } |
216 | 216 | ||
217 | void oled_task_user(void) { | 217 | bool oled_task_user(void) { |
218 | if (is_keyboard_master()) { | 218 | if (is_keyboard_master()) { |
219 | render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc) | 219 | render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc) |
220 | } else { | 220 | } else { |
221 | render_kyria_logo(); | 221 | render_kyria_logo(); |
222 | } | 222 | } |
223 | return false; | ||
223 | } | 224 | } |
224 | #endif | 225 | #endif |
225 | 226 | ||
diff --git a/keyboards/splitkb/kyria/keymaps/gotham/keymap.c b/keyboards/splitkb/kyria/keymaps/gotham/keymap.c index 498e1c112..5fdeb494e 100644 --- a/keyboards/splitkb/kyria/keymaps/gotham/keymap.c +++ b/keyboards/splitkb/kyria/keymaps/gotham/keymap.c | |||
@@ -106,7 +106,10 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
106 | #ifdef OLED_ENABLE | 106 | #ifdef OLED_ENABLE |
107 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_180; } | 107 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_180; } |
108 | 108 | ||
109 | void oled_task_user(void) { render_status(); } | 109 | bool oled_task_user(void) { |
110 | render_status(); | ||
111 | return false; | ||
112 | } | ||
110 | #endif | 113 | #endif |
111 | 114 | ||
112 | #ifdef ENCODER_ENABLE | 115 | #ifdef ENCODER_ENABLE |
diff --git a/keyboards/splitkb/kyria/keymaps/j-inc/keymap.c b/keyboards/splitkb/kyria/keymaps/j-inc/keymap.c index 6121dd0f8..af583a607 100644 --- a/keyboards/splitkb/kyria/keymaps/j-inc/keymap.c +++ b/keyboards/splitkb/kyria/keymaps/j-inc/keymap.c | |||
@@ -317,7 +317,7 @@ static void render_anim(void) { | |||
317 | // oled_write_raw_P(skull, 801); | 317 | // oled_write_raw_P(skull, 801); |
318 | // } | 318 | // } |
319 | 319 | ||
320 | void oled_task_user(void) { | 320 | bool oled_task_user(void) { |
321 | if (is_keyboard_master()) { | 321 | if (is_keyboard_master()) { |
322 | //render_skull(); | 322 | //render_skull(); |
323 | //oled_set_cursor(7,6); | 323 | //oled_set_cursor(7,6); |
@@ -335,6 +335,7 @@ void oled_task_user(void) { | |||
335 | oled_write(wpm_str, false); | 335 | oled_write(wpm_str, false); |
336 | 336 | ||
337 | } | 337 | } |
338 | return false; | ||
338 | } | 339 | } |
339 | #endif | 340 | #endif |
340 | 341 | ||
diff --git a/keyboards/splitkb/kyria/keymaps/jhelvy/keymap.c b/keyboards/splitkb/kyria/keymaps/jhelvy/keymap.c index a9c8db28d..e78e15ea3 100644 --- a/keyboards/splitkb/kyria/keymaps/jhelvy/keymap.c +++ b/keyboards/splitkb/kyria/keymaps/jhelvy/keymap.c | |||
@@ -161,12 +161,13 @@ static void render_status(void) { | |||
161 | 161 | ||
162 | } | 162 | } |
163 | 163 | ||
164 | void oled_task_user(void) { | 164 | bool oled_task_user(void) { |
165 | if (is_keyboard_master()) { | 165 | if (is_keyboard_master()) { |
166 | render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc) | 166 | render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc) |
167 | } else { | 167 | } else { |
168 | render_kyria_logo(); | 168 | render_kyria_logo(); |
169 | } | 169 | } |
170 | return false; | ||
170 | } | 171 | } |
171 | #endif | 172 | #endif |
172 | 173 | ||
diff --git a/keyboards/splitkb/kyria/keymaps/john-ezra/oled.c b/keyboards/splitkb/kyria/keymaps/john-ezra/oled.c index fe9c96d55..732cca8f7 100644 --- a/keyboards/splitkb/kyria/keymaps/john-ezra/oled.c +++ b/keyboards/splitkb/kyria/keymaps/john-ezra/oled.c | |||
@@ -478,12 +478,13 @@ void render_status_secondary(void) { | |||
478 | render_wpm_graph(); | 478 | render_wpm_graph(); |
479 | } | 479 | } |
480 | 480 | ||
481 | void oled_task_user(void) { | 481 | bool oled_task_user(void) { |
482 | if (is_keyboard_master()) { | 482 | if (is_keyboard_master()) { |
483 | render_status_main(); // Renders the current keyboard state (layer, lock, caps, scroll, etc) | 483 | render_status_main(); // Renders the current keyboard state (layer, lock, caps, scroll, etc) |
484 | } else { | 484 | } else { |
485 | render_status_secondary(); | 485 | render_status_secondary(); |
486 | } | 486 | } |
487 | return false; | ||
487 | } | 488 | } |
488 | 489 | ||
489 | #endif | 490 | #endif |
diff --git a/keyboards/splitkb/kyria/keymaps/mattir/keymap.c b/keyboards/splitkb/kyria/keymaps/mattir/keymap.c index 89efaec55..7b567cbd6 100644 --- a/keyboards/splitkb/kyria/keymaps/mattir/keymap.c +++ b/keyboards/splitkb/kyria/keymaps/mattir/keymap.c | |||
@@ -193,12 +193,13 @@ static void render_status(void) { | |||
193 | } | 193 | } |
194 | } | 194 | } |
195 | 195 | ||
196 | void oled_task_user(void) { | 196 | bool oled_task_user(void) { |
197 | if (is_keyboard_master()) { | 197 | if (is_keyboard_master()) { |
198 | render_status(); // Renders the current keyboard layer | 198 | render_status(); // Renders the current keyboard layer |
199 | } else { | 199 | } else { |
200 | render_mattir_logo(); | 200 | render_mattir_logo(); |
201 | } | 201 | } |
202 | return false; | ||
202 | } | 203 | } |
203 | #endif | 204 | #endif |
204 | 205 | ||
diff --git a/keyboards/splitkb/kyria/keymaps/ninjonas/oled.c b/keyboards/splitkb/kyria/keymaps/ninjonas/oled.c index 216f47534..813328aa0 100644 --- a/keyboards/splitkb/kyria/keymaps/ninjonas/oled.c +++ b/keyboards/splitkb/kyria/keymaps/ninjonas/oled.c | |||
@@ -198,12 +198,13 @@ static void render_status(void) { | |||
198 | render_mod_state(get_mods()|get_oneshot_mods()); | 198 | render_mod_state(get_mods()|get_oneshot_mods()); |
199 | } | 199 | } |
200 | 200 | ||
201 | void oled_task_user(void) { | 201 | bool oled_task_user(void) { |
202 | if (is_keyboard_master()) { | 202 | if (is_keyboard_master()) { |
203 | render_status(); | 203 | render_status(); |
204 | } else { | 204 | } else { |
205 | render_logo(); | 205 | render_logo(); |
206 | oled_scroll_left(); | 206 | oled_scroll_left(); |
207 | } | 207 | } |
208 | return false; | ||
208 | } | 209 | } |
209 | #endif | 210 | #endif |
diff --git a/keyboards/splitkb/kyria/keymaps/plattfot/keymap.c b/keyboards/splitkb/kyria/keymaps/plattfot/keymap.c index 8b4b0c263..222759d60 100644 --- a/keyboards/splitkb/kyria/keymaps/plattfot/keymap.c +++ b/keyboards/splitkb/kyria/keymaps/plattfot/keymap.c | |||
@@ -327,12 +327,13 @@ static void render_status(void) { | |||
327 | oled_write_P(led_state.scroll_lock ? PSTR("SCRLCK ") : PSTR(" "), false); | 327 | oled_write_P(led_state.scroll_lock ? PSTR("SCRLCK ") : PSTR(" "), false); |
328 | } | 328 | } |
329 | 329 | ||
330 | void oled_task_user(void) { | 330 | bool oled_task_user(void) { |
331 | if (is_keyboard_master()) { | 331 | if (is_keyboard_master()) { |
332 | render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc) | 332 | render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc) |
333 | } else { | 333 | } else { |
334 | render_static_info(); | 334 | render_static_info(); |
335 | } | 335 | } |
336 | return false; | ||
336 | } | 337 | } |
337 | #endif | 338 | #endif |
338 | 339 | ||
diff --git a/keyboards/splitkb/kyria/keymaps/shinze/keymap.c b/keyboards/splitkb/kyria/keymaps/shinze/keymap.c index ad9ca4da1..348341052 100644 --- a/keyboards/splitkb/kyria/keymaps/shinze/keymap.c +++ b/keyboards/splitkb/kyria/keymaps/shinze/keymap.c | |||
@@ -216,12 +216,13 @@ static void render_status(void) { | |||
216 | oled_write_P(IS_LED_ON(led_usb_state, USB_LED_SCROLL_LOCK) ? PSTR("SCRLCK ") : PSTR(" "), false); | 216 | oled_write_P(IS_LED_ON(led_usb_state, USB_LED_SCROLL_LOCK) ? PSTR("SCRLCK ") : PSTR(" "), false); |
217 | } | 217 | } |
218 | 218 | ||
219 | void oled_task_user(void) { | 219 | bool oled_task_user(void) { |
220 | if (is_keyboard_master()) { | 220 | if (is_keyboard_master()) { |
221 | render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc) | 221 | render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc) |
222 | } else { | 222 | } else { |
223 | render_kyria_logo(); | 223 | render_kyria_logo(); |
224 | } | 224 | } |
225 | return false; | ||
225 | } | 226 | } |
226 | #endif | 227 | #endif |
227 | 228 | ||
diff --git a/keyboards/splitkb/kyria/keymaps/tessachka/keymap.c b/keyboards/splitkb/kyria/keymaps/tessachka/keymap.c index 51a91fc91..16d2bad8a 100644 --- a/keyboards/splitkb/kyria/keymaps/tessachka/keymap.c +++ b/keyboards/splitkb/kyria/keymaps/tessachka/keymap.c | |||
@@ -231,11 +231,12 @@ static void render_status(void) { | |||
231 | oled_write_P(IS_LED_ON(led_usb_state, USB_LED_SCROLL_LOCK) ? PSTR("SCRLCK ") : PSTR(" "), false); | 231 | oled_write_P(IS_LED_ON(led_usb_state, USB_LED_SCROLL_LOCK) ? PSTR("SCRLCK ") : PSTR(" "), false); |
232 | } | 232 | } |
233 | 233 | ||
234 | void oled_task_user(void) { | 234 | bool oled_task_user(void) { |
235 | if (is_keyboard_master()) { | 235 | if (is_keyboard_master()) { |
236 | render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc) | 236 | render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc) |
237 | } else { | 237 | } else { |
238 | render_kyria_logo(); | 238 | render_kyria_logo(); |
239 | } | 239 | } |
240 | return false; | ||
240 | } | 241 | } |
241 | #endif | 242 | #endif |
diff --git a/keyboards/splitkb/kyria/keymaps/thomasbaart/keymap.c b/keyboards/splitkb/kyria/keymaps/thomasbaart/keymap.c index 24be4135e..0a4f1887c 100644 --- a/keyboards/splitkb/kyria/keymaps/thomasbaart/keymap.c +++ b/keyboards/splitkb/kyria/keymaps/thomasbaart/keymap.c | |||
@@ -298,12 +298,13 @@ static void render_status(void) { | |||
298 | oled_write_P(IS_LED_ON(led_usb_state, USB_LED_SCROLL_LOCK) ? PSTR("SCRLCK ") : PSTR(" "), false); | 298 | oled_write_P(IS_LED_ON(led_usb_state, USB_LED_SCROLL_LOCK) ? PSTR("SCRLCK ") : PSTR(" "), false); |
299 | } | 299 | } |
300 | 300 | ||
301 | void oled_task_user(void) { | 301 | bool oled_task_user(void) { |
302 | if (is_keyboard_master()) { | 302 | if (is_keyboard_master()) { |
303 | render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc) | 303 | render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc) |
304 | } else { | 304 | } else { |
305 | render_kyria_logo(); | 305 | render_kyria_logo(); |
306 | } | 306 | } |
307 | return false; | ||
307 | } | 308 | } |
308 | #endif | 309 | #endif |
309 | 310 | ||
diff --git a/keyboards/splitkb/kyria/keymaps/via/keymap.c b/keyboards/splitkb/kyria/keymaps/via/keymap.c index 730b5028c..6835652a7 100644 --- a/keyboards/splitkb/kyria/keymaps/via/keymap.c +++ b/keyboards/splitkb/kyria/keymaps/via/keymap.c | |||
@@ -191,7 +191,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) { | |||
191 | #endif | 191 | #endif |
192 | 192 | ||
193 | #ifdef OLED_ENABLE | 193 | #ifdef OLED_ENABLE |
194 | void oled_task_user(void) { | 194 | bool oled_task_user(void) { |
195 | if (is_keyboard_master()) { | 195 | if (is_keyboard_master()) { |
196 | // QMK Logo and version information | 196 | // QMK Logo and version information |
197 | // clang-format off | 197 | // clang-format off |
@@ -244,5 +244,6 @@ void oled_task_user(void) { | |||
244 | // clang-format on | 244 | // clang-format on |
245 | oled_write_raw_P(kyria_logo, sizeof(kyria_logo)); | 245 | oled_write_raw_P(kyria_logo, sizeof(kyria_logo)); |
246 | } | 246 | } |
247 | return false; | ||
247 | } | 248 | } |
248 | #endif | 249 | #endif |
diff --git a/keyboards/splitkb/kyria/keymaps/winternebs/keymap.c b/keyboards/splitkb/kyria/keymaps/winternebs/keymap.c index 082903031..4f0df9354 100755 --- a/keyboards/splitkb/kyria/keymaps/winternebs/keymap.c +++ b/keyboards/splitkb/kyria/keymaps/winternebs/keymap.c | |||
@@ -695,7 +695,7 @@ static void render_logo(void) { | |||
695 | oled_set_cursor(6,6); | 695 | oled_set_cursor(6,6); |
696 | oled_write_P(PSTR(" play asc "), false); | 696 | oled_write_P(PSTR(" play asc "), false); |
697 | } | 697 | } |
698 | void oled_task_user(void) { | 698 | bool oled_task_user(void) { |
699 | if (is_keyboard_master()) { | 699 | if (is_keyboard_master()) { |
700 | render_anim(); | 700 | render_anim(); |
701 | oled_set_cursor(0,7); | 701 | oled_set_cursor(0,7); |
@@ -728,5 +728,6 @@ void oled_task_user(void) { | |||
728 | oled_scroll_left(); | 728 | oled_scroll_left(); |
729 | 729 | ||
730 | } | 730 | } |
731 | return false; | ||
731 | } | 732 | } |
732 | #endif | 733 | #endif |
diff --git a/keyboards/splitkb/kyria/keymaps/zigotica/oled.c b/keyboards/splitkb/kyria/keymaps/zigotica/oled.c index 46bb2c3ce..ba1415dee 100644 --- a/keyboards/splitkb/kyria/keymaps/zigotica/oled.c +++ b/keyboards/splitkb/kyria/keymaps/zigotica/oled.c | |||
@@ -77,11 +77,11 @@ static void render_status(void) { | |||
77 | oled_write_P(led_state.scroll_lock ? PSTR("SCRLCK ") : PSTR(" "), false); | 77 | oled_write_P(led_state.scroll_lock ? PSTR("SCRLCK ") : PSTR(" "), false); |
78 | } | 78 | } |
79 | 79 | ||
80 | void oled_task_user(void) { | 80 | bool oled_task_user(void) { |
81 | if (!is_keyboard_left()) { | 81 | if (!is_keyboard_left()) { |
82 | render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc) | 82 | render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc) |
83 | } else { | 83 | } else { |
84 | render_kyria_logo(); | 84 | render_kyria_logo(); |
85 | } | 85 | } |
86 | return false; | ||
86 | } | 87 | } |
87 | |||
diff --git a/keyboards/splitkb/kyria/rev1/rev1.c b/keyboards/splitkb/kyria/rev1/rev1.c index ac82f7373..b2641fb40 100644 --- a/keyboards/splitkb/kyria/rev1/rev1.c +++ b/keyboards/splitkb/kyria/rev1/rev1.c | |||
@@ -56,9 +56,14 @@ led_config_t g_led_config = { { | |||
56 | #endif | 56 | #endif |
57 | 57 | ||
58 | #ifdef OLED_ENABLE | 58 | #ifdef OLED_ENABLE |
59 | __attribute__((weak)) oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_180; } | 59 | oled_rotation_t oled_init_kb(oled_rotation_t rotation) { |
60 | return OLED_ROTATION_180; | ||
61 | } | ||
60 | 62 | ||
61 | __attribute__((weak)) void oled_task_user(void) { | 63 | bool oled_task_kb(void) { |
64 | if (!oled_task_user()) { | ||
65 | return false; | ||
66 | } | ||
62 | if (is_keyboard_master()) { | 67 | if (is_keyboard_master()) { |
63 | // QMK Logo and version information | 68 | // QMK Logo and version information |
64 | // clang-format off | 69 | // clang-format off |
@@ -119,6 +124,7 @@ __attribute__((weak)) void oled_task_user(void) { | |||
119 | // clang-format on | 124 | // clang-format on |
120 | oled_write_raw_P(kyria_logo, sizeof(kyria_logo)); | 125 | oled_write_raw_P(kyria_logo, sizeof(kyria_logo)); |
121 | } | 126 | } |
127 | return false; | ||
122 | } | 128 | } |
123 | #endif | 129 | #endif |
124 | 130 | ||
diff --git a/keyboards/splitkb/zima/keymaps/drashna/keymap.c b/keyboards/splitkb/zima/keymaps/drashna/keymap.c index 29d03ec91..b3133c601 100644 --- a/keyboards/splitkb/zima/keymaps/drashna/keymap.c +++ b/keyboards/splitkb/zima/keymaps/drashna/keymap.c | |||
@@ -78,10 +78,10 @@ void render_user_status(void) { | |||
78 | 78 | ||
79 | void keyboard_post_init_user(void) { oled_scroll_set_speed(0); } | 79 | void keyboard_post_init_user(void) { oled_scroll_set_speed(0); } |
80 | 80 | ||
81 | void oled_task_user(void) { | 81 | bool oled_task_user(void) { |
82 | if (is_asleep) { | 82 | if (is_asleep) { |
83 | oled_off(); | 83 | oled_off(); |
84 | return; | 84 | return false;; |
85 | } | 85 | } |
86 | 86 | ||
87 | if (timer_elapsed32(oled_timer) < 30000) { | 87 | if (timer_elapsed32(oled_timer) < 30000) { |
@@ -131,6 +131,7 @@ void oled_task_user(void) { | |||
131 | oled_off(); | 131 | oled_off(); |
132 | } | 132 | } |
133 | } | 133 | } |
134 | return false; | ||
134 | } | 135 | } |
135 | 136 | ||
136 | void suspend_power_down_user(void) { is_asleep = true; } | 137 | void suspend_power_down_user(void) { is_asleep = true; } |
diff --git a/keyboards/splitkb/zima/zima.c b/keyboards/splitkb/zima/zima.c index 6570f3449..f39e3a39e 100644 --- a/keyboards/splitkb/zima/zima.c +++ b/keyboards/splitkb/zima/zima.c | |||
@@ -35,12 +35,17 @@ void suspend_wakeup_init_kb(void) { | |||
35 | suspend_wakeup_init_user(); | 35 | suspend_wakeup_init_user(); |
36 | } | 36 | } |
37 | 37 | ||
38 | __attribute__((weak)) oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_180; } | 38 | oled_rotation_t oled_init_kb(oled_rotation_t rotation) { |
39 | return OLED_ROTATION_180; | ||
40 | } | ||
39 | 41 | ||
40 | __attribute__((weak)) void oled_task_user(void) { | 42 | bool oled_task_kb(void) { |
43 | if (!oled_task_user()) { | ||
44 | return false; | ||
45 | } | ||
41 | if (is_asleep) { | 46 | if (is_asleep) { |
42 | oled_off(); | 47 | oled_off(); |
43 | return; | 48 | return false; |
44 | } | 49 | } |
45 | 50 | ||
46 | if (timer_elapsed32(oled_timer) < 30000) { | 51 | if (timer_elapsed32(oled_timer) < 30000) { |
@@ -83,6 +88,7 @@ __attribute__((weak)) void oled_task_user(void) { | |||
83 | oled_off(); | 88 | oled_off(); |
84 | } | 89 | } |
85 | } | 90 | } |
91 | return false; | ||
86 | } | 92 | } |
87 | 93 | ||
88 | bool process_record_kb(uint16_t keycode, keyrecord_t* record) { | 94 | bool process_record_kb(uint16_t keycode, keyrecord_t* record) { |