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/knobgoblin | |
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/knobgoblin')
-rw-r--r-- | keyboards/knobgoblin/keymaps/moults31/keymap.c | 3 | ||||
-rw-r--r-- | keyboards/knobgoblin/knobgoblin.c | 10 |
2 files changed, 10 insertions, 3 deletions
diff --git a/keyboards/knobgoblin/keymaps/moults31/keymap.c b/keyboards/knobgoblin/keymaps/moults31/keymap.c index 16830bc98..20dda4ccd 100644 --- a/keyboards/knobgoblin/keymaps/moults31/keymap.c +++ b/keyboards/knobgoblin/keymaps/moults31/keymap.c | |||
@@ -141,7 +141,7 @@ static void render_goblin_logo(void) { | |||
141 | oled_write_raw_P(my_logo, sizeof(my_logo)); | 141 | oled_write_raw_P(my_logo, sizeof(my_logo)); |
142 | } | 142 | } |
143 | 143 | ||
144 | void oled_task_user(void) { | 144 | bool oled_task_user(void) { |
145 | 145 | ||
146 | render_goblin_logo(); | 146 | render_goblin_logo(); |
147 | 147 | ||
@@ -167,4 +167,5 @@ void oled_task_user(void) { | |||
167 | oled_write_P(PSTR(" NONE\n"), false); | 167 | oled_write_P(PSTR(" NONE\n"), false); |
168 | break; | 168 | break; |
169 | } | 169 | } |
170 | return false; | ||
170 | } | 171 | } |
diff --git a/keyboards/knobgoblin/knobgoblin.c b/keyboards/knobgoblin/knobgoblin.c index 7349a3199..fcf86a3a4 100644 --- a/keyboards/knobgoblin/knobgoblin.c +++ b/keyboards/knobgoblin/knobgoblin.c | |||
@@ -40,7 +40,9 @@ bool encoder_update_kb(uint8_t index, bool clockwise) { | |||
40 | 40 | ||
41 | #ifdef OLED_ENABLE | 41 | #ifdef OLED_ENABLE |
42 | /* rotate screen for proper orentation*/ | 42 | /* rotate screen for proper orentation*/ |
43 | __attribute__((weak)) oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_270; } | 43 | oled_rotation_t oled_init_kb(oled_rotation_t rotation) { |
44 | return OLED_ROTATION_270; | ||
45 | } | ||
44 | 46 | ||
45 | /* byte map for the goblin logo, knob goblin text, and level text */ | 47 | /* byte map for the goblin logo, knob goblin text, and level text */ |
46 | static void render_goblin_logo(void) { | 48 | static void render_goblin_logo(void) { |
@@ -72,7 +74,10 @@ static void render_goblin_logo(void) { | |||
72 | } | 74 | } |
73 | 75 | ||
74 | /* text display for layer indication */ | 76 | /* text display for layer indication */ |
75 | __attribute__((weak)) void oled_task_user(void) { | 77 | bool oled_task_kb(void) { |
78 | if (!oled_task_user()) { | ||
79 | return false; | ||
80 | } | ||
76 | 81 | ||
77 | render_goblin_logo(); | 82 | render_goblin_logo(); |
78 | 83 | ||
@@ -99,5 +104,6 @@ __attribute__((weak)) void oled_task_user(void) { | |||
99 | break; | 104 | break; |
100 | 105 | ||
101 | } | 106 | } |
107 | return false; | ||
102 | } | 108 | } |
103 | #endif | 109 | #endif |