From 3d83b3e7c5dc18b77d82798fdad9d7552487cfe4 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Thu, 25 Apr 2024 08:42:48 +0100 Subject: Migrate build target markers to keyboard.json - Misc (#23609) --- keyboards/epomaker/tide65/info.json | 231 ---------- keyboards/epomaker/tide65/keyboard.json | 231 ++++++++++ keyboards/epomaker/tide65/rules.mk | 1 - keyboards/keyten/lisa/info.json | 81 ---- keyboards/keyten/lisa/keyboard.json | 81 ++++ keyboards/keyten/lisa/rules.mk | 0 keyboards/maple_computing/jnao/config.h | 24 -- keyboards/maple_computing/jnao/info.json | 156 ------- keyboards/maple_computing/jnao/keyboard.json | 162 +++++++ keyboards/maple_computing/lets_split_eh/eh/eh.c | 16 + .../maple_computing/lets_split_eh/eh/info.json | 117 ----- .../maple_computing/lets_split_eh/eh/keyboard.json | 117 +++++ .../maple_computing/lets_split_eh/lets_split_eh.c | 16 - keyboards/marksard/treadstone48/rev2/info.json | 101 ----- keyboards/marksard/treadstone48/rev2/keyboard.json | 101 +++++ keyboards/marksard/treadstone48/rev2/rules.mk | 0 keyboards/massdrop/alt/info.json | 107 ----- keyboards/massdrop/alt/keyboard.json | 107 +++++ keyboards/massdrop/ctrl/info.json | 132 ------ keyboards/massdrop/ctrl/keyboard.json | 132 ++++++ keyboards/matrix/abelx/info.json | 247 ----------- keyboards/matrix/abelx/keyboard.json | 249 +++++++++++ keyboards/matrix/abelx/rules.mk | 28 +- keyboards/matrix/m12og/rev1/info.json | 255 ----------- keyboards/matrix/m12og/rev1/keyboard.json | 257 +++++++++++ keyboards/matrix/m12og/rev1/rev1.c | 2 + keyboards/matrix/m12og/rev1/rules.mk | 8 +- keyboards/matrix/m12og/rev2/rev2.c | 4 +- keyboards/matrix/m20add/info.json | 246 ----------- keyboards/matrix/m20add/keyboard.json | 248 +++++++++++ keyboards/matrix/m20add/rules.mk | 13 +- keyboards/matrix/noah/info.json | 469 -------------------- keyboards/matrix/noah/keyboard.json | 471 +++++++++++++++++++++ keyboards/matrix/noah/rules.mk | 13 +- keyboards/rgbkb/pan/rev1/32a/info.json | 18 - keyboards/rgbkb/pan/rev1/32a/keyboard.json | 18 + keyboards/rgbkb/sol/rev1/info.json | 187 -------- keyboards/rgbkb/sol/rev1/keyboard.json | 187 ++++++++ keyboards/rgbkb/sol/rev2/info.json | 182 -------- keyboards/rgbkb/sol/rev2/keyboard.json | 182 ++++++++ keyboards/rgbkb/zen/rev2/info.json | 129 ------ keyboards/rgbkb/zen/rev2/keyboard.json | 129 ++++++ keyboards/splitkb/kyria/rev1/info.json | 9 + keyboards/splitkb/kyria/rev1/proton_c/info.json | 5 - .../splitkb/kyria/rev1/proton_c/keyboard.json | 5 + keyboards/splitkb/kyria/rev1/rules.mk | 14 +- keyboards/splitkb/kyria/rev2/info.json | 9 + keyboards/splitkb/kyria/rev2/proton_c/info.json | 5 - .../splitkb/kyria/rev2/proton_c/keyboard.json | 5 + keyboards/splitkb/kyria/rev2/rules.mk | 14 +- keyboards/suikagiken/suika85ergo/info.json | 124 ------ keyboards/suikagiken/suika85ergo/keyboard.json | 124 ++++++ keyboards/suikagiken/suika85ergo/rules.mk | 1 - keyboards/yushakobo/navpad/10/info.json | 8 + keyboards/yushakobo/navpad/10/rev0/rules.mk | 1 + keyboards/yushakobo/navpad/10/rev1/rules.mk | 1 + keyboards/yushakobo/navpad/10/rules.mk | 16 - keyboards/yushakobo/navpad/10_helix_r/info.json | 143 ------- .../yushakobo/navpad/10_helix_r/keyboard.json | 151 +++++++ keyboards/yushakobo/navpad/10_helix_r/rules.mk | 15 - keyboards/yushakobo/quick17/info.json | 74 ---- keyboards/yushakobo/quick17/keyboard.json | 82 ++++ keyboards/yushakobo/quick17/rules.mk | 15 - keyboards/zsa/voyager/info.json | 219 ---------- keyboards/zsa/voyager/keyboard.json | 219 ++++++++++ 65 files changed, 3313 insertions(+), 3401 deletions(-) delete mode 100644 keyboards/epomaker/tide65/info.json create mode 100644 keyboards/epomaker/tide65/keyboard.json delete mode 100644 keyboards/epomaker/tide65/rules.mk delete mode 100644 keyboards/keyten/lisa/info.json create mode 100644 keyboards/keyten/lisa/keyboard.json delete mode 100644 keyboards/keyten/lisa/rules.mk delete mode 100644 keyboards/maple_computing/jnao/config.h delete mode 100644 keyboards/maple_computing/jnao/info.json create mode 100644 keyboards/maple_computing/jnao/keyboard.json create mode 100644 keyboards/maple_computing/lets_split_eh/eh/eh.c delete mode 100644 keyboards/maple_computing/lets_split_eh/eh/info.json create mode 100644 keyboards/maple_computing/lets_split_eh/eh/keyboard.json delete mode 100644 keyboards/maple_computing/lets_split_eh/lets_split_eh.c delete mode 100644 keyboards/marksard/treadstone48/rev2/info.json create mode 100644 keyboards/marksard/treadstone48/rev2/keyboard.json delete mode 100644 keyboards/marksard/treadstone48/rev2/rules.mk delete mode 100644 keyboards/massdrop/alt/info.json create mode 100644 keyboards/massdrop/alt/keyboard.json delete mode 100644 keyboards/massdrop/ctrl/info.json create mode 100644 keyboards/massdrop/ctrl/keyboard.json delete mode 100644 keyboards/matrix/abelx/info.json create mode 100644 keyboards/matrix/abelx/keyboard.json delete mode 100644 keyboards/matrix/m12og/rev1/info.json create mode 100644 keyboards/matrix/m12og/rev1/keyboard.json delete mode 100644 keyboards/matrix/m20add/info.json create mode 100644 keyboards/matrix/m20add/keyboard.json delete mode 100644 keyboards/matrix/noah/info.json create mode 100644 keyboards/matrix/noah/keyboard.json delete mode 100644 keyboards/rgbkb/pan/rev1/32a/info.json create mode 100644 keyboards/rgbkb/pan/rev1/32a/keyboard.json delete mode 100644 keyboards/rgbkb/sol/rev1/info.json create mode 100644 keyboards/rgbkb/sol/rev1/keyboard.json delete mode 100644 keyboards/rgbkb/sol/rev2/info.json create mode 100644 keyboards/rgbkb/sol/rev2/keyboard.json delete mode 100644 keyboards/rgbkb/zen/rev2/info.json create mode 100644 keyboards/rgbkb/zen/rev2/keyboard.json delete mode 100644 keyboards/splitkb/kyria/rev1/proton_c/info.json create mode 100644 keyboards/splitkb/kyria/rev1/proton_c/keyboard.json delete mode 100644 keyboards/splitkb/kyria/rev2/proton_c/info.json create mode 100644 keyboards/splitkb/kyria/rev2/proton_c/keyboard.json delete mode 100644 keyboards/suikagiken/suika85ergo/info.json create mode 100644 keyboards/suikagiken/suika85ergo/keyboard.json delete mode 100644 keyboards/suikagiken/suika85ergo/rules.mk create mode 100644 keyboards/yushakobo/navpad/10/rev0/rules.mk create mode 100644 keyboards/yushakobo/navpad/10/rev1/rules.mk delete mode 100644 keyboards/yushakobo/navpad/10_helix_r/info.json create mode 100644 keyboards/yushakobo/navpad/10_helix_r/keyboard.json delete mode 100644 keyboards/yushakobo/quick17/info.json create mode 100644 keyboards/yushakobo/quick17/keyboard.json delete mode 100644 keyboards/zsa/voyager/info.json create mode 100644 keyboards/zsa/voyager/keyboard.json (limited to 'keyboards') diff --git a/keyboards/epomaker/tide65/info.json b/keyboards/epomaker/tide65/info.json deleted file mode 100644 index 2715b923f4..0000000000 --- a/keyboards/epomaker/tide65/info.json +++ /dev/null @@ -1,231 +0,0 @@ -{ - "manufacturer": "HS", - "keyboard_name": "EPOMAKER TIDE 65", - "maintainer": "sdk66", - "bootloader": "wb32-dfu", - "diode_direction": "ROW2COL", - "encoder": { - "rotary": [ - {"pin_a": "B7", "pin_b": "B6"} - ] - }, - "features": { - "bootmagic": true, - "encoder": true, - "extrakey": true, - "mousekey": true, - "nkro": true, - "rgb_matrix": true - }, - "matrix_pins": { - "cols": ["C0", "C1", "C2", "C3", "A6", "B10", "B11", "B12", "B13", "B14", "A10", "C6", "C7", "C8", "C9"], - "rows": ["A1", "A2", "A3", "A4", "C13"] - }, - "processor": "WB32FQ95", - "rgb_matrix": { - "animations": { - "alphas_mods": true, - "band_pinwheel_sat": true, - "band_pinwheel_val": true, - "band_sat": true, - "band_spiral_sat": true, - "band_spiral_val": true, - "band_val": true, - "breathing": true, - "cycle_all": true, - "cycle_left_right": true, - "cycle_out_in": true, - "cycle_out_in_dual": true, - "cycle_pinwheel": true, - "cycle_spiral": true, - "cycle_up_down": true, - "digital_rain": true, - "dual_beacon": true, - "gradient_left_right": true, - "gradient_up_down": true, - "hue_breathing": true, - "hue_pendulum": true, - "hue_wave": true, - "jellybean_raindrops": true, - "multisplash": true, - "pixel_flow": true, - "pixel_fractal": true, - "pixel_rain": true, - "rainbow_beacon": true, - "rainbow_moving_chevron": true, - "rainbow_pinwheels": true, - "raindrops": true, - "solid_multisplash": true, - "solid_reactive": true, - "solid_reactive_cross": true, - "solid_reactive_multicross": true, - "solid_reactive_multinexus": true, - "solid_reactive_multiwide": true, - "solid_reactive_nexus": true, - "solid_reactive_simple": true, - "solid_reactive_wide": true, - "solid_splash": true, - "splash": true, - "typing_heatmap": true - }, - "driver": "ws2812", - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, - {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4}, - {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4}, - {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4}, - {"matrix": [0, 4], "x": 64, "y": 0, "flags": 4}, - {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4}, - {"matrix": [0, 6], "x": 96, "y": 0, "flags": 4}, - {"matrix": [0, 7], "x": 112, "y": 0, "flags": 4}, - {"matrix": [0, 8], "x": 128, "y": 0, "flags": 4}, - {"matrix": [0, 9], "x": 144, "y": 0, "flags": 4}, - {"matrix": [0, 10], "x": 160, "y": 0, "flags": 4}, - {"matrix": [0, 11], "x": 176, "y": 0, "flags": 4}, - {"matrix": [0, 12], "x": 192, "y": 0, "flags": 4}, - {"matrix": [0, 13], "x": 208, "y": 0, "flags": 4}, - {"matrix": [1, 0], "x": 0, "y": 16, "flags": 4}, - {"matrix": [1, 1], "x": 16, "y": 16, "flags": 4}, - {"matrix": [1, 2], "x": 32, "y": 16, "flags": 4}, - {"matrix": [1, 3], "x": 48, "y": 16, "flags": 4}, - {"matrix": [1, 4], "x": 64, "y": 16, "flags": 4}, - {"matrix": [1, 5], "x": 80, "y": 16, "flags": 4}, - {"matrix": [1, 6], "x": 96, "y": 16, "flags": 4}, - {"matrix": [1, 7], "x": 112, "y": 16, "flags": 4}, - {"matrix": [1, 8], "x": 128, "y": 16, "flags": 4}, - {"matrix": [1, 9], "x": 144, "y": 16, "flags": 4}, - {"matrix": [1, 10], "x": 160, "y": 16, "flags": 4}, - {"matrix": [1, 11], "x": 176, "y": 16, "flags": 4}, - {"matrix": [1, 12], "x": 192, "y": 16, "flags": 4}, - {"matrix": [1, 13], "x": 208, "y": 16, "flags": 4}, - {"matrix": [1, 14], "x": 224, "y": 16, "flags": 4}, - {"matrix": [2, 0], "x": 0, "y": 32, "flags": 4}, - {"matrix": [2, 1], "x": 16, "y": 32, "flags": 4}, - {"matrix": [2, 2], "x": 32, "y": 32, "flags": 4}, - {"matrix": [2, 3], "x": 48, "y": 32, "flags": 4}, - {"matrix": [2, 4], "x": 64, "y": 32, "flags": 4}, - {"matrix": [2, 5], "x": 80, "y": 32, "flags": 4}, - {"matrix": [2, 6], "x": 96, "y": 32, "flags": 4}, - {"matrix": [2, 7], "x": 112, "y": 32, "flags": 4}, - {"matrix": [2, 8], "x": 128, "y": 32, "flags": 4}, - {"matrix": [2, 9], "x": 144, "y": 32, "flags": 4}, - {"matrix": [2, 10], "x": 160, "y": 32, "flags": 4}, - {"matrix": [2, 11], "x": 176, "y": 32, "flags": 4}, - {"matrix": [2, 13], "x": 208, "y": 32, "flags": 4}, - {"matrix": [2, 14], "x": 224, "y": 32, "flags": 4}, - {"matrix": [3, 0], "x": 0, "y": 48, "flags": 4}, - {"matrix": [3, 1], "x": 16, "y": 48, "flags": 4}, - {"matrix": [3, 2], "x": 32, "y": 48, "flags": 4}, - {"matrix": [3, 3], "x": 48, "y": 48, "flags": 4}, - {"matrix": [3, 4], "x": 64, "y": 48, "flags": 4}, - {"matrix": [3, 5], "x": 80, "y": 48, "flags": 4}, - {"matrix": [3, 6], "x": 96, "y": 48, "flags": 4}, - {"matrix": [3, 7], "x": 112, "y": 48, "flags": 4}, - {"matrix": [3, 8], "x": 128, "y": 48, "flags": 4}, - {"matrix": [3, 9], "x": 144, "y": 48, "flags": 4}, - {"matrix": [3, 11], "x": 176, "y": 48, "flags": 4}, - {"matrix": [3, 12], "x": 192, "y": 48, "flags": 4}, - {"matrix": [3, 13], "x": 208, "y": 48, "flags": 4}, - {"matrix": [3, 14], "x": 224, "y": 48, "flags": 4}, - {"matrix": [4, 0], "x": 0, "y": 64, "flags": 4}, - {"matrix": [4, 1], "x": 16, "y": 64, "flags": 4}, - {"matrix": [4, 2], "x": 32, "y": 64, "flags": 4}, - {"matrix": [4, 3], "x": 48, "y": 64, "flags": 4}, - {"matrix": [4, 4], "x": 64, "y": 64, "flags": 4}, - {"matrix": [4, 5], "x": 80, "y": 64, "flags": 4}, - {"matrix": [4, 6], "x": 96, "y": 64, "flags": 4}, - {"matrix": [4, 9], "x": 144, "y": 64, "flags": 4}, - {"matrix": [4, 11], "x": 176, "y": 64, "flags": 4}, - {"matrix": [4, 12], "x": 192, "y": 64, "flags": 4}, - {"matrix": [4, 13], "x": 208, "y": 64, "flags": 4}, - {"matrix": [4, 14], "x": 224, "y": 64, "flags": 4} - ] - }, - "url": "", - "usb": { - "device_version": "0.0.1", - "force_nkro": true, - "pid": "0xE463", - "suspend_wakeup_delay": 1000, - "vid": "0x342D" - }, - "ws2812": { - "pin": "B15" - }, - "layouts": { - "LAYOUT": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, - {"matrix": [0, 6], "x": 6, "y": 0}, - {"matrix": [0, 7], "x": 7, "y": 0}, - {"matrix": [0, 8], "x": 8, "y": 0}, - {"matrix": [0, 9], "x": 9, "y": 0}, - {"matrix": [0, 10], "x": 10, "y": 0}, - {"matrix": [0, 11], "x": 11, "y": 0}, - {"matrix": [0, 12], "x": 12, "y": 0}, - {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, - {"matrix": [0, 14], "x": 15, "y": 0}, - {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, - {"matrix": [1, 1], "x": 1.5, "y": 1}, - {"matrix": [1, 2], "x": 2.5, "y": 1}, - {"matrix": [1, 3], "x": 3.5, "y": 1}, - {"matrix": [1, 4], "x": 4.5, "y": 1}, - {"matrix": [1, 5], "x": 5.5, "y": 1}, - {"matrix": [1, 6], "x": 6.5, "y": 1}, - {"matrix": [1, 7], "x": 7.5, "y": 1}, - {"matrix": [1, 8], "x": 8.5, "y": 1}, - {"matrix": [1, 9], "x": 9.5, "y": 1}, - {"matrix": [1, 10], "x": 10.5, "y": 1}, - {"matrix": [1, 11], "x": 11.5, "y": 1}, - {"matrix": [1, 12], "x": 12.5, "y": 1}, - {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, - {"matrix": [1, 14], "x": 15, "y": 1.25}, - {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, - {"matrix": [2, 1], "x": 1.75, "y": 2}, - {"matrix": [2, 2], "x": 2.75, "y": 2}, - {"matrix": [2, 3], "x": 3.75, "y": 2}, - {"matrix": [2, 4], "x": 4.75, "y": 2}, - {"matrix": [2, 5], "x": 5.75, "y": 2}, - {"matrix": [2, 6], "x": 6.75, "y": 2}, - {"matrix": [2, 7], "x": 7.75, "y": 2}, - {"matrix": [2, 8], "x": 8.75, "y": 2}, - {"matrix": [2, 9], "x": 9.75, "y": 2}, - {"matrix": [2, 10], "x": 10.75, "y": 2}, - {"matrix": [2, 11], "x": 11.75, "y": 2}, - {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 1.75}, - {"matrix": [2, 14], "x": 15, "y": 2.25}, - {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, - {"matrix": [3, 1], "x": 2.25, "y": 3}, - {"matrix": [3, 2], "x": 3.25, "y": 3}, - {"matrix": [3, 3], "x": 4.25, "y": 3}, - {"matrix": [3, 4], "x": 5.25, "y": 3}, - {"matrix": [3, 5], "x": 6.25, "y": 3}, - {"matrix": [3, 6], "x": 7.25, "y": 3}, - {"matrix": [3, 7], "x": 8.25, "y": 3}, - {"matrix": [3, 8], "x": 9.25, "y": 3}, - {"matrix": [3, 9], "x": 10.25, "y": 3}, - {"matrix": [3, 11], "x": 11.25, "y": 3}, - {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, - {"matrix": [3, 13], "x": 14, "y": 3}, - {"matrix": [3, 14], "x": 15, "y": 3}, - {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, - {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, - {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, - {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25}, - {"matrix": [4, 5], "x": 6, "y": 3.75, "w": 1.25}, - {"matrix": [4, 4], "x": 6, "y": 4, "w": 1.25}, - {"matrix": [4, 6], "x": 7.25, "y": 4, "w": 2.75}, - {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, - {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, - {"matrix": [4, 12], "x": 13, "y": 4}, - {"matrix": [4, 13], "x": 14, "y": 4}, - {"matrix": [4, 14], "x": 15, "y": 4} - ] - } - } -} diff --git a/keyboards/epomaker/tide65/keyboard.json b/keyboards/epomaker/tide65/keyboard.json new file mode 100644 index 0000000000..2715b923f4 --- /dev/null +++ b/keyboards/epomaker/tide65/keyboard.json @@ -0,0 +1,231 @@ +{ + "manufacturer": "HS", + "keyboard_name": "EPOMAKER TIDE 65", + "maintainer": "sdk66", + "bootloader": "wb32-dfu", + "diode_direction": "ROW2COL", + "encoder": { + "rotary": [ + {"pin_a": "B7", "pin_b": "B6"} + ] + }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "matrix_pins": { + "cols": ["C0", "C1", "C2", "C3", "A6", "B10", "B11", "B12", "B13", "B14", "A10", "C6", "C7", "C8", "C9"], + "rows": ["A1", "A2", "A3", "A4", "C13"] + }, + "processor": "WB32FQ95", + "rgb_matrix": { + "animations": { + "alphas_mods": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_sat": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "band_val": true, + "breathing": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "cycle_up_down": true, + "digital_rain": true, + "dual_beacon": true, + "gradient_left_right": true, + "gradient_up_down": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "jellybean_raindrops": true, + "multisplash": true, + "pixel_flow": true, + "pixel_fractal": true, + "pixel_rain": true, + "rainbow_beacon": true, + "rainbow_moving_chevron": true, + "rainbow_pinwheels": true, + "raindrops": true, + "solid_multisplash": true, + "solid_reactive": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_multinexus": true, + "solid_reactive_multiwide": true, + "solid_reactive_nexus": true, + "solid_reactive_simple": true, + "solid_reactive_wide": true, + "solid_splash": true, + "splash": true, + "typing_heatmap": true + }, + "driver": "ws2812", + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, + {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4}, + {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4}, + {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4}, + {"matrix": [0, 4], "x": 64, "y": 0, "flags": 4}, + {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4}, + {"matrix": [0, 6], "x": 96, "y": 0, "flags": 4}, + {"matrix": [0, 7], "x": 112, "y": 0, "flags": 4}, + {"matrix": [0, 8], "x": 128, "y": 0, "flags": 4}, + {"matrix": [0, 9], "x": 144, "y": 0, "flags": 4}, + {"matrix": [0, 10], "x": 160, "y": 0, "flags": 4}, + {"matrix": [0, 11], "x": 176, "y": 0, "flags": 4}, + {"matrix": [0, 12], "x": 192, "y": 0, "flags": 4}, + {"matrix": [0, 13], "x": 208, "y": 0, "flags": 4}, + {"matrix": [1, 0], "x": 0, "y": 16, "flags": 4}, + {"matrix": [1, 1], "x": 16, "y": 16, "flags": 4}, + {"matrix": [1, 2], "x": 32, "y": 16, "flags": 4}, + {"matrix": [1, 3], "x": 48, "y": 16, "flags": 4}, + {"matrix": [1, 4], "x": 64, "y": 16, "flags": 4}, + {"matrix": [1, 5], "x": 80, "y": 16, "flags": 4}, + {"matrix": [1, 6], "x": 96, "y": 16, "flags": 4}, + {"matrix": [1, 7], "x": 112, "y": 16, "flags": 4}, + {"matrix": [1, 8], "x": 128, "y": 16, "flags": 4}, + {"matrix": [1, 9], "x": 144, "y": 16, "flags": 4}, + {"matrix": [1, 10], "x": 160, "y": 16, "flags": 4}, + {"matrix": [1, 11], "x": 176, "y": 16, "flags": 4}, + {"matrix": [1, 12], "x": 192, "y": 16, "flags": 4}, + {"matrix": [1, 13], "x": 208, "y": 16, "flags": 4}, + {"matrix": [1, 14], "x": 224, "y": 16, "flags": 4}, + {"matrix": [2, 0], "x": 0, "y": 32, "flags": 4}, + {"matrix": [2, 1], "x": 16, "y": 32, "flags": 4}, + {"matrix": [2, 2], "x": 32, "y": 32, "flags": 4}, + {"matrix": [2, 3], "x": 48, "y": 32, "flags": 4}, + {"matrix": [2, 4], "x": 64, "y": 32, "flags": 4}, + {"matrix": [2, 5], "x": 80, "y": 32, "flags": 4}, + {"matrix": [2, 6], "x": 96, "y": 32, "flags": 4}, + {"matrix": [2, 7], "x": 112, "y": 32, "flags": 4}, + {"matrix": [2, 8], "x": 128, "y": 32, "flags": 4}, + {"matrix": [2, 9], "x": 144, "y": 32, "flags": 4}, + {"matrix": [2, 10], "x": 160, "y": 32, "flags": 4}, + {"matrix": [2, 11], "x": 176, "y": 32, "flags": 4}, + {"matrix": [2, 13], "x": 208, "y": 32, "flags": 4}, + {"matrix": [2, 14], "x": 224, "y": 32, "flags": 4}, + {"matrix": [3, 0], "x": 0, "y": 48, "flags": 4}, + {"matrix": [3, 1], "x": 16, "y": 48, "flags": 4}, + {"matrix": [3, 2], "x": 32, "y": 48, "flags": 4}, + {"matrix": [3, 3], "x": 48, "y": 48, "flags": 4}, + {"matrix": [3, 4], "x": 64, "y": 48, "flags": 4}, + {"matrix": [3, 5], "x": 80, "y": 48, "flags": 4}, + {"matrix": [3, 6], "x": 96, "y": 48, "flags": 4}, + {"matrix": [3, 7], "x": 112, "y": 48, "flags": 4}, + {"matrix": [3, 8], "x": 128, "y": 48, "flags": 4}, + {"matrix": [3, 9], "x": 144, "y": 48, "flags": 4}, + {"matrix": [3, 11], "x": 176, "y": 48, "flags": 4}, + {"matrix": [3, 12], "x": 192, "y": 48, "flags": 4}, + {"matrix": [3, 13], "x": 208, "y": 48, "flags": 4}, + {"matrix": [3, 14], "x": 224, "y": 48, "flags": 4}, + {"matrix": [4, 0], "x": 0, "y": 64, "flags": 4}, + {"matrix": [4, 1], "x": 16, "y": 64, "flags": 4}, + {"matrix": [4, 2], "x": 32, "y": 64, "flags": 4}, + {"matrix": [4, 3], "x": 48, "y": 64, "flags": 4}, + {"matrix": [4, 4], "x": 64, "y": 64, "flags": 4}, + {"matrix": [4, 5], "x": 80, "y": 64, "flags": 4}, + {"matrix": [4, 6], "x": 96, "y": 64, "flags": 4}, + {"matrix": [4, 9], "x": 144, "y": 64, "flags": 4}, + {"matrix": [4, 11], "x": 176, "y": 64, "flags": 4}, + {"matrix": [4, 12], "x": 192, "y": 64, "flags": 4}, + {"matrix": [4, 13], "x": 208, "y": 64, "flags": 4}, + {"matrix": [4, 14], "x": 224, "y": 64, "flags": 4} + ] + }, + "url": "", + "usb": { + "device_version": "0.0.1", + "force_nkro": true, + "pid": "0xE463", + "suspend_wakeup_delay": 1000, + "vid": "0x342D" + }, + "ws2812": { + "pin": "B15" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 14], "x": 15, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 1.75}, + {"matrix": [2, 14], "x": 15, "y": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25}, + {"matrix": [4, 5], "x": 6, "y": 3.75, "w": 1.25}, + {"matrix": [4, 4], "x": 6, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 7.25, "y": 4, "w": 2.75}, + {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} + ] + } + } +} diff --git a/keyboards/epomaker/tide65/rules.mk b/keyboards/epomaker/tide65/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/epomaker/tide65/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keyten/lisa/info.json b/keyboards/keyten/lisa/info.json deleted file mode 100644 index deac0f3740..0000000000 --- a/keyboards/keyten/lisa/info.json +++ /dev/null @@ -1,81 +0,0 @@ -{ - "manufacturer": "keyten", - "keyboard_name": "Lisa", - "maintainer": "key10iq", - "bootloader": "stm32-dfu", - "diode_direction": "COL2ROW", - "features": { - "bootmagic": true, - "command": false, - "console": false, - "extrakey": true, - "mousekey": true, - "nkro": true - }, - "matrix_pins": { - "cols": ["B7", "B6", "B5", "B4", "B3", "A15", "A3", "A4", "A5", "A6", "A7", "B0", "B1"], - "rows": ["B13", "B15", "B14", "A8"] - }, - "indicators": { - "caps_lock": "B10", - "num_lock": "B11" - } - "processor": "STM32F072", - "usb": { - "vid": "0xEB69", - "pid": "0x4001", - "device_version": "0.0.1" - }, - "layouts": { - "LAYOUT": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, - {"matrix": [0, 6], "x": 7.5, "y": 0}, - {"matrix": [0, 7], "x": 8.5, "y": 0}, - {"matrix": [0, 8], "x": 9.5, "y": 0}, - {"matrix": [0, 9], "x": 10.5, "y": 0}, - {"matrix": [0, 10], "x": 11.5, "y": 0}, - {"matrix": [0, 11], "x": 12.5, "y": 0}, - {"matrix": [0, 12], "x": 13.5, "y": 0}, - {"matrix": [1, 0], "w": 1.25, "x": 0, "y": 1}, - {"matrix": [1, 1], "x": 1.25, "y": 1}, - {"matrix": [1, 2], "x": 2.25, "y": 1}, - {"matrix": [1, 3], "x": 3.25, "y": 1}, - {"matrix": [1, 4], "x": 4.25, "y": 1}, - {"matrix": [1, 5], "x": 5.25, "y": 1}, - {"matrix": [1, 6], "x": 7.75, "y": 1}, - {"matrix": [1, 7], "x": 8.75, "y": 1}, - {"matrix": [1, 8], "x": 9.75, "y": 1}, - {"matrix": [1, 9], "x": 10.75, "y": 1}, - {"matrix": [1, 10], "x": 11.75, "y": 1}, - {"matrix": [1, 12], "w": 1.75, "x": 12.75, "y": 1}, - {"matrix": [2, 0], "w": 1.75, "x": 0, "y": 2}, - {"matrix": [2, 1], "x": 1.75, "y": 2}, - {"matrix": [2, 2], "x": 2.75, "y": 2}, - {"matrix": [2, 3], "x": 3.75, "y": 2}, - {"matrix": [2, 4], "x": 4.75, "y": 2}, - {"matrix": [2, 5], "x": 5.75, "y": 2}, - {"matrix": [2, 6], "x": 7.25, "y": 2}, - {"matrix": [2, 7], "x": 8.25, "y": 2}, - {"matrix": [2, 8], "x": 9.25, "y": 2}, - {"matrix": [2, 9], "x": 10.25, "y": 2}, - {"matrix": [2, 10], "x": 11.25, "y": 2}, - {"matrix": [2, 11], "x": 12.25, "y": 2}, - {"matrix": [2, 12], "w": 1.25, "x": 13.25, "y": 2}, - {"matrix": [3, 0], "w": 1.25, "x": 0, "y": 3}, - {"matrix": [3, 1], "w": 1.25, "x": 1.25, "y": 3}, - {"matrix": [3, 3], "w": 1.25, "x": 3.5, "y": 3}, - {"matrix": [3, 5], "w": 2, "x": 4.75, "y": 3}, - {"matrix": [3, 6], "w": 2.25, "x": 7.25, "y": 3}, - {"matrix": [3, 8], "w": 1.25, "x": 9.5, "y": 3}, - {"matrix": [3, 11], "w": 1.25, "x": 12, "y": 3}, - {"matrix": [3, 12], "w": 1.25, "x": 13.25, "y": 3} - ] - } - } -} diff --git a/keyboards/keyten/lisa/keyboard.json b/keyboards/keyten/lisa/keyboard.json new file mode 100644 index 0000000000..deac0f3740 --- /dev/null +++ b/keyboards/keyten/lisa/keyboard.json @@ -0,0 +1,81 @@ +{ + "manufacturer": "keyten", + "keyboard_name": "Lisa", + "maintainer": "key10iq", + "bootloader": "stm32-dfu", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "cols": ["B7", "B6", "B5", "B4", "B3", "A15", "A3", "A4", "A5", "A6", "A7", "B0", "B1"], + "rows": ["B13", "B15", "B14", "A8"] + }, + "indicators": { + "caps_lock": "B10", + "num_lock": "B11" + } + "processor": "STM32F072", + "usb": { + "vid": "0xEB69", + "pid": "0x4001", + "device_version": "0.0.1" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 7.5, "y": 0}, + {"matrix": [0, 7], "x": 8.5, "y": 0}, + {"matrix": [0, 8], "x": 9.5, "y": 0}, + {"matrix": [0, 9], "x": 10.5, "y": 0}, + {"matrix": [0, 10], "x": 11.5, "y": 0}, + {"matrix": [0, 11], "x": 12.5, "y": 0}, + {"matrix": [0, 12], "x": 13.5, "y": 0}, + {"matrix": [1, 0], "w": 1.25, "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 7.75, "y": 1}, + {"matrix": [1, 7], "x": 8.75, "y": 1}, + {"matrix": [1, 8], "x": 9.75, "y": 1}, + {"matrix": [1, 9], "x": 10.75, "y": 1}, + {"matrix": [1, 10], "x": 11.75, "y": 1}, + {"matrix": [1, 12], "w": 1.75, "x": 12.75, "y": 1}, + {"matrix": [2, 0], "w": 1.75, "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 7.25, "y": 2}, + {"matrix": [2, 7], "x": 8.25, "y": 2}, + {"matrix": [2, 8], "x": 9.25, "y": 2}, + {"matrix": [2, 9], "x": 10.25, "y": 2}, + {"matrix": [2, 10], "x": 11.25, "y": 2}, + {"matrix": [2, 11], "x": 12.25, "y": 2}, + {"matrix": [2, 12], "w": 1.25, "x": 13.25, "y": 2}, + {"matrix": [3, 0], "w": 1.25, "x": 0, "y": 3}, + {"matrix": [3, 1], "w": 1.25, "x": 1.25, "y": 3}, + {"matrix": [3, 3], "w": 1.25, "x": 3.5, "y": 3}, + {"matrix": [3, 5], "w": 2, "x": 4.75, "y": 3}, + {"matrix": [3, 6], "w": 2.25, "x": 7.25, "y": 3}, + {"matrix": [3, 8], "w": 1.25, "x": 9.5, "y": 3}, + {"matrix": [3, 11], "w": 1.25, "x": 12, "y": 3}, + {"matrix": [3, 12], "w": 1.25, "x": 13.25, "y": 3} + ] + } + } +} diff --git a/keyboards/keyten/lisa/rules.mk b/keyboards/keyten/lisa/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/keyboards/maple_computing/jnao/config.h b/keyboards/maple_computing/jnao/config.h deleted file mode 100644 index c2949ab3a7..0000000000 --- a/keyboards/maple_computing/jnao/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2012 Jun Wako - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - diff --git a/keyboards/maple_computing/jnao/info.json b/keyboards/maple_computing/jnao/info.json deleted file mode 100644 index 861baa95b9..0000000000 --- a/keyboards/maple_computing/jnao/info.json +++ /dev/null @@ -1,156 +0,0 @@ -{ - "keyboard_name": "JNAO", - "manufacturer": "Maple Computing", - "url": "", - "maintainer": "That-Canadian", - "usb": { - "vid": "0x1337", - "pid": "0x6017", - "device_version": "0.0.1" - }, - "matrix_pins": { - "cols": ["F1", "F4", "B1", "B2", "B3", "B7", "D1", "D2", "D4", "D6", "D7", "B4"], - "rows": ["E6", "F0", "F5", "F6", "F7"] - }, - "diode_direction": "COL2ROW", - "backlight": { - "driver": "timer", - "pin": "D0" - }, - "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": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, - {"matrix": [0, 6], "x": 6, "y": 0}, - {"matrix": [0, 7], "x": 7, "y": 0}, - {"matrix": [0, 8], "x": 8, "y": 0}, - {"matrix": [0, 9], "x": 9, "y": 0}, - {"matrix": [0, 10], "x": 10, "y": 0}, - {"matrix": [0, 11], "x": 11, "y": 0}, - - {"matrix": [1, 0], "x": 0, "y": 1}, - {"matrix": [1, 1], "x": 1, "y": 1}, - {"matrix": [1, 2], "x": 2, "y": 1}, - {"matrix": [1, 3], "x": 3, "y": 1}, - {"matrix": [1, 4], "x": 4, "y": 1}, - {"matrix": [1, 5], "x": 5, "y": 1}, - {"matrix": [1, 6], "x": 6, "y": 1}, - {"matrix": [1, 7], "x": 7, "y": 1}, - {"matrix": [1, 8], "x": 8, "y": 1}, - {"matrix": [1, 9], "x": 9, "y": 1}, - {"matrix": [1, 10], "x": 10, "y": 1}, - {"matrix": [1, 11], "x": 11, "y": 1}, - - {"matrix": [2, 0], "x": 0, "y": 2}, - {"matrix": [2, 1], "x": 1, "y": 2}, - {"matrix": [2, 2], "x": 2, "y": 2}, - {"matrix": [2, 3], "x": 3, "y": 2}, - {"matrix": [2, 4], "x": 4, "y": 2}, - {"matrix": [2, 5], "x": 5, "y": 2}, - {"matrix": [2, 6], "x": 6, "y": 2}, - {"matrix": [2, 7], "x": 7, "y": 2}, - {"matrix": [2, 8], "x": 8, "y": 2}, - {"matrix": [2, 9], "x": 9, "y": 2}, - {"matrix": [2, 10], "x": 10, "y": 2}, - {"matrix": [2, 11], "x": 11, "y": 2}, - - {"matrix": [3, 0], "x": 0, "y": 3}, - {"matrix": [3, 1], "x": 1, "y": 3}, - {"matrix": [3, 2], "x": 2, "y": 3}, - {"matrix": [3, 3], "x": 3, "y": 3}, - {"matrix": [3, 4], "x": 4, "y": 3}, - {"matrix": [3, 5], "x": 5, "y": 3}, - {"matrix": [3, 6], "x": 6, "y": 3}, - {"matrix": [3, 7], "x": 7, "y": 3}, - {"matrix": [3, 8], "x": 8, "y": 3}, - {"matrix": [3, 9], "x": 9, "y": 3}, - {"matrix": [3, 10], "x": 10, "y": 3}, - {"matrix": [3, 11], "x": 11, "y": 3}, - - {"matrix": [4, 0], "x": 0, "y": 4}, - {"matrix": [4, 1], "x": 1, "y": 4}, - {"matrix": [4, 2], "x": 2, "y": 4}, - {"matrix": [4, 3], "x": 3, "y": 4}, - {"matrix": [4, 4], "x": 4, "y": 4}, - {"matrix": [4, 5], "x": 5, "y": 4}, - {"matrix": [4, 6], "x": 6, "y": 4}, - {"matrix": [4, 7], "x": 7, "y": 4}, - {"matrix": [4, 8], "x": 8, "y": 4}, - {"matrix": [4, 9], "x": 9, "y": 4}, - {"matrix": [4, 10], "x": 10, "y": 4}, - {"matrix": [4, 11], "x": 11, "y": 4} - ] - }, - "LAYOUT_ortho_4x12": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, - {"matrix": [0, 6], "x": 6, "y": 0}, - {"matrix": [0, 7], "x": 7, "y": 0}, - {"matrix": [0, 8], "x": 8, "y": 0}, - {"matrix": [0, 9], "x": 9, "y": 0}, - {"matrix": [0, 10], "x": 10, "y": 0}, - {"matrix": [0, 11], "x": 11, "y": 0}, - - {"matrix": [1, 0], "x": 0, "y": 1}, - {"matrix": [1, 1], "x": 1, "y": 1}, - {"matrix": [1, 2], "x": 2, "y": 1}, - {"matrix": [1, 3], "x": 3, "y": 1}, - {"matrix": [1, 4], "x": 4, "y": 1}, - {"matrix": [1, 5], "x": 5, "y": 1}, - {"matrix": [1, 6], "x": 6, "y": 1}, - {"matrix": [1, 7], "x": 7, "y": 1}, - {"matrix": [1, 8], "x": 8, "y": 1}, - {"matrix": [1, 9], "x": 9, "y": 1}, - {"matrix": [1, 10], "x": 10, "y": 1}, - {"matrix": [1, 11], "x": 11, "y": 1}, - - {"matrix": [2, 0], "x": 0, "y": 2}, - {"matrix": [2, 1], "x": 1, "y": 2}, - {"matrix": [2, 2], "x": 2, "y": 2}, - {"matrix": [2, 3], "x": 3, "y": 2}, - {"matrix": [2, 4], "x": 4, "y": 2}, - {"matrix": [2, 5], "x": 5, "y": 2}, - {"matrix": [2, 6], "x": 6, "y": 2}, - {"matrix": [2, 7], "x": 7, "y": 2}, - {"matrix": [2, 8], "x": 8, "y": 2}, - {"matrix": [2, 9], "x": 9, "y": 2}, - {"matrix": [2, 10], "x": 10, "y": 2}, - {"matrix": [2, 11], "x": 11, "y": 2}, - - {"matrix": [3, 0], "x": 0, "y": 3}, - {"matrix": [3, 1], "x": 1, "y": 3}, - {"matrix": [3, 2], "x": 2, "y": 3}, - {"matrix": [3, 3], "x": 3, "y": 3}, - {"matrix": [3, 4], "x": 4, "y": 3}, - {"matrix": [3, 5], "x": 5, "y": 3}, - {"matrix": [3, 6], "x": 6, "y": 3}, - {"matrix": [3, 7], "x": 7, "y": 3}, - {"matrix": [3, 8], "x": 8, "y": 3}, - {"matrix": [3, 9], "x": 9, "y": 3}, - {"matrix": [3, 10], "x": 10, "y": 3}, - {"matrix": [3, 11], "x": 11, "y": 3} - ] - } - } -} diff --git a/keyboards/maple_computing/jnao/keyboard.json b/keyboards/maple_computing/jnao/keyboard.json new file mode 100644 index 0000000000..97b51a7680 --- /dev/null +++ b/keyboards/maple_computing/jnao/keyboard.json @@ -0,0 +1,162 @@ +{ + "keyboard_name": "JNAO", + "manufacturer": "Maple Computing", + "url": "", + "maintainer": "That-Canadian", + "usb": { + "vid": "0x1337", + "pid": "0x6017", + "device_version": "0.0.1" + }, + "matrix_pins": { + "cols": ["F1", "F4", "B1", "B2", "B3", "B7", "D1", "D2", "D4", "D6", "D7", "B4"], + "rows": ["E6", "F0", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", + "backlight": { + "driver": "timer", + "pin": "D0" + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "console": true, + "command": true, + "backlight": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, + "community_layouts": ["ortho_5x12", "ortho_4x12"], + "layouts": { + "LAYOUT_ortho_5x12": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4}, + {"matrix": [4, 6], "x": 6, "y": 4}, + {"matrix": [4, 7], "x": 7, "y": 4}, + {"matrix": [4, 8], "x": 8, "y": 4}, + {"matrix": [4, 9], "x": 9, "y": 4}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4} + ] + }, + "LAYOUT_ortho_4x12": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3} + ] + } + } +} diff --git a/keyboards/maple_computing/lets_split_eh/eh/eh.c b/keyboards/maple_computing/lets_split_eh/eh/eh.c new file mode 100644 index 0000000000..37e8b3ab9b --- /dev/null +++ b/keyboards/maple_computing/lets_split_eh/eh/eh.c @@ -0,0 +1,16 @@ +#include "quantum.h" + +#ifdef SWAP_HANDS_ENABLE +__attribute__ ((weak)) +const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = { + + {{0, 4}, {1, 4}, {2, 4}, {3, 4}, {4, 4}, {5, 4}}, + {{0, 5}, {1, 5}, {2, 5}, {3, 5}, {4, 5}, {5, 5}}, + {{0, 6}, {1, 6}, {2, 6}, {3, 6}, {4, 6}, {5, 6}}, + {{0, 7}, {1, 7}, {2, 7}, {3, 7}, {4, 7}, {5, 7}}, + {{0, 0}, {1, 0}, {2, 0}, {3, 0}, {4, 0}, {5, 0}}, + {{0, 1}, {1, 1}, {2, 1}, {3, 1}, {4, 1}, {5, 1}}, + {{0, 2}, {1, 2}, {2, 2}, {3, 2}, {4, 2}, {5, 2}}, + {{0, 3}, {1, 3}, {2, 3}, {3, 3}, {4, 3}, {5, 3}}, +}; +#endif diff --git a/keyboards/maple_computing/lets_split_eh/eh/info.json b/keyboards/maple_computing/lets_split_eh/eh/info.json deleted file mode 100644 index f40b15098f..0000000000 --- a/keyboards/maple_computing/lets_split_eh/eh/info.json +++ /dev/null @@ -1,117 +0,0 @@ -{ - "keyboard_name": "Lets Split Eh?", - "manufacturer": "That-Canadian", - "url": "", - "maintainer": "qmk", - "usb": { - "vid": "0xFEED", - "pid": "0xE401", - "device_version": "1.0.0" - }, - "matrix_pins": { - "cols": ["F4", "F5", "C6", "B6", "B5", "D5"], - "rows": ["B1", "B3", "D7", "B4"] - }, - "diode_direction": "COL2ROW", - "backlight": { - "pin": "B7" - }, - "rgblight": { - "led_count": 12, - "split_count": [6, 6], - "animations": { - "breathing": true, - "rainbow_mood": true, - "rainbow_swirl": true, - "snake": true, - "knight": true, - "christmas": true, - "static_gradient": true, - "rgb_test": true, - "alternating": true, - "twinkle": true - } - }, - "ws2812": { - "pin": "B2" - }, - "split": { - "enabled": true, - "soft_serial_pin": "D0" - }, - "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" - }, - "layouts": { - "LAYOUT_ortho_4x12": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, - - {"matrix": [4, 0], "x": 7, "y": 0}, - {"matrix": [4, 1], "x": 8, "y": 0}, - {"matrix": [4, 2], "x": 9, "y": 0}, - {"matrix": [4, 3], "x": 10, "y": 0}, - {"matrix": [4, 4], "x": 11, "y": 0}, - {"matrix": [4, 5], "x": 12, "y": 0}, - - {"matrix": [1, 0], "x": 0, "y": 1}, - {"matrix": [1, 1], "x": 1, "y": 1}, - {"matrix": [1, 2], "x": 2, "y": 1}, - {"matrix": [1, 3], "x": 3, "y": 1}, - {"matrix": [1, 4], "x": 4, "y": 1}, - {"matrix": [1, 5], "x": 5, "y": 1}, - - {"matrix": [5, 0], "x": 7, "y": 1}, - {"matrix": [5, 1], "x": 8, "y": 1}, - {"matrix": [5, 2], "x": 9, "y": 1}, - {"matrix": [5, 3], "x": 10, "y": 1}, - {"matrix": [5, 4], "x": 11, "y": 1}, - {"matrix": [5, 5], "x": 12, "y": 1}, - - {"matrix": [2, 0], "x": 0, "y": 2}, - {"matrix": [2, 1], "x": 1, "y": 2}, - {"matrix": [2, 2], "x": 2, "y": 2}, - {"matrix": [2, 3], "x": 3, "y": 2}, - {"matrix": [2, 4], "x": 4, "y": 2}, - {"matrix": [2, 5], "x": 5, "y": 2}, - - {"matrix": [6, 0], "x": 7, "y": 2}, - {"matrix": [6, 1], "x": 8, "y": 2}, - {"matrix": [6, 2], "x": 9, "y": 2}, - {"matrix": [6, 3], "x": 10, "y": 2}, - {"matrix": [6, 4], "x": 11, "y": 2}, - {"matrix": [6, 5], "x": 12, "y": 2}, - - {"matrix": [3, 0], "x": 0, "y": 3}, - {"matrix": [3, 1], "x": 1, "y": 3}, - {"matrix": [3, 2], "x": 2, "y": 3}, - {"matrix": [3, 3], "x": 3, "y": 3}, - {"matrix": [3, 4], "x": 4, "y": 3}, - {"matrix": [3, 5], "x": 5, "y": 3}, - - {"matrix": [7, 0], "x": 7, "y": 3}, - {"matrix": [7, 1], "x": 8, "y": 3}, - {"matrix": [7, 2], "x": 9, "y": 3}, - {"matrix": [7, 3], "x": 10, "y": 3}, - {"matrix": [7, 4], "x": 11, "y": 3}, - {"matrix": [7, 5], "x": 12, "y": 3} - ] - } - } -} diff --git a/keyboards/maple_computing/lets_split_eh/eh/keyboard.json b/keyboards/maple_computing/lets_split_eh/eh/keyboard.json new file mode 100644 index 0000000000..f40b15098f --- /dev/null +++ b/keyboards/maple_computing/lets_split_eh/eh/keyboard.json @@ -0,0 +1,117 @@ +{ + "keyboard_name": "Lets Split Eh?", + "manufacturer": "That-Canadian", + "url": "", + "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0xE401", + "device_version": "1.0.0" + }, + "matrix_pins": { + "cols": ["F4", "F5", "C6", "B6", "B5", "D5"], + "rows": ["B1", "B3", "D7", "B4"] + }, + "diode_direction": "COL2ROW", + "backlight": { + "pin": "B7" + }, + "rgblight": { + "led_count": 12, + "split_count": [6, 6], + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } + }, + "ws2812": { + "pin": "B2" + }, + "split": { + "enabled": true, + "soft_serial_pin": "D0" + }, + "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" + }, + "layouts": { + "LAYOUT_ortho_4x12": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + + {"matrix": [4, 0], "x": 7, "y": 0}, + {"matrix": [4, 1], "x": 8, "y": 0}, + {"matrix": [4, 2], "x": 9, "y": 0}, + {"matrix": [4, 3], "x": 10, "y": 0}, + {"matrix": [4, 4], "x": 11, "y": 0}, + {"matrix": [4, 5], "x": 12, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + + {"matrix": [5, 0], "x": 7, "y": 1}, + {"matrix": [5, 1], "x": 8, "y": 1}, + {"matrix": [5, 2], "x": 9, "y": 1}, + {"matrix": [5, 3], "x": 10, "y": 1}, + {"matrix": [5, 4], "x": 11, "y": 1}, + {"matrix": [5, 5], "x": 12, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + + {"matrix": [6, 0], "x": 7, "y": 2}, + {"matrix": [6, 1], "x": 8, "y": 2}, + {"matrix": [6, 2], "x": 9, "y": 2}, + {"matrix": [6, 3], "x": 10, "y": 2}, + {"matrix": [6, 4], "x": 11, "y": 2}, + {"matrix": [6, 5], "x": 12, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + + {"matrix": [7, 0], "x": 7, "y": 3}, + {"matrix": [7, 1], "x": 8, "y": 3}, + {"matrix": [7, 2], "x": 9, "y": 3}, + {"matrix": [7, 3], "x": 10, "y": 3}, + {"matrix": [7, 4], "x": 11, "y": 3}, + {"matrix": [7, 5], "x": 12, "y": 3} + ] + } + } +} diff --git a/keyboards/maple_computing/lets_split_eh/lets_split_eh.c b/keyboards/maple_computing/lets_split_eh/lets_split_eh.c deleted file mode 100644 index 37e8b3ab9b..0000000000 --- a/keyboards/maple_computing/lets_split_eh/lets_split_eh.c +++ /dev/null @@ -1,16 +0,0 @@ -#include "quantum.h" - -#ifdef SWAP_HANDS_ENABLE -__attribute__ ((weak)) -const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = { - - {{0, 4}, {1, 4}, {2, 4}, {3, 4}, {4, 4}, {5, 4}}, - {{0, 5}, {1, 5}, {2, 5}, {3, 5}, {4, 5}, {5, 5}}, - {{0, 6}, {1, 6}, {2, 6}, {3, 6}, {4, 6}, {5, 6}}, - {{0, 7}, {1, 7}, {2, 7}, {3, 7}, {4, 7}, {5, 7}}, - {{0, 0}, {1, 0}, {2, 0}, {3, 0}, {4, 0}, {5, 0}}, - {{0, 1}, {1, 1}, {2, 1}, {3, 1}, {4, 1}, {5, 1}}, - {{0, 2}, {1, 2}, {2, 2}, {3, 2}, {4, 2}, {5, 2}}, - {{0, 3}, {1, 3}, {2, 3}, {3, 3}, {4, 3}, {5, 3}}, -}; -#endif diff --git a/keyboards/marksard/treadstone48/rev2/info.json b/keyboards/marksard/treadstone48/rev2/info.json deleted file mode 100644 index 56346d080a..0000000000 --- a/keyboards/marksard/treadstone48/rev2/info.json +++ /dev/null @@ -1,101 +0,0 @@ -{ - "keyboard_name": "Treadstone48", - "manufacturer": "marksard", - "url": "https://github.com/marksard/Keyboards", - "maintainer": "marksard", - "usb": { - "vid": "0xFEED", - "pid": "0xDFA3", - "device_version": "0.2.0" - }, - "ws2812": { - "pin": "D3" - }, - "rgblight": { - "saturation_steps": 8, - "brightness_steps": 8, - "led_count": 12, - "max_brightness": 220, - "sleep": true, - "animations": { - "rainbow_mood": true, - "rainbow_swirl": true, - "knight": true, - "static_gradient": true - } - }, - "matrix_pins": { - "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], - "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"] - }, - "diode_direction": "COL2ROW", - "processor": "atmega32u4", - "bootloader": "caterina", - "features": { - "bootmagic": false, - "mousekey": true, - "extrakey": false, - "rgblight": true, - "oled": true - }, - "layout_aliases": { - "LAYOUT_full": "LAYOUT_base" - }, - "layouts": { - "LAYOUT_base": { - "layout": [ - {"matrix": [4, 5], "x": 1, "y": 0}, - {"matrix": [4, 4], "x": 2.25, "y": 0}, - {"matrix": [4, 3], "x": 3.25, "y": 0}, - {"matrix": [4, 2], "x": 4.25, "y": 0}, - {"matrix": [4, 1], "x": 5.25, "y": 0}, - {"matrix": [4, 0], "x": 6.25, "y": 0}, - {"matrix": [0, 5], "x": 7.75, "y": 0}, - {"matrix": [0, 4], "x": 8.75, "y": 0}, - {"matrix": [0, 3], "x": 9.75, "y": 0}, - {"matrix": [0, 2], "x": 10.75, "y": 0}, - {"matrix": [0, 1], "x": 11.75, "y": 0}, - {"matrix": [0, 0], "x": 12.75, "y": 0, "w": 2}, - - {"matrix": [5, 5], "x": 1, "y": 1, "w": 1.5}, - {"matrix": [5, 4], "x": 2.5, "y": 1}, - {"matrix": [5, 3], "x": 3.5, "y": 1}, - {"matrix": [5, 2], "x": 4.5, "y": 1}, - {"matrix": [5, 1], "x": 5.5, "y": 1}, - {"matrix": [5, 0], "x": 6.5, "y": 1}, - {"matrix": [1, 5], "x": 7.5, "y": 1}, - {"matrix": [1, 4], "x": 8.5, "y": 1}, - {"matrix": [1, 3], "x": 9.5, "y": 1}, - {"matrix": [1, 2], "x": 10.5, "y": 1}, - {"matrix": [1, 1], "x": 11.5, "y": 1}, - {"matrix": [1, 0], "x": 12.5, "y": 1, "w": 2.25}, - - {"matrix": [6, 5], "x": 0, "y": 2, "w": 2.25}, - {"matrix": [6, 4], "x": 2.25, "y": 2}, - {"matrix": [6, 3], "x": 3.25, "y": 2}, - {"matrix": [6, 2], "x": 4.25, "y": 2}, - {"matrix": [6, 1], "x": 5.25, "y": 2}, - {"matrix": [6, 0], "x": 6.25, "y": 2}, - {"matrix": [2, 5], "x": 7.75, "y": 2}, - {"matrix": [2, 4], "x": 8.75, "y": 2}, - {"matrix": [2, 3], "x": 9.75, "y": 2}, - {"matrix": [2, 2], "x": 10.75, "y": 2}, - {"matrix": [2, 1], "x": 11.75, "y": 2}, - {"matrix": [2, 0], "x": 12.75, "y": 2}, - - {"matrix": [7, 5], "x": 0.75, "y": 3, "w": 1.25}, - {"matrix": [7, 4], "x": 2, "y": 3, "w": 1.25}, - {"matrix": [7, 3], "x": 3.25, "y": 3, "w": 1.25}, - {"matrix": [7, 2], "x": 4.5, "y": 3}, - {"matrix": [7, 1], "x": 5.5, "y": 3, "w": 2}, - {"matrix": [7, 0], "x": 7.5, "y": 3, "w": 2}, - {"matrix": [3, 5], "x": 9.5, "y": 3}, - {"matrix": [3, 4], "x": 10.5, "y": 3, "w": 1.25}, - {"matrix": [3, 3], "x": 11.75, "y": 3}, - {"matrix": [3, 2], "x": 12.75, "y": 3}, - {"matrix": [3, 1], "x": 13.75, "y": 3}, - {"matrix": [3, 0], "x": 13.75, "y": 2} - ] - } - } -} diff --git a/keyboards/marksard/treadstone48/rev2/keyboard.json b/keyboards/marksard/treadstone48/rev2/keyboard.json new file mode 100644 index 0000000000..56346d080a --- /dev/null +++ b/keyboards/marksard/treadstone48/rev2/keyboard.json @@ -0,0 +1,101 @@ +{ + "keyboard_name": "Treadstone48", + "manufacturer": "marksard", + "url": "https://github.com/marksard/Keyboards", + "maintainer": "marksard", + "usb": { + "vid": "0xFEED", + "pid": "0xDFA3", + "device_version": "0.2.0" + }, + "ws2812": { + "pin": "D3" + }, + "rgblight": { + "saturation_steps": 8, + "brightness_steps": 8, + "led_count": 12, + "max_brightness": 220, + "sleep": true, + "animations": { + "rainbow_mood": true, + "rainbow_swirl": true, + "knight": true, + "static_gradient": true + } + }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", + "processor": "atmega32u4", + "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": false, + "rgblight": true, + "oled": true + }, + "layout_aliases": { + "LAYOUT_full": "LAYOUT_base" + }, + "layouts": { + "LAYOUT_base": { + "layout": [ + {"matrix": [4, 5], "x": 1, "y": 0}, + {"matrix": [4, 4], "x": 2.25, "y": 0}, + {"matrix": [4, 3], "x": 3.25, "y": 0}, + {"matrix": [4, 2], "x": 4.25, "y": 0}, + {"matrix": [4, 1], "x": 5.25, "y": 0}, + {"matrix": [4, 0], "x": 6.25, "y": 0}, + {"matrix": [0, 5], "x": 7.75, "y": 0}, + {"matrix": [0, 4], "x": 8.75, "y": 0}, + {"matrix": [0, 3], "x": 9.75, "y": 0}, + {"matrix": [0, 2], "x": 10.75, "y": 0}, + {"matrix": [0, 1], "x": 11.75, "y": 0}, + {"matrix": [0, 0], "x": 12.75, "y": 0, "w": 2}, + + {"matrix": [5, 5], "x": 1, "y": 1, "w": 1.5}, + {"matrix": [5, 4], "x": 2.5, "y": 1}, + {"matrix": [5, 3], "x": 3.5, "y": 1}, + {"matrix": [5, 2], "x": 4.5, "y": 1}, + {"matrix": [5, 1], "x": 5.5, "y": 1}, + {"matrix": [5, 0], "x": 6.5, "y": 1}, + {"matrix": [1, 5], "x": 7.5, "y": 1}, + {"matrix": [1, 4], "x": 8.5, "y": 1}, + {"matrix": [1, 3], "x": 9.5, "y": 1}, + {"matrix": [1, 2], "x": 10.5, "y": 1}, + {"matrix": [1, 1], "x": 11.5, "y": 1}, + {"matrix": [1, 0], "x": 12.5, "y": 1, "w": 2.25}, + + {"matrix": [6, 5], "x": 0, "y": 2, "w": 2.25}, + {"matrix": [6, 4], "x": 2.25, "y": 2}, + {"matrix": [6, 3], "x": 3.25, "y": 2}, + {"matrix": [6, 2], "x": 4.25, "y": 2}, + {"matrix": [6, 1], "x": 5.25, "y": 2}, + {"matrix": [6, 0], "x": 6.25, "y": 2}, + {"matrix": [2, 5], "x": 7.75, "y": 2}, + {"matrix": [2, 4], "x": 8.75, "y": 2}, + {"matrix": [2, 3], "x": 9.75, "y": 2}, + {"matrix": [2, 2], "x": 10.75, "y": 2}, + {"matrix": [2, 1], "x": 11.75, "y": 2}, + {"matrix": [2, 0], "x": 12.75, "y": 2}, + + {"matrix": [7, 5], "x": 0.75, "y": 3, "w": 1.25}, + {"matrix": [7, 4], "x": 2, "y": 3, "w": 1.25}, + {"matrix": [7, 3], "x": 3.25, "y": 3, "w": 1.25}, + {"matrix": [7, 2], "x": 4.5, "y": 3}, + {"matrix": [7, 1], "x": 5.5, "y": 3, "w": 2}, + {"matrix": [7, 0], "x": 7.5, "y": 3, "w": 2}, + {"matrix": [3, 5], "x": 9.5, "y": 3}, + {"matrix": [3, 4], "x": 10.5, "y": 3, "w": 1.25}, + {"matrix": [3, 3], "x": 11.75, "y": 3}, + {"matrix": [3, 2], "x": 12.75, "y": 3}, + {"matrix": [3, 1], "x": 13.75, "y": 3}, + {"matrix": [3, 0], "x": 13.75, "y": 2} + ] + } + } +} diff --git a/keyboards/marksard/treadstone48/rev2/rules.mk b/keyboards/marksard/treadstone48/rev2/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/keyboards/massdrop/alt/info.json b/keyboards/massdrop/alt/info.json deleted file mode 100644 index 7598a43b7d..0000000000 --- a/keyboards/massdrop/alt/info.json +++ /dev/null @@ -1,107 +0,0 @@ -{ - "keyboard_name": "ALT Keyboard", - "manufacturer": "Massdrop Inc.", - "url": "https://www.massdrop.com/buy/massdrop-alt-mechanical-keyboard", - "maintainer": "Massdrop", - "usb": { - "vid": "0x04D8", - "pid": "0xEED3", - "device_version": "1.0.1" - }, - "rgb_matrix": { - "driver": "custom" - }, - "matrix_pins": { - "cols": ["B04", "B05", "B06", "B07", "B08", "B09", "B10", "B11", "B12", "B13", "A05", "A06", "A07", "A10", "A11"], - "rows": ["A00", "A01", "A02", "A03", "A04"] - }, - "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" - }, - "layouts": { - "LAYOUT_65_ansi_blocker": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, - {"matrix": [0, 6], "x": 6, "y": 0}, - {"matrix": [0, 7], "x": 7, "y": 0}, - {"matrix": [0, 8], "x": 8, "y": 0}, - {"matrix": [0, 9], "x": 9, "y": 0}, - {"matrix": [0, 10], "x": 10, "y": 0}, - {"matrix": [0, 11], "x": 11, "y": 0}, - {"matrix": [0, 12], "x": 12, "y": 0}, - {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, - {"matrix": [0, 14], "x": 15, "y": 0}, - - {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, - {"matrix": [1, 1], "x": 1.5, "y": 1}, - {"matrix": [1, 2], "x": 2.5, "y": 1}, - {"matrix": [1, 3], "x": 3.5, "y": 1}, - {"matrix": [1, 4], "x": 4.5, "y": 1}, - {"matrix": [1, 5], "x": 5.5, "y": 1}, - {"matrix": [1, 6], "x": 6.5, "y": 1}, - {"matrix": [1, 7], "x": 7.5, "y": 1}, - {"matrix": [1, 8], "x": 8.5, "y": 1}, - {"matrix": [1, 9], "x": 9.5, "y": 1}, - {"matrix": [1, 10], "x": 10.5, "y": 1}, - {"matrix": [1, 11], "x": 11.5, "y": 1}, - {"matrix": [1, 12], "x": 12.5, "y": 1}, - {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, - {"matrix": [1, 14], "x": 15, "y": 1}, - - {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, - {"matrix": [2, 1], "x": 1.75, "y": 2}, - {"matrix": [2, 2], "x": 2.75, "y": 2}, - {"matrix": [2, 3], "x": 3.75, "y": 2}, - {"matrix": [2, 4], "x": 4.75, "y": 2}, - {"matrix": [2, 5], "x": 5.75, "y": 2}, - {"matrix": [2, 6], "x": 6.75, "y": 2}, - {"matrix": [2, 7], "x": 7.75, "y": 2}, - {"matrix": [2, 8], "x": 8.75, "y": 2}, - {"matrix": [2, 9], "x": 9.75, "y": 2}, - {"matrix": [2, 10], "x": 10.75, "y": 2}, - {"matrix": [2, 11], "x": 11.75, "y": 2}, - {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, - {"matrix": [2, 14], "x": 15, "y": 2}, - - {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, - {"matrix": [3, 2], "x": 2.25, "y": 3}, - {"matrix": [3, 3], "x": 3.25, "y": 3}, - {"matrix": [3, 4], "x": 4.25, "y": 3}, - {"matrix": [3, 5], "x": 5.25, "y": 3}, - {"matrix": [3, 6], "x": 6.25, "y": 3}, - {"matrix": [3, 7], "x": 7.25, "y": 3}, - {"matrix": [3, 8], "x": 8.25, "y": 3}, - {"matrix": [3, 9], "x": 9.25, "y": 3}, - {"matrix": [3, 10], "x": 10.25, "y": 3}, - {"matrix": [3, 11], "x": 11.25, "y": 3}, - {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, - {"matrix": [3, 13], "x": 14, "y": 3}, - {"matrix": [3, 14], "x": 15, "y": 3}, - - {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, - {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, - {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, - {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, - {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, - {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, - {"matrix": [4, 12], "x": 13, "y": 4}, - {"matrix": [4, 13], "x": 14, "y": 4}, - {"matrix": [4, 14], "x": 15, "y": 4} - ] - } - } -} diff --git a/keyboards/massdrop/alt/keyboard.json b/keyboards/massdrop/alt/keyboard.json new file mode 100644 index 0000000000..7598a43b7d --- /dev/null +++ b/keyboards/massdrop/alt/keyboard.json @@ -0,0 +1,107 @@ +{ + "keyboard_name": "ALT Keyboard", + "manufacturer": "Massdrop Inc.", + "url": "https://www.massdrop.com/buy/massdrop-alt-mechanical-keyboard", + "maintainer": "Massdrop", + "usb": { + "vid": "0x04D8", + "pid": "0xEED3", + "device_version": "1.0.1" + }, + "rgb_matrix": { + "driver": "custom" + }, + "matrix_pins": { + "cols": ["B04", "B05", "B06", "B07", "B08", "B09", "B10", "B11", "B12", "B13", "A05", "A06", "A07", "A10", "A11"], + "rows": ["A00", "A01", "A02", "A03", "A04"] + }, + "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" + }, + "layouts": { + "LAYOUT_65_ansi_blocker": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 14], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} + ] + } + } +} diff --git a/keyboards/massdrop/ctrl/info.json b/keyboards/massdrop/ctrl/info.json deleted file mode 100644 index d3488ebd6b..0000000000 --- a/keyboards/massdrop/ctrl/info.json +++ /dev/null @@ -1,132 +0,0 @@ -{ - "keyboard_name": "CTRL Keyboard", - "manufacturer": "Massdrop Inc.", - "url": "https://www.massdrop.com/buy/massdrop-ctrl-mechanical-keyboard", - "maintainer": "Massdrop", - "usb": { - "vid": "0x04D8", - "pid": "0xEED2", - "device_version": "1.0.1" - }, - "rgb_matrix": { - "driver": "custom" - }, - "matrix_pins": { - "cols": ["A00", "A01", "A02", "A03", "A04", "A05", "A06", "A07"], - "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": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - - {"matrix": [0, 1], "x": 2, "y": 0}, - {"matrix": [0, 2], "x": 3, "y": 0}, - {"matrix": [0, 3], "x": 4, "y": 0}, - {"matrix": [0, 4], "x": 5, "y": 0}, - - {"matrix": [0, 5], "x": 6.5, "y": 0}, - {"matrix": [0, 6], "x": 7.5, "y": 0}, - {"matrix": [0, 7], "x": 8.5, "y": 0}, - {"matrix": [6, 0], "x": 9.5, "y": 0}, - - {"matrix": [6, 1], "x": 11, "y": 0}, - {"matrix": [6, 2], "x": 12, "y": 0}, - {"matrix": [6, 3], "x": 13, "y": 0}, - {"matrix": [6, 4], "x": 14, "y": 0}, - - {"matrix": [6, 5], "x": 15.5, "y": 0}, - {"matrix": [6, 6], "x": 16.5, "y": 0}, - {"matrix": [6, 7], "x": 17.5, "y": 0}, - - {"matrix": [1, 0], "x": 0, "y": 1.5}, - {"matrix": [1, 1], "x": 1, "y": 1.5}, - {"matrix": [1, 2], "x": 2, "y": 1.5}, - {"matrix": [1, 3], "x": 3, "y": 1.5}, - {"matrix": [1, 4], "x": 4, "y": 1.5}, - {"matrix": [1, 5], "x": 5, "y": 1.5}, - {"matrix": [1, 6], "x": 6, "y": 1.5}, - {"matrix": [1, 7], "x": 7, "y": 1.5}, - {"matrix": [7, 0], "x": 8, "y": 1.5}, - {"matrix": [7, 1], "x": 9, "y": 1.5}, - {"matrix": [7, 2], "x": 10, "y": 1.5}, - {"matrix": [7, 3], "x": 11, "y": 1.5}, - {"matrix": [7, 4], "x": 12, "y": 1.5}, - {"matrix": [7, 5], "x": 13, "y": 1.5, "w": 2}, - - {"matrix": [7, 6], "x": 15.5, "y": 1.5}, - {"matrix": [7, 7], "x": 16.5, "y": 1.5}, - {"matrix": [9, 7], "x": 17.5, "y": 1.5}, - - {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, - {"matrix": [2, 1], "x": 1.5, "y": 2.5}, - {"matrix": [2, 2], "x": 2.5, "y": 2.5}, - {"matrix": [2, 3], "x": 3.5, "y": 2.5}, - {"matrix": [2, 4], "x": 4.5, "y": 2.5}, - {"matrix": [2, 5], "x": 5.5, "y": 2.5}, - {"matrix": [2, 6], "x": 6.5, "y": 2.5}, - {"matrix": [2, 7], "x": 7.5, "y": 2.5}, - {"matrix": [8, 0], "x": 8.5, "y": 2.5}, - {"matrix": [8, 1], "x": 9.5, "y": 2.5}, - {"matrix": [8, 2], "x": 10.5, "y": 2.5}, - {"matrix": [8, 3], "x": 11.5, "y": 2.5}, - {"matrix": [8, 4], "x": 12.5, "y": 2.5}, - {"matrix": [8, 5], "x": 13.5, "y": 2.5, "w": 1.5}, - - {"matrix": [8, 6], "x": 15.5, "y": 2.5}, - {"matrix": [8, 7], "x": 16.5, "y": 2.5}, - {"matrix": [9, 6], "x": 17.5, "y": 2.5}, - - {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, - {"matrix": [3, 1], "x": 1.75, "y": 3.5}, - {"matrix": [3, 2], "x": 2.75, "y": 3.5}, - {"matrix": [3, 3], "x": 3.75, "y": 3.5}, - {"matrix": [3, 4], "x": 4.75, "y": 3.5}, - {"matrix": [3, 5], "x": 5.75, "y": 3.5}, - {"matrix": [3, 6], "x": 6.75, "y": 3.5}, - {"matrix": [3, 7], "x": 7.75, "y": 3.5}, - {"matrix": [9, 0], "x": 8.75, "y": 3.5}, - {"matrix": [9, 1], "x": 9.75, "y": 3.5}, - {"matrix": [9, 2], "x": 10.75, "y": 3.5}, - {"matrix": [9, 3], "x": 11.75, "y": 3.5}, - {"matrix": [9, 4], "x": 12.75, "y": 3.5, "w": 2.25}, - - {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25}, - {"matrix": [4, 1], "x": 2.25, "y": 4.5}, - {"matrix": [4, 2], "x": 3.25, "y": 4.5}, - {"matrix": [4, 3], "x": 4.25, "y": 4.5}, - {"matrix": [4, 4], "x": 5.25, "y": 4.5}, - {"matrix": [4, 5], "x": 6.25, "y": 4.5}, - {"matrix": [4, 6], "x": 7.25, "y": 4.5}, - {"matrix": [4, 7], "x": 8.25, "y": 4.5}, - {"matrix": [10, 0], "x": 9.25, "y": 4.5}, - {"matrix": [10, 1], "x": 10.25, "y": 4.5}, - {"matrix": [10, 2], "x": 11.25, "y": 4.5}, - {"matrix": [10, 3], "x": 12.25, "y": 4.5, "w": 2.75}, - - {"matrix": [9, 5], "x": 16.5, "y": 4.5}, - - {"matrix": [5, 0], "x": 0.005, "y": 5.5, "w": 1.25}, - {"matrix": [5, 1], "x": 1.255, "y": 5.5, "w": 1.25}, - {"matrix": [5, 2], "x": 2.505, "y": 5.5, "w": 1.25}, - {"matrix": [5, 3], "x": 3.75, "y": 5.5, "w": 6.25}, - {"matrix": [5, 4], "x": 10, "y": 5.5, "w": 1.25}, - {"matrix": [5, 5], "x": 11.25, "y": 5.5, "w": 1.25}, - {"matrix": [5, 6], "x": 12.5, "y": 5.5, "w": 1.25}, - {"matrix": [5, 7], "x": 13.75, "y": 5.5, "w": 1.25}, - - {"matrix": [10, 4], "x": 15.5, "y": 5.5}, - {"matrix": [10, 5], "x": 16.5, "y": 5.5}, - {"matrix": [10, 6], "x": 17.5, "y": 5.5} - ] - } - } -} diff --git a/keyboards/massdrop/ctrl/keyboard.json b/keyboards/massdrop/ctrl/keyboard.json new file mode 100644 index 0000000000..d3488ebd6b --- /dev/null +++ b/keyboards/massdrop/ctrl/keyboard.json @@ -0,0 +1,132 @@ +{ + "keyboard_name": "CTRL Keyboard", + "manufacturer": "Massdrop Inc.", + "url": "https://www.massdrop.com/buy/massdrop-ctrl-mechanical-keyboard", + "maintainer": "Massdrop", + "usb": { + "vid": "0x04D8", + "pid": "0xEED2", + "device_version": "1.0.1" + }, + "rgb_matrix": { + "driver": "custom" + }, + "matrix_pins": { + "cols": ["A00", "A01", "A02", "A03", "A04", "A05", "A06", "A07"], + "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": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [0, 2], "x": 3, "y": 0}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0}, + + {"matrix": [0, 5], "x": 6.5, "y": 0}, + {"matrix": [0, 6], "x": 7.5, "y": 0}, + {"matrix": [0, 7], "x": 8.5, "y": 0}, + {"matrix": [6, 0], "x": 9.5, "y": 0}, + + {"matrix": [6, 1], "x": 11, "y": 0}, + {"matrix": [6, 2], "x": 12, "y": 0}, + {"matrix": [6, 3], "x": 13, "y": 0}, + {"matrix": [6, 4], "x": 14, "y": 0}, + + {"matrix": [6, 5], "x": 15.5, "y": 0}, + {"matrix": [6, 6], "x": 16.5, "y": 0}, + {"matrix": [6, 7], "x": 17.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [7, 0], "x": 8, "y": 1.5}, + {"matrix": [7, 1], "x": 9, "y": 1.5}, + {"matrix": [7, 2], "x": 10, "y": 1.5}, + {"matrix": [7, 3], "x": 11, "y": 1.5}, + {"matrix": [7, 4], "x": 12, "y": 1.5}, + {"matrix": [7, 5], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [7, 6], "x": 15.5, "y": 1.5}, + {"matrix": [7, 7], "x": 16.5, "y": 1.5}, + {"matrix": [9, 7], "x": 17.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [8, 0], "x": 8.5, "y": 2.5}, + {"matrix": [8, 1], "x": 9.5, "y": 2.5}, + {"matrix": [8, 2], "x": 10.5, "y": 2.5}, + {"matrix": [8, 3], "x": 11.5, "y": 2.5}, + {"matrix": [8, 4], "x": 12.5, "y": 2.5}, + {"matrix": [8, 5], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [8, 6], "x": 15.5, "y": 2.5}, + {"matrix": [8, 7], "x": 16.5, "y": 2.5}, + {"matrix": [9, 6], "x": 17.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [9, 0], "x": 8.75, "y": 3.5}, + {"matrix": [9, 1], "x": 9.75, "y": 3.5}, + {"matrix": [9, 2], "x": 10.75, "y": 3.5}, + {"matrix": [9, 3], "x": 11.75, "y": 3.5}, + {"matrix": [9, 4], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4.5}, + {"matrix": [4, 2], "x": 3.25, "y": 4.5}, + {"matrix": [4, 3], "x": 4.25, "y": 4.5}, + {"matrix": [4, 4], "x": 5.25, "y": 4.5}, + {"matrix": [4, 5], "x": 6.25, "y": 4.5}, + {"matrix": [4, 6], "x": 7.25, "y": 4.5}, + {"matrix": [4, 7], "x": 8.25, "y": 4.5}, + {"matrix": [10, 0], "x": 9.25, "y": 4.5}, + {"matrix": [10, 1], "x": 10.25, "y": 4.5}, + {"matrix": [10, 2], "x": 11.25, "y": 4.5}, + {"matrix": [10, 3], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"matrix": [9, 5], "x": 16.5, "y": 4.5}, + + {"matrix": [5, 0], "x": 0.005, "y": 5.5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.255, "y": 5.5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.505, "y": 5.5, "w": 1.25}, + {"matrix": [5, 3], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [5, 4], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [5, 5], "x": 11.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 6], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 7], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"matrix": [10, 4], "x": 15.5, "y": 5.5}, + {"matrix": [10, 5], "x": 16.5, "y": 5.5}, + {"matrix": [10, 6], "x": 17.5, "y": 5.5} + ] + } + } +} diff --git a/keyboards/matrix/abelx/info.json b/keyboards/matrix/abelx/info.json deleted file mode 100644 index d62ddf53e2..0000000000 --- a/keyboards/matrix/abelx/info.json +++ /dev/null @@ -1,247 +0,0 @@ -{ - "keyboard_name": "ABELX", - "manufacturer": "Matrix", - "url": "", - "maintainer": "qmk", - "usb": { - "vid": "0x4D58", - "pid": "0xAB87", - "device_version": "0.0.1", - "no_startup_check": true - }, - "rgblight": { - "led_count": 9, - "driver": "custom", - "animations": { - "breathing": true, - "rainbow_mood": true, - "rainbow_swirl": true, - "snake": true, - "knight": true, - "christmas": true, - "static_gradient": true, - "rgb_test": true, - "alternating": true, - "twinkle": true - } - }, - "ws2812": { - "pin": "B4" - }, - "features": { - "bootmagic": true, - "mousekey": true, - "extrakey": true, - "rgblight": true - }, - "layouts": { - "LAYOUT_tkl_ansi": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - - {"matrix": [0, 1], "x": 2, "y": 0}, - {"matrix": [0, 2], "x": 3, "y": 0}, - {"matrix": [0, 3], "x": 4, "y": 0}, - {"matrix": [0, 4], "x": 5, "y": 0}, - - {"matrix": [0, 5], "x": 6.5, "y": 0}, - {"matrix": [0, 6], "x": 7.5, "y": 0}, - {"matrix": [0, 7], "x": 8.5, "y": 0}, - {"matrix": [0, 8], "x": 9.5, "y": 0}, - - {"matrix": [0, 9], "x": 11, "y": 0}, - {"matrix": [0, 10], "x": 12, "y": 0}, - {"matrix": [0, 11], "x": 13, "y": 0}, - {"matrix": [0, 12], "x": 14, "y": 0}, - - {"matrix": [0, 13], "x": 15.25, "y": 0}, - {"matrix": [0, 14], "x": 16.25, "y": 0}, - {"matrix": [0, 15], "x": 17.25, "y": 0}, - - {"matrix": [1, 0], "x": 0, "y": 1.5}, - {"matrix": [1, 1], "x": 1, "y": 1.5}, - {"matrix": [1, 2], "x": 2, "y": 1.5}, - {"matrix": [1, 3], "x": 3, "y": 1.5}, - {"matrix": [1, 4], "x": 4, "y": 1.5}, - {"matrix": [1, 5], "x": 5, "y": 1.5}, - {"matrix": [1, 6], "x": 6, "y": 1.5}, - {"matrix": [1, 7], "x": 7, "y": 1.5}, - {"matrix": [1, 8], "x": 8, "y": 1.5}, - {"matrix": [1, 9], "x": 9, "y": 1.5}, - {"matrix": [1, 10], "x": 10, "y": 1.5}, - {"matrix": [1, 11], "x": 11, "y": 1.5}, - {"matrix": [1, 12], "x": 12, "y": 1.5}, - {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2}, - - {"matrix": [1, 14], "x": 15.25, "y": 1.5}, - {"matrix": [1, 15], "x": 16.25, "y": 1.5}, - {"matrix": [2, 15], "x": 17.25, "y": 1.5}, - - {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, - {"matrix": [2, 1], "x": 1.5, "y": 2.5}, - {"matrix": [2, 2], "x": 2.5, "y": 2.5}, - {"matrix": [2, 3], "x": 3.5, "y": 2.5}, - {"matrix": [2, 4], "x": 4.5, "y": 2.5}, - {"matrix": [2, 5], "x": 5.5, "y": 2.5}, - {"matrix": [2, 6], "x": 6.5, "y": 2.5}, - {"matrix": [2, 7], "x": 7.5, "y": 2.5}, - {"matrix": [2, 8], "x": 8.5, "y": 2.5}, - {"matrix": [2, 9], "x": 9.5, "y": 2.5}, - {"matrix": [2, 10], "x": 10.5, "y": 2.5}, - {"matrix": [2, 11], "x": 11.5, "y": 2.5}, - {"matrix": [2, 12], "x": 12.5, "y": 2.5}, - {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5}, - - {"matrix": [2, 14], "x": 15.25, "y": 2.5}, - {"matrix": [3, 14], "x": 16.25, "y": 2.5}, - {"matrix": [3, 15], "x": 17.25, "y": 2.5}, - - {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, - {"matrix": [3, 1], "x": 1.75, "y": 3.5}, - {"matrix": [3, 2], "x": 2.75, "y": 3.5}, - {"matrix": [3, 3], "x": 3.75, "y": 3.5}, - {"matrix": [3, 4], "x": 4.75, "y": 3.5}, - {"matrix": [3, 5], "x": 5.75, "y": 3.5}, - {"matrix": [3, 6], "x": 6.75, "y": 3.5}, - {"matrix": [3, 7], "x": 7.75, "y": 3.5}, - {"matrix": [3, 8], "x": 8.75, "y": 3.5}, - {"matrix": [3, 9], "x": 9.75, "y": 3.5}, - {"matrix": [3, 10], "x": 10.75, "y": 3.5}, - {"matrix": [3, 11], "x": 11.75, "y": 3.5}, - {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25}, - - {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25}, - {"matrix": [4, 2], "x": 2.25, "y": 4.5}, - {"matrix": [4, 3], "x": 3.25, "y": 4.5}, - {"matrix": [4, 4], "x": 4.25, "y": 4.5}, - {"matrix": [4, 5], "x": 5.25, "y": 4.5}, - {"matrix": [4, 6], "x": 6.25, "y": 4.5}, - {"matrix": [4, 7], "x": 7.25, "y": 4.5}, - {"matrix": [4, 8], "x": 8.25, "y": 4.5}, - {"matrix": [4, 9], "x": 9.25, "y": 4.5}, - {"matrix": [4, 10], "x": 10.25, "y": 4.5}, - {"matrix": [4, 11], "x": 11.25, "y": 4.5}, - {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75}, - - {"matrix": [4, 14], "x": 16.25, "y": 4.5}, - - {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25}, - {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25}, - {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25}, - {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25}, - {"matrix": [5, 7], "x": 10, "y": 5.5, "w": 1.25}, - {"matrix": [5, 8], "x": 11.25, "y": 5.5, "w": 1.25}, - {"matrix": [5, 9], "x": 12.5, "y": 5.5, "w": 1.25}, - {"matrix": [5, 10], "x": 13.75, "y": 5.5, "w": 1.25}, - - {"matrix": [5, 11], "x": 15.25, "y": 5.5}, - {"matrix": [5, 12], "x": 16.25, "y": 5.5}, - {"matrix": [5, 14], "x": 17.25, "y": 5.5} - ] - }, - "LAYOUT_tkl_iso": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - - {"matrix": [0, 1], "x": 2, "y": 0}, - {"matrix": [0, 2], "x": 3, "y": 0}, - {"matrix": [0, 3], "x": 4, "y": 0}, - {"matrix": [0, 4], "x": 5, "y": 0}, - - {"matrix": [0, 5], "x": 6.5, "y": 0}, - {"matrix": [0, 6], "x": 7.5, "y": 0}, - {"matrix": [0, 7], "x": 8.5, "y": 0}, - {"matrix": [0, 8], "x": 9.5, "y": 0}, - - {"matrix": [0, 9], "x": 11, "y": 0}, - {"matrix": [0, 10], "x": 12, "y": 0}, - {"matrix": [0, 11], "x": 13, "y": 0}, - {"matrix": [0, 12], "x": 14, "y": 0}, - - {"matrix": [0, 13], "x": 15.25, "y": 0}, - {"matrix": [0, 14], "x": 16.25, "y": 0}, - {"matrix": [0, 15], "x": 17.25, "y": 0}, - - {"matrix": [1, 0], "x": 0, "y": 1.5}, - {"matrix": [1, 1], "x": 1, "y": 1.5}, - {"matrix": [1, 2], "x": 2, "y": 1.5}, - {"matrix": [1, 3], "x": 3, "y": 1.5}, - {"matrix": [1, 4], "x": 4, "y": 1.5}, - {"matrix": [1, 5], "x": 5, "y": 1.5}, - {"matrix": [1, 6], "x": 6, "y": 1.5}, - {"matrix": [1, 7], "x": 7, "y": 1.5}, - {"matrix": [1, 8], "x": 8, "y": 1.5}, - {"matrix": [1, 9], "x": 9, "y": 1.5}, - {"matrix": [1, 10], "x": 10, "y": 1.5}, - {"matrix": [1, 11], "x": 11, "y": 1.5}, - {"matrix": [1, 12], "x": 12, "y": 1.5}, - {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2}, - - {"matrix": [1, 14], "x": 15.25, "y": 1.5}, - {"matrix": [1, 15], "x": 16.25, "y": 1.5}, - {"matrix": [2, 15], "x": 17.25, "y": 1.5}, - - {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, - {"matrix": [2, 1], "x": 1.5, "y": 2.5}, - {"matrix": [2, 2], "x": 2.5, "y": 2.5}, - {"matrix": [2, 3], "x": 3.5, "y": 2.5}, - {"matrix": [2, 4], "x": 4.5, "y": 2.5}, - {"matrix": [2, 5], "x": 5.5, "y": 2.5}, - {"matrix": [2, 6], "x": 6.5, "y": 2.5}, - {"matrix": [2, 7], "x": 7.5, "y": 2.5}, - {"matrix": [2, 8], "x": 8.5, "y": 2.5}, - {"matrix": [2, 9], "x": 9.5, "y": 2.5}, - {"matrix": [2, 10], "x": 10.5, "y": 2.5}, - {"matrix": [2, 11], "x": 11.5, "y": 2.5}, - {"matrix": [2, 12], "x": 12.5, "y": 2.5}, - {"matrix": [2, 14], "x": 15.25, "y": 2.5}, - {"matrix": [3, 14], "x": 16.25, "y": 2.5}, - {"matrix": [3, 15], "x": 17.25, "y": 2.5}, - - {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, - {"matrix": [3, 1], "x": 1.75, "y": 3.5}, - {"matrix": [3, 2], "x": 2.75, "y": 3.5}, - {"matrix": [3, 3], "x": 3.75, "y": 3.5}, - {"matrix": [3, 4], "x": 4.75, "y": 3.5}, - {"matrix": [3, 5], "x": 5.75, "y": 3.5}, - {"matrix": [3, 6], "x": 6.75, "y": 3.5}, - {"matrix": [3, 7], "x": 7.75, "y": 3.5}, - {"matrix": [3, 8], "x": 8.75, "y": 3.5}, - {"matrix": [3, 9], "x": 9.75, "y": 3.5}, - {"matrix": [3, 10], "x": 10.75, "y": 3.5}, - {"matrix": [3, 11], "x": 11.75, "y": 3.5}, - {"matrix": [3, 12], "x": 12.75, "y": 3.5}, - {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2}, - - {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25}, - {"matrix": [4, 1], "x": 1.25, "y": 4.5}, - {"matrix": [4, 2], "x": 2.25, "y": 4.5}, - {"matrix": [4, 3], "x": 3.25, "y": 4.5}, - {"matrix": [4, 4], "x": 4.25, "y": 4.5}, - {"matrix": [4, 5], "x": 5.25, "y": 4.5}, - {"matrix": [4, 6], "x": 6.25, "y": 4.5}, - {"matrix": [4, 7], "x": 7.25, "y": 4.5}, - {"matrix": [4, 8], "x": 8.25, "y": 4.5}, - {"matrix": [4, 9], "x": 9.25, "y": 4.5}, - {"matrix": [4, 10], "x": 10.25, "y": 4.5}, - {"matrix": [4, 11], "x": 11.25, "y": 4.5}, - {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75}, - - {"matrix": [4, 14], "x": 16.25, "y": 4.5}, - - {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25}, - {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25}, - {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25}, - {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25}, - {"matrix": [5, 7], "x": 10, "y": 5.5, "w": 1.25}, - {"matrix": [5, 8], "x": 11.25, "y": 5.5, "w": 1.25}, - {"matrix": [5, 9], "x": 12.5, "y": 5.5, "w": 1.25}, - {"matrix": [5, 10], "x": 13.75, "y": 5.5, "w": 1.25}, - - {"matrix": [5, 11], "x": 15.25, "y": 5.5}, - {"matrix": [5, 12], "x": 16.25, "y": 5.5}, - {"matrix": [5, 14], "x": 17.25, "y": 5.5} - ] - } - } -} diff --git a/keyboards/matrix/abelx/keyboard.json b/keyboards/matrix/abelx/keyboard.json new file mode 100644 index 0000000000..7fcad281da --- /dev/null +++ b/keyboards/matrix/abelx/keyboard.json @@ -0,0 +1,249 @@ +{ + "keyboard_name": "ABELX", + "manufacturer": "Matrix", + "url": "", + "maintainer": "qmk", + "usb": { + "vid": "0x4D58", + "pid": "0xAB87", + "device_version": "0.0.1", + "no_startup_check": true + }, + "rgblight": { + "led_count": 9, + "driver": "custom", + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } + }, + "ws2812": { + "pin": "B4" + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgblight": true + }, + "processor": "STM32F411", + "bootloader": "custom", + "layouts": { + "LAYOUT_tkl_ansi": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [0, 2], "x": 3, "y": 0}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0}, + + {"matrix": [0, 5], "x": 6.5, "y": 0}, + {"matrix": [0, 6], "x": 7.5, "y": 0}, + {"matrix": [0, 7], "x": 8.5, "y": 0}, + {"matrix": [0, 8], "x": 9.5, "y": 0}, + + {"matrix": [0, 9], "x": 11, "y": 0}, + {"matrix": [0, 10], "x": 12, "y": 0}, + {"matrix": [0, 11], "x": 13, "y": 0}, + {"matrix": [0, 12], "x": 14, "y": 0}, + + {"matrix": [0, 13], "x": 15.25, "y": 0}, + {"matrix": [0, 14], "x": 16.25, "y": 0}, + {"matrix": [0, 15], "x": 17.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.5}, + {"matrix": [1, 10], "x": 10, "y": 1.5}, + {"matrix": [1, 11], "x": 11, "y": 1.5}, + {"matrix": [1, 12], "x": 12, "y": 1.5}, + {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [1, 14], "x": 15.25, "y": 1.5}, + {"matrix": [1, 15], "x": 16.25, "y": 1.5}, + {"matrix": [2, 15], "x": 17.25, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [2, 14], "x": 15.25, "y": 2.5}, + {"matrix": [3, 14], "x": 16.25, "y": 2.5}, + {"matrix": [3, 15], "x": 17.25, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3.5}, + {"matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"matrix": [3, 11], "x": 11.75, "y": 3.5}, + {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.5}, + {"matrix": [4, 3], "x": 3.25, "y": 4.5}, + {"matrix": [4, 4], "x": 4.25, "y": 4.5}, + {"matrix": [4, 5], "x": 5.25, "y": 4.5}, + {"matrix": [4, 6], "x": 6.25, "y": 4.5}, + {"matrix": [4, 7], "x": 7.25, "y": 4.5}, + {"matrix": [4, 8], "x": 8.25, "y": 4.5}, + {"matrix": [4, 9], "x": 9.25, "y": 4.5}, + {"matrix": [4, 10], "x": 10.25, "y": 4.5}, + {"matrix": [4, 11], "x": 11.25, "y": 4.5}, + {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"matrix": [4, 14], "x": 16.25, "y": 4.5}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [5, 7], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [5, 8], "x": 11.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 9], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 10], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"matrix": [5, 11], "x": 15.25, "y": 5.5}, + {"matrix": [5, 12], "x": 16.25, "y": 5.5}, + {"matrix": [5, 14], "x": 17.25, "y": 5.5} + ] + }, + "LAYOUT_tkl_iso": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [0, 2], "x": 3, "y": 0}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0}, + + {"matrix": [0, 5], "x": 6.5, "y": 0}, + {"matrix": [0, 6], "x": 7.5, "y": 0}, + {"matrix": [0, 7], "x": 8.5, "y": 0}, + {"matrix": [0, 8], "x": 9.5, "y": 0}, + + {"matrix": [0, 9], "x": 11, "y": 0}, + {"matrix": [0, 10], "x": 12, "y": 0}, + {"matrix": [0, 11], "x": 13, "y": 0}, + {"matrix": [0, 12], "x": 14, "y": 0}, + + {"matrix": [0, 13], "x": 15.25, "y": 0}, + {"matrix": [0, 14], "x": 16.25, "y": 0}, + {"matrix": [0, 15], "x": 17.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.5}, + {"matrix": [1, 10], "x": 10, "y": 1.5}, + {"matrix": [1, 11], "x": 11, "y": 1.5}, + {"matrix": [1, 12], "x": 12, "y": 1.5}, + {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [1, 14], "x": 15.25, "y": 1.5}, + {"matrix": [1, 15], "x": 16.25, "y": 1.5}, + {"matrix": [2, 15], "x": 17.25, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + {"matrix": [2, 14], "x": 15.25, "y": 2.5}, + {"matrix": [3, 14], "x": 16.25, "y": 2.5}, + {"matrix": [3, 15], "x": 17.25, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3.5}, + {"matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"matrix": [3, 11], "x": 11.75, "y": 3.5}, + {"matrix": [3, 12], "x": 12.75, "y": 3.5}, + {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.5}, + {"matrix": [4, 2], "x": 2.25, "y": 4.5}, + {"matrix": [4, 3], "x": 3.25, "y": 4.5}, + {"matrix": [4, 4], "x": 4.25, "y": 4.5}, + {"matrix": [4, 5], "x": 5.25, "y": 4.5}, + {"matrix": [4, 6], "x": 6.25, "y": 4.5}, + {"matrix": [4, 7], "x": 7.25, "y": 4.5}, + {"matrix": [4, 8], "x": 8.25, "y": 4.5}, + {"matrix": [4, 9], "x": 9.25, "y": 4.5}, + {"matrix": [4, 10], "x": 10.25, "y": 4.5}, + {"matrix": [4, 11], "x": 11.25, "y": 4.5}, + {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"matrix": [4, 14], "x": 16.25, "y": 4.5}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [5, 7], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [5, 8], "x": 11.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 9], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 10], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"matrix": [5, 11], "x": 15.25, "y": 5.5}, + {"matrix": [5, 12], "x": 16.25, "y": 5.5}, + {"matrix": [5, 14], "x": 17.25, "y": 5.5} + ] + } + } +} diff --git a/keyboards/matrix/abelx/rules.mk b/keyboards/matrix/abelx/rules.mk index 00a63f4a27..ee9c23c086 100644 --- a/keyboards/matrix/abelx/rules.mk +++ b/keyboards/matrix/abelx/rules.mk @@ -1,33 +1,7 @@ -# -# - the next two should match the directories in -# /os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) -MCU_FAMILY = STM32 -MCU_SERIES = STM32F4xx - -# Linker script to use -# - it should exist either in /os/common/ports/ARMCMx/compilers/GCC/ld/ -# or /ld/ +# custom bootloader MCU_LDSCRIPT = abelx_boot - -# Startup code to use -# - it should exist in /os/common/startup/ARMCMx/compilers/GCC/mk/ -MCU_STARTUP = stm32f4xx - -# Board: it should exist either in /os/hal/boards/ -# or /boards BOARD = abelx_bd -# Cortex version -MCU = cortex-m4 - -# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 -ARMV = 7 - -USE_FPU = yes - -# Bootloader selection -BOOTLOADER = custom - CUSTOM_MATRIX = lite # project specific files SRC += matrix.c tca6424.c aw9523b.c diff --git a/keyboards/matrix/m12og/rev1/info.json b/keyboards/matrix/m12og/rev1/info.json deleted file mode 100644 index d5ee589cc1..0000000000 --- a/keyboards/matrix/m12og/rev1/info.json +++ /dev/null @@ -1,255 +0,0 @@ -{ - "keyboard_name": "m12og_v1", - "manufacturer": "Matrix", - "url": "", - "maintainer": "kb-elmo", - "usb": { - "vid": "0x4D58", - "pid": "0x0369", - "device_version": "0.0.1" - }, - "indicators": { - "caps_lock": "B6", - "scroll_lock": "B5" - }, - "rgblight": { - "led_count": 16, - "sleep": true, - "animations": { - "breathing": true, - "rainbow_mood": true, - "rainbow_swirl": true, - "snake": true, - "knight": true, - "christmas": true, - "static_gradient": true, - "rgb_test": true, - "alternating": true, - "twinkle": true - } - }, - "ws2812": { - "pin": "B8" - }, - "features": { - "bootmagic": false, - "mousekey": false, - "extrakey": true, - "rgblight": true - }, - "build": { - "lto": true - }, - "layout_aliases": { - "LAYOUT_all": "LAYOUT_tkl_ansi_tsangan" - }, - "community_layouts": [ - "tkl_ansi_tsangan" - ], - "layouts": { - "LAYOUT_tkl_ansi_tsangan": { - "layout": [ - {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, - - {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0}, - {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0}, - {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0}, - {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0}, - - {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0}, - {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0}, - {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0}, - {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0}, - - {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0}, - {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0}, - {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0}, - {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0}, - - {"label": "Print Screen", "matrix": [0, 13], "x": 15.25, "y": 0}, - {"label": "Scroll Lock", "matrix": [0, 14], "x": 16.25, "y": 0}, - {"label": "Pause", "matrix": [0, 15], "x": 17.25, "y": 0}, - - {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25}, - {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25}, - {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25}, - {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25}, - {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25}, - {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25}, - {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25}, - {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25}, - {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25}, - {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25}, - {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25}, - {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25}, - {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25}, - {"label": "Backspace", "matrix": [2, 13], "x": 13, "y": 1.25, "w": 2}, - - {"label": "Insert", "matrix": [3, 13], "x": 15.25, "y": 1.25}, - {"label": "Home", "matrix": [1, 14], "x": 16.25, "y": 1.25}, - {"label": "Page Up", "matrix": [1, 15], "x": 17.25, "y": 1.25}, - - {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, - {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25}, - {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25}, - {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25}, - {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25}, - {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25}, - {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25}, - {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25}, - {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25}, - {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25}, - {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25}, - {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25}, - {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25}, - {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 2.25, "w": 1.5}, - - {"label": "Delete", "matrix": [3, 14], "x": 15.25, "y": 2.25}, - {"label": "End", "matrix": [2, 14], "x": 16.25, "y": 2.25}, - {"label": "Page Down", "matrix": [2, 15], "x": 17.25, "y": 2.25}, - - {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, - {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25}, - {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25}, - {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25}, - {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25}, - {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25}, - {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25}, - {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25}, - {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25}, - {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25}, - {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25}, - {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25}, - {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25}, - - {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, - {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25}, - {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25}, - {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25}, - {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25}, - {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25}, - {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25}, - {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25}, - {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25}, - {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25}, - {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25}, - {"label": "Shift", "matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 2.75}, - - {"label": "\u2191", "matrix": [4, 12], "x": 16.25, "y": 4.25}, - - {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, - {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25}, - {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, - {"label": "Space", "matrix": [5, 5], "x": 4, "y": 5.25, "w": 7}, - {"label": "Alt", "matrix": [5, 6], "x": 11, "y": 5.25, "w": 1.5}, - {"label": "Fn", "matrix": [5, 7], "x": 12.5, "y": 5.25}, - {"label": "Ctrl", "matrix": [5, 8], "x": 13.5, "y": 5.25, "w": 1.5}, - - {"label": "\u2190", "matrix": [4, 13], "x": 15.25, "y": 5.25}, - {"label": "\u2193", "matrix": [4, 14], "x": 16.25, "y": 5.25}, - {"label": "\u2192", "matrix": [3, 15], "x": 17.25, "y": 5.25} - ] - }, - "LAYOUT_tkl_ansi_wkl": { - "layout": [ - {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, - - {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0}, - {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0}, - {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0}, - {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0}, - - {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0}, - {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0}, - {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0}, - {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0}, - - {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0}, - {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0}, - {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0}, - {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0}, - - {"label": "Print Screen", "matrix": [0, 13], "x": 15.25, "y": 0}, - {"label": "Scroll Lock", "matrix": [0, 14], "x": 16.25, "y": 0}, - {"label": "Pause", "matrix": [0, 15], "x": 17.25, "y": 0}, - - {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25}, - {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25}, - {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25}, - {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25}, - {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25}, - {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25}, - {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25}, - {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25}, - {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25}, - {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25}, - {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25}, - {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25}, - {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25}, - {"label": "Backspace", "matrix": [2, 13], "x": 13, "y": 1.25, "w": 2}, - - {"label": "Insert", "matrix": [3, 13], "x": 15.25, "y": 1.25}, - {"label": "Home", "matrix": [1, 14], "x": 16.25, "y": 1.25}, - {"label": "Page Up", "matrix": [1, 15], "x": 17.25, "y": 1.25}, - - {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, - {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25}, - {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25}, - {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25}, - {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25}, - {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25}, - {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25}, - {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25}, - {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25}, - {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25}, - {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25}, - {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25}, - {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25}, - {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 2.25, "w": 1.5}, - - {"label": "Delete", "matrix": [3, 14], "x": 15.25, "y": 2.25}, - {"label": "End", "matrix": [2, 14], "x": 16.25, "y": 2.25}, - {"label": "Page Down", "matrix": [2, 15], "x": 17.25, "y": 2.25}, - - {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, - {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25}, - {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25}, - {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25}, - {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25}, - {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25}, - {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25}, - {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25}, - {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25}, - {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25}, - {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25}, - {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25}, - {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25}, - - {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, - {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25}, - {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25}, - {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25}, - {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25}, - {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25}, - {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25}, - {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25}, - {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25}, - {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25}, - {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25}, - {"label": "Shift", "matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 2.75}, - - {"label": "\u2191", "matrix": [4, 12], "x": 16.25, "y": 4.25}, - - {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, - {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, - {"label": "Space", "matrix": [5, 5], "x": 4, "y": 5.25, "w": 7}, - {"label": "Alt", "matrix": [5, 6], "x": 11, "y": 5.25, "w": 1.5}, - {"label": "Ctrl", "matrix": [5, 8], "x": 13.5, "y": 5.25, "w": 1.5}, - - {"label": "\u2190", "matrix": [4, 13], "x": 15.25, "y": 5.25}, - {"label": "\u2193", "matrix": [4, 14], "x": 16.25, "y": 5.25}, - {"label": "\u2192", "matrix": [3, 15], "x": 17.25, "y": 5.25} - ] - } - } -} diff --git a/keyboards/matrix/m12og/rev1/keyboard.json b/keyboards/matrix/m12og/rev1/keyboard.json new file mode 100644 index 0000000000..c956720a8d --- /dev/null +++ b/keyboards/matrix/m12og/rev1/keyboard.json @@ -0,0 +1,257 @@ +{ + "keyboard_name": "m12og_v1", + "manufacturer": "Matrix", + "url": "", + "maintainer": "kb-elmo", + "usb": { + "vid": "0x4D58", + "pid": "0x0369", + "device_version": "0.0.1" + }, + "indicators": { + "caps_lock": "B6", + "scroll_lock": "B5" + }, + "rgblight": { + "led_count": 16, + "sleep": true, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } + }, + "ws2812": { + "pin": "B8" + }, + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "rgblight": true + }, + "build": { + "lto": true + }, + "bootloader": "custom", + "processor": "STM32F103", + "layout_aliases": { + "LAYOUT_all": "LAYOUT_tkl_ansi_tsangan" + }, + "community_layouts": [ + "tkl_ansi_tsangan" + ], + "layouts": { + "LAYOUT_tkl_ansi_tsangan": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + + {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0}, + + {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0}, + + {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0}, + {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0}, + {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0}, + {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0}, + + {"label": "Print Screen", "matrix": [0, 13], "x": 15.25, "y": 0}, + {"label": "Scroll Lock", "matrix": [0, 14], "x": 16.25, "y": 0}, + {"label": "Pause", "matrix": [0, 15], "x": 17.25, "y": 0}, + + {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25}, + {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25}, + {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25}, + {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25}, + {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25}, + {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25}, + {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25}, + {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25}, + {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25}, + {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25}, + {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25}, + {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25}, + {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25}, + {"label": "Backspace", "matrix": [2, 13], "x": 13, "y": 1.25, "w": 2}, + + {"label": "Insert", "matrix": [3, 13], "x": 15.25, "y": 1.25}, + {"label": "Home", "matrix": [1, 14], "x": 16.25, "y": 1.25}, + {"label": "Page Up", "matrix": [1, 15], "x": 17.25, "y": 1.25}, + + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + + {"label": "Delete", "matrix": [3, 14], "x": 15.25, "y": 2.25}, + {"label": "End", "matrix": [2, 14], "x": 16.25, "y": 2.25}, + {"label": "Page Down", "matrix": [2, 15], "x": 17.25, "y": 2.25}, + + {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25}, + + {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25}, + {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25}, + {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25}, + {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25}, + {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25}, + {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25}, + {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25}, + {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25}, + {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25}, + {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25}, + {"label": "Shift", "matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 2.75}, + + {"label": "\u2191", "matrix": [4, 12], "x": 16.25, "y": 4.25}, + + {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25}, + {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, + {"label": "Space", "matrix": [5, 5], "x": 4, "y": 5.25, "w": 7}, + {"label": "Alt", "matrix": [5, 6], "x": 11, "y": 5.25, "w": 1.5}, + {"label": "Fn", "matrix": [5, 7], "x": 12.5, "y": 5.25}, + {"label": "Ctrl", "matrix": [5, 8], "x": 13.5, "y": 5.25, "w": 1.5}, + + {"label": "\u2190", "matrix": [4, 13], "x": 15.25, "y": 5.25}, + {"label": "\u2193", "matrix": [4, 14], "x": 16.25, "y": 5.25}, + {"label": "\u2192", "matrix": [3, 15], "x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_tkl_ansi_wkl": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + + {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0}, + + {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0}, + + {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0}, + {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0}, + {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0}, + {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0}, + + {"label": "Print Screen", "matrix": [0, 13], "x": 15.25, "y": 0}, + {"label": "Scroll Lock", "matrix": [0, 14], "x": 16.25, "y": 0}, + {"label": "Pause", "matrix": [0, 15], "x": 17.25, "y": 0}, + + {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25}, + {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25}, + {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25}, + {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25}, + {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25}, + {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25}, + {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25}, + {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25}, + {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25}, + {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25}, + {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25}, + {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25}, + {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25}, + {"label": "Backspace", "matrix": [2, 13], "x": 13, "y": 1.25, "w": 2}, + + {"label": "Insert", "matrix": [3, 13], "x": 15.25, "y": 1.25}, + {"label": "Home", "matrix": [1, 14], "x": 16.25, "y": 1.25}, + {"label": "Page Up", "matrix": [1, 15], "x": 17.25, "y": 1.25}, + + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + + {"label": "Delete", "matrix": [3, 14], "x": 15.25, "y": 2.25}, + {"label": "End", "matrix": [2, 14], "x": 16.25, "y": 2.25}, + {"label": "Page Down", "matrix": [2, 15], "x": 17.25, "y": 2.25}, + + {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25}, + + {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25}, + {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25}, + {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25}, + {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25}, + {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25}, + {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25}, + {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25}, + {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25}, + {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25}, + {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25}, + {"label": "Shift", "matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 2.75}, + + {"label": "\u2191", "matrix": [4, 12], "x": 16.25, "y": 4.25}, + + {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, + {"label": "Space", "matrix": [5, 5], "x": 4, "y": 5.25, "w": 7}, + {"label": "Alt", "matrix": [5, 6], "x": 11, "y": 5.25, "w": 1.5}, + {"label": "Ctrl", "matrix": [5, 8], "x": 13.5, "y": 5.25, "w": 1.5}, + + {"label": "\u2190", "matrix": [4, 13], "x": 15.25, "y": 5.25}, + {"label": "\u2193", "matrix": [4, 14], "x": 16.25, "y": 5.25}, + {"label": "\u2192", "matrix": [3, 15], "x": 17.25, "y": 5.25} + ] + } + } +} diff --git a/keyboards/matrix/m12og/rev1/rev1.c b/keyboards/matrix/m12og/rev1/rev1.c index 702d3857c4..f517703c60 100644 --- a/keyboards/matrix/m12og/rev1/rev1.c +++ b/keyboards/matrix/m12og/rev1/rev1.c @@ -29,4 +29,6 @@ void keyboard_post_init_kb(void) { rgblight_enable_noeeprom(); rgblight_sethsv_noeeprom(5, 255, 255); rgblight_mode_noeeprom(37); + + keyboard_post_init_user(); } diff --git a/keyboards/matrix/m12og/rev1/rules.mk b/keyboards/matrix/m12og/rev1/rules.mk index bc406d1cba..077011cdc1 100644 --- a/keyboards/matrix/m12og/rev1/rules.mk +++ b/keyboards/matrix/m12og/rev1/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = STM32F103 - +# custom bootloader MCU_LDSCRIPT = m12og_v1 - BOARD = m12og_v1 -# Bootloader selection -BOOTLOADER = custom - CUSTOM_MATRIX = lite SRC += matrix.c diff --git a/keyboards/matrix/m12og/rev2/rev2.c b/keyboards/matrix/m12og/rev2/rev2.c index 1a35dff7a9..fb424b164f 100644 --- a/keyboards/matrix/m12og/rev2/rev2.c +++ b/keyboards/matrix/m12og/rev2/rev2.c @@ -4,10 +4,12 @@ #include "quantum.h" -void matrix_init_user(void) { +void matrix_init_kb(void) { setPinOutput(C6); setPinOutput(B2); setPinOutput(B1); + + matrix_init_user(); } bool led_update_kb(led_t led_state) { diff --git a/keyboards/matrix/m20add/info.json b/keyboards/matrix/m20add/info.json deleted file mode 100644 index 5a999bb484..0000000000 --- a/keyboards/matrix/m20add/info.json +++ /dev/null @@ -1,246 +0,0 @@ -{ - "keyboard_name": "8XV2.0 Additional", - "manufacturer": "Matrix", - "url": "", - "maintainer": "qmk", - "usb": { - "vid": "0x4D58", - "pid": "0x20AD", - "device_version": "0.0.1", - "no_startup_check": true - }, - "rgblight": { - "led_count": 20, - "driver": "custom", - "animations": { - "breathing": true, - "rainbow_mood": true, - "rainbow_swirl": true, - "snake": true, - "knight": true, - "christmas": true, - "static_gradient": true, - "rgb_test": true, - "alternating": true, - "twinkle": true - } - }, - "ws2812": { - "pin": "B4" - }, - "features": { - "bootmagic": true, - "mousekey": true, - "extrakey": true, - "rgblight": true - }, - "layouts": { - "LAYOUT_tkl_ansi_tsangan": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - - {"matrix": [0, 1], "x": 2, "y": 0}, - {"matrix": [0, 2], "x": 3, "y": 0}, - {"matrix": [0, 3], "x": 4, "y": 0}, - {"matrix": [0, 4], "x": 5, "y": 0}, - - {"matrix": [0, 5], "x": 6.5, "y": 0}, - {"matrix": [0, 6], "x": 7.5, "y": 0}, - {"matrix": [0, 7], "x": 8.5, "y": 0}, - {"matrix": [0, 8], "x": 9.5, "y": 0}, - - {"matrix": [0, 9], "x": 11, "y": 0}, - {"matrix": [0, 10], "x": 12, "y": 0}, - {"matrix": [0, 11], "x": 13, "y": 0}, - {"matrix": [0, 12], "x": 14, "y": 0}, - - {"matrix": [0, 13], "x": 15.25, "y": 0}, - {"matrix": [0, 14], "x": 16.25, "y": 0}, - {"matrix": [0, 15], "x": 17.25, "y": 0}, - - {"matrix": [1, 0], "x": 0, "y": 1.5}, - {"matrix": [1, 1], "x": 1, "y": 1.5}, - {"matrix": [1, 2], "x": 2, "y": 1.5}, - {"matrix": [1, 3], "x": 3, "y": 1.5}, - {"matrix": [1, 4], "x": 4, "y": 1.5}, - {"matrix": [1, 5], "x": 5, "y": 1.5}, - {"matrix": [1, 6], "x": 6, "y": 1.5}, - {"matrix": [1, 7], "x": 7, "y": 1.5}, - {"matrix": [1, 8], "x": 8, "y": 1.5}, - {"matrix": [1, 9], "x": 9, "y": 1.5}, - {"matrix": [1, 10], "x": 10, "y": 1.5}, - {"matrix": [1, 11], "x": 11, "y": 1.5}, - {"matrix": [1, 12], "x": 12, "y": 1.5}, - {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2}, - - {"matrix": [1, 14], "x": 15.25, "y": 1.5}, - {"matrix": [1, 15], "x": 16.25, "y": 1.5}, - {"matrix": [2, 15], "x": 17.25, "y": 1.5}, - - {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, - {"matrix": [2, 1], "x": 1.5, "y": 2.5}, - {"matrix": [2, 2], "x": 2.5, "y": 2.5}, - {"matrix": [2, 3], "x": 3.5, "y": 2.5}, - {"matrix": [2, 4], "x": 4.5, "y": 2.5}, - {"matrix": [2, 5], "x": 5.5, "y": 2.5}, - {"matrix": [2, 6], "x": 6.5, "y": 2.5}, - {"matrix": [2, 7], "x": 7.5, "y": 2.5}, - {"matrix": [2, 8], "x": 8.5, "y": 2.5}, - {"matrix": [2, 9], "x": 9.5, "y": 2.5}, - {"matrix": [2, 10], "x": 10.5, "y": 2.5}, - {"matrix": [2, 11], "x": 11.5, "y": 2.5}, - {"matrix": [2, 12], "x": 12.5, "y": 2.5}, - {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5}, - - {"matrix": [2, 14], "x": 15.25, "y": 2.5}, - {"matrix": [3, 14], "x": 16.25, "y": 2.5}, - {"matrix": [3, 15], "x": 17.25, "y": 2.5}, - - {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, - {"matrix": [3, 1], "x": 1.75, "y": 3.5}, - {"matrix": [3, 2], "x": 2.75, "y": 3.5}, - {"matrix": [3, 3], "x": 3.75, "y": 3.5}, - {"matrix": [3, 4], "x": 4.75, "y": 3.5}, - {"matrix": [3, 5], "x": 5.75, "y": 3.5}, - {"matrix": [3, 6], "x": 6.75, "y": 3.5}, - {"matrix": [3, 7], "x": 7.75, "y": 3.5}, - {"matrix": [3, 8], "x": 8.75, "y": 3.5}, - {"matrix": [3, 9], "x": 9.75, "y": 3.5}, - {"matrix": [3, 10], "x": 10.75, "y": 3.5}, - {"matrix": [3, 11], "x": 11.75, "y": 3.5}, - {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25}, - - {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25}, - {"matrix": [4, 2], "x": 2.25, "y": 4.5}, - {"matrix": [4, 3], "x": 3.25, "y": 4.5}, - {"matrix": [4, 4], "x": 4.25, "y": 4.5}, - {"matrix": [4, 5], "x": 5.25, "y": 4.5}, - {"matrix": [4, 6], "x": 6.25, "y": 4.5}, - {"matrix": [4, 7], "x": 7.25, "y": 4.5}, - {"matrix": [4, 8], "x": 8.25, "y": 4.5}, - {"matrix": [4, 9], "x": 9.25, "y": 4.5}, - {"matrix": [4, 10], "x": 10.25, "y": 4.5}, - {"matrix": [4, 11], "x": 11.25, "y": 4.5}, - {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75}, - - {"matrix": [4, 14], "x": 16.25, "y": 4.5}, - - {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5}, - {"matrix": [5, 1], "x": 1.5, "y": 5.5}, - {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5}, - {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7}, - {"matrix": [5, 8], "x": 11, "y": 5.5, "w": 1.5}, - {"matrix": [5, 9], "x": 12.5, "y": 5.5}, - {"matrix": [5, 10], "x": 13.5, "y": 5.5, "w": 1.5}, - - {"matrix": [5, 11], "x": 15.25, "y": 5.5}, - {"matrix": [5, 12], "x": 16.25, "y": 5.5}, - {"matrix": [5, 14], "x": 17.25, "y": 5.5} - ] - }, - "LAYOUT_tkl_iso_tsangan": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - - {"matrix": [0, 1], "x": 2, "y": 0}, - {"matrix": [0, 2], "x": 3, "y": 0}, - {"matrix": [0, 3], "x": 4, "y": 0}, - {"matrix": [0, 4], "x": 5, "y": 0}, - - {"matrix": [0, 5], "x": 6.5, "y": 0}, - {"matrix": [0, 6], "x": 7.5, "y": 0}, - {"matrix": [0, 7], "x": 8.5, "y": 0}, - {"matrix": [0, 8], "x": 9.5, "y": 0}, - - {"matrix": [0, 9], "x": 11, "y": 0}, - {"matrix": [0, 10], "x": 12, "y": 0}, - {"matrix": [0, 11], "x": 13, "y": 0}, - {"matrix": [0, 12], "x": 14, "y": 0}, - - {"matrix": [0, 13], "x": 15.25, "y": 0}, - {"matrix": [0, 14], "x": 16.25, "y": 0}, - {"matrix": [0, 15], "x": 17.25, "y": 0}, - - {"matrix": [1, 0], "x": 0, "y": 1.5}, - {"matrix": [1, 1], "x": 1, "y": 1.5}, - {"matrix": [1, 2], "x": 2, "y": 1.5}, - {"matrix": [1, 3], "x": 3, "y": 1.5}, - {"matrix": [1, 4], "x": 4, "y": 1.5}, - {"matrix": [1, 5], "x": 5, "y": 1.5}, - {"matrix": [1, 6], "x": 6, "y": 1.5}, - {"matrix": [1, 7], "x": 7, "y": 1.5}, - {"matrix": [1, 8], "x": 8, "y": 1.5}, - {"matrix": [1, 9], "x": 9, "y": 1.5}, - {"matrix": [1, 10], "x": 10, "y": 1.5}, - {"matrix": [1, 11], "x": 11, "y": 1.5}, - {"matrix": [1, 12], "x": 12, "y": 1.5}, - {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2}, - - {"matrix": [1, 14], "x": 15.25, "y": 1.5}, - {"matrix": [1, 15], "x": 16.25, "y": 1.5}, - {"matrix": [2, 15], "x": 17.25, "y": 1.5}, - - {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, - {"matrix": [2, 1], "x": 1.5, "y": 2.5}, - {"matrix": [2, 2], "x": 2.5, "y": 2.5}, - {"matrix": [2, 3], "x": 3.5, "y": 2.5}, - {"matrix": [2, 4], "x": 4.5, "y": 2.5}, - {"matrix": [2, 5], "x": 5.5, "y": 2.5}, - {"matrix": [2, 6], "x": 6.5, "y": 2.5}, - {"matrix": [2, 7], "x": 7.5, "y": 2.5}, - {"matrix": [2, 8], "x": 8.5, "y": 2.5}, - {"matrix": [2, 9], "x": 9.5, "y": 2.5}, - {"matrix": [2, 10], "x": 10.5, "y": 2.5}, - {"matrix": [2, 11], "x": 11.5, "y": 2.5}, - {"matrix": [2, 12], "x": 12.5, "y": 2.5}, - - {"matrix": [2, 14], "x": 15.25, "y": 2.5}, - {"matrix": [3, 14], "x": 16.25, "y": 2.5}, - {"matrix": [3, 15], "x": 17.25, "y": 2.5}, - - {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, - {"matrix": [3, 1], "x": 1.75, "y": 3.5}, - {"matrix": [3, 2], "x": 2.75, "y": 3.5}, - {"matrix": [3, 3], "x": 3.75, "y": 3.5}, - {"matrix": [3, 4], "x": 4.75, "y": 3.5}, - {"matrix": [3, 5], "x": 5.75, "y": 3.5}, - {"matrix": [3, 6], "x": 6.75, "y": 3.5}, - {"matrix": [3, 7], "x": 7.75, "y": 3.5}, - {"matrix": [3, 8], "x": 8.75, "y": 3.5}, - {"matrix": [3, 9], "x": 9.75, "y": 3.5}, - {"matrix": [3, 10], "x": 10.75, "y": 3.5}, - {"matrix": [3, 11], "x": 11.75, "y": 3.5}, - {"matrix": [3, 12], "x": 12.75, "y": 3.5}, - {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2}, - - {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25}, - {"matrix": [4, 1], "x": 1.25, "y": 4.5}, - {"matrix": [4, 2], "x": 2.25, "y": 4.5}, - {"matrix": [4, 3], "x": 3.25, "y": 4.5}, - {"matrix": [4, 4], "x": 4.25, "y": 4.5}, - {"matrix": [4, 5], "x": 5.25, "y": 4.5}, - {"matrix": [4, 6], "x": 6.25, "y": 4.5}, - {"matrix": [4, 7], "x": 7.25, "y": 4.5}, - {"matrix": [4, 8], "x": 8.25, "y": 4.5}, - {"matrix": [4, 9], "x": 9.25, "y": 4.5}, - {"matrix": [4, 10], "x": 10.25, "y": 4.5}, - {"matrix": [4, 11], "x": 11.25, "y": 4.5}, - {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75}, - - {"matrix": [4, 14], "x": 16.25, "y": 4.5}, - - {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5}, - {"matrix": [5, 1], "x": 1.5, "y": 5.5}, - {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5}, - {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7}, - {"matrix": [5, 8], "x": 11, "y": 5.5, "w": 1.5}, - {"matrix": [5, 9], "x": 12.5, "y": 5.5}, - {"matrix": [5, 10], "x": 13.5, "y": 5.5, "w": 1.5}, - - {"matrix": [5, 11], "x": 15.25, "y": 5.5}, - {"matrix": [5, 12], "x": 16.25, "y": 5.5}, - {"matrix": [5, 14], "x": 17.25, "y": 5.5} - ] - } - } -} diff --git a/keyboards/matrix/m20add/keyboard.json b/keyboards/matrix/m20add/keyboard.json new file mode 100644 index 0000000000..fc58d242e6 --- /dev/null +++ b/keyboards/matrix/m20add/keyboard.json @@ -0,0 +1,248 @@ +{ + "keyboard_name": "8XV2.0 Additional", + "manufacturer": "Matrix", + "url": "", + "maintainer": "qmk", + "usb": { + "vid": "0x4D58", + "pid": "0x20AD", + "device_version": "0.0.1", + "no_startup_check": true + }, + "rgblight": { + "led_count": 20, + "driver": "custom", + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } + }, + "ws2812": { + "pin": "B4" + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgblight": true + }, + "processor": "STM32F411", + "bootloader": "custom", + "layouts": { + "LAYOUT_tkl_ansi_tsangan": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [0, 2], "x": 3, "y": 0}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0}, + + {"matrix": [0, 5], "x": 6.5, "y": 0}, + {"matrix": [0, 6], "x": 7.5, "y": 0}, + {"matrix": [0, 7], "x": 8.5, "y": 0}, + {"matrix": [0, 8], "x": 9.5, "y": 0}, + + {"matrix": [0, 9], "x": 11, "y": 0}, + {"matrix": [0, 10], "x": 12, "y": 0}, + {"matrix": [0, 11], "x": 13, "y": 0}, + {"matrix": [0, 12], "x": 14, "y": 0}, + + {"matrix": [0, 13], "x": 15.25, "y": 0}, + {"matrix": [0, 14], "x": 16.25, "y": 0}, + {"matrix": [0, 15], "x": 17.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.5}, + {"matrix": [1, 10], "x": 10, "y": 1.5}, + {"matrix": [1, 11], "x": 11, "y": 1.5}, + {"matrix": [1, 12], "x": 12, "y": 1.5}, + {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [1, 14], "x": 15.25, "y": 1.5}, + {"matrix": [1, 15], "x": 16.25, "y": 1.5}, + {"matrix": [2, 15], "x": 17.25, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [2, 14], "x": 15.25, "y": 2.5}, + {"matrix": [3, 14], "x": 16.25, "y": 2.5}, + {"matrix": [3, 15], "x": 17.25, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3.5}, + {"matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"matrix": [3, 11], "x": 11.75, "y": 3.5}, + {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.5}, + {"matrix": [4, 3], "x": 3.25, "y": 4.5}, + {"matrix": [4, 4], "x": 4.25, "y": 4.5}, + {"matrix": [4, 5], "x": 5.25, "y": 4.5}, + {"matrix": [4, 6], "x": 6.25, "y": 4.5}, + {"matrix": [4, 7], "x": 7.25, "y": 4.5}, + {"matrix": [4, 8], "x": 8.25, "y": 4.5}, + {"matrix": [4, 9], "x": 9.25, "y": 4.5}, + {"matrix": [4, 10], "x": 10.25, "y": 4.5}, + {"matrix": [4, 11], "x": 11.25, "y": 4.5}, + {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"matrix": [4, 14], "x": 16.25, "y": 4.5}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5.5}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5}, + {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7}, + {"matrix": [5, 8], "x": 11, "y": 5.5, "w": 1.5}, + {"matrix": [5, 9], "x": 12.5, "y": 5.5}, + {"matrix": [5, 10], "x": 13.5, "y": 5.5, "w": 1.5}, + + {"matrix": [5, 11], "x": 15.25, "y": 5.5}, + {"matrix": [5, 12], "x": 16.25, "y": 5.5}, + {"matrix": [5, 14], "x": 17.25, "y": 5.5} + ] + }, + "LAYOUT_tkl_iso_tsangan": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [0, 2], "x": 3, "y": 0}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0}, + + {"matrix": [0, 5], "x": 6.5, "y": 0}, + {"matrix": [0, 6], "x": 7.5, "y": 0}, + {"matrix": [0, 7], "x": 8.5, "y": 0}, + {"matrix": [0, 8], "x": 9.5, "y": 0}, + + {"matrix": [0, 9], "x": 11, "y": 0}, + {"matrix": [0, 10], "x": 12, "y": 0}, + {"matrix": [0, 11], "x": 13, "y": 0}, + {"matrix": [0, 12], "x": 14, "y": 0}, + + {"matrix": [0, 13], "x": 15.25, "y": 0}, + {"matrix": [0, 14], "x": 16.25, "y": 0}, + {"matrix": [0, 15], "x": 17.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.5}, + {"matrix": [1, 10], "x": 10, "y": 1.5}, + {"matrix": [1, 11], "x": 11, "y": 1.5}, + {"matrix": [1, 12], "x": 12, "y": 1.5}, + {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [1, 14], "x": 15.25, "y": 1.5}, + {"matrix": [1, 15], "x": 16.25, "y": 1.5}, + {"matrix": [2, 15], "x": 17.25, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + + {"matrix": [2, 14], "x": 15.25, "y": 2.5}, + {"matrix": [3, 14], "x": 16.25, "y": 2.5}, + {"matrix": [3, 15], "x": 17.25, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3.5}, + {"matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"matrix": [3, 11], "x": 11.75, "y": 3.5}, + {"matrix": [3, 12], "x": 12.75, "y": 3.5}, + {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.5}, + {"matrix": [4, 2], "x": 2.25, "y": 4.5}, + {"matrix": [4, 3], "x": 3.25, "y": 4.5}, + {"matrix": [4, 4], "x": 4.25, "y": 4.5}, + {"matrix": [4, 5], "x": 5.25, "y": 4.5}, + {"matrix": [4, 6], "x": 6.25, "y": 4.5}, + {"matrix": [4, 7], "x": 7.25, "y": 4.5}, + {"matrix": [4, 8], "x": 8.25, "y": 4.5}, + {"matrix": [4, 9], "x": 9.25, "y": 4.5}, + {"matrix": [4, 10], "x": 10.25, "y": 4.5}, + {"matrix": [4, 11], "x": 11.25, "y": 4.5}, + {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"matrix": [4, 14], "x": 16.25, "y": 4.5}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5.5}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5}, + {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7}, + {"matrix": [5, 8], "x": 11, "y": 5.5, "w": 1.5}, + {"matrix": [5, 9], "x": 12.5, "y": 5.5}, + {"matrix": [5, 10], "x": 13.5, "y": 5.5, "w": 1.5}, + + {"matrix": [5, 11], "x": 15.25, "y": 5.5}, + {"matrix": [5, 12], "x": 16.25, "y": 5.5}, + {"matrix": [5, 14], "x": 17.25, "y": 5.5} + ] + } + } +} diff --git a/keyboards/matrix/m20add/rules.mk b/keyboards/matrix/m20add/rules.mk index 150bd24e30..980cf9518b 100644 --- a/keyboards/matrix/m20add/rules.mk +++ b/keyboards/matrix/m20add/rules.mk @@ -1,18 +1,7 @@ -# MCU name -MCU = STM32F411 - -# Linker script to use -# - it should exist either in /os/common/ports/ARMCMx/compilers/GCC/ld/ -# or /ld/ +# custom bootloader MCU_LDSCRIPT = m20add_boot - -# Board: it should exist either in /os/hal/boards/ -# or /boards BOARD = ST_NUCLEO64_F411RE -# Bootloader selection -BOOTLOADER = custom - CUSTOM_MATRIX = lite # project specific files SRC += matrix.c tca6424.c rgb_ring.c drivers/led/issi/is31fl3731.c diff --git a/keyboards/matrix/noah/info.json b/keyboards/matrix/noah/info.json deleted file mode 100644 index 959c3c8c9c..0000000000 --- a/keyboards/matrix/noah/info.json +++ /dev/null @@ -1,469 +0,0 @@ -{ - "keyboard_name": "NOAH", - "manufacturer": "Matrix", - "url": "", - "maintainer": "astro", - "usb": { - "vid": "0x4D58", - "pid": "0x0065", - "device_version": "0.0.1", - "no_startup_check": true - }, - "rgblight": { - "driver": "custom", - "led_count": 7, - "animations": { - "breathing": true, - "rainbow_mood": true, - "rainbow_swirl": true, - "snake": true, - "knight": true, - "christmas": true, - "static_gradient": true, - "rgb_test": true, - "alternating": true, - "twinkle": true - } - }, - "ws2812": { - "pin": "B1" - }, - "rgb_matrix": { - "animations": { - "alphas_mods": true, - "gradient_up_down": true, - "gradient_left_right": true, - "breathing": true, - "band_sat": true, - "band_val": true, - "band_pinwheel_sat": true, - "band_pinwheel_val": true, - "band_spiral_sat": true, - "band_spiral_val": true, - "cycle_all": true, - "cycle_left_right": true, - "cycle_up_down": true, - "rainbow_moving_chevron": true, - "cycle_out_in": true, - "cycle_out_in_dual": true, - "cycle_pinwheel": true, - "cycle_spiral": true, - "dual_beacon": true, - "rainbow_beacon": true, - "rainbow_pinwheels": true, - "raindrops": true, - "jellybean_raindrops": true, - "hue_breathing": true, - "hue_pendulum": true, - "hue_wave": true, - "pixel_rain": true, - "pixel_flow": true, - "pixel_fractal": true, - "typing_heatmap": true, - "digital_rain": true, - "solid_reactive_simple": true, - "solid_reactive": true, - "solid_reactive_wide": true, - "solid_reactive_multiwide": true, - "solid_reactive_cross": true, - "solid_reactive_multicross": true, - "solid_reactive_nexus": true, - "solid_reactive_multinexus": true, - "splash": true, - "multisplash": true, - "solid_splash": true, - "solid_multisplash": true - }, - "driver": "is31fl3731" - }, - "features": { - "bootmagic": true, - "mousekey": true, - "extrakey": true, - "rgblight": true, - "rgb_matrix": true - }, - "community_layouts": ["65_iso_blocker"], - "layouts": { - "LAYOUT_default": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, - {"matrix": [0, 6], "x": 6, "y": 0}, - {"matrix": [0, 7], "x": 7, "y": 0}, - {"matrix": [0, 8], "x": 8, "y": 0}, - {"matrix": [0, 9], "x": 9, "y": 0}, - {"matrix": [0, 10], "x": 10, "y": 0}, - {"matrix": [0, 11], "x": 11, "y": 0}, - {"matrix": [0, 12], "x": 12, "y": 0}, - {"matrix": [0, 13], "x": 13, "y": 0}, - {"matrix": [0, 14], "x": 14, "y": 0}, - {"matrix": [4, 14], "x": 15, "y": 0}, - - {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, - {"matrix": [1, 1], "x": 1.5, "y": 1}, - {"matrix": [1, 2], "x": 2.5, "y": 1}, - {"matrix": [1, 3], "x": 3.5, "y": 1}, - {"matrix": [1, 4], "x": 4.5, "y": 1}, - {"matrix": [1, 5], "x": 5.5, "y": 1}, - {"matrix": [1, 6], "x": 6.5, "y": 1}, - {"matrix": [1, 7], "x": 7.5, "y": 1}, - {"matrix": [1, 8], "x": 8.5, "y": 1}, - {"matrix": [1, 9], "x": 9.5, "y": 1}, - {"matrix": [1, 10], "x": 10.5, "y": 1}, - {"matrix": [1, 11], "x": 11.5, "y": 1}, - {"matrix": [1, 12], "x": 12.5, "y": 1}, - {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, - {"matrix": [4, 11], "x": 15, "y": 1}, - - {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, - {"matrix": [2, 1], "x": 1.75, "y": 2}, - {"matrix": [2, 2], "x": 2.75, "y": 2}, - {"matrix": [2, 3], "x": 3.75, "y": 2}, - {"matrix": [2, 4], "x": 4.75, "y": 2}, - {"matrix": [2, 5], "x": 5.75, "y": 2}, - {"matrix": [2, 6], "x": 6.75, "y": 2}, - {"matrix": [2, 7], "x": 7.75, "y": 2}, - {"matrix": [2, 8], "x": 8.75, "y": 2}, - {"matrix": [2, 9], "x": 9.75, "y": 2}, - {"matrix": [2, 10], "x": 10.75, "y": 2}, - {"matrix": [2, 11], "x": 11.75, "y": 2}, - {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, - {"matrix": [4, 12], "x": 15, "y": 2}, - - {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, - {"matrix": [3, 2], "x": 2.25, "y": 3}, - {"matrix": [3, 3], "x": 3.25, "y": 3}, - {"matrix": [3, 4], "x": 4.25, "y": 3}, - {"matrix": [3, 5], "x": 5.25, "y": 3}, - {"matrix": [3, 6], "x": 6.25, "y": 3}, - {"matrix": [3, 7], "x": 7.25, "y": 3}, - {"matrix": [3, 8], "x": 8.25, "y": 3}, - {"matrix": [3, 9], "x": 9.25, "y": 3}, - {"matrix": [3, 10], "x": 10.25, "y": 3}, - {"matrix": [3, 11], "x": 11.25, "y": 3}, - {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, - {"matrix": [3, 13], "x": 14, "y": 3}, - {"matrix": [4, 13], "x": 15, "y": 3}, - - {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, - {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, - {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, - {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25}, - {"matrix": [4, 6], "x": 10, "y": 4, "w": 1.25}, - {"matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25}, - {"matrix": [4, 8], "x": 13, "y": 4}, - {"matrix": [4, 9], "x": 14, "y": 4}, - {"matrix": [4, 10], "x": 15, "y": 4} - ] - }, - "LAYOUT_default_splitspace": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, - {"matrix": [0, 6], "x": 6, "y": 0}, - {"matrix": [0, 7], "x": 7, "y": 0}, - {"matrix": [0, 8], "x": 8, "y": 0}, - {"matrix": [0, 9], "x": 9, "y": 0}, - {"matrix": [0, 10], "x": 10, "y": 0}, - {"matrix": [0, 11], "x": 11, "y": 0}, - {"matrix": [0, 12], "x": 12, "y": 0}, - {"matrix": [0, 13], "x": 13, "y": 0}, - {"matrix": [0, 14], "x": 14, "y": 0}, - {"matrix": [4, 14], "x": 15, "y": 0}, - - {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, - {"matrix": [1, 1], "x": 1.5, "y": 1}, - {"matrix": [1, 2], "x": 2.5, "y": 1}, - {"matrix": [1, 3], "x": 3.5, "y": 1}, - {"matrix": [1, 4], "x": 4.5, "y": 1}, - {"matrix": [1, 5], "x": 5.5, "y": 1}, - {"matrix": [1, 6], "x": 6.5, "y": 1}, - {"matrix": [1, 7], "x": 7.5, "y": 1}, - {"matrix": [1, 8], "x": 8.5, "y": 1}, - {"matrix": [1, 9], "x": 9.5, "y": 1}, - {"matrix": [1, 10], "x": 10.5, "y": 1}, - {"matrix": [1, 11], "x": 11.5, "y": 1}, - {"matrix": [1, 12], "x": 12.5, "y": 1}, - {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, - {"matrix": [4, 11], "x": 15, "y": 1}, - - {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, - {"matrix": [2, 1], "x": 1.75, "y": 2}, - {"matrix": [2, 2], "x": 2.75, "y": 2}, - {"matrix": [2, 3], "x": 3.75, "y": 2}, - {"matrix": [2, 4], "x": 4.75, "y": 2}, - {"matrix": [2, 5], "x": 5.75, "y": 2}, - {"matrix": [2, 6], "x": 6.75, "y": 2}, - {"matrix": [2, 7], "x": 7.75, "y": 2}, - {"matrix": [2, 8], "x": 8.75, "y": 2}, - {"matrix": [2, 9], "x": 9.75, "y": 2}, - {"matrix": [2, 10], "x": 10.75, "y": 2}, - {"matrix": [2, 11], "x": 11.75, "y": 2}, - {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, - {"matrix": [4, 12], "x": 15, "y": 2}, - - {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, - {"matrix": [3, 2], "x": 2.25, "y": 3}, - {"matrix": [3, 3], "x": 3.25, "y": 3}, - {"matrix": [3, 4], "x": 4.25, "y": 3}, - {"matrix": [3, 5], "x": 5.25, "y": 3}, - {"matrix": [3, 6], "x": 6.25, "y": 3}, - {"matrix": [3, 7], "x": 7.25, "y": 3}, - {"matrix": [3, 8], "x": 8.25, "y": 3}, - {"matrix": [3, 9], "x": 9.25, "y": 3}, - {"matrix": [3, 10], "x": 10.25, "y": 3}, - {"matrix": [3, 11], "x": 11.25, "y": 3}, - {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, - {"matrix": [3, 13], "x": 14, "y": 3}, - {"matrix": [4, 13], "x": 15, "y": 3}, - - {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, - {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, - {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, - {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25}, - {"matrix": [4, 4], "x": 6, "y": 4, "w": 1.25}, - {"matrix": [4, 5], "x": 7.25, "y": 4, "w": 2.75}, - {"matrix": [4, 6], "x": 10, "y": 4, "w": 1.25}, - {"matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25}, - {"matrix": [4, 8], "x": 13, "y": 4}, - {"matrix": [4, 9], "x": 14, "y": 4}, - {"matrix": [4, 10], "x": 15, "y": 4} - ] - }, - "LAYOUT_wkl": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, - {"matrix": [0, 6], "x": 6, "y": 0}, - {"matrix": [0, 7], "x": 7, "y": 0}, - {"matrix": [0, 8], "x": 8, "y": 0}, - {"matrix": [0, 9], "x": 9, "y": 0}, - {"matrix": [0, 10], "x": 10, "y": 0}, - {"matrix": [0, 11], "x": 11, "y": 0}, - {"matrix": [0, 12], "x": 12, "y": 0}, - {"matrix": [0, 13], "x": 13, "y": 0}, - {"matrix": [0, 14], "x": 14, "y": 0}, - {"matrix": [4, 14], "x": 15, "y": 0}, - - {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, - {"matrix": [1, 1], "x": 1.5, "y": 1}, - {"matrix": [1, 2], "x": 2.5, "y": 1}, - {"matrix": [1, 3], "x": 3.5, "y": 1}, - {"matrix": [1, 4], "x": 4.5, "y": 1}, - {"matrix": [1, 5], "x": 5.5, "y": 1}, - {"matrix": [1, 6], "x": 6.5, "y": 1}, - {"matrix": [1, 7], "x": 7.5, "y": 1}, - {"matrix": [1, 8], "x": 8.5, "y": 1}, - {"matrix": [1, 9], "x": 9.5, "y": 1}, - {"matrix": [1, 10], "x": 10.5, "y": 1}, - {"matrix": [1, 11], "x": 11.5, "y": 1}, - {"matrix": [1, 12], "x": 12.5, "y": 1}, - {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, - {"matrix": [4, 11], "x": 15, "y": 1}, - - {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, - {"matrix": [2, 1], "x": 1.75, "y": 2}, - {"matrix": [2, 2], "x": 2.75, "y": 2}, - {"matrix": [2, 3], "x": 3.75, "y": 2}, - {"matrix": [2, 4], "x": 4.75, "y": 2}, - {"matrix": [2, 5], "x": 5.75, "y": 2}, - {"matrix": [2, 6], "x": 6.75, "y": 2}, - {"matrix": [2, 7], "x": 7.75, "y": 2}, - {"matrix": [2, 8], "x": 8.75, "y": 2}, - {"matrix": [2, 9], "x": 9.75, "y": 2}, - {"matrix": [2, 10], "x": 10.75, "y": 2}, - {"matrix": [2, 11], "x": 11.75, "y": 2}, - {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, - {"matrix": [4, 12], "x": 15, "y": 2}, - - {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, - {"matrix": [3, 2], "x": 2.25, "y": 3}, - {"matrix": [3, 3], "x": 3.25, "y": 3}, - {"matrix": [3, 4], "x": 4.25, "y": 3}, - {"matrix": [3, 5], "x": 5.25, "y": 3}, - {"matrix": [3, 6], "x": 6.25, "y": 3}, - {"matrix": [3, 7], "x": 7.25, "y": 3}, - {"matrix": [3, 8], "x": 8.25, "y": 3}, - {"matrix": [3, 9], "x": 9.25, "y": 3}, - {"matrix": [3, 10], "x": 10.25, "y": 3}, - {"matrix": [3, 11], "x": 11.25, "y": 3}, - {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, - {"matrix": [3, 13], "x": 14, "y": 3}, - {"matrix": [4, 13], "x": 15, "y": 3}, - - {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, - {"matrix": [4, 1], "x": 1.5, "y": 4}, - {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, - {"matrix": [4, 4], "x": 4, "y": 4, "w": 7}, - {"matrix": [4, 7], "x": 11, "y": 4, "w": 1.5}, - {"matrix": [4, 8], "x": 13, "y": 4}, - {"matrix": [4, 9], "x": 14, "y": 4}, - {"matrix": [4, 10], "x": 15, "y": 4} - ] - }, - "LAYOUT_iso": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, - {"matrix": [0, 6], "x": 6, "y": 0}, - {"matrix": [0, 7], "x": 7, "y": 0}, - {"matrix": [0, 8], "x": 8, "y": 0}, - {"matrix": [0, 9], "x": 9, "y": 0}, - {"matrix": [0, 10], "x": 10, "y": 0}, - {"matrix": [0, 11], "x": 11, "y": 0}, - {"matrix": [0, 12], "x": 12, "y": 0}, - {"matrix": [0, 14], "x": 13, "y": 0, "w": 2}, - {"matrix": [4, 14], "x": 15, "y": 0}, - - {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, - {"matrix": [1, 1], "x": 1.5, "y": 1}, - {"matrix": [1, 2], "x": 2.5, "y": 1}, - {"matrix": [1, 3], "x": 3.5, "y": 1}, - {"matrix": [1, 4], "x": 4.5, "y": 1}, - {"matrix": [1, 5], "x": 5.5, "y": 1}, - {"matrix": [1, 6], "x": 6.5, "y": 1}, - {"matrix": [1, 7], "x": 7.5, "y": 1}, - {"matrix": [1, 8], "x": 8.5, "y": 1}, - {"matrix": [1, 9], "x": 9.5, "y": 1}, - {"matrix": [1, 10], "x": 10.5, "y": 1}, - {"matrix": [1, 11], "x": 11.5, "y": 1}, - {"matrix": [1, 12], "x": 12.5, "y": 1}, - {"matrix": [4, 11], "x": 15, "y": 1}, - - {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, - {"matrix": [2, 1], "x": 1.75, "y": 2}, - {"matrix": [2, 2], "x": 2.75, "y": 2}, - {"matrix": [2, 3], "x": 3.75, "y": 2}, - {"matrix": [2, 4], "x": 4.75, "y": 2}, - {"matrix": [2, 5], "x": 5.75, "y": 2}, - {"matrix": [2, 6], "x": 6.75, "y": 2}, - {"matrix": [2, 7], "x": 7.75, "y": 2}, - {"matrix": [2, 8], "x": 8.75, "y": 2}, - {"matrix": [2, 9], "x": 9.75, "y": 2}, - {"matrix": [2, 10], "x": 10.75, "y": 2}, - {"matrix": [2, 11], "x": 11.75, "y": 2}, - {"matrix": [2, 12], "x": 12.75, "y": 2}, - {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, - {"matrix": [4, 12], "x": 15, "y": 2}, - - {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, - {"matrix": [3, 1], "x": 1.25, "y": 3}, - {"matrix": [3, 2], "x": 2.25, "y": 3}, - {"matrix": [3, 3], "x": 3.25, "y": 3}, - {"matrix": [3, 4], "x": 4.25, "y": 3}, - {"matrix": [3, 5], "x": 5.25, "y": 3}, - {"matrix": [3, 6], "x": 6.25, "y": 3}, - {"matrix": [3, 7], "x": 7.25, "y": 3}, - {"matrix": [3, 8], "x": 8.25, "y": 3}, - {"matrix": [3, 9], "x": 9.25, "y": 3}, - {"matrix": [3, 10], "x": 10.25, "y": 3}, - {"matrix": [3, 11], "x": 11.25, "y": 3}, - {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, - {"matrix": [3, 13], "x": 14, "y": 3}, - {"matrix": [4, 13], "x": 15, "y": 3}, - - {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, - {"matrix": [4, 1], "x": 1.5, "y": 4}, - {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, - {"matrix": [4, 4], "x": 4, "y": 4, "w": 7}, - {"matrix": [4, 7], "x": 11, "y": 4, "w": 1.5}, - {"matrix": [4, 8], "x": 13, "y": 4}, - {"matrix": [4, 9], "x": 14, "y": 4}, - {"matrix": [4, 10], "x": 15, "y": 4} - ] - }, - "LAYOUT_65_iso_blocker": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, - {"matrix": [0, 6], "x": 6, "y": 0}, - {"matrix": [0, 7], "x": 7, "y": 0}, - {"matrix": [0, 8], "x": 8, "y": 0}, - {"matrix": [0, 9], "x": 9, "y": 0}, - {"matrix": [0, 10], "x": 10, "y": 0}, - {"matrix": [0, 11], "x": 11, "y": 0}, - {"matrix": [0, 12], "x": 12, "y": 0}, - {"matrix": [0, 14], "x": 13, "y": 0, "w": 2}, - {"matrix": [4, 14], "x": 15, "y": 0}, - - {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, - {"matrix": [1, 1], "x": 1.5, "y": 1}, - {"matrix": [1, 2], "x": 2.5, "y": 1}, - {"matrix": [1, 3], "x": 3.5, "y": 1}, - {"matrix": [1, 4], "x": 4.5, "y": 1}, - {"matrix": [1, 5], "x": 5.5, "y": 1}, - {"matrix": [1, 6], "x": 6.5, "y": 1}, - {"matrix": [1, 7], "x": 7.5, "y": 1}, - {"matrix": [1, 8], "x": 8.5, "y": 1}, - {"matrix": [1, 9], "x": 9.5, "y": 1}, - {"matrix": [1, 10], "x": 10.5, "y": 1}, - {"matrix": [1, 11], "x": 11.5, "y": 1}, - {"matrix": [1, 12], "x": 12.5, "y": 1}, - {"matrix": [4, 11], "x": 15, "y": 1}, - - {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, - {"matrix": [2, 1], "x": 1.75, "y": 2}, - {"matrix": [2, 2], "x": 2.75, "y": 2}, - {"matrix": [2, 3], "x": 3.75, "y": 2}, - {"matrix": [2, 4], "x": 4.75, "y": 2}, - {"matrix": [2, 5], "x": 5.75, "y": 2}, - {"matrix": [2, 6], "x": 6.75, "y": 2}, - {"matrix": [2, 7], "x": 7.75, "y": 2}, - {"matrix": [2, 8], "x": 8.75, "y": 2}, - {"matrix": [2, 9], "x": 9.75, "y": 2}, - {"matrix": [2, 10], "x": 10.75, "y": 2}, - {"matrix": [2, 11], "x": 11.75, "y": 2}, - {"matrix": [2, 12], "x": 12.75, "y": 2}, - {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, - {"matrix": [4, 12], "x": 15, "y": 2}, - - {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, - {"matrix": [3, 1], "x": 1.25, "y": 3}, - {"matrix": [3, 2], "x": 2.25, "y": 3}, - {"matrix": [3, 3], "x": 3.25, "y": 3}, - {"matrix": [3, 4], "x": 4.25, "y": 3}, - {"matrix": [3, 5], "x": 5.25, "y": 3}, - {"matrix": [3, 6], "x": 6.25, "y": 3}, - {"matrix": [3, 7], "x": 7.25, "y": 3}, - {"matrix": [3, 8], "x": 8.25, "y": 3}, - {"matrix": [3, 9], "x": 9.25, "y": 3}, - {"matrix": [3, 10], "x": 10.25, "y": 3}, - {"matrix": [3, 11], "x": 11.25, "y": 3}, - {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, - {"matrix": [3, 13], "x": 14, "y": 3}, - {"matrix": [4, 13], "x": 15, "y": 3}, - - {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, - {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, - {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, - {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25}, - {"matrix": [4, 6], "x": 10, "y": 4, "w": 1.25}, - {"matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25}, - {"matrix": [4, 8], "x": 13, "y": 4}, - {"matrix": [4, 9], "x": 14, "y": 4}, - {"matrix": [4, 10], "x": 15, "y": 4} - ] - } - } -} diff --git a/keyboards/matrix/noah/keyboard.json b/keyboards/matrix/noah/keyboard.json new file mode 100644 index 0000000000..eb13e16aa2 --- /dev/null +++ b/keyboards/matrix/noah/keyboard.json @@ -0,0 +1,471 @@ +{ + "keyboard_name": "NOAH", + "manufacturer": "Matrix", + "url": "", + "maintainer": "astro", + "usb": { + "vid": "0x4D58", + "pid": "0x0065", + "device_version": "0.0.1", + "no_startup_check": true + }, + "rgblight": { + "driver": "custom", + "led_count": 7, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } + }, + "ws2812": { + "pin": "B1" + }, + "rgb_matrix": { + "animations": { + "alphas_mods": true, + "gradient_up_down": true, + "gradient_left_right": true, + "breathing": true, + "band_sat": true, + "band_val": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_up_down": true, + "rainbow_moving_chevron": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "dual_beacon": true, + "rainbow_beacon": true, + "rainbow_pinwheels": true, + "raindrops": true, + "jellybean_raindrops": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "pixel_rain": true, + "pixel_flow": true, + "pixel_fractal": true, + "typing_heatmap": true, + "digital_rain": true, + "solid_reactive_simple": true, + "solid_reactive": true, + "solid_reactive_wide": true, + "solid_reactive_multiwide": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_nexus": true, + "solid_reactive_multinexus": true, + "splash": true, + "multisplash": true, + "solid_splash": true, + "solid_multisplash": true + }, + "driver": "is31fl3731" + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgblight": true, + "rgb_matrix": true + }, + "processor": "STM32F411", + "bootloader": "custom", + "community_layouts": ["65_iso_blocker"], + "layouts": { + "LAYOUT_default": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [4, 14], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [4, 11], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [4, 12], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [4, 13], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 6], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 8], "x": 13, "y": 4}, + {"matrix": [4, 9], "x": 14, "y": 4}, + {"matrix": [4, 10], "x": 15, "y": 4} + ] + }, + "LAYOUT_default_splitspace": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [4, 14], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [4, 11], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [4, 12], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [4, 13], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25}, + {"matrix": [4, 4], "x": 6, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 7.25, "y": 4, "w": 2.75}, + {"matrix": [4, 6], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 8], "x": 13, "y": 4}, + {"matrix": [4, 9], "x": 14, "y": 4}, + {"matrix": [4, 10], "x": 15, "y": 4} + ] + }, + "LAYOUT_wkl": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [4, 14], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [4, 11], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [4, 12], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [4, 13], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 4], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 7], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 8], "x": 13, "y": 4}, + {"matrix": [4, 9], "x": 14, "y": 4}, + {"matrix": [4, 10], "x": 15, "y": 4} + ] + }, + "LAYOUT_iso": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 14], "x": 13, "y": 0, "w": 2}, + {"matrix": [4, 14], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [4, 11], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [4, 12], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [4, 13], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 4], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 7], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 8], "x": 13, "y": 4}, + {"matrix": [4, 9], "x": 14, "y": 4}, + {"matrix": [4, 10], "x": 15, "y": 4} + ] + }, + "LAYOUT_65_iso_blocker": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 14], "x": 13, "y": 0, "w": 2}, + {"matrix": [4, 14], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [4, 11], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [4, 12], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [4, 13], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 6], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 8], "x": 13, "y": 4}, + {"matrix": [4, 9], "x": 14, "y": 4}, + {"matrix": [4, 10], "x": 15, "y": 4} + ] + } + } +} diff --git a/keyboards/matrix/noah/rules.mk b/keyboards/matrix/noah/rules.mk index d1c19f36ff..407c120a52 100644 --- a/keyboards/matrix/noah/rules.mk +++ b/keyboards/matrix/noah/rules.mk @@ -1,18 +1,7 @@ -# MCU name -MCU = STM32F411 - -# Linker script to use -# - it should exist either in /os/common/ports/ARMCMx/compilers/GCC/ld/ -# or /ld/ +# custom bootloader MCU_LDSCRIPT = noah_boot - -# Board: it should exist either in /os/hal/boards/ -# or /boards BOARD = ST_NUCLEO64_F411RE -# Bootloader selection -BOOTLOADER = custom - WS2812_DRIVER_REQUIRED = yes CUSTOM_MATRIX = yes diff --git a/keyboards/rgbkb/pan/rev1/32a/info.json b/keyboards/rgbkb/pan/rev1/32a/info.json deleted file mode 100644 index e4ac3eeecb..0000000000 --- a/keyboards/rgbkb/pan/rev1/32a/info.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "matrix_pins": { - "cols": ["C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0"], - "rows": ["D7", "D1", "D5", "D6", "C2"] - }, - "diode_direction": "COL2ROW", - "processor": "atmega32a", - "bootloader": "usbasploader", - "encoder": { - "rotary": [ - {"pin_a": "B0", "pin_b": "B1"}, - {"pin_a": "D0", "pin_b": "B2"} - ] - }, - "ws2812": { - "pin": "B3" - } -} diff --git a/keyboards/rgbkb/pan/rev1/32a/keyboard.json b/keyboards/rgbkb/pan/rev1/32a/keyboard.json new file mode 100644 index 0000000000..e4ac3eeecb --- /dev/null +++ b/keyboards/rgbkb/pan/rev1/32a/keyboard.json @@ -0,0 +1,18 @@ +{ + "matrix_pins": { + "cols": ["C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0"], + "rows": ["D7", "D1", "D5", "D6", "C2"] + }, + "diode_direction": "COL2ROW", + "processor": "atmega32a", + "bootloader": "usbasploader", + "encoder": { + "rotary": [ + {"pin_a": "B0", "pin_b": "B1"}, + {"pin_a": "D0", "pin_b": "B2"} + ] + }, + "ws2812": { + "pin": "B3" + } +} diff --git a/keyboards/rgbkb/sol/rev1/info.json b/keyboards/rgbkb/sol/rev1/info.json deleted file mode 100644 index 16b61d9e02..0000000000 --- a/keyboards/rgbkb/sol/rev1/info.json +++ /dev/null @@ -1,187 +0,0 @@ -{ - "keyboard_name": "Sol", - "manufacturer": "RGBKB", - "url": "", - "maintainer": "Legonut", - "usb": { - "vid": "0xFEED", - "pid": "0x3060", - "device_version": "0.0.1" - }, - "rgb_matrix": { - "animations": { - "alphas_mods": true, - "gradient_up_down": true, - "gradient_left_right": true, - "breathing": true, - "band_sat": true, - "band_val": true, - "band_pinwheel_sat": true, - "band_pinwheel_val": true, - "band_spiral_sat": true, - "band_spiral_val": true, - "cycle_all": true, - "cycle_left_right": true, - "cycle_up_down": true, - "rainbow_moving_chevron": true, - "cycle_out_in": true, - "cycle_out_in_dual": true, - "cycle_pinwheel": true, - "cycle_spiral": true, - "dual_beacon": true, - "rainbow_beacon": true, - "rainbow_pinwheels": true, - "raindrops": true, - "jellybean_raindrops": true, - "hue_breathing": true, - "hue_pendulum": true, - "hue_wave": true, - "pixel_rain": true, - "pixel_flow": true, - "pixel_fractal": true, - "typing_heatmap": true, - "digital_rain": true, - "solid_reactive_simple": true, - "solid_reactive": true, - "solid_reactive_wide": true, - "solid_reactive_multiwide": true, - "solid_reactive_cross": true, - "solid_reactive_multicross": true, - "solid_reactive_nexus": true, - "solid_reactive_multinexus": true, - "splash": true, - "multisplash": true, - "solid_splash": true, - "solid_multisplash": true - }, - "center_point": [112, 35], - "driver": "ws2812" - }, - "rgblight": { - "animations": { - "breathing": true, - "rainbow_mood": true, - "rainbow_swirl": true, - "snake": true, - "knight": true, - "christmas": true, - "static_gradient": true, - "rgb_test": true, - "alternating": true, - "twinkle": true - } - }, - "matrix_pins": { - "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7"], - "rows": ["C6", "B6", "B5", "B4", "D7", "E6"] - }, - "diode_direction": "COL2ROW", - "encoder": { - "rotary": [ - {"pin_a": "D2", "pin_b": "D6"} - ] - }, - "split": { - "enabled": true, - "soft_serial_pin": "D3" - }, - "tapping": { - "term": 150 - }, - "ws2812": { - "pin": "B3" - }, - "processor": "atmega32u4", - "bootloader": "qmk-dfu", - "layouts": { - "LAYOUT": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, - {"matrix": [0, 1], "x": 1.5, "y": 0}, - {"matrix": [0, 2], "x": 2.5, "y": 0}, - {"matrix": [0, 3], "x": 3.5, "y": 0}, - {"matrix": [0, 4], "x": 4.5, "y": 0}, - {"matrix": [0, 5], "x": 5.5, "y": 0}, - {"matrix": [0, 6], "x": 6.75, "y": 0}, - - {"matrix": [6, 6], "x": 9.25, "y": 0}, - {"matrix": [6, 5], "x": 10.5, "y": 0}, - {"matrix": [6, 4], "x": 11.5, "y": 0}, - {"matrix": [6, 3], "x": 12.5, "y": 0}, - {"matrix": [6, 2], "x": 13.5, "y": 0}, - {"matrix": [6, 1], "x": 14.5, "y": 0}, - {"matrix": [6, 0], "x": 15.5, "y": 0, "w": 1.5}, - - {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, - {"matrix": [1, 1], "x": 1.5, "y": 1}, - {"matrix": [1, 2], "x": 2.5, "y": 1}, - {"matrix": [1, 3], "x": 3.5, "y": 1}, - {"matrix": [1, 4], "x": 4.5, "y": 1}, - {"matrix": [1, 5], "x": 5.5, "y": 1}, - {"matrix": [1, 6], "x": 6.75, "y": 1}, - - {"matrix": [7, 6], "x": 9.25, "y": 1}, - {"matrix": [7, 5], "x": 10.5, "y": 1}, - {"matrix": [7, 4], "x": 11.5, "y": 1}, - {"matrix": [7, 3], "x": 12.5, "y": 1}, - {"matrix": [7, 2], "x": 13.5, "y": 1}, - {"matrix": [7, 1], "x": 14.5, "y": 1}, - {"matrix": [7, 0], "x": 15.5, "y": 1, "w": 1.5}, - - {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, - {"matrix": [2, 1], "x": 1.5, "y": 2}, - {"matrix": [2, 2], "x": 2.5, "y": 2}, - {"matrix": [2, 3], "x": 3.5, "y": 2}, - {"matrix": [2, 4], "x": 4.5, "y": 2}, - {"matrix": [2, 5], "x": 5.5, "y": 2}, - {"matrix": [2, 6], "x": 6.75, "y": 2}, - - {"matrix": [8, 6], "x": 9.25, "y": 2}, - {"matrix": [8, 5], "x": 10.5, "y": 2}, - {"matrix": [8, 4], "x": 11.5, "y": 2}, - {"matrix": [8, 3], "x": 12.5, "y": 2}, - {"matrix": [8, 2], "x": 13.5, "y": 2}, - {"matrix": [8, 1], "x": 14.5, "y": 2}, - {"matrix": [8, 0], "x": 15.5, "y": 2, "w": 1.5}, - - {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5}, - {"matrix": [3, 1], "x": 1.5, "y": 3}, - {"matrix": [3, 2], "x": 2.5, "y": 3}, - {"matrix": [3, 3], "x": 3.5, "y": 3}, - {"matrix": [3, 4], "x": 4.5, "y": 3}, - {"matrix": [3, 5], "x": 5.5, "y": 3}, - {"matrix": [3, 6], "x": 6.75, "y": 3}, - - {"matrix": [9, 6], "x": 9.25, "y": 3}, - {"matrix": [9, 5], "x": 10.5, "y": 3}, - {"matrix": [9, 4], "x": 11.5, "y": 3}, - {"matrix": [9, 3], "x": 12.5, "y": 3}, - {"matrix": [9, 2], "x": 13.5, "y": 3}, - {"matrix": [9, 1], "x": 14.5, "y": 3}, - {"matrix": [9, 0], "x": 15.5, "y": 3, "w": 1.5}, - - {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, - {"matrix": [4, 1], "x": 1.5, "y": 4}, - {"matrix": [4, 2], "x": 2.5, "y": 4}, - {"matrix": [4, 3], "x": 3.5, "y": 4}, - {"matrix": [4, 4], "x": 4.5, "y": 4}, - {"matrix": [4, 5], "x": 6, "y": 4.5}, - {"matrix": [4, 6], "x": 7, "y": 4.5}, - - {"matrix": [10, 6], "x": 9, "y": 4.5}, - {"matrix": [10, 5], "x": 10, "y": 4.5}, - {"matrix": [10, 4], "x": 11.5, "y": 4}, - {"matrix": [10, 3], "x": 12.5, "y": 4}, - {"matrix": [10, 2], "x": 13.5, "y": 4}, - {"matrix": [10, 1], "x": 14.5, "y": 4}, - {"matrix": [10, 0], "x": 15.5, "y": 4, "w": 1.5}, - - {"matrix": [5, 5], "x": 6, "y": 5.5}, - {"matrix": [5, 6], "x": 7, "y": 5.5}, - - {"matrix": [11, 6], "x": 9, "y": 5.5}, - {"matrix": [11, 5], "x": 10, "y": 5.5} - ] - } - } -} diff --git a/keyboards/rgbkb/sol/rev1/keyboard.json b/keyboards/rgbkb/sol/rev1/keyboard.json new file mode 100644 index 0000000000..16b61d9e02 --- /dev/null +++ b/keyboards/rgbkb/sol/rev1/keyboard.json @@ -0,0 +1,187 @@ +{ + "keyboard_name": "Sol", + "manufacturer": "RGBKB", + "url": "", + "maintainer": "Legonut", + "usb": { + "vid": "0xFEED", + "pid": "0x3060", + "device_version": "0.0.1" + }, + "rgb_matrix": { + "animations": { + "alphas_mods": true, + "gradient_up_down": true, + "gradient_left_right": true, + "breathing": true, + "band_sat": true, + "band_val": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_up_down": true, + "rainbow_moving_chevron": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "dual_beacon": true, + "rainbow_beacon": true, + "rainbow_pinwheels": true, + "raindrops": true, + "jellybean_raindrops": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "pixel_rain": true, + "pixel_flow": true, + "pixel_fractal": true, + "typing_heatmap": true, + "digital_rain": true, + "solid_reactive_simple": true, + "solid_reactive": true, + "solid_reactive_wide": true, + "solid_reactive_multiwide": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_nexus": true, + "solid_reactive_multinexus": true, + "splash": true, + "multisplash": true, + "solid_splash": true, + "solid_multisplash": true + }, + "center_point": [112, 35], + "driver": "ws2812" + }, + "rgblight": { + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } + }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7"], + "rows": ["C6", "B6", "B5", "B4", "D7", "E6"] + }, + "diode_direction": "COL2ROW", + "encoder": { + "rotary": [ + {"pin_a": "D2", "pin_b": "D6"} + ] + }, + "split": { + "enabled": true, + "soft_serial_pin": "D3" + }, + "tapping": { + "term": 150 + }, + "ws2812": { + "pin": "B3" + }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + {"matrix": [0, 5], "x": 5.5, "y": 0}, + {"matrix": [0, 6], "x": 6.75, "y": 0}, + + {"matrix": [6, 6], "x": 9.25, "y": 0}, + {"matrix": [6, 5], "x": 10.5, "y": 0}, + {"matrix": [6, 4], "x": 11.5, "y": 0}, + {"matrix": [6, 3], "x": 12.5, "y": 0}, + {"matrix": [6, 2], "x": 13.5, "y": 0}, + {"matrix": [6, 1], "x": 14.5, "y": 0}, + {"matrix": [6, 0], "x": 15.5, "y": 0, "w": 1.5}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.75, "y": 1}, + + {"matrix": [7, 6], "x": 9.25, "y": 1}, + {"matrix": [7, 5], "x": 10.5, "y": 1}, + {"matrix": [7, 4], "x": 11.5, "y": 1}, + {"matrix": [7, 3], "x": 12.5, "y": 1}, + {"matrix": [7, 2], "x": 13.5, "y": 1}, + {"matrix": [7, 1], "x": 14.5, "y": 1}, + {"matrix": [7, 0], "x": 15.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + + {"matrix": [8, 6], "x": 9.25, "y": 2}, + {"matrix": [8, 5], "x": 10.5, "y": 2}, + {"matrix": [8, 4], "x": 11.5, "y": 2}, + {"matrix": [8, 3], "x": 12.5, "y": 2}, + {"matrix": [8, 2], "x": 13.5, "y": 2}, + {"matrix": [8, 1], "x": 14.5, "y": 2}, + {"matrix": [8, 0], "x": 15.5, "y": 2, "w": 1.5}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 3}, + {"matrix": [3, 2], "x": 2.5, "y": 3}, + {"matrix": [3, 3], "x": 3.5, "y": 3}, + {"matrix": [3, 4], "x": 4.5, "y": 3}, + {"matrix": [3, 5], "x": 5.5, "y": 3}, + {"matrix": [3, 6], "x": 6.75, "y": 3}, + + {"matrix": [9, 6], "x": 9.25, "y": 3}, + {"matrix": [9, 5], "x": 10.5, "y": 3}, + {"matrix": [9, 4], "x": 11.5, "y": 3}, + {"matrix": [9, 3], "x": 12.5, "y": 3}, + {"matrix": [9, 2], "x": 13.5, "y": 3}, + {"matrix": [9, 1], "x": 14.5, "y": 3}, + {"matrix": [9, 0], "x": 15.5, "y": 3, "w": 1.5}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4}, + {"matrix": [4, 3], "x": 3.5, "y": 4}, + {"matrix": [4, 4], "x": 4.5, "y": 4}, + {"matrix": [4, 5], "x": 6, "y": 4.5}, + {"matrix": [4, 6], "x": 7, "y": 4.5}, + + {"matrix": [10, 6], "x": 9, "y": 4.5}, + {"matrix": [10, 5], "x": 10, "y": 4.5}, + {"matrix": [10, 4], "x": 11.5, "y": 4}, + {"matrix": [10, 3], "x": 12.5, "y": 4}, + {"matrix": [10, 2], "x": 13.5, "y": 4}, + {"matrix": [10, 1], "x": 14.5, "y": 4}, + {"matrix": [10, 0], "x": 15.5, "y": 4, "w": 1.5}, + + {"matrix": [5, 5], "x": 6, "y": 5.5}, + {"matrix": [5, 6], "x": 7, "y": 5.5}, + + {"matrix": [11, 6], "x": 9, "y": 5.5}, + {"matrix": [11, 5], "x": 10, "y": 5.5} + ] + } + } +} diff --git a/keyboards/rgbkb/sol/rev2/info.json b/keyboards/rgbkb/sol/rev2/info.json deleted file mode 100644 index f7ec84cfce..0000000000 --- a/keyboards/rgbkb/sol/rev2/info.json +++ /dev/null @@ -1,182 +0,0 @@ -{ - "keyboard_name": "Sol", - "manufacturer": "RGBKB", - "url": "", - "maintainer": "Legonut", - "usb": { - "vid": "0xFEED", - "pid": "0x3060", - "device_version": "0.0.2" - }, - "rgb_matrix": { - "animations": { - "alphas_mods": true, - "gradient_up_down": true, - "gradient_left_right": true, - "breathing": true, - "band_sat": true, - "band_val": true, - "band_pinwheel_sat": true, - "band_pinwheel_val": true, - "band_spiral_sat": true, - "band_spiral_val": true, - "cycle_all": true, - "cycle_left_right": true, - "cycle_up_down": true, - "rainbow_moving_chevron": true, - "cycle_out_in": true, - "cycle_out_in_dual": true, - "cycle_pinwheel": true, - "cycle_spiral": true, - "dual_beacon": true, - "rainbow_beacon": true, - "rainbow_pinwheels": true, - "raindrops": true, - "jellybean_raindrops": true, - "hue_breathing": true, - "hue_pendulum": true, - "hue_wave": true, - "pixel_rain": true, - "pixel_flow": true, - "pixel_fractal": true, - "typing_heatmap": true, - "digital_rain": true, - "solid_reactive_simple": true, - "solid_reactive": true, - "solid_reactive_wide": true, - "solid_reactive_multiwide": true, - "solid_reactive_cross": true, - "solid_reactive_multicross": true, - "solid_reactive_nexus": true, - "solid_reactive_multinexus": true, - "splash": true, - "multisplash": true, - "solid_splash": true, - "solid_multisplash": true - }, - "center_point": [112, 37], - "driver": "ws2812" - }, - "rgblight": { - "animations": { - "breathing": true, - "rainbow_mood": true, - "rainbow_swirl": true, - "snake": true, - "knight": true, - "christmas": true, - "static_gradient": true, - "rgb_test": true, - "alternating": true, - "twinkle": true - } - }, - "matrix_pins": { - "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7"], - "rows": ["C6", "B6", "B5", "B4", "D7", "E6"] - }, - "diode_direction": "COL2ROW", - "split": { - "enabled": true, - "soft_serial_pin": "D3" - }, - "tapping": { - "term": 150 - }, - "ws2812": { - "pin": "B7" - }, - "processor": "atmega32u4", - "bootloader": "qmk-dfu", - "layouts": { - "LAYOUT": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, - {"matrix": [0, 1], "x": 1.5, "y": 0}, - {"matrix": [0, 2], "x": 2.5, "y": 0}, - {"matrix": [0, 3], "x": 3.5, "y": 0}, - {"matrix": [0, 4], "x": 4.5, "y": 0}, - {"matrix": [0, 5], "x": 5.5, "y": 0}, - {"matrix": [0, 6], "x": 6.75, "y": 0}, - - {"matrix": [6, 6], "x": 9.25, "y": 0}, - {"matrix": [6, 5], "x": 10.5, "y": 0}, - {"matrix": [6, 4], "x": 11.5, "y": 0}, - {"matrix": [6, 3], "x": 12.5, "y": 0}, - {"matrix": [6, 2], "x": 13.5, "y": 0}, - {"matrix": [6, 1], "x": 14.5, "y": 0}, - {"matrix": [6, 0], "x": 15.5, "y": 0, "w": 1.5}, - - {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, - {"matrix": [1, 1], "x": 1.5, "y": 1}, - {"matrix": [1, 2], "x": 2.5, "y": 1}, - {"matrix": [1, 3], "x": 3.5, "y": 1}, - {"matrix": [1, 4], "x": 4.5, "y": 1}, - {"matrix": [1, 5], "x": 5.5, "y": 1}, - {"matrix": [1, 6], "x": 6.75, "y": 1}, - - {"matrix": [7, 6], "x": 9.25, "y": 1}, - {"matrix": [7, 5], "x": 10.5, "y": 1}, - {"matrix": [7, 4], "x": 11.5, "y": 1}, - {"matrix": [7, 3], "x": 12.5, "y": 1}, - {"matrix": [7, 2], "x": 13.5, "y": 1}, - {"matrix": [7, 1], "x": 14.5, "y": 1}, - {"matrix": [7, 0], "x": 15.5, "y": 1, "w": 1.5}, - - {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, - {"matrix": [2, 1], "x": 1.5, "y": 2}, - {"matrix": [2, 2], "x": 2.5, "y": 2}, - {"matrix": [2, 3], "x": 3.5, "y": 2}, - {"matrix": [2, 4], "x": 4.5, "y": 2}, - {"matrix": [2, 5], "x": 5.5, "y": 2}, - {"matrix": [2, 6], "x": 6.75, "y": 2}, - - {"matrix": [8, 6], "x": 9.25, "y": 2}, - {"matrix": [8, 5], "x": 10.5, "y": 2}, - {"matrix": [8, 4], "x": 11.5, "y": 2}, - {"matrix": [8, 3], "x": 12.5, "y": 2}, - {"matrix": [8, 2], "x": 13.5, "y": 2}, - {"matrix": [8, 1], "x": 14.5, "y": 2}, - {"matrix": [8, 0], "x": 15.5, "y": 2, "w": 1.5}, - - {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5}, - {"matrix": [3, 1], "x": 1.5, "y": 3}, - {"matrix": [3, 2], "x": 2.5, "y": 3}, - {"matrix": [3, 3], "x": 3.5, "y": 3}, - {"matrix": [3, 4], "x": 4.5, "y": 3}, - {"matrix": [3, 5], "x": 5.5, "y": 3}, - {"matrix": [3, 6], "x": 6.75, "y": 3}, - - {"matrix": [9, 6], "x": 9.25, "y": 3}, - {"matrix": [9, 5], "x": 10.5, "y": 3}, - {"matrix": [9, 4], "x": 11.5, "y": 3}, - {"matrix": [9, 3], "x": 12.5, "y": 3}, - {"matrix": [9, 2], "x": 13.5, "y": 3}, - {"matrix": [9, 1], "x": 14.5, "y": 3}, - {"matrix": [9, 0], "x": 15.5, "y": 3, "w": 1.5}, - - {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, - {"matrix": [4, 1], "x": 1.5, "y": 4}, - {"matrix": [4, 2], "x": 2.5, "y": 4}, - {"matrix": [4, 3], "x": 3.5, "y": 4}, - {"matrix": [4, 4], "x": 4.5, "y": 4}, - {"matrix": [4, 5], "x": 6, "y": 4.5}, - {"matrix": [4, 6], "x": 7, "y": 4.5}, - - {"matrix": [10, 6], "x": 9, "y": 4.5}, - {"matrix": [10, 5], "x": 10, "y": 4.5}, - {"matrix": [10, 4], "x": 11.5, "y": 4}, - {"matrix": [10, 3], "x": 12.5, "y": 4}, - {"matrix": [10, 2], "x": 13.5, "y": 4}, - {"matrix": [10, 1], "x": 14.5, "y": 4}, - {"matrix": [10, 0], "x": 15.5, "y": 4, "w": 1.5}, - - {"matrix": [5, 5], "x": 6, "y": 5.5}, - {"matrix": [5, 6], "x": 7, "y": 5.5}, - - {"matrix": [11, 6], "x": 9, "y": 5.5}, - {"matrix": [11, 5], "x": 10, "y": 5.5} - ] - } - } -} diff --git a/keyboards/rgbkb/sol/rev2/keyboard.json b/keyboards/rgbkb/sol/rev2/keyboard.json new file mode 100644 index 0000000000..f7ec84cfce --- /dev/null +++ b/keyboards/rgbkb/sol/rev2/keyboard.json @@ -0,0 +1,182 @@ +{ + "keyboard_name": "Sol", + "manufacturer": "RGBKB", + "url": "", + "maintainer": "Legonut", + "usb": { + "vid": "0xFEED", + "pid": "0x3060", + "device_version": "0.0.2" + }, + "rgb_matrix": { + "animations": { + "alphas_mods": true, + "gradient_up_down": true, + "gradient_left_right": true, + "breathing": true, + "band_sat": true, + "band_val": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_up_down": true, + "rainbow_moving_chevron": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "dual_beacon": true, + "rainbow_beacon": true, + "rainbow_pinwheels": true, + "raindrops": true, + "jellybean_raindrops": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "pixel_rain": true, + "pixel_flow": true, + "pixel_fractal": true, + "typing_heatmap": true, + "digital_rain": true, + "solid_reactive_simple": true, + "solid_reactive": true, + "solid_reactive_wide": true, + "solid_reactive_multiwide": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_nexus": true, + "solid_reactive_multinexus": true, + "splash": true, + "multisplash": true, + "solid_splash": true, + "solid_multisplash": true + }, + "center_point": [112, 37], + "driver": "ws2812" + }, + "rgblight": { + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } + }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7"], + "rows": ["C6", "B6", "B5", "B4", "D7", "E6"] + }, + "diode_direction": "COL2ROW", + "split": { + "enabled": true, + "soft_serial_pin": "D3" + }, + "tapping": { + "term": 150 + }, + "ws2812": { + "pin": "B7" + }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + {"matrix": [0, 5], "x": 5.5, "y": 0}, + {"matrix": [0, 6], "x": 6.75, "y": 0}, + + {"matrix": [6, 6], "x": 9.25, "y": 0}, + {"matrix": [6, 5], "x": 10.5, "y": 0}, + {"matrix": [6, 4], "x": 11.5, "y": 0}, + {"matrix": [6, 3], "x": 12.5, "y": 0}, + {"matrix": [6, 2], "x": 13.5, "y": 0}, + {"matrix": [6, 1], "x": 14.5, "y": 0}, + {"matrix": [6, 0], "x": 15.5, "y": 0, "w": 1.5}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.75, "y": 1}, + + {"matrix": [7, 6], "x": 9.25, "y": 1}, + {"matrix": [7, 5], "x": 10.5, "y": 1}, + {"matrix": [7, 4], "x": 11.5, "y": 1}, + {"matrix": [7, 3], "x": 12.5, "y": 1}, + {"matrix": [7, 2], "x": 13.5, "y": 1}, + {"matrix": [7, 1], "x": 14.5, "y": 1}, + {"matrix": [7, 0], "x": 15.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + + {"matrix": [8, 6], "x": 9.25, "y": 2}, + {"matrix": [8, 5], "x": 10.5, "y": 2}, + {"matrix": [8, 4], "x": 11.5, "y": 2}, + {"matrix": [8, 3], "x": 12.5, "y": 2}, + {"matrix": [8, 2], "x": 13.5, "y": 2}, + {"matrix": [8, 1], "x": 14.5, "y": 2}, + {"matrix": [8, 0], "x": 15.5, "y": 2, "w": 1.5}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 3}, + {"matrix": [3, 2], "x": 2.5, "y": 3}, + {"matrix": [3, 3], "x": 3.5, "y": 3}, + {"matrix": [3, 4], "x": 4.5, "y": 3}, + {"matrix": [3, 5], "x": 5.5, "y": 3}, + {"matrix": [3, 6], "x": 6.75, "y": 3}, + + {"matrix": [9, 6], "x": 9.25, "y": 3}, + {"matrix": [9, 5], "x": 10.5, "y": 3}, + {"matrix": [9, 4], "x": 11.5, "y": 3}, + {"matrix": [9, 3], "x": 12.5, "y": 3}, + {"matrix": [9, 2], "x": 13.5, "y": 3}, + {"matrix": [9, 1], "x": 14.5, "y": 3}, + {"matrix": [9, 0], "x": 15.5, "y": 3, "w": 1.5}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4}, + {"matrix": [4, 3], "x": 3.5, "y": 4}, + {"matrix": [4, 4], "x": 4.5, "y": 4}, + {"matrix": [4, 5], "x": 6, "y": 4.5}, + {"matrix": [4, 6], "x": 7, "y": 4.5}, + + {"matrix": [10, 6], "x": 9, "y": 4.5}, + {"matrix": [10, 5], "x": 10, "y": 4.5}, + {"matrix": [10, 4], "x": 11.5, "y": 4}, + {"matrix": [10, 3], "x": 12.5, "y": 4}, + {"matrix": [10, 2], "x": 13.5, "y": 4}, + {"matrix": [10, 1], "x": 14.5, "y": 4}, + {"matrix": [10, 0], "x": 15.5, "y": 4, "w": 1.5}, + + {"matrix": [5, 5], "x": 6, "y": 5.5}, + {"matrix": [5, 6], "x": 7, "y": 5.5}, + + {"matrix": [11, 6], "x": 9, "y": 5.5}, + {"matrix": [11, 5], "x": 10, "y": 5.5} + ] + } + } +} diff --git a/keyboards/rgbkb/zen/rev2/info.json b/keyboards/rgbkb/zen/rev2/info.json deleted file mode 100644 index 8d486e53b8..0000000000 --- a/keyboards/rgbkb/zen/rev2/info.json +++ /dev/null @@ -1,129 +0,0 @@ -{ - "keyboard_name": "Project Zen", - "manufacturer": "Legonut", - "url": "", - "maintainer": "qmk", - "usb": { - "vid": "0xFEED", - "pid": "0x3061", - "device_version": "0.0.2" - }, - "matrix_pins": { - "cols": ["F4", "F5", "F6", "F7", "B3", "B1", "B2"], - "rows": ["C6", "E6", "B5", "D7", "B4"] - }, - "diode_direction": "COL2ROW", - "encoder": { - "rotary": [ - {"pin_a": "D4", "pin_b": "D2"} - ] - }, - "split": { - "soft_serial_pin": "D3" - }, - "rgblight": { - "led_count": 34, - "animations": { - "breathing": true, - "rainbow_mood": true, - "rainbow_swirl": true, - "snake": true, - "knight": true, - "christmas": true, - "static_gradient": true, - "rgb_test": true, - "alternating": true, - "twinkle": true - } - }, - "ws2812": { - "pin": "B6" - }, - "processor": "atmega32u4", - "bootloader": "caterina", - "layouts": { - "LAYOUT": { - "layout": [ - {"matrix": [0, 0], "x": 0.5, "y": 0}, - {"matrix": [0, 1], "x": 1.5, "y": 0}, - {"matrix": [0, 2], "x": 2.5, "y": 0}, - {"matrix": [0, 3], "x": 3.5, "y": 0}, - {"matrix": [0, 4], "x": 4.5, "y": 0}, - {"matrix": [0, 5], "x": 5.5, "y": 0}, - - {"matrix": [5, 5], "x": 10.5, "y": 0}, - {"matrix": [5, 4], "x": 11.5, "y": 0}, - {"matrix": [5, 3], "x": 12.5, "y": 0}, - {"matrix": [5, 2], "x": 13.5, "y": 0}, - {"matrix": [5, 1], "x": 14.5, "y": 0}, - {"matrix": [5, 0], "x": 15.5, "y": 0}, - - {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, - {"matrix": [1, 1], "x": 1.5, "y": 1}, - {"matrix": [1, 2], "x": 2.5, "y": 1}, - {"matrix": [1, 3], "x": 3.5, "y": 1}, - {"matrix": [1, 4], "x": 4.5, "y": 1}, - {"matrix": [1, 5], "x": 5.5, "y": 1}, - - {"matrix": [6, 5], "x": 10.5, "y": 1}, - {"matrix": [6, 4], "x": 11.5, "y": 1}, - {"matrix": [6, 3], "x": 12.5, "y": 1}, - {"matrix": [6, 2], "x": 13.5, "y": 1}, - {"matrix": [6, 1], "x": 14.5, "y": 1}, - {"matrix": [6, 0], "x": 15.5, "y": 1, "w": 1.5}, - - {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, - {"matrix": [2, 1], "x": 1.5, "y": 2}, - {"matrix": [2, 2], "x": 2.5, "y": 2}, - {"matrix": [2, 3], "x": 3.5, "y": 2}, - {"matrix": [2, 4], "x": 4.5, "y": 2}, - {"matrix": [2, 5], "x": 5.5, "y": 2}, - - {"matrix": [7, 5], "x": 10.5, "y": 2}, - {"matrix": [7, 4], "x": 11.5, "y": 2}, - {"matrix": [7, 3], "x": 12.5, "y": 2}, - {"matrix": [7, 2], "x": 13.5, "y": 2}, - {"matrix": [7, 1], "x": 14.5, "y": 2}, - {"matrix": [7, 0], "x": 15.5, "y": 2, "w": 1.5}, - - {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5}, - {"matrix": [3, 1], "x": 1.5, "y": 3}, - {"matrix": [3, 2], "x": 2.5, "y": 3}, - {"matrix": [3, 3], "x": 3.5, "y": 3}, - {"matrix": [3, 4], "x": 4.5, "y": 3}, - {"matrix": [3, 5], "x": 5.5, "y": 3}, - {"matrix": [1, 6], "x": 6.5, "y": 3}, - - {"matrix": [6, 6], "x": 9.5, "y": 3}, - {"matrix": [8, 5], "x": 10.5, "y": 3}, - {"matrix": [8, 4], "x": 11.5, "y": 3}, - {"matrix": [8, 3], "x": 12.5, "y": 3}, - {"matrix": [8, 2], "x": 13.5, "y": 3}, - {"matrix": [8, 1], "x": 14.5, "y": 3}, - {"matrix": [8, 0], "x": 15.5, "y": 3, "w": 1.5}, - - {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, - {"matrix": [4, 1], "x": 1.5, "y": 4}, - {"matrix": [4, 2], "x": 2.5, "y": 4}, - {"matrix": [4, 3], "x": 3.5, "y": 4}, - {"matrix": [4, 4], "x": 4.5, "y": 4}, - - {"matrix": [3, 6], "x": 6, "y": 4.5}, - {"matrix": [2, 6], "x": 7, "y": 4.5}, - {"matrix": [7, 6], "x": 9, "y": 4.5}, - {"matrix": [8, 6], "x": 10, "y": 4.5}, - - {"matrix": [9, 4], "x": 11.5, "y": 4}, - {"matrix": [9, 3], "x": 12.5, "y": 4}, - {"matrix": [9, 2], "x": 13.5, "y": 4}, - {"matrix": [9, 1], "x": 14.5, "y": 4}, - {"matrix": [9, 0], "x": 15.5, "y": 4, "w": 1.5}, - - {"matrix": [4, 5], "x": 6, "y": 5.5}, - {"matrix": [4, 6], "x": 7, "y": 5.5}, - {"matrix": [9, 6], "x": 9, "y": 5.5}, - {"matrix": [9, 5], "x": 10, "y": 5.5} - ] - } - } - } diff --git a/keyboards/rgbkb/zen/rev2/keyboard.json b/keyboards/rgbkb/zen/rev2/keyboard.json new file mode 100644 index 0000000000..8d486e53b8 --- /dev/null +++ b/keyboards/rgbkb/zen/rev2/keyboard.json @@ -0,0 +1,129 @@ +{ + "keyboard_name": "Project Zen", + "manufacturer": "Legonut", + "url": "", + "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x3061", + "device_version": "0.0.2" + }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B3", "B1", "B2"], + "rows": ["C6", "E6", "B5", "D7", "B4"] + }, + "diode_direction": "COL2ROW", + "encoder": { + "rotary": [ + {"pin_a": "D4", "pin_b": "D2"} + ] + }, + "split": { + "soft_serial_pin": "D3" + }, + "rgblight": { + "led_count": 34, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } + }, + "ws2812": { + "pin": "B6" + }, + "processor": "atmega32u4", + "bootloader": "caterina", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0.5, "y": 0}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + {"matrix": [0, 5], "x": 5.5, "y": 0}, + + {"matrix": [5, 5], "x": 10.5, "y": 0}, + {"matrix": [5, 4], "x": 11.5, "y": 0}, + {"matrix": [5, 3], "x": 12.5, "y": 0}, + {"matrix": [5, 2], "x": 13.5, "y": 0}, + {"matrix": [5, 1], "x": 14.5, "y": 0}, + {"matrix": [5, 0], "x": 15.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + + {"matrix": [6, 5], "x": 10.5, "y": 1}, + {"matrix": [6, 4], "x": 11.5, "y": 1}, + {"matrix": [6, 3], "x": 12.5, "y": 1}, + {"matrix": [6, 2], "x": 13.5, "y": 1}, + {"matrix": [6, 1], "x": 14.5, "y": 1}, + {"matrix": [6, 0], "x": 15.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "y": 2}, + + {"matrix": [7, 5], "x": 10.5, "y": 2}, + {"matrix": [7, 4], "x": 11.5, "y": 2}, + {"matrix": [7, 3], "x": 12.5, "y": 2}, + {"matrix": [7, 2], "x": 13.5, "y": 2}, + {"matrix": [7, 1], "x": 14.5, "y": 2}, + {"matrix": [7, 0], "x": 15.5, "y": 2, "w": 1.5}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 3}, + {"matrix": [3, 2], "x": 2.5, "y": 3}, + {"matrix": [3, 3], "x": 3.5, "y": 3}, + {"matrix": [3, 4], "x": 4.5, "y": 3}, + {"matrix": [3, 5], "x": 5.5, "y": 3}, + {"matrix": [1, 6], "x": 6.5, "y": 3}, + + {"matrix": [6, 6], "x": 9.5, "y": 3}, + {"matrix": [8, 5], "x": 10.5, "y": 3}, + {"matrix": [8, 4], "x": 11.5, "y": 3}, + {"matrix": [8, 3], "x": 12.5, "y": 3}, + {"matrix": [8, 2], "x": 13.5, "y": 3}, + {"matrix": [8, 1], "x": 14.5, "y": 3}, + {"matrix": [8, 0], "x": 15.5, "y": 3, "w": 1.5}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4}, + {"matrix": [4, 3], "x": 3.5, "y": 4}, + {"matrix": [4, 4], "x": 4.5, "y": 4}, + + {"matrix": [3, 6], "x": 6, "y": 4.5}, + {"matrix": [2, 6], "x": 7, "y": 4.5}, + {"matrix": [7, 6], "x": 9, "y": 4.5}, + {"matrix": [8, 6], "x": 10, "y": 4.5}, + + {"matrix": [9, 4], "x": 11.5, "y": 4}, + {"matrix": [9, 3], "x": 12.5, "y": 4}, + {"matrix": [9, 2], "x": 13.5, "y": 4}, + {"matrix": [9, 1], "x": 14.5, "y": 4}, + {"matrix": [9, 0], "x": 15.5, "y": 4, "w": 1.5}, + + {"matrix": [4, 5], "x": 6, "y": 5.5}, + {"matrix": [4, 6], "x": 7, "y": 5.5}, + {"matrix": [9, 6], "x": 9, "y": 5.5}, + {"matrix": [9, 5], "x": 10, "y": 5.5} + ] + } + } + } diff --git a/keyboards/splitkb/kyria/rev1/info.json b/keyboards/splitkb/kyria/rev1/info.json index 38a2e6bf3f..3d84b37b31 100644 --- a/keyboards/splitkb/kyria/rev1/info.json +++ b/keyboards/splitkb/kyria/rev1/info.json @@ -4,6 +4,15 @@ "pid": "0x9D9D", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "oled": true, + "rgblight": true + }, "rgblight": { "led_count": 20, "split_count": [10, 10] diff --git a/keyboards/splitkb/kyria/rev1/proton_c/info.json b/keyboards/splitkb/kyria/rev1/proton_c/info.json deleted file mode 100644 index 6cc38d4a21..0000000000 --- a/keyboards/splitkb/kyria/rev1/proton_c/info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "ws2812": { - "driver": "pwm" - } -} diff --git a/keyboards/splitkb/kyria/rev1/proton_c/keyboard.json b/keyboards/splitkb/kyria/rev1/proton_c/keyboard.json new file mode 100644 index 0000000000..6cc38d4a21 --- /dev/null +++ b/keyboards/splitkb/kyria/rev1/proton_c/keyboard.json @@ -0,0 +1,5 @@ +{ + "ws2812": { + "driver": "pwm" + } +} diff --git a/keyboards/splitkb/kyria/rev1/rules.mk b/keyboards/splitkb/kyria/rev1/rules.mk index c4c82d05aa..3a8bfbe089 100644 --- a/keyboards/splitkb/kyria/rev1/rules.mk +++ b/keyboards/splitkb/kyria/rev1/rules.mk @@ -1,13 +1 @@ -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 -AUDIO_ENABLE = no # Audio output - -OLED_ENABLE = yes # Enables the use of OLED displays -ENCODER_ENABLE = yes # Enables the use of one or more encoders -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE) +DEFAULT_FOLDER = splitkb/kyria/rev1/base diff --git a/keyboards/splitkb/kyria/rev2/info.json b/keyboards/splitkb/kyria/rev2/info.json index 0290153f4a..80f801e3d1 100644 --- a/keyboards/splitkb/kyria/rev2/info.json +++ b/keyboards/splitkb/kyria/rev2/info.json @@ -4,6 +4,15 @@ "pid": "0x9D9D", "device_version": "0.0.2" }, + "features": { + "bootmagic": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "oled": true, + "rgblight": true + }, "rgblight": { "led_count": 20, "split_count": [10, 10] diff --git a/keyboards/splitkb/kyria/rev2/proton_c/info.json b/keyboards/splitkb/kyria/rev2/proton_c/info.json deleted file mode 100644 index 6cc38d4a21..0000000000 --- a/keyboards/splitkb/kyria/rev2/proton_c/info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "ws2812": { - "driver": "pwm" - } -} diff --git a/keyboards/splitkb/kyria/rev2/proton_c/keyboard.json b/keyboards/splitkb/kyria/rev2/proton_c/keyboard.json new file mode 100644 index 0000000000..6cc38d4a21 --- /dev/null +++ b/keyboards/splitkb/kyria/rev2/proton_c/keyboard.json @@ -0,0 +1,5 @@ +{ + "ws2812": { + "driver": "pwm" + } +} diff --git a/keyboards/splitkb/kyria/rev2/rules.mk b/keyboards/splitkb/kyria/rev2/rules.mk index c4c82d05aa..fb808070bf 100644 --- a/keyboards/splitkb/kyria/rev2/rules.mk +++ b/keyboards/splitkb/kyria/rev2/rules.mk @@ -1,13 +1 @@ -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 -AUDIO_ENABLE = no # Audio output - -OLED_ENABLE = yes # Enables the use of OLED displays -ENCODER_ENABLE = yes # Enables the use of one or more encoders -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE) +DEFAULT_FOLDER = splitkb/kyria/rev2/base diff --git a/keyboards/suikagiken/suika85ergo/info.json b/keyboards/suikagiken/suika85ergo/info.json deleted file mode 100644 index e0514dfab8..0000000000 --- a/keyboards/suikagiken/suika85ergo/info.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "manufacturer": "suikagiken", - "keyboard_name": "suika85ergo", - "maintainer": "suikagiken", - "development_board": "elite_c", - "pin_compatible": "elite_c", - "diode_direction": "COL2ROW", - "features": { - "bootmagic": true, - "command": false, - "console": false, - "extrakey": true, - "mousekey": true, - "nkro": true - }, - "matrix_pins": { - "cols": ["B3", "B2", "B6", "F0", "F1", "C7", "D5", "B7", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2"], - "rows": ["B0", "F4", "F5", "F6", "F7", "B1"] - }, - "url": "https://github.com/suikagiken/suika85ergo", - "usb": { - "device_version": "1.0.0", - "vid": "0x4B48", - "pid": "0x0002" - }, - "dynamic_keymap": { - "layer_count": 2 - }, - "build": { - "debounce_type": "sym_eager_pk" - }, - "debounce": 50, - "layouts": { - "LAYOUT": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, - {"matrix": [0, 6], "x": 6, "y": 0}, - {"matrix": [0, 10], "x": 10, "y": 0}, - {"matrix": [0, 11], "x": 11, "y": 0}, - {"matrix": [0, 12], "x": 12, "y": 0}, - {"matrix": [0, 13], "x": 13, "y": 0}, - {"matrix": [0, 14], "x": 14, "y": 0}, - {"matrix": [0, 15], "x": 15, "y": 0}, - {"matrix": [0, 16], "x": 16, "y": 0}, - {"matrix": [1, 0], "x": 0, "y": 1}, - {"matrix": [1, 1], "x": 1, "y": 1}, - {"matrix": [1, 2], "x": 2, "y": 1}, - {"matrix": [1, 3], "x": 3, "y": 1}, - {"matrix": [1, 4], "x": 4, "y": 1}, - {"matrix": [1, 5], "x": 5, "y": 1}, - {"matrix": [1, 6], "x": 6, "y": 1}, - {"matrix": [1, 8], "x": 8, "y": 1}, - {"matrix": [1, 10], "x": 10, "y": 1}, - {"matrix": [1, 11], "x": 11, "y": 1}, - {"matrix": [1, 12], "x": 12, "y": 1}, - {"matrix": [1, 13], "x": 13, "y": 1}, - {"matrix": [1, 14], "x": 14, "y": 1}, - {"matrix": [1, 15], "x": 15, "y": 1}, - {"matrix": [1, 16], "x": 16, "y": 1}, - {"matrix": [2, 0], "x": 0, "y": 2}, - {"matrix": [2, 1], "x": 1, "y": 2}, - {"matrix": [2, 2], "x": 2, "y": 2}, - {"matrix": [2, 3], "x": 3, "y": 2}, - {"matrix": [2, 4], "x": 4, "y": 2}, - {"matrix": [2, 5], "x": 5, "y": 2}, - {"matrix": [2, 6], "x": 6, "y": 2}, - {"matrix": [2, 8], "x": 8, "y": 2}, - {"matrix": [2, 10], "x": 10, "y": 2}, - {"matrix": [2, 11], "x": 11, "y": 2}, - {"matrix": [2, 12], "x": 12, "y": 2}, - {"matrix": [2, 13], "x": 13, "y": 2}, - {"matrix": [2, 14], "x": 14, "y": 2}, - {"matrix": [2, 15], "x": 15, "y": 2}, - {"matrix": [2, 16], "x": 16, "y": 2}, - {"matrix": [3, 0], "x": 0, "y": 3}, - {"matrix": [3, 1], "x": 1, "y": 3}, - {"matrix": [3, 2], "x": 2, "y": 3}, - {"matrix": [3, 3], "x": 3, "y": 3}, - {"matrix": [3, 4], "x": 4, "y": 3}, - {"matrix": [3, 5], "x": 5, "y": 3}, - {"matrix": [3, 6], "x": 6, "y": 3}, - {"matrix": [3, 7], "x": 7, "y": 3}, - {"matrix": [3, 9], "x": 9, "y": 3}, - {"matrix": [3, 10], "x": 10, "y": 3}, - {"matrix": [3, 11], "x": 11, "y": 3}, - {"matrix": [3, 12], "x": 12, "y": 3}, - {"matrix": [3, 13], "x": 13, "y": 3}, - {"matrix": [3, 14], "x": 14, "y": 3}, - {"matrix": [3, 15], "x": 15, "y": 3}, - {"matrix": [4, 1], "x": 1, "y": 4}, - {"matrix": [4, 2], "x": 2, "y": 4}, - {"matrix": [4, 3], "x": 3, "y": 4}, - {"matrix": [4, 4], "x": 4, "y": 4}, - {"matrix": [4, 5], "x": 5, "y": 4}, - {"matrix": [4, 6], "x": 6, "y": 4}, - {"matrix": [4, 8], "x": 8, "y": 4}, - {"matrix": [4, 10], "x": 10, "y": 4}, - {"matrix": [4, 11], "x": 11, "y": 4}, - {"matrix": [4, 12], "x": 12, "y": 4}, - {"matrix": [4, 13], "x": 13, "y": 4}, - {"matrix": [4, 14], "x": 14, "y": 4}, - {"matrix": [4, 15], "x": 15, "y": 4}, - {"matrix": [5, 2], "x": 2, "y": 5}, - {"matrix": [5, 3], "x": 3, "y": 5}, - {"matrix": [5, 4], "x": 4, "y": 5}, - {"matrix": [5, 5], "x": 5, "y": 5}, - {"matrix": [5, 6], "x": 6, "y": 5}, - {"matrix": [5, 7], "x": 7, "y": 5}, - {"matrix": [5, 8], "x": 8, "y": 5}, - {"matrix": [5, 9], "x": 9, "y": 5}, - {"matrix": [5, 10], "x": 10, "y": 5}, - {"matrix": [5, 11], "x": 11, "y": 5}, - {"matrix": [5, 12], "x": 12, "y": 5}, - {"matrix": [5, 13], "x": 13, "y": 5}, - {"matrix": [5, 14], "x": 14, "y": 5} - ] - } - } -} \ No newline at end of file diff --git a/keyboards/suikagiken/suika85ergo/keyboard.json b/keyboards/suikagiken/suika85ergo/keyboard.json new file mode 100644 index 0000000000..e0514dfab8 --- /dev/null +++ b/keyboards/suikagiken/suika85ergo/keyboard.json @@ -0,0 +1,124 @@ +{ + "manufacturer": "suikagiken", + "keyboard_name": "suika85ergo", + "maintainer": "suikagiken", + "development_board": "elite_c", + "pin_compatible": "elite_c", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "cols": ["B3", "B2", "B6", "F0", "F1", "C7", "D5", "B7", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2"], + "rows": ["B0", "F4", "F5", "F6", "F7", "B1"] + }, + "url": "https://github.com/suikagiken/suika85ergo", + "usb": { + "device_version": "1.0.0", + "vid": "0x4B48", + "pid": "0x0002" + }, + "dynamic_keymap": { + "layer_count": 2 + }, + "build": { + "debounce_type": "sym_eager_pk" + }, + "debounce": 50, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "y": 0}, + {"matrix": [0, 16], "x": 16, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1}, + {"matrix": [1, 14], "x": 14, "y": 1}, + {"matrix": [1, 15], "x": 15, "y": 1}, + {"matrix": [1, 16], "x": 16, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + {"matrix": [2, 12], "x": 12, "y": 2}, + {"matrix": [2, 13], "x": 13, "y": 2}, + {"matrix": [2, 14], "x": 14, "y": 2}, + {"matrix": [2, 15], "x": 15, "y": 2}, + {"matrix": [2, 16], "x": 16, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + {"matrix": [3, 12], "x": 12, "y": 3}, + {"matrix": [3, 13], "x": 13, "y": 3}, + {"matrix": [3, 14], "x": 14, "y": 3}, + {"matrix": [3, 15], "x": 15, "y": 3}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4}, + {"matrix": [4, 6], "x": 6, "y": 4}, + {"matrix": [4, 8], "x": 8, "y": 4}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + {"matrix": [4, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4}, + {"matrix": [5, 2], "x": 2, "y": 5}, + {"matrix": [5, 3], "x": 3, "y": 5}, + {"matrix": [5, 4], "x": 4, "y": 5}, + {"matrix": [5, 5], "x": 5, "y": 5}, + {"matrix": [5, 6], "x": 6, "y": 5}, + {"matrix": [5, 7], "x": 7, "y": 5}, + {"matrix": [5, 8], "x": 8, "y": 5}, + {"matrix": [5, 9], "x": 9, "y": 5}, + {"matrix": [5, 10], "x": 10, "y": 5}, + {"matrix": [5, 11], "x": 11, "y": 5}, + {"matrix": [5, 12], "x": 12, "y": 5}, + {"matrix": [5, 13], "x": 13, "y": 5}, + {"matrix": [5, 14], "x": 14, "y": 5} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/suikagiken/suika85ergo/rules.mk b/keyboards/suikagiken/suika85ergo/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/suikagiken/suika85ergo/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/yushakobo/navpad/10/info.json b/keyboards/yushakobo/navpad/10/info.json index ef0cdf5cbe..e28a2e2cb1 100644 --- a/keyboards/yushakobo/navpad/10/info.json +++ b/keyboards/yushakobo/navpad/10/info.json @@ -7,6 +7,14 @@ "vid": "0x3265", "pid": "0x0008" }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "encoder": { "rotary": [ {"pin_a": "B5", "pin_b": "B6"} diff --git a/keyboards/yushakobo/navpad/10/rev0/rules.mk b/keyboards/yushakobo/navpad/10/rev0/rules.mk new file mode 100644 index 0000000000..e8ffcca7a6 --- /dev/null +++ b/keyboards/yushakobo/navpad/10/rev0/rules.mk @@ -0,0 +1 @@ +SRC += navpad_prefs.c diff --git a/keyboards/yushakobo/navpad/10/rev1/rules.mk b/keyboards/yushakobo/navpad/10/rev1/rules.mk new file mode 100644 index 0000000000..e8ffcca7a6 --- /dev/null +++ b/keyboards/yushakobo/navpad/10/rev1/rules.mk @@ -0,0 +1 @@ +SRC += navpad_prefs.c diff --git a/keyboards/yushakobo/navpad/10/rules.mk b/keyboards/yushakobo/navpad/10/rules.mk index 61cbbf351d..32daeef814 100644 --- a/keyboards/yushakobo/navpad/10/rules.mk +++ b/keyboards/yushakobo/navpad/10/rules.mk @@ -1,17 +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 - -SRC += navpad_prefs.c DEFAULT_FOLDER = yushakobo/navpad/10/rev1 diff --git a/keyboards/yushakobo/navpad/10_helix_r/info.json b/keyboards/yushakobo/navpad/10_helix_r/info.json deleted file mode 100644 index 8084f1f7bd..0000000000 --- a/keyboards/yushakobo/navpad/10_helix_r/info.json +++ /dev/null @@ -1,143 +0,0 @@ -{ - "keyboard_name": "navpad 1.0 with helix keyboard", - "manufacturer": "yushakobo", - "url": "", - "maintainer": "yushakobo", - "usb": { - "vid": "0x3265", - "pid": "0x0008", - "device_version": "0.0.1" - }, - "matrix_pins": { - "cols": ["F5", "F6", "B2", "B3", "B1", "F7", null], - "rows": ["D4", "C6", "D7", "E6", "B4", "F4"] - }, - "diode_direction": "COL2ROW", - "encoder": { - "rotary": [ - {"pin_a": "B5", "pin_b": "B6"} - ] - }, - "split": { - "enabled": true, - "soft_serial_pin": "D2", - "encoder": { - "right": { - "rotary": [ - {"pin_a": "B6", "pin_b": "B5"} - ] - } - }, - "matrix_pins": { - "right": { - "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], - "rows": ["D4", "C6", "D7", "E6", "B4"] - } - } - }, - "tapping": { - "term": 132 - }, - "ws2812": { - "pin": "D3" - }, - "rgblight": { - "saturation_steps": 8, - "brightness_steps": 8, - "led_count": 41, - "max_brightness": 120, - "led_map": [0, 1, 2, 3, 4, 5, 6, 8, 7, 9, 10, 11, 12, 13, 14, 20, 19, 18, 17, 16, 15, 21, 22, 23, 24, 25, 26, 33, 32, 31, 30, 29, 28, 27, 34, 35, 36, 37, 38, 39, 40], - "sleep": true, - "split_count": [9, 32], - "animations": { - "rainbow_swirl": true, - "rgb_test": true - } - }, - "processor": "atmega32u4", - "bootloader": "caterina", - "layouts": { - "LAYOUT": { - "layout": [ - {"matrix": [5, 0], "x": 0, "y": 0}, - {"matrix": [0, 0], "x": 1, "y": 0}, - {"matrix": [0, 1], "x": 2, "y": 0}, - {"matrix": [5, 1], "x": 3, "y": 0}, - - {"matrix": [5, 2], "x": 0, "y": 1}, - {"matrix": [1, 0], "x": 1, "y": 1}, - {"matrix": [1, 1], "x": 2, "y": 1}, - {"matrix": [0, 2], "x": 3, "y": 1}, - {"matrix": [0, 3], "x": 4, "y": 1}, - {"matrix": [0, 4], "x": 5, "y": 1}, - {"matrix": [0, 5], "x": 6, "y": 1}, - - {"matrix": [6, 5], "x": 8, "y": 1}, - {"matrix": [6, 4], "x": 9, "y": 1}, - {"matrix": [6, 3], "x": 10, "y": 1}, - {"matrix": [6, 2], "x": 11, "y": 1}, - {"matrix": [6, 1], "x": 12, "y": 1}, - {"matrix": [6, 0], "x": 13, "y": 1}, - - {"matrix": [5, 3], "x": 0, "y": 2}, - {"matrix": [2, 0], "x": 1, "y": 2}, - {"matrix": [2, 1], "x": 2, "y": 2}, - {"matrix": [1, 2], "x": 3, "y": 2}, - {"matrix": [1, 3], "x": 4, "y": 2}, - {"matrix": [1, 4], "x": 5, "y": 2}, - {"matrix": [1, 5], "x": 6, "y": 2}, - - {"matrix": [7, 5], "x": 8, "y": 2}, - {"matrix": [7, 4], "x": 9, "y": 2}, - {"matrix": [7, 3], "x": 10, "y": 2}, - {"matrix": [7, 2], "x": 11, "y": 2}, - {"matrix": [7, 1], "x": 12, "y": 2}, - {"matrix": [7, 0], "x": 13, "y": 2}, - - {"matrix": [2, 2], "x": 3, "y": 3}, - {"matrix": [2, 3], "x": 4, "y": 3}, - {"matrix": [2, 4], "x": 5, "y": 3}, - {"matrix": [2, 5], "x": 6, "y": 3}, - - {"matrix": [8, 5], "x": 8, "y": 3}, - {"matrix": [8, 4], "x": 9, "y": 3}, - {"matrix": [8, 3], "x": 10, "y": 3}, - {"matrix": [8, 2], "x": 11, "y": 3}, - {"matrix": [8, 1], "x": 12, "y": 3}, - {"matrix": [8, 0], "x": 13, "y": 3}, - - {"matrix": [5, 4], "x": 0, "y": 4}, - {"matrix": [3, 0], "x": 1, "y": 4}, - {"matrix": [3, 1], "x": 2, "y": 4}, - {"matrix": [3, 2], "x": 3, "y": 4}, - {"matrix": [3, 3], "x": 4, "y": 4}, - {"matrix": [3, 4], "x": 5, "y": 4}, - {"matrix": [3, 5], "x": 6, "y": 4}, - - {"matrix": [9, 6], "x": 7, "y": 4}, - {"matrix": [9, 5], "x": 8, "y": 4}, - {"matrix": [9, 4], "x": 9, "y": 4}, - {"matrix": [9, 3], "x": 10, "y": 4}, - {"matrix": [9, 2], "x": 11, "y": 4}, - {"matrix": [9, 1], "x": 12, "y": 4}, - {"matrix": [9, 0], "x": 13, "y": 4}, - - {"matrix": [5, 5], "x": 0, "y": 5}, - {"matrix": [4, 0], "x": 1, "y": 5}, - {"matrix": [4, 1], "x": 2, "y": 5}, - {"matrix": [4, 2], "x": 3, "y": 5}, - {"matrix": [4, 3], "x": 4, "y": 5}, - {"matrix": [4, 4], "x": 5, "y": 5}, - {"matrix": [4, 5], "x": 6, "y": 5}, - - {"matrix": [10, 6], "x": 7, "y": 5}, - {"matrix": [10, 5], "x": 8, "y": 5}, - {"matrix": [10, 4], "x": 9, "y": 5}, - {"matrix": [10, 3], "x": 10, "y": 5}, - {"matrix": [10, 2], "x": 11, "y": 5}, - {"matrix": [10, 1], "x": 12, "y": 5}, - {"matrix": [10, 0], "x": 13, "y": 5} - ] - } - } -} diff --git a/keyboards/yushakobo/navpad/10_helix_r/keyboard.json b/keyboards/yushakobo/navpad/10_helix_r/keyboard.json new file mode 100644 index 0000000000..81854128da --- /dev/null +++ b/keyboards/yushakobo/navpad/10_helix_r/keyboard.json @@ -0,0 +1,151 @@ +{ + "keyboard_name": "navpad 1.0 with helix keyboard", + "manufacturer": "yushakobo", + "url": "", + "maintainer": "yushakobo", + "usb": { + "vid": "0x3265", + "pid": "0x0008", + "device_version": "0.0.1" + }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, + "matrix_pins": { + "cols": ["F5", "F6", "B2", "B3", "B1", "F7", null], + "rows": ["D4", "C6", "D7", "E6", "B4", "F4"] + }, + "diode_direction": "COL2ROW", + "encoder": { + "rotary": [ + {"pin_a": "B5", "pin_b": "B6"} + ] + }, + "split": { + "enabled": true, + "soft_serial_pin": "D2", + "encoder": { + "right": { + "rotary": [ + {"pin_a": "B6", "pin_b": "B5"} + ] + } + }, + "matrix_pins": { + "right": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + } + } + }, + "tapping": { + "term": 132 + }, + "ws2812": { + "pin": "D3" + }, + "rgblight": { + "saturation_steps": 8, + "brightness_steps": 8, + "led_count": 41, + "max_brightness": 120, + "led_map": [0, 1, 2, 3, 4, 5, 6, 8, 7, 9, 10, 11, 12, 13, 14, 20, 19, 18, 17, 16, 15, 21, 22, 23, 24, 25, 26, 33, 32, 31, 30, 29, 28, 27, 34, 35, 36, 37, 38, 39, 40], + "sleep": true, + "split_count": [9, 32], + "animations": { + "rainbow_swirl": true, + "rgb_test": true + } + }, + "processor": "atmega32u4", + "bootloader": "caterina", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [5, 0], "x": 0, "y": 0}, + {"matrix": [0, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [5, 1], "x": 3, "y": 0}, + + {"matrix": [5, 2], "x": 0, "y": 1}, + {"matrix": [1, 0], "x": 1, "y": 1}, + {"matrix": [1, 1], "x": 2, "y": 1}, + {"matrix": [0, 2], "x": 3, "y": 1}, + {"matrix": [0, 3], "x": 4, "y": 1}, + {"matrix": [0, 4], "x": 5, "y": 1}, + {"matrix": [0, 5], "x": 6, "y": 1}, + + {"matrix": [6, 5], "x": 8, "y": 1}, + {"matrix": [6, 4], "x": 9, "y": 1}, + {"matrix": [6, 3], "x": 10, "y": 1}, + {"matrix": [6, 2], "x": 11, "y": 1}, + {"matrix": [6, 1], "x": 12, "y": 1}, + {"matrix": [6, 0], "x": 13, "y": 1}, + + {"matrix": [5, 3], "x": 0, "y": 2}, + {"matrix": [2, 0], "x": 1, "y": 2}, + {"matrix": [2, 1], "x": 2, "y": 2}, + {"matrix": [1, 2], "x": 3, "y": 2}, + {"matrix": [1, 3], "x": 4, "y": 2}, + {"matrix": [1, 4], "x": 5, "y": 2}, + {"matrix": [1, 5], "x": 6, "y": 2}, + + {"matrix": [7, 5], "x": 8, "y": 2}, + {"matrix": [7, 4], "x": 9, "y": 2}, + {"matrix": [7, 3], "x": 10, "y": 2}, + {"matrix": [7, 2], "x": 11, "y": 2}, + {"matrix": [7, 1], "x": 12, "y": 2}, + {"matrix": [7, 0], "x": 13, "y": 2}, + + {"matrix": [2, 2], "x": 3, "y": 3}, + {"matrix": [2, 3], "x": 4, "y": 3}, + {"matrix": [2, 4], "x": 5, "y": 3}, + {"matrix": [2, 5], "x": 6, "y": 3}, + + {"matrix": [8, 5], "x": 8, "y": 3}, + {"matrix": [8, 4], "x": 9, "y": 3}, + {"matrix": [8, 3], "x": 10, "y": 3}, + {"matrix": [8, 2], "x": 11, "y": 3}, + {"matrix": [8, 1], "x": 12, "y": 3}, + {"matrix": [8, 0], "x": 13, "y": 3}, + + {"matrix": [5, 4], "x": 0, "y": 4}, + {"matrix": [3, 0], "x": 1, "y": 4}, + {"matrix": [3, 1], "x": 2, "y": 4}, + {"matrix": [3, 2], "x": 3, "y": 4}, + {"matrix": [3, 3], "x": 4, "y": 4}, + {"matrix": [3, 4], "x": 5, "y": 4}, + {"matrix": [3, 5], "x": 6, "y": 4}, + + {"matrix": [9, 6], "x": 7, "y": 4}, + {"matrix": [9, 5], "x": 8, "y": 4}, + {"matrix": [9, 4], "x": 9, "y": 4}, + {"matrix": [9, 3], "x": 10, "y": 4}, + {"matrix": [9, 2], "x": 11, "y": 4}, + {"matrix": [9, 1], "x": 12, "y": 4}, + {"matrix": [9, 0], "x": 13, "y": 4}, + + {"matrix": [5, 5], "x": 0, "y": 5}, + {"matrix": [4, 0], "x": 1, "y": 5}, + {"matrix": [4, 1], "x": 2, "y": 5}, + {"matrix": [4, 2], "x": 3, "y": 5}, + {"matrix": [4, 3], "x": 4, "y": 5}, + {"matrix": [4, 4], "x": 5, "y": 5}, + {"matrix": [4, 5], "x": 6, "y": 5}, + + {"matrix": [10, 6], "x": 7, "y": 5}, + {"matrix": [10, 5], "x": 8, "y": 5}, + {"matrix": [10, 4], "x": 9, "y": 5}, + {"matrix": [10, 3], "x": 10, "y": 5}, + {"matrix": [10, 2], "x": 11, "y": 5}, + {"matrix": [10, 1], "x": 12, "y": 5}, + {"matrix": [10, 0], "x": 13, "y": 5} + ] + } + } +} diff --git a/keyboards/yushakobo/navpad/10_helix_r/rules.mk b/keyboards/yushakobo/navpad/10_helix_r/rules.mk index f30c00650c..e8ffcca7a6 100644 --- a/keyboards/yushakobo/navpad/10_helix_r/rules.mk +++ b/keyboards/yushakobo/navpad/10_helix_r/rules.mk @@ -1,16 +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 - SRC += navpad_prefs.c diff --git a/keyboards/yushakobo/quick17/info.json b/keyboards/yushakobo/quick17/info.json deleted file mode 100644 index 51c41a6e82..0000000000 --- a/keyboards/yushakobo/quick17/info.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "keyboard_name": "quick17", - "manufacturer": "yushakobo", - "url": "https://shop.yushakobo.jp/products/quick17", - "maintainer": "yushakobo", - "usb": { - "vid": "0x3265", - "pid": "0x0006", - "device_version": "0.0.1" - }, - "rgb_matrix": { - "driver": "ws2812", - "max_brightness": 150, - "sat_steps": 8, - "sleep": true, - "val_steps": 8, - "speed_steps": 10 - }, - "rgblight": { - "saturation_steps": 8, - "brightness_steps": 8, - "led_count": 18, - "max_brightness": 150, - "led_map": [6, 7, 12, 13, 14, 15, 16, 17, 11, 10, 9, 8, 0, 1, 2, 3, 4, 5], - "animations": { - "rainbow_mood": true, - "rainbow_swirl": true, - "christmas": true, - "static_gradient": true, - "rgb_test": true - } - }, - "matrix_pins": { - "cols": ["F5", "D4", "E6", "F7", "C6", "D7"], - "rows": ["F4", "B3", "B6"] - }, - "diode_direction": "COL2ROW", - "encoder": { - "rotary": [ - {"pin_a": "B4", "pin_b": "B5"} - ] - }, - "ws2812": { - "pin": "D2" - }, - "processor": "atmega32u4", - "bootloader": "caterina", - "layouts": { - "LAYOUT": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, - - {"matrix": [1, 0], "x": 0, "y": 1}, - {"matrix": [1, 1], "x": 1, "y": 1}, - {"matrix": [1, 2], "x": 2, "y": 1}, - {"matrix": [1, 3], "x": 3, "y": 1}, - {"matrix": [1, 4], "x": 4, "y": 1}, - {"matrix": [1, 5], "x": 5, "y": 1}, - - {"matrix": [2, 0], "x": 0, "y": 2}, - {"matrix": [2, 1], "x": 1, "y": 2}, - {"matrix": [2, 2], "x": 2, "y": 2}, - {"matrix": [2, 3], "x": 3, "y": 2}, - {"matrix": [2, 4], "x": 4, "y": 2}, - {"matrix": [2, 5], "x": 5, "y": 2} - ] - } - } -} diff --git a/keyboards/yushakobo/quick17/keyboard.json b/keyboards/yushakobo/quick17/keyboard.json new file mode 100644 index 0000000000..aa0d39756d --- /dev/null +++ b/keyboards/yushakobo/quick17/keyboard.json @@ -0,0 +1,82 @@ +{ + "keyboard_name": "quick17", + "manufacturer": "yushakobo", + "url": "https://shop.yushakobo.jp/products/quick17", + "maintainer": "yushakobo", + "usb": { + "vid": "0x3265", + "pid": "0x0006", + "device_version": "0.0.1" + }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgb_matrix": true + }, + "rgb_matrix": { + "driver": "ws2812", + "max_brightness": 150, + "sat_steps": 8, + "sleep": true, + "val_steps": 8, + "speed_steps": 10 + }, + "rgblight": { + "saturation_steps": 8, + "brightness_steps": 8, + "led_count": 18, + "max_brightness": 150, + "led_map": [6, 7, 12, 13, 14, 15, 16, 17, 11, 10, 9, 8, 0, 1, 2, 3, 4, 5], + "animations": { + "rainbow_mood": true, + "rainbow_swirl": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true + } + }, + "matrix_pins": { + "cols": ["F5", "D4", "E6", "F7", "C6", "D7"], + "rows": ["F4", "B3", "B6"] + }, + "diode_direction": "COL2ROW", + "encoder": { + "rotary": [ + {"pin_a": "B4", "pin_b": "B5"} + ] + }, + "ws2812": { + "pin": "D2" + }, + "processor": "atmega32u4", + "bootloader": "caterina", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2} + ] + } + } +} diff --git a/keyboards/yushakobo/quick17/rules.mk b/keyboards/yushakobo/quick17/rules.mk index 70ab5e2744..083da9448c 100644 --- a/keyboards/yushakobo/quick17/rules.mk +++ b/keyboards/yushakobo/quick17/rules.mk @@ -1,18 +1,3 @@ -# 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 - -RGB_MATRIX_ENABLE = yes RGB_MATRIX_CUSTOM_KB = yes SRC += quick17_prefs.c diff --git a/keyboards/zsa/voyager/info.json b/keyboards/zsa/voyager/info.json deleted file mode 100644 index 14e7584f5c..0000000000 --- a/keyboards/zsa/voyager/info.json +++ /dev/null @@ -1,219 +0,0 @@ -{ - "manufacturer": "ZSA Technology Labs", - "keyboard_name": "Voyager", - "maintainer": "ZSA Technology Labs", - "url": "zsa.io/voyager", - "processor": "STM32F303", - "bootloader": "custom", - "usb": { - "vid": "0x3297", - "pid": "0x1977", - "device_version": "0.0.1", - "shared_endpoint": { - "mouse": false - } - }, - "features": { - "bootmagic": true, - "caps_word": true, - "deferred_exec": true, - "mousekey": true, - "extrakey": true, - "nkro": true, - "swap_hands": true, - "rgb_matrix": true - }, - "bootmagic": { - "matrix": [0, 1] - }, - "diode_direction": "ROW2COL", - "matrix_size": { - "cols": 7, - "rows": 12 - }, - "mousekey": { - "delay": 0, - "interval": 20, - "max_speed": 7, - "time_to_max": 60, - "wheel_delay": 400 - }, - "qmk": { - "locking": { - "enabled": true, - "resync": true - } - }, - "rgb_matrix": { - "driver": "is31fl3731", - "led_flush_limit": 26, - "led_process_limit": 5, - "max_brightness": 175, - "sleep": true, - "animations": { - "alphas_mods": true, - "gradient_up_down": true, - "gradient_left_right": true, - "breathing": true, - "band_sat": true, - "band_val": true, - "band_pinwheel_sat": true, - "band_pinwheel_val": true, - "band_spiral_sat": true, - "band_spiral_val": true, - "cycle_all": true, - "cycle_left_right": true, - "cycle_up_down": true, - "cycle_out_in": true, - "cycle_out_in_dual": true, - "rainbow_moving_chevron": true, - "cycle_pinwheel": true, - "cycle_spiral": true, - "dual_beacon": true, - "rainbow_beacon": true, - "rainbow_pinwheels": true, - "flower_blooming": true, - "raindrops": true, - "jellybean_raindrops": true, - "hue_breathing": true, - "hue_pendulum": true, - "hue_wave": true, - "pixel_fractal": true, - "pixel_flow": true, - "pixel_rain": true, - "typing_heatmap": true, - "digital_rain": true, - "solid_reactive_simple": true, - "solid_reactive": true, - "solid_reactive_wide": true, - "solid_reactive_multiwide": true, - "solid_reactive_cross": true, - "solid_reactive_multicross": true, - "solid_reactive_nexus": true, - "solid_reactive_multinexus": true, - "splash": true, - "multisplash": true, - "solid_splash": true, - "solid_multisplash": true, - "starlight": true, - "starlight_dual_sat": true, - "starlight_dual_hue": true, - "riverflow": true - }, - "layout": [ - {"matrix": [0, 1], "x": 0, "y": 10, "flags": 1}, - {"matrix": [0, 2], "x": 17, "y": 10, "flags": 4}, - {"matrix": [0, 3], "x": 34, "y": 8, "flags": 4}, - {"matrix": [0, 4], "x": 52, "y": 5, "flags": 4}, - {"matrix": [0, 5], "x": 69, "y": 8, "flags": 4}, - {"matrix": [0, 6], "x": 86, "y": 10, "flags": 4}, - {"matrix": [1, 1], "x": 0, "y": 21, "flags": 1}, - {"matrix": [1, 2], "x": 17, "y": 21, "flags": 4}, - {"matrix": [1, 3], "x": 34, "y": 19, "flags": 4}, - {"matrix": [1, 4], "x": 52, "y": 17, "flags": 4}, - {"matrix": [1, 5], "x": 69, "y": 19, "flags": 4}, - {"matrix": [1, 6], "x": 86, "y": 21, "flags": 4}, - {"matrix": [2, 1], "x": 0, "y": 32, "flags": 1}, - {"matrix": [2, 2], "x": 17, "y": 32, "flags": 4}, - {"matrix": [2, 3], "x": 34, "y": 30, "flags": 4}, - {"matrix": [2, 4], "x": 52, "y": 28, "flags": 4}, - {"matrix": [2, 5], "x": 69, "y": 30, "flags": 4}, - {"matrix": [2, 6], "x": 86, "y": 32, "flags": 4}, - {"matrix": [3, 1], "x": 0, "y": 43, "flags": 1}, - {"matrix": [3, 2], "x": 17, "y": 43, "flags": 4}, - {"matrix": [3, 3], "x": 34, "y": 41, "flags": 4}, - {"matrix": [3, 4], "x": 52, "y": 39, "flags": 4}, - {"matrix": [3, 5], "x": 69, "y": 41, "flags": 4}, - {"matrix": [4, 4], "x": 86, "y": 43, "flags": 4}, - {"matrix": [5, 0], "x": 86, "y": 53, "flags": 1}, - {"matrix": [5, 1], "x": 96, "y": 58, "flags": 1}, - {"matrix": [6, 0], "x": 138, "y": 10, "flags": 4}, - {"matrix": [6, 1], "x": 155, "y": 10, "flags": 4}, - {"matrix": [6, 2], "x": 172, "y": 8, "flags": 4}, - {"matrix": [6, 3], "x": 190, "y": 5, "flags": 4}, - {"matrix": [6, 4], "x": 207, "y": 8, "flags": 4}, - {"matrix": [6, 5], "x": 224, "y": 10, "flags": 1}, - {"matrix": [7, 0], "x": 138, "y": 21, "flags": 4}, - {"matrix": [7, 1], "x": 155, "y": 21, "flags": 4}, - {"matrix": [7, 2], "x": 172, "y": 19, "flags": 4}, - {"matrix": [7, 3], "x": 190, "y": 17, "flags": 4}, - {"matrix": [7, 4], "x": 207, "y": 19, "flags": 4}, - {"matrix": [7, 5], "x": 224, "y": 21, "flags": 1}, - {"matrix": [8, 0], "x": 138, "y": 32, "flags": 4}, - {"matrix": [8, 1], "x": 155, "y": 32, "flags": 4}, - {"matrix": [8, 2], "x": 172, "y": 30, "flags": 4}, - {"matrix": [8, 3], "x": 190, "y": 28, "flags": 4}, - {"matrix": [8, 4], "x": 207, "y": 30, "flags": 4}, - {"matrix": [8, 5], "x": 224, "y": 32, "flags": 1}, - {"matrix": [10, 2], "x": 138, "y": 43, "flags": 4}, - {"matrix": [9, 1], "x": 155, "y": 43, "flags": 4}, - {"matrix": [9, 2], "x": 172, "y": 41, "flags": 4}, - {"matrix": [9, 3], "x": 190, "y": 39, "flags": 4}, - {"matrix": [9, 4], "x": 207, "y": 41, "flags": 4}, - {"matrix": [9, 5], "x": 224, "y": 43, "flags": 1}, - {"matrix": [11, 5], "x": 128, "y": 58, "flags": 1}, - {"matrix": [11, 6], "x": 138, "y": 53, "flags": 1} - ] - }, - "layout_aliases": { - "LAYOUT_voyager": "LAYOUT" - }, - "layouts": { - "LAYOUT": { - "layout": [ - {"label": "k00", "matrix": [0, 1], "x": 3, "y": 0}, - {"label": "k01", "matrix": [0, 2], "x": 12, "y": 0}, - {"label": "k02", "matrix": [0, 3], "x": 2, "y": 0.25}, - {"label": "k03", "matrix": [0, 4], "x": 4, "y": 0.25}, - {"label": "k04", "matrix": [0, 5], "x": 11, "y": 0.25}, - {"label": "k05", "matrix": [0, 6], "x": 13, "y": 0.25}, - {"label": "k26", "matrix": [6, 0], "x": 0, "y": 0.5}, - {"label": "k27", "matrix": [6, 1], "x": 1, "y": 0.5}, - {"label": "k28", "matrix": [6, 2], "x": 5, "y": 0.5}, - {"label": "k29", "matrix": [6, 3], "x": 10, "y": 0.5}, - {"label": "k30", "matrix": [6, 4], "x": 14, "y": 0.5}, - {"label": "k31", "matrix": [6, 5], "x": 15, "y": 0.5}, - {"label": "k06", "matrix": [1, 1], "x": 3, "y": 1}, - {"label": "k07", "matrix": [1, 2], "x": 12, "y": 1}, - {"label": "k08", "matrix": [1, 3], "x": 2, "y": 1.25}, - {"label": "k09", "matrix": [1, 4], "x": 4, "y": 1.25}, - {"label": "k10", "matrix": [1, 5], "x": 11, "y": 1.25}, - {"label": "k11", "matrix": [1, 6], "x": 13, "y": 1.25}, - {"label": "k32", "matrix": [7, 0], "x": 0, "y": 1.5}, - {"label": "k33", "matrix": [7, 1], "x": 1, "y": 1.5}, - {"label": "k34", "matrix": [7, 2], "x": 5, "y": 1.5}, - {"label": "k35", "matrix": [7, 3], "x": 10, "y": 1.5}, - {"label": "k36", "matrix": [7, 4], "x": 14, "y": 1.5}, - {"label": "k37", "matrix": [7, 5], "x": 15, "y": 1.5}, - {"label": "k12", "matrix": [2, 1], "x": 3, "y": 2}, - {"label": "k13", "matrix": [2, 2], "x": 12, "y": 2}, - {"label": "k14", "matrix": [2, 3], "x": 2, "y": 2.25}, - {"label": "k15", "matrix": [2, 4], "x": 4, "y": 2.25}, - {"label": "k16", "matrix": [2, 5], "x": 11, "y": 2.25}, - {"label": "k17", "matrix": [2, 6], "x": 13, "y": 2.25}, - {"label": "k38", "matrix": [8, 0], "x": 0, "y": 2.5}, - {"label": "k39", "matrix": [8, 1], "x": 1, "y": 2.5}, - {"label": "k40", "matrix": [8, 2], "x": 5, "y": 2.5}, - {"label": "k41", "matrix": [8, 3], "x": 10, "y": 2.5}, - {"label": "k42", "matrix": [8, 4], "x": 14, "y": 2.5}, - {"label": "k43", "matrix": [8, 5], "x": 15, "y": 2.5}, - {"label": "k18", "matrix": [3, 1], "x": 3, "y": 3}, - {"label": "k19", "matrix": [3, 2], "x": 12, "y": 3}, - {"label": "k20", "matrix": [3, 3], "x": 2, "y": 3.25}, - {"label": "k21", "matrix": [3, 4], "x": 4, "y": 3.25}, - {"label": "k22", "matrix": [3, 5], "x": 11, "y": 3.25}, - {"label": "k23", "matrix": [4, 4], "x": 13, "y": 3.25}, - {"label": "k44", "matrix": [10, 2], "x": 0, "y": 3.5}, - {"label": "k45", "matrix": [9, 1], "x": 1, "y": 3.5}, - {"label": "k46", "matrix": [9, 2], "x": 5, "y": 3.5}, - {"label": "k47", "matrix": [9, 3], "x": 10, "y": 3.5}, - {"label": "k48", "matrix": [9, 4], "x": 14, "y": 3.5}, - {"label": "k49", "matrix": [9, 5], "x": 15, "y": 3.5}, - {"label": "k24", "matrix": [5, 0], "x": 5, "y": 4.5}, - {"label": "k25", "matrix": [5, 1], "x": 6, "y": 4.75}, - {"label": "k50", "matrix": [11, 5], "x": 9, "y": 4.75}, - {"label": "k51", "matrix": [11, 6], "x": 10, "y": 4.5} - ] - } - } -} diff --git a/keyboards/zsa/voyager/keyboard.json b/keyboards/zsa/voyager/keyboard.json new file mode 100644 index 0000000000..14e7584f5c --- /dev/null +++ b/keyboards/zsa/voyager/keyboard.json @@ -0,0 +1,219 @@ +{ + "manufacturer": "ZSA Technology Labs", + "keyboard_name": "Voyager", + "maintainer": "ZSA Technology Labs", + "url": "zsa.io/voyager", + "processor": "STM32F303", + "bootloader": "custom", + "usb": { + "vid": "0x3297", + "pid": "0x1977", + "device_version": "0.0.1", + "shared_endpoint": { + "mouse": false + } + }, + "features": { + "bootmagic": true, + "caps_word": true, + "deferred_exec": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "swap_hands": true, + "rgb_matrix": true + }, + "bootmagic": { + "matrix": [0, 1] + }, + "diode_direction": "ROW2COL", + "matrix_size": { + "cols": 7, + "rows": 12 + }, + "mousekey": { + "delay": 0, + "interval": 20, + "max_speed": 7, + "time_to_max": 60, + "wheel_delay": 400 + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, + "rgb_matrix": { + "driver": "is31fl3731", + "led_flush_limit": 26, + "led_process_limit": 5, + "max_brightness": 175, + "sleep": true, + "animations": { + "alphas_mods": true, + "gradient_up_down": true, + "gradient_left_right": true, + "breathing": true, + "band_sat": true, + "band_val": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_up_down": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "rainbow_moving_chevron": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "dual_beacon": true, + "rainbow_beacon": true, + "rainbow_pinwheels": true, + "flower_blooming": true, + "raindrops": true, + "jellybean_raindrops": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "pixel_fractal": true, + "pixel_flow": true, + "pixel_rain": true, + "typing_heatmap": true, + "digital_rain": true, + "solid_reactive_simple": true, + "solid_reactive": true, + "solid_reactive_wide": true, + "solid_reactive_multiwide": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_nexus": true, + "solid_reactive_multinexus": true, + "splash": true, + "multisplash": true, + "solid_splash": true, + "solid_multisplash": true, + "starlight": true, + "starlight_dual_sat": true, + "starlight_dual_hue": true, + "riverflow": true + }, + "layout": [ + {"matrix": [0, 1], "x": 0, "y": 10, "flags": 1}, + {"matrix": [0, 2], "x": 17, "y": 10, "flags": 4}, + {"matrix": [0, 3], "x": 34, "y": 8, "flags": 4}, + {"matrix": [0, 4], "x": 52, "y": 5, "flags": 4}, + {"matrix": [0, 5], "x": 69, "y": 8, "flags": 4}, + {"matrix": [0, 6], "x": 86, "y": 10, "flags": 4}, + {"matrix": [1, 1], "x": 0, "y": 21, "flags": 1}, + {"matrix": [1, 2], "x": 17, "y": 21, "flags": 4}, + {"matrix": [1, 3], "x": 34, "y": 19, "flags": 4}, + {"matrix": [1, 4], "x": 52, "y": 17, "flags": 4}, + {"matrix": [1, 5], "x": 69, "y": 19, "flags": 4}, + {"matrix": [1, 6], "x": 86, "y": 21, "flags": 4}, + {"matrix": [2, 1], "x": 0, "y": 32, "flags": 1}, + {"matrix": [2, 2], "x": 17, "y": 32, "flags": 4}, + {"matrix": [2, 3], "x": 34, "y": 30, "flags": 4}, + {"matrix": [2, 4], "x": 52, "y": 28, "flags": 4}, + {"matrix": [2, 5], "x": 69, "y": 30, "flags": 4}, + {"matrix": [2, 6], "x": 86, "y": 32, "flags": 4}, + {"matrix": [3, 1], "x": 0, "y": 43, "flags": 1}, + {"matrix": [3, 2], "x": 17, "y": 43, "flags": 4}, + {"matrix": [3, 3], "x": 34, "y": 41, "flags": 4}, + {"matrix": [3, 4], "x": 52, "y": 39, "flags": 4}, + {"matrix": [3, 5], "x": 69, "y": 41, "flags": 4}, + {"matrix": [4, 4], "x": 86, "y": 43, "flags": 4}, + {"matrix": [5, 0], "x": 86, "y": 53, "flags": 1}, + {"matrix": [5, 1], "x": 96, "y": 58, "flags": 1}, + {"matrix": [6, 0], "x": 138, "y": 10, "flags": 4}, + {"matrix": [6, 1], "x": 155, "y": 10, "flags": 4}, + {"matrix": [6, 2], "x": 172, "y": 8, "flags": 4}, + {"matrix": [6, 3], "x": 190, "y": 5, "flags": 4}, + {"matrix": [6, 4], "x": 207, "y": 8, "flags": 4}, + {"matrix": [6, 5], "x": 224, "y": 10, "flags": 1}, + {"matrix": [7, 0], "x": 138, "y": 21, "flags": 4}, + {"matrix": [7, 1], "x": 155, "y": 21, "flags": 4}, + {"matrix": [7, 2], "x": 172, "y": 19, "flags": 4}, + {"matrix": [7, 3], "x": 190, "y": 17, "flags": 4}, + {"matrix": [7, 4], "x": 207, "y": 19, "flags": 4}, + {"matrix": [7, 5], "x": 224, "y": 21, "flags": 1}, + {"matrix": [8, 0], "x": 138, "y": 32, "flags": 4}, + {"matrix": [8, 1], "x": 155, "y": 32, "flags": 4}, + {"matrix": [8, 2], "x": 172, "y": 30, "flags": 4}, + {"matrix": [8, 3], "x": 190, "y": 28, "flags": 4}, + {"matrix": [8, 4], "x": 207, "y": 30, "flags": 4}, + {"matrix": [8, 5], "x": 224, "y": 32, "flags": 1}, + {"matrix": [10, 2], "x": 138, "y": 43, "flags": 4}, + {"matrix": [9, 1], "x": 155, "y": 43, "flags": 4}, + {"matrix": [9, 2], "x": 172, "y": 41, "flags": 4}, + {"matrix": [9, 3], "x": 190, "y": 39, "flags": 4}, + {"matrix": [9, 4], "x": 207, "y": 41, "flags": 4}, + {"matrix": [9, 5], "x": 224, "y": 43, "flags": 1}, + {"matrix": [11, 5], "x": 128, "y": 58, "flags": 1}, + {"matrix": [11, 6], "x": 138, "y": 53, "flags": 1} + ] + }, + "layout_aliases": { + "LAYOUT_voyager": "LAYOUT" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"label": "k00", "matrix": [0, 1], "x": 3, "y": 0}, + {"label": "k01", "matrix": [0, 2], "x": 12, "y": 0}, + {"label": "k02", "matrix": [0, 3], "x": 2, "y": 0.25}, + {"label": "k03", "matrix": [0, 4], "x": 4, "y": 0.25}, + {"label": "k04", "matrix": [0, 5], "x": 11, "y": 0.25}, + {"label": "k05", "matrix": [0, 6], "x": 13, "y": 0.25}, + {"label": "k26", "matrix": [6, 0], "x": 0, "y": 0.5}, + {"label": "k27", "matrix": [6, 1], "x": 1, "y": 0.5}, + {"label": "k28", "matrix": [6, 2], "x": 5, "y": 0.5}, + {"label": "k29", "matrix": [6, 3], "x": 10, "y": 0.5}, + {"label": "k30", "matrix": [6, 4], "x": 14, "y": 0.5}, + {"label": "k31", "matrix": [6, 5], "x": 15, "y": 0.5}, + {"label": "k06", "matrix": [1, 1], "x": 3, "y": 1}, + {"label": "k07", "matrix": [1, 2], "x": 12, "y": 1}, + {"label": "k08", "matrix": [1, 3], "x": 2, "y": 1.25}, + {"label": "k09", "matrix": [1, 4], "x": 4, "y": 1.25}, + {"label": "k10", "matrix": [1, 5], "x": 11, "y": 1.25}, + {"label": "k11", "matrix": [1, 6], "x": 13, "y": 1.25}, + {"label": "k32", "matrix": [7, 0], "x": 0, "y": 1.5}, + {"label": "k33", "matrix": [7, 1], "x": 1, "y": 1.5}, + {"label": "k34", "matrix": [7, 2], "x": 5, "y": 1.5}, + {"label": "k35", "matrix": [7, 3], "x": 10, "y": 1.5}, + {"label": "k36", "matrix": [7, 4], "x": 14, "y": 1.5}, + {"label": "k37", "matrix": [7, 5], "x": 15, "y": 1.5}, + {"label": "k12", "matrix": [2, 1], "x": 3, "y": 2}, + {"label": "k13", "matrix": [2, 2], "x": 12, "y": 2}, + {"label": "k14", "matrix": [2, 3], "x": 2, "y": 2.25}, + {"label": "k15", "matrix": [2, 4], "x": 4, "y": 2.25}, + {"label": "k16", "matrix": [2, 5], "x": 11, "y": 2.25}, + {"label": "k17", "matrix": [2, 6], "x": 13, "y": 2.25}, + {"label": "k38", "matrix": [8, 0], "x": 0, "y": 2.5}, + {"label": "k39", "matrix": [8, 1], "x": 1, "y": 2.5}, + {"label": "k40", "matrix": [8, 2], "x": 5, "y": 2.5}, + {"label": "k41", "matrix": [8, 3], "x": 10, "y": 2.5}, + {"label": "k42", "matrix": [8, 4], "x": 14, "y": 2.5}, + {"label": "k43", "matrix": [8, 5], "x": 15, "y": 2.5}, + {"label": "k18", "matrix": [3, 1], "x": 3, "y": 3}, + {"label": "k19", "matrix": [3, 2], "x": 12, "y": 3}, + {"label": "k20", "matrix": [3, 3], "x": 2, "y": 3.25}, + {"label": "k21", "matrix": [3, 4], "x": 4, "y": 3.25}, + {"label": "k22", "matrix": [3, 5], "x": 11, "y": 3.25}, + {"label": "k23", "matrix": [4, 4], "x": 13, "y": 3.25}, + {"label": "k44", "matrix": [10, 2], "x": 0, "y": 3.5}, + {"label": "k45", "matrix": [9, 1], "x": 1, "y": 3.5}, + {"label": "k46", "matrix": [9, 2], "x": 5, "y": 3.5}, + {"label": "k47", "matrix": [9, 3], "x": 10, "y": 3.5}, + {"label": "k48", "matrix": [9, 4], "x": 14, "y": 3.5}, + {"label": "k49", "matrix": [9, 5], "x": 15, "y": 3.5}, + {"label": "k24", "matrix": [5, 0], "x": 5, "y": 4.5}, + {"label": "k25", "matrix": [5, 1], "x": 6, "y": 4.75}, + {"label": "k50", "matrix": [11, 5], "x": 9, "y": 4.75}, + {"label": "k51", "matrix": [11, 6], "x": 10, "y": 4.5} + ] + } + } +} -- cgit v1.2.3