Move Bootmagic config to data driven (#19860)

qmk · Feb 16, 2023 · d784f78 · d784f78
1 parent 7fad94b
commit d784f78
Show file tree

Hide file tree

Showing 281 changed files with 458 additions and 700 deletions.
diff --git a/keyboards/0xcb/tutelpad/config.h b/keyboards/0xcb/tutelpad/config.h
@@ -55,7 +55,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
-
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 1
-#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/0xcb/tutelpad/info.json b/keyboards/0xcb/tutelpad/info.json
@@ -8,6 +8,9 @@
         "pid": "0xF09F",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [1, 0]
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "matrix_pins": {

diff --git a/keyboards/a_dux/config.h b/keyboards/a_dux/config.h
@@ -26,10 +26,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define SOFT_SERIAL_PIN D1
 
 #define EE_HANDS
-
-/* Top left key on left half */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 0
-/* Top right key on right half */
-#define BOOTMAGIC_LITE_ROW_RIGHT 4
-#define BOOTMAGIC_LITE_COLUMN_RIGHT 4
diff --git a/keyboards/a_dux/info.json b/keyboards/a_dux/info.json
@@ -19,6 +19,9 @@
         ]
     },
     "split": {
+        "bootmagic": {
+            "matrix": [4, 4]
+        },
         "matrix_pins": {
             "right": {
                 "direct": [

diff --git a/keyboards/adafruit/macropad/config.h b/keyboards/adafruit/macropad/config.h
@@ -41,11 +41,6 @@
 #define ENCODERS_PAD_A { GP18 }
 #define ENCODERS_PAD_B { GP17 }
 
-/* Bootmagic lite */
-/* (Press the key below the encoder button while plugging the keyboard to enter the bootloader and clear flash) */
-#define BOOTMAGIC_LITE_ROW 1
-#define BOOTMAGIC_LITE_COLUMN 2
-
 /* Double tap the side button to enter bootloader */
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP13

diff --git a/keyboards/adafruit/macropad/info.json b/keyboards/adafruit/macropad/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0108",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [1, 2]
+    },
     "processor": "RP2040",
     "bootloader": "rp2040",
     "matrix_pins": {

diff --git a/keyboards/afternoonlabs/breeze/rev0/config.h b/keyboards/afternoonlabs/breeze/rev0/config.h
@@ -32,6 +32,3 @@
 #define SOFT_SERIAL_PIN D2
 
 #define DIODE_DIRECTION COL2ROW
-
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 5
diff --git a/keyboards/afternoonlabs/breeze/rev0/info.json b/keyboards/afternoonlabs/breeze/rev0/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0001",
         "device_version": "0.0.0"
     },
+    "bootmagic": {
+        "matrix": [0, 5]
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {

diff --git a/keyboards/afternoonlabs/breeze/rev1/config.h b/keyboards/afternoonlabs/breeze/rev1/config.h
@@ -32,8 +32,3 @@
 #define SOFT_SERIAL_PIN D2
 
 #define DIODE_DIRECTION COL2ROW
-
-#define BOOTMAGIC_LITE_ROW_RIGHT 0
-#define BOOTMAGIC_LITE_COLUMN_RIGHT 5
-#define BOOTMAGIC_LITE_ROW_LEFT 0
-#define BOOTMAGIC_LITE_COLUMN_LEFT 5
diff --git a/keyboards/afternoonlabs/breeze/rev1/info.json b/keyboards/afternoonlabs/breeze/rev1/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [0, 5]
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {

diff --git a/keyboards/afternoonlabs/oceanbreeze/rev1/config.h b/keyboards/afternoonlabs/oceanbreeze/rev1/config.h
@@ -32,8 +32,3 @@
 #define SOFT_SERIAL_PIN D2
 
 #define DIODE_DIRECTION COL2ROW
-
-#define BOOTMAGIC_LITE_ROW_RIGHT 0
-#define BOOTMAGIC_LITE_COLUMN_RIGHT 5
-#define BOOTMAGIC_LITE_ROW_LEFT 0
-#define BOOTMAGIC_LITE_COLUMN_LEFT 5
diff --git a/keyboards/afternoonlabs/oceanbreeze/rev1/info.json b/keyboards/afternoonlabs/oceanbreeze/rev1/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0003",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [0, 5]
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {

diff --git a/keyboards/afternoonlabs/southern_breeze/rev1/config.h b/keyboards/afternoonlabs/southern_breeze/rev1/config.h
@@ -32,8 +32,3 @@
 #define SOFT_SERIAL_PIN D2
 
 #define DIODE_DIRECTION COL2ROW
-
-#define BOOTMAGIC_LITE_ROW_RIGHT 0
-#define BOOTMAGIC_LITE_COLUMN_RIGHT 5
-#define BOOTMAGIC_LITE_ROW_LEFT 0
-#define BOOTMAGIC_LITE_COLUMN_LEFT 5
diff --git a/keyboards/afternoonlabs/southern_breeze/rev1/info.json b/keyboards/afternoonlabs/southern_breeze/rev1/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0005",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [0, 5]
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {

diff --git a/keyboards/afternoonlabs/summer_breeze/rev1/config.h b/keyboards/afternoonlabs/summer_breeze/rev1/config.h
@@ -32,8 +32,3 @@
 #define SOFT_SERIAL_PIN D2
 
 #define DIODE_DIRECTION COL2ROW
-
-#define BOOTMAGIC_LITE_ROW_RIGHT 0
-#define BOOTMAGIC_LITE_COLUMN_RIGHT 5
-#define BOOTMAGIC_LITE_ROW_LEFT 0
-#define BOOTMAGIC_LITE_COLUMN_LEFT 5
diff --git a/keyboards/afternoonlabs/summer_breeze/rev1/info.json b/keyboards/afternoonlabs/summer_breeze/rev1/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0004",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [0, 5]
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {

diff --git a/keyboards/alps64/config.h b/keyboards/alps64/config.h
@@ -34,10 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* Bootmagic Lite Support*/
-#define BOOTMAGIC_LITE_ROW 3
-#define BOOTMAGIC_LITE_COLUMN 6
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.

diff --git a/keyboards/alps64/info.json b/keyboards/alps64/info.json
@@ -8,6 +8,9 @@
         "pid": "0x6464",
         "device_version": "0.0.1"
     },
+  "bootmagic": {
+      "matrix": [3, 6]
+  },
   "processor": "atmega32u2",
   "bootloader": "atmel-dfu",
   "community_layouts": ["60_ansi"],

diff --git a/keyboards/ares/config.h b/keyboards/ares/config.h
@@ -43,7 +43,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
-
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 4
-#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/ares/info.json b/keyboards/ares/info.json
@@ -8,6 +8,9 @@
         "pid": "0x422D",
         "device_version": "2.0.0"
     },
+    "bootmagic": {
+        "matrix": [4, 0]
+    },
     "processor": "atmega32a",
     "bootloader": "bootloadhid",
     "layout_aliases": {

diff --git a/keyboards/argo_works/ishi/80/mk0_avr/config.h b/keyboards/argo_works/ishi/80/mk0_avr/config.h
diff --git a/keyboards/argo_works/ishi/80/mk0_avr/info.json b/keyboards/argo_works/ishi/80/mk0_avr/info.json
@@ -10,6 +10,9 @@
         "pid": "0x4930",
         "vid": "0x4157"
     },
+    "bootmagic": {
+        "matrix": [1, 0]
+    },
     "features": {
         "bootmagic": true,
         "command": false,

diff --git a/keyboards/argo_works/ishi/80/mk0_avr_extra/config.h b/keyboards/argo_works/ishi/80/mk0_avr_extra/config.h
diff --git a/keyboards/argo_works/ishi/80/mk0_avr_extra/info.json b/keyboards/argo_works/ishi/80/mk0_avr_extra/info.json
@@ -11,6 +11,9 @@
         "pid": "0x4930",
         "vid": "0x4157"
     },
+    "bootmagic": {
+        "matrix": [1, 0]
+    },
     "features": {
         "bootmagic": true,
         "command": false,

diff --git a/keyboards/ashpil/modelm_usbc/config.h b/keyboards/ashpil/modelm_usbc/config.h
@@ -53,7 +53,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
-
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 2
diff --git a/keyboards/ashpil/modelm_usbc/info.json b/keyboards/ashpil/modelm_usbc/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [0, 2]
+    },
     "processor": "at90usb1286",
     "bootloader": "atmel-dfu",
     "layouts": {

diff --git a/keyboards/aves60/config.h b/keyboards/aves60/config.h
@@ -71,7 +71,3 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 4
-#define BOOTMAGIC_LITE_COLUMN 6
diff --git a/keyboards/aves60/info.json b/keyboards/aves60/info.json
@@ -8,6 +8,9 @@
         "pid": "0xD408",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [4, 6]
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {

diff --git a/keyboards/basekeys/trifecta/config.h b/keyboards/basekeys/trifecta/config.h
@@ -68,10 +68,6 @@
 /* EEPROM for via */
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
 
-/* bootmagic row col assignment */
-#define BOOTMAGIC_LITE_ROW 1
-#define BOOTMAGIC_LITE_COLUMN 0
-
 #ifdef RGB_MATRIX_ENABLE
 #   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 // #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)

diff --git a/keyboards/basekeys/trifecta/info.json b/keyboards/basekeys/trifecta/info.json
@@ -8,6 +8,9 @@
         "pid": "0xEAF3",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [1, 0]
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {

diff --git a/keyboards/beekeeb/piantor/config.h b/keyboards/beekeeb/piantor/config.h
@@ -10,6 +10,3 @@
 #define SERIAL_USART_FULL_DUPLEX
 #define SERIAL_USART_TX_PIN GP0
 #define SERIAL_USART_RX_PIN GP1
-
-#define BOOTMAGIC_LITE_ROW    0
-#define BOOTMAGIC_LITE_COLUMN 5
diff --git a/keyboards/beekeeb/piantor/info.json b/keyboards/beekeeb/piantor/info.json
@@ -18,6 +18,9 @@
         "pid": "0x0001",
         "vid": "0xBEEB"
     },
+    "bootmagic": {
+        "matrix": [0, 5]
+    },
     "matrix_pins": {
         "direct": [
             ["GP5", "GP4", "GP11", "GP15", "GP3", "GP2"],

diff --git a/keyboards/cantor/config.h b/keyboards/cantor/config.h
@@ -7,13 +7,6 @@
 #define SERIAL_USART_TX_PIN B6     // USART TX pin
 #define SERIAL_USART_RX_PIN B7     // USART RX pin
 
-/* Top left key on left half */
-#define BOOTMAGIC_LITE_ROW    0
-#define BOOTMAGIC_LITE_COLUMN 0
-/* Top right key on right half */
-#define BOOTMAGIC_LITE_ROW_RIGHT    4
-#define BOOTMAGIC_LITE_COLUMN_RIGHT 5
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.

diff --git a/keyboards/cantor/info.json b/keyboards/cantor/info.json
@@ -28,6 +28,9 @@
         ]
     },
     "split": {
+        "bootmagic": {
+            "matrix": [4, 5]
+        },
         "matrix_pins": {
             "right": {
                 "direct": [

diff --git a/keyboards/controllerworks/mini42/config.h b/keyboards/controllerworks/mini42/config.h
@@ -36,10 +36,3 @@
 /* #define EE_HANDS  */
 /* #define MASTER_LEFT */
 /* #define MASTER_RIGHT */
-
-/* Top left key on left half */
-#define BOOTMAGIC_LITE_ROW    0
-#define BOOTMAGIC_LITE_COLUMN 0
-/* Top right key on right half */
-#define BOOTMAGIC_LITE_ROW_RIGHT    0
-#define BOOTMAGIC_LITE_COLUMN_RIGHT 0
diff --git a/keyboards/cradio/config.h b/keyboards/cradio/config.h
diff --git a/keyboards/cradio/info.json b/keyboards/cradio/info.json
@@ -29,6 +29,9 @@
         ]
     },
     "split": {
+        "bootmagic": {
+            "matrix": [4, 4]
+        },
         "enabled": true,
         "matrix_pins": {
             "right": {