From 3fa971ca41ff33b59df7efa9fb2ff15d51a9a111 Mon Sep 17 00:00:00 2001 From: a33bis <48868985+a33bis@users.noreply.github.com> Date: Sat, 16 Jul 2022 15:53:02 -0400 Subject: [PATCH] Plain60: Fix conflict between Bootmagic Lite and qmk-dfu (#206) * Workaround for dfu/bootmagic conflict + support for nkro and mouse keys * Changed Bootmagic key to Left Control --- keyboards/evyd13/plain60/keymaps/vial/config.h | 5 +++++ keyboards/evyd13/plain60/keymaps/vial/rules.mk | 3 +++ 2 files changed, 8 insertions(+) diff --git a/keyboards/evyd13/plain60/keymaps/vial/config.h b/keyboards/evyd13/plain60/keymaps/vial/config.h index 78eeef0b94..9b5715b97a 100644 --- a/keyboards/evyd13/plain60/keymaps/vial/config.h +++ b/keyboards/evyd13/plain60/keymaps/vial/config.h @@ -5,3 +5,8 @@ #define VIAL_KEYBOARD_UID {0xED, 0x26, 0xCA, 0x6E, 0xC6, 0x33, 0x93, 0x24} #define VIAL_UNLOCK_COMBO_ROWS {1, 4} #define VIAL_UNLOCK_COMBO_COLS {0, 6} + +/* Moves Bootmagic Lite key from "Esc" to "Left Control" to avoid conflict with qmk-dfu + * See https://docs.qmk.fm/#/flashing?id=qmk-dfu */ +#define BOOTMAGIC_LITE_ROW 4 +#define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/evyd13/plain60/keymaps/vial/rules.mk b/keyboards/evyd13/plain60/keymaps/vial/rules.mk index 46f9f1360f..b2ca78fd49 100644 --- a/keyboards/evyd13/plain60/keymaps/vial/rules.mk +++ b/keyboards/evyd13/plain60/keymaps/vial/rules.mk @@ -1,3 +1,6 @@ VIA_ENABLE = yes VIAL_ENABLE = yes LTO_ENABLE = yes + +MOUSEKEY_ENABLE = yes +NKRO_ENABLE = yes