aboutsummaryrefslogtreecommitdiff
path: root/keyboards/merge
diff options
context:
space:
mode:
authorJoel Challis <[email protected]>2024-04-13 08:45:27 +0100
committerGitHub <[email protected]>2024-04-13 08:45:27 +0100
commit2eea2cdc46b3e920578ed75c4545a8b5160135bd (patch)
treebbc7b12b4b7320f278c1334f066254baff0e52bf /keyboards/merge
parent8ad3a36fb60d75b5f0279f0cd4d9c24dde6b6330 (diff)
downloadqmk_firmware-2eea2cdc46b3e920578ed75c4545a8b5160135bd.tar.gz
qmk_firmware-2eea2cdc46b3e920578ed75c4545a8b5160135bd.zip
Miscellaneous keyboard.json migrations (#23486)
Diffstat (limited to 'keyboards/merge')
-rw-r--r--keyboards/merge/um70/keyboard.json (renamed from keyboards/merge/um70/info.json)11
-rw-r--r--keyboards/merge/um70/rules.mk14
-rw-r--r--keyboards/merge/um80/keyboard.json (renamed from keyboards/merge/um80/info.json)11
-rw-r--r--keyboards/merge/um80/rules.mk14
4 files changed, 22 insertions, 28 deletions
diff --git a/keyboards/merge/um70/info.json b/keyboards/merge/um70/keyboard.json
index a667dbe11b..c349abc788 100644
--- a/keyboards/merge/um70/info.json
+++ b/keyboards/merge/um70/keyboard.json
@@ -8,6 +8,17 @@
"pid": "0x3222",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "oled": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D6", "D4"],
"rows": ["B0", "B1", "B2", "B3", "B7"]
diff --git a/keyboards/merge/um70/rules.mk b/keyboards/merge/um70/rules.mk
deleted file mode 100644
index 45cbdcf015..0000000000
--- a/keyboards/merge/um70/rules.mk
+++ /dev/null
@@ -1,14 +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 = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = yes
-OLED_ENABLE = yes
diff --git a/keyboards/merge/um80/info.json b/keyboards/merge/um80/keyboard.json
index 64939a18fb..5a369877f8 100644
--- a/keyboards/merge/um80/info.json
+++ b/keyboards/merge/um80/keyboard.json
@@ -8,6 +8,17 @@
"pid": "0x3241",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "oled": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D6", "D4"],
"rows": ["B0", "B1", "B2", "B3", "B7", "C7"]
diff --git a/keyboards/merge/um80/rules.mk b/keyboards/merge/um80/rules.mk
deleted file mode 100644
index 45cbdcf015..0000000000
--- a/keyboards/merge/um80/rules.mk
+++ /dev/null
@@ -1,14 +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 = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = yes
-OLED_ENABLE = yes