From 3bf01bb9ed202b14f78105db2aa2a75d01fc4323 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 23 Feb 2023 09:20:23 +1100 Subject: Move QMK LUFA bootloader config to data driven (#19879) --- keyboards/4pplet/aekiso60/rev_a/config.h | 3 --- keyboards/4pplet/aekiso60/rev_a/info.json | 4 ++++ keyboards/4pplet/aekiso60/rev_b/config.h | 3 --- keyboards/4pplet/bootleg/rev_a/config.h | 3 --- keyboards/4pplet/bootleg/rev_a/info.json | 4 ++++ keyboards/4pplet/steezy60/rev_a/config.h | 3 --- keyboards/4pplet/steezy60/rev_a/info.json | 4 ++++ keyboards/4pplet/waffling60/rev_a/config.h | 3 --- keyboards/4pplet/waffling60/rev_a/info.json | 4 ++++ keyboards/4pplet/waffling60/rev_b/config.h | 3 --- keyboards/4pplet/waffling60/rev_b/info.json | 4 ++++ keyboards/4pplet/waffling60/rev_c/config.h | 3 --- keyboards/4pplet/waffling60/rev_c/info.json | 4 ++++ keyboards/4pplet/waffling60/rev_d/config.h | 3 --- keyboards/4pplet/waffling60/rev_d_ansi/config.h | 3 --- keyboards/4pplet/waffling60/rev_d_iso/config.h | 3 --- keyboards/4pplet/waffling80/rev_a/config.h | 3 --- keyboards/4pplet/waffling80/rev_a/info.json | 4 ++++ keyboards/4pplet/waffling80/rev_b/config.h | 3 --- 19 files changed, 28 insertions(+), 36 deletions(-) (limited to 'keyboards/4pplet') diff --git a/keyboards/4pplet/aekiso60/rev_a/config.h b/keyboards/4pplet/aekiso60/rev_a/config.h index da29046991..f7ef22d986 100644 --- 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 index e43265fcdd..9932b6ec55 100644 --- 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 index 1162b4acd1..b5602b1cc0 100644 --- 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 . /* 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 index 5ce36a22bd..b1743d0982 100644 --- 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 . /* 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 index 5654de5fa9..8f3b5eb2bf 100644 --- 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 index 9b3480fe8f..f7ef22d986 100644 --- 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 index d2c271ba63..b6e9c37ba2 100644 --- 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 index 302d40911e..670c8132a1 100644 --- 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 . /* 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 index 872b9a8116..0b98be4876 100644 --- 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 index 8f56bc1327..7c1e13ce84 100644 --- 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 . /* 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 index 4a1cf0180c..866ae5c1ac 100644 --- 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 index 015532bb8c..689a515013 100644 --- 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 . /* 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 index 20e4445b2a..1a6937b096 100644 --- 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 index a1f5ac032d..05e66f6a79 100644 --- 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 . /* 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 index 255ba2f2d5..beb204bb2d 100644 --- 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 . /* 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 index 06c34408f3..cb2e06921a 100644 --- 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 . /* 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 index cc729dc505..8b3dc47247 100644 --- 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 . /* 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 index 1f334dcb63..13bffb7384 100644 --- 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 index c065fac544..c863208012 100644 --- 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 . /* 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 -- cgit v1.2.3