From d784f78bd0a034c1d6085379615014fd701536ab Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Feb 2023 08:49:49 +1100 Subject: Move Bootmagic config to data driven (#19860) --- keyboards/duck/eagle_viper/v2/config.h | 4 ---- keyboards/duck/eagle_viper/v2/info.json | 3 +++ keyboards/duck/jetfire/config.h | 4 ---- keyboards/duck/jetfire/info.json | 3 +++ keyboards/duck/lightsaver/config.h | 4 ---- keyboards/duck/lightsaver/info.json | 3 +++ keyboards/duck/octagon/v1/config.h | 4 ---- keyboards/duck/octagon/v1/info.json | 3 +++ keyboards/duck/octagon/v2/config.h | 4 ---- keyboards/duck/octagon/v2/info.json | 3 +++ keyboards/duck/orion/v3/config.h | 4 ---- keyboards/duck/orion/v3/info.json | 3 +++ keyboards/duck/tcv3/config.h | 4 ---- keyboards/duck/tcv3/info.json | 3 +++ 14 files changed, 21 insertions(+), 28 deletions(-) (limited to 'keyboards/duck') diff --git a/keyboards/duck/eagle_viper/v2/config.h b/keyboards/duck/eagle_viper/v2/config.h index 7feddfd575..a8834cb0b9 100644 --- a/keyboards/duck/eagle_viper/v2/config.h +++ b/keyboards/duck/eagle_viper/v2/config.h @@ -39,8 +39,4 @@ along with this program. If not, see . #define RGB_DI_PIN D6 #define RGBLED_NUM 17 -/* Set to top left most key */ -#define BOOTMAGIC_LITE_ROW 4 -#define BOOTMAGIC_LITE_COLUMN 10 - #define TAPPING_TERM 200 diff --git a/keyboards/duck/eagle_viper/v2/info.json b/keyboards/duck/eagle_viper/v2/info.json index c4d9ffa869..614e75c4c9 100644 --- a/keyboards/duck/eagle_viper/v2/info.json +++ b/keyboards/duck/eagle_viper/v2/info.json @@ -6,6 +6,9 @@ "pid": "0x4556", "device_version": "0.0.2" }, + "bootmagic": { + "matrix": [4, 10] + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/duck/jetfire/config.h b/keyboards/duck/jetfire/config.h index 5a1562f4a4..874997ab56 100644 --- a/keyboards/duck/jetfire/config.h +++ b/keyboards/duck/jetfire/config.h @@ -40,10 +40,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_TWINKLE #define RGBLED_NUM 23 -/* Set to top left most key */ -#define BOOTMAGIC_LITE_ROW 5 -#define BOOTMAGIC_LITE_COLUMN 10 - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/duck/jetfire/info.json b/keyboards/duck/jetfire/info.json index ae158863a0..3fc7b030ed 100644 --- a/keyboards/duck/jetfire/info.json +++ b/keyboards/duck/jetfire/info.json @@ -8,6 +8,9 @@ "pid": "0x4A46", "device_version": "0.0.1" }, + "bootmagic": { + "matrix": [5, 10] + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/duck/lightsaver/config.h b/keyboards/duck/lightsaver/config.h index 88cd81f7d3..1fa9980c8c 100644 --- a/keyboards/duck/lightsaver/config.h +++ b/keyboards/duck/lightsaver/config.h @@ -39,8 +39,4 @@ along with this program. If not, see . #define RGB_DI_PIN D6 #define RGBLED_NUM 17 -/* Set to top left most key */ -#define BOOTMAGIC_LITE_ROW 5 -#define BOOTMAGIC_LITE_COLUMN 10 - #define TAPPING_TERM 200 diff --git a/keyboards/duck/lightsaver/info.json b/keyboards/duck/lightsaver/info.json index 9067ca8f60..3f434820be 100644 --- a/keyboards/duck/lightsaver/info.json +++ b/keyboards/duck/lightsaver/info.json @@ -8,6 +8,9 @@ "pid": "0x4C53", "device_version": "0.0.3" }, + "bootmagic": { + "matrix": [5, 10] + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/duck/octagon/v1/config.h b/keyboards/duck/octagon/v1/config.h index fe44ef5126..c19aa1f22d 100644 --- a/keyboards/duck/octagon/v1/config.h +++ b/keyboards/duck/octagon/v1/config.h @@ -39,8 +39,4 @@ along with this program. If not, see . #define RGB_DI_PIN D6 #define RGBLED_NUM 17 -/* Set to top left most key */ -#define BOOTMAGIC_LITE_ROW 5 -#define BOOTMAGIC_LITE_COLUMN 10 - #define TAPPING_TERM 200 diff --git a/keyboards/duck/octagon/v1/info.json b/keyboards/duck/octagon/v1/info.json index c8208f0697..8eaf8fb0d9 100644 --- a/keyboards/duck/octagon/v1/info.json +++ b/keyboards/duck/octagon/v1/info.json @@ -8,6 +8,9 @@ "pid": "0x4F31", "device_version": "0.0.1" }, + "bootmagic": { + "matrix": [5, 10] + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["75_ansi"], diff --git a/keyboards/duck/octagon/v2/config.h b/keyboards/duck/octagon/v2/config.h index 12f8bf1f0c..d1f2971077 100644 --- a/keyboards/duck/octagon/v2/config.h +++ b/keyboards/duck/octagon/v2/config.h @@ -39,8 +39,4 @@ along with this program. If not, see . #define RGB_DI_PIN D6 #define RGBLED_NUM 17 -/* Set to top left most key */ -#define BOOTMAGIC_LITE_ROW 5 -#define BOOTMAGIC_LITE_COLUMN 10 - #define TAPPING_TERM 200 diff --git a/keyboards/duck/octagon/v2/info.json b/keyboards/duck/octagon/v2/info.json index 95f8886a38..220196e9fc 100644 --- a/keyboards/duck/octagon/v2/info.json +++ b/keyboards/duck/octagon/v2/info.json @@ -8,6 +8,9 @@ "pid": "0x4F32", "device_version": "0.0.2" }, + "bootmagic": { + "matrix": [5, 10] + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["75_ansi"], diff --git a/keyboards/duck/orion/v3/config.h b/keyboards/duck/orion/v3/config.h index 1a13f8d7f6..908bad5bde 100644 --- a/keyboards/duck/orion/v3/config.h +++ b/keyboards/duck/orion/v3/config.h @@ -42,8 +42,4 @@ along with this program. If not, see . #define RGB_DI_PIN D6 #define RGBLED_NUM 18 -/* Set to top left most key */ -#define BOOTMAGIC_LITE_ROW 4 -#define BOOTMAGIC_LITE_COLUMN 10 - #define TAPPING_TERM 200 diff --git a/keyboards/duck/orion/v3/info.json b/keyboards/duck/orion/v3/info.json index 576c4945e5..f96e5b9ca5 100644 --- a/keyboards/duck/orion/v3/info.json +++ b/keyboards/duck/orion/v3/info.json @@ -8,6 +8,9 @@ "pid": "0x4F52", "device_version": "0.0.2" }, + "bootmagic": { + "matrix": [4, 10] + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["tkl_ansi"], diff --git a/keyboards/duck/tcv3/config.h b/keyboards/duck/tcv3/config.h index e7f8fb9346..4cb83d43fa 100644 --- a/keyboards/duck/tcv3/config.h +++ b/keyboards/duck/tcv3/config.h @@ -36,7 +36,3 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_TWINKLE #define RGB_DI_PIN D6 #define RGBLED_NUM 17 - -/* Set to top left most key */ -#define BOOTMAGIC_LITE_ROW 5 -#define BOOTMAGIC_LITE_COLUMN 10 diff --git a/keyboards/duck/tcv3/info.json b/keyboards/duck/tcv3/info.json index 8cb7bfa08e..9b8b20e80e 100644 --- a/keyboards/duck/tcv3/info.json +++ b/keyboards/duck/tcv3/info.json @@ -8,6 +8,9 @@ "pid": "0x5443", "device_version": "0.0.1" }, + "bootmagic": { + "matrix": [5, 10] + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { -- cgit v1.2.3