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/mercutio/keymaps/jonavin/keymap.c | |
| 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/mercutio/keymaps/jonavin/keymap.c')
| -rwxr-xr-x | keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c | 3 |
1 files changed, 2 insertions, 1 deletions
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 |
