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/mechwild | |
| 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/mechwild')
8 files changed, 18 insertions, 9 deletions
diff --git a/keyboards/mechwild/mercutio/keymaps/bongocat/keymap.c b/keyboards/mechwild/mercutio/keymaps/bongocat/keymap.c index b09489876..6062b8c73 100644 --- a/keyboards/mechwild/mercutio/keymaps/bongocat/keymap.c +++ b/keyboards/mechwild/mercutio/keymaps/bongocat/keymap.c | |||
| @@ -187,12 +187,13 @@ static void render_anim(void) { | |||
| 187 | } | 187 | } |
| 188 | } | 188 | } |
| 189 | 189 | ||
| 190 | void oled_task_user(void) { | 190 | bool oled_task_user(void) { |
| 191 | render_anim(); | 191 | render_anim(); |
| 192 | oled_set_cursor(0,4); | 192 | oled_set_cursor(0,4); |
| 193 | sprintf(wpm_str, "WPM: %03d", get_current_wpm()); | 193 | sprintf(wpm_str, "WPM: %03d", get_current_wpm()); |
| 194 | oled_write(wpm_str, false); | 194 | oled_write(wpm_str, false); |
| 195 | 195 | ||
| 196 | return false; | ||
| 196 | } | 197 | } |
| 197 | 198 | ||
| 198 | #endif | 199 | #endif |
diff --git a/keyboards/mechwild/mercutio/keymaps/default/keymap.c b/keyboards/mechwild/mercutio/keymaps/default/keymap.c index a08150505..8f433292b 100644 --- a/keyboards/mechwild/mercutio/keymaps/default/keymap.c +++ b/keyboards/mechwild/mercutio/keymaps/default/keymap.c | |||
| @@ -76,7 +76,8 @@ static void render_name(void) { | |||
| 76 | oled_write_P(mercutio_name, false); | 76 | oled_write_P(mercutio_name, false); |
| 77 | } | 77 | } |
| 78 | 78 | ||
| 79 | void oled_task_user(void) { | 79 | bool oled_task_user(void) { |
| 80 | render_name(); | 80 | render_name(); |
| 81 | return false; | ||
| 81 | } | 82 | } |
| 82 | #endif | 83 | #endif |
diff --git a/keyboards/mechwild/mercutio/keymaps/fancy/keymap.c b/keyboards/mechwild/mercutio/keymaps/fancy/keymap.c index cb0a6173f..96457be6d 100755 --- a/keyboards/mechwild/mercutio/keymaps/fancy/keymap.c +++ b/keyboards/mechwild/mercutio/keymaps/fancy/keymap.c | |||
| @@ -107,7 +107,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 107 | oled_write_P(logo_4, false); | 107 | oled_write_P(logo_4, false); |
| 108 | } | 108 | } |
| 109 | 109 | ||
| 110 | void oled_task_user(void) { | 110 | bool oled_task_user(void) { |
| 111 | 111 | ||
| 112 | if ( IS_HOST_LED_OFF(USB_LED_NUM_LOCK) && IS_HOST_LED_OFF(USB_LED_CAPS_LOCK) && selected_layer == 0 && get_highest_layer(layer_state) == 0 ) { | 112 | if ( IS_HOST_LED_OFF(USB_LED_NUM_LOCK) && IS_HOST_LED_OFF(USB_LED_CAPS_LOCK) && selected_layer == 0 && get_highest_layer(layer_state) == 0 ) { |
| 113 | render_name(); | 113 | render_name(); |
| @@ -164,5 +164,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 164 | oled_write_P(led_state.num_lock ? PSTR("NLCK ") : PSTR(" "), false); | 164 | oled_write_P(led_state.num_lock ? PSTR("NLCK ") : PSTR(" "), false); |
| 165 | oled_write_P(led_state.caps_lock ? PSTR("CAPS ") : PSTR(" "), false); | 165 | oled_write_P(led_state.caps_lock ? PSTR("CAPS ") : PSTR(" "), false); |
| 166 | } | 166 | } |
| 167 | return false; | ||
| 167 | } | 168 | } |
| 168 | #endif | 169 | #endif |
diff --git a/keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c b/keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c index 22d26db3c..869a9f73a 100755 --- a/keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c +++ b/keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c | |||
| @@ -188,7 +188,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { | |||
| 188 | oled_write_P(logo_4, false); | 188 | oled_write_P(logo_4, false); |
| 189 | } | 189 | } |
| 190 | 190 | ||
| 191 | void oled_task_user(void) { | 191 | bool oled_task_user(void) { |
| 192 | 192 | ||
| 193 | if ( IS_HOST_LED_OFF(USB_LED_NUM_LOCK) && IS_HOST_LED_OFF(USB_LED_CAPS_LOCK) && get_selected_layer() == 0 && get_highest_layer(layer_state) == 0 ) { | 193 | if ( IS_HOST_LED_OFF(USB_LED_NUM_LOCK) && IS_HOST_LED_OFF(USB_LED_CAPS_LOCK) && get_selected_layer() == 0 && get_highest_layer(layer_state) == 0 ) { |
| 194 | render_name(); | 194 | render_name(); |
| @@ -263,6 +263,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { | |||
| 263 | 263 | ||
| 264 | } | 264 | } |
| 265 | 265 | ||
| 266 | return false; | ||
| 266 | } | 267 | } |
| 267 | 268 | ||
| 268 | void suspend_power_down_user(void) { // shutdown oled when powered down to prevent OLED from showing Mercutio all the time | 269 | void suspend_power_down_user(void) { // shutdown oled when powered down to prevent OLED from showing Mercutio all the time |
diff --git a/keyboards/mechwild/mercutio/keymaps/via/keymap.c b/keyboards/mechwild/mercutio/keymaps/via/keymap.c index a08150505..8f433292b 100755 --- a/keyboards/mechwild/mercutio/keymaps/via/keymap.c +++ b/keyboards/mechwild/mercutio/keymaps/via/keymap.c | |||
| @@ -76,7 +76,8 @@ static void render_name(void) { | |||
| 76 | oled_write_P(mercutio_name, false); | 76 | oled_write_P(mercutio_name, false); |
| 77 | } | 77 | } |
| 78 | 78 | ||
| 79 | void oled_task_user(void) { | 79 | bool oled_task_user(void) { |
| 80 | render_name(); | 80 | render_name(); |
| 81 | return false; | ||
| 81 | } | 82 | } |
| 82 | #endif | 83 | #endif |
diff --git a/keyboards/mechwild/murphpad/keymaps/default/keymap.c b/keyboards/mechwild/murphpad/keymaps/default/keymap.c index a30bf6bfa..fe46e8ce5 100644 --- a/keyboards/mechwild/murphpad/keymaps/default/keymap.c +++ b/keyboards/mechwild/murphpad/keymaps/default/keymap.c | |||
| @@ -115,7 +115,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) { | |||
| 115 | oled_write_P(logo_4, false); | 115 | oled_write_P(logo_4, false); |
| 116 | } | 116 | } |
| 117 | 117 | ||
| 118 | void oled_task_user(void) { | 118 | bool oled_task_user(void) { |
| 119 | render_logo(); | 119 | render_logo(); |
| 120 | oled_set_cursor(0,6); | 120 | oled_set_cursor(0,6); |
| 121 | 121 | ||
| @@ -143,5 +143,6 @@ bool encoder_update_user(uint8_t index, bool clockwise) { | |||
| 143 | oled_write_ln_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); | 143 | oled_write_ln_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); |
| 144 | oled_write_ln_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); | 144 | oled_write_ln_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); |
| 145 | oled_write_ln_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); | 145 | oled_write_ln_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); |
| 146 | return false; | ||
| 146 | } | 147 | } |
| 147 | #endif | 148 | #endif |
diff --git a/keyboards/mechwild/murphpad/keymaps/jonavin/keymap.c b/keyboards/mechwild/murphpad/keymaps/jonavin/keymap.c index dc03e334b..043eeb992 100644 --- a/keyboards/mechwild/murphpad/keymaps/jonavin/keymap.c +++ b/keyboards/mechwild/murphpad/keymaps/jonavin/keymap.c | |||
| @@ -296,7 +296,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { | |||
| 296 | } | 296 | } |
| 297 | 297 | ||
| 298 | #ifdef LANDSCAPE_MODE | 298 | #ifdef LANDSCAPE_MODE |
| 299 | void oled_task_user(void) { | 299 | bool oled_task_user(void) { |
| 300 | 300 | ||
| 301 | render_logo(); | 301 | render_logo(); |
| 302 | oled_set_cursor(8,2); | 302 | oled_set_cursor(8,2); |
| @@ -359,6 +359,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { | |||
| 359 | oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); | 359 | oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); |
| 360 | oled_write_P(led_state.caps_lock ? PSTR("CAPS ") : PSTR(" "), false); | 360 | oled_write_P(led_state.caps_lock ? PSTR("CAPS ") : PSTR(" "), false); |
| 361 | oled_write_P(led_state.scroll_lock ? PSTR("SCR") : PSTR(" "), false); | 361 | oled_write_P(led_state.scroll_lock ? PSTR("SCR") : PSTR(" "), false); |
| 362 | return false; | ||
| 362 | } | 363 | } |
| 363 | #endif // LANDSCAPE_MODE | 364 | #endif // LANDSCAPE_MODE |
| 364 | 365 | ||
| @@ -368,7 +369,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { | |||
| 368 | return OLED_ROTATION_270; // flips the display 270 degrees | 369 | return OLED_ROTATION_270; // flips the display 270 degrees |
| 369 | } | 370 | } |
| 370 | 371 | ||
| 371 | void oled_task_user(void) { | 372 | bool oled_task_user(void) { |
| 372 | render_logo(); | 373 | render_logo(); |
| 373 | oled_set_cursor(0,5); | 374 | oled_set_cursor(0,5); |
| 374 | 375 | ||
| @@ -408,6 +409,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { | |||
| 408 | oled_write_ln_P(led_state.num_lock ? PSTR(" NUM") : PSTR(" "), false); | 409 | oled_write_ln_P(led_state.num_lock ? PSTR(" NUM") : PSTR(" "), false); |
| 409 | oled_write_ln_P(led_state.caps_lock ? PSTR(" CAP") : PSTR(" "), false); | 410 | oled_write_ln_P(led_state.caps_lock ? PSTR(" CAP") : PSTR(" "), false); |
| 410 | oled_write_ln_P(led_state.scroll_lock ? PSTR(" SCR") : PSTR(" "), false); | 411 | oled_write_ln_P(led_state.scroll_lock ? PSTR(" SCR") : PSTR(" "), false); |
| 412 | return false; | ||
| 411 | } | 413 | } |
| 412 | #endif // !LANDSCAPE_MODE | 414 | #endif // !LANDSCAPE_MODE |
| 413 | 415 | ||
diff --git a/keyboards/mechwild/murphpad/keymaps/via/keymap.c b/keyboards/mechwild/murphpad/keymaps/via/keymap.c index 17e4699a9..4f4f6d571 100644 --- a/keyboards/mechwild/murphpad/keymaps/via/keymap.c +++ b/keyboards/mechwild/murphpad/keymaps/via/keymap.c | |||
| @@ -113,7 +113,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) { | |||
| 113 | oled_write_P(logo_4, false); | 113 | oled_write_P(logo_4, false); |
| 114 | } | 114 | } |
| 115 | 115 | ||
| 116 | void oled_task_user(void) { | 116 | bool oled_task_user(void) { |
| 117 | render_logo(); | 117 | render_logo(); |
| 118 | oled_set_cursor(0,6); | 118 | oled_set_cursor(0,6); |
| 119 | 119 | ||
| @@ -141,5 +141,6 @@ bool encoder_update_user(uint8_t index, bool clockwise) { | |||
| 141 | oled_write_ln_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); | 141 | oled_write_ln_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); |
| 142 | oled_write_ln_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); | 142 | oled_write_ln_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); |
| 143 | oled_write_ln_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); | 143 | oled_write_ln_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); |
| 144 | return false; | ||
| 144 | } | 145 | } |
| 145 | #endif | 146 | #endif |
