OLED_ENABLE fix & dynamic key override exclusion (#188)

vial-kb · Jun 27, 2022 · 74a2c9a · 74a2c9a
1 parent 1c12919
commit 74a2c9a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/keyboards/mechwild/mercutio/keymaps/vial/config.h b/keyboards/mechwild/mercutio/keymaps/vial/config.h
@@ -21,4 +21,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define VIAL_KEYBOARD_UID {0xAA, 0xF4, 0xE4, 0x5D, 0xDA, 0x2E, 0x52, 0x2F}
 #define VIAL_UNLOCK_COMBO_ROWS { 1, 5 }
 #define VIAL_UNLOCK_COMBO_COLS { 0, 3 }
-#define VIAL_ENCODER_DEFAULT { KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS }
+#define VIAL_ENCODER_DEFAULT { KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS }
+
+/* Space-saving measures */
+#define LAYER_STATE_8BIT
+#undef LOCKING_SUPPORT_ENABLE
+#undef LOCKING_RESYNC_ENABLE
diff --git a/keyboards/mechwild/mercutio/keymaps/vial/keymap.c b/keyboards/mechwild/mercutio/keymaps/vial/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   	  KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS )
 };
 
-#ifdef OLED_DRIVER_ENABLE
+#ifdef OLED_ENABLE
 oled_rotation_t oled_init_user(oled_rotation_t rotation) {
     return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
 }
@@ -61,7 +61,8 @@ static void render_name(void) {
     oled_write_P(mercutio_name, false);
 }
 
-void oled_task_user(void) {
+bool oled_task_user(void) {
     render_name();
+    return false;
 }
-#endif
+#endif
diff --git a/keyboards/mechwild/mercutio/keymaps/vial/rules.mk b/keyboards/mechwild/mercutio/keymaps/vial/rules.mk
@@ -3,4 +3,5 @@ VIAL_ENABLE = yes
 VIAL_ENCODERS_ENABLE = yes
 
 LTO_ENABLE = yes
-QMK_SETTINGS = no
+KEY_OVERRIDE_ENABLE = no
+MAGIC_ENABLE = no