commit: a1cbdf145fe90a60fed2d567ac944277a4234089 parent dc0095c64b2658a8fb5421ce93cb6bdc53806693 Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Mon, 22 Apr 2024 20:06:24 -0700 Data-Driven Keyboard Conversions: M, Part 1 (#23590)Diffstat:
38 files changed, 341 insertions(+), 447 deletions(-)diff --git a/keyboards/malevolti/lyra/rev1/info.json b/keyboards/malevolti/lyra/rev1/info.json@@ -1,110 +0,0 @@ -{ - "keyboard_name": "Lyra", - "manufacturer": "Dom", - "url": "", - "maintainer": "malevolti", - "usb": { - "vid": "0x4443", - "pid": "0x4C43", - "device_version": "30.3.1" - }, - "matrix_pins": { - "cols": ["B2", "B3", "B1", "F7", "F6", "F5", "F4"], - "rows": ["D4", "C6", "D7", "E6", "B4"] - }, - "diode_direction": "COL2ROW", - "split": { - "enabled": true, - "soft_serial_pin": "D2" - }, - "tapping": { - "term": 100 - }, - "processor": "atmega32u4", - "bootloader": "caterina", - "layouts": { - "LAYOUT": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0.3}, - {"matrix": [0, 1], "x": 1, "y": 0.4}, - {"matrix": [0, 2], "x": 2, "y": 0.3}, - {"matrix": [0, 3], "x": 3, "y": 0.1}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0.1}, - {"matrix": [0, 6], "x": 6, "y": 0.25}, - - {"matrix": [5, 6], "x": 8, "y": 0.25}, - {"matrix": [5, 5], "x": 9, "y": 0.1}, - {"matrix": [5, 4], "x": 10, "y": 0}, - {"matrix": [5, 3], "x": 11, "y": 0.1}, - {"matrix": [5, 2], "x": 12, "y": 0.3}, - {"matrix": [5, 1], "x": 13, "y": 0.4}, - {"matrix": [5, 0], "x": 14, "y": 0.3}, - - {"matrix": [1, 0], "x": 0, "y": 1.3}, - {"matrix": [1, 1], "x": 1, "y": 1.4}, - {"matrix": [1, 2], "x": 2, "y": 1.3}, - {"matrix": [1, 3], "x": 3, "y": 1.1}, - {"matrix": [1, 4], "x": 4, "y": 1}, - {"matrix": [1, 5], "x": 5, "y": 1.1}, - {"matrix": [1, 6], "x": 6, "y": 1.25}, - - {"matrix": [6, 6], "x": 8, "y": 1.25}, - {"matrix": [6, 5], "x": 9, "y": 1.1}, - {"matrix": [6, 4], "x": 10, "y": 1}, - {"matrix": [6, 3], "x": 11, "y": 1.1}, - {"matrix": [6, 2], "x": 12, "y": 1.3}, - {"matrix": [6, 1], "x": 13, "y": 1.4}, - {"matrix": [6, 0], "x": 14, "y": 1.3}, - - {"matrix": [2, 0], "x": 0, "y": 2.3}, - {"matrix": [2, 1], "x": 1, "y": 2.4}, - {"matrix": [2, 2], "x": 2, "y": 2.3}, - {"matrix": [2, 3], "x": 3, "y": 2.1}, - {"matrix": [2, 4], "x": 4, "y": 2}, - {"matrix": [2, 5], "x": 5, "y": 2.1}, - {"matrix": [2, 6], "x": 6, "y": 2.25}, - - {"matrix": [7, 6], "x": 8, "y": 2.25}, - {"matrix": [7, 5], "x": 9, "y": 2.1}, - {"matrix": [7, 4], "x": 10, "y": 2}, - {"matrix": [7, 3], "x": 11, "y": 2.1}, - {"matrix": [7, 2], "x": 12, "y": 2.3}, - {"matrix": [7, 1], "x": 13, "y": 2.4}, - {"matrix": [7, 0], "x": 14, "y": 2.3}, - - {"matrix": [3, 0], "x": 0, "y": 3.3}, - {"matrix": [3, 1], "x": 1, "y": 3.4}, - {"matrix": [3, 2], "x": 2, "y": 3.3}, - {"matrix": [3, 3], "x": 3, "y": 3.1}, - {"matrix": [3, 4], "x": 4, "y": 3}, - {"matrix": [3, 5], "x": 5, "y": 3.1}, - {"matrix": [3, 6], "x": 6, "y": 3.25}, - - {"matrix": [8, 6], "x": 8, "y": 3.25}, - {"matrix": [8, 5], "x": 9, "y": 3.1}, - {"matrix": [8, 4], "x": 10, "y": 3}, - {"matrix": [8, 3], "x": 11, "y": 3.1}, - {"matrix": [8, 2], "x": 12, "y": 3.3}, - {"matrix": [8, 1], "x": 13, "y": 3.4}, - {"matrix": [8, 0], "x": 14, "y": 3.3}, - - {"matrix": [4, 0], "x": 0, "y": 4.3}, - {"matrix": [4, 1], "x": 1, "y": 4.4}, - {"matrix": [4, 2], "x": 2, "y": 4.3}, - {"matrix": [4, 3], "x": 3, "y": 4.1}, - {"matrix": [4, 4], "x": 4, "y": 4}, - {"matrix": [4, 5], "x": 5, "y": 4.1}, - {"matrix": [4, 6], "x": 6.25, "y": 4.5}, - - {"matrix": [9, 6], "x": 7.75, "y": 4.5}, - {"matrix": [9, 5], "x": 9, "y": 4.1}, - {"matrix": [9, 4], "x": 10, "y": 4}, - {"matrix": [9, 3], "x": 11, "y": 4.1}, - {"matrix": [9, 2], "x": 12, "y": 4.3}, - {"matrix": [9, 1], "x": 13, "y": 4.4}, - {"matrix": [9, 0], "x": 14, "y": 4.3} - ] - } - } -}diff --git a/keyboards/malevolti/lyra/rev1/keyboard.json b/keyboards/malevolti/lyra/rev1/keyboard.json@@ -0,0 +1,118 @@ +{ + "keyboard_name": "Lyra", + "manufacturer": "Dom", + "url": "", + "maintainer": "malevolti", + "usb": { + "vid": "0x4443", + "pid": "0x4C43", + "device_version": "30.3.1" + }, + "matrix_pins": { + "cols": ["B2", "B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", + "split": { + "enabled": true, + "soft_serial_pin": "D2" + }, + "tapping": { + "term": 100 + }, + "processor": "atmega32u4", + "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true + }, + "build": { + "lto": true + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.3}, + {"matrix": [0, 1], "x": 1, "y": 0.4}, + {"matrix": [0, 2], "x": 2, "y": 0.3}, + {"matrix": [0, 3], "x": 3, "y": 0.1}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0.1}, + {"matrix": [0, 6], "x": 6, "y": 0.25}, + + {"matrix": [5, 6], "x": 8, "y": 0.25}, + {"matrix": [5, 5], "x": 9, "y": 0.1}, + {"matrix": [5, 4], "x": 10, "y": 0}, + {"matrix": [5, 3], "x": 11, "y": 0.1}, + {"matrix": [5, 2], "x": 12, "y": 0.3}, + {"matrix": [5, 1], "x": 13, "y": 0.4}, + {"matrix": [5, 0], "x": 14, "y": 0.3}, + + {"matrix": [1, 0], "x": 0, "y": 1.3}, + {"matrix": [1, 1], "x": 1, "y": 1.4}, + {"matrix": [1, 2], "x": 2, "y": 1.3}, + {"matrix": [1, 3], "x": 3, "y": 1.1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1.1}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + + {"matrix": [6, 6], "x": 8, "y": 1.25}, + {"matrix": [6, 5], "x": 9, "y": 1.1}, + {"matrix": [6, 4], "x": 10, "y": 1}, + {"matrix": [6, 3], "x": 11, "y": 1.1}, + {"matrix": [6, 2], "x": 12, "y": 1.3}, + {"matrix": [6, 1], "x": 13, "y": 1.4}, + {"matrix": [6, 0], "x": 14, "y": 1.3}, + + {"matrix": [2, 0], "x": 0, "y": 2.3}, + {"matrix": [2, 1], "x": 1, "y": 2.4}, + {"matrix": [2, 2], "x": 2, "y": 2.3}, + {"matrix": [2, 3], "x": 3, "y": 2.1}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2.1}, + {"matrix": [2, 6], "x": 6, "y": 2.25}, + + {"matrix": [7, 6], "x": 8, "y": 2.25}, + {"matrix": [7, 5], "x": 9, "y": 2.1}, + {"matrix": [7, 4], "x": 10, "y": 2}, + {"matrix": [7, 3], "x": 11, "y": 2.1}, + {"matrix": [7, 2], "x": 12, "y": 2.3}, + {"matrix": [7, 1], "x": 13, "y": 2.4}, + {"matrix": [7, 0], "x": 14, "y": 2.3}, + + {"matrix": [3, 0], "x": 0, "y": 3.3}, + {"matrix": [3, 1], "x": 1, "y": 3.4}, + {"matrix": [3, 2], "x": 2, "y": 3.3}, + {"matrix": [3, 3], "x": 3, "y": 3.1}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3.1}, + {"matrix": [3, 6], "x": 6, "y": 3.25}, + + {"matrix": [8, 6], "x": 8, "y": 3.25}, + {"matrix": [8, 5], "x": 9, "y": 3.1}, + {"matrix": [8, 4], "x": 10, "y": 3}, + {"matrix": [8, 3], "x": 11, "y": 3.1}, + {"matrix": [8, 2], "x": 12, "y": 3.3}, + {"matrix": [8, 1], "x": 13, "y": 3.4}, + {"matrix": [8, 0], "x": 14, "y": 3.3}, + + {"matrix": [4, 0], "x": 0, "y": 4.3}, + {"matrix": [4, 1], "x": 1, "y": 4.4}, + {"matrix": [4, 2], "x": 2, "y": 4.3}, + {"matrix": [4, 3], "x": 3, "y": 4.1}, + {"matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4.1}, + {"matrix": [4, 6], "x": 6.25, "y": 4.5}, + + {"matrix": [9, 6], "x": 7.75, "y": 4.5}, + {"matrix": [9, 5], "x": 9, "y": 4.1}, + {"matrix": [9, 4], "x": 10, "y": 4}, + {"matrix": [9, 3], "x": 11, "y": 4.1}, + {"matrix": [9, 2], "x": 12, "y": 4.3}, + {"matrix": [9, 1], "x": 13, "y": 4.4}, + {"matrix": [9, 0], "x": 14, "y": 4.3} + ] + } + } +}diff --git a/keyboards/malevolti/lyra/rev1/rules.mk b/keyboards/malevolti/lyra/rev1/rules.mk@@ -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 - -LTO_ENABLE = yesdiff --git a/keyboards/maple_computing/christmas_tree/info.json b/keyboards/maple_computing/christmas_tree/info.json@@ -1,44 +0,0 @@ -{ - "keyboard_name": "Christmas Tree", - "manufacturer": "Maple Computing", - "url": "https://www.reddit.com/r/MechanicalKeyboards/comments/7cqxpf/gb_christmas_tree_pcb_gb_now_live/", - "maintainer": "That-Canadian", - "usb": { - "vid": "0xFEED", - "pid": "0x3070" - }, - "features": { - "backlight": true, - "bootmagic": false, - "command": false, - "console": true, - "extrakey": true, - "mousekey": false, - "nkro": false - }, - "matrix_pins": { - "cols": ["D1"], - "rows": ["D3", "F4", "D0", "F6", "F5", "D4"] - }, - "diode_direction": "COL2ROW", - "backlight": { - "driver": "timer", - "pin": "D2" - }, - "processor": "atmega32u4", - "bootloader": "caterina", - "layouts": { - "LAYOUT": { - "layout": [ - {"matrix": [0, 0], "x": 1, "y": 0}, - - {"matrix": [1, 0], "x": 0.5, "y": 1}, - {"matrix": [2, 0], "x": 1.5, "y": 1}, - - {"matrix": [3, 0], "x": 0, "y": 2}, - {"matrix": [4, 0], "x": 1, "y": 2}, - {"matrix": [5, 0], "x": 2, "y": 2} - ] - } - } -}diff --git a/keyboards/maple_computing/christmas_tree/v2017/info.json b/keyboards/maple_computing/christmas_tree/v2017/info.json@@ -1,5 +0,0 @@ -{ - "usb": { - "device_version": "20.1.7" - } -}diff --git a/keyboards/maple_computing/christmas_tree/v2017/keyboard.json b/keyboards/maple_computing/christmas_tree/v2017/keyboard.json@@ -0,0 +1,45 @@ +{ + "keyboard_name": "Christmas Tree", + "manufacturer": "Maple Computing", + "url": "https://www.reddit.com/r/MechanicalKeyboards/comments/7cqxpf/gb_christmas_tree_pcb_gb_now_live/", + "maintainer": "That-Canadian", + "usb": { + "vid": "0xFEED", + "pid": "0x3070", + "device_version": "20.1.7" + }, + "processor": "atmega32u4", + "bootloader": "caterina", + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, + "matrix_pins": { + "cols": ["D1"], + "rows": ["D3", "F4", "D0", "F6", "F5", "D4"] + }, + "diode_direction": "COL2ROW", + "backlight": { + "driver": "timer", + "pin": "D2" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [ 0, 0 ], "x": 1, "y": 0}, + + {"matrix": [ 1, 0 ], "x": 0.5, "y": 1}, + {"matrix": [ 2, 0 ], "x": 1.5, "y": 1}, + + {"matrix": [ 3, 0 ], "x": 0, "y": 2}, + {"matrix": [ 4, 0 ], "x": 1, "y": 2}, + {"matrix": [ 5, 0 ], "x": 2, "y": 2} + ] + } + } +}diff --git a/keyboards/maple_computing/christmas_tree/v2017/rules.mk b/keyboards/maple_computing/christmas_tree/v2017/rules.mk@@ -1,3 +0,0 @@ -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. -AUDIO_ENABLE = no # Audio output -\ No newline at end of filediff --git a/keyboards/maple_computing/ivy/rev1/keyboard.json b/keyboards/maple_computing/ivy/rev1/keyboard.json@@ -19,6 +19,12 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "backlight": true + }, "layouts": { "LAYOUT": { "layout": [diff --git a/keyboards/maple_computing/ivy/rules.mk b/keyboards/maple_computing/ivy/rules.mk@@ -1,14 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # 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 = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - DEFAULT_FOLDER = maple_computing/ivy/rev1diff --git a/keyboards/maple_computing/jnao/info.json b/keyboards/maple_computing/jnao/info.json@@ -19,6 +19,14 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "console": true, + "command": true, + "backlight": true + }, "community_layouts": ["ortho_5x12", "ortho_4x12"], "layouts": { "LAYOUT_ortho_5x12": {diff --git a/keyboards/maple_computing/jnao/rules.mk b/keyboards/maple_computing/jnao/rules.mk@@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - # Disable unsupported hardware RGBLIGHT_SUPPORTED = no AUDIO_SUPPORTED = nodiff --git a/keyboards/maple_computing/launchpad/rev1/keyboard.json b/keyboards/maple_computing/launchpad/rev1/keyboard.json@@ -33,6 +33,12 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "nkro": true + }, "layouts": { "LAYOUT": { "layout": [diff --git a/keyboards/maple_computing/launchpad/rules.mk b/keyboards/maple_computing/launchpad/rules.mk@@ -1,14 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # 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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - DEFAULT_FOLDER = maple_computing/launchpad/rev1diff --git a/keyboards/maple_computing/lets_split_eh/eh/info.json b/keyboards/maple_computing/lets_split_eh/eh/info.json@@ -41,6 +41,14 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "community_layouts": ["ortho_4x12"], "layout_aliases": { "LAYOUT": "LAYOUT_ortho_4x12"diff --git a/keyboards/maple_computing/lets_split_eh/eh/rules.mk b/keyboards/maple_computing/lets_split_eh/eh/rules.mk@@ -1,5 +1,2 @@ -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes - # Disable unsupported hardware AUDIO_SUPPORTED = nodiff --git a/keyboards/maple_computing/lets_split_eh/rules.mk b/keyboards/maple_computing/lets_split_eh/rules.mk@@ -1,14 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # 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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - DEFAULT_FOLDER = maple_computing/lets_split_eh/ehdiff --git a/keyboards/maple_computing/minidox/rev1/info.json b/keyboards/maple_computing/minidox/rev1/info.json@@ -1,75 +0,0 @@ -{ - "keyboard_name": "MiniDox", - "manufacturer": "That-Canadian", - "url": "", - "maintainer": "qmk", - "usb": { - "vid": "0xFEED", - "pid": "0x3060", - "device_version": "0.0.1" - }, - "matrix_pins": { - "cols": ["F4", "D3", "D2", "D1", "D4"], - "rows": ["B2", "B6", "B4", "B5"] - }, - "diode_direction": "COL2ROW", - "split": { - "enabled": true, - "soft_serial_pin": "D0" - }, - "processor": "atmega32u4", - "bootloader": "caterina", - "community_layouts": ["split_3x5_3"], - "layout_aliases": { - "LAYOUT": "LAYOUT_split_3x5_3" - }, - "layouts": { - "LAYOUT_split_3x5_3": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0.375}, - {"matrix": [0, 1], "x": 1, "y": 0.125}, - {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 3], "x": 3, "y": 0.125}, - {"matrix": [0, 4], "x": 4, "y": 0.25}, - - {"matrix": [4, 4], "x": 7, "y": 0.25}, - {"matrix": [4, 3], "x": 8, "y": 0.125}, - {"matrix": [4, 2], "x": 9, "y": 0}, - {"matrix": [4, 1], "x": 10, "y": 0.125}, - {"matrix": [4, 0], "x": 11, "y": 0.375}, - - {"matrix": [1, 0], "x": 0, "y": 1.375}, - {"matrix": [1, 1], "x": 1, "y": 1.125}, - {"matrix": [1, 2], "x": 2, "y": 1}, - {"matrix": [1, 3], "x": 3, "y": 1.125}, - {"matrix": [1, 4], "x": 4, "y": 1.25}, - - {"matrix": [5, 4], "x": 7, "y": 1.25}, - {"matrix": [5, 3], "x": 8, "y": 1.125}, - {"matrix": [5, 2], "x": 9, "y": 1}, - {"matrix": [5, 1], "x": 10, "y": 1.125}, - {"matrix": [5, 0], "x": 11, "y": 1.375}, - - {"matrix": [2, 0], "x": 0, "y": 2.375}, - {"matrix": [2, 1], "x": 1, "y": 2.125}, - {"matrix": [2, 2], "x": 2, "y": 2}, - {"matrix": [2, 3], "x": 3, "y": 2.125}, - {"matrix": [2, 4], "x": 4, "y": 2.25}, - - {"matrix": [6, 4], "x": 7, "y": 2.25}, - {"matrix": [6, 3], "x": 8, "y": 2.125}, - {"matrix": [6, 2], "x": 9, "y": 2}, - {"matrix": [6, 1], "x": 10, "y": 2.125}, - {"matrix": [6, 0], "x": 11, "y": 2.375}, - - {"matrix": [3, 2], "x": 2.5, "y": 4.75}, - {"matrix": [3, 3], "x": 3.5, "y": 4.75}, - {"matrix": [3, 4], "x": 4.5, "y": 3.75, "h": 2}, - - {"matrix": [7, 4], "x": 6.5, "y": 3.75, "h": 2}, - {"matrix": [7, 3], "x": 7.5, "y": 4.75}, - {"matrix": [7, 2], "x": 8.5, "y": 4.75} - ] - } - } -}diff --git a/keyboards/maple_computing/minidox/rev1/keyboard.json b/keyboards/maple_computing/minidox/rev1/keyboard.json@@ -0,0 +1,81 @@ +{ + "keyboard_name": "MiniDox", + "manufacturer": "That-Canadian", + "url": "", + "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x3060", + "device_version": "0.0.1" + }, + "matrix_pins": { + "cols": ["F4", "D3", "D2", "D1", "D4"], + "rows": ["B2", "B6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", + "split": { + "enabled": true, + "soft_serial_pin": "D0" + }, + "processor": "atmega32u4", + "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "command": true + }, + "community_layouts": ["split_3x5_3"], + "layout_aliases": { + "LAYOUT": "LAYOUT_split_3x5_3" + }, + "layouts": { + "LAYOUT_split_3x5_3": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.375}, + {"matrix": [0, 1], "x": 1, "y": 0.125}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.125}, + {"matrix": [0, 4], "x": 4, "y": 0.25}, + + {"matrix": [4, 4], "x": 7, "y": 0.25}, + {"matrix": [4, 3], "x": 8, "y": 0.125}, + {"matrix": [4, 2], "x": 9, "y": 0}, + {"matrix": [4, 1], "x": 10, "y": 0.125}, + {"matrix": [4, 0], "x": 11, "y": 0.375}, + + {"matrix": [1, 0], "x": 0, "y": 1.375}, + {"matrix": [1, 1], "x": 1, "y": 1.125}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.125}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + + {"matrix": [5, 4], "x": 7, "y": 1.25}, + {"matrix": [5, 3], "x": 8, "y": 1.125}, + {"matrix": [5, 2], "x": 9, "y": 1}, + {"matrix": [5, 1], "x": 10, "y": 1.125}, + {"matrix": [5, 0], "x": 11, "y": 1.375}, + + {"matrix": [2, 0], "x": 0, "y": 2.375}, + {"matrix": [2, 1], "x": 1, "y": 2.125}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.125}, + {"matrix": [2, 4], "x": 4, "y": 2.25}, + + {"matrix": [6, 4], "x": 7, "y": 2.25}, + {"matrix": [6, 3], "x": 8, "y": 2.125}, + {"matrix": [6, 2], "x": 9, "y": 2}, + {"matrix": [6, 1], "x": 10, "y": 2.125}, + {"matrix": [6, 0], "x": 11, "y": 2.375}, + + {"matrix": [3, 2], "x": 2.5, "y": 4.75}, + {"matrix": [3, 3], "x": 3.5, "y": 4.75}, + {"matrix": [3, 4], "x": 4.5, "y": 3.75, "h": 2}, + + {"matrix": [7, 4], "x": 6.5, "y": 3.75, "h": 2}, + {"matrix": [7, 3], "x": 7.5, "y": 4.75}, + {"matrix": [7, 2], "x": 8.5, "y": 4.75} + ] + } + } +}diff --git a/keyboards/maple_computing/minidox/rev1/rules.mk b/keyboards/maple_computing/minidox/rev1/rules.mk@@ -1 +0,0 @@ -BACKLIGHT_ENABLE = nodiff --git a/keyboards/maple_computing/minidox/rules.mk b/keyboards/maple_computing/minidox/rules.mk@@ -1,14 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # 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 - DEFAULT_FOLDER = maple_computing/minidox/rev1diff --git a/keyboards/marksard/rhymestone/rev1/keyboard.json b/keyboards/marksard/rhymestone/rev1/keyboard.json@@ -44,6 +44,12 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false, + "nkro": true + }, "community_layouts": ["ortho_4x10"], "layouts": { "LAYOUT_ortho_4x10": {diff --git a/keyboards/marksard/rhymestone/rules.mk b/keyboards/marksard/rhymestone/rules.mk@@ -1,15 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = no - DEFAULT_FOLDER = marksard/rhymestone/rev1diff --git a/keyboards/marksard/treadstone48/rev1/keyboard.json b/keyboards/marksard/treadstone48/rev1/keyboard.json@@ -34,6 +34,13 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": false, + "rgblight": true, + "oled": true + }, "layouts": { "LAYOUT_base": { "layout": [diff --git a/keyboards/marksard/treadstone48/rev2/info.json b/keyboards/marksard/treadstone48/rev2/info.json@@ -31,6 +31,13 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": false, + "rgblight": true, + "oled": true + }, "layout_aliases": { "LAYOUT_full": "LAYOUT_base" },diff --git a/keyboards/marksard/treadstone48/rev2/rules.mk b/keyboards/marksard/treadstone48/rev2/rules.mk@@ -1 +0,0 @@ -# File intentionally blankdiff --git a/keyboards/marksard/treadstone48/rules.mk b/keyboards/marksard/treadstone48/rules.mk@@ -1,17 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -EXTRAKEY_ENABLE = no # 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 -AUDIO_ENABLE = no # Audio output - -MOUSEKEY_ENABLE = yes # Mouse keys - -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -OLED_ENABLE = yes - DEFAULT_FOLDER = marksard/treadstone48/rev1diff --git a/keyboards/massdrop/alt/info.json b/keyboards/massdrop/alt/info.json@@ -17,6 +17,13 @@ }, "diode_direction": "COL2ROW", "community_layouts": ["65_ansi_blocker"], + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, "layout_aliases": { "LAYOUT": "LAYOUT_65_ansi_blocker" },diff --git a/keyboards/massdrop/alt/rules.mk b/keyboards/massdrop/alt/rules.mk@@ -7,21 +7,3 @@ MCU = cortex-m4 # Bootloader selection BOOTLOADER = md-boot - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # 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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -VIRTSER_ENABLE = no # USB Serial Driver -AUTO_SHIFT_ENABLE = no # Auto Shift - -# Custom RGB matrix handling -RGB_MATRIX_ENABLE = yesdiff --git a/keyboards/massdrop/ctrl/info.json b/keyboards/massdrop/ctrl/info.json@@ -16,6 +16,13 @@ "rows": ["B04", "B05", "B06", "B07", "B08", "B09", "A10", "A11", "B10", "B11", "B12"] }, "diode_direction": "COL2ROW", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, "layouts": { "LAYOUT": { "layout": [diff --git a/keyboards/massdrop/ctrl/rules.mk b/keyboards/massdrop/ctrl/rules.mk@@ -7,21 +7,3 @@ MCU = cortex-m4 # Bootloader selection BOOTLOADER = md-boot - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # 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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -VIRTSER_ENABLE = no # USB Serial Driver -AUTO_SHIFT_ENABLE = no # Auto Shift - -# Custom RGB matrix handling -RGB_MATRIX_ENABLE = yesdiff --git a/keyboards/matrix/abelx/info.json b/keyboards/matrix/abelx/info.json@@ -6,7 +6,8 @@ "usb": { "vid": "0x4D58", "pid": "0xAB87", - "device_version": "0.0.1" + "device_version": "0.0.1", + "no_startup_check": true }, "rgblight": { "led_count": 9, @@ -27,6 +28,12 @@ "ws2812": { "pin": "B4" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgblight": true + }, "layouts": { "LAYOUT_tkl_ansi": { "layout": [diff --git a/keyboards/matrix/abelx/rules.mk b/keyboards/matrix/abelx/rules.mk@@ -1,4 +1,4 @@ -## chip/board settings +# # - the next two should match the directories in # <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) MCU_FAMILY = STM32 @@ -28,20 +28,6 @@ USE_FPU = yes # Bootloader selection BOOTLOADER = custom -# 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 -NO_USB_STARTUP_CHECK = yes # Disable initialization only when usb is plugged in - CUSTOM_MATRIX = lite # project specific files SRC += matrix.c tca6424.c aw9523b.cdiff --git a/keyboards/matrix/m12og/rev1/info.json b/keyboards/matrix/m12og/rev1/info.json@@ -31,6 +31,15 @@ "ws2812": { "pin": "B8" }, + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "rgblight": true + }, + "build": { + "lto": true + }, "layout_aliases": { "LAYOUT_all": "LAYOUT_tkl_ansi_tsangan" },diff --git a/keyboards/matrix/m12og/rev1/rules.mk b/keyboards/matrix/m12og/rev1/rules.mk@@ -8,19 +8,5 @@ BOARD = m12og_v1 # Bootloader selection BOOTLOADER = custom -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # 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 # HAS TO BE ON! Otherwise the custom matrix doesn't work -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes - CUSTOM_MATRIX = lite SRC += matrix.cdiff --git a/keyboards/matrix/m20add/info.json b/keyboards/matrix/m20add/info.json@@ -6,7 +6,8 @@ "usb": { "vid": "0x4D58", "pid": "0x20AD", - "device_version": "0.0.1" + "device_version": "0.0.1", + "no_startup_check": true }, "rgblight": { "led_count": 20, @@ -27,6 +28,12 @@ "ws2812": { "pin": "B4" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgblight": true + }, "layouts": { "LAYOUT_tkl_ansi_tsangan": { "layout": [diff --git a/keyboards/matrix/m20add/rules.mk b/keyboards/matrix/m20add/rules.mk@@ -13,19 +13,6 @@ BOARD = ST_NUCLEO64_F411RE # Bootloader selection BOOTLOADER = custom -# 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 -NO_USB_STARTUP_CHECK = yes # Disable initialization only when usb is plugged in - -RGBLIGHT_ENABLE = yes - CUSTOM_MATRIX = lite # project specific files SRC += matrix.c tca6424.c rgb_ring.c drivers/led/issi/is31fl3731.cdiff --git a/keyboards/matrix/noah/info.json b/keyboards/matrix/noah/info.json@@ -6,7 +6,8 @@ "usb": { "vid": "0x4D58", "pid": "0x0065", - "device_version": "0.0.1" + "device_version": "0.0.1", + "no_startup_check": true }, "rgblight": { "driver": "custom", @@ -75,6 +76,13 @@ }, "driver": "is31fl3731" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgblight": true, + "rgb_matrix": true + }, "community_layouts": ["65_iso_blocker"], "layouts": { "LAYOUT_default": {diff --git a/keyboards/matrix/noah/rules.mk b/keyboards/matrix/noah/rules.mk@@ -13,20 +13,6 @@ BOARD = ST_NUCLEO64_F411RE # Bootloader selection BOOTLOADER = custom -# 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 -NO_USB_STARTUP_CHECK = yes # Disable initialization only when usb is plugged in - -RGB_MATRIX_ENABLE = yes - -RGBLIGHT_ENABLE = yes WS2812_DRIVER_REQUIRED = yes CUSTOM_MATRIX = yes