From a09816762cf5ee5635fdf77aa44056b5148e778d Mon Sep 17 00:00:00 2001 From: Marcel Maltry Date: Fri, 24 Dec 2021 20:09:00 +0100 Subject: [PATCH] Fix OLED support for mechwild/murphpad. * Disable Combos and Tap Dance to reduce firmware size. --- keyboards/mechwild/murphpad/keymaps/vial/keymap.c | 7 ++++--- keyboards/mechwild/murphpad/keymaps/vial/rules.mk | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/keyboards/mechwild/murphpad/keymaps/vial/keymap.c b/keyboards/mechwild/murphpad/keymaps/vial/keymap.c index 901c7d9ee1..4648d20340 100644 --- a/keyboards/mechwild/murphpad/keymaps/vial/keymap.c +++ b/keyboards/mechwild/murphpad/keymaps/vial/keymap.c @@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; -#ifdef OLED_DRIVER_ENABLE +#ifdef OLED_ENABLE oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_270; // flips the display 270 degrees } @@ -91,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { oled_write_P(logo_4, false); } - void oled_task_user(void) { + bool oled_task_user(void) { render_logo(); oled_set_cursor(0,6); @@ -119,5 +119,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { oled_write_ln_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); oled_write_ln_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); oled_write_ln_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); + return false; } -#endif \ No newline at end of file +#endif diff --git a/keyboards/mechwild/murphpad/keymaps/vial/rules.mk b/keyboards/mechwild/murphpad/keymaps/vial/rules.mk index 7ff71a8ed3..8c4ab8f5ae 100644 --- a/keyboards/mechwild/murphpad/keymaps/vial/rules.mk +++ b/keyboards/mechwild/murphpad/keymaps/vial/rules.mk @@ -1,7 +1,8 @@ VIA_ENABLE = yes +LTO_ENABLE = yes VIAL_ENABLE = yes VIAL_ENCODERS_ENABLE = yes MOUSEKEY_ENABLE = no QMK_SETTINGS = no - -EXTRAFLAGS += -flto \ No newline at end of file +COMBOS_ENABLE = no +TAP_DANCE_ENABLE = no