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/lily58/keymaps | |
| 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/lily58/keymaps')
| -rw-r--r-- | keyboards/lily58/keymaps/barabas/keymap.c | 3 | ||||
| -rw-r--r-- | keyboards/lily58/keymaps/chuan/keymap.c | 3 | ||||
| -rw-r--r-- | keyboards/lily58/keymaps/cykedev/keymap.c | 4 | ||||
| -rw-r--r-- | keyboards/lily58/keymaps/datadavd/keymap.c | 4 | ||||
| -rw-r--r-- | keyboards/lily58/keymaps/default/keymap.c | 3 | ||||
| -rw-r--r-- | keyboards/lily58/keymaps/domnantas/keymap.c | 31 | ||||
| -rw-r--r-- | keyboards/lily58/keymaps/drasbeck/keymap.c | 3 | ||||
| -rw-r--r-- | keyboards/lily58/keymaps/lily58l/keymap.c | 3 | ||||
| -rw-r--r-- | keyboards/lily58/keymaps/mikefightsbears/keymap.c | 4 | ||||
| -rw-r--r-- | keyboards/lily58/keymaps/muuko/keymap.c | 3 | ||||
| -rw-r--r-- | keyboards/lily58/keymaps/narze/keymap.c | 3 | ||||
| -rw-r--r-- | keyboards/lily58/keymaps/via/keymap.c | 3 | ||||
| -rw-r--r-- | keyboards/lily58/keymaps/yshrsmz/keymap.c | 3 | ||||
| -rw-r--r-- | keyboards/lily58/keymaps/yuchi/keymap.c | 3 |
14 files changed, 42 insertions, 31 deletions
diff --git a/keyboards/lily58/keymaps/barabas/keymap.c b/keyboards/lily58/keymaps/barabas/keymap.c index 00d6045d4..64ef3cfff 100644 --- a/keyboards/lily58/keymaps/barabas/keymap.c +++ b/keyboards/lily58/keymaps/barabas/keymap.c | |||
| @@ -171,7 +171,7 @@ void write_layer_state(void) { | |||
| 171 | oled_advance_page(true); | 171 | oled_advance_page(true); |
| 172 | } | 172 | } |
| 173 | 173 | ||
| 174 | void oled_task_user(void) { | 174 | bool oled_task_user(void) { |
| 175 | if (is_keyboard_master()) { | 175 | if (is_keyboard_master()) { |
| 176 | write_layer_state(); | 176 | write_layer_state(); |
| 177 | oled_write_ln(read_keylog(), false); | 177 | oled_write_ln(read_keylog(), false); |
| @@ -179,6 +179,7 @@ void oled_task_user(void) { | |||
| 179 | } else { | 179 | } else { |
| 180 | oled_write(read_logo(), false); | 180 | oled_write(read_logo(), false); |
| 181 | } | 181 | } |
| 182 | return false; | ||
| 182 | } | 183 | } |
| 183 | #endif // OLED_ENABLE | 184 | #endif // OLED_ENABLE |
| 184 | 185 | ||
diff --git a/keyboards/lily58/keymaps/chuan/keymap.c b/keyboards/lily58/keymaps/chuan/keymap.c index 29e5aae19..1e0923a3c 100644 --- a/keyboards/lily58/keymaps/chuan/keymap.c +++ b/keyboards/lily58/keymaps/chuan/keymap.c | |||
| @@ -152,7 +152,7 @@ const char *read_timelog(void); | |||
| 152 | 152 | ||
| 153 | char encoder_debug[24]; | 153 | char encoder_debug[24]; |
| 154 | 154 | ||
| 155 | void oled_task_user(void) { | 155 | bool oled_task_user(void) { |
| 156 | // Host Keyboard Layer Status | 156 | // Host Keyboard Layer Status |
| 157 | snprintf(encoder_debug, sizeof(encoder_debug), "%i %i", counter, lastIndex ); | 157 | snprintf(encoder_debug, sizeof(encoder_debug), "%i %i", counter, lastIndex ); |
| 158 | if (is_keyboard_master()) { | 158 | if (is_keyboard_master()) { |
| @@ -168,6 +168,7 @@ void oled_task_user(void) { | |||
| 168 | oled_write(read_logo(), false); | 168 | oled_write(read_logo(), false); |
| 169 | // oled_write_ln(encoder_debug, false); | 169 | // oled_write_ln(encoder_debug, false); |
| 170 | } | 170 | } |
| 171 | return false; | ||
| 171 | } | 172 | } |
| 172 | #endif //OLED_ENABLE | 173 | #endif //OLED_ENABLE |
| 173 | 174 | ||
diff --git a/keyboards/lily58/keymaps/cykedev/keymap.c b/keyboards/lily58/keymaps/cykedev/keymap.c index 460afb229..75cdc04fe 100644 --- a/keyboards/lily58/keymaps/cykedev/keymap.c +++ b/keyboards/lily58/keymaps/cykedev/keymap.c | |||
| @@ -114,8 +114,8 @@ oled_rotation_t oled_init_user(oled_rotation_t rotation) { | |||
| 114 | 114 | ||
| 115 | const char *read_logo(void); | 115 | const char *read_logo(void); |
| 116 | 116 | ||
| 117 | void oled_task_user(void) { | 117 | bool oled_task_user(void) { |
| 118 | oled_write_ln(read_logo(), false); | 118 | oled_write_ln(read_logo(), false); |
| 119 | return false; | ||
| 119 | } | 120 | } |
| 120 | #endif // OLED_ENABLE | 121 | #endif // OLED_ENABLE |
| 121 | |||
diff --git a/keyboards/lily58/keymaps/datadavd/keymap.c b/keyboards/lily58/keymaps/datadavd/keymap.c index 15bcce10b..0485cd19a 100644 --- a/keyboards/lily58/keymaps/datadavd/keymap.c +++ b/keyboards/lily58/keymaps/datadavd/keymap.c | |||
| @@ -219,12 +219,13 @@ static void render_lfc_logo(void) { | |||
| 219 | oled_write_raw_P(my_lfc_logo, sizeof(my_lfc_logo)); | 219 | oled_write_raw_P(my_lfc_logo, sizeof(my_lfc_logo)); |
| 220 | } | 220 | } |
| 221 | 221 | ||
| 222 | void oled_task_user(void) { | 222 | bool oled_task_user(void) { |
| 223 | if (is_keyboard_master()) { | 223 | if (is_keyboard_master()) { |
| 224 | render_logo(); | 224 | render_logo(); |
| 225 | } else { | 225 | } else { |
| 226 | render_lfc_logo(); | 226 | render_lfc_logo(); |
| 227 | } | 227 | } |
| 228 | return false; | ||
| 228 | } | 229 | } |
| 229 | #endif // OLED_ENABLE | 230 | #endif // OLED_ENABLE |
| 230 | 231 | ||
| @@ -263,4 +264,3 @@ const char *read_layer_state(void) { | |||
| 263 | 264 | ||
| 264 | return layer_state_str; | 265 | return layer_state_str; |
| 265 | } | 266 | } |
| 266 | |||
diff --git a/keyboards/lily58/keymaps/default/keymap.c b/keyboards/lily58/keymaps/default/keymap.c index 1b5b7c862..5010c6697 100644 --- a/keyboards/lily58/keymaps/default/keymap.c +++ b/keyboards/lily58/keymaps/default/keymap.c | |||
| @@ -122,7 +122,7 @@ const char *read_keylogs(void); | |||
| 122 | // void set_timelog(void); | 122 | // void set_timelog(void); |
| 123 | // const char *read_timelog(void); | 123 | // const char *read_timelog(void); |
| 124 | 124 | ||
| 125 | void oled_task_user(void) { | 125 | bool oled_task_user(void) { |
| 126 | if (is_keyboard_master()) { | 126 | if (is_keyboard_master()) { |
| 127 | // If you want to change the display of OLED, you need to change here | 127 | // If you want to change the display of OLED, you need to change here |
| 128 | oled_write_ln(read_layer_state(), false); | 128 | oled_write_ln(read_layer_state(), false); |
| @@ -134,6 +134,7 @@ void oled_task_user(void) { | |||
| 134 | } else { | 134 | } else { |
| 135 | oled_write(read_logo(), false); | 135 | oled_write(read_logo(), false); |
| 136 | } | 136 | } |
| 137 | return false; | ||
| 137 | } | 138 | } |
| 138 | #endif // OLED_ENABLE | 139 | #endif // OLED_ENABLE |
| 139 | 140 | ||
diff --git a/keyboards/lily58/keymaps/domnantas/keymap.c b/keyboards/lily58/keymaps/domnantas/keymap.c index f1b2b2dcd..ef2a89c47 100644 --- a/keyboards/lily58/keymaps/domnantas/keymap.c +++ b/keyboards/lily58/keymaps/domnantas/keymap.c | |||
| @@ -1,18 +1,18 @@ | |||
| 1 | /* Copyright 2020 Domantas Petrauskas | 1 | /* Copyright 2020 Domantas Petrauskas |
| 2 | * | 2 | * |
| 3 | * This program is free software: you can redistribute it and/or modify | 3 | * This program is free software: you can redistribute it and/or modify |
| 4 | * it under the terms of the GNU General Public License as published by | 4 | * it under the terms of the GNU General Public License as published by |
| 5 | * the Free Software Foundation, either version 2 of the License, or | 5 | * the Free Software Foundation, either version 2 of the License, or |
| 6 | * (at your option) any later version. | 6 | * (at your option) any later version. |
| 7 | * | 7 | * |
| 8 | * This program is distributed in the hope that it will be useful, | 8 | * This program is distributed in the hope that it will be useful, |
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 11 | * GNU General Public License for more details. | 11 | * GNU General Public License for more details. |
| 12 | * | 12 | * |
| 13 | * You should have received a copy of the GNU General Public License | 13 | * You should have received a copy of the GNU General Public License |
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include QMK_KEYBOARD_H | 17 | #include QMK_KEYBOARD_H |
| 18 | #include <stdio.h> | 18 | #include <stdio.h> |
| @@ -275,10 +275,11 @@ static void render_status(void) { | |||
| 275 | oled_write_ln_P(PSTR("caps"), led_state.caps_lock); | 275 | oled_write_ln_P(PSTR("caps"), led_state.caps_lock); |
| 276 | } | 276 | } |
| 277 | 277 | ||
| 278 | void oled_task_user(void) { | 278 | bool oled_task_user(void) { |
| 279 | if (is_keyboard_left()) { | 279 | if (is_keyboard_left()) { |
| 280 | render_status(); | 280 | render_status(); |
| 281 | } else { | 281 | } else { |
| 282 | render_bongo_cat(); | 282 | render_bongo_cat(); |
| 283 | } | 283 | } |
| 284 | return false; | ||
| 284 | } | 285 | } |
diff --git a/keyboards/lily58/keymaps/drasbeck/keymap.c b/keyboards/lily58/keymaps/drasbeck/keymap.c index 6e22f0431..56bed4d7a 100644 --- a/keyboards/lily58/keymaps/drasbeck/keymap.c +++ b/keyboards/lily58/keymaps/drasbeck/keymap.c | |||
| @@ -92,7 +92,7 @@ void set_keylog(uint16_t keycode, keyrecord_t *record); | |||
| 92 | // void set_timelog(void); | 92 | // void set_timelog(void); |
| 93 | // const char *read_timelog(void); | 93 | // const char *read_timelog(void); |
| 94 | 94 | ||
| 95 | void oled_task_user(void) { | 95 | bool oled_task_user(void) { |
| 96 | if (is_keyboard_master()) { | 96 | if (is_keyboard_master()) { |
| 97 | // If you want to change the display of OLED, you need to change here | 97 | // If you want to change the display of OLED, you need to change here |
| 98 | oled_write_ln(read_layer_state(), false); | 98 | oled_write_ln(read_layer_state(), false); |
| @@ -104,6 +104,7 @@ void oled_task_user(void) { | |||
| 104 | } else { | 104 | } else { |
| 105 | oled_write(read_logo(), false); | 105 | oled_write(read_logo(), false); |
| 106 | } | 106 | } |
| 107 | return false; | ||
| 107 | } | 108 | } |
| 108 | #endif // OLED_ENABLE | 109 | #endif // OLED_ENABLE |
| 109 | 110 | ||
diff --git a/keyboards/lily58/keymaps/lily58l/keymap.c b/keyboards/lily58/keymaps/lily58l/keymap.c index 3db5f4ac6..10794b869 100644 --- a/keyboards/lily58/keymaps/lily58l/keymap.c +++ b/keyboards/lily58/keymaps/lily58l/keymap.c | |||
| @@ -271,13 +271,14 @@ void render_status_main(void) { | |||
| 271 | render_keylogger_status(); | 271 | render_keylogger_status(); |
| 272 | } | 272 | } |
| 273 | 273 | ||
| 274 | void oled_task_user(void) { | 274 | bool oled_task_user(void) { |
| 275 | update_log(); | 275 | update_log(); |
| 276 | if (is_keyboard_master()) { | 276 | if (is_keyboard_master()) { |
| 277 | render_status_main(); // Renders the current keyboard state (layer, lock, caps, scroll, etc) | 277 | render_status_main(); // Renders the current keyboard state (layer, lock, caps, scroll, etc) |
| 278 | } else { | 278 | } else { |
| 279 | render_lily58_logo(); | 279 | render_lily58_logo(); |
| 280 | } | 280 | } |
| 281 | return false; | ||
| 281 | } | 282 | } |
| 282 | 283 | ||
| 283 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | 284 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { |
diff --git a/keyboards/lily58/keymaps/mikefightsbears/keymap.c b/keyboards/lily58/keymaps/mikefightsbears/keymap.c index 303e7b7d5..2b9855f19 100644 --- a/keyboards/lily58/keymaps/mikefightsbears/keymap.c +++ b/keyboards/lily58/keymaps/mikefightsbears/keymap.c | |||
| @@ -156,7 +156,7 @@ const char *read_keylogs(void); | |||
| 156 | // void set_timelog(void); | 156 | // void set_timelog(void); |
| 157 | // const char *read_timelog(void); | 157 | // const char *read_timelog(void); |
| 158 | 158 | ||
| 159 | void oled_task_user(void) { | 159 | bool oled_task_user(void) { |
| 160 | if (is_keyboard_master()) { | 160 | if (is_keyboard_master()) { |
| 161 | // If you want to change the display of OLED, you need to change here | 161 | // If you want to change the display of OLED, you need to change here |
| 162 | oled_write_ln(read_layer_state(), false); | 162 | oled_write_ln(read_layer_state(), false); |
| @@ -168,6 +168,7 @@ void oled_task_user(void) { | |||
| 168 | } else { | 168 | } else { |
| 169 | oled_write(read_logo(), false); | 169 | oled_write(read_logo(), false); |
| 170 | } | 170 | } |
| 171 | return false; | ||
| 171 | } | 172 | } |
| 172 | #endif // OLED_ENABLE | 173 | #endif // OLED_ENABLE |
| 173 | 174 | ||
| @@ -211,4 +212,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 211 | } | 212 | } |
| 212 | return true; | 213 | return true; |
| 213 | } | 214 | } |
| 214 | |||
diff --git a/keyboards/lily58/keymaps/muuko/keymap.c b/keyboards/lily58/keymaps/muuko/keymap.c index 7ec273743..c984202b9 100644 --- a/keyboards/lily58/keymaps/muuko/keymap.c +++ b/keyboards/lily58/keymaps/muuko/keymap.c | |||
| @@ -174,11 +174,12 @@ static void render_anim(void) { | |||
| 174 | } | 174 | } |
| 175 | } | 175 | } |
| 176 | 176 | ||
| 177 | void oled_task_user(void) { | 177 | bool oled_task_user(void) { |
| 178 | if (is_keyboard_master()) { | 178 | if (is_keyboard_master()) { |
| 179 | render_status(); | 179 | render_status(); |
| 180 | } else { | 180 | } else { |
| 181 | render_anim(); | 181 | render_anim(); |
| 182 | } | 182 | } |
| 183 | return false; | ||
| 183 | } | 184 | } |
| 184 | #endif | 185 | #endif |
diff --git a/keyboards/lily58/keymaps/narze/keymap.c b/keyboards/lily58/keymaps/narze/keymap.c index dfb51ae50..7438e7275 100644 --- a/keyboards/lily58/keymaps/narze/keymap.c +++ b/keyboards/lily58/keymaps/narze/keymap.c | |||
| @@ -299,7 +299,7 @@ const char *read_timelog(void); | |||
| 299 | 299 | ||
| 300 | char encoder_debug[24]; | 300 | char encoder_debug[24]; |
| 301 | 301 | ||
| 302 | void oled_task_user(void) { | 302 | bool oled_task_user(void) { |
| 303 | // Host Keyboard Layer Status | 303 | // Host Keyboard Layer Status |
| 304 | if (is_keyboard_master()) { | 304 | if (is_keyboard_master()) { |
| 305 | // If you want to change the display of OLED, you need to change here | 305 | // If you want to change the display of OLED, you need to change here |
| @@ -313,6 +313,7 @@ void oled_task_user(void) { | |||
| 313 | oled_write(read_logo(), false); | 313 | oled_write(read_logo(), false); |
| 314 | // oled_write_ln(encoder_debug, false); | 314 | // oled_write_ln(encoder_debug, false); |
| 315 | } | 315 | } |
| 316 | return false; | ||
| 316 | } | 317 | } |
| 317 | 318 | ||
| 318 | #endif //OLED_ENABLE | 319 | #endif //OLED_ENABLE |
diff --git a/keyboards/lily58/keymaps/via/keymap.c b/keyboards/lily58/keymaps/via/keymap.c index 5cc5dc1e5..4cae26733 100644 --- a/keyboards/lily58/keymaps/via/keymap.c +++ b/keyboards/lily58/keymaps/via/keymap.c | |||
| @@ -186,7 +186,7 @@ const char *read_keylogs(void) { | |||
| 186 | } | 186 | } |
| 187 | //new | 187 | //new |
| 188 | 188 | ||
| 189 | void oled_task_user(void) { | 189 | bool oled_task_user(void) { |
| 190 | if (is_keyboard_master()) { | 190 | if (is_keyboard_master()) { |
| 191 | // Host Keyboard Layer Status | 191 | // Host Keyboard Layer Status |
| 192 | oled_write_P(PSTR("Layer: "), false); | 192 | oled_write_P(PSTR("Layer: "), false); |
| @@ -214,6 +214,7 @@ void oled_task_user(void) { | |||
| 214 | } else { | 214 | } else { |
| 215 | render_logo(); | 215 | render_logo(); |
| 216 | } | 216 | } |
| 217 | return false; | ||
| 217 | } | 218 | } |
| 218 | #endif // OLED_ENABLE | 219 | #endif // OLED_ENABLE |
| 219 | 220 | ||
diff --git a/keyboards/lily58/keymaps/yshrsmz/keymap.c b/keyboards/lily58/keymaps/yshrsmz/keymap.c index da840e585..6b3166323 100644 --- a/keyboards/lily58/keymaps/yshrsmz/keymap.c +++ b/keyboards/lily58/keymaps/yshrsmz/keymap.c | |||
| @@ -158,7 +158,7 @@ const char *read_keylogs(void); | |||
| 158 | // void set_timelog(void); | 158 | // void set_timelog(void); |
| 159 | // const char *read_timelog(void); | 159 | // const char *read_timelog(void); |
| 160 | 160 | ||
| 161 | void oled_task_user(void) { | 161 | bool oled_task_user(void) { |
| 162 | if (is_keyboard_master()) { | 162 | if (is_keyboard_master()) { |
| 163 | // If you want to change the display of OLED, you need to change here | 163 | // If you want to change the display of OLED, you need to change here |
| 164 | oled_write_ln(read_layer_state(), false); | 164 | oled_write_ln(read_layer_state(), false); |
| @@ -170,6 +170,7 @@ void oled_task_user(void) { | |||
| 170 | } else { | 170 | } else { |
| 171 | oled_write(read_logo(), false); | 171 | oled_write(read_logo(), false); |
| 172 | } | 172 | } |
| 173 | return false; | ||
| 173 | } | 174 | } |
| 174 | #endif // OLED_ENABLE | 175 | #endif // OLED_ENABLE |
| 175 | 176 | ||
diff --git a/keyboards/lily58/keymaps/yuchi/keymap.c b/keyboards/lily58/keymaps/yuchi/keymap.c index 02279bb8a..2cab439c3 100644 --- a/keyboards/lily58/keymaps/yuchi/keymap.c +++ b/keyboards/lily58/keymaps/yuchi/keymap.c | |||
| @@ -140,7 +140,7 @@ const char *read_keylogs(void); | |||
| 140 | // void set_timelog(void); | 140 | // void set_timelog(void); |
| 141 | // const char *read_timelog(void); | 141 | // const char *read_timelog(void); |
| 142 | 142 | ||
| 143 | void oled_task_user(void) { | 143 | bool oled_task_user(void) { |
| 144 | if (is_keyboard_master()) { | 144 | if (is_keyboard_master()) { |
| 145 | // If you want to change the display of OLED, you need to change here | 145 | // If you want to change the display of OLED, you need to change here |
| 146 | oled_write_ln(read_layer_state(), false); | 146 | oled_write_ln(read_layer_state(), false); |
| @@ -152,6 +152,7 @@ void oled_task_user(void) { | |||
| 152 | } else { | 152 | } else { |
| 153 | oled_write(read_logo(), false); | 153 | oled_write(read_logo(), false); |
| 154 | } | 154 | } |
| 155 | return false; | ||
| 155 | } | 156 | } |
| 156 | #endif // OLED_ENABLE | 157 | #endif // OLED_ENABLE |
| 157 | 158 | ||
