aboutsummaryrefslogtreecommitdiff
path: root/keyboards/mechwild
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/mechwild')
-rw-r--r--keyboards/mechwild/bde/info.json3
-rw-r--r--keyboards/mechwild/bde/rev2/keyboard.json1
-rw-r--r--keyboards/mechwild/mercutio/keyboard.json339
-rw-r--r--keyboards/mechwild/mercutio/keymaps/default/keymap.c24
-rw-r--r--keyboards/mechwild/mercutio/keymaps/default_625u_space/keymap.c10
-rw-r--r--keyboards/mechwild/mokulua/mirrored/keyboard.json3
-rw-r--r--keyboards/mechwild/mokulua/standard/keyboard.json3
-rw-r--r--keyboards/mechwild/murphpad/keyboard.json5
-rw-r--r--keyboards/mechwild/obe/info.json2
-rw-r--r--keyboards/mechwild/puckbuddy/halconf.h3
-rw-r--r--keyboards/mechwild/sugarglider/f401/keyboard.json2
-rw-r--r--keyboards/mechwild/sugarglider/f411/keyboard.json2
-rw-r--r--keyboards/mechwild/sugarglider/halconf.h3
-rw-r--r--keyboards/mechwild/sugarglider/info.json2
-rw-r--r--keyboards/mechwild/sugarglider/rules.mk2
-rw-r--r--keyboards/mechwild/sugarglider/wide_oled/f401/keyboard.json2
-rw-r--r--keyboards/mechwild/sugarglider/wide_oled/f411/keyboard.json2
-rw-r--r--keyboards/mechwild/sugarglider/wide_oled/rules.mk2
18 files changed, 321 insertions, 89 deletions
diff --git a/keyboards/mechwild/bde/info.json b/keyboards/mechwild/bde/info.json
index 918c792aa7..edecde1eba 100644
--- a/keyboards/mechwild/bde/info.json
+++ b/keyboards/mechwild/bde/info.json
@@ -10,8 +10,7 @@
},
"development_board": "promicro",
"rgblight": {
- "sleep": true,
- "max_brightness": 255
+ "sleep": true
},
"tapping": {
"tap_keycode_delay": 10,
diff --git a/keyboards/mechwild/bde/rev2/keyboard.json b/keyboards/mechwild/bde/rev2/keyboard.json
index 932f99f0e9..b166934e1e 100644
--- a/keyboards/mechwild/bde/rev2/keyboard.json
+++ b/keyboards/mechwild/bde/rev2/keyboard.json
@@ -34,7 +34,6 @@
"animations": {
"rainbow_swirl": true
},
- "hue_steps": 8,
"saturation_steps": 8,
"brightness_steps": 8
},
diff --git a/keyboards/mechwild/mercutio/keyboard.json b/keyboards/mechwild/mercutio/keyboard.json
index 0a7d758128..58ff0b216e 100644
--- a/keyboards/mechwild/mercutio/keyboard.json
+++ b/keyboards/mechwild/mercutio/keyboard.json
@@ -1,17 +1,17 @@
{
- "keyboard_name": "Mercutio",
"manufacturer": "MechWild",
- "url": "mechwild.com",
+ "keyboard_name": "Mercutio",
"maintainer": "kylemccreery",
- "usb": {
- "vid": "0x6D77",
- "pid": "0x1703",
- "device_version": "1.0.0"
+ "bootloader": "usbasploader",
+ "bootloader_instructions": "Hold down the BOOT button, then tap the RESET button.",
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B4", "pin_b": "B5"}
+ ]
},
"features": {
"bootmagic": true,
- "command": false,
- "console": false,
"encoder": true,
"extrakey": true,
"mousekey": true,
@@ -22,26 +22,72 @@
"cols": ["B0", "D7", "D6", "D5", "B1", "B2", "B3"],
"rows": ["D0", "D1", "D4", "C3", "C0", "C1", "C2"]
},
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "B4", "pin_b": "B5"}
- ]
- },
+ "processor": "atmega328p",
"qmk": {
- "tap_keycode_delay": 10,
"locking": {
"enabled": true,
"resync": true
- }
+ },
+ "tap_keycode_delay": 10
+ },
+ "url": "https://mechwild.com",
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0x1703",
+ "vid": "0x6D77"
},
- "processor": "atmega328p",
- "bootloader": "usbasploader",
"layouts": {
+ "LAYOUT_625u_space": {
+ "layout": [
+ {"label": "Mute", "matrix": [4, 2], "x": 12, "y": 0, "encoder": 0},
+ {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [0, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [0, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [0, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [0, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [0, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [0, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [4, 6], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [4, 5], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [4, 4], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [4, 3], "x": 10.5, "y": 1},
+ {"label": "Backspace", "matrix": [5, 2], "x": 11.5, "y": 1, "w": 1.5},
+ {"label": "Fn", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [1, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [1, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [1, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [1, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [1, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [1, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [5, 6], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [5, 5], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+ {"label": "'", "matrix": [4, 1], "x": 10.75, "y": 2},
+ {"label": "Enter", "matrix": [5, 3], "x": 11.75, "y": 2, "w": 1.25},
+ {"label": "Shift", "matrix": [2, 0], "x": 0, "y": 3, "w": 1.25},
+ {"label": "/", "matrix": [2, 1], "x": 1.25, "y": 3},
+ {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [2, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [2, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [2, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [2, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [6, 6], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [6, 5], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [6, 4], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [6, 3], "x": 10.25, "y": 3},
+ {"label": "Shift", "matrix": [6, 2], "x": 11.25, "y": 3, "w": 1.75},
+ {"label": "Ctrl", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 4},
+ {"label": "Alt", "matrix": [3, 1], "x": 2.25, "y": 4, "w": 1.25},
+ {"label": "Space", "matrix": [3, 5], "x": 3.25, "y": 4, "w": 6.25},
+ {"label": "Alt", "matrix": [3, 3], "x": 9.5, "y": 4, "w": 1.25},
+ {"label": "Fn2", "matrix": [3, 2], "x": 10.75, "y": 4},
+ {"label": "Ctrl", "matrix": [2, 2], "x": 11.75, "y": 4, "w": 1.25}
+ ]
+ },
"LAYOUT_all": {
"layout": [
- {"label": "Mute", "matrix": [4, 2], "x": 12, "y": 0},
-
+ {"label": "Mute", "matrix": [4, 2], "x": 12, "y": 0, "encoder": 0},
{"label": "Tab", "matrix": [0, 0], "x": 0, "y": 1, "w": 1.5},
{"label": "Q", "matrix": [0, 1], "x": 1.5, "y": 1},
{"label": "W", "matrix": [0, 2], "x": 2.5, "y": 1},
@@ -54,7 +100,6 @@
{"label": "O", "matrix": [4, 4], "x": 9.5, "y": 1},
{"label": "P", "matrix": [4, 3], "x": 10.5, "y": 1},
{"label": "Backspace", "matrix": [5, 2], "x": 11.5, "y": 1, "w": 1.5},
-
{"label": "Fn", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.75},
{"label": "A", "matrix": [1, 1], "x": 1.75, "y": 2},
{"label": "S", "matrix": [1, 2], "x": 2.75, "y": 2},
@@ -67,7 +112,6 @@
{"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
{"label": "'", "matrix": [4, 1], "x": 10.75, "y": 2},
{"label": "Enter", "matrix": [5, 3], "x": 11.75, "y": 2, "w": 1.25},
-
{"label": "Shift", "matrix": [2, 0], "x": 0, "y": 3, "w": 1.25},
{"label": "/", "matrix": [2, 1], "x": 1.25, "y": 3},
{"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
@@ -80,7 +124,6 @@
{"label": ",", "matrix": [6, 4], "x": 9.25, "y": 3},
{"label": ".", "matrix": [6, 3], "x": 10.25, "y": 3},
{"label": "Shift", "matrix": [6, 2], "x": 11.25, "y": 3, "w": 1.75},
-
{"label": "Ctrl", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
{"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 4},
{"label": "Alt", "matrix": [3, 1], "x": 2.25, "y": 4, "w": 1.25},
@@ -92,10 +135,9 @@
{"label": "Ctrl", "matrix": [2, 2], "x": 11.75, "y": 4, "w": 1.25}
]
},
- "LAYOUT_625u_space": {
+ "LAYOUT_full_enter": {
"layout": [
- {"label": "Mute", "matrix": [4, 2], "x": 12, "y": 0},
-
+ {"label": "Mute", "matrix": [4, 2], "x": 12, "y": 0, "encoder": 0},
{"label": "Tab", "matrix": [0, 0], "x": 0, "y": 1, "w": 1.5},
{"label": "Q", "matrix": [0, 1], "x": 1.5, "y": 1},
{"label": "W", "matrix": [0, 2], "x": 2.5, "y": 1},
@@ -108,7 +150,6 @@
{"label": "O", "matrix": [4, 4], "x": 9.5, "y": 1},
{"label": "P", "matrix": [4, 3], "x": 10.5, "y": 1},
{"label": "Backspace", "matrix": [5, 2], "x": 11.5, "y": 1, "w": 1.5},
-
{"label": "Fn", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.75},
{"label": "A", "matrix": [1, 1], "x": 1.75, "y": 2},
{"label": "S", "matrix": [1, 2], "x": 2.75, "y": 2},
@@ -119,9 +160,7 @@
{"label": "J", "matrix": [5, 6], "x": 7.75, "y": 2},
{"label": "K", "matrix": [5, 5], "x": 8.75, "y": 2},
{"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
- {"label": "'", "matrix": [4, 1], "x": 10.75, "y": 2},
- {"label": "Enter", "matrix": [5, 3], "x": 11.75, "y": 2, "w": 1.25},
-
+ {"label": "Enter", "matrix": [5, 3], "x": 10.75, "y": 2, "w": 2.25},
{"label": "Shift", "matrix": [2, 0], "x": 0, "y": 3, "w": 1.25},
{"label": "/", "matrix": [2, 1], "x": 1.25, "y": 3},
{"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
@@ -134,7 +173,197 @@
{"label": ",", "matrix": [6, 4], "x": 9.25, "y": 3},
{"label": ".", "matrix": [6, 3], "x": 10.25, "y": 3},
{"label": "Shift", "matrix": [6, 2], "x": 11.25, "y": 3, "w": 1.75},
-
+ {"label": "Ctrl", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 4},
+ {"label": "Alt", "matrix": [3, 1], "x": 2.25, "y": 4, "w": 1.25},
+ {"label": "Space", "matrix": [3, 4], "x": 3.5, "y": 4, "w": 2.25},
+ {"label": "Space", "matrix": [3, 5], "x": 5.75, "y": 4},
+ {"label": "Space", "matrix": [3, 6], "x": 6.75, "y": 4, "w": 2.75},
+ {"label": "Alt", "matrix": [3, 3], "x": 9.5, "y": 4, "w": 1.25},
+ {"label": "Fn2", "matrix": [3, 2], "x": 10.75, "y": 4},
+ {"label": "Ctrl", "matrix": [2, 2], "x": 11.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_full_enter_625u_space": {
+ "layout": [
+ {"label": "Mute", "matrix": [4, 2], "x": 12, "y": 0, "encoder": 0},
+ {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [0, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [0, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [0, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [0, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [0, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [0, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [4, 6], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [4, 5], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [4, 4], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [4, 3], "x": 10.5, "y": 1},
+ {"label": "Backspace", "matrix": [5, 2], "x": 11.5, "y": 1, "w": 1.5},
+ {"label": "Fn", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [1, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [1, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [1, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [1, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [1, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [1, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [5, 6], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [5, 5], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+ {"label": "Enter", "matrix": [5, 3], "x": 10.75, "y": 2, "w": 2.25},
+ {"label": "Shift", "matrix": [2, 0], "x": 0, "y": 3, "w": 1.25},
+ {"label": "/", "matrix": [2, 1], "x": 1.25, "y": 3},
+ {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [2, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [2, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [2, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [2, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [6, 6], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [6, 5], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [6, 4], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [6, 3], "x": 10.25, "y": 3},
+ {"label": "Shift", "matrix": [6, 2], "x": 11.25, "y": 3, "w": 1.75},
+ {"label": "Ctrl", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 4},
+ {"label": "Alt", "matrix": [3, 1], "x": 2.25, "y": 4},
+ {"label": "Space", "matrix": [3, 5], "x": 3.25, "y": 4, "w": 6.25},
+ {"label": "Alt", "matrix": [3, 3], "x": 9.5, "y": 4, "w": 1.25},
+ {"label": "Fn2", "matrix": [3, 2], "x": 10.75, "y": 4},
+ {"label": "Ctrl", "matrix": [2, 2], "x": 11.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_full_enter_full_lshift_625u_space": {
+ "layout": [
+ {"label": "Mute", "matrix": [4, 2], "x": 12, "y": 0, "encoder": 0},
+ {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [0, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [0, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [0, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [0, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [0, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [0, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [4, 6], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [4, 5], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [4, 4], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [4, 3], "x": 10.5, "y": 1},
+ {"label": "Backspace", "matrix": [5, 2], "x": 11.5, "y": 1, "w": 1.5},
+ {"label": "Fn", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [1, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [1, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [1, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [1, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [1, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [1, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [5, 6], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [5, 5], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+ {"label": "Enter", "matrix": [5, 3], "x": 10.75, "y": 2, "w": 2.25},
+ {"label": "Shift", "matrix": [2, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [2, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [2, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [2, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [2, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [6, 6], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [6, 5], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [6, 4], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [6, 3], "x": 10.25, "y": 3},
+ {"label": "Shift", "matrix": [6, 2], "x": 11.25, "y": 3, "w": 1.75},
+ {"label": "Ctrl", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 4},
+ {"label": "Alt", "matrix": [3, 1], "x": 2.25, "y": 4, "w": 1.25},
+ {"label": "Space", "matrix": [3, 5], "x": 3.25, "y": 4, "w": 6.25},
+ {"label": "Alt", "matrix": [3, 3], "x": 9.5, "y": 4, "w": 1.25},
+ {"label": "Fn2", "matrix": [3, 2], "x": 10.75, "y": 4},
+ {"label": "Ctrl", "matrix": [2, 2], "x": 11.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_full_lshift": {
+ "layout": [
+ {"label": "Mute", "matrix": [4, 2], "x": 12, "y": 0, "encoder": 0},
+ {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [0, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [0, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [0, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [0, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [0, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [0, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [4, 6], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [4, 5], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [4, 4], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [4, 3], "x": 10.5, "y": 1},
+ {"label": "Backspace", "matrix": [5, 2], "x": 11.5, "y": 1, "w": 1.5},
+ {"label": "Fn", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [1, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [1, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [1, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [1, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [1, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [1, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [5, 6], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [5, 5], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+ {"label": "'", "matrix": [4, 1], "x": 10.75, "y": 2},
+ {"label": "Enter", "matrix": [5, 3], "x": 11.75, "y": 2, "w": 1.25},
+ {"label": "Shift", "matrix": [2, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [2, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [2, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [2, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [2, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [6, 6], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [6, 5], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [6, 4], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [6, 3], "x": 10.25, "y": 3},
+ {"label": "Shift", "matrix": [6, 2], "x": 11.25, "y": 3, "w": 1.75},
+ {"label": "Ctrl", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 4},
+ {"label": "Alt", "matrix": [3, 1], "x": 2.25, "y": 4, "w": 1.25},
+ {"label": "Space", "matrix": [3, 4], "x": 3.5, "y": 4, "w": 2.25},
+ {"label": "Space", "matrix": [3, 5], "x": 5.75, "y": 4},
+ {"label": "Space", "matrix": [3, 6], "x": 6.75, "y": 4, "w": 2.75},
+ {"label": "Alt", "matrix": [3, 3], "x": 9.5, "y": 4, "w": 1.25},
+ {"label": "Fn2", "matrix": [3, 2], "x": 10.75, "y": 4},
+ {"label": "Ctrl", "matrix": [2, 2], "x": 11.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_full_lshift_625u_space": {
+ "layout": [
+ {"label": "Mute", "matrix": [4, 2], "x": 12, "y": 0, "encoder": 0},
+ {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [0, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [0, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [0, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [0, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [0, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [0, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [4, 6], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [4, 5], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [4, 4], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [4, 3], "x": 10.5, "y": 1},
+ {"label": "Backspace", "matrix": [5, 2], "x": 11.5, "y": 1, "w": 1.5},
+ {"label": "Fn", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [1, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [1, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [1, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [1, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [1, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [1, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [5, 6], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [5, 5], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+ {"label": "'", "matrix": [4, 1], "x": 10.75, "y": 2},
+ {"label": "Enter", "matrix": [5, 3], "x": 11.75, "y": 2, "w": 1.25},
+ {"label": "Shift", "matrix": [2, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [2, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [2, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [2, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [2, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [6, 6], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [6, 5], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [6, 4], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [6, 3], "x": 10.25, "y": 3},
+ {"label": "Shift", "matrix": [6, 2], "x": 11.25, "y": 3, "w": 1.75},
{"label": "Ctrl", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
{"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 4},
{"label": "Alt", "matrix": [3, 1], "x": 2.25, "y": 4},
@@ -143,6 +372,54 @@
{"label": "Fn2", "matrix": [3, 2], "x": 10.75, "y": 4},
{"label": "Ctrl", "matrix": [2, 2], "x": 11.75, "y": 4, "w": 1.25}
]
+ },
+ "LAYOUT_full_lshift_full_enter": {
+ "layout": [
+ {"label": "Mute", "matrix": [4, 2], "x": 12, "y": 0, "encoder": 0},
+ {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [0, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [0, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [0, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [0, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [0, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [0, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [4, 6], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [4, 5], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [4, 4], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [4, 3], "x": 10.5, "y": 1},
+ {"label": "Backspace", "matrix": [5, 2], "x": 11.5, "y": 1, "w": 1.5},
+ {"label": "Fn", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [1, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [1, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [1, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [1, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [1, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [1, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [5, 6], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [5, 5], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+ {"label": "Enter", "matrix": [5, 3], "x": 10.75, "y": 2, "w": 2.25},
+ {"label": "Shift", "matrix": [2, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [2, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [2, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [2, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [2, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [6, 6], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [6, 5], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [6, 4], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [6, 3], "x": 10.25, "y": 3},
+ {"label": "Shift", "matrix": [6, 2], "x": 11.25, "y": 3, "w": 1.75},
+ {"label": "Ctrl", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 4},
+ {"label": "Alt", "matrix": [3, 1], "x": 2.25, "y": 4, "w": 1.25},
+ {"label": "Space", "matrix": [3, 4], "x": 3.5, "y": 4, "w": 2.25},
+ {"label": "Space", "matrix": [3, 5], "x": 5.75, "y": 4},
+ {"label": "Space", "matrix": [3, 6], "x": 6.75, "y": 4, "w": 2.75},
+ {"label": "Alt", "matrix": [3, 3], "x": 9.5, "y": 4, "w": 1.25},
+ {"label": "Fn2", "matrix": [3, 2], "x": 10.75, "y": 4},
+ {"label": "Ctrl", "matrix": [2, 2], "x": 11.75, "y": 4, "w": 1.25}
+ ]
}
}
}
diff --git a/keyboards/mechwild/mercutio/keymaps/default/keymap.c b/keyboards/mechwild/mercutio/keymaps/default/keymap.c
index 9d5d174c60..bf6b96b8be 100644
--- a/keyboards/mechwild/mercutio/keymaps/default/keymap.c
+++ b/keyboards/mechwild/mercutio/keymaps/default/keymap.c
@@ -26,24 +26,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[1] = LAYOUT_all(
KC_TRNS,
- KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL,
- KC_TRNS, KC_TRNS, KC_GRV, KC_BSLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_SCLN, KC_TRNS, KC_QUOT,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL, KC_SLSH, KC_UP,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_TRNS, KC_END, KC_LEFT, KC_DOWN, KC_RIGHT ),
+ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL,
+ KC_TRNS, KC_TRNS, KC_GRV, KC_BSLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_SCLN, KC_TRNS, KC_QUOT,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL, KC_SLSH, KC_UP,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_TRNS, KC_END, KC_LEFT, KC_DOWN, KC_RIGHT ),
[2] = LAYOUT_all(
KC_TRNS,
- KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS,
- KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ),
-
- [3] = LAYOUT_all(
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS )
+ KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS,
+ KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS )
};
#ifdef ENCODER_MAP_ENABLE
@@ -51,6 +44,5 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
[2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
- [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
};
#endif
diff --git a/keyboards/mechwild/mercutio/keymaps/default_625u_space/keymap.c b/keyboards/mechwild/mercutio/keymaps/default_625u_space/keymap.c
index a4cd13134c..b76479a5b9 100644
--- a/keyboards/mechwild/mercutio/keymaps/default_625u_space/keymap.c
+++ b/keyboards/mechwild/mercutio/keymaps/default_625u_space/keymap.c
@@ -36,13 +36,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______,
KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______ ),
-
- [3] = LAYOUT_625u_space(
- _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______ )
};
@@ -50,7 +43,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[1] = { ENCODER_CCW_CW(_______, _______) },
- [2] = { ENCODER_CCW_CW(_______, _______) },
- [3] = { ENCODER_CCW_CW(_______, _______) },
+ [2] = { ENCODER_CCW_CW(_______, _______) }
};
#endif
diff --git a/keyboards/mechwild/mokulua/mirrored/keyboard.json b/keyboards/mechwild/mokulua/mirrored/keyboard.json
index dc66c0c53a..e76314f869 100644
--- a/keyboards/mechwild/mokulua/mirrored/keyboard.json
+++ b/keyboards/mechwild/mokulua/mirrored/keyboard.json
@@ -61,8 +61,7 @@
"ws2812": {
"pin": "B6"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layout_aliases": {
"LAYOUT_mirrored": "LAYOUT"
},
diff --git a/keyboards/mechwild/mokulua/standard/keyboard.json b/keyboards/mechwild/mokulua/standard/keyboard.json
index f3eccd921f..e9c81c7e6d 100644
--- a/keyboards/mechwild/mokulua/standard/keyboard.json
+++ b/keyboards/mechwild/mokulua/standard/keyboard.json
@@ -61,8 +61,7 @@
"ws2812": {
"pin": "B6"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layout_aliases": {
"LAYOUT_standard": "LAYOUT"
},
diff --git a/keyboards/mechwild/murphpad/keyboard.json b/keyboards/mechwild/murphpad/keyboard.json
index 47d99f78e9..a79810afd7 100644
--- a/keyboards/mechwild/murphpad/keyboard.json
+++ b/keyboards/mechwild/murphpad/keyboard.json
@@ -10,8 +10,6 @@
},
"features": {
"bootmagic": true,
- "command": false,
- "console": false,
"encoder": true,
"extrakey": true,
"mousekey": true,
@@ -61,8 +59,7 @@
"ws2812": {
"pin": "F4"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/mechwild/obe/info.json b/keyboards/mechwild/obe/info.json
index 2247f69fac..5244062e9a 100644
--- a/keyboards/mechwild/obe/info.json
+++ b/keyboards/mechwild/obe/info.json
@@ -10,8 +10,6 @@
},
"features": {
"bootmagic": true,
- "command": false,
- "console": false,
"encoder": true,
"extrakey": true,
"mousekey": true,
diff --git a/keyboards/mechwild/puckbuddy/halconf.h b/keyboards/mechwild/puckbuddy/halconf.h
index 07e8cdd17b..fb6312d554 100644
--- a/keyboards/mechwild/puckbuddy/halconf.h
+++ b/keyboards/mechwild/puckbuddy/halconf.h
@@ -5,9 +5,6 @@
#pragma once
#define HAL_USE_I2C TRUE
-
#define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
#include_next <halconf.h>
diff --git a/keyboards/mechwild/sugarglider/f401/keyboard.json b/keyboards/mechwild/sugarglider/f401/keyboard.json
index 7bf58c1b45..658f174275 100644
--- a/keyboards/mechwild/sugarglider/f401/keyboard.json
+++ b/keyboards/mechwild/sugarglider/f401/keyboard.json
@@ -4,8 +4,6 @@
"bootmagic": true,
"mousekey": true,
"extrakey": true,
- "console": false,
- "command": false,
"nkro": true,
"rgblight": true,
"encoder": true,
diff --git a/keyboards/mechwild/sugarglider/f411/keyboard.json b/keyboards/mechwild/sugarglider/f411/keyboard.json
index dd76af1f10..e990db524b 100644
--- a/keyboards/mechwild/sugarglider/f411/keyboard.json
+++ b/keyboards/mechwild/sugarglider/f411/keyboard.json
@@ -4,8 +4,6 @@
"bootmagic": true,
"mousekey": true,
"extrakey": true,
- "console": false,
- "command": false,
"nkro": true,
"rgblight": true,
"encoder": true,
diff --git a/keyboards/mechwild/sugarglider/halconf.h b/keyboards/mechwild/sugarglider/halconf.h
index 23a1dc04b3..76bd6cf256 100644
--- a/keyboards/mechwild/sugarglider/halconf.h
+++ b/keyboards/mechwild/sugarglider/halconf.h
@@ -4,9 +4,6 @@
#pragma once
#define HAL_USE_I2C TRUE
-
#define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
#include_next <halconf.h>
diff --git a/keyboards/mechwild/sugarglider/info.json b/keyboards/mechwild/sugarglider/info.json
index 80004f35d1..0b796f7c21 100644
--- a/keyboards/mechwild/sugarglider/info.json
+++ b/keyboards/mechwild/sugarglider/info.json
@@ -18,8 +18,6 @@
},
"rgblight": {
"led_count": 10,
- "max_brightness": 255,
- "hue_steps": 8,
"saturation_steps": 8,
"brightness_steps": 8,
"animations": {
diff --git a/keyboards/mechwild/sugarglider/rules.mk b/keyboards/mechwild/sugarglider/rules.mk
index a01a95a868..73a141ac91 100644
--- a/keyboards/mechwild/sugarglider/rules.mk
+++ b/keyboards/mechwild/sugarglider/rules.mk
@@ -7,5 +7,3 @@ CUSTOM_MATRIX = lite
VPATH += drivers/gpio
SRC += mcp23018.c matrix.c
I2C_DRIVER_REQUIRED = yes
-
-DEFAULT_FOLDER = mechwild/sugarglider/wide_oled
diff --git a/keyboards/mechwild/sugarglider/wide_oled/f401/keyboard.json b/keyboards/mechwild/sugarglider/wide_oled/f401/keyboard.json
index 7bf58c1b45..658f174275 100644
--- a/keyboards/mechwild/sugarglider/wide_oled/f401/keyboard.json
+++ b/keyboards/mechwild/sugarglider/wide_oled/f401/keyboard.json
@@ -4,8 +4,6 @@
"bootmagic": true,
"mousekey": true,
"extrakey": true,
- "console": false,
- "command": false,
"nkro": true,
"rgblight": true,
"encoder": true,
diff --git a/keyboards/mechwild/sugarglider/wide_oled/f411/keyboard.json b/keyboards/mechwild/sugarglider/wide_oled/f411/keyboard.json
index dd76af1f10..e990db524b 100644
--- a/keyboards/mechwild/sugarglider/wide_oled/f411/keyboard.json
+++ b/keyboards/mechwild/sugarglider/wide_oled/f411/keyboard.json
@@ -4,8 +4,6 @@
"bootmagic": true,
"mousekey": true,
"extrakey": true,
- "console": false,
- "command": false,
"nkro": true,
"rgblight": true,
"encoder": true,
diff --git a/keyboards/mechwild/sugarglider/wide_oled/rules.mk b/keyboards/mechwild/sugarglider/wide_oled/rules.mk
index 23e6cab873..a77f1a8af2 100644
--- a/keyboards/mechwild/sugarglider/wide_oled/rules.mk
+++ b/keyboards/mechwild/sugarglider/wide_oled/rules.mk
@@ -2,5 +2,3 @@
# change yes to no to disable
#
WIDE_OLED_ENABLE = yes
-
-DEFAULT_FOLDER = mechwild/sugarglider/wide_oled/f401