diff options
Diffstat (limited to 'keyboards')
109 files changed, 217 insertions, 225 deletions
diff --git a/keyboards/0xcb/1337/config.h b/keyboards/0xcb/1337/config.h index 10f946592f..5b576cc0c5 100644 --- a/keyboards/0xcb/1337/config.h +++ b/keyboards/0xcb/1337/config.h @@ -62,6 +62,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define OLED_DISPLAY_128X64 #define OLED_FONT_END 255 #define OLED_FONT_H "gfxfont.c" - -/* QMK DFU */ -#define QMK_LED B0 diff --git a/keyboards/0xcb/1337/info.json b/keyboards/0xcb/1337/info.json index fb4480e1b0..d37fc515f7 100644 --- a/keyboards/0xcb/1337/info.json +++ b/keyboards/0xcb/1337/info.json @@ -8,6 +8,9 @@ "pid": "0x1337", "device_version": "0.0.1" }, + "qmk_lufa_bootloader": { + "led": "B0" + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "matrix_pins": { diff --git a/keyboards/4pplet/aekiso60/rev_a/config.h b/keyboards/4pplet/aekiso60/rev_a/config.h index da29046991..f7ef22d986 100644 --- a/keyboards/4pplet/aekiso60/rev_a/config.h +++ b/keyboards/4pplet/aekiso60/rev_a/config.h @@ -8,9 +8,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define QMK_ESC_OUTPUT C4 // usually COL -#define QMK_ESC_INPUT C2 // usually ROW - #define RGB_DI_PIN D3 #define RGBLED_NUM 12 diff --git a/keyboards/4pplet/aekiso60/rev_a/info.json b/keyboards/4pplet/aekiso60/rev_a/info.json index e43265fcdd..9932b6ec55 100644 --- a/keyboards/4pplet/aekiso60/rev_a/info.json +++ b/keyboards/4pplet/aekiso60/rev_a/info.json @@ -8,6 +8,10 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "qmk_lufa_bootloader": { + "esc_input": "C2", + "esc_output": "C4" + }, "processor": "atmega32u2", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/4pplet/aekiso60/rev_b/config.h b/keyboards/4pplet/aekiso60/rev_b/config.h index 1162b4acd1..b5602b1cc0 100644 --- a/keyboards/4pplet/aekiso60/rev_b/config.h +++ b/keyboards/4pplet/aekiso60/rev_b/config.h @@ -25,9 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define QMK_ESC_OUTPUT A3 // usually COL -#define QMK_ESC_INPUT B14 // usually ROW - #define RGBLED_NUM 12 #define WS2812_EXTERNAL_PULLUP #define RGB_DI_PIN A8 diff --git a/keyboards/4pplet/bootleg/rev_a/config.h b/keyboards/4pplet/bootleg/rev_a/config.h index 5ce36a22bd..b1743d0982 100644 --- a/keyboards/4pplet/bootleg/rev_a/config.h +++ b/keyboards/4pplet/bootleg/rev_a/config.h @@ -23,6 +23,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW - -#define QMK_ESC_OUTPUT C4 // usually COL -#define QMK_ESC_INPUT D0 // usually ROW diff --git a/keyboards/4pplet/bootleg/rev_a/info.json b/keyboards/4pplet/bootleg/rev_a/info.json index 5654de5fa9..8f3b5eb2bf 100644 --- a/keyboards/4pplet/bootleg/rev_a/info.json +++ b/keyboards/4pplet/bootleg/rev_a/info.json @@ -8,6 +8,10 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "qmk_lufa_bootloader": { + "esc_input": "D0", + "esc_output": "C4" + }, "processor": "atmega32u2", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/4pplet/steezy60/rev_a/config.h b/keyboards/4pplet/steezy60/rev_a/config.h index 9b3480fe8f..f7ef22d986 100644 --- a/keyboards/4pplet/steezy60/rev_a/config.h +++ b/keyboards/4pplet/steezy60/rev_a/config.h @@ -8,9 +8,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define QMK_ESC_OUTPUT C4 // usually COL -#define QMK_ESC_INPUT C2 // usually ROW - #define RGB_DI_PIN D3 #define RGBLED_NUM 12 diff --git a/keyboards/4pplet/steezy60/rev_a/info.json b/keyboards/4pplet/steezy60/rev_a/info.json index d2c271ba63..b6e9c37ba2 100644 --- a/keyboards/4pplet/steezy60/rev_a/info.json +++ b/keyboards/4pplet/steezy60/rev_a/info.json @@ -8,6 +8,10 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "qmk_lufa_bootloader": { + "esc_input": "C2", + "esc_output": "C4" + }, "processor": "atmega32u2", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/4pplet/waffling60/rev_a/config.h b/keyboards/4pplet/waffling60/rev_a/config.h index 302d40911e..670c8132a1 100644 --- a/keyboards/4pplet/waffling60/rev_a/config.h +++ b/keyboards/4pplet/waffling60/rev_a/config.h @@ -24,6 +24,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW - -#define QMK_ESC_OUTPUT D3 // usually COL -#define QMK_ESC_INPUT D4 // usually ROW diff --git a/keyboards/4pplet/waffling60/rev_a/info.json b/keyboards/4pplet/waffling60/rev_a/info.json index 872b9a8116..0b98be4876 100644 --- a/keyboards/4pplet/waffling60/rev_a/info.json +++ b/keyboards/4pplet/waffling60/rev_a/info.json @@ -8,6 +8,10 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "qmk_lufa_bootloader": { + "esc_input": "D4", + "esc_output": "D3" + }, "processor": "atmega32u2", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/4pplet/waffling60/rev_b/config.h b/keyboards/4pplet/waffling60/rev_b/config.h index 8f56bc1327..7c1e13ce84 100644 --- a/keyboards/4pplet/waffling60/rev_b/config.h +++ b/keyboards/4pplet/waffling60/rev_b/config.h @@ -25,9 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define QMK_ESC_OUTPUT C2 // usually COL -#define QMK_ESC_INPUT C4 // usually ROW - #define RGB_DI_PIN D3 #define RGBLED_NUM 1 diff --git a/keyboards/4pplet/waffling60/rev_b/info.json b/keyboards/4pplet/waffling60/rev_b/info.json index 4a1cf0180c..866ae5c1ac 100644 --- a/keyboards/4pplet/waffling60/rev_b/info.json +++ b/keyboards/4pplet/waffling60/rev_b/info.json @@ -8,6 +8,10 @@ "pid": "0x0005", "device_version": "0.0.2" }, + "qmk_lufa_bootloader": { + "esc_input": "C4", + "esc_output": "C2" + }, "processor": "atmega32u2", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/4pplet/waffling60/rev_c/config.h b/keyboards/4pplet/waffling60/rev_c/config.h index 015532bb8c..689a515013 100644 --- a/keyboards/4pplet/waffling60/rev_c/config.h +++ b/keyboards/4pplet/waffling60/rev_c/config.h @@ -25,9 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define QMK_ESC_OUTPUT C2 // usually COL -#define QMK_ESC_INPUT C4 // usually ROW - #define RGB_DI_PIN D3 #define RGBLED_NUM 1 diff --git a/keyboards/4pplet/waffling60/rev_c/info.json b/keyboards/4pplet/waffling60/rev_c/info.json index 20e4445b2a..1a6937b096 100644 --- a/keyboards/4pplet/waffling60/rev_c/info.json +++ b/keyboards/4pplet/waffling60/rev_c/info.json @@ -8,6 +8,10 @@ "pid": "0x0008", "device_version": "0.0.3" }, + "qmk_lufa_bootloader": { + "esc_input": "C4", + "esc_output": "C2" + }, "processor": "atmega32u2", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/4pplet/waffling60/rev_d/config.h b/keyboards/4pplet/waffling60/rev_d/config.h index a1f5ac032d..05e66f6a79 100644 --- a/keyboards/4pplet/waffling60/rev_d/config.h +++ b/keyboards/4pplet/waffling60/rev_d/config.h @@ -25,9 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define QMK_ESC_OUTPUT B2 // usually COL -#define QMK_ESC_INPUT B14 // usually ROW - #define RGBLED_NUM 1 #define WS2812_EXTERNAL_PULLUP #define RGB_DI_PIN A8 diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/config.h b/keyboards/4pplet/waffling60/rev_d_ansi/config.h index 255ba2f2d5..beb204bb2d 100644 --- a/keyboards/4pplet/waffling60/rev_d_ansi/config.h +++ b/keyboards/4pplet/waffling60/rev_d_ansi/config.h @@ -24,6 +24,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW - -#define QMK_ESC_OUTPUT B2 // usually COL -#define QMK_ESC_INPUT B14 // usually ROW diff --git a/keyboards/4pplet/waffling60/rev_d_iso/config.h b/keyboards/4pplet/waffling60/rev_d_iso/config.h index 06c34408f3..cb2e06921a 100644 --- a/keyboards/4pplet/waffling60/rev_d_iso/config.h +++ b/keyboards/4pplet/waffling60/rev_d_iso/config.h @@ -24,6 +24,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW - -#define QMK_ESC_OUTPUT B2 // usually COL -#define QMK_ESC_INPUT B14 // usually ROW diff --git a/keyboards/4pplet/waffling80/rev_a/config.h b/keyboards/4pplet/waffling80/rev_a/config.h index cc729dc505..8b3dc47247 100644 --- a/keyboards/4pplet/waffling80/rev_a/config.h +++ b/keyboards/4pplet/waffling80/rev_a/config.h @@ -24,9 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define QMK_ESC_OUTPUT C6 // usually COL -#define QMK_ESC_INPUT C4 // usually ROW - #define RGB_DI_PIN D7 #define RGBLED_NUM 2 diff --git a/keyboards/4pplet/waffling80/rev_a/info.json b/keyboards/4pplet/waffling80/rev_a/info.json index 1f334dcb63..13bffb7384 100644 --- a/keyboards/4pplet/waffling80/rev_a/info.json +++ b/keyboards/4pplet/waffling80/rev_a/info.json @@ -8,6 +8,10 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "qmk_lufa_bootloader": { + "esc_input": "C4", + "esc_output": "C6" + }, "processor": "atmega32u2", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/4pplet/waffling80/rev_b/config.h b/keyboards/4pplet/waffling80/rev_b/config.h index c065fac544..c863208012 100644 --- a/keyboards/4pplet/waffling80/rev_b/config.h +++ b/keyboards/4pplet/waffling80/rev_b/config.h @@ -24,9 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define QMK_ESC_OUTPUT B2 // usually COL -#define QMK_ESC_INPUT B13 // usually ROW - #define RGBLED_NUM 2 #define WS2812_EXTERNAL_PULLUP #define RGB_DI_PIN A8 diff --git a/keyboards/adm42/rev4/config.h b/keyboards/adm42/rev4/config.h index c03603b011..fa2bcb3e43 100644 --- a/keyboards/adm42/rev4/config.h +++ b/keyboards/adm42/rev4/config.h @@ -19,7 +19,7 @@ #define MATRIX_COL_PINS { C6, B6, B5, B4, D7, D6, F0, F1, F4, F5, F6, F7 } #define MATRIX_ROW_PINS { C7, D5, D3, D2 } -#define QMK_LED E6 +#define ADM42_LED E6 #define RGB_DI_PIN B7 diff --git a/keyboards/adm42/rev4/keymaps/default/keymap.c b/keyboards/adm42/rev4/keymaps/default/keymap.c index d066445025..12e4e85a4a 100644 --- a/keyboards/adm42/rev4/keymaps/default/keymap.c +++ b/keyboards/adm42/rev4/keymaps/default/keymap.c @@ -174,7 +174,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { case REFLASH: eeconfig_init(); eeconfig_update_rgb_matrix_default(); - writePinLow(QMK_LED); + writePinLow(ADM42_LED); reset_keyboard(); return false; @@ -184,21 +184,21 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } void keyboard_pre_init_kb(void) { - setPinOutput(QMK_LED); - writePinHigh(QMK_LED); + setPinOutput(ADM42_LED); + writePinHigh(ADM42_LED); } void keyboard_post_init_kb(void) { debug_enable = true; debug_matrix = false; debug_keyboard = false; - writePinHigh(QMK_LED); + writePinHigh(ADM42_LED); } void suspend_power_down_kb(void) { - writePinLow(QMK_LED); + writePinLow(ADM42_LED); } void suspend_wakeup_init_kb(void) { - writePinHigh(QMK_LED); + writePinHigh(ADM42_LED); } diff --git a/keyboards/aves65/config.h b/keyboards/aves65/config.h index 015bb55e51..9037aa13f4 100644 --- a/keyboards/aves65/config.h +++ b/keyboards/aves65/config.h @@ -45,6 +45,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE #define RGBLED_NUM 9 - -#define QMK_ESC_OUTPUT D0 // usually COL -#define QMK_ESC_INPUT D4 // usually ROW diff --git a/keyboards/aves65/info.json b/keyboards/aves65/info.json index 5938e1b07d..8984465f07 100644 --- a/keyboards/aves65/info.json +++ b/keyboards/aves65/info.json @@ -8,6 +8,10 @@ "pid": "0x9038", "device_version": "0.0.1" }, + "qmk_lufa_bootloader": { + "esc_input": "D4", + "esc_output": "D0" + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "community_layouts": ["65_ansi", "65_ansi_split_bs", "65_ansi_blocker", "65_ansi_blocker_split_bs", "65_iso", "65_iso_blocker", "65_iso_blocker_split_bs"], diff --git a/keyboards/compound/config.h b/keyboards/compound/config.h index 1024eb01f3..f2824f9630 100644 --- a/keyboards/compound/config.h +++ b/keyboards/compound/config.h @@ -25,6 +25,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW - -#define QMK_ESC_OUTPUT B3 // usually COL -#define QMK_ESC_INPUT F0 // usually ROW diff --git a/keyboards/e88/config.h b/keyboards/e88/config.h index 832ac7b1d4..3b5d16a588 100644 --- a/keyboards/e88/config.h +++ b/keyboards/e88/config.h @@ -54,6 +54,3 @@ //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT - -#define QMK_ESC_OUTPUT F0 // usually COL -#define QMK_ESC_INPUT B7 // usually ROW diff --git a/keyboards/e88/info.json b/keyboards/e88/info.json index 0c1e212654..67b4044a56 100644 --- a/keyboards/e88/info.json +++ b/keyboards/e88/info.json @@ -8,6 +8,10 @@ "pid": "0x0187", "device_version": "0.0.1" }, + "qmk_lufa_bootloader": { + "esc_input": "B7", + "esc_output": "F0" + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "layouts": { diff --git a/keyboards/evyd13/atom47/rev2/config.h b/keyboards/evyd13/atom47/rev2/config.h index 8ee6bc985c..b057bbdae6 100644 --- a/keyboards/evyd13/atom47/rev2/config.h +++ b/keyboards/evyd13/atom47/rev2/config.h @@ -40,7 +40,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGB_DI_PIN D0 // The pin the LED strip is connected to #define RGBLED_NUM 1 // Number of LEDs in your strip - -#define QMK_ESC_OUTPUT D7 // usually COL -#define QMK_ESC_INPUT B7 // usually ROW -#define QMK_LED B6 diff --git a/keyboards/evyd13/atom47/rev2/info.json b/keyboards/evyd13/atom47/rev2/info.json index 2083187e07..660d92a9a2 100644 --- a/keyboards/evyd13/atom47/rev2/info.json +++ b/keyboards/evyd13/atom47/rev2/info.json @@ -8,6 +8,11 @@ "pid": "0x8E66", "device_version": "0.0.1" }, + "qmk_lufa_bootloader": { + "esc_input": "B7", + "esc_output": "D7", + "led": "B6" + }, "indicators": { "caps_lock": "F5" }, diff --git a/keyboards/evyd13/atom47/rev3/config.h b/keyboards/evyd13/atom47/rev3/config.h index 3acdb6280b..f7cdbe79ba 100644 --- a/keyboards/evyd13/atom47/rev3/config.h +++ b/keyboards/evyd13/atom47/rev3/config.h @@ -45,6 +45,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define QMK_ESC_OUTPUT B7 // usually COL -#define QMK_ESC_INPUT B0 // usually ROW -#define QMK_LED E6 diff --git a/keyboards/evyd13/atom47/rev3/info.json b/keyboards/evyd13/atom47/rev3/info.json index ee044a58e7..a6bcc95458 100644 --- a/keyboards/evyd13/atom47/rev3/info.json +++ b/keyboards/evyd13/atom47/rev3/info.json @@ -8,6 +8,11 @@ "pid": "0x0E6D", "device_version": "0.0.1" }, + "qmk_lufa_bootloader": { + "esc_input": "B0", + "esc_output": "B7", + "led": "E6" + }, "indicators": { "caps_lock": "E6", "on_state": 0 diff --git a/keyboards/evyd13/atom47/rev4/config.h b/keyboards/evyd13/atom47/rev4/config.h index 3caf43adb7..3cd6d65e1a 100644 --- a/keyboards/evyd13/atom47/rev4/config.h +++ b/keyboards/evyd13/atom47/rev4/config.h @@ -28,10 +28,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW - -/* Backlight configuration - */ - -#define QMK_ESC_OUTPUT C4 // usually COL -#define QMK_ESC_INPUT C6 // usually ROW -#define QMK_LED D1 diff --git a/keyboards/evyd13/atom47/rev4/info.json b/keyboards/evyd13/atom47/rev4/info.json index 3c64f506a0..b89255f90a 100644 --- a/keyboards/evyd13/atom47/rev4/info.json +++ b/keyboards/evyd13/atom47/rev4/info.json @@ -8,6 +8,11 @@ "pid": "0x8446", "device_version": "0.0.1" }, + "qmk_lufa_bootloader": { + "esc_input": "C6", + "esc_output": "C4", + "led": "D1" + }, "indicators": { "caps_lock": "D1", "on_state": 0 diff --git a/keyboards/evyd13/eon40/config.h b/keyboards/evyd13/eon40/config.h index 8baf97b88f..ca86bd78bc 100644 --- a/keyboards/evyd13/eon40/config.h +++ b/keyboards/evyd13/eon40/config.h @@ -56,6 +56,3 @@ //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT - -#define QMK_ESC_OUTPUT F0 // usually COL -#define QMK_ESC_INPUT B7 // usually ROW diff --git a/keyboards/evyd13/eon40/info.json b/keyboards/evyd13/eon40/info.json index 350fa019dd..66bcb280ce 100644 --- a/keyboards/evyd13/eon40/info.json +++ b/keyboards/evyd13/eon40/info.json @@ -8,6 +8,10 @@ "pid": "0x0140", "device_version": "0.0.1" }, + "qmk_lufa_bootloader": { + "esc_input": "B7", + "esc_output": "F0" + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "community_layouts": ["ortho_4x12", "planck_mit"], diff --git a/keyboards/evyd13/minitomic/config.h b/keyboards/evyd13/minitomic/config.h index d96d4574e0..6e5b26d022 100644 --- a/keyboards/evyd13/minitomic/config.h +++ b/keyboards/evyd13/minitomic/config.h @@ -53,7 +53,3 @@ //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT - -#define QMK_ESC_OUTPUT C6 // usually COL -#define QMK_ESC_INPUT B1 // usually ROW -#define QMK_LED C7 diff --git a/keyboards/evyd13/minitomic/info.json b/keyboards/evyd13/minitomic/info.json index f1f9d20f8b..1a58aa135f 100644 --- a/keyboards/evyd13/minitomic/info.json +++ b/keyboards/evyd13/minitomic/info.json @@ -8,6 +8,11 @@ "pid": "0x0145", "device_version": "0.0.1" }, + "qmk_lufa_bootloader": { + "esc_input": "B1", + "esc_output": "C6", + "led": "C7" + }, "indicators": { "caps_lock": "C7", "on_state": 0 diff --git a/keyboards/evyd13/mx5160/config.h b/keyboards/evyd13/mx5160/config.h index 45e5500bfa..408d12cb69 100644 --- a/keyboards/evyd13/mx5160/config.h +++ b/keyboards/evyd13/mx5160/config.h @@ -33,11 +33,6 @@ /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION ROW2COL -// For QMK DFU -#define QMK_ESC_OUTPUT C6 -#define QMK_ESC_INPUT D1 -#define QMK_LED B1 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/evyd13/mx5160/info.json b/keyboards/evyd13/mx5160/info.json index c554429556..4436aefb8f 100644 --- a/keyboards/evyd13/mx5160/info.json +++ b/keyboards/evyd13/mx5160/info.json @@ -8,6 +8,11 @@ "pid": "0x5160", "device_version": "0.0.1" }, + "qmk_lufa_bootloader": { + "esc_input": "D1", + "esc_output": "C6", + "led": "B1" + }, "indicators": { "caps_lock": "B1", "num_lock": "B2", diff --git a/keyboards/evyd13/nt660/config.h b/keyboards/evyd13/nt660/config.h index f0b3c5653f..4993142773 100644 --- a/keyboards/evyd13/nt660/config.h +++ b/keyboards/evyd13/nt660/config.h @@ -54,7 +54,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT - -#define QMK_ESC_OUTPUT D6 // usually COL -#define QMK_ESC_INPUT B7 // usually ROW -#define QMK_LED D0 diff --git a/keyboards/evyd13/nt660/info.json b/keyboards/evyd13/nt660/info.json index 9953112fda..ba2503c5ef 100644 --- a/keyboards/evyd13/nt660/info.json +++ b/keyboards/evyd13/nt660/info.json @@ -8,6 +8,11 @@ "pid": "0x1F02", "device_version": "0.0.1" }, + "qmk_lufa_bootloader": { + "esc_input": "B7", + "esc_output": "D6", + "led": "D0" + }, "indicators": { "caps_lock": "D0" }, diff --git a/keyboards/evyd13/plain60/config.h b/keyboards/evyd13/plain60/config.h index a952eb50ab..d3c3722e9e 100644 --- a/keyboards/evyd13/plain60/config.h +++ b/keyboards/evyd13/plain60/config.h @@ -25,6 +25,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW - -#define QMK_ESC_OUTPUT D2 // usually COL -#define QMK_ESC_INPUT B4 // usually ROW diff --git a/keyboards/evyd13/plain60/info.json b/keyboards/evyd13/plain60/info.json index 5a03e1a91c..d6a930e9ea 100644 --- a/keyboards/evyd13/plain60/info.json +++ b/keyboards/evyd13/plain60/info.json @@ -8,6 +8,10 @@ "pid": "0x0160", "device_version": "0.0.1" }, + "qmk_lufa_bootloader": { + "esc_input": "B4", + "esc_output": "D2" + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_hhkb", "60_iso", "60_tsangan_hhkb"], diff --git a/keyboards/evyd13/ta65/config.h b/keyboards/evyd13/ta65/config.h index 12717bcde4..6bea2c459c 100644 --- a/keyboards/evyd13/ta65/config.h +++ b/keyboards/evyd13/ta65/config.h @@ -51,7 +51,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE #define RGBLED_NUM 8 - -#define QMK_ESC_OUTPUT D2 // usually COL -#define QMK_ESC_INPUT B4 // usually ROW -#define QMK_LED E6 diff --git a/keyboards/evyd13/ta65/info.json b/keyboards/evyd13/ta65/info.json index 34030c32c5..4c52181f67 100644 --- a/keyboards/evyd13/ta65/info.json +++ b/keyboards/evyd13/ta65/info.json @@ -8,6 +8,11 @@ "pid": "0x7465", "device_version": "0.0.1" }, + "qmk_lufa_bootloader": { + "esc_input": "B4", + "esc_output": "D2", + "led": "E6" + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "community_layouts": ["65_ansi", "65_iso"], diff --git a/keyboards/evyd13/wasdat_code/config.h b/keyboards/evyd13/wasdat_code/config.h index 818147e5b0..98acf00d75 100644 --- a/keyboards/evyd13/wasdat_code/config.h +++ b/keyboards/evyd13/wasdat_code/config.h @@ -38,11 +38,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define SN74X138_ADDRESS_PINS { D2, D1, D0 } #define SN74X138_E3_PIN D4 -// For QMK DFU -#define QMK_ESC_OUTPUT E6 -#define QMK_ESC_INPUT F0 -#define QMK_LED B1 - #define BACKLIGHT_PIN B7 #define BACKLIGHT_BREATHING #define BACKLIGHT_LEVELS 5 diff --git a/keyboards/evyd13/wasdat_code/info.json b/keyboards/evyd13/wasdat_code/info.json index d0a0af9b81..94ab350e9c 100644 --- a/keyboards/evyd13/wasdat_code/info.json +++ b/keyboards/evyd13/wasdat_code/info.json @@ -8,6 +8,11 @@ "pid": "0xB00E", "device_version": "0.0.1" }, + "qmk_lufa_bootloader": { + "esc_input": "F0", + "esc_output": "E6", + "led": "B1" + }, "indicators": { "caps_lock": "B1", "num_lock": "B3", diff --git a/keyboards/evyd13/wonderland/config.h b/keyboards/evyd13/wonderland/config.h index 56a907817e..8d41a6a924 100644 --- a/keyboards/evyd13/wonderland/config.h +++ b/keyboards/evyd13/wonderland/config.h @@ -41,7 +41,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE #define RGBLED_NUM 12 - -#define QMK_ESC_OUTPUT F0 // usually COL -#define QMK_ESC_INPUT B0 // usually ROW -#define QMK_LED B1 diff --git a/keyboards/evyd13/wonderland/info.json b/keyboards/evyd13/wonderland/info.json index 99672acb74..9a84e03c0e 100644 --- a/keyboards/evyd13/wonderland/info.json +++ b/keyboards/evyd13/wonderland/info.json @@ -8,6 +8,11 @@ "pid": "0xA71C", "device_version": "0.0.3" }, + "qmk_lufa_bootloader": { + "esc_input": "B0", + "esc_output": "F0", + "led": "B1" + }, "indicators": { "caps_lock": "B2", "num_lock": "B1", diff --git a/keyboards/gami_studio/lex60/config.h b/keyboards/gami_studio/lex60/config.h index 92a963abc6..152c1a512b 100644 --- a/keyboards/gami_studio/lex60/config.h +++ b/keyboards/gami_studio/lex60/config.h @@ -26,9 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define QMK_ESC_OUTPUT B7 // usually COL -#define QMK_ESC_INPUT D5 // usually ROW - #define RGB_DI_PIN D1 #define RGBLED_NUM 12 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/gami_studio/lex60/info.json b/keyboards/gami_studio/lex60/info.json index c47a0ab474..8c1d730787 100644 --- a/keyboards/gami_studio/lex60/info.json +++ b/keyboards/gami_studio/lex60/info.json @@ -8,6 +8,10 @@ "pid": "0x0160", "device_version": "0.0.1" }, + "qmk_lufa_bootloader": { + "esc_input": "D5", + "esc_output": "B7" + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "layouts": { diff --git a/keyboards/gvalchca/ga150/config.h b/keyboards/gvalchca/ga150/config.h index 741ab9f0d5..7678422bc5 100644 --- a/keyboards/gvalchca/ga150/config.h +++ b/keyboards/gvalchca/ga150/config.h @@ -25,6 +25,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW - -#define QMK_ESC_OUTPUT E6 // usually COL -#define QMK_ESC_INPUT B1 // usually ROW diff --git a/keyboards/gvalchca/ga150/info.json b/keyboards/gvalchca/ga150/info.json index 955d7a5d04..4e2d65df59 100644 --- a/keyboards/gvalchca/ga150/info.json +++ b/keyboards/gvalchca/ga150/info.json @@ -8,6 +8,10 @@ "pid": "0x6135", "device_version": "0.0.1" }, + "qmk_lufa_bootloader": { + "esc_input": "B1", + "esc_output": "E6" + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "layouts": { diff --git a/keyboards/gvalchca/spaccboard/config.h b/keyboards/gvalchca/spaccboard/config.h index f409f9494c..2703cdd688 100644 --- a/keyboards/gvalchca/spaccboard/config.h +++ b/keyboards/gvalchca/spaccboard/config.h @@ -25,6 +25,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW - -#define QMK_ESC_OUTPUT E6 // usually COL -#define QMK_ESC_INPUT B1 // usually ROW diff --git a/keyboards/gvalchca/spaccboard/info.json b/keyboards/gvalchca/spaccboard/info.json index 2bd0744f4c..435abb01e0 100644 --- a/keyboards/gvalchca/spaccboard/info.json +++ b/keyboards/gvalchca/spaccboard/info.json @@ -8,6 +8,10 @@ "pid": "0x5342", "device_version": "0.0.1" }, + "qmk_lufa_bootloader": { + "esc_input": "B1", + "esc_output": "E6" + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "layouts": { diff --git a/keyboards/handwired/ddg_56/config.h b/keyboards/handwired/ddg_56/config.h index 7582367f13..a9b3c12ef2 100644 --- a/keyboards/handwired/ddg_56/config.h +++ b/keyboards/handwired/ddg_56/config.h @@ -20,7 +20,5 @@ #define MATRIX_ROW_PINS { B5, B15, B9, B10, A14 } #define MATRIX_COL_PINS { A2, B8, B13, B14, B4, B11, B12, A13, A15, A8, A7, A6, B0, B1 } -#define QMK_SPEAKER A5 - #define ENCODERS_PAD_A { A1, B3 } #define ENCODERS_PAD_B { A0, B2 } diff --git a/keyboards/handwired/jotpad16/config.h b/keyboards/handwired/jotpad16/config.h index c8a121fb44..9a1af0d614 100644 --- a/keyboards/handwired/jotpad16/config.h +++ b/keyboards/handwired/jotpad16/config.h @@ -9,7 +9,6 @@ #define JOTPAD16_LEDS #define JOTPAD16_LED1 B5 #define JOTPAD16_LED2 B4 -#define QMK_LED B5 /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/handwired/p65rgb/config.h b/keyboards/handwired/p65rgb/config.h index 4d6195c3c4..a3693706d4 100644 --- a/keyboards/handwired/p65rgb/config.h +++ b/keyboards/handwired/p65rgb/config.h @@ -86,6 +86,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -#define QMK_ESC_OUTPUT E6 // usually COL -#define QMK_ESC_INPUT C7 // usually ROW diff --git a/keyboards/handwired/p65rgb/info.json b/keyboards/handwired/p65rgb/info.json index 1b8e87a2c8..316fa0f61d 100644 --- a/keyboards/handwired/p65rgb/info.json +++ b/keyboards/handwired/p65rgb/info.json @@ -8,6 +8,10 @@ "pid": "0x75B4", "device_version": "0.0.1" }, + "qmk_lufa_bootloader": { + "esc_input": "C7", + "esc_output": "E6" + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "layouts": { diff --git a/keyboards/handwired/rs60/config.h b/keyboards/handwired/rs60/config.h index a4aa91b497..b9bf17a4a0 100644 --- a/keyboards/handwired/rs60/config.h +++ b/keyboards/handwired/rs60/config.h @@ -20,11 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MATRIX_ROW_PINS { B5, B6, B4, B2, E6 } #define MATRIX_COL_PINS { C6, D4, D0, D1, D2, D3, F4, F5, F6, F7, B1, B3} -#define QMK_ESC_OUTPUT C6 -#define QMK_ESC_INPUT B4 -#define QMK_LED B0 -// #define QMK_SPEAKER C6 - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/handwired/rs60/info.json b/keyboards/handwired/rs60/info.json index c96c1da1a3..ddd2cff353 100644 --- a/keyboards/handwired/rs60/info.json +++ b/keyboards/handwired/rs60/info.json @@ -8,6 +8,11 @@ "pid": "0x4260", "device_version": "0.0.1" }, + "qmk_lufa_bootloader": { + "esc_input": "B4", + "esc_output": "C6", + "led": "B0" + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "community_layouts": ["ortho_5x12"], diff --git a/keyboards/hs60/v1/config.h b/keyboards/hs60/v1/config.h index 2add4f62be..36db915bd7 100644 --- a/keyboards/hs60/v1/config.h +++ b/keyboards/hs60/v1/config.h @@ -31,11 +31,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MATRIX_ROW_PINS { B0, B1, B2, B3, F7 } #define MATRIX_COL_PINS { F1, F4, F5, E6, F0, B7, D2, D3, D5, D4, D6, D7, B4, B5 } -/* bootloader configuration */ - -#define QMK_ESC_OUTPUT B5 // usually COL -#define QMK_ESC_INPUT B2 // usually ROW - /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/hs60/v1/info.json b/keyboards/hs60/v1/info.json index 2c723f58b5..33e1d46b08 100644 --- a/keyboards/hs60/v1/info.json +++ b/keyboards/hs60/v1/info.json @@ -8,6 +8,10 @@ "pid": "0x0257", "device_version": "0.0.1" }, + "qmk_lufa_bootloader": { + "esc_input": "B2", + "esc_output": "B5" + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "community_layouts": ["60_ansi", "60_iso"], diff --git a/keyboards/jian/nsrev2/config.h b/keyboards/jian/nsrev2/config.h index 1e2a238f69..eba3f5247b 100644 --- a/keyboards/jian/nsrev2/config.h +++ b/keyboards/jian/nsrev2/config.h @@ -25,9 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MATRIX_ROW_PINS { F4, F5, B1, B3, D1, D0, D7, E6 } #define MATRIX_COL_PINS { D3, D2, B4, F6, F7, B2 } -#define QMK_ESC_OUTPUT D3 -#define QMK_ESC_INPUT B1 - #define PHYSICAL_LEDS_ENABLE #ifdef BACKLIGHT_ENABLE diff --git a/keyboards/jian/nsrev2/info.json b/keyboards/jian/nsrev2/info.json index a642aaf0a9..bb64f79e58 100644 --- a/keyboards/jian/nsrev2/info.json +++ b/keyboards/jian/nsrev2/info.json @@ -3,6 +3,10 @@ "usb": { "device_version": "2.1.0" }, + "qmk_lufa_bootloader": { + "esc_input": "B1", + "esc_output": "D3" + }, "processor": "atmega32u4", "bootloader": "qmk-dfu" } diff --git a/keyboards/jian/rev2/config.h b/keyboards/jian/rev2/config.h index 3e5b61863e..061e1185cf 100644 --- a/keyboards/jian/rev2/config.h +++ b/keyboards/jian/rev2/config.h @@ -27,9 +27,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //#define EE_HANDS #define SPLIT_HAND_PIN E6 -#define QMK_ESC_OUTPUT D3 -#define QMK_ESC_INPUT B1 - #define PHYSICAL_LEDS_ENABLE #define IOS_DEVICE_ENABLE diff --git a/keyboards/jian/rev2/info.json b/keyboards/jian/rev2/info.json index 06faa71432..0e87ca3bb6 100644 --- a/keyboards/jian/rev2/info.json +++ b/keyboards/jian/rev2/info.json @@ -3,6 +3,10 @@ "usb": { "device_version": "2.0.0" }, + "qmk_lufa_bootloader": { + "esc_input": "B1", + "esc_output": "D3" + }, "split": { "soft_serial_pin": "D1" }, diff --git a/keyboards/keebio/fourier/config.h b/keyboards/keebio/fourier/config.h index 4bab21784f..a9af99d29d 100644 --- a/keyboards/keebio/fourier/config.h +++ b/keyboards/keebio/fourier/config.h @@ -25,11 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define DIODE_DIRECTION COL2ROW -#define QMK_ESC_OUTPUT F5 -#define QMK_ESC_INPUT F4 -#define QMK_LED B0 -#define QMK_SPEAKER C6 - /* Split Defines */ #define SPLIT_HAND_PIN D2 diff --git a/keyboards/keebio/fourier/info.json b/keyboards/keebio/fourier/info.json index 34e7d586bb..9633cb3e93 100644 --- a/keyboards/keebio/fourier/info.json +++ b/keyboards/keebio/fourier/info.json @@ -8,6 +8,12 @@ "pid": "0x1247", "device_version": "1.0.0" }, + "qmk_lufa_bootloader": { + "esc_input": "F4", + "esc_output": "F5", + "led": "B0", + "speaker": "C6" + }, "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/keebio/iris/rev3/config.h b/keyboards/keebio/iris/rev3/config.h index 93f5074027..17dd3d35e4 100644 --- a/keyboards/keebio/iris/rev3/config.h +++ b/keyboards/keebio/iris/rev3/config.h @@ -21,10 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MATRIX_ROW_PINS { D2, D3, D5, D7, D6 } #define MATRIX_COL_PINS { F1, F4, F5, F6, D4, B4 } #define SPLIT_HAND_PIN F0 -#define QMK_ESC_OUTPUT F1 -#define QMK_ESC_INPUT D2 -#define QMK_LED B0 -#define QMK_SPEAKER C6 #define ENCODERS_PAD_A { B5 } #define ENCODERS_PAD_B { B7 } diff --git a/keyboards/keebio/iris/rev3/info.json b/keyboards/keebio/iris/rev3/info.json index c52dfee400..f930160d0f 100644 --- a/keyboards/keebio/iris/rev3/info.json +++ b/keyboards/keebio/iris/rev3/info.json @@ -4,6 +4,12 @@ "pid": "0x3256", "device_version": "3.0.0" }, + "qmk_lufa_bootloader": { + "esc_input": "D2", + "esc_output": "F1", + "led": "B0", + "speaker": "C6" + }, "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/keebio/iris/rev4/config.h b/keyboards/keebio/iris/rev4/config.h index 7674f72876..35d4d59721 100644 --- a/keyboards/keebio/iris/rev4/config.h +++ b/keyboards/keebio/iris/rev4/config.h @@ -23,10 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MATRIX_ROW_PINS_RIGHT { B1, B2, D2, F1, F4 } #define MATRIX_COL_PINS_RIGHT { D4, D7, D3, B7, F0, B3 } #define SPLIT_HAND_PIN D5 -#define QMK_ESC_OUTPUT F1 -#define QMK_ESC_INPUT B1 -#define QMK_LED B0 -#define QMK_SPEAKER C6 #define ENCODERS_PAD_A { B2 } #define ENCODERS_PAD_B { B3 } diff --git a/keyboards/keebio/iris/rev4/info.json b/keyboards/keebio/iris/rev4/info.json index 183108825b..8288b2fdf4 100644 --- a/keyboards/keebio/iris/rev4/info.json +++ b/keyboards/keebio/iris/rev4/info.json @@ -4,6 +4,12 @@ "pid": "0x4256", "device_version": "4.0.0" }, + "qmk_lufa_bootloader": { + "esc_input": "B1", + "esc_output": "F1", + "led": "B0", + "speaker": "C6" + }, "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/keebio/iris/rev5/config.h b/keyboards/keebio/iris/rev5/config.h index 9f0bdfc633..fcfe3b5b68 100644 --- a/keyboards/keebio/iris/rev5/config.h +++ b/keyboards/keebio/iris/rev5/config.h @@ -23,10 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MATRIX_ROW_PINS_RIGHT { B1, B2, D2, F1, F4 } #define MATRIX_COL_PINS_RIGHT { D4, D7, D3, B7, F0, B3 } #define SPLIT_HAND_PIN D5 -#define QMK_ESC_OUTPUT F1 -#define QMK_ESC_INPUT B1 -#define QMK_LED B0 -#define QMK_SPEAKER C6 #define ENCODERS_PAD_A { B2 } #define ENCODERS_PAD_B { B3 } diff --git a/keyboards/keebio/iris/rev5/info.json b/keyboards/keebio/iris/rev5/info.json index 495dfb5f5a..11b8bed530 100644 --- a/keyboards/keebio/iris/rev5/info.json +++ b/keyboards/keebio/iris/rev5/info.json @@ -4,6 +4,12 @@ "pid": "0x5256", "device_version": "5.0.0" }, + "qmk_lufa_bootloader": { + "esc_input": "B1", + "esc_output": "F1", + "led": "B0", + "speaker": "C6" + }, "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/kindakeyboards/conone65/config.h b/keyboards/kindakeyboards/conone65/config.h index fc36d2b364..3780553ea1 100644 --- a/keyboards/kindakeyboards/conone65/config.h +++ b/keyboards/kindakeyboards/conone65/config.h @@ -54,6 +54,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT - -#define QMK_ESC_OUTPUT B7 // usually COL -#define QMK_ESC_INPUT D5 // usually ROW diff --git a/keyboards/kindakeyboards/conone65/info.json b/keyboards/kindakeyboards/conone65/info.json index 3b924683e6..e1dfa932f5 100644 --- a/keyboards/kindakeyboards/conone65/info.json +++ b/keyboards/kindakeyboards/conone65/info.json @@ -8,6 +8,10 @@ "pid": "0x6AAB", "device_version": "0.0.1" }, + "qmk_lufa_bootloader": { + "esc_input": "D5", + "esc_output": "B7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi", "65_ansi_split_bs", "65_iso"], diff --git a/keyboards/lfkeyboards/lfk65_hs/config.h b/keyboards/lfkeyboards/lfk65_hs/config.h index 6caa4d1dea..9bec564065 100644 --- a/keyboards/lfkeyboards/lfk65_hs/config.h +++ b/keyboards/lfkeyboards/lfk65_hs/config.h @@ -6,11 +6,6 @@ #define MATRIX_COL_PINS {E6, F4, B7, D5, D3, D2, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4} #define RGBLED_NUM 20 // Number of LEDs -#define QMK_ESC_OUTPUT E6 // usually COL -#define QMK_ESC_INPUT B0 // usually ROW -#define QMK_LED F1 -// #define QMK_SPEAKER C6 - #define BACKLIGHT_LEVELS 8 #define BACKLIGHT_PWM_MAP {8, 16, 40, 55, 70, 128, 200, 255} diff --git a/keyboards/mechllama/g35/config.h b/keyboards/mechllama/g35/config.h index 42e1dda370..e7f24e3985 100644 --- a/keyboards/mechllama/g35/config.h +++ b/keyboards/mechllama/g35/config.h @@ -20,10 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define DIODE_DIRECTION COL2ROW -#define QMK_ESC_OUTPUT D6 -#define QMK_ESC_INPUT F5 -#define QMK_SPEAKER D2 - #define RGB_DI_PIN F7 #define FORCE_NKRO diff --git a/keyboards/mechstudio/dawn/config.h b/keyboards/mechstudio/dawn/config.h index 92971a46db..4270fca037 100644 --- a/keyboards/mechstudio/dawn/config.h +++ b/keyboards/mechstudio/dawn/config.h @@ -24,6 +24,3 @@ /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW - -#define QMK_ESC_OUTPUT F0 // usually COL -#define QMK_ESC_INPUT B1 // usually ROW diff --git a/keyboards/mechstudio/dawn/info.json b/keyboards/mechstudio/dawn/info.json index bc1bd35c51..4b4d6c5c26 100644 --- a/keyboards/mechstudio/dawn/info.json +++ b/keyboards/mechstudio/dawn/info.json @@ -8,6 +8,10 @@ "pid": "0x0004", "device_version": "0.0.4" }, + "qmk_lufa_bootloader": { + "esc_input": "B1", + "esc_output": "F0" + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "layouts": { diff --git a/keyboards/mechstudio/ud_40_ortho/config.h b/keyboards/mechstudio/ud_40_ortho/config.h index 0333413ab6..41a6be19a4 100644 --- a/keyboards/mechstudio/ud_40_ortho/config.h +++ b/keyboards/mechstudio/ud_40_ortho/config.h @@ -44,6 +44,3 @@ #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE #endif - -#define QMK_ESC_OUTPUT F0 // usually COL -#define QMK_ESC_INPUT B7 // usually ROW diff --git a/keyboards/mechstudio/ud_40_ortho/info.json b/keyboards/mechstudio/ud_40_ortho/info.json index f323fdd02c..a517137f96 100644 --- a/keyboards/mechstudio/ud_40_ortho/info.json +++ b/keyboards/mechstudio/ud_40_ortho/info.json @@ -8,6 +8,10 @@ "pid": "0x0002", "device_version": "0.0.2" }, + "qmk_lufa_bootloader": { + "esc_input": "B7", + "esc_output": "F0" + }, "processor": "atmega32u2", "bootloader": "qmk-dfu", "community_layouts": ["ortho_4x12"], diff --git a/keyboards/mschwingen/modelm/config.h b/keyboards/mschwingen/modelm/config.h index 4cef528db1..6545f91070 100644 --- a/keyboards/mschwingen/modelm/config.h +++ b/keyboards/mschwingen/modelm/config.h @@ -50,7 +50,7 @@ //#define DEBUG_MATRIX_SCAN_RATE #define DYNAMIC_MACRO_NO_NESTING -#define QMK_LED E6 +#define MODELM_STATUS_LED E6 #define MODELM_LED1 B5 #define MODELM_LED2 B6 diff --git a/keyboards/mschwingen/modelm/modelm.c b/keyboards/mschwingen/modelm/modelm.c index 0ff58f4be3..122dca3400 100644 --- a/keyboards/mschwingen/modelm/modelm.c +++ b/keyboards/mschwingen/modelm/modelm.c @@ -75,12 +75,12 @@ void sleep_led_toggle(void) {} void sleep_led_disable(void) { suspend_active = false; - writePinHigh(QMK_LED); + writePinHigh(MODELM_STATUS_LED); } void sleep_led_enable(void) { suspend_active = true; - writePinLow(QMK_LED); + writePinLow(MODELM_STATUS_LED); #ifdef KEYBOARD_mschwingen_modelm_led_ws2812 led[0] = black; led[1] = black; @@ -101,8 +101,8 @@ void keyboard_pre_init_kb(void) { writePinLow(MODELM_LED_SCROLLOCK); writePinLow(MODELM_LED_NUMLOCK); #endif - setPinOutput(QMK_LED); - writePinHigh(QMK_LED); + setPinOutput(MODELM_STATUS_LED); + writePinHigh(MODELM_STATUS_LED); _delay_ms(50); #ifdef UART_DEBUG uart_init(115200); diff --git a/keyboards/planck/config.h b/keyboards/planck/config.h index b4064a264b..165e6dcc5c 100644 --- a/keyboards/planck/config.h +++ b/keyboards/planck/config.h @@ -22,11 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MATRIX_ROW_PINS { D0, D5, B5, B6 } #define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 } -#define QMK_ESC_OUTPUT F1 -#define QMK_ESC_INPUT D5 -#define QMK_LED E6 -#define QMK_SPEAKER C6 - #define AUDIO_VOICES #define AUDIO_PIN C6 diff --git a/keyboards/planck/rev5/info.json b/keyboards/planck/rev5/info.json index 9e271ec072..cd76c7e2ad 100644 --- a/keyboards/planck/rev5/info.json +++ b/keyboards/planck/rev5/info.json @@ -8,6 +8,12 @@ "pid": "0xAE01", "device_version": "0.0.5" }, + "qmk_lufa_bootloader": { + "esc_input": "D5", + "esc_output": "F1", + "led": "E6", + "speaker": "C6" + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "community_layouts": ["ortho_4x12", "planck_mit"], diff --git a/keyboards/plume/plume65/config.h b/keyboards/plume/plume65/config.h index b7b44811d1..3e9f66e3d3 100644 --- a/keyboards/plume/plume65/config.h +++ b/keyboards/plume/plume65/config.h @@ -71,6 +71,3 @@ //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT - -#define QMK_ESC_OUTPUT B7 // usually COL -#define QMK_ESC_INPUT D2 // usually ROW diff --git a/keyboards/plume/plume65/info.json b/keyboards/plume/plume65/info.json index ba046dfa02..1937223b02 100644 --- a/keyboards/plume/plume65/info.json +++ b/keyboards/plume/plume65/info.json @@ -8,6 +8,10 @@ "pid": "0x22CF", "device_version": "0.0.1" }, + "qmk_lufa_bootloader": { + "esc_input": "D2", + "esc_output": "B7" + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "layouts": { diff --git a/keyboards/preonic/config.h b/keyboards/preonic/config.h index 9580100dfe..494c15c516 100644 --- a/keyboards/preonic/config.h +++ b/keyboards/preonic/config.h @@ -22,11 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MATRIX_ROW_PINS { D2, D5, B5, B6, D3 } #define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 } -#define QMK_ESC_OUTPUT F1 -#define QMK_ESC_INPUT B5 -#define QMK_LED E6 -#define QMK_SPEAKER C6 - #define AUDIO_VOICES #define AUDIO_PIN C6 diff --git a/keyboards/preonic/rev2/info.json b/keyboards/preonic/rev2/info.json index b1e66a09e0..4392f2e964 100644 --- a/keyboards/preonic/rev2/info.json +++ b/keyboards/preonic/rev2/info.json @@ -6,6 +6,12 @@ "pid": "0x67F3", "device_version": "0.0.2" }, + "qmk_lufa_bootloader": { + "esc_input": "B5", + "esc_output": "F1", + "led": "E6", + "speaker": "C6" + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "community_layouts": ["ortho_5x12"] diff --git a/keyboards/rationalist/ratio65_hotswap/rev_a/config.h b/keyboards/rationalist/ratio65_hotswap/rev_a/config.h index 32d785a2f4..1d483f8d77 100644 --- a/keyboards/rationalist/ratio65_hotswap/rev_a/config.h +++ b/keyboards/rationalist/ratio65_hotswap/rev_a/config.h @@ -25,9 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define QMK_ESC_OUTPUT C2 // usually COL -#define QMK_ESC_INPUT D1 // usually ROW - #define RGB_DI_PIN D3 #define RGBLED_NUM 18 diff --git a/keyboards/rationalist/ratio65_hotswap/rev_a/info.json b/keyboards/rationalist/ratio65_hotswap/rev_a/info.json index 19d6371b48..71253c2113 100644 --- a/keyboards/rationalist/ratio65_hotswap/rev_a/info.json +++ b/keyboards/rationalist/ratio65_hotswap/rev_a/info.json @@ -8,6 +8,10 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "qmk_lufa_bootloader": { + "esc_input": "D1", + "esc_output": "C2" + }, "processor": "atmega32u2", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/rationalist/ratio65_solder/rev_a/config.h b/keyboards/rationalist/ratio65_solder/rev_a/config.h index c50f38dc21..dba1363b48 100644 --- a/keyboards/rationalist/ratio65_solder/rev_a/config.h +++ b/keyboards/rationalist/ratio65_solder/rev_a/config.h @@ -25,9 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define QMK_ESC_OUTPUT C2 // usually COL -#define QMK_ESC_INPUT D1 // usually ROW - #define RGB_DI_PIN D3 #define RGBLED_NUM 18 diff --git a/keyboards/rationalist/ratio65_solder/rev_a/info.json b/keyboards/rationalist/ratio65_solder/rev_a/info.json index 5858f68abc..1fa6dc2b91 100644 --- a/keyboards/rationalist/ratio65_solder/rev_a/info.json +++ b/keyboards/rationalist/ratio65_solder/rev_a/info.json @@ -8,6 +8,10 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "qmk_lufa_bootloader": { + "esc_input": "D1", + "esc_output": "C2" + }, "processor": "atmega32u2", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/splitkb/zima/config.h b/keyboards/splitkb/zima/config.h index 777c56465f..0cb93e77af 100644 --- a/keyboards/splitkb/zima/config.h +++ b/keyboards/splitkb/zima/config.h @@ -20,10 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define ENCODERS_PAD_A { B4 } #define ENCODERS_PAD_B { D7 } -// #define QMK_ESC_OUTPUT B7 -// #define QMK_ESC_INPUT C6 -// #define QMK_SPEAKER B6 - #define AUDIO_PIN B6 #define AUDIO_CLICKY #define NO_MUSIC_MODE diff --git a/keyboards/tkc/m0lly/config.h b/keyboards/tkc/m0lly/config.h index 42f16ac75d..dc94510953 100644 --- a/keyboards/tkc/m0lly/config.h +++ b/keyboards/tkc/m0lly/config.h @@ -63,11 +63,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define QMK_ESC_OUTPUT A0 // usually COL -#define QMK_ESC_INPUT F4 // usually ROW -#define QMK_LED D2 // NumLock on M0lly -//#define QMK_SPEAKER C6 - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/tkc/m0lly/info.json b/keyboards/tkc/m0lly/info.json index c5fa343339..61bb64dca2 100644 --- a/keyboards/tkc/m0lly/info.json +++ b/keyboards/tkc/m0lly/info.json @@ -8,6 +8,11 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "qmk_lufa_bootloader": { + "esc_input": "F4", + "esc_output": "A0", + "led": "D2" + }, "indicators": { "caps_lock": "D3", "num_lock": "D2", diff --git a/keyboards/tkc/tkc1800/config.h b/keyboards/tkc/tkc1800/config.h index 7f88bf8d47..8e475e3ff2 100644 --- a/keyboards/tkc/tkc1800/config.h +++ b/keyboards/tkc/tkc1800/config.h @@ -55,11 +55,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define QMK_ESC_OUTPUT A0 // usually COL -#define QMK_ESC_INPUT F4 // usually ROW -#define QMK_LED D2 // NumLock on TKC1800 -//#define QMK_SPEAKER C6 - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/tkc/tkc1800/info.json b/keyboards/tkc/tkc1800/info.json index 5e0e31f036..0be83dbd53 100644 --- a/keyboards/tkc/tkc1800/info.json +++ b/keyboards/tkc/tkc1800/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.3" }, + "qmk_lufa_bootloader": { + "esc_input": "F4", + "esc_output": "A0", + "led": "D2" + }, "indicators": { "caps_lock": "D3", "num_lock": "D2", diff --git a/keyboards/tokyokeyboard/alix40/config.h b/keyboards/tokyokeyboard/alix40/config.h index 909a6fb46d..9a98443470 100644 --- a/keyboards/tokyokeyboard/alix40/config.h +++ b/keyboards/tokyokeyboard/alix40/config.h @@ -51,10 +51,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_VAL_STEP 10 #endif -/* For Production */ -#define QMK_ESC_OUTPUT F7 // usually COL -#define QMK_ESC_INPUT D7 // usually ROW - /* Bluetooth */ #define BATTERY_LEVEL_PIN B6 diff --git a/keyboards/tokyokeyboard/tokyo60/config.h b/keyboards/tokyokeyboard/tokyo60/config.h index 0c24b1e3f9..c29c92ad37 100644 --- a/keyboards/tokyokeyboard/tokyo60/config.h +++ b/keyboards/tokyokeyboard/tokyo60/config.h @@ -38,7 +38,3 @@ #define RGBLIGHT_SAT_STEP 12 #define RGBLIGHT_VAL_STEP 12 #endif - -/* For Production */ -#define QMK_ESC_OUTPUT F0 // usually COL -#define QMK_ESC_INPUT D0 // usually ROW diff --git a/keyboards/vitamins_included/rev2/config.h b/keyboards/vitamins_included/rev2/config.h index f28b91a472..40f6312b47 100644 --- a/keyboards/vitamins_included/rev2/config.h +++ b/keyboards/vitamins_included/rev2/config.h @@ -49,12 +49,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. # define AUDIO_PIN C6 // Define this to enable the buzzer #endif -#define QMK_ESC_OUTPUT F1 // usually COL -#define QMK_ESC_INPUT F5 // usually ROW -#define QMK_LED D5 -#define QMK_SPEAKER C6 - - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/vitamins_included/rev2/info.json b/keyboards/vitamins_included/rev2/info.json index ec9edaf233..894043ef98 100644 --- a/keyboards/vitamins_included/rev2/info.json +++ b/keyboards/vitamins_included/rev2/info.json @@ -2,6 +2,12 @@ "usb": { "device_version": "0.0.2" }, + "qmk_lufa_bootloader": { + "esc_input": "F5", + "esc_output": "F1", + "led": "D5", + "speaker": "C6" + }, "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/woodkeys/meira/featherble/config.h b/keyboards/woodkeys/meira/featherble/config.h index 990ebdf19b..eab64b36b9 100644 --- a/keyboards/woodkeys/meira/featherble/config.h +++ b/keyboards/woodkeys/meira/featherble/config.h @@ -34,7 +34,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MATRIX_COL_PINS_SCANNED { C7, B7, B6, C6 } #define LED_EN_PIN D2 -#define QMK_SPEAKER B5 #define AUDIO_PIN B5 #define AUDIO_VOICES diff --git a/keyboards/woodkeys/scarletbandana/config.h b/keyboards/woodkeys/scarletbandana/config.h index 7d906b8d25..fac7647ab8 100644 --- a/keyboards/woodkeys/scarletbandana/config.h +++ b/keyboards/woodkeys/scarletbandana/config.h @@ -39,8 +39,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MATRIX_ROW_PINS { D4, D6, D7, B4, B5 } #define MATRIX_COL_PINS { B2, B3, B7, B1, F5, F4, F6, F7, B0, F0, F1, D0, D1, D2, D5, B6, C7 } -#define QMK_SPEAKER C6 - #ifdef AUDIO_ENABLE #define AUDIO_PIN C6 #define STARTUP_SONG SONG(PREONIC_SOUND) diff --git a/keyboards/ydkb/just60/config.h b/keyboards/ydkb/just60/config.h index 69a48877fb..bc86dc02e5 100644 --- a/keyboards/ydkb/just60/config.h +++ b/keyboards/ydkb/just60/config.h @@ -22,9 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MATRIX_COL_PINS { D6, D7, B4, B6, B5, B7, F7, F6, F5, F4, F1, F0, E6, B0 } #define DIODE_DIRECTION COL2ROW -#define QMK_ESC_OUTPUT D6 // usually COL -#define QMK_ESC_INPUT E2 // usually ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/ydkb/just60/info.json b/keyboards/ydkb/just60/info.json index 808341a5d1..618f0d8eac 100644 --- a/keyboards/ydkb/just60/info.json +++ b/keyboards/ydkb/just60/info.json @@ -8,6 +8,10 @@ "pid": "0x1960", "device_version": "0.0.1" }, + "qmk_lufa_bootloader": { + "esc_input": "E2", + "esc_output": "D6" + }, "processor": "atmega32u4", "bootloader": "lufa-ms", "layouts": { |