diff options
Diffstat (limited to 'keyboards/mechwild')
24 files changed, 34 insertions, 90 deletions
diff --git a/keyboards/mechwild/bbs/info.json b/keyboards/mechwild/bbs/info.json index a6b6747df6..97fc709de9 100644 --- a/keyboards/mechwild/bbs/info.json +++ b/keyboards/mechwild/bbs/info.json @@ -8,6 +8,9 @@ "pid": "0x170E", "device_version": "0.0.1" }, + "processor": "STM32F401", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F401", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mechwild/bbs/rules.mk b/keyboards/mechwild/bbs/rules.mk index 519b77b437..6dbff620b8 100644 --- a/keyboards/mechwild/bbs/rules.mk +++ b/keyboards/mechwild/bbs/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = BLACKPILL_STM32_F401 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mechwild/mercutio/info.json b/keyboards/mechwild/mercutio/info.json index f3323ac48f..b0596e76e5 100644 --- a/keyboards/mechwild/mercutio/info.json +++ b/keyboards/mechwild/mercutio/info.json @@ -8,6 +8,8 @@ "pid": "0x1703", "device_version": "1.0.0" }, + "processor": "atmega328p", + "bootloader": "usbasploader", "layouts": { "LAYOUT_all": { "layout": [{"label":"encoder", "x":12, "y":0}, {"label":"1.5u", "x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"label":"1.5u", "x":11.5, "y":1, "w":1.5}, {"label":"1.75u", "x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"label":"1.25u", "x":11.75, "y":2, "w":1.25}, {"label":"1.25u", "x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"label":"1.75u", "x":11.25, "y":3, "w":1.75},{"label":"1.25u", "x":0, "y":4, "w":1.25}, {"label":"1u", "x":1.25, "y":4}, {"label":"1.25u", "x":2.25, "y":4, "w":1.25}, {"label":"2.25u", "x":3.5, "y":4, "w":2.25}, {"label":"1u", "x":5.75, "y":4}, {"label":"2.75u", "x":6.75, "y":4, "w":2.75}, {"label":"1.25u", "x":9.5, "y":4, "w":1.25}, {"label":"1u", "x":10.75, "y":4}, {"label":"1.25u", "x":11.75, "y":4, "w":1.25}] diff --git a/keyboards/mechwild/mercutio/rules.mk b/keyboards/mechwild/mercutio/rules.mk index cba3861f34..27c445ca2f 100644 --- a/keyboards/mechwild/mercutio/rules.mk +++ b/keyboards/mechwild/mercutio/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega328p - -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/mechwild/mokulua/mirrored/info.json b/keyboards/mechwild/mokulua/mirrored/info.json index 15ed63a858..4cc18e68c4 100644 --- a/keyboards/mechwild/mokulua/mirrored/info.json +++ b/keyboards/mechwild/mokulua/mirrored/info.json @@ -8,6 +8,8 @@ "pid": "0x170C", "device_version": "1.0.3" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_mirrored": { "layout": [ diff --git a/keyboards/mechwild/mokulua/mirrored/rules.mk b/keyboards/mechwild/mokulua/mirrored/rules.mk index 5aae5c7c76..c04e6937b0 100644 --- a/keyboards/mechwild/mokulua/mirrored/rules.mk +++ b/keyboards/mechwild/mokulua/mirrored/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/mechwild/mokulua/standard/info.json b/keyboards/mechwild/mokulua/standard/info.json index 74bcd0b16f..dd9507dbe4 100644 --- a/keyboards/mechwild/mokulua/standard/info.json +++ b/keyboards/mechwild/mokulua/standard/info.json @@ -8,6 +8,8 @@ "pid": "0x170B", "device_version": "1.0.3" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_standard": { "layout": [ diff --git a/keyboards/mechwild/mokulua/standard/rules.mk b/keyboards/mechwild/mokulua/standard/rules.mk index 5aae5c7c76..c04e6937b0 100644 --- a/keyboards/mechwild/mokulua/standard/rules.mk +++ b/keyboards/mechwild/mokulua/standard/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/mechwild/murphpad/info.json b/keyboards/mechwild/murphpad/info.json index ae4f24f9fa..6344d42672 100644 --- a/keyboards/mechwild/murphpad/info.json +++ b/keyboards/mechwild/murphpad/info.json @@ -8,6 +8,8 @@ "pid": "0x1705", "device_version": "3.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mechwild/murphpad/rules.mk b/keyboards/mechwild/murphpad/rules.mk index 2210965970..ddfffd4c4b 100644 --- a/keyboards/mechwild/murphpad/rules.mk +++ b/keyboards/mechwild/murphpad/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/mechwild/obe/f401/eeprom/rules.mk b/keyboards/mechwild/obe/f401/eeprom/rules.mk index 4707020e58..44adba039b 100644 --- a/keyboards/mechwild/obe/f401/eeprom/rules.mk +++ b/keyboards/mechwild/obe/f401/eeprom/rules.mk @@ -1,8 +1 @@ -# MCU name -MCU = STM32F401 -BOARD = BLACKPILL_STM32_F401 - -# Bootloader selection -BOOTLOADER = stm32-dfu - EEPROM_DRIVER = i2c diff --git a/keyboards/mechwild/obe/f401/info.json b/keyboards/mechwild/obe/f401/info.json new file mode 100644 index 0000000000..acd7e83f77 --- /dev/null +++ b/keyboards/mechwild/obe/f401/info.json @@ -0,0 +1,5 @@ +{ + "processor": "STM32F401", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F401" +} diff --git a/keyboards/mechwild/obe/f401/rules.mk b/keyboards/mechwild/obe/f401/rules.mk index 1b21bbaf77..e69de29bb2 100644 --- a/keyboards/mechwild/obe/f401/rules.mk +++ b/keyboards/mechwild/obe/f401/rules.mk @@ -1,6 +0,0 @@ -# MCU name -MCU = STM32F401 -BOARD = BLACKPILL_STM32_F401 - -# Bootloader selection -BOOTLOADER = stm32-dfu diff --git a/keyboards/mechwild/obe/f411/eeprom/rules.mk b/keyboards/mechwild/obe/f411/eeprom/rules.mk index 3d2f9bcf05..44adba039b 100644 --- a/keyboards/mechwild/obe/f411/eeprom/rules.mk +++ b/keyboards/mechwild/obe/f411/eeprom/rules.mk @@ -1,8 +1 @@ -# MCU name -MCU = STM32F411 -BOARD = BLACKPILL_STM32_F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu - EEPROM_DRIVER = i2c diff --git a/keyboards/mechwild/obe/f411/info.json b/keyboards/mechwild/obe/f411/info.json new file mode 100644 index 0000000000..2517a82403 --- /dev/null +++ b/keyboards/mechwild/obe/f411/info.json @@ -0,0 +1,5 @@ +{ + "processor": "STM32F411", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F411" +} diff --git a/keyboards/mechwild/obe/f411/rules.mk b/keyboards/mechwild/obe/f411/rules.mk index c25a64f4b3..e69de29bb2 100644 --- a/keyboards/mechwild/obe/f411/rules.mk +++ b/keyboards/mechwild/obe/f411/rules.mk @@ -1,6 +0,0 @@ -# MCU name -MCU = STM32F411 -BOARD = BLACKPILL_STM32_F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu diff --git a/keyboards/mechwild/puckbuddy/info.json b/keyboards/mechwild/puckbuddy/info.json index 742438e8f5..d8ae46caf3 100644 --- a/keyboards/mechwild/puckbuddy/info.json +++ b/keyboards/mechwild/puckbuddy/info.json @@ -8,6 +8,9 @@ "pid": "0x170F", "device_version": "1.0.0" }, + "processor": "STM32F401", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F401", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mechwild/puckbuddy/rules.mk b/keyboards/mechwild/puckbuddy/rules.mk index a2837f9216..4bddc4813f 100644 --- a/keyboards/mechwild/puckbuddy/rules.mk +++ b/keyboards/mechwild/puckbuddy/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = BLACKPILL_STM32_F401 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mechwild/waka60/f401/eeprom/rules.mk b/keyboards/mechwild/waka60/f401/eeprom/rules.mk index 4707020e58..44adba039b 100644 --- a/keyboards/mechwild/waka60/f401/eeprom/rules.mk +++ b/keyboards/mechwild/waka60/f401/eeprom/rules.mk @@ -1,8 +1 @@ -# MCU name -MCU = STM32F401 -BOARD = BLACKPILL_STM32_F401 - -# Bootloader selection -BOOTLOADER = stm32-dfu - EEPROM_DRIVER = i2c diff --git a/keyboards/mechwild/waka60/f401/info.json b/keyboards/mechwild/waka60/f401/info.json new file mode 100644 index 0000000000..acd7e83f77 --- /dev/null +++ b/keyboards/mechwild/waka60/f401/info.json @@ -0,0 +1,5 @@ +{ + "processor": "STM32F401", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F401" +} diff --git a/keyboards/mechwild/waka60/f401/rules.mk b/keyboards/mechwild/waka60/f401/rules.mk index 1b21bbaf77..e69de29bb2 100644 --- a/keyboards/mechwild/waka60/f401/rules.mk +++ b/keyboards/mechwild/waka60/f401/rules.mk @@ -1,6 +0,0 @@ -# MCU name -MCU = STM32F401 -BOARD = BLACKPILL_STM32_F401 - -# Bootloader selection -BOOTLOADER = stm32-dfu diff --git a/keyboards/mechwild/waka60/f411/eeprom/rules.mk b/keyboards/mechwild/waka60/f411/eeprom/rules.mk index 3d2f9bcf05..44adba039b 100644 --- a/keyboards/mechwild/waka60/f411/eeprom/rules.mk +++ b/keyboards/mechwild/waka60/f411/eeprom/rules.mk @@ -1,8 +1 @@ -# MCU name -MCU = STM32F411 -BOARD = BLACKPILL_STM32_F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu - EEPROM_DRIVER = i2c diff --git a/keyboards/mechwild/waka60/f411/info.json b/keyboards/mechwild/waka60/f411/info.json new file mode 100644 index 0000000000..2517a82403 --- /dev/null +++ b/keyboards/mechwild/waka60/f411/info.json @@ -0,0 +1,5 @@ +{ + "processor": "STM32F411", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F411" +} diff --git a/keyboards/mechwild/waka60/f411/rules.mk b/keyboards/mechwild/waka60/f411/rules.mk index c25a64f4b3..e69de29bb2 100644 --- a/keyboards/mechwild/waka60/f411/rules.mk +++ b/keyboards/mechwild/waka60/f411/rules.mk @@ -1,6 +0,0 @@ -# MCU name -MCU = STM32F411 -BOARD = BLACKPILL_STM32_F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu |