summary refs log tree commit diff
path: root/keyboards/handwired
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-02-17 08:49:49 +1100
committerGitHub <noreply@github.com>2023-02-17 08:49:49 +1100
commitd784f78bd0a034c1d6085379615014fd701536ab (patch)
tree2b81c4e8848ebc8dece2ad9aaa8126d12a87825c /keyboards/handwired
parent7fad94ba2d5092abe451d0bbc95caaa37fec95bc (diff)
Move Bootmagic config to data driven (#19860)
Diffstat (limited to 'keyboards/handwired')
-rw-r--r--keyboards/handwired/brain/config.h5
-rw-r--r--keyboards/handwired/brain/info.json8
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6_2_5/config.h6
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6_2_5/info.json5
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6_5/config.h6
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6_5/info.json5
-rw-r--r--keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/config.h5
-rw-r--r--keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json5
-rw-r--r--keyboards/handwired/daskeyboard/daskeyboard4/config.h24
-rw-r--r--keyboards/handwired/daskeyboard/daskeyboard4/info.json3
-rw-r--r--keyboards/handwired/dc/mc/001/config.h6
-rw-r--r--keyboards/handwired/dc/mc/001/info.json3
-rw-r--r--keyboards/handwired/frankie_macropad/config.h4
-rw-r--r--keyboards/handwired/frankie_macropad/info.json3
-rw-r--r--keyboards/handwired/jscotto/scottocmd/config.h4
-rw-r--r--keyboards/handwired/jscotto/scottocmd/info.json3
-rw-r--r--keyboards/handwired/tractyl_manuform/4x6_right/config.h6
-rw-r--r--keyboards/handwired/tractyl_manuform/4x6_right/info.json5
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/config.h6
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/info.json5
-rw-r--r--keyboards/handwired/videowriter/config.h4
-rw-r--r--keyboards/handwired/videowriter/info.json3
22 files changed, 48 insertions, 76 deletions
diff --git a/keyboards/handwired/brain/config.h b/keyboards/handwired/brain/config.h
index 4997ae12dd..a9ddcc3315 100644
--- a/keyboards/handwired/brain/config.h
+++ b/keyboards/handwired/brain/config.h
@@ -93,8 +93,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define TAPPING_TERM 150
 //#define IGNORE_MOD_TAP_INTERRUPT
 //#define QUICK_TAP_TERM 0
-
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 6
-#define BOOTMAGIC_LITE_ROW_RIGHT 5
-#define BOOTMAGIC_LITE_COLUMN_RIGHT 0
diff --git a/keyboards/handwired/brain/info.json b/keyboards/handwired/brain/info.json
index 7b9260f2d2..c7f91a294b 100644
--- a/keyboards/handwired/brain/info.json
+++ b/keyboards/handwired/brain/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [0, 6]
+    },
+    "split": {
+        "bootmagic": {
+            "matrix": [5, 0]
+        }
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/handwired/dactyl_manuform/5x6_2_5/config.h b/keyboards/handwired/dactyl_manuform/5x6_2_5/config.h
index a6840170ae..a6b36d163c 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_2_5/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6_2_5/config.h
@@ -32,12 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define DIODE_DIRECTION COL2ROW
 
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 0
-
-#define BOOTMAGIC_LITE_ROW_RIGHT 6
-#define BOOTMAGIC_LITE_COLUMN_RIGHT 5
-
 // WS2812 RGB LED strip input and number of LEDs
 // #define RGB_DI_PIN D3
 // #define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json b/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json
index 9ca8136ede..12b8c20c5a 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json
+++ b/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3536",
         "device_version": "0.0.3"
     },
+    "split": {
+        "bootmagic": {
+            "matrix": [6, 5]
+        }
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/config.h b/keyboards/handwired/dactyl_manuform/5x6_5/config.h
index eacb178e46..cc21709a9c 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_5/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6_5/config.h
@@ -30,12 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define DIODE_DIRECTION COL2ROW
 
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 0
-
-#define BOOTMAGIC_LITE_ROW_RIGHT 6
-#define BOOTMAGIC_LITE_COLUMN_RIGHT 5
-
 // WS2812 RGB LED strip input and number of LEDs
 // #define RGB_DI_PIN D3
 // #define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/info.json b/keyboards/handwired/dactyl_manuform/5x6_5/info.json
index c99a1cd8ff..b8fda10021 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_5/info.json
+++ b/keyboards/handwired/dactyl_manuform/5x6_5/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3536",
         "device_version": "0.0.2"
     },
+    "split": {
+        "bootmagic": {
+            "matrix": [6, 5]
+        }
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/config.h b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/config.h
index 99a36c5905..717e0e98f0 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/config.h
+++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/config.h
@@ -24,11 +24,6 @@
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-#define BOOTMAGIC_LITE_ROW          0
-#define BOOTMAGIC_LITE_COLUMN       0
-#define BOOTMAGIC_LITE_ROW_RIGHT    7
-#define BOOTMAGIC_LITE_COLUMN_RIGHT 0
-
 // in col2row col is input, and row is output
 // #define SPLIT_HAND_MATRIX_GRID A10, A4
 // 68kohm
diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json
index 2517a82403..f28579ba5f 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json
@@ -1,4 +1,9 @@
 {
+    "split": {
+        "bootmagic": {
+            "matrix": [7, 0]
+        }
+    },
     "processor": "STM32F411",
     "bootloader": "stm32-dfu",
     "board": "BLACKPILL_STM32_F411"
diff --git a/keyboards/handwired/daskeyboard/daskeyboard4/config.h b/keyboards/handwired/daskeyboard/daskeyboard4/config.h
deleted file mode 100644
index df121b6832..0000000000
--- a/keyboards/handwired/daskeyboard/daskeyboard4/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2022 Commander1024 (@Commander1024)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-/* configure bootmagic lite trigger to ESC */
-#define BOOTMAGIC_LITE_ROW 5
-#define BOOTMAGIC_LITE_COLUMN 16
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/handwired/daskeyboard/daskeyboard4/info.json b/keyboards/handwired/daskeyboard/daskeyboard4/info.json
index a61443000d..067450ae0b 100644
--- a/keyboards/handwired/daskeyboard/daskeyboard4/info.json
+++ b/keyboards/handwired/daskeyboard/daskeyboard4/info.json
@@ -26,6 +26,9 @@
         "vid": "0xFEED",
         "pid": "0x0140"
     },
+    "bootmagic": {
+        "matrix": [5, 16]
+    },
     "indicators": {
         "num_lock": "C13",
         "caps_lock": "B14",
diff --git a/keyboards/handwired/dc/mc/001/config.h b/keyboards/handwired/dc/mc/001/config.h
index ecc1bc9c52..7be4ba0aa9 100644
--- a/keyboards/handwired/dc/mc/001/config.h
+++ b/keyboards/handwired/dc/mc/001/config.h
@@ -43,10 +43,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define NO_ACTION_TAPPING
 #define NO_ACTION_ONESHOT
 
-/* Bootmagic Lite key configuration */
-// The (default) Stop key
-// Doesn't work, though. Maybe becuase of the bootloader that's in use?
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 1
-
 #define USB_MAX_POWER_CONSUMPTION 100
diff --git a/keyboards/handwired/dc/mc/001/info.json b/keyboards/handwired/dc/mc/001/info.json
index 2bcd5ffd92..d14c92150b 100644
--- a/keyboards/handwired/dc/mc/001/info.json
+++ b/keyboards/handwired/dc/mc/001/info.json
@@ -8,6 +8,9 @@
         "pid": "0x4D43",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [0, 1]
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "matrix_pins": {
diff --git a/keyboards/handwired/frankie_macropad/config.h b/keyboards/handwired/frankie_macropad/config.h
index f4ba32d5a6..6d0aa48c7c 100644
--- a/keyboards/handwired/frankie_macropad/config.h
+++ b/keyboards/handwired/frankie_macropad/config.h
@@ -60,9 +60,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 #define NO_ACTION_ONESHOT
 
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 2
-#define BOOTMAGIC_LITE_COLUMN 0
-
 #define ENCODERS_PAD_A { D0, D2 }
 #define ENCODERS_PAD_B { D1, D3 }
diff --git a/keyboards/handwired/frankie_macropad/info.json b/keyboards/handwired/frankie_macropad/info.json
index f206c366a5..3ddf407549 100644
--- a/keyboards/handwired/frankie_macropad/info.json
+++ b/keyboards/handwired/frankie_macropad/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [2, 0]
+    },
     "processor": "atmega16u2",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/handwired/jscotto/scottocmd/config.h b/keyboards/handwired/jscotto/scottocmd/config.h
index db72806f86..a168f0ef21 100644
--- a/keyboards/handwired/jscotto/scottocmd/config.h
+++ b/keyboards/handwired/jscotto/scottocmd/config.h
@@ -17,9 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// Define tab key for boot magic
-#define BOOTMAGIC_LITE_ROW 1
-#define BOOTMAGIC_LITE_COLUMN 0
-
 // OLED 
 #define OLED_DISPLAY_128X64
\ No newline at end of file
diff --git a/keyboards/handwired/jscotto/scottocmd/info.json b/keyboards/handwired/jscotto/scottocmd/info.json
index b2040fb7ab..51bf76595d 100644
--- a/keyboards/handwired/jscotto/scottocmd/info.json
+++ b/keyboards/handwired/jscotto/scottocmd/info.json
@@ -38,6 +38,9 @@
         "pid": "0x0000",
         "vid": "0xFEED"
     },
+    "bootmagic": {
+        "matrix": [1, 0]
+    },
     "layouts": {
         "LAYOUT_ortho_4_3x10_4": {
             "layout": [
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/config.h b/keyboards/handwired/tractyl_manuform/4x6_right/config.h
index a861c59889..9bdb4f268e 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/config.h
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/config.h
@@ -47,12 +47,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define ROTATIONAL_TRANSFORM_ANGLE     -25
 
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW             0
-#define BOOTMAGIC_LITE_COLUMN          0
-#define BOOTMAGIC_LITE_ROW_RIGHT       4
-#define BOOTMAGIC_LITE_COLUMN_RIGHT    5
-
 #define AUDIO_PIN                      C6
 #define AUDIO_PIN_ALT                  B7
 
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/info.json b/keyboards/handwired/tractyl_manuform/4x6_right/info.json
index 9ea6febd4a..1880e66b8d 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/info.json
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/info.json
@@ -6,6 +6,11 @@
         "pid": "0x3537",
         "device_version": "0.0.1"
     },
+    "split": {
+        "bootmagic": {
+            "matrix": [4, 5]
+        }
+    },
     "processor": "at90usb1286",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/config.h
index 237ff5ec76..d89cf6f2b4 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/config.h
@@ -29,12 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ROTATIONAL_TRANSFORM_ANGLE  -25
 #define POINTING_DEVICE_INVERT_X
 
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW          0
-#define BOOTMAGIC_LITE_COLUMN       0
-#define BOOTMAGIC_LITE_ROW_RIGHT    6
-#define BOOTMAGIC_LITE_COLUMN_RIGHT 5
-
 #define DYNAMIC_KEYMAP_LAYER_COUNT  16
 #define LAYER_STATE_16BIT
 
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/info.json
index 5000486242..1ea3e6ab8b 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/info.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/info.json
@@ -4,6 +4,11 @@
         "pid": "0x3536",
         "device_version": "0.0.1"
     },
+    "split": {
+        "bootmagic": {
+            "matrix": [6, 5]
+        }
+    },
     "layouts": {
         "LAYOUT_5x6_right": {
             "layout": [
diff --git a/keyboards/handwired/videowriter/config.h b/keyboards/handwired/videowriter/config.h
index 12961d531f..aa498a7e4a 100644
--- a/keyboards/handwired/videowriter/config.h
+++ b/keyboards/handwired/videowriter/config.h
@@ -42,7 +42,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 1
-#define BOOTMAGIC_LITE_COLUMN 7
diff --git a/keyboards/handwired/videowriter/info.json b/keyboards/handwired/videowriter/info.json
index 59ea1c0613..329085fe85 100644
--- a/keyboards/handwired/videowriter/info.json
+++ b/keyboards/handwired/videowriter/info.json
@@ -8,6 +8,9 @@
         "pid": "0x5657",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [1, 7]
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {