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

swanmatch · Feb 22, 2023 · 3bf01bb · 3bf01bb
1 parent 7f805cc
commit 3bf01bb
Show file tree

Hide file tree

Showing 109 changed files with 217 additions and 225 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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