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/helix/rev3_5rows | |
| 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/helix/rev3_5rows')
4 files changed, 9 insertions, 5 deletions
diff --git a/keyboards/helix/rev3_5rows/keymaps/default/oled_display.c b/keyboards/helix/rev3_5rows/keymaps/default/oled_display.c index fb1a6f9f8..e951f627c 100644 --- a/keyboards/helix/rev3_5rows/keymaps/default/oled_display.c +++ b/keyboards/helix/rev3_5rows/keymaps/default/oled_display.c | |||
| @@ -101,12 +101,13 @@ static void render_rgbled_status(bool full) { | |||
| 101 | #endif | 101 | #endif |
| 102 | } | 102 | } |
| 103 | 103 | ||
| 104 | void oled_task_user(void) { | 104 | bool oled_task_user(void) { |
| 105 | if(is_keyboard_master()){ | 105 | if(is_keyboard_master()){ |
| 106 | render_status(); | 106 | render_status(); |
| 107 | }else{ | 107 | }else{ |
| 108 | render_logo(); | 108 | render_logo(); |
| 109 | render_rgbled_status(true); | 109 | render_rgbled_status(true); |
| 110 | } | 110 | } |
| 111 | return false; | ||
| 111 | } | 112 | } |
| 112 | #endif | 113 | #endif |
diff --git a/keyboards/helix/rev3_5rows/keymaps/five_rows/oled_display.c b/keyboards/helix/rev3_5rows/keymaps/five_rows/oled_display.c index e8ba0d720..cee415ad3 100644 --- a/keyboards/helix/rev3_5rows/keymaps/five_rows/oled_display.c +++ b/keyboards/helix/rev3_5rows/keymaps/five_rows/oled_display.c | |||
| @@ -214,7 +214,7 @@ void iota_gfx_task_user(void) { | |||
| 214 | matrix_update(&display, &matrix); | 214 | matrix_update(&display, &matrix); |
| 215 | } | 215 | } |
| 216 | # else | 216 | # else |
| 217 | void oled_task_user(void) { | 217 | bool oled_task_user(void) { |
| 218 | 218 | ||
| 219 | # if DEBUG_TO_SCREEN | 219 | # if DEBUG_TO_SCREEN |
| 220 | if (debug_enable) { | 220 | if (debug_enable) { |
| @@ -227,6 +227,7 @@ void oled_task_user(void) { | |||
| 227 | }else{ | 227 | }else{ |
| 228 | render_logo(); | 228 | render_logo(); |
| 229 | } | 229 | } |
| 230 | return false; | ||
| 230 | } | 231 | } |
| 231 | # endif | 232 | # endif |
| 232 | 233 | ||
diff --git a/keyboards/helix/rev3_5rows/keymaps/via/oled_display.c b/keyboards/helix/rev3_5rows/keymaps/via/oled_display.c index fb1a6f9f8..e951f627c 100644 --- a/keyboards/helix/rev3_5rows/keymaps/via/oled_display.c +++ b/keyboards/helix/rev3_5rows/keymaps/via/oled_display.c | |||
| @@ -101,12 +101,13 @@ static void render_rgbled_status(bool full) { | |||
| 101 | #endif | 101 | #endif |
| 102 | } | 102 | } |
| 103 | 103 | ||
| 104 | void oled_task_user(void) { | 104 | bool oled_task_user(void) { |
| 105 | if(is_keyboard_master()){ | 105 | if(is_keyboard_master()){ |
| 106 | render_status(); | 106 | render_status(); |
| 107 | }else{ | 107 | }else{ |
| 108 | render_logo(); | 108 | render_logo(); |
| 109 | render_rgbled_status(true); | 109 | render_rgbled_status(true); |
| 110 | } | 110 | } |
| 111 | return false; | ||
| 111 | } | 112 | } |
| 112 | #endif | 113 | #endif |
diff --git a/keyboards/helix/rev3_5rows/rev3_5rows.c b/keyboards/helix/rev3_5rows/rev3_5rows.c index 963cc744e..704f91551 100644 --- a/keyboards/helix/rev3_5rows/rev3_5rows.c +++ b/keyboards/helix/rev3_5rows/rev3_5rows.c | |||
| @@ -83,8 +83,8 @@ char *sprint2d(char *buf, char *leadstr, int data) { | |||
| 83 | return sprint_decimal(buf, data); | 83 | return sprint_decimal(buf, data); |
| 84 | } | 84 | } |
| 85 | 85 | ||
| 86 | __attribute__((weak)) | 86 | bool oled_task_kb(void) { |
| 87 | void oled_task_user(void) { | 87 | if (!oled_task_user()) { return false; } |
| 88 | static const char PROGMEM helix_logo[] = { | 88 | static const char PROGMEM helix_logo[] = { |
| 89 | 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94, | 89 | 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94, |
| 90 | 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, | 90 | 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, |
| @@ -109,5 +109,6 @@ void oled_task_user(void) { | |||
| 109 | } else { | 109 | } else { |
| 110 | oled_write_P(helix_logo, false); | 110 | oled_write_P(helix_logo, false); |
| 111 | } | 111 | } |
| 112 | return false; | ||
| 112 | } | 113 | } |
| 113 | #endif | 114 | #endif |
