Move QMK LUFA bootloader config to data driven (#19879)

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

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": {

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
 

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": {

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

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

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": {

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
 

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": {

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

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": {

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
 

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": {

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
 

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": {

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

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

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

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
 

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": {

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

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
 

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);
+    setPinOutput(ADM42_LED);
-    writePinHigh(QMK_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);
 }

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

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"],

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

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

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": {

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

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"
     },

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

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

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

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

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

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"],

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

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

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 */

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",

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

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"
     },

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

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"],

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

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"],

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

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",

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

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",

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

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": {

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

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": {

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

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": {

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 }

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

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

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": {

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
 

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"],

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
 

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"],

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

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"
 }

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
 

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"
     },

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
 

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"
     },

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 }

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"
     },

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 }

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"
     },

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 }

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"
     },

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

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"],

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}
 

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

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

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": {

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

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"],

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

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);
+    setPinOutput(MODELM_STATUS_LED);
-    writePinHigh(QMK_LED);
+    writePinHigh(MODELM_STATUS_LED);
     _delay_ms(50);
 #ifdef UART_DEBUG
     uart_init(115200);

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
 

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"],

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

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": {

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
 

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"]

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
 

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": {

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
 

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": {

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

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.

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",

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.