aboutsummaryrefslogtreecommitdiff
path: root/keyboards/merge
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/merge')
-rw-r--r--keyboards/merge/iso_macro/keyboard.json (renamed from keyboards/merge/iso_macro/info.json)10
-rw-r--r--keyboards/merge/iso_macro/rules.mk13
-rw-r--r--keyboards/merge/uc1/keyboard.json (renamed from keyboards/merge/uc1/info.json)10
-rw-r--r--keyboards/merge/uc1/rules.mk13
-rw-r--r--keyboards/merge/um70/keyboard.json (renamed from keyboards/merge/um70/info.json)12
-rw-r--r--keyboards/merge/um70/rules.mk15
-rw-r--r--keyboards/merge/um80/keyboard.json (renamed from keyboards/merge/um80/info.json)12
-rw-r--r--keyboards/merge/um80/rules.mk15
-rw-r--r--keyboards/merge/uma/keyboard.json (renamed from keyboards/merge/uma/info.json)13
-rw-r--r--keyboards/merge/uma/rules.mk16
10 files changed, 57 insertions, 72 deletions
diff --git a/keyboards/merge/iso_macro/info.json b/keyboards/merge/iso_macro/keyboard.json
index fe20e701ba..1c6d905282 100644
--- a/keyboards/merge/iso_macro/info.json
+++ b/keyboards/merge/iso_macro/keyboard.json
@@ -8,6 +8,16 @@
"pid": "0x1200",
"device_version": "0.0.1"
},
+ "features": {
+ "backlight": true,
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["B4", "B5", "B6"],
"rows": ["F4", "F5", "F6"]
diff --git a/keyboards/merge/iso_macro/rules.mk b/keyboards/merge/iso_macro/rules.mk
deleted file mode 100644
index f6b1d47e1a..0000000000
--- a/keyboards/merge/iso_macro/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # 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 = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = yes \ No newline at end of file
diff --git a/keyboards/merge/uc1/info.json b/keyboards/merge/uc1/keyboard.json
index b1f032417f..85e9b03c64 100644
--- a/keyboards/merge/uc1/info.json
+++ b/keyboards/merge/uc1/keyboard.json
@@ -30,6 +30,16 @@
"ws2812": {
"pin": "B5"
},
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["B3", "B4"],
"rows": ["B1", "B2"]
diff --git a/keyboards/merge/uc1/rules.mk b/keyboards/merge/uc1/rules.mk
deleted file mode 100644
index e78e1f6cec..0000000000
--- a/keyboards/merge/uc1/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # 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 = no # 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
diff --git a/keyboards/merge/um70/info.json b/keyboards/merge/um70/keyboard.json
index 9c120b9224..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"]
@@ -19,6 +30,7 @@
]
},
"split": {
+ "enabled": true,
"soft_serial_pin": "D2"
},
"ws2812": {
diff --git a/keyboards/merge/um70/rules.mk b/keyboards/merge/um70/rules.mk
deleted file mode 100644
index 11776618e2..0000000000
--- a/keyboards/merge/um70/rules.mk
+++ /dev/null
@@ -1,15 +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
-SPLIT_KEYBOARD = yes
-OLED_ENABLE = yes
diff --git a/keyboards/merge/um80/info.json b/keyboards/merge/um80/keyboard.json
index 554d1997a3..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"]
@@ -19,6 +30,7 @@
]
},
"split": {
+ "enabled": true,
"soft_serial_pin": "D2"
},
"ws2812": {
diff --git a/keyboards/merge/um80/rules.mk b/keyboards/merge/um80/rules.mk
deleted file mode 100644
index 11776618e2..0000000000
--- a/keyboards/merge/um80/rules.mk
+++ /dev/null
@@ -1,15 +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
-SPLIT_KEYBOARD = yes
-OLED_ENABLE = yes
diff --git a/keyboards/merge/uma/info.json b/keyboards/merge/uma/keyboard.json
index 7de7cd251f..d5fea75fb4 100644
--- a/keyboards/merge/uma/info.json
+++ b/keyboards/merge/uma/keyboard.json
@@ -8,6 +8,18 @@
"pid": "0x3232",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "backlight": true,
+ "encoder": true,
+ "oled": true
+ },
+ "build": {
+ "lto": true
+ },
"matrix_pins": {
"cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D6", "D4"],
"rows": ["B0", "B1", "B2", "B3", "B7"]
@@ -22,6 +34,7 @@
]
},
"split": {
+ "enabled": true,
"soft_serial_pin": "D2"
},
"processor": "atmega32u4",
diff --git a/keyboards/merge/uma/rules.mk b/keyboards/merge/uma/rules.mk
deleted file mode 100644
index 8bd01d2bb4..0000000000
--- a/keyboards/merge/uma/rules.mk
+++ /dev/null
@@ -1,16 +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 = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = yes
-SPLIT_KEYBOARD = yes
-LTO_ENABLE = yes
-OLED_ENABLE = yes