Merge pull request #98 from marcelmaltry/fix_murphpad

Fix OLED support for `mechwild/murphpad`.
vial-kb · Dec 30, 2021 · 0e5d31c · 0e5d31c
2 parents 3686884 + a098167
commit 0e5d31c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git 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
+#endif
diff --git 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
+COMBOS_ENABLE = no
+TAP_DANCE_ENABLE = no