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/bde/lefty/keyboard.json (renamed from keyboards/mechwild/bde/lefty/info.json)0
-rw-r--r--keyboards/mechwild/bde/lefty/rules.mk1
-rw-r--r--keyboards/mechwild/bde/righty/keyboard.json (renamed from keyboards/mechwild/bde/righty/info.json)0
-rw-r--r--keyboards/mechwild/bde/righty/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/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/keyboard.json (renamed from keyboards/mechwild/obe/f401/info.json)0
-rw-r--r--keyboards/mechwild/obe/f401/rules.mk0
-rw-r--r--keyboards/mechwild/obe/f411/keyboard.json (renamed from keyboards/mechwild/obe/f411/info.json)0
-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/sugarglider/f401/keyboard.json3
-rw-r--r--keyboards/mechwild/sugarglider/f401/rules.mk3
-rw-r--r--keyboards/mechwild/sugarglider/f411/keyboard.json3
-rw-r--r--keyboards/mechwild/sugarglider/f411/rules.mk3
-rw-r--r--keyboards/mechwild/sugarglider/info.json1
-rw-r--r--keyboards/mechwild/sugarglider/matrix.c2
-rw-r--r--keyboards/mechwild/sugarglider/wide_oled/f401/keyboard.json3
-rw-r--r--keyboards/mechwild/sugarglider/wide_oled/f401/rules.mk3
-rw-r--r--keyboards/mechwild/sugarglider/wide_oled/f411/keyboard.json3
-rw-r--r--keyboards/mechwild/sugarglider/wide_oled/f411/rules.mk3
-rw-r--r--keyboards/mechwild/waka60/f401/keyboard.json (renamed from keyboards/mechwild/waka60/f401/info.json)0
-rw-r--r--keyboards/mechwild/waka60/f401/rules.mk0
-rw-r--r--keyboards/mechwild/waka60/f411/keyboard.json (renamed from keyboards/mechwild/waka60/f411/info.json)0
-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
34 files changed, 54 insertions, 74 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/bde/lefty/info.json b/keyboards/mechwild/bde/lefty/keyboard.json
index c9bcd05195..c9bcd05195 100644
--- a/keyboards/mechwild/bde/lefty/info.json
+++ b/keyboards/mechwild/bde/lefty/keyboard.json
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/righty/info.json b/keyboards/mechwild/bde/righty/keyboard.json
index 3f254da286..3f254da286 100644
--- a/keyboards/mechwild/bde/righty/info.json
+++ b/keyboards/mechwild/bde/righty/keyboard.json
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/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/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/keyboard.json
index acd7e83f77..acd7e83f77 100644
--- a/keyboards/mechwild/obe/f401/info.json
+++ b/keyboards/mechwild/obe/f401/keyboard.json
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/keyboard.json
index 2517a82403..2517a82403 100644
--- a/keyboards/mechwild/obe/f411/info.json
+++ b/keyboards/mechwild/obe/f411/keyboard.json
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/sugarglider/f401/keyboard.json b/keyboards/mechwild/sugarglider/f401/keyboard.json
new file mode 100644
index 0000000000..797e990059
--- /dev/null
+++ b/keyboards/mechwild/sugarglider/f401/keyboard.json
@@ -0,0 +1,3 @@
+{
+ "development_board": "blackpill_f401"
+}
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..a41c5f4dd1
--- /dev/null
+++ b/keyboards/mechwild/sugarglider/f411/keyboard.json
@@ -0,0 +1,3 @@
+{
+ "development_board": "blackpill_f411"
+}
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..749b0952cb 100644
--- a/keyboards/mechwild/sugarglider/info.json
+++ b/keyboards/mechwild/sugarglider/info.json
@@ -3,7 +3,6 @@
"keyboard_name": "Sugar Glider",
"maintainer": "kylemccreery",
"url": "https://mechwild.com/product/sugar-glider/",
- "bootloader": "stm32-dfu",
"features": {
"bootmagic": true,
"command": false,
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/wide_oled/f401/keyboard.json b/keyboards/mechwild/sugarglider/wide_oled/f401/keyboard.json
new file mode 100644
index 0000000000..797e990059
--- /dev/null
+++ b/keyboards/mechwild/sugarglider/wide_oled/f401/keyboard.json
@@ -0,0 +1,3 @@
+{
+ "development_board": "blackpill_f401"
+}
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..a41c5f4dd1
--- /dev/null
+++ b/keyboards/mechwild/sugarglider/wide_oled/f411/keyboard.json
@@ -0,0 +1,3 @@
+{
+ "development_board": "blackpill_f411"
+}
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/waka60/f401/info.json b/keyboards/mechwild/waka60/f401/keyboard.json
index acd7e83f77..acd7e83f77 100644
--- a/keyboards/mechwild/waka60/f401/info.json
+++ b/keyboards/mechwild/waka60/f401/keyboard.json
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/keyboard.json
index 2517a82403..2517a82403 100644
--- a/keyboards/mechwild/waka60/f411/info.json
+++ b/keyboards/mechwild/waka60/f411/keyboard.json
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