summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--keyboards/cannonkeys/aella/info.json8
-rw-r--r--keyboards/cannonkeys/aella/rules.mk14
-rw-r--r--keyboards/cannonkeys/an_c/info.json10
-rw-r--r--keyboards/cannonkeys/an_c/rules.mk13
-rw-r--r--keyboards/cannonkeys/balance/info.json9
-rw-r--r--keyboards/cannonkeys/balance/rules.mk15
-rw-r--r--keyboards/cannonkeys/brutalv2_65/info.json8
-rw-r--r--keyboards/cannonkeys/brutalv2_65/rules.mk14
-rw-r--r--keyboards/cannonkeys/cloudline/info.json10
-rw-r--r--keyboards/cannonkeys/cloudline/rules.mk14
-rw-r--r--keyboards/cannonkeys/crin/info.json9
-rw-r--r--keyboards/cannonkeys/crin/rules.mk14
-rw-r--r--keyboards/cannonkeys/db60/info.json12
-rw-r--r--keyboards/cannonkeys/db60/rules.mk13
-rw-r--r--keyboards/cannonkeys/devastatingtkl/info.json10
-rw-r--r--keyboards/cannonkeys/devastatingtkl/rules.mk13
-rw-r--r--keyboards/cannonkeys/gentoo/info.json8
-rw-r--r--keyboards/cannonkeys/gentoo/rules.mk14
-rw-r--r--keyboards/cannonkeys/gentoo_hs/info.json8
-rw-r--r--keyboards/cannonkeys/gentoo_hs/rules.mk14
-rw-r--r--keyboards/cannonkeys/instant60/info.json10
-rw-r--r--keyboards/cannonkeys/instant60/rules.mk13
-rw-r--r--keyboards/cannonkeys/instant65/info.json10
-rw-r--r--keyboards/cannonkeys/instant65/rules.mk14
-rw-r--r--keyboards/cannonkeys/malicious_ergo/info.json10
-rw-r--r--keyboards/cannonkeys/malicious_ergo/rules.mk14
-rw-r--r--keyboards/cannonkeys/obliterated75/info.json10
-rw-r--r--keyboards/cannonkeys/obliterated75/rules.mk14
-rw-r--r--keyboards/cannonkeys/onyx/info.json9
-rw-r--r--keyboards/cannonkeys/onyx/rules.mk14
-rw-r--r--keyboards/cannonkeys/rekt1800/info.json9
-rw-r--r--keyboards/cannonkeys/rekt1800/rules.mk13
-rw-r--r--keyboards/cannonkeys/sagittarius/info.json10
-rw-r--r--keyboards/cannonkeys/sagittarius/rules.mk14
-rw-r--r--keyboards/cannonkeys/savage65/info.json10
-rw-r--r--keyboards/cannonkeys/savage65/rules.mk13
-rw-r--r--keyboards/cannonkeys/tmov2/info.json10
-rw-r--r--keyboards/cannonkeys/tmov2/rules.mk13
-rw-r--r--keyboards/cannonkeys/tsukuyomi/info.json10
-rw-r--r--keyboards/cannonkeys/tsukuyomi/rules.mk14
-rw-r--r--keyboards/cannonkeys/vicious40/info.json9
-rw-r--r--keyboards/cannonkeys/vicious40/rules.mk14
-rw-r--r--keyboards/centromere/info.json8
-rw-r--r--keyboards/centromere/rules.mk13
-rw-r--r--keyboards/checkerboards/phoenix45_ortho/info.json9
-rw-r--r--keyboards/checkerboards/phoenix45_ortho/rules.mk14
-rw-r--r--keyboards/checkerboards/quark/info.json10
-rw-r--r--keyboards/checkerboards/quark/rules.mk16
-rw-r--r--keyboards/checkerboards/quark_squared/info.json10
-rw-r--r--keyboards/checkerboards/quark_squared/rules.mk14
-rw-r--r--keyboards/checkerboards/snop60/keyboard.json (renamed from keyboards/checkerboards/snop60/info.json)13
-rw-r--r--keyboards/checkerboards/snop60/rules.mk13
-rw-r--r--keyboards/chlx/str_merro60/keyboard.json (renamed from keyboards/chlx/str_merro60/info.json)8
-rw-r--r--keyboards/chlx/str_merro60/rules.mk14
-rw-r--r--keyboards/cipulot/kawayo/keyboard.json (renamed from keyboards/cipulot/kawayo/info.json)11
-rw-r--r--keyboards/cipulot/kawayo/rules.mk14
-rw-r--r--keyboards/clueboard/66_hotswap/prototype/keyboard.json (renamed from keyboards/clueboard/66_hotswap/prototype/info.json)3
-rw-r--r--keyboards/clueboard/66_hotswap/prototype/rules.mk1
-rw-r--r--keyboards/coarse/ixora/keyboard.json (renamed from keyboards/coarse/ixora/info.json)6
-rw-r--r--keyboards/coarse/ixora/rules.mk10
-rw-r--r--keyboards/coarse/vinta/keyboard.json (renamed from keyboards/coarse/vinta/info.json)6
-rw-r--r--keyboards/coarse/vinta/rules.mk10
-rw-r--r--keyboards/controllerworks/city42/info.json5
-rw-r--r--keyboards/controllerworks/city42/rules.mk3
-rw-r--r--keyboards/converter/adb_usb/info.json5
-rw-r--r--keyboards/converter/adb_usb/rules.mk12
-rw-r--r--keyboards/converter/hp_46010a/info.json7
-rw-r--r--keyboards/converter/hp_46010a/rules.mk13
-rw-r--r--keyboards/converter/ibm_terminal/info.json7
-rw-r--r--keyboards/converter/ibm_terminal/rules.mk13
-rw-r--r--keyboards/converter/m0110_usb/info.json7
-rw-r--r--keyboards/converter/m0110_usb/rules.mk11
-rw-r--r--keyboards/converter/palm_usb/info.json9
-rw-r--r--keyboards/converter/palm_usb/rules.mk12
-rw-r--r--keyboards/converter/periboard_512/keyboard.json (renamed from keyboards/converter/periboard_512/info.json)5
-rw-r--r--keyboards/converter/periboard_512/rules.mk12
-rw-r--r--keyboards/converter/siemens_tastatur/info.json9
-rw-r--r--keyboards/converter/siemens_tastatur/rules.mk17
-rw-r--r--keyboards/converter/sun_usb/info.json10
-rw-r--r--keyboards/converter/sun_usb/rules.mk12
-rw-r--r--keyboards/converter/xt_usb/info.json8
-rw-r--r--keyboards/converter/xt_usb/rules.mk12
-rw-r--r--keyboards/coseyfannitutti/discipline/info.json5
-rw-r--r--keyboards/coseyfannitutti/discipline/rules.mk13
-rw-r--r--keyboards/coseyfannitutti/mysterium/info.json5
-rw-r--r--keyboards/coseyfannitutti/mysterium/rules.mk13
-rw-r--r--keyboards/cozykeys/speedo/v3/info.json6
-rw-r--r--keyboards/cozykeys/speedo/v3/rules.mk13
-rw-r--r--keyboards/crimsonkeyboards/resume1800/info.json5
-rw-r--r--keyboards/crimsonkeyboards/resume1800/rules.mk13
-rw-r--r--keyboards/crypt_macro/info.json7
-rw-r--r--keyboards/crypt_macro/rules.mk13
-rw-r--r--keyboards/custommk/genesis/rev1/keyboard.json8
-rw-r--r--keyboards/custommk/genesis/rev2/keyboard.json (renamed from keyboards/custommk/genesis/rev2/info.json)8
-rw-r--r--keyboards/custommk/genesis/rev2/rules.mk13
-rw-r--r--keyboards/custommk/genesis/rules.mk14
96 files changed, 395 insertions, 620 deletions
diff --git a/keyboards/cannonkeys/aella/info.json b/keyboards/cannonkeys/aella/info.json
index 0cab722338..54679d5792 100644
--- a/keyboards/cannonkeys/aella/info.json
+++ b/keyboards/cannonkeys/aella/info.json
@@ -15,6 +15,14 @@
15 "diode_direction": "COL2ROW", 15 "diode_direction": "COL2ROW",
16 "processor": "STM32F072", 16 "processor": "STM32F072",
17 "bootloader": "stm32-dfu", 17 "bootloader": "stm32-dfu",
18 "features": {
19 "bootmagic": true,
20 "mousekey": true,
21 "extrakey": true,
22 "console": true,
23 "command": true,
24 "nkro": true
25 },
18 "layouts": { 26 "layouts": {
19 "LAYOUT_all": { 27 "LAYOUT_all": {
20 "layout": [ 28 "layout": [
diff --git a/keyboards/cannonkeys/aella/rules.mk b/keyboards/cannonkeys/aella/rules.mk
index 480e866179..0ab54aaaf7 100644
--- a/keyboards/cannonkeys/aella/rules.mk
+++ b/keyboards/cannonkeys/aella/rules.mk
@@ -1,16 +1,2 @@
1# Wildcard to allow APM32 MCU 1# Wildcard to allow APM32 MCU
2DFU_SUFFIX_ARGS = -v FFFF -p FFFF 2DFU_SUFFIX_ARGS = -v FFFF -p FFFF
3
4# Build Options
5# change yes to no to disable
6#
7BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
8MOUSEKEY_ENABLE = yes # Mouse keys
9EXTRAKEY_ENABLE = yes # Audio control and System control
10CONSOLE_ENABLE = yes # Console for debug
11COMMAND_ENABLE = yes # Commands for debug and configuration
12NKRO_ENABLE = yes # Enable N-Key Rollover
13BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
14RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
15AUDIO_ENABLE = no # Audio output
16
diff --git a/keyboards/cannonkeys/an_c/info.json b/keyboards/cannonkeys/an_c/info.json
index 9de1ff5fff..e1e18f5167 100644
--- a/keyboards/cannonkeys/an_c/info.json
+++ b/keyboards/cannonkeys/an_c/info.json
@@ -39,6 +39,16 @@
39 }, 39 },
40 "processor": "STM32F072", 40 "processor": "STM32F072",
41 "bootloader": "stm32-dfu", 41 "bootloader": "stm32-dfu",
42 "features": {
43 "bootmagic": true,
44 "mousekey": true,
45 "extrakey": true,
46 "console": true,
47 "command": true,
48 "nkro": true,
49 "backlight": true,
50 "rgblight": true
51 },
42 "community_layouts": ["60_ansi", "60_tsangan_hhkb"], 52 "community_layouts": ["60_ansi", "60_tsangan_hhkb"],
43 "layouts": { 53 "layouts": {
44 "LAYOUT_60_ansi": { 54 "LAYOUT_60_ansi": {
diff --git a/keyboards/cannonkeys/an_c/rules.mk b/keyboards/cannonkeys/an_c/rules.mk
index 8d3de1b8b2..0ab54aaaf7 100644
--- a/keyboards/cannonkeys/an_c/rules.mk
+++ b/keyboards/cannonkeys/an_c/rules.mk
@@ -1,15 +1,2 @@
1# Wildcard to allow APM32 MCU 1# Wildcard to allow APM32 MCU
2DFU_SUFFIX_ARGS = -v FFFF -p FFFF 2DFU_SUFFIX_ARGS = -v FFFF -p FFFF
3
4# Build Options
5# change yes to no to disable
6#
7BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
8MOUSEKEY_ENABLE = yes # Mouse keys
9EXTRAKEY_ENABLE = yes # Audio control and System control
10CONSOLE_ENABLE = yes # Console for debug
11COMMAND_ENABLE = yes # Commands for debug and configuration
12NKRO_ENABLE = yes # Enable N-Key Rollover
13BACKLIGHT_ENABLE = yes
14RGBLIGHT_ENABLE = yes
15
diff --git a/keyboards/cannonkeys/balance/info.json b/keyboards/cannonkeys/balance/info.json
index 9565795169..c7ecea37f8 100644
--- a/keyboards/cannonkeys/balance/info.json
+++ b/keyboards/cannonkeys/balance/info.json
@@ -28,6 +28,15 @@
28 }, 28 },
29 "processor": "STM32F072", 29 "processor": "STM32F072",
30 "bootloader": "stm32-dfu", 30 "bootloader": "stm32-dfu",
31 "features": {
32 "bootmagic": true,
33 "mousekey": true,
34 "extrakey": true,
35 "console": true,
36 "command": true,
37 "nkro": true,
38 "encoder": true
39 },
31 "layouts": { 40 "layouts": {
32 "LAYOUT_all": { 41 "LAYOUT_all": {
33 "layout": [ 42 "layout": [
diff --git a/keyboards/cannonkeys/balance/rules.mk b/keyboards/cannonkeys/balance/rules.mk
index 5afdd3772f..04fe1eba2a 100644
--- a/keyboards/cannonkeys/balance/rules.mk
+++ b/keyboards/cannonkeys/balance/rules.mk
@@ -1,17 +1,2 @@
1# Wildcard to allow APM32 MCU 1# Wildcard to allow APM32 MCU
2DFU_SUFFIX_ARGS = -p FFFF -v FFFF 2DFU_SUFFIX_ARGS = -p FFFF -v FFFF
3
4# Build Options
5# change yes to no to disable
6#
7BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
8MOUSEKEY_ENABLE = yes # Mouse keys
9EXTRAKEY_ENABLE = yes # Audio control and System control
10CONSOLE_ENABLE = yes # Console for debug
11COMMAND_ENABLE = yes # Commands for debug and configuration
12NKRO_ENABLE = yes # Enable N-Key Rollover
13BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
14RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
15AUDIO_ENABLE = no # Audio output
16ENCODER_ENABLE = yes
17
diff --git a/keyboards/cannonkeys/brutalv2_65/info.json b/keyboards/cannonkeys/brutalv2_65/info.json
index 0eddf11aaa..4cff1a7571 100644
--- a/keyboards/cannonkeys/brutalv2_65/info.json
+++ b/keyboards/cannonkeys/brutalv2_65/info.json
@@ -19,6 +19,14 @@
19 }, 19 },
20 "processor": "STM32F072", 20 "processor": "STM32F072",
21 "bootloader": "stm32-dfu", 21 "bootloader": "stm32-dfu",
22 "features": {
23 "bootmagic": true,
24 "mousekey": true,
25 "extrakey": true,
26 "console": true,
27 "command": true,
28 "nkro": true
29 },
22 "community_layouts": [ 30 "community_layouts": [
23 "65_ansi_blocker", 31 "65_ansi_blocker",
24 "65_ansi_blocker_split_bs", 32 "65_ansi_blocker_split_bs",
diff --git a/keyboards/cannonkeys/brutalv2_65/rules.mk b/keyboards/cannonkeys/brutalv2_65/rules.mk
index 480e866179..0ab54aaaf7 100644
--- a/keyboards/cannonkeys/brutalv2_65/rules.mk
+++ b/keyboards/cannonkeys/brutalv2_65/rules.mk
@@ -1,16 +1,2 @@
1# Wildcard to allow APM32 MCU 1# Wildcard to allow APM32 MCU
2DFU_SUFFIX_ARGS = -v FFFF -p FFFF 2DFU_SUFFIX_ARGS = -v FFFF -p FFFF
3
4# Build Options
5# change yes to no to disable
6#
7BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
8MOUSEKEY_ENABLE = yes # Mouse keys
9EXTRAKEY_ENABLE = yes # Audio control and System control
10CONSOLE_ENABLE = yes # Console for debug
11COMMAND_ENABLE = yes # Commands for debug and configuration
12NKRO_ENABLE = yes # Enable N-Key Rollover
13BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
14RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
15AUDIO_ENABLE = no # Audio output
16
diff --git a/keyboards/cannonkeys/cloudline/info.json b/keyboards/cannonkeys/cloudline/info.json
index d1bbce929a..ac1bca976b 100644
--- a/keyboards/cannonkeys/cloudline/info.json
+++ b/keyboards/cannonkeys/cloudline/info.json
@@ -44,6 +44,16 @@
44 }, 44 },
45 "processor": "STM32F072", 45 "processor": "STM32F072",
46 "bootloader": "stm32-dfu", 46 "bootloader": "stm32-dfu",
47 "features": {
48 "bootmagic": true,
49 "mousekey": true,
50 "extrakey": true,
51 "console": true,
52 "command": true,
53 "nkro": true,
54 "backlight": true,
55 "rgblight": true
56 },
47 "community_layouts": [ 57 "community_layouts": [
48 "tkl_f13_ansi_tsangan", 58 "tkl_f13_ansi_tsangan",
49 "tkl_f13_ansi_tsangan_split_bs_rshift", 59 "tkl_f13_ansi_tsangan_split_bs_rshift",
diff --git a/keyboards/cannonkeys/cloudline/rules.mk b/keyboards/cannonkeys/cloudline/rules.mk
index 86794ca0f7..0ab54aaaf7 100644
--- a/keyboards/cannonkeys/cloudline/rules.mk
+++ b/keyboards/cannonkeys/cloudline/rules.mk
@@ -1,16 +1,2 @@
1# Wildcard to allow APM32 MCU 1# Wildcard to allow APM32 MCU
2DFU_SUFFIX_ARGS = -v FFFF -p FFFF 2DFU_SUFFIX_ARGS = -v FFFF -p FFFF
3
4# Build Options
5# change yes to no to disable
6#
7BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
8MOUSEKEY_ENABLE = yes # Mouse keys
9EXTRAKEY_ENABLE = yes # Audio control and System control
10CONSOLE_ENABLE = yes # Console for debug
11COMMAND_ENABLE = yes # Commands for debug and configuration
12NKRO_ENABLE = yes # Enable N-Key Rollover
13BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
14RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
15AUDIO_ENABLE = no # Audio output
16
diff --git a/keyboards/cannonkeys/crin/info.json b/keyboards/cannonkeys/crin/info.json
index a8468b3ed3..f61d0e12e5 100644
--- a/keyboards/cannonkeys/crin/info.json
+++ b/keyboards/cannonkeys/crin/info.json
@@ -24,6 +24,15 @@
24 }, 24 },
25 "processor": "STM32F072", 25 "processor": "STM32F072",
26 "bootloader": "stm32-dfu", 26 "bootloader": "stm32-dfu",
27 "features": {
28 "bootmagic": true,
29 "mousekey": true,
30 "extrakey": true,
31 "console": true,
32 "command": true,
33 "nkro": true,
34 "backlight": true
35 },
27 "layout_aliases": { 36 "layout_aliases": {
28 "LAYOUT_all": "LAYOUT" 37 "LAYOUT_all": "LAYOUT"
29 }, 38 },
diff --git a/keyboards/cannonkeys/crin/rules.mk b/keyboards/cannonkeys/crin/rules.mk
index a5906b6a90..0ab54aaaf7 100644
--- a/keyboards/cannonkeys/crin/rules.mk
+++ b/keyboards/cannonkeys/crin/rules.mk
@@ -1,16 +1,2 @@
1# Wildcard to allow APM32 MCU 1# Wildcard to allow APM32 MCU
2DFU_SUFFIX_ARGS = -v FFFF -p FFFF 2DFU_SUFFIX_ARGS = -v FFFF -p FFFF
3
4# Build Options
5# change yes to no to disable
6#
7BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
8MOUSEKEY_ENABLE = yes # Mouse keys
9EXTRAKEY_ENABLE = yes # Audio control and System control
10CONSOLE_ENABLE = yes # Console for debug
11COMMAND_ENABLE = yes # Commands for debug and configuration
12NKRO_ENABLE = yes # Enable N-Key Rollover
13BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
14RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
15AUDIO_ENABLE = no # Audio output
16
diff --git a/keyboards/cannonkeys/db60/info.json b/keyboards/cannonkeys/db60/info.json
index 112ebaddde..0c437ed921 100644
--- a/keyboards/cannonkeys/db60/info.json
+++ b/keyboards/cannonkeys/db60/info.json
@@ -36,5 +36,15 @@
36 "driver": "spi" 36 "driver": "spi"
37 }, 37 },
38 "processor": "STM32F072", 38 "processor": "STM32F072",
39 "bootloader": "stm32-dfu" 39 "bootloader": "stm32-dfu",
40 "features": {
41 "bootmagic": true,
42 "mousekey": true,
43 "extrakey": true,
44 "console": true,
45 "command": true,
46 "nkro": true,
47 "backlight": true,
48 "rgblight": true
49 }
40} 50}
diff --git a/keyboards/cannonkeys/db60/rules.mk b/keyboards/cannonkeys/db60/rules.mk
index 023b329ad2..60addd7fe7 100644
--- a/keyboards/cannonkeys/db60/rules.mk
+++ b/keyboards/cannonkeys/db60/rules.mk
@@ -1,17 +1,4 @@
1# Wildcard to allow APM32 MCU 1# Wildcard to allow APM32 MCU
2DFU_SUFFIX_ARGS = -v FFFF -p FFFF 2DFU_SUFFIX_ARGS = -v FFFF -p FFFF
3 3
4# Build Options
5# change yes to no to disable
6#
7BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
8MOUSEKEY_ENABLE = yes # Mouse keys
9EXTRAKEY_ENABLE = yes # Audio control and System control
10CONSOLE_ENABLE = yes # Console for debug
11COMMAND_ENABLE = yes # Commands for debug and configuration
12NKRO_ENABLE = yes # Enable N-Key Rollover
13BACKLIGHT_ENABLE = yes
14RGBLIGHT_ENABLE = yes
15
16DEFAULT_FOLDER = cannonkeys/db60/rev2 4DEFAULT_FOLDER = cannonkeys/db60/rev2
17
diff --git a/keyboards/cannonkeys/devastatingtkl/info.json b/keyboards/cannonkeys/devastatingtkl/info.json
index a3b269f1cf..7acea3fe8b 100644
--- a/keyboards/cannonkeys/devastatingtkl/info.json
+++ b/keyboards/cannonkeys/devastatingtkl/info.json
@@ -39,6 +39,16 @@
39 }, 39 },
40 "processor": "STM32F072", 40 "processor": "STM32F072",
41 "bootloader": "stm32-dfu", 41 "bootloader": "stm32-dfu",
42 "features": {
43 "bootmagic": true,
44 "mousekey": true,
45 "extrakey": true,
46 "console": true,
47 "command": true,
48 "nkro": true,
49 "backlight": true,
50 "rgblight": true
51 },
42 "community_layouts": [ 52 "community_layouts": [
43 "tkl_f13_ansi", 53 "tkl_f13_ansi",
44 "tkl_f13_ansi_split_bs_rshift", 54 "tkl_f13_ansi_split_bs_rshift",
diff --git a/keyboards/cannonkeys/devastatingtkl/rules.mk b/keyboards/cannonkeys/devastatingtkl/rules.mk
index 8d3de1b8b2..0ab54aaaf7 100644
--- a/keyboards/cannonkeys/devastatingtkl/rules.mk
+++ b/keyboards/cannonkeys/devastatingtkl/rules.mk
@@ -1,15 +1,2 @@
1# Wildcard to allow APM32 MCU 1# Wildcard to allow APM32 MCU
2DFU_SUFFIX_ARGS = -v FFFF -p FFFF 2DFU_SUFFIX_ARGS = -v FFFF -p FFFF
3
4# Build Options
5# change yes to no to disable
6#
7BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
8MOUSEKEY_ENABLE = yes # Mouse keys
9EXTRAKEY_ENABLE = yes # Audio control and System control
10CONSOLE_ENABLE = yes # Console for debug
11COMMAND_ENABLE = yes # Commands for debug and configuration
12NKRO_ENABLE = yes # Enable N-Key Rollover
13BACKLIGHT_ENABLE = yes
14RGBLIGHT_ENABLE = yes
15
diff --git a/keyboards/cannonkeys/gentoo/info.json b/keyboards/cannonkeys/gentoo/info.json
index a371ae4232..3d8a4acac9 100644
--- a/keyboards/cannonkeys/gentoo/info.json
+++ b/keyboards/cannonkeys/gentoo/info.json
@@ -19,6 +19,14 @@
19 }, 19 },
20 "processor": "STM32F072", 20 "processor": "STM32F072",
21 "bootloader": "stm32-dfu", 21 "bootloader": "stm32-dfu",
22 "features": {
23 "bootmagic": true,
24 "mousekey": true,
25 "extrakey": true,
26 "console": true,
27 "command": true,
28 "nkro": true
29 },
22 "community_layouts": [ 30 "community_layouts": [
23 "65_ansi", 31 "65_ansi",
24 "65_ansi_split_bs", 32 "65_ansi_split_bs",
diff --git a/keyboards/cannonkeys/gentoo/rules.mk b/keyboards/cannonkeys/gentoo/rules.mk
index 480e866179..0ab54aaaf7 100644
--- a/keyboards/cannonkeys/gentoo/rules.mk
+++ b/keyboards/cannonkeys/gentoo/rules.mk
@@ -1,16 +1,2 @@
1# Wildcard to allow APM32 MCU 1# Wildcard to allow APM32 MCU
2DFU_SUFFIX_ARGS = -v FFFF -p FFFF 2DFU_SUFFIX_ARGS = -v FFFF -p FFFF
3
4# Build Options
5# change yes to no to disable
6#
7BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
8MOUSEKEY_ENABLE = yes # Mouse keys
9EXTRAKEY_ENABLE = yes # Audio control and System control
10CONSOLE_ENABLE = yes # Console for debug
11COMMAND_ENABLE = yes # Commands for debug and configuration
12NKRO_ENABLE = yes # Enable N-Key Rollover
13BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
14RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
15AUDIO_ENABLE = no # Audio output
16
diff --git a/keyboards/cannonkeys/gentoo_hs/info.json b/keyboards/cannonkeys/gentoo_hs/info.json
index ef496628da..fa97ae5877 100644
--- a/keyboards/cannonkeys/gentoo_hs/info.json
+++ b/keyboards/cannonkeys/gentoo_hs/info.json
@@ -19,6 +19,14 @@
19 }, 19 },
20 "processor": "STM32F072", 20 "processor": "STM32F072",
21 "bootloader": "stm32-dfu", 21 "bootloader": "stm32-dfu",
22 "features": {
23 "bootmagic": true,
24 "mousekey": true,
25 "extrakey": true,
26 "console": true,
27 "command": true,
28 "nkro": true
29 },
22 "layout_aliases": { 30 "layout_aliases": {
23 "LAYOUT_default": "LAYOUT_65_ansi_rwkl" 31 "LAYOUT_default": "LAYOUT_65_ansi_rwkl"
24 }, 32 },
diff --git a/keyboards/cannonkeys/gentoo_hs/rules.mk b/keyboards/cannonkeys/gentoo_hs/rules.mk
index 4ee7a29916..0ab54aaaf7 100644
--- a/keyboards/cannonkeys/gentoo_hs/rules.mk
+++ b/keyboards/cannonkeys/gentoo_hs/rules.mk
@@ -1,16 +1,2 @@
1# Wildcard to allow APM32 MCU 1# Wildcard to allow APM32 MCU
2DFU_SUFFIX_ARGS = -v FFFF -p FFFF 2DFU_SUFFIX_ARGS = -v FFFF -p FFFF
3
4# Build Options
5# change yes to no to disable
6#
7BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
8MOUSEKEY_ENABLE = yes # Mouse keys
9EXTRAKEY_ENABLE = yes # Audio control and System control
10CONSOLE_ENABLE = yes # Console for debug
11COMMAND_ENABLE = yes # Commands for debug and configuration
12NKRO_ENABLE = yes # Enable N-Key Rollover
13BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
14RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
15AUDIO_ENABLE = no # Audio output
16
diff --git a/keyboards/cannonkeys/instant60/info.json b/keyboards/cannonkeys/instant60/info.json
index 355ae99f0c..bca90e5015 100644
--- a/keyboards/cannonkeys/instant60/info.json
+++ b/keyboards/cannonkeys/instant60/info.json
@@ -39,6 +39,16 @@
39 }, 39 },
40 "processor": "STM32F072", 40 "processor": "STM32F072",
41 "bootloader": "stm32-dfu", 41 "bootloader": "stm32-dfu",
42 "features": {
43 "bootmagic": true,
44 "mousekey": true,
45 "extrakey": true,
46 "console": true,
47 "command": true,
48 "nkro": true,
49 "backlight": true,
50 "rgblight": true
51 },
42 "community_layouts": ["60_ansi", "60_tsangan_hhkb"], 52 "community_layouts": ["60_ansi", "60_tsangan_hhkb"],
43 "layouts": { 53 "layouts": {
44 "LAYOUT_60_ansi": { 54 "LAYOUT_60_ansi": {
diff --git a/keyboards/cannonkeys/instant60/rules.mk b/keyboards/cannonkeys/instant60/rules.mk
index 8d3de1b8b2..0ab54aaaf7 100644
--- a/keyboards/cannonkeys/instant60/rules.mk
+++ b/keyboards/cannonkeys/instant60/rules.mk
@@ -1,15 +1,2 @@
1# Wildcard to allow APM32 MCU 1# Wildcard to allow APM32 MCU
2DFU_SUFFIX_ARGS = -v FFFF -p FFFF 2DFU_SUFFIX_ARGS = -v FFFF -p FFFF
3
4# Build Options
5# change yes to no to disable
6#
7BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
8MOUSEKEY_ENABLE = yes # Mouse keys
9EXTRAKEY_ENABLE = yes # Audio control and System control
10CONSOLE_ENABLE = yes # Console for debug
11COMMAND_ENABLE = yes # Commands for debug and configuration
12NKRO_ENABLE = yes # Enable N-Key Rollover
13BACKLIGHT_ENABLE = yes
14RGBLIGHT_ENABLE = yes
15
diff --git a/keyboards/cannonkeys/instant65/info.json b/keyboards/cannonkeys/instant65/info.json
index 3c447a4bd3..63e84be0aa 100644
--- a/keyboards/cannonkeys/instant65/info.json
+++ b/keyboards/cannonkeys/instant65/info.json
@@ -39,6 +39,16 @@
39 }, 39 },
40 "processor": "STM32F072", 40 "processor": "STM32F072",
41 "bootloader": "stm32-dfu", 41 "bootloader": "stm32-dfu",
42 "features": {
43 "bootmagic": true,
44 "mousekey": true,
45 "extrakey": true,
46 "console": true,
47 "command": true,
48 "nkro": true,
49 "backlight": true,
50 "rgblight": true
51 },
42 "layouts": { 52 "layouts": {
43 "LAYOUT_default": { 53 "LAYOUT_default": {
44 "layout": [ 54 "layout": [
diff --git a/keyboards/cannonkeys/instant65/rules.mk b/keyboards/cannonkeys/instant65/rules.mk
index 86794ca0f7..0ab54aaaf7 100644
--- a/keyboards/cannonkeys/instant65/rules.mk
+++ b/keyboards/cannonkeys/instant65/rules.mk
@@ -1,16 +1,2 @@
1# Wildcard to allow APM32 MCU 1# Wildcard to allow APM32 MCU
2DFU_SUFFIX_ARGS = -v FFFF -p FFFF 2DFU_SUFFIX_ARGS = -v FFFF -p FFFF
3
4# Build Options
5# change yes to no to disable
6#
7BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
8MOUSEKEY_ENABLE = yes # Mouse keys
9EXTRAKEY_ENABLE = yes # Audio control and System control
10CONSOLE_ENABLE = yes # Console for debug
11COMMAND_ENABLE = yes # Commands for debug and configuration
12NKRO_ENABLE = yes # Enable N-Key Rollover
13BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
14RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
15AUDIO_ENABLE = no # Audio output
16
diff --git a/keyboards/cannonkeys/malicious_ergo/info.json b/keyboards/cannonkeys/malicious_ergo/info.json
index d5941f5f96..3897aea08b 100644
--- a/keyboards/cannonkeys/malicious_ergo/info.json
+++ b/keyboards/cannonkeys/malicious_ergo/info.json
@@ -45,6 +45,16 @@
45 }, 45 },
46 "processor": "STM32F072", 46 "processor": "STM32F072",
47 "bootloader": "stm32-dfu", 47 "bootloader": "stm32-dfu",
48 "features": {
49 "bootmagic": true,
50 "mousekey": true,
51 "extrakey": true,
52 "console": true,
53 "command": true,
54 "nkro": true,
55 "backlight": true,
56 "rgblight": true
57 },
48 "layouts": { 58 "layouts": {
49 "LAYOUT_default": { 59 "LAYOUT_default": {
50 "layout": [ 60 "layout": [
diff --git a/keyboards/cannonkeys/malicious_ergo/rules.mk b/keyboards/cannonkeys/malicious_ergo/rules.mk
index 86794ca0f7..0ab54aaaf7 100644
--- a/keyboards/cannonkeys/malicious_ergo/rules.mk
+++ b/keyboards/cannonkeys/malicious_ergo/rules.mk
@@ -1,16 +1,2 @@
1# Wildcard to allow APM32 MCU 1# Wildcard to allow APM32 MCU
2DFU_SUFFIX_ARGS = -v FFFF -p FFFF 2DFU_SUFFIX_ARGS = -v FFFF -p FFFF
3
4# Build Options
5# change yes to no to disable
6#
7BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
8MOUSEKEY_ENABLE = yes # Mouse keys
9EXTRAKEY_ENABLE = yes # Audio control and System control
10CONSOLE_ENABLE = yes # Console for debug
11COMMAND_ENABLE = yes # Commands for debug and configuration
12NKRO_ENABLE = yes # Enable N-Key Rollover
13BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
14RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
15AUDIO_ENABLE = no # Audio output
16
diff --git a/keyboards/cannonkeys/obliterated75/info.json b/keyboards/cannonkeys/obliterated75/info.json
index d831eb1aca..19227c5150 100644
--- a/keyboards/cannonkeys/obliterated75/info.json
+++ b/keyboards/cannonkeys/obliterated75/info.json
@@ -39,6 +39,16 @@
39 }, 39 },
40 "processor": "STM32F072", 40 "processor": "STM32F072",
41 "bootloader": "stm32-dfu", 41 "bootloader": "stm32-dfu",
42 "features": {
43 "bootmagic": true,
44 "mousekey": true,
45 "extrakey": true,
46 "console": true,
47 "command": true,
48 "nkro": true,
49 "backlight": true,
50 "rgblight": true
51 },
42 "layouts": { 52 "layouts": {
43 "LAYOUT_all": { 53 "LAYOUT_all": {
44 "layout": [ 54 "layout": [
diff --git a/keyboards/cannonkeys/obliterated75/rules.mk b/keyboards/cannonkeys/obliterated75/rules.mk
index 86794ca0f7..0ab54aaaf7 100644
--- a/keyboards/cannonkeys/obliterated75/rules.mk
+++ b/keyboards/cannonkeys/obliterated75/rules.mk
@@ -1,16 +1,2 @@
1# Wildcard to allow APM32 MCU 1# Wildcard to allow APM32 MCU
2DFU_SUFFIX_ARGS = -v FFFF -p FFFF 2DFU_SUFFIX_ARGS = -v FFFF -p FFFF
3
4# Build Options
5# change yes to no to disable
6#
7BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
8MOUSEKEY_ENABLE = yes # Mouse keys
9EXTRAKEY_ENABLE = yes # Audio control and System control
10CONSOLE_ENABLE = yes # Console for debug
11COMMAND_ENABLE = yes # Commands for debug and configuration
12NKRO_ENABLE = yes # Enable N-Key Rollover
13BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
14RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
15AUDIO_ENABLE = no # Audio output
16
diff --git a/keyboards/cannonkeys/onyx/info.json b/keyboards/cannonkeys/onyx/info.json
index 8be4673df4..5ae7039049 100644
--- a/keyboards/cannonkeys/onyx/info.json
+++ b/keyboards/cannonkeys/onyx/info.json
@@ -20,6 +20,15 @@
20 }, 20 },
21 "processor": "STM32F072", 21 "processor": "STM32F072",
22 "bootloader": "stm32-dfu", 22 "bootloader": "stm32-dfu",
23 "features": {
24 "bootmagic": true,
25 "mousekey": true,
26 "extrakey": true,
27 "console": true,
28 "command": true,
29 "nkro": true,
30 "backlight": true
31 },
23 "layouts": { 32 "layouts": {
24 "LAYOUT_all": { 33 "LAYOUT_all": {
25 "layout": [ 34 "layout": [
diff --git a/keyboards/cannonkeys/onyx/rules.mk b/keyboards/cannonkeys/onyx/rules.mk
index a5906b6a90..0ab54aaaf7 100644
--- a/keyboards/cannonkeys/onyx/rules.mk
+++ b/keyboards/cannonkeys/onyx/rules.mk
@@ -1,16 +1,2 @@
1# Wildcard to allow APM32 MCU 1# Wildcard to allow APM32 MCU
2DFU_SUFFIX_ARGS = -v FFFF -p FFFF 2DFU_SUFFIX_ARGS = -v FFFF -p FFFF
3
4# Build Options
5# change yes to no to disable
6#
7BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
8MOUSEKEY_ENABLE = yes # Mouse keys
9EXTRAKEY_ENABLE = yes # Audio control and System control
10CONSOLE_ENABLE = yes # Console for debug
11COMMAND_ENABLE = yes # Commands for debug and configuration
12NKRO_ENABLE = yes # Enable N-Key Rollover
13BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
14RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
15AUDIO_ENABLE = no # Audio output
16
diff --git a/keyboards/cannonkeys/rekt1800/info.json b/keyboards/cannonkeys/rekt1800/info.json
index 889ff5eff9..f9a58afa02 100644
--- a/keyboards/cannonkeys/rekt1800/info.json
+++ b/keyboards/cannonkeys/rekt1800/info.json
@@ -20,6 +20,15 @@
20 }, 20 },
21 "processor": "STM32F072", 21 "processor": "STM32F072",
22 "bootloader": "stm32-dfu", 22 "bootloader": "stm32-dfu",
23 "features": {
24 "bootmagic": true,
25 "mousekey": true,
26 "extrakey": true,
27 "console": true,
28 "command": true,
29 "nkro": true,
30 "backlight": true
31 },
23 "layouts": { 32 "layouts": {
24 "LAYOUT_all": { 33 "LAYOUT_all": {
25 "layout": [ 34 "layout": [
diff --git a/keyboards/cannonkeys/rekt1800/rules.mk b/keyboards/cannonkeys/rekt1800/rules.mk
index 01d0c0ade1..0ab54aaaf7 100644
--- a/keyboards/cannonkeys/rekt1800/rules.mk
+++ b/keyboards/cannonkeys/rekt1800/rules.mk
@@ -1,15 +1,2 @@
1# Wildcard to allow APM32 MCU 1# Wildcard to allow APM32 MCU
2DFU_SUFFIX_ARGS = -v FFFF -p FFFF 2DFU_SUFFIX_ARGS = -v FFFF -p FFFF
3
4# Build Options
5# change yes to no to disable
6#
7BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
8MOUSEKEY_ENABLE = yes # Mouse keys
9EXTRAKEY_ENABLE = yes # Audio control and System control
10CONSOLE_ENABLE = yes # Console for debug
11COMMAND_ENABLE = yes # Commands for debug and configuration
12NKRO_ENABLE = yes # Enable N-Key Rollover
13BACKLIGHT_ENABLE = yes
14RGBLIGHT_ENABLE = no
15
diff --git a/keyboards/cannonkeys/sagittarius/info.json b/keyboards/cannonkeys/sagittarius/info.json
index d9236b3905..876c68e82e 100644
--- a/keyboards/cannonkeys/sagittarius/info.json
+++ b/keyboards/cannonkeys/sagittarius/info.json
@@ -44,6 +44,16 @@
44 }, 44 },
45 "processor": "STM32F072", 45 "processor": "STM32F072",
46 "bootloader": "stm32-dfu", 46 "bootloader": "stm32-dfu",
47 "features": {
48 "bootmagic": true,
49 "mousekey": true,
50 "extrakey": true,
51 "console": true,
52 "command": true,
53 "nkro": true,
54 "backlight": true,
55 "rgblight": true
56 },
47 "layouts": { 57 "layouts": {
48 "LAYOUT_default": { 58 "LAYOUT_default": {
49 "layout": [ 59 "layout": [
diff --git a/keyboards/cannonkeys/sagittarius/rules.mk b/keyboards/cannonkeys/sagittarius/rules.mk
index 86794ca0f7..0ab54aaaf7 100644
--- a/keyboards/cannonkeys/sagittarius/rules.mk
+++ b/keyboards/cannonkeys/sagittarius/rules.mk
@@ -1,16 +1,2 @@
1# Wildcard to allow APM32 MCU 1# Wildcard to allow APM32 MCU
2DFU_SUFFIX_ARGS = -v FFFF -p FFFF 2DFU_SUFFIX_ARGS = -v FFFF -p FFFF
3
4# Build Options
5# change yes to no to disable
6#
7BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
8MOUSEKEY_ENABLE = yes # Mouse keys
9EXTRAKEY_ENABLE = yes # Audio control and System control
10CONSOLE_ENABLE = yes # Console for debug
11COMMAND_ENABLE = yes # Commands for debug and configuration
12NKRO_ENABLE = yes # Enable N-Key Rollover
13BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
14RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
15AUDIO_ENABLE = no # Audio output
16
diff --git a/keyboards/cannonkeys/savage65/info.json b/keyboards/cannonkeys/savage65/info.json
index 0c2409713b..9d7d454e55 100644
--- a/keyboards/cannonkeys/savage65/info.json
+++ b/keyboards/cannonkeys/savage65/info.json
@@ -39,6 +39,16 @@
39 }, 39 },
40 "processor": "STM32F072", 40 "processor": "STM32F072",
41 "bootloader": "stm32-dfu", 41 "bootloader": "stm32-dfu",
42 "features": {
43 "bootmagic": true,
44 "mousekey": true,
45 "extrakey": true,
46 "console": true,
47 "command": true,
48 "nkro": true,
49 "backlight": true,
50 "rgblight": true
51 },
42 "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_ansi_blocker_tsangan", "65_iso_blocker"], 52 "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_ansi_blocker_tsangan", "65_iso_blocker"],
43 "layouts": { 53 "layouts": {
44 "LAYOUT_default": { 54 "LAYOUT_default": {
diff --git a/keyboards/cannonkeys/savage65/rules.mk b/keyboards/cannonkeys/savage65/rules.mk
index 8d3de1b8b2..0ab54aaaf7 100644
--- a/keyboards/cannonkeys/savage65/rules.mk
+++ b/keyboards/cannonkeys/savage65/rules.mk
@@ -1,15 +1,2 @@
1# Wildcard to allow APM32 MCU 1# Wildcard to allow APM32 MCU
2DFU_SUFFIX_ARGS = -v FFFF -p FFFF 2DFU_SUFFIX_ARGS = -v FFFF -p FFFF
3
4# Build Options
5# change yes to no to disable
6#
7BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
8MOUSEKEY_ENABLE = yes # Mouse keys
9EXTRAKEY_ENABLE = yes # Audio control and System control
10CONSOLE_ENABLE = yes # Console for debug
11COMMAND_ENABLE = yes # Commands for debug and configuration
12NKRO_ENABLE = yes # Enable N-Key Rollover
13BACKLIGHT_ENABLE = yes
14RGBLIGHT_ENABLE = yes
15
diff --git a/keyboards/cannonkeys/tmov2/info.json b/keyboards/cannonkeys/tmov2/info.json
index ed834c73cd..acc5093221 100644
--- a/keyboards/cannonkeys/tmov2/info.json
+++ b/keyboards/cannonkeys/tmov2/info.json
@@ -39,6 +39,16 @@
39 }, 39 },
40 "processor": "STM32F072", 40 "processor": "STM32F072",
41 "bootloader": "stm32-dfu", 41 "bootloader": "stm32-dfu",
42 "features": {
43 "bootmagic": true,
44 "mousekey": true,
45 "extrakey": true,
46 "console": true,
47 "command": true,
48 "nkro": true,
49 "backlight": true,
50 "rgblight": true
51 },
42 "layouts": { 52 "layouts": {
43 "LAYOUT_default": { 53 "LAYOUT_default": {
44 "layout": [ 54 "layout": [
diff --git a/keyboards/cannonkeys/tmov2/rules.mk b/keyboards/cannonkeys/tmov2/rules.mk
index 8d3de1b8b2..0ab54aaaf7 100644
--- a/keyboards/cannonkeys/tmov2/rules.mk
+++ b/keyboards/cannonkeys/tmov2/rules.mk
@@ -1,15 +1,2 @@
1# Wildcard to allow APM32 MCU 1# Wildcard to allow APM32 MCU
2DFU_SUFFIX_ARGS = -v FFFF -p FFFF 2DFU_SUFFIX_ARGS = -v FFFF -p FFFF
3
4# Build Options
5# change yes to no to disable
6#
7BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
8MOUSEKEY_ENABLE = yes # Mouse keys
9EXTRAKEY_ENABLE = yes # Audio control and System control
10CONSOLE_ENABLE = yes # Console for debug
11COMMAND_ENABLE = yes # Commands for debug and configuration
12NKRO_ENABLE = yes # Enable N-Key Rollover
13BACKLIGHT_ENABLE = yes
14RGBLIGHT_ENABLE = yes
15
diff --git a/keyboards/cannonkeys/tsukuyomi/info.json b/keyboards/cannonkeys/tsukuyomi/info.json
index 3542bca1f6..a874d3d293 100644
--- a/keyboards/cannonkeys/tsukuyomi/info.json
+++ b/keyboards/cannonkeys/tsukuyomi/info.json
@@ -39,6 +39,16 @@
39 }, 39 },
40 "processor": "STM32F072", 40 "processor": "STM32F072",
41 "bootloader": "stm32-dfu", 41 "bootloader": "stm32-dfu",
42 "features": {
43 "bootmagic": true,
44 "mousekey": true,
45 "extrakey": true,
46 "console": true,
47 "command": true,
48 "nkro": true,
49 "backlight": true,
50 "rgblight": true
51 },
42 "layouts": { 52 "layouts": {
43 "LAYOUT_default": { 53 "LAYOUT_default": {
44 "layout": [ 54 "layout": [
diff --git a/keyboards/cannonkeys/tsukuyomi/rules.mk b/keyboards/cannonkeys/tsukuyomi/rules.mk
index 86794ca0f7..0ab54aaaf7 100644
--- a/keyboards/cannonkeys/tsukuyomi/rules.mk
+++ b/keyboards/cannonkeys/tsukuyomi/rules.mk
@@ -1,16 +1,2 @@
1# Wildcard to allow APM32 MCU 1# Wildcard to allow APM32 MCU
2DFU_SUFFIX_ARGS = -v FFFF -p FFFF 2DFU_SUFFIX_ARGS = -v FFFF -p FFFF
3
4# Build Options
5# change yes to no to disable
6#
7BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
8MOUSEKEY_ENABLE = yes # Mouse keys
9EXTRAKEY_ENABLE = yes # Audio control and System control
10CONSOLE_ENABLE = yes # Console for debug
11COMMAND_ENABLE = yes # Commands for debug and configuration
12NKRO_ENABLE = yes # Enable N-Key Rollover
13BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
14RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
15AUDIO_ENABLE = no # Audio output
16
diff --git a/keyboards/cannonkeys/vicious40/info.json b/keyboards/cannonkeys/vicious40/info.json
index d6669155cf..b2d68545f0 100644
--- a/keyboards/cannonkeys/vicious40/info.json
+++ b/keyboards/cannonkeys/vicious40/info.json
@@ -20,6 +20,15 @@
20 }, 20 },
21 "processor": "STM32F072", 21 "processor": "STM32F072",
22 "bootloader": "stm32-dfu", 22 "bootloader": "stm32-dfu",
23 "features": {
24 "bootmagic": true,
25 "mousekey": true,
26 "extrakey": true,
27 "console": true,
28 "command": true,
29 "nkro": true,
30 "backlight": true
31 },
23 "layouts": { 32 "layouts": {
24 "LAYOUT_default": { 33 "LAYOUT_default": {
25 "layout": [ 34 "layout": [
diff --git a/keyboards/cannonkeys/vicious40/rules.mk b/keyboards/cannonkeys/vicious40/rules.mk
index 9d14eaf9aa..04fe1eba2a 100644
--- a/keyboards/cannonkeys/vicious40/rules.mk
+++ b/keyboards/cannonkeys/vicious40/rules.mk
@@ -1,16 +1,2 @@
1# Wildcard to allow APM32 MCU 1# Wildcard to allow APM32 MCU
2DFU_SUFFIX_ARGS = -p FFFF -v FFFF 2DFU_SUFFIX_ARGS = -p FFFF -v FFFF
3
4# Build Options
5# change yes to no to disable
6#
7BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
8MOUSEKEY_ENABLE = yes # Mouse keys
9EXTRAKEY_ENABLE = yes # Audio control and System control
10CONSOLE_ENABLE = yes # Console for debug
11COMMAND_ENABLE = yes # Commands for debug and configuration
12NKRO_ENABLE = yes # Enable N-Key Rollover
13BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
14RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
15AUDIO_ENABLE = no # Audio output
16
diff --git a/keyboards/centromere/info.json b/keyboards/centromere/info.json
index 280ab8bd7e..c190bd84d7 100644
--- a/keyboards/centromere/info.json
+++ b/keyboards/centromere/info.json
@@ -10,6 +10,14 @@
10 }, 10 },
11 "processor": "atmega32u4", 11 "processor": "atmega32u4",
12 "bootloader": "caterina", 12 "bootloader": "caterina",
13 "features": {
14 "bootmagic": false,
15 "mousekey": true,
16 "extrakey": true,
17 "console": true,
18 "command": true,
19 "unicode": true
20 },
13 "community_layouts": ["split_3x5_3", "split_3x6_3"], 21 "community_layouts": ["split_3x5_3", "split_3x6_3"],
14 "layout_aliases": { 22 "layout_aliases": {
15 "LAYOUT": "LAYOUT_split_3x6_3" 23 "LAYOUT": "LAYOUT_split_3x6_3"
diff --git a/keyboards/centromere/rules.mk b/keyboards/centromere/rules.mk
index 26081e4132..0bb4817a8b 100644
--- a/keyboards/centromere/rules.mk
+++ b/keyboards/centromere/rules.mk
@@ -1,19 +1,6 @@
1# Processor frequency 1# Processor frequency
2F_CPU = 8000000 2F_CPU = 8000000
3 3
4# Build Options
5# change yes to no to disable
6#
7BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
8MOUSEKEY_ENABLE = yes # Mouse keys
9EXTRAKEY_ENABLE = yes # Audio control and System control
10CONSOLE_ENABLE = yes # Console for debug
11COMMAND_ENABLE = yes # Commands for debug and configuration
12NKRO_ENABLE = no # Enable N-Key Rollover
13BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
14RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
15AUDIO_ENABLE = no # Audio output
16UNICODE_ENABLE = yes
17CUSTOM_MATRIX = lite 4CUSTOM_MATRIX = lite
18 5
19# project specific files 6# project specific files
diff --git a/keyboards/checkerboards/phoenix45_ortho/info.json b/keyboards/checkerboards/phoenix45_ortho/info.json
index 5bd7c644cf..43565b9852 100644
--- a/keyboards/checkerboards/phoenix45_ortho/info.json
+++ b/keyboards/checkerboards/phoenix45_ortho/info.json
@@ -20,6 +20,15 @@
20 }, 20 },
21 "processor": "atmega32u2", 21 "processor": "atmega32u2",
22 "bootloader": "atmel-dfu", 22 "bootloader": "atmel-dfu",
23 "features": {
24 "bootmagic": true,
25 "mousekey": false,
26 "extrakey": true,
27 "command": true,
28 "nkro": true,
29 "unicode": true,
30 "encoder": true
31 },
23 "layouts": { 32 "layouts": {
24 "LAYOUT_ortho_2x225u": { 33 "LAYOUT_ortho_2x225u": {
25 "layout": [ 34 "layout": [
diff --git a/keyboards/checkerboards/phoenix45_ortho/rules.mk b/keyboards/checkerboards/phoenix45_ortho/rules.mk
index 634fd79c1d..4df55cd220 100644
--- a/keyboards/checkerboards/phoenix45_ortho/rules.mk
+++ b/keyboards/checkerboards/phoenix45_ortho/rules.mk
@@ -1,17 +1,3 @@
1# Build Options
2# change yes to no to disable
3#
4BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
5MOUSEKEY_ENABLE = no # Mouse keys
6EXTRAKEY_ENABLE = yes # Audio control and System control
7CONSOLE_ENABLE = no # Console for debug
8COMMAND_ENABLE = yes # Commands for debug and configuration
9NKRO_ENABLE = yes # Enable N-Key Rollover
10RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
11AUDIO_ENABLE = no # Audio output
12UNICODE_ENABLE = yes # Unicode
13ENCODER_ENABLE = yes # Encoder enable
14
15# Disable unsupported hardware 1# Disable unsupported hardware
16AUDIO_SUPPORTED = no 2AUDIO_SUPPORTED = no
17BACKLIGHT_SUPPORTED = no 3BACKLIGHT_SUPPORTED = no
diff --git a/keyboards/checkerboards/quark/info.json b/keyboards/checkerboards/quark/info.json
index ca84460348..22fa758e7e 100644
--- a/keyboards/checkerboards/quark/info.json
+++ b/keyboards/checkerboards/quark/info.json
@@ -41,6 +41,16 @@
41 }, 41 },
42 "processor": "atmega32u2", 42 "processor": "atmega32u2",
43 "bootloader": "atmel-dfu", 43 "bootloader": "atmel-dfu",
44 "features": {
45 "bootmagic": true,
46 "mousekey": false,
47 "extrakey": true,
48 "command": true,
49 "nkro": true,
50 "rgblight": true,
51 "unicode": true,
52 "encoder": true
53 },
44 "community_layouts": ["ortho_4x12", "planck_mit"], 54 "community_layouts": ["ortho_4x12", "planck_mit"],
45 "layouts": { 55 "layouts": {
46 "LAYOUT_ortho_5x12_2x225u": { 56 "LAYOUT_ortho_5x12_2x225u": {
diff --git a/keyboards/checkerboards/quark/rules.mk b/keyboards/checkerboards/quark/rules.mk
index 2dd2e10d80..4df55cd220 100644
--- a/keyboards/checkerboards/quark/rules.mk
+++ b/keyboards/checkerboards/quark/rules.mk
@@ -1,19 +1,3 @@
1# Build Options
2# change yes to no to disable
3#
4BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
5MOUSEKEY_ENABLE = no # Mouse keys
6EXTRAKEY_ENABLE = yes # Audio control and System control
7CONSOLE_ENABLE = no # Console for debug
8COMMAND_ENABLE = yes # Commands for debug and configuration
9NKRO_ENABLE = yes # Enable N-Key Rollover
10BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
11RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
12AUDIO_ENABLE = no # Audio output
13UNICODE_ENABLE = yes # Unicode
14ENCODER_ENABLE = yes # Enable Rotary Encoders
15
16
17# Disable unsupported hardware 1# Disable unsupported hardware
18AUDIO_SUPPORTED = no 2AUDIO_SUPPORTED = no
19BACKLIGHT_SUPPORTED = no 3BACKLIGHT_SUPPORTED = no
diff --git a/keyboards/checkerboards/quark_squared/info.json b/keyboards/checkerboards/quark_squared/info.json
index a47253d5b4..e242bfc5d9 100644
--- a/keyboards/checkerboards/quark_squared/info.json
+++ b/keyboards/checkerboards/quark_squared/info.json
@@ -41,6 +41,16 @@
41 }, 41 },
42 "processor": "atmega32u2", 42 "processor": "atmega32u2",
43 "bootloader": "atmel-dfu", 43 "bootloader": "atmel-dfu",
44 "features": {
45 "bootmagic": true,
46 "mousekey": false,
47 "extrakey": true,
48 "command": true,
49 "nkro": true,
50 "rgblight": true,
51 "unicode": true,
52 "encoder": true
53 },
44 "layouts": { 54 "layouts": {
45 "LAYOUT_4_2x225u": { 55 "LAYOUT_4_2x225u": {
46 "layout": [ 56 "layout": [
diff --git a/keyboards/checkerboards/quark_squared/rules.mk b/keyboards/checkerboards/quark_squared/rules.mk
index 88b0022c5f..4df55cd220 100644
--- a/keyboards/checkerboards/quark_squared/rules.mk
+++ b/keyboards/checkerboards/quark_squared/rules.mk
@@ -1,17 +1,3 @@
1# Build Options
2# change yes to no to disable
3#
4BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
5MOUSEKEY_ENABLE = no # Mouse keys
6EXTRAKEY_ENABLE = yes # Audio control and System control
7CONSOLE_ENABLE = no # Console for debug
8COMMAND_ENABLE = yes # Commands for debug and configuration
9NKRO_ENABLE = yes # Enable N-Key Rollover
10BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
11RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
12AUDIO_ENABLE = no # Audio output
13UNICODE_ENABLE = yes # Unicode
14ENCODER_ENABLE = yes # Enable Rotary Encoders
15# Disable unsupported hardware 1# Disable unsupported hardware
16AUDIO_SUPPORTED = no 2AUDIO_SUPPORTED = no
17BACKLIGHT_SUPPORTED = no 3BACKLIGHT_SUPPORTED = no
diff --git a/keyboards/checkerboards/snop60/info.json b/keyboards/checkerboards/snop60/keyboard.json
index f88186fadd..60b22caf76 100644
--- a/keyboards/checkerboards/snop60/info.json
+++ b/keyboards/checkerboards/snop60/keyboard.json
@@ -47,6 +47,19 @@
47 }, 47 },
48 "processor": "atmega32u4", 48 "processor": "atmega32u4",
49 "bootloader": "atmel-dfu", 49 "bootloader": "atmel-dfu",
50 "build": {
51 "lto": true
52 },
53 "features": {
54 "bootmagic": true,
55 "mousekey": true,
56 "extrakey": true,
57 "command": true,
58 "nkro": true,
59 "backlight": true,
60 "rgblight": true,
61 "encoder": true
62 },
50 "layout_aliases": { 63 "layout_aliases": {
51 "LAYOUT_7u": "LAYOUT_60_ansi_tsangan_split_bs_rshift", 64 "LAYOUT_7u": "LAYOUT_60_ansi_tsangan_split_bs_rshift",
52 "LAYOUT_2x3u": "LAYOUT_60_ansi_tsangan_split_bs_rshift_space" 65 "LAYOUT_2x3u": "LAYOUT_60_ansi_tsangan_split_bs_rshift_space"
diff --git a/keyboards/checkerboards/snop60/rules.mk b/keyboards/checkerboards/snop60/rules.mk
deleted file mode 100644
index d24c9861b4..0000000000
--- a/keyboards/checkerboards/snop60/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
1# Build Options
2# change yes to no to disable
3#
4BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
5MOUSEKEY_ENABLE = yes # Mouse keys
6EXTRAKEY_ENABLE = yes # Audio control and System control
7CONSOLE_ENABLE = no # Console for debug
8COMMAND_ENABLE = yes # Commands for debug and configuration
9NKRO_ENABLE = yes # Enable N-Key Rollover
10BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
11RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
12AUDIO_ENABLE = no # Audio output
13ENCODER_ENBALE = yes # Enable Rotary Encoders
diff --git a/keyboards/chlx/str_merro60/info.json b/keyboards/chlx/str_merro60/keyboard.json
index 89fdd4baa1..15903f2f6c 100644
--- a/keyboards/chlx/str_merro60/info.json
+++ b/keyboards/chlx/str_merro60/keyboard.json
@@ -36,12 +36,20 @@
36 "diode_direction": "ROW2COL", 36 "diode_direction": "ROW2COL",
37 "processor": "atmega32u4", 37 "processor": "atmega32u4",
38 "bootloader": "atmel-dfu", 38 "bootloader": "atmel-dfu",
39 "features": {
40 "bootmagic": true,
41 "mousekey": true,
42 "extrakey": true,
43 "nkro": true,
44 "rgblight": true
45 },
39 "layout_aliases": { 46 "layout_aliases": {
40 "LAYOUT_default": "LAYOUT_all", 47 "LAYOUT_default": "LAYOUT_all",
41 "LAYOUT_hhkb": "LAYOUT_60_hhkb", 48 "LAYOUT_hhkb": "LAYOUT_60_hhkb",
42 "LAYOUT_iso": "LAYOUT_60_iso_split_bs_rshift", 49 "LAYOUT_iso": "LAYOUT_60_iso_split_bs_rshift",
43 "LAYOUT_tsangan": "LAYOUT_60_tsangan_hhkb" 50 "LAYOUT_tsangan": "LAYOUT_60_tsangan_hhkb"
44 }, 51 },
52 "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_hhkb", "60_iso", "60_tsangan_hhkb"],
45 "layouts": { 53 "layouts": {
46 "LAYOUT_all": { 54 "LAYOUT_all": {
47 "layout": [ 55 "layout": [
diff --git a/keyboards/chlx/str_merro60/rules.mk b/keyboards/chlx/str_merro60/rules.mk
deleted file mode 100644
index 9cceab1f74..0000000000
--- a/keyboards/chlx/str_merro60/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
1# Build Options
2# change yes to no to disable
3#
4BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
5MOUSEKEY_ENABLE = yes # Mouse keys
6EXTRAKEY_ENABLE = yes # Audio control and System control
7CONSOLE_ENABLE = no # Console for debug
8COMMAND_ENABLE = no # Commands for debug and configuration
9NKRO_ENABLE = yes # Enable N-Key Rollover
10BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
11RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
12AUDIO_ENABLE = no # Audio output
13
14Layouts = 60_ansi 60_ansi_split_bs_rshift 60_hhkb 60_iso 60_tsangan_hhkb
diff --git a/keyboards/cipulot/kawayo/info.json b/keyboards/cipulot/kawayo/keyboard.json
index 85a5f81c2b..ac4d24b9b5 100644
--- a/keyboards/cipulot/kawayo/info.json
+++ b/keyboards/cipulot/kawayo/keyboard.json
@@ -6,7 +6,10 @@
6 "usb": { 6 "usb": {
7 "vid": "0x6369", 7 "vid": "0x6369",
8 "pid": "0x6B7F", 8 "pid": "0x6B7F",
9 "device_version": "0.0.1" 9 "device_version": "0.0.1",
10 "shared_endpoint": {
11 "keyboard": true
12 }
10 }, 13 },
11 "matrix_pins": { 14 "matrix_pins": {
12 "cols": ["B10", "A0", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14", "A4", "A3", "A2", "A1"], 15 "cols": ["B10", "A0", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14", "A4", "A3", "A2", "A1"],
@@ -15,6 +18,12 @@
15 "diode_direction": "COL2ROW", 18 "diode_direction": "COL2ROW",
16 "processor": "STM32F411", 19 "processor": "STM32F411",
17 "bootloader": "stm32-dfu", 20 "bootloader": "stm32-dfu",
21 "features": {
22 "bootmagic": true,
23 "mousekey": true,
24 "extrakey": true,
25 "nkro": true
26 },
18 "layout_aliases": { 27 "layout_aliases": {
19 "LAYOUT_all": "LAYOUT_65_ansi_blocker_split_bs" 28 "LAYOUT_all": "LAYOUT_65_ansi_blocker_split_bs"
20 }, 29 },
diff --git a/keyboards/cipulot/kawayo/rules.mk b/keyboards/cipulot/kawayo/rules.mk
deleted file mode 100644
index fbab9885cd..0000000000
--- a/keyboards/cipulot/kawayo/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
1KEYBOARD_SHARED_EP = yes
2
3# Build Options
4# change yes to no to disable
5#
6BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
7MOUSEKEY_ENABLE = yes # Mouse keys
8EXTRAKEY_ENABLE = yes # Audio control and System control
9CONSOLE_ENABLE = no # Console for debug
10COMMAND_ENABLE = no # Commands for debug and configuration
11NKRO_ENABLE = yes # Enable N-Key Rollover
12BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
13RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
14AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/clueboard/66_hotswap/prototype/info.json b/keyboards/clueboard/66_hotswap/prototype/keyboard.json
index 2ef1fbec1e..9d0b0dd27c 100644
--- a/keyboards/clueboard/66_hotswap/prototype/info.json
+++ b/keyboards/clueboard/66_hotswap/prototype/keyboard.json
@@ -16,6 +16,9 @@
16 "nkro": true, 16 "nkro": true,
17 "rgblight": true 17 "rgblight": true
18 }, 18 },
19 "build": {
20 "lto": true
21 },
19 "indicators": { 22 "indicators": {
20 "caps_lock": "B4" 23 "caps_lock": "B4"
21 }, 24 },
diff --git a/keyboards/clueboard/66_hotswap/prototype/rules.mk b/keyboards/clueboard/66_hotswap/prototype/rules.mk
deleted file mode 100644
index 4da205a168..0000000000
--- a/keyboards/clueboard/66_hotswap/prototype/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
1LTO_ENABLE = yes
diff --git a/keyboards/coarse/ixora/info.json b/keyboards/coarse/ixora/keyboard.json
index 8d51f1e927..33ba2270ac 100644
--- a/keyboards/coarse/ixora/info.json
+++ b/keyboards/coarse/ixora/keyboard.json
@@ -20,6 +20,12 @@
20 }, 20 },
21 "processor": "STM32F042", 21 "processor": "STM32F042",
22 "bootloader": "stm32-dfu", 22 "bootloader": "stm32-dfu",
23 "features": {
24 "bootmagic": true,
25 "mousekey": true,
26 "extrakey": true,
27 "nkro": true
28 },
23 "debounce": 0, 29 "debounce": 0,
24 "layouts": { 30 "layouts": {
25 "LAYOUT_full": { 31 "LAYOUT_full": {
diff --git a/keyboards/coarse/ixora/rules.mk b/keyboards/coarse/ixora/rules.mk
deleted file mode 100644
index 285aeb8202..0000000000
--- a/keyboards/coarse/ixora/rules.mk
+++ /dev/null
@@ -1,10 +0,0 @@
1# Build Options
2# change yes to no to disable
3#
4BACKLIGHT_ENABLE = no
5BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
6MOUSEKEY_ENABLE = yes # Mouse keys
7EXTRAKEY_ENABLE = yes # Audio control and System control
8CONSOLE_ENABLE = no # Console for debug
9COMMAND_ENABLE = no # Commands for debug and configuration
10NKRO_ENABLE = yes # Enable N-Key Rollover
diff --git a/keyboards/coarse/vinta/info.json b/keyboards/coarse/vinta/keyboard.json
index 3dd9898f1a..df9aa7e5a1 100644
--- a/keyboards/coarse/vinta/info.json
+++ b/keyboards/coarse/vinta/keyboard.json
@@ -15,6 +15,12 @@
15 "diode_direction": "COL2ROW", 15 "diode_direction": "COL2ROW",
16 "processor": "STM32F042", 16 "processor": "STM32F042",
17 "bootloader": "stm32-dfu", 17 "bootloader": "stm32-dfu",
18 "features": {
19 "bootmagic": true,
20 "mousekey": true,
21 "extrakey": true,
22 "nkro": true
23 },
18 "debounce": 0, 24 "debounce": 0,
19 "community_layouts": ["65_ansi_blocker"], 25 "community_layouts": ["65_ansi_blocker"],
20 "layout_aliases": { 26 "layout_aliases": {
diff --git a/keyboards/coarse/vinta/rules.mk b/keyboards/coarse/vinta/rules.mk
deleted file mode 100644
index 285aeb8202..0000000000
--- a/keyboards/coarse/vinta/rules.mk
+++ /dev/null
@@ -1,10 +0,0 @@
1# Build Options
2# change yes to no to disable
3#
4BACKLIGHT_ENABLE = no
5BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
6MOUSEKEY_ENABLE = yes # Mouse keys
7EXTRAKEY_ENABLE = yes # Audio control and System control
8CONSOLE_ENABLE = no # Console for debug
9COMMAND_ENABLE = no # Commands for debug and configuration
10NKRO_ENABLE = yes # Enable N-Key Rollover
diff --git a/keyboards/controllerworks/city42/info.json b/keyboards/controllerworks/city42/info.json
index bff73f7e6f..6657a7485b 100644
--- a/keyboards/controllerworks/city42/info.json
+++ b/keyboards/controllerworks/city42/info.json
@@ -14,7 +14,8 @@
14 "extrakey": true, 14 "extrakey": true,
15 "mousekey": true, 15 "mousekey": true,
16 "nkro": true, 16 "nkro": true,
17 "rgb_matrix": true 17 "rgb_matrix": true,
18 "pointing_device": true
18 }, 19 },
19 "matrix_pins": { 20 "matrix_pins": {
20 "cols": ["GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP0", "GP1", "GP2", "GP3", "GP4", "GP5"], 21 "cols": ["GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP0", "GP1", "GP2", "GP3", "GP4", "GP5"],
@@ -174,4 +175,4 @@
174 ] 175 ]
175 } 176 }
176 } 177 }
177} \ No newline at end of file 178}
diff --git a/keyboards/controllerworks/city42/rules.mk b/keyboards/controllerworks/city42/rules.mk
index 2e0f2befbf..fb5d649735 100644
--- a/keyboards/controllerworks/city42/rules.mk
+++ b/keyboards/controllerworks/city42/rules.mk
@@ -1,2 +1 @@
1POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_DRIVER = cirque_pinnacle_spi
2POINTING_DEVICE_DRIVER = cirque_pinnacle_spi \ No newline at end of file
diff --git a/keyboards/converter/adb_usb/info.json b/keyboards/converter/adb_usb/info.json
index b553dfc10f..47467a97c7 100644
--- a/keyboards/converter/adb_usb/info.json
+++ b/keyboards/converter/adb_usb/info.json
@@ -8,6 +8,11 @@
8 "pid": "0x0ADB", 8 "pid": "0x0ADB",
9 "device_version": "1.0.1" 9 "device_version": "1.0.1"
10 }, 10 },
11 "features": {
12 "bootmagic": false,
13 "mousekey": false,
14 "extrakey": true
15 },
11 "layouts": { 16 "layouts": {
12 "LAYOUT_ext_ansi": { 17 "LAYOUT_ext_ansi": {
13 "layout": [ 18 "layout": [
diff --git a/keyboards/converter/adb_usb/rules.mk b/keyboards/converter/adb_usb/rules.mk
index 4e4d068a70..28df56c337 100644
--- a/keyboards/converter/adb_usb/rules.mk
+++ b/keyboards/converter/adb_usb/rules.mk
@@ -1,15 +1,3 @@
1# Build Options
2# change yes to no to disable
3#
4BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
5MOUSEKEY_ENABLE = no # Mouse keys
6EXTRAKEY_ENABLE = yes # Audio control and System control
7CONSOLE_ENABLE = no # Console for debug
8COMMAND_ENABLE = no # Commands for debug and configuration
9NKRO_ENABLE = no # Enable N-Key Rollover
10BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
11RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
12AUDIO_ENABLE = no # Audio output
13CUSTOM_MATRIX = yes 1CUSTOM_MATRIX = yes
14 2
15SRC += matrix.c adb.c led.c 3SRC += matrix.c adb.c led.c
diff --git a/keyboards/converter/hp_46010a/info.json b/keyboards/converter/hp_46010a/info.json
index da29c72fac..0296bda5e9 100644
--- a/keyboards/converter/hp_46010a/info.json
+++ b/keyboards/converter/hp_46010a/info.json
@@ -10,6 +10,13 @@
10 }, 10 },
11 "processor": "atmega32u4", 11 "processor": "atmega32u4",
12 "bootloader": "halfkay", 12 "bootloader": "halfkay",
13 "features": {
14 "bootmagic": false,
15 "mousekey": true,
16 "extrakey": true,
17 "console": true,
18 "nkro": true
19 },
13 "layouts": { 20 "layouts": {
14 "LAYOUT": { 21 "LAYOUT": {
15 "layout": [ 22 "layout": [
diff --git a/keyboards/converter/hp_46010a/rules.mk b/keyboards/converter/hp_46010a/rules.mk
index 104381f12f..3c6124d20a 100644
--- a/keyboards/converter/hp_46010a/rules.mk
+++ b/keyboards/converter/hp_46010a/rules.mk
@@ -1,16 +1,3 @@
1# Build Options
2# change yes to no to disable
3#
4BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
5MOUSEKEY_ENABLE = yes # Mouse keys
6EXTRAKEY_ENABLE = yes # Audio control and System control
7CONSOLE_ENABLE = yes # Console for debug
8COMMAND_ENABLE = no # Commands for debug and configuration
9NKRO_ENABLE = yes # Enable N-Key Rollover
10BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
11AUDIO_ENABLE = no # Audio output
12RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
13SPLIT_KEYBOARD = no
14WAIT_FOR_USB = yes 1WAIT_FOR_USB = yes
15CUSTOM_MATRIX = yes 2CUSTOM_MATRIX = yes
16 3
diff --git a/keyboards/converter/ibm_terminal/info.json b/keyboards/converter/ibm_terminal/info.json
index 39840eb627..b95ea58d20 100644
--- a/keyboards/converter/ibm_terminal/info.json
+++ b/keyboards/converter/ibm_terminal/info.json
@@ -10,6 +10,13 @@
10 }, 10 },
11 "processor": "atmega32u4", 11 "processor": "atmega32u4",
12 "bootloader": "atmel-dfu", 12 "bootloader": "atmel-dfu",
13 "features": {
14 "bootmagic": false,
15 "mousekey": true,
16 "extrakey": true,
17 "nkro": true,
18 "ps2": true
19 },
13 "layouts": { 20 "layouts": {
14 "LAYOUT": { 21 "LAYOUT": {
15 "layout": [ 22 "layout": [
diff --git a/keyboards/converter/ibm_terminal/rules.mk b/keyboards/converter/ibm_terminal/rules.mk
index c04e7e01a4..038d8da5a2 100644
--- a/keyboards/converter/ibm_terminal/rules.mk
+++ b/keyboards/converter/ibm_terminal/rules.mk
@@ -1,16 +1,3 @@
1# Build Options
2# change yes to no to disable
3#
4BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
5MOUSEKEY_ENABLE = yes # Mouse keys
6EXTRAKEY_ENABLE = yes # Audio control and System control
7CONSOLE_ENABLE = no # Console for debug
8COMMAND_ENABLE = no # Commands for debug and configuration
9NKRO_ENABLE = yes # Enable N-Key Rollover
10BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
11AUDIO_ENABLE = no # Audio output
12RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
13PS2_ENABLE = yes
14PS2_DRIVER = usart 1PS2_DRIVER = usart
15CUSTOM_MATRIX = yes 2CUSTOM_MATRIX = yes
16 3
diff --git a/keyboards/converter/m0110_usb/info.json b/keyboards/converter/m0110_usb/info.json
index 1869d2dacb..522f83caba 100644
--- a/keyboards/converter/m0110_usb/info.json
+++ b/keyboards/converter/m0110_usb/info.json
@@ -10,6 +10,13 @@
10 }, 10 },
11 "processor": "atmega32u4", 11 "processor": "atmega32u4",
12 "bootloader": "caterina", 12 "bootloader": "caterina",
13 "features": {
14 "bootmagic": false,
15 "mousekey": false,
16 "console": true,
17 "extrakey": true,
18 "usb_hid": true
19 },
13 "layouts": { 20 "layouts": {
14 "LAYOUT_ansi": { 21 "LAYOUT_ansi": {
15 "layout": [ 22 "layout": [
diff --git a/keyboards/converter/m0110_usb/rules.mk b/keyboards/converter/m0110_usb/rules.mk
index a9dc1a9e49..7021c1052a 100644
--- a/keyboards/converter/m0110_usb/rules.mk
+++ b/keyboards/converter/m0110_usb/rules.mk
@@ -1,17 +1,6 @@
1# Processor frequency 1# Processor frequency
2F_CPU = 8000000 2F_CPU = 8000000
3 3
4# Build Options
5# change yes to no to disable
6#
7BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
8MOUSEKEY_ENABLE = no # Mouse keys
9CONSOLE_ENABLE = yes # Console for debug
10COMMAND_ENABLE = no # Commands for debug and configuration
11NKRO_ENABLE = no # Enable N-Key Rollover
12EXTRAKEY_ENABLE = yes
13USB_HID_ENABLE = yes
14BACKLIGHT_ENABLE = no
15CUSTOM_MATRIX = yes 4CUSTOM_MATRIX = yes
16 5
17SRC = matrix.c m0110.c 6SRC = matrix.c m0110.c
diff --git a/keyboards/converter/palm_usb/info.json b/keyboards/converter/palm_usb/info.json
index 2fe66720ec..c5b893d757 100644
--- a/keyboards/converter/palm_usb/info.json
+++ b/keyboards/converter/palm_usb/info.json
@@ -9,5 +9,12 @@
9 "device_version": "1.0.0" 9 "device_version": "1.0.0"
10 }, 10 },
11 "processor": "atmega32u4", 11 "processor": "atmega32u4",
12 "bootloader": "caterina" 12 "bootloader": "caterina",
13 "features": {
14 "bootmagic": false,
15 "mousekey": false,
16 "extrakey": false,
17 "console": true,
18 "command": true
19 }
13} 20}
diff --git a/keyboards/converter/palm_usb/rules.mk b/keyboards/converter/palm_usb/rules.mk
index 72d9daf6d9..bdb3bb0d6b 100644
--- a/keyboards/converter/palm_usb/rules.mk
+++ b/keyboards/converter/palm_usb/rules.mk
@@ -1,15 +1,3 @@
1# Build Options
2# change yes to no to disable
3#
4BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
5MOUSEKEY_ENABLE = no # Mouse keys
6EXTRAKEY_ENABLE = no # Audio control and System control
7CONSOLE_ENABLE = yes # Console for debug
8COMMAND_ENABLE = yes # Commands for debug and configuration
9NKRO_ENABLE = no # Enable N-Key Rollover
10BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
11AUDIO_ENABLE = no # Audio output
12RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
13#HARDWARE_SERIAL = yes 1#HARDWARE_SERIAL = yes
14CUSTOM_MATRIX = yes 2CUSTOM_MATRIX = yes
15 3
diff --git a/keyboards/converter/periboard_512/info.json b/keyboards/converter/periboard_512/keyboard.json
index 08cc8ee9bf..b335931493 100644
--- a/keyboards/converter/periboard_512/info.json
+++ b/keyboards/converter/periboard_512/keyboard.json
@@ -10,6 +10,11 @@
10 }, 10 },
11 "processor": "at90usb1286", 11 "processor": "at90usb1286",
12 "bootloader": "halfkay", 12 "bootloader": "halfkay",
13 "features": {
14 "bootmagic": false,
15 "mousekey": false,
16 "extrakey": false
17 },
13 "diode_direction": "ROW2COL", 18 "diode_direction": "ROW2COL",
14 "matrix_pins": { 19 "matrix_pins": {
15 "cols": ["B7", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "E0", "E1", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7"], 20 "cols": ["B7", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "E0", "E1", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7"],
diff --git a/keyboards/converter/periboard_512/rules.mk b/keyboards/converter/periboard_512/rules.mk
deleted file mode 100644
index 1eeda920b4..0000000000
--- a/keyboards/converter/periboard_512/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
1# Build Options
2# change yes to no to disable
3#
4BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
5MOUSEKEY_ENABLE = no # Mouse keys
6EXTRAKEY_ENABLE = no # Audio control and System control
7CONSOLE_ENABLE = no # Console for debug
8COMMAND_ENABLE = no # Commands for debug and configuration
9NKRO_ENABLE = no # Enable N-Key Rollover
10BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
11RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
12AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/converter/siemens_tastatur/info.json b/keyboards/converter/siemens_tastatur/info.json
index 8ed2523c26..571d06a5c3 100644
--- a/keyboards/converter/siemens_tastatur/info.json
+++ b/keyboards/converter/siemens_tastatur/info.json
@@ -10,6 +10,15 @@
10 }, 10 },
11 "processor": "STM32F103", 11 "processor": "STM32F103",
12 "bootloader": "stm32duino", 12 "bootloader": "stm32duino",
13 "features": {
14 "bootmagic": false,
15 "mousekey": true,
16 "extrakey": true,
17 "console": true,
18 "command": true,
19 "nkro": true,
20 "sleep_led": true
21 },
13 "layouts": { 22 "layouts": {
14 "LAYOUT": { 23 "LAYOUT": {
15 "layout": [ 24 "layout": [
diff --git a/keyboards/converter/siemens_tastatur/rules.mk b/keyboards/converter/siemens_tastatur/rules.mk
index 1bc8ee188b..3215e3588a 100644
--- a/keyboards/converter/siemens_tastatur/rules.mk
+++ b/keyboards/converter/siemens_tastatur/rules.mk
@@ -1,17 +1,2 @@
1SRC = matrix.c
2
3# Build Options
4# change yes to no to disable
5#
6BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
7MOUSEKEY_ENABLE = yes # Mouse keys
8EXTRAKEY_ENABLE = yes # Audio control and System control
9CONSOLE_ENABLE = yes # Console for debug
10COMMAND_ENABLE = yes # Commands for debug and configuration
11NKRO_ENABLE = yes # Enable N-Key Rollover
12BACKLIGHT_ENABLE = no
13RGBLIGHT_ENABLE = no
14SLEEP_LED_ENABLE = yes
15CUSTOM_MATRIX = yes 1CUSTOM_MATRIX = yes
16 2SRC = matrix.c
17
diff --git a/keyboards/converter/sun_usb/info.json b/keyboards/converter/sun_usb/info.json
index a243a64da2..e4031595ad 100644
--- a/keyboards/converter/sun_usb/info.json
+++ b/keyboards/converter/sun_usb/info.json
@@ -9,5 +9,13 @@
9 "device_version": "1.0.0" 9 "device_version": "1.0.0"
10 }, 10 },
11 "processor": "atmega32u4", 11 "processor": "atmega32u4",
12 "bootloader": "lufa-dfu" 12 "bootloader": "lufa-dfu",
13 "features": {
14 "bootmagic": false,
15 "mousekey": true,
16 "extrakey": true,
17 "console": true,
18 "command": true,
19 "nkro": true
20 }
13} 21}
diff --git a/keyboards/converter/sun_usb/rules.mk b/keyboards/converter/sun_usb/rules.mk
index ae20f51b37..d3ec00c5d5 100644
--- a/keyboards/converter/sun_usb/rules.mk
+++ b/keyboards/converter/sun_usb/rules.mk
@@ -1,15 +1,3 @@
1# Build Options
2# change yes to no to disable
3#
4BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
5MOUSEKEY_ENABLE = yes # Mouse keys
6EXTRAKEY_ENABLE = yes # Audio control and System control
7CONSOLE_ENABLE = yes # Console for debug
8COMMAND_ENABLE = yes # Commands for debug and configuration
9NKRO_ENABLE = yes # Enable N-Key Rollover
10BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
11AUDIO_ENABLE = no # Audio output
12RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
13#HARDWARE_SERIAL = yes 1#HARDWARE_SERIAL = yes
14CUSTOM_MATRIX = yes 2CUSTOM_MATRIX = yes
15 3
diff --git a/keyboards/converter/xt_usb/info.json b/keyboards/converter/xt_usb/info.json
index 1c9bcf5e34..649b283329 100644
--- a/keyboards/converter/xt_usb/info.json
+++ b/keyboards/converter/xt_usb/info.json
@@ -10,6 +10,14 @@
10 }, 10 },
11 "processor": "atmega32u4", 11 "processor": "atmega32u4",
12 "bootloader": "halfkay", 12 "bootloader": "halfkay",
13 "features": {
14 "bootmagic": false,
15 "mousekey": true,
16 "extrakey": true,
17 "console": true,
18 "command": true,
19 "nkro": true
20 },
13 "layouts": { 21 "layouts": {
14 "LAYOUT_xt": { 22 "LAYOUT_xt": {
15 "layout": [ 23 "layout": [
diff --git a/keyboards/converter/xt_usb/rules.mk b/keyboards/converter/xt_usb/rules.mk
index f98bdcc5d3..3fd6b1cfa6 100644
--- a/keyboards/converter/xt_usb/rules.mk
+++ b/keyboards/converter/xt_usb/rules.mk
@@ -1,15 +1,3 @@
1# Build Options
2# change yes to no to disable
3#
4BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
5MOUSEKEY_ENABLE = yes # Mouse keys
6EXTRAKEY_ENABLE = yes # Audio control and System control
7CONSOLE_ENABLE = yes # Console for debug
8COMMAND_ENABLE = yes # Commands for debug and configuration
9NKRO_ENABLE = yes # Enable N-Key Rollover
10BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
11RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
12AUDIO_ENABLE = no # Audio output
13CUSTOM_MATRIX = yes 1CUSTOM_MATRIX = yes
14 2
15SRC += matrix.c xt_interrupt.c 3SRC += matrix.c xt_interrupt.c
diff --git a/keyboards/coseyfannitutti/discipline/info.json b/keyboards/coseyfannitutti/discipline/info.json
index 82da2f800f..1fb94c7052 100644
--- a/keyboards/coseyfannitutti/discipline/info.json
+++ b/keyboards/coseyfannitutti/discipline/info.json
@@ -16,6 +16,11 @@
16 "diode_direction": "COL2ROW", 16 "diode_direction": "COL2ROW",
17 "processor": "atmega32a", 17 "processor": "atmega32a",
18 "bootloader": "usbasploader", 18 "bootloader": "usbasploader",
19 "features": {
20 "bootmagic": true,
21 "mousekey": true,
22 "extrakey": true
23 },
19 "layout_aliases": { 24 "layout_aliases": {
20 "LAYOUT_65_ansi_2_right_mods": "LAYOUT_65_ansi_blocker", 25 "LAYOUT_65_ansi_2_right_mods": "LAYOUT_65_ansi_blocker",
21 "LAYOUT_65_iso_2_right_mods": "LAYOUT_65_iso_blocker", 26 "LAYOUT_65_iso_2_right_mods": "LAYOUT_65_iso_blocker",
diff --git a/keyboards/coseyfannitutti/discipline/rules.mk b/keyboards/coseyfannitutti/discipline/rules.mk
index 18550f0a64..c2ee0bc86f 100644
--- a/keyboards/coseyfannitutti/discipline/rules.mk
+++ b/keyboards/coseyfannitutti/discipline/rules.mk
@@ -1,15 +1,2 @@
1# Processor frequency 1# Processor frequency
2F_CPU = 16000000 2F_CPU = 16000000
3
4# Build Options
5# change yes to no to disable
6#
7BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
8MOUSEKEY_ENABLE = yes # Mouse keys
9EXTRAKEY_ENABLE = yes # Audio control and System control
10CONSOLE_ENABLE = no # Console for debug
11COMMAND_ENABLE = no # Commands for debug and configuration
12NKRO_ENABLE = no # Enable N-Key Rollover
13BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
14RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
15AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/coseyfannitutti/mysterium/info.json b/keyboards/coseyfannitutti/mysterium/info.json
index ff6e2de22b..0d75d19229 100644
--- a/keyboards/coseyfannitutti/mysterium/info.json
+++ b/keyboards/coseyfannitutti/mysterium/info.json
@@ -15,6 +15,11 @@
15 "diode_direction": "COL2ROW", 15 "diode_direction": "COL2ROW",
16 "processor": "atmega32a", 16 "processor": "atmega32a",
17 "bootloader": "usbasploader", 17 "bootloader": "usbasploader",
18 "features": {
19 "bootmagic": true,
20 "mousekey": false,
21 "extrakey": true
22 },
18 "community_layouts": ["tkl_ansi"], 23 "community_layouts": ["tkl_ansi"],
19 "layouts": { 24 "layouts": {
20 "LAYOUT_tkl_ansi": { 25 "LAYOUT_tkl_ansi": {
diff --git a/keyboards/coseyfannitutti/mysterium/rules.mk b/keyboards/coseyfannitutti/mysterium/rules.mk
index b6082e107c..c2ee0bc86f 100644
--- a/keyboards/coseyfannitutti/mysterium/rules.mk
+++ b/keyboards/coseyfannitutti/mysterium/rules.mk
@@ -1,15 +1,2 @@
1# Processor frequency 1# Processor frequency
2F_CPU = 16000000 2F_CPU = 16000000
3
4# Build Options
5# change yes to no to disable
6#
7BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
8MOUSEKEY_ENABLE = no # Mouse keys
9EXTRAKEY_ENABLE = yes # Audio control and System control
10CONSOLE_ENABLE = no # Console for debug
11COMMAND_ENABLE = no # Commands for debug and configuration
12NKRO_ENABLE = no # Enable N-Key Rollover
13BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
14RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
15AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/cozykeys/speedo/v3/info.json b/keyboards/cozykeys/speedo/v3/info.json
index 3a084b04ba..7636d9b702 100644
--- a/keyboards/cozykeys/speedo/v3/info.json
+++ b/keyboards/cozykeys/speedo/v3/info.json
@@ -36,6 +36,12 @@
36 "diode_direction": "COL2ROW", 36 "diode_direction": "COL2ROW",
37 "processor": "atmega32u4", 37 "processor": "atmega32u4",
38 "bootloader": "atmel-dfu", 38 "bootloader": "atmel-dfu",
39 "features": {
40 "bootmagic": false,
41 "mousekey": true,
42 "extrakey": true,
43 "rgblight": true
44 },
39 "layouts": { 45 "layouts": {
40 "LAYOUT": { 46 "LAYOUT": {
41 "layout": [ 47 "layout": [
diff --git a/keyboards/cozykeys/speedo/v3/rules.mk b/keyboards/cozykeys/speedo/v3/rules.mk
index 78ff4d5d60..baf23318cc 100644
--- a/keyboards/cozykeys/speedo/v3/rules.mk
+++ b/keyboards/cozykeys/speedo/v3/rules.mk
@@ -1,14 +1 @@
1PIN_COMPATIBLE = elite_c PIN_COMPATIBLE = elite_c
2
3# Build Options
4# change yes to no to disable
5#
6BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
7MOUSEKEY_ENABLE = yes # Mouse keys
8EXTRAKEY_ENABLE = yes # Audio control and System control
9CONSOLE_ENABLE = no # Console for debug
10COMMAND_ENABLE = no # Commands for debug and configuration
11NKRO_ENABLE = no # Enable N-Key Rollover
12BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
13RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
14AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/crimsonkeyboards/resume1800/info.json b/keyboards/crimsonkeyboards/resume1800/info.json
index 23257be46e..f88b703208 100644
--- a/keyboards/crimsonkeyboards/resume1800/info.json
+++ b/keyboards/crimsonkeyboards/resume1800/info.json
@@ -20,6 +20,11 @@
20 }, 20 },
21 "processor": "atmega32a", 21 "processor": "atmega32a",
22 "bootloader": "usbasploader", 22 "bootloader": "usbasploader",
23 "features": {
24 "bootmagic": true,
25 "mousekey": true,
26 "extrakey": true
27 },
23 "layout_aliases": { 28 "layout_aliases": {
24 "LAYOUT_resume1800_ansi_all": "LAYOUT_ansi_all", 29 "LAYOUT_resume1800_ansi_all": "LAYOUT_ansi_all",
25 "LAYOUT_resume1800_iso_all": "LAYOUT_iso_all" 30 "LAYOUT_resume1800_iso_all": "LAYOUT_iso_all"
diff --git a/keyboards/crimsonkeyboards/resume1800/rules.mk b/keyboards/crimsonkeyboards/resume1800/rules.mk
index 18550f0a64..c2ee0bc86f 100644
--- a/keyboards/crimsonkeyboards/resume1800/rules.mk
+++ b/keyboards/crimsonkeyboards/resume1800/rules.mk
@@ -1,15 +1,2 @@
1# Processor frequency 1# Processor frequency
2F_CPU = 16000000 2F_CPU = 16000000
3
4# Build Options
5# change yes to no to disable
6#
7BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
8MOUSEKEY_ENABLE = yes # Mouse keys
9EXTRAKEY_ENABLE = yes # Audio control and System control
10CONSOLE_ENABLE = no # Console for debug
11COMMAND_ENABLE = no # Commands for debug and configuration
12NKRO_ENABLE = no # Enable N-Key Rollover
13BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
14RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
15AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/crypt_macro/info.json b/keyboards/crypt_macro/info.json
index 1b340ff74f..e8771e363e 100644
--- a/keyboards/crypt_macro/info.json
+++ b/keyboards/crypt_macro/info.json
@@ -31,6 +31,13 @@
31 }, 31 },
32 "processor": "STM32F072", 32 "processor": "STM32F072",
33 "bootloader": "stm32-dfu", 33 "bootloader": "stm32-dfu",
34 "features": {
35 "bootmagic": true,
36 "mousekey": true,
37 "extrakey": true,
38 "nkro": true,
39 "rgblight": true
40 },
34 "matrix_pins": { 41 "matrix_pins": {
35 "direct": [ 42 "direct": [
36 ["B12", "B6", "B7"], 43 ["B12", "B6", "B7"],
diff --git a/keyboards/crypt_macro/rules.mk b/keyboards/crypt_macro/rules.mk
index cc9d7bb3f5..0ab54aaaf7 100644
--- a/keyboards/crypt_macro/rules.mk
+++ b/keyboards/crypt_macro/rules.mk
@@ -1,15 +1,2 @@
1# Wildcard to allow APM32 MCU 1# Wildcard to allow APM32 MCU
2DFU_SUFFIX_ARGS = -v FFFF -p FFFF 2DFU_SUFFIX_ARGS = -v FFFF -p FFFF
3
4# Build Options
5# change yes to no to disable
6#
7BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
8MOUSEKEY_ENABLE = yes # Mouse keys
9EXTRAKEY_ENABLE = yes # Audio control and System control
10CONSOLE_ENABLE = no # Console for debug
11COMMAND_ENABLE = no # Commands for debug and configuration
12NKRO_ENABLE = yes # Enable N-Key Rollover
13BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
14RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
15AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/custommk/genesis/rev1/keyboard.json b/keyboards/custommk/genesis/rev1/keyboard.json
index f859a6b9bf..7025834d91 100644
--- a/keyboards/custommk/genesis/rev1/keyboard.json
+++ b/keyboards/custommk/genesis/rev1/keyboard.json
@@ -45,6 +45,14 @@
45 }, 45 },
46 "processor": "atmega32u4", 46 "processor": "atmega32u4",
47 "bootloader": "qmk-dfu", 47 "bootloader": "qmk-dfu",
48 "features": {
49 "bootmagic": true,
50 "mousekey": true,
51 "extrakey": true,
52 "nkro": true,
53 "rgblight": true,
54 "encoder": true
55 },
48 "layouts": { 56 "layouts": {
49 "LAYOUT_ortho_5x4": { 57 "LAYOUT_ortho_5x4": {
50 "layout": [ 58 "layout": [
diff --git a/keyboards/custommk/genesis/rev2/info.json b/keyboards/custommk/genesis/rev2/keyboard.json
index 5760ba52cd..d56cdb9df5 100644
--- a/keyboards/custommk/genesis/rev2/info.json
+++ b/keyboards/custommk/genesis/rev2/keyboard.json
@@ -45,6 +45,14 @@
45 }, 45 },
46 "processor": "atmega32u4", 46 "processor": "atmega32u4",
47 "bootloader": "qmk-dfu", 47 "bootloader": "qmk-dfu",
48 "features": {
49 "bootmagic": true,
50 "mousekey": true,
51 "extrakey": true,
52 "nkro": true,
53 "rgblight": true,
54 "encoder": true
55 },
48 "layouts": { 56 "layouts": {
49 "LAYOUT_ortho_5x4": { 57 "LAYOUT_ortho_5x4": {
50 "layout": [ 58 "layout": [
diff --git a/keyboards/custommk/genesis/rev2/rules.mk b/keyboards/custommk/genesis/rev2/rules.mk
deleted file mode 100644
index 212c267b25..0000000000
--- a/keyboards/custommk/genesis/rev2/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
1# Build Options
2# change yes to no to disable
3#
4BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
5MOUSEKEY_ENABLE = yes # Mouse keys
6EXTRAKEY_ENABLE = yes # Audio control and System control
7CONSOLE_ENABLE = no # Console for debug
8COMMAND_ENABLE = no # Commands for debug and configuration
9NKRO_ENABLE = yes # Enable N-Key Rollover
10BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
11RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
12AUDIO_ENABLE = no # Audio output
13ENCODER_ENABLE = yes \ No newline at end of file
diff --git a/keyboards/custommk/genesis/rules.mk b/keyboards/custommk/genesis/rules.mk
index cb164c1a89..3d64c0af2b 100644
--- a/keyboards/custommk/genesis/rules.mk
+++ b/keyboards/custommk/genesis/rules.mk
@@ -1,15 +1 @@
1# Build Options
2# change yes to no to disable
3#
4BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
5MOUSEKEY_ENABLE = yes # Mouse keys
6EXTRAKEY_ENABLE = yes # Audio control and System control
7CONSOLE_ENABLE = no # Console for debug
8COMMAND_ENABLE = no # Commands for debug and configuration
9NKRO_ENABLE = yes # Enable N-Key Rollover
10BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
11RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
12AUDIO_ENABLE = no # Audio output
13ENCODER_ENABLE = yes
14
15DEFAULT_FOLDER = custommk/genesis/rev2 DEFAULT_FOLDER = custommk/genesis/rev2