aboutsummaryrefslogtreecommitdiff
path: root/keyboards/chlx
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/chlx')
-rw-r--r--keyboards/chlx/merro60/keyboard.json (renamed from keyboards/chlx/merro60/info.json)8
-rw-r--r--keyboards/chlx/merro60/rules.mk12
-rw-r--r--keyboards/chlx/ppr_merro60/keyboard.json (renamed from keyboards/chlx/ppr_merro60/info.json)0
-rw-r--r--keyboards/chlx/ppr_merro60/rules.mk1
4 files changed, 8 insertions, 13 deletions
diff --git a/keyboards/chlx/merro60/info.json b/keyboards/chlx/merro60/keyboard.json
index f9de8194ba..d34489607a 100644
--- a/keyboards/chlx/merro60/info.json
+++ b/keyboards/chlx/merro60/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x0601",
"device_version": "1.0.0"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["B7", "D1", "D0", "B0", "B1", "E6", "B2", "B3", "D2", "D7", "B4", "B6", "C6", "C7", "D6"],
"rows": ["D4", "D5", "D3", "B5", "F4"]
diff --git a/keyboards/chlx/merro60/rules.mk b/keyboards/chlx/merro60/rules.mk
deleted file mode 100644
index 3b6a1809db..0000000000
--- a/keyboards/chlx/merro60/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/chlx/ppr_merro60/info.json b/keyboards/chlx/ppr_merro60/keyboard.json
index f8f45232a1..f8f45232a1 100644
--- a/keyboards/chlx/ppr_merro60/info.json
+++ b/keyboards/chlx/ppr_merro60/keyboard.json
diff --git a/keyboards/chlx/ppr_merro60/rules.mk b/keyboards/chlx/ppr_merro60/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/chlx/ppr_merro60/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank