From f6dd8dea2e493dc549a60fee99de871c4088d09a Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Tue, 31 Jan 2023 06:03:30 +1100 Subject: Remove usages of config_common.h from config.h files. (#19714) --- keyboards/recompile_keys/choco60/config.h | 1 - 1 file changed, 1 deletion(-) (limited to 'keyboards/recompile_keys/choco60') diff --git a/keyboards/recompile_keys/choco60/config.h b/keyboards/recompile_keys/choco60/config.h index 5a017cbc4b..e6fc72a63c 100644 --- a/keyboards/recompile_keys/choco60/config.h +++ b/keyboards/recompile_keys/choco60/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 10 -- cgit v1.2.3 From 11b6bb8179ce93c5954c96e24ef6dd09c497a131 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 7 Feb 2023 11:05:37 +1100 Subject: Remove unused Bootmagic row/col defines from config.h (#19761) --- keyboards/recompile_keys/choco60/config.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'keyboards/recompile_keys/choco60') diff --git a/keyboards/recompile_keys/choco60/config.h b/keyboards/recompile_keys/choco60/config.h index e6fc72a63c..d23942ba86 100644 --- a/keyboards/recompile_keys/choco60/config.h +++ b/keyboards/recompile_keys/choco60/config.h @@ -21,7 +21,3 @@ along with this program. If not, see . /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 9 - -/* Bootmagic Lite key configuration */ -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 0 -- cgit v1.2.3 From f9aeea64c1f85d388485503e52035b5f7533ed26 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 8 Feb 2023 18:41:46 +1100 Subject: Migrate `MCU` and `BOOTLOADER` to data-driven (#19529) --- keyboards/recompile_keys/choco60/rev1/info.json | 4 ++++ keyboards/recompile_keys/choco60/rev1/rules.mk | 6 ------ keyboards/recompile_keys/choco60/rev2/info.json | 4 ++++ keyboards/recompile_keys/choco60/rev2/rules.mk | 6 ------ 4 files changed, 8 insertions(+), 12 deletions(-) create mode 100644 keyboards/recompile_keys/choco60/rev1/info.json create mode 100644 keyboards/recompile_keys/choco60/rev2/info.json (limited to 'keyboards/recompile_keys/choco60') diff --git a/keyboards/recompile_keys/choco60/rev1/info.json b/keyboards/recompile_keys/choco60/rev1/info.json new file mode 100644 index 0000000000..4369a04103 --- /dev/null +++ b/keyboards/recompile_keys/choco60/rev1/info.json @@ -0,0 +1,4 @@ +{ + "processor": "atmega32u4", + "bootloader": "caterina" +} diff --git a/keyboards/recompile_keys/choco60/rev1/rules.mk b/keyboards/recompile_keys/choco60/rev1/rules.mk index ff16426c32..b74db0a672 100644 --- a/keyboards/recompile_keys/choco60/rev1/rules.mk +++ b/keyboards/recompile_keys/choco60/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/recompile_keys/choco60/rev2/info.json b/keyboards/recompile_keys/choco60/rev2/info.json new file mode 100644 index 0000000000..dd190d18ee --- /dev/null +++ b/keyboards/recompile_keys/choco60/rev2/info.json @@ -0,0 +1,4 @@ +{ + "processor": "atmega32u2", + "bootloader": "atmel-dfu" +} diff --git a/keyboards/recompile_keys/choco60/rev2/rules.mk b/keyboards/recompile_keys/choco60/rev2/rules.mk index f8bad8e08e..ca4dbbab2f 100644 --- a/keyboards/recompile_keys/choco60/rev2/rules.mk +++ b/keyboards/recompile_keys/choco60/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # -- cgit v1.2.3 From 2da0827d4ffbcba161126d6001f370e97d0172a8 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Feb 2023 16:08:25 +1100 Subject: Remove matrix size defines (#19581) --- keyboards/recompile_keys/choco60/config.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'keyboards/recompile_keys/choco60') diff --git a/keyboards/recompile_keys/choco60/config.h b/keyboards/recompile_keys/choco60/config.h index d23942ba86..378fc07981 100644 --- a/keyboards/recompile_keys/choco60/config.h +++ b/keyboards/recompile_keys/choco60/config.h @@ -16,8 +16,3 @@ along with this program. If not, see . */ #pragma once - - -/* key matrix size */ -#define MATRIX_ROWS 10 -#define MATRIX_COLS 9 -- cgit v1.2.3 From 8f6c228adbfec98828f0411f62bab07f96e5c020 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Feb 2023 16:40:49 +1100 Subject: Move `SOFT_SERIAL_PIN` to data driven (#19863) --- keyboards/recompile_keys/choco60/rev1/config.h | 4 ---- keyboards/recompile_keys/choco60/rev1/info.json | 3 +++ keyboards/recompile_keys/choco60/rev2/config.h | 4 ---- keyboards/recompile_keys/choco60/rev2/info.json | 3 +++ 4 files changed, 6 insertions(+), 8 deletions(-) (limited to 'keyboards/recompile_keys/choco60') diff --git a/keyboards/recompile_keys/choco60/rev1/config.h b/keyboards/recompile_keys/choco60/rev1/config.h index d8b3d2904d..20fefc2180 100644 --- a/keyboards/recompile_keys/choco60/rev1/config.h +++ b/keyboards/recompile_keys/choco60/rev1/config.h @@ -33,8 +33,4 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -/* - * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. - */ -#define SOFT_SERIAL_PIN D3 // or D1, D2, D3, E6 #define SPLIT_HAND_PIN D0 diff --git a/keyboards/recompile_keys/choco60/rev1/info.json b/keyboards/recompile_keys/choco60/rev1/info.json index 4369a04103..81738c4d47 100644 --- a/keyboards/recompile_keys/choco60/rev1/info.json +++ b/keyboards/recompile_keys/choco60/rev1/info.json @@ -1,4 +1,7 @@ { + "split": { + "soft_serial_pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina" } diff --git a/keyboards/recompile_keys/choco60/rev2/config.h b/keyboards/recompile_keys/choco60/rev2/config.h index 5db3a06352..0540d16151 100644 --- a/keyboards/recompile_keys/choco60/rev2/config.h +++ b/keyboards/recompile_keys/choco60/rev2/config.h @@ -36,10 +36,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -/* - * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. - */ -#define SOFT_SERIAL_PIN D0 #define SPLIT_HAND_PIN D1 #define SPLIT_USB_DETECT diff --git a/keyboards/recompile_keys/choco60/rev2/info.json b/keyboards/recompile_keys/choco60/rev2/info.json index dd190d18ee..a768c060db 100644 --- a/keyboards/recompile_keys/choco60/rev2/info.json +++ b/keyboards/recompile_keys/choco60/rev2/info.json @@ -1,4 +1,7 @@ { + "split": { + "soft_serial_pin": "D0" + }, "processor": "atmega32u2", "bootloader": "atmel-dfu" } -- cgit v1.2.3