aboutsummaryrefslogtreecommitdiff
path: root/keyboards/merge
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/merge')
-rw-r--r--keyboards/merge/iso_macro/keyboard.json3
-rw-r--r--keyboards/merge/uc1/keyboard.json5
-rw-r--r--keyboards/merge/um70/keyboard.json2
-rw-r--r--keyboards/merge/um80/keyboard.json2
4 files changed, 1 insertions, 11 deletions
diff --git a/keyboards/merge/iso_macro/keyboard.json b/keyboards/merge/iso_macro/keyboard.json
index 1c6d905282..5fcfc6fcb1 100644
--- a/keyboards/merge/iso_macro/keyboard.json
+++ b/keyboards/merge/iso_macro/keyboard.json
@@ -1,7 +1,6 @@
{
"keyboard_name": "ISO Macro",
"manufacturer": "Merge",
- "url": "",
"maintainer": "duoshock",
"usb": {
"vid": "0x4D65",
@@ -11,8 +10,6 @@
"features": {
"backlight": true,
"bootmagic": false,
- "command": false,
- "console": false,
"encoder": true,
"extrakey": true,
"mousekey": true,
diff --git a/keyboards/merge/uc1/keyboard.json b/keyboards/merge/uc1/keyboard.json
index 85e9b03c64..4d0393399f 100644
--- a/keyboards/merge/uc1/keyboard.json
+++ b/keyboards/merge/uc1/keyboard.json
@@ -32,8 +32,6 @@
},
"features": {
"bootmagic": false,
- "command": false,
- "console": false,
"encoder": true,
"extrakey": true,
"mousekey": true,
@@ -50,8 +48,7 @@
{"pin_a": "F5", "pin_b": "F6"}
]
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/merge/um70/keyboard.json b/keyboards/merge/um70/keyboard.json
index afb52d3d4f..7ebb61f7fe 100644
--- a/keyboards/merge/um70/keyboard.json
+++ b/keyboards/merge/um70/keyboard.json
@@ -10,8 +10,6 @@
},
"features": {
"bootmagic": true,
- "command": false,
- "console": false,
"encoder": true,
"extrakey": true,
"mousekey": true,
diff --git a/keyboards/merge/um80/keyboard.json b/keyboards/merge/um80/keyboard.json
index ea233e8f1c..6024f6e485 100644
--- a/keyboards/merge/um80/keyboard.json
+++ b/keyboards/merge/um80/keyboard.json
@@ -10,8 +10,6 @@
},
"features": {
"bootmagic": true,
- "command": false,
- "console": false,
"encoder": true,
"extrakey": true,
"mousekey": true,