aboutsummaryrefslogtreecommitdiff
path: root/keyboards/mechwild
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/mechwild')
-rw-r--r--keyboards/mechwild/bb40/f401/keyboard.json (renamed from keyboards/mechwild/bb40/f401/info.json)0
-rw-r--r--keyboards/mechwild/bb40/f401/rules.mk1
-rw-r--r--keyboards/mechwild/bb40/f411/keyboard.json (renamed from keyboards/mechwild/bb40/f411/info.json)0
-rw-r--r--keyboards/mechwild/bb40/f411/rules.mk1
-rw-r--r--keyboards/mechwild/bbs/keyboard.json (renamed from keyboards/mechwild/bbs/info.json)0
-rw-r--r--keyboards/mechwild/bde/info.json10
-rw-r--r--keyboards/mechwild/bde/lefty/keyboard.json (renamed from keyboards/mechwild/bde/lefty/info.json)7
-rw-r--r--keyboards/mechwild/bde/lefty/rules.mk1
-rw-r--r--keyboards/mechwild/bde/rev2/keyboard.json (renamed from keyboards/mechwild/bde/rev2/info.json)9
-rw-r--r--keyboards/mechwild/bde/rev2/rules.mk2
-rw-r--r--keyboards/mechwild/bde/righty/keyboard.json (renamed from keyboards/mechwild/bde/righty/info.json)7
-rw-r--r--keyboards/mechwild/bde/righty/rules.mk1
-rw-r--r--keyboards/mechwild/clunker/keyboard.json (renamed from keyboards/mechwild/clunker/info.json)3
-rw-r--r--keyboards/mechwild/clunker/rules.mk1
-rw-r--r--keyboards/mechwild/mercutio/keyboard.json (renamed from keyboards/mechwild/mercutio/info.json)10
-rw-r--r--keyboards/mechwild/mercutio/rules.mk14
-rw-r--r--keyboards/mechwild/mokulua/mirrored/keyboard.json (renamed from keyboards/mechwild/mokulua/mirrored/info.json)9
-rw-r--r--keyboards/mechwild/mokulua/mirrored/rules.mk15
-rw-r--r--keyboards/mechwild/mokulua/standard/keyboard.json (renamed from keyboards/mechwild/mokulua/standard/info.json)9
-rw-r--r--keyboards/mechwild/mokulua/standard/rules.mk15
-rw-r--r--keyboards/mechwild/murphpad/keyboard.json (renamed from keyboards/mechwild/murphpad/info.json)11
-rw-r--r--keyboards/mechwild/murphpad/rules.mk14
-rw-r--r--keyboards/mechwild/obe/f401/info.json5
-rw-r--r--keyboards/mechwild/obe/f401/keyboard.json3
-rw-r--r--keyboards/mechwild/obe/f401/rules.mk0
-rw-r--r--keyboards/mechwild/obe/f411/info.json5
-rw-r--r--keyboards/mechwild/obe/f411/keyboard.json3
-rw-r--r--keyboards/mechwild/obe/f411/rules.mk0
-rw-r--r--keyboards/mechwild/obe/info.json10
-rw-r--r--keyboards/mechwild/obe/rules.mk14
-rw-r--r--keyboards/mechwild/puckbuddy/keyboard.json (renamed from keyboards/mechwild/puckbuddy/info.json)15
-rw-r--r--keyboards/mechwild/puckbuddy/rules.mk21
-rw-r--r--keyboards/mechwild/sugarglider/f401/keyboard.json18
-rw-r--r--keyboards/mechwild/sugarglider/f401/rules.mk3
-rw-r--r--keyboards/mechwild/sugarglider/f411/keyboard.json18
-rw-r--r--keyboards/mechwild/sugarglider/f411/rules.mk3
-rw-r--r--keyboards/mechwild/sugarglider/info.json18
-rw-r--r--keyboards/mechwild/sugarglider/matrix.c2
-rw-r--r--keyboards/mechwild/sugarglider/rules.mk10
-rw-r--r--keyboards/mechwild/sugarglider/wide_oled/f401/keyboard.json18
-rw-r--r--keyboards/mechwild/sugarglider/wide_oled/f401/rules.mk3
-rw-r--r--keyboards/mechwild/sugarglider/wide_oled/f411/keyboard.json18
-rw-r--r--keyboards/mechwild/sugarglider/wide_oled/f411/rules.mk3
-rw-r--r--keyboards/mechwild/sugarglider/wide_oled/rules.mk2
-rw-r--r--keyboards/mechwild/waka60/f401/info.json5
-rw-r--r--keyboards/mechwild/waka60/f401/keyboard.json3
-rw-r--r--keyboards/mechwild/waka60/f401/rules.mk0
-rw-r--r--keyboards/mechwild/waka60/f411/info.json5
-rw-r--r--keyboards/mechwild/waka60/f411/keyboard.json3
-rw-r--r--keyboards/mechwild/waka60/f411/rules.mk0
-rw-r--r--keyboards/mechwild/waka60/info.json10
-rw-r--r--keyboards/mechwild/waka60/rules.mk14
52 files changed, 188 insertions, 184 deletions
diff --git a/keyboards/mechwild/bb40/f401/info.json b/keyboards/mechwild/bb40/f401/keyboard.json
index 797e990059..797e990059 100644
--- a/keyboards/mechwild/bb40/f401/info.json
+++ b/keyboards/mechwild/bb40/f401/keyboard.json
diff --git a/keyboards/mechwild/bb40/f401/rules.mk b/keyboards/mechwild/bb40/f401/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/mechwild/bb40/f401/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/mechwild/bb40/f411/info.json b/keyboards/mechwild/bb40/f411/keyboard.json
index a41c5f4dd1..a41c5f4dd1 100644
--- a/keyboards/mechwild/bb40/f411/info.json
+++ b/keyboards/mechwild/bb40/f411/keyboard.json
diff --git a/keyboards/mechwild/bb40/f411/rules.mk b/keyboards/mechwild/bb40/f411/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/mechwild/bb40/f411/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/mechwild/bbs/info.json b/keyboards/mechwild/bbs/keyboard.json
index c0ba888d9a..c0ba888d9a 100644
--- a/keyboards/mechwild/bbs/info.json
+++ b/keyboards/mechwild/bbs/keyboard.json
diff --git a/keyboards/mechwild/bde/info.json b/keyboards/mechwild/bde/info.json
index e238945563..918c792aa7 100644
--- a/keyboards/mechwild/bde/info.json
+++ b/keyboards/mechwild/bde/info.json
@@ -8,16 +8,6 @@
"build": {
"lto": true
},
- "features": {
- "bootmagic": true,
- "command": false,
- "console": false,
- "debug": false,
- "extrakey": true,
- "mousekey": true,
- "rgblight": true,
- "nkro": true
- },
"development_board": "promicro",
"rgblight": {
"sleep": true,
diff --git a/keyboards/mechwild/bde/lefty/info.json b/keyboards/mechwild/bde/lefty/keyboard.json
index c9bcd05195..751a65b1a4 100644
--- a/keyboards/mechwild/bde/lefty/info.json
+++ b/keyboards/mechwild/bde/lefty/keyboard.json
@@ -4,6 +4,13 @@
"pid": "0x1701",
"device_version": "2.0.3"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "rgblight": true
+ },
"matrix_pins": {
"rows": ["D1", "D7", "D3"],
"cols": ["F7", "B1", "B6", "B2", "B3", "F6", "F5", "F4", "D0", "D4", "C6", "E6", "B5", "B4"]
diff --git a/keyboards/mechwild/bde/lefty/rules.mk b/keyboards/mechwild/bde/lefty/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/mechwild/bde/lefty/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/mechwild/bde/rev2/info.json b/keyboards/mechwild/bde/rev2/keyboard.json
index b8b7fc39d0..beb2624f3e 100644
--- a/keyboards/mechwild/bde/rev2/info.json
+++ b/keyboards/mechwild/bde/rev2/keyboard.json
@@ -4,6 +4,15 @@
"pid": "0x170A",
"device_version": "1.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "rgblight": true,
+ "encoder": true,
+ "oled": true
+ },
"encoder": {
"rotary": [
{"pin_a": "D2", "pin_b": "D3"}
diff --git a/keyboards/mechwild/bde/rev2/rules.mk b/keyboards/mechwild/bde/rev2/rules.mk
deleted file mode 100644
index bade0749fc..0000000000
--- a/keyboards/mechwild/bde/rev2/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-ENCODER_ENABLE = yes # Enable encoder
-OLED_ENABLE = yes # Enable OLED Screen
diff --git a/keyboards/mechwild/bde/righty/info.json b/keyboards/mechwild/bde/righty/keyboard.json
index 3f254da286..54a7a4459f 100644
--- a/keyboards/mechwild/bde/righty/info.json
+++ b/keyboards/mechwild/bde/righty/keyboard.json
@@ -4,6 +4,13 @@
"pid": "0x1702",
"device_version": "2.0.3"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "rgblight": true
+ },
"matrix_pins": {
"rows": ["D1", "D7", "D3"],
"cols": ["B4", "B5", "E6", "C6", "D4", "D0", "F4", "F5", "F6", "B3", "B2", "B6", "B1", "F7"]
diff --git a/keyboards/mechwild/bde/righty/rules.mk b/keyboards/mechwild/bde/righty/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/mechwild/bde/righty/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/mechwild/clunker/info.json b/keyboards/mechwild/clunker/keyboard.json
index 1a4114f8f2..acf9628f8e 100644
--- a/keyboards/mechwild/clunker/info.json
+++ b/keyboards/mechwild/clunker/keyboard.json
@@ -17,6 +17,9 @@
"mousekey": true,
"nkro": true
},
+ "haptic": {
+ "driver": "solenoid"
+ },
"matrix_pins": {
"cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
"rows": ["F5", "F6", "B3", "F7", "B2", "B1", "B6"]
diff --git a/keyboards/mechwild/clunker/rules.mk b/keyboards/mechwild/clunker/rules.mk
deleted file mode 100644
index a521203b32..0000000000
--- a/keyboards/mechwild/clunker/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-HAPTIC_DRIVER = solenoid
diff --git a/keyboards/mechwild/mercutio/info.json b/keyboards/mechwild/mercutio/keyboard.json
index 796d22e363..a07874e2a2 100644
--- a/keyboards/mechwild/mercutio/info.json
+++ b/keyboards/mechwild/mercutio/keyboard.json
@@ -8,6 +8,16 @@
"pid": "0x1703",
"device_version": "1.0.0"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "oled": true
+ },
"matrix_pins": {
"cols": ["B0", "D7", "D6", "D5", "B1", "B2", "B3"],
"rows": ["D0", "D1", "D4", "C3", "C0", "C1", "C2"]
diff --git a/keyboards/mechwild/mercutio/rules.mk b/keyboards/mechwild/mercutio/rules.mk
deleted file mode 100644
index a62bc3d00c..0000000000
--- a/keyboards/mechwild/mercutio/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 = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = yes
-OLED_ENABLE = yes
diff --git a/keyboards/mechwild/mokulua/mirrored/info.json b/keyboards/mechwild/mokulua/mirrored/keyboard.json
index 7289147e6b..be74fabbd3 100644
--- a/keyboards/mechwild/mokulua/mirrored/info.json
+++ b/keyboards/mechwild/mokulua/mirrored/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x170C",
"device_version": "1.0.3"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "rgblight": true,
+ "encoder": true,
+ "oled": true
+ },
"matrix_pins": {
"cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
"rows": ["F4", "F5", "F6", "F7", "B1", "B3"]
@@ -22,6 +30,7 @@
"tap_keycode_delay": 10
},
"split": {
+ "enabled": true,
"soft_serial_pin": "D3",
"transport": {
"sync": {
diff --git a/keyboards/mechwild/mokulua/mirrored/rules.mk b/keyboards/mechwild/mokulua/mirrored/rules.mk
deleted file mode 100644
index 875d431168..0000000000
--- a/keyboards/mechwild/mokulua/mirrored/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 = 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 # Enable encoder
-OLED_ENABLE = yes # Enable OLED Screen
-SPLIT_KEYBOARD = yes # Define split functionality
diff --git a/keyboards/mechwild/mokulua/standard/info.json b/keyboards/mechwild/mokulua/standard/keyboard.json
index da82447980..044573d82c 100644
--- a/keyboards/mechwild/mokulua/standard/info.json
+++ b/keyboards/mechwild/mokulua/standard/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x170B",
"device_version": "1.0.3"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "rgblight": true,
+ "encoder": true,
+ "oled": true
+ },
"matrix_pins": {
"cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
"rows": ["F4", "F5", "F6", "F7", "B1", "B3"]
@@ -22,6 +30,7 @@
"tap_keycode_delay": 10
},
"split": {
+ "enabled": true,
"soft_serial_pin": "D3",
"transport": {
"sync": {
diff --git a/keyboards/mechwild/mokulua/standard/rules.mk b/keyboards/mechwild/mokulua/standard/rules.mk
deleted file mode 100644
index 875d431168..0000000000
--- a/keyboards/mechwild/mokulua/standard/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 = 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 # Enable encoder
-OLED_ENABLE = yes # Enable OLED Screen
-SPLIT_KEYBOARD = yes # Define split functionality
diff --git a/keyboards/mechwild/murphpad/info.json b/keyboards/mechwild/murphpad/keyboard.json
index dd635fed59..a2a5eba926 100644
--- a/keyboards/mechwild/murphpad/info.json
+++ b/keyboards/mechwild/murphpad/keyboard.json
@@ -8,6 +8,17 @@
"pid": "0x1705",
"device_version": "3.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "oled": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["B5", "D7", "C6", "D4", "B6"],
"rows": ["F5", "B2", "B3", "B1", "F7", "F6"]
diff --git a/keyboards/mechwild/murphpad/rules.mk b/keyboards/mechwild/murphpad/rules.mk
deleted file mode 100644
index df9b208bb2..0000000000
--- a/keyboards/mechwild/murphpad/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 = 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 # Enable encoder
-OLED_ENABLE = yes
diff --git a/keyboards/mechwild/obe/f401/info.json b/keyboards/mechwild/obe/f401/info.json
deleted file mode 100644
index acd7e83f77..0000000000
--- a/keyboards/mechwild/obe/f401/info.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "processor": "STM32F401",
- "bootloader": "stm32-dfu",
- "board": "BLACKPILL_STM32_F401"
-}
diff --git a/keyboards/mechwild/obe/f401/keyboard.json b/keyboards/mechwild/obe/f401/keyboard.json
new file mode 100644
index 0000000000..797e990059
--- /dev/null
+++ b/keyboards/mechwild/obe/f401/keyboard.json
@@ -0,0 +1,3 @@
+{
+ "development_board": "blackpill_f401"
+}
diff --git a/keyboards/mechwild/obe/f401/rules.mk b/keyboards/mechwild/obe/f401/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/mechwild/obe/f401/rules.mk
+++ /dev/null
diff --git a/keyboards/mechwild/obe/f411/info.json b/keyboards/mechwild/obe/f411/info.json
deleted file mode 100644
index 2517a82403..0000000000
--- a/keyboards/mechwild/obe/f411/info.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "processor": "STM32F411",
- "bootloader": "stm32-dfu",
- "board": "BLACKPILL_STM32_F411"
-}
diff --git a/keyboards/mechwild/obe/f411/keyboard.json b/keyboards/mechwild/obe/f411/keyboard.json
new file mode 100644
index 0000000000..a41c5f4dd1
--- /dev/null
+++ b/keyboards/mechwild/obe/f411/keyboard.json
@@ -0,0 +1,3 @@
+{
+ "development_board": "blackpill_f411"
+}
diff --git a/keyboards/mechwild/obe/f411/rules.mk b/keyboards/mechwild/obe/f411/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/mechwild/obe/f411/rules.mk
+++ /dev/null
diff --git a/keyboards/mechwild/obe/info.json b/keyboards/mechwild/obe/info.json
index 98c70bef08..2baf5422f0 100644
--- a/keyboards/mechwild/obe/info.json
+++ b/keyboards/mechwild/obe/info.json
@@ -8,6 +8,16 @@
"pid": "0x1707",
"device_version": "2.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["B10", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1"],
"rows": ["A8", "B15", "B14", "B13", "B12", "A15", "B3"]
diff --git a/keyboards/mechwild/obe/rules.mk b/keyboards/mechwild/obe/rules.mk
index bdcc7d903b..8fb92c3a6b 100644
--- a/keyboards/mechwild/obe/rules.mk
+++ b/keyboards/mechwild/obe/rules.mk
@@ -1,15 +1 @@
-# 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 = 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 # Encoder Enabled
-
DEFAULT_FOLDER = mechwild/obe/f401
diff --git a/keyboards/mechwild/puckbuddy/info.json b/keyboards/mechwild/puckbuddy/keyboard.json
index 56bac432b8..4e827d1ba8 100644
--- a/keyboards/mechwild/puckbuddy/info.json
+++ b/keyboards/mechwild/puckbuddy/keyboard.json
@@ -8,6 +8,17 @@
"pid": "0x170F",
"device_version": "1.0.0"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "rgblight": true,
+ "encoder": true,
+ "oled": true,
+ "dip_switch": true,
+ "pointing_device": true,
+ "dynamic_tapping_term": true
+ },
"matrix_pins": {
"cols": ["B10", "A8", "B4", "B5"],
"rows": ["B12", "B13", "B14", "B15"]
@@ -52,9 +63,7 @@
"ws2812": {
"pin": "A3"
},
- "processor": "STM32F401",
- "bootloader": "stm32-dfu",
- "board": "BLACKPILL_STM32_F401",
+ "development_board": "blackpill_f401",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/mechwild/puckbuddy/rules.mk b/keyboards/mechwild/puckbuddy/rules.mk
index 980fe281cf..fb5d649735 100644
--- a/keyboards/mechwild/puckbuddy/rules.mk
+++ b/keyboards/mechwild/puckbuddy/rules.mk
@@ -1,20 +1 @@
-# 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 = 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 # Encoder Enabled
-OLED_ENABLE = yes # OLED Enabled
-DIP_SWITCH_ENABLE = yes # Dip Switch Enabled
-
-POINTING_DEVICE_ENABLE = yes # Pointing Device Enabled
-POINTING_DEVICE_DRIVER = cirque_pinnacle_spi # Pointing Device Driver
-
-DYNAMIC_TAPPING_TERM_ENABLE = yes # Enable Dynamic Tapping Term to control the Tap term for the Cirque Pad easily
+POINTING_DEVICE_DRIVER = cirque_pinnacle_spi
diff --git a/keyboards/mechwild/sugarglider/f401/keyboard.json b/keyboards/mechwild/sugarglider/f401/keyboard.json
new file mode 100644
index 0000000000..7bf58c1b45
--- /dev/null
+++ b/keyboards/mechwild/sugarglider/f401/keyboard.json
@@ -0,0 +1,18 @@
+{
+ "development_board": "blackpill_f401",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": false,
+ "command": false,
+ "nkro": true,
+ "rgblight": true,
+ "encoder": true,
+ "dip_switch": true,
+ "steno": true,
+ "oled": true,
+ "pointing_device": true,
+ "dynamic_tapping_term": true
+ }
+}
diff --git a/keyboards/mechwild/sugarglider/f401/rules.mk b/keyboards/mechwild/sugarglider/f401/rules.mk
deleted file mode 100644
index a92d8a85c6..0000000000
--- a/keyboards/mechwild/sugarglider/f401/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# MCU name
-MCU = STM32F401
-BOARD = BLACKPILL_STM32_F401
diff --git a/keyboards/mechwild/sugarglider/f411/keyboard.json b/keyboards/mechwild/sugarglider/f411/keyboard.json
new file mode 100644
index 0000000000..dd76af1f10
--- /dev/null
+++ b/keyboards/mechwild/sugarglider/f411/keyboard.json
@@ -0,0 +1,18 @@
+{
+ "development_board": "blackpill_f411",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": false,
+ "command": false,
+ "nkro": true,
+ "rgblight": true,
+ "encoder": true,
+ "dip_switch": true,
+ "steno": true,
+ "oled": true,
+ "pointing_device": true,
+ "dynamic_tapping_term": true
+ }
+}
diff --git a/keyboards/mechwild/sugarglider/f411/rules.mk b/keyboards/mechwild/sugarglider/f411/rules.mk
deleted file mode 100644
index db1d4054fd..0000000000
--- a/keyboards/mechwild/sugarglider/f411/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# MCU name
-MCU = STM32F411
-BOARD = BLACKPILL_STM32_F411
diff --git a/keyboards/mechwild/sugarglider/info.json b/keyboards/mechwild/sugarglider/info.json
index c9095b3db4..80004f35d1 100644
--- a/keyboards/mechwild/sugarglider/info.json
+++ b/keyboards/mechwild/sugarglider/info.json
@@ -3,24 +3,14 @@
"keyboard_name": "Sugar Glider",
"maintainer": "kylemccreery",
"url": "https://mechwild.com/product/sugar-glider/",
- "bootloader": "stm32-dfu",
- "features": {
- "bootmagic": true,
- "command": false,
- "console": false,
- "extrakey": true,
- "mousekey": true,
- "nkro": true,
- "encoder": true,
- "rgblight": true,
- "dip_switch": true,
- "steno": true
- },
"usb": {
"vid": "0x6D77",
"pid": "0x1710",
"device_version": "0.2.0",
- "force_nkro": true
+ "force_nkro": true,
+ "shared_endpoint": {
+ "keyboard": true
+ }
},
"diode_direction": "COL2ROW",
"dynamic_keymap": {
diff --git a/keyboards/mechwild/sugarglider/matrix.c b/keyboards/mechwild/sugarglider/matrix.c
index c76a8345d3..2fa384ed22 100644
--- a/keyboards/mechwild/sugarglider/matrix.c
+++ b/keyboards/mechwild/sugarglider/matrix.c
@@ -38,7 +38,7 @@ static matrix_row_t read_cols(void) {
}
uint8_t ret = 0xFF; // sets all to 1
- mcp23018_errors += !mcp23018_readPins(I2C_ADDR, mcp23018_PORTB, &ret); // will update with values 0 = pulled down by connection, 1 = pulled up by pullup resistors
+ mcp23018_errors += !mcp23018_read_pins(I2C_ADDR, mcp23018_PORTB, &ret); // will update with values 0 = pulled down by connection, 1 = pulled up by pullup resistors
return (~ret) & 0b00111111; // Clears out the two row bits in the B buffer.
}
diff --git a/keyboards/mechwild/sugarglider/rules.mk b/keyboards/mechwild/sugarglider/rules.mk
index 6fd0836a73..a01a95a868 100644
--- a/keyboards/mechwild/sugarglider/rules.mk
+++ b/keyboards/mechwild/sugarglider/rules.mk
@@ -1,12 +1,5 @@
-# Build Options
-# change yes to no to disable
-#
-OLED_ENABLE = yes # OLED Enabled
-
# Cirque touchpad settings
-POINTING_DEVICE_ENABLE = yes # Pointing Device Enabled
POINTING_DEVICE_DRIVER = cirque_pinnacle_spi # Pointing Device Driver
-DYNAMIC_TAPPING_TERM_ENABLE = yes # Enable Dynamic Tapping Term to control the Tap term for the Cirque Pad easily
# Custom matrix setup
CUSTOM_MATRIX = lite
@@ -16,6 +9,3 @@ SRC += mcp23018.c matrix.c
I2C_DRIVER_REQUIRED = yes
DEFAULT_FOLDER = mechwild/sugarglider/wide_oled
-
-# Necessary for stenography functionality
-KEYBOARD_SHARED_EP = yes # Needed to free up an endpoint in blackpill
diff --git a/keyboards/mechwild/sugarglider/wide_oled/f401/keyboard.json b/keyboards/mechwild/sugarglider/wide_oled/f401/keyboard.json
new file mode 100644
index 0000000000..7bf58c1b45
--- /dev/null
+++ b/keyboards/mechwild/sugarglider/wide_oled/f401/keyboard.json
@@ -0,0 +1,18 @@
+{
+ "development_board": "blackpill_f401",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": false,
+ "command": false,
+ "nkro": true,
+ "rgblight": true,
+ "encoder": true,
+ "dip_switch": true,
+ "steno": true,
+ "oled": true,
+ "pointing_device": true,
+ "dynamic_tapping_term": true
+ }
+}
diff --git a/keyboards/mechwild/sugarglider/wide_oled/f401/rules.mk b/keyboards/mechwild/sugarglider/wide_oled/f401/rules.mk
deleted file mode 100644
index a92d8a85c6..0000000000
--- a/keyboards/mechwild/sugarglider/wide_oled/f401/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# MCU name
-MCU = STM32F401
-BOARD = BLACKPILL_STM32_F401
diff --git a/keyboards/mechwild/sugarglider/wide_oled/f411/keyboard.json b/keyboards/mechwild/sugarglider/wide_oled/f411/keyboard.json
new file mode 100644
index 0000000000..dd76af1f10
--- /dev/null
+++ b/keyboards/mechwild/sugarglider/wide_oled/f411/keyboard.json
@@ -0,0 +1,18 @@
+{
+ "development_board": "blackpill_f411",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": false,
+ "command": false,
+ "nkro": true,
+ "rgblight": true,
+ "encoder": true,
+ "dip_switch": true,
+ "steno": true,
+ "oled": true,
+ "pointing_device": true,
+ "dynamic_tapping_term": true
+ }
+}
diff --git a/keyboards/mechwild/sugarglider/wide_oled/f411/rules.mk b/keyboards/mechwild/sugarglider/wide_oled/f411/rules.mk
deleted file mode 100644
index db1d4054fd..0000000000
--- a/keyboards/mechwild/sugarglider/wide_oled/f411/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# MCU name
-MCU = STM32F411
-BOARD = BLACKPILL_STM32_F411
diff --git a/keyboards/mechwild/sugarglider/wide_oled/rules.mk b/keyboards/mechwild/sugarglider/wide_oled/rules.mk
index 193169239b..23e6cab873 100644
--- a/keyboards/mechwild/sugarglider/wide_oled/rules.mk
+++ b/keyboards/mechwild/sugarglider/wide_oled/rules.mk
@@ -3,4 +3,4 @@
#
WIDE_OLED_ENABLE = yes
-DEFAULT_FOLDER = mechwild/sugarglider/wide_oled/f401 \ No newline at end of file
+DEFAULT_FOLDER = mechwild/sugarglider/wide_oled/f401
diff --git a/keyboards/mechwild/waka60/f401/info.json b/keyboards/mechwild/waka60/f401/info.json
deleted file mode 100644
index acd7e83f77..0000000000
--- a/keyboards/mechwild/waka60/f401/info.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "processor": "STM32F401",
- "bootloader": "stm32-dfu",
- "board": "BLACKPILL_STM32_F401"
-}
diff --git a/keyboards/mechwild/waka60/f401/keyboard.json b/keyboards/mechwild/waka60/f401/keyboard.json
new file mode 100644
index 0000000000..797e990059
--- /dev/null
+++ b/keyboards/mechwild/waka60/f401/keyboard.json
@@ -0,0 +1,3 @@
+{
+ "development_board": "blackpill_f401"
+}
diff --git a/keyboards/mechwild/waka60/f401/rules.mk b/keyboards/mechwild/waka60/f401/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/mechwild/waka60/f401/rules.mk
+++ /dev/null
diff --git a/keyboards/mechwild/waka60/f411/info.json b/keyboards/mechwild/waka60/f411/info.json
deleted file mode 100644
index 2517a82403..0000000000
--- a/keyboards/mechwild/waka60/f411/info.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "processor": "STM32F411",
- "bootloader": "stm32-dfu",
- "board": "BLACKPILL_STM32_F411"
-}
diff --git a/keyboards/mechwild/waka60/f411/keyboard.json b/keyboards/mechwild/waka60/f411/keyboard.json
new file mode 100644
index 0000000000..a41c5f4dd1
--- /dev/null
+++ b/keyboards/mechwild/waka60/f411/keyboard.json
@@ -0,0 +1,3 @@
+{
+ "development_board": "blackpill_f411"
+}
diff --git a/keyboards/mechwild/waka60/f411/rules.mk b/keyboards/mechwild/waka60/f411/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/mechwild/waka60/f411/rules.mk
+++ /dev/null
diff --git a/keyboards/mechwild/waka60/info.json b/keyboards/mechwild/waka60/info.json
index 0d50b0f261..f7a0300a6a 100644
--- a/keyboards/mechwild/waka60/info.json
+++ b/keyboards/mechwild/waka60/info.json
@@ -29,6 +29,16 @@
"ws2812": {
"pin": "A1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["B10", "B1", "B0", "A7", "A6", "A5", "A4"],
"rows": ["B8", "B4", "B3", "B9", "A15", "B12", "B13", "B14", "B15", "A8"]
diff --git a/keyboards/mechwild/waka60/rules.mk b/keyboards/mechwild/waka60/rules.mk
index 06e0fbc7c5..d3be506b16 100644
--- a/keyboards/mechwild/waka60/rules.mk
+++ b/keyboards/mechwild/waka60/rules.mk
@@ -1,15 +1 @@
-# 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 = 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 # Encoder Enabled
-
DEFAULT_FOLDER = mechwild/waka60/f401