commit: f29daff9b6ed178d1d9c3bdb5d504ca8782f8d5a parent 62af50ceeff95a49f381130008ed03fdb0cc9362 Author: Joel Challis <git@zvecr.com> Date: Wed, 3 Apr 2024 23:14:03 +0100 Miscellaneous keyboard.json migrations (#23378)Diffstat:
70 files changed, 863 insertions(+), 991 deletions(-)diff --git a/keyboards/canary/canary60rgb/info.json b/keyboards/canary/canary60rgb/v1/keyboard.jsondiff --git a/keyboards/canary/canary60rgb/v1/rules.mk b/keyboards/canary/canary60rgb/v1/rules.mk@@ -1 +0,0 @@ -# This file intentionally left blankdiff --git a/keyboards/canary/canary60rgb/canary60rgb.c b/keyboards/canary/canary60rgb/v1/v1.cdiff --git a/keyboards/handwired/qc60/info.json b/keyboards/handwired/qc60/proto/keyboard.jsondiff --git a/keyboards/handwired/qc60/proto/rules.mk b/keyboards/handwired/qc60/proto/rules.mk@@ -1 +0,0 @@ -# This file intentionally left blankdiff --git a/keyboards/handwired/stef9998/split_5x7/info.json b/keyboards/handwired/stef9998/split_5x7/rev1/keyboard.jsondiff --git a/keyboards/handwired/stef9998/split_5x7/split_5x7.c b/keyboards/handwired/stef9998/split_5x7/rev1/rev1.cdiff --git a/keyboards/junco/info.json b/keyboards/junco/info.json@@ -1,112 +0,0 @@ -{ - "manufacturer": "Dane Skalski", - "keyboard_name": "Junco", - "url": "https://github.com/Daneski13/Junco", - "maintainer": "Daneski13", - "usb": { - "vid": "0x4413", - "pid": "0x4A13", - "device_version": "1.0.0" - }, - "matrix_pins": { - "cols": ["GP2", "GP3", "GP4", "GP5", "GP6", "GP7"], - "rows": ["GP8", "GP9", "GP10", "GP11", "GP12"] - }, - "diode_direction": "COL2ROW", - "ws2812": { - "pin": "GP15", - "driver": "vendor" - }, - "rgb_matrix": { - "driver": "ws2812", - "split_count": [37, 37] - }, - "encoder": { - "rotary": [ - {"pin_a": "GP16", "pin_b": "GP17"}, - {"pin_a": "GP14", "pin_b": "GP13"} - ] - }, - "split": { - "encoder": { - "right": { - "rotary": [ - {"pin_a": "GP14", "pin_b": "GP13"}, - {"pin_a": "GP16", "pin_b": "GP17"} - ] - } - } - }, - "processor": "RP2040", - "bootloader": "rp2040", - "layouts": { - "LAYOUT_split4x6_r1": { - "layout": [ - {"label": "`", "matrix": [0, 0], "x": 0, "y": 0.7}, - {"label": "1", "matrix": [0, 1], "x": 1, "y": 0.7}, - {"label": "2", "matrix": [0, 2], "x": 2, "y": 0.3}, - {"label": "3", "matrix": [0, 3], "x": 3, "y": 0}, - {"label": "4", "matrix": [0, 4], "x": 4, "y": 0.3}, - {"label": "5", "matrix": [0, 5], "x": 5, "y": 0.45}, - {"label": "6", "matrix": [5, 5], "x": 9, "y": 0.45}, - {"label": "7", "matrix": [5, 4], "x": 10, "y": 0.3}, - {"label": "8", "matrix": [5, 3], "x": 11, "y": 0}, - {"label": "9", "matrix": [5, 2], "x": 12, "y": 0.3}, - {"label": "0", "matrix": [5, 1], "x": 13, "y": 0.7}, - {"label": "-", "matrix": [5, 0], "x": 14, "y": 0.7}, - - {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1.7}, - {"label": "Q", "matrix": [1, 1], "x": 1, "y": 1.7}, - {"label": "W", "matrix": [1, 2], "x": 2, "y": 1.3}, - {"label": "E", "matrix": [1, 3], "x": 3, "y": 1}, - {"label": "R", "matrix": [1, 4], "x": 4, "y": 1.3}, - {"label": "T", "matrix": [1, 5], "x": 5, "y": 1.45}, - {"label": "Y", "matrix": [6, 5], "x": 9, "y": 1.45}, - {"label": "U", "matrix": [6, 4], "x": 10, "y": 1.3}, - {"label": "I", "matrix": [6, 3], "x": 11, "y": 1}, - {"label": "O", "matrix": [6, 2], "x": 12, "y": 1.3}, - {"label": "P", "matrix": [6, 1], "x": 13, "y": 1.7}, - {"label": "Enter", "matrix": [6, 0], "x": 14, "y": 1.7}, - - {"label": "Esc", "matrix": [2, 0], "x": 0, "y": 2.7}, - {"label": "A", "matrix": [2, 1], "x": 1, "y": 2.7}, - {"label": "S", "matrix": [2, 2], "x": 2, "y": 2.3}, - {"label": "D", "matrix": [2, 3], "x": 3, "y": 2}, - {"label": "F", "matrix": [2, 4], "x": 4, "y": 2.3}, - {"label": "G", "matrix": [2, 5], "x": 5, "y": 2.45}, - {"label": "H", "matrix": [7, 5], "x": 9, "y": 2.45}, - {"label": "J", "matrix": [7, 4], "x": 10, "y": 2.3}, - {"label": "K", "matrix": [7, 3], "x": 11, "y": 2}, - {"label": "L", "matrix": [7, 2], "x": 12, "y": 2.3}, - {"label": ";", "matrix": [7, 1], "x": 13, "y": 2.7}, - {"label": "'", "matrix": [7, 0], "x": 14, "y": 2.7}, - - {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3.7}, - {"label": "Z", "matrix": [3, 1], "x": 1, "y": 3.7}, - {"label": "X", "matrix": [3, 2], "x": 2, "y": 3.3}, - {"label": "C", "matrix": [3, 3], "x": 3, "y": 3}, - {"label": "V", "matrix": [3, 4], "x": 4, "y": 3.3}, - {"label": "B", "matrix": [3, 5], "x": 5, "y": 3.45}, - {"label": "Mute", "matrix": [4, 5], "x": 6.2, "y": 3.45}, - {"label": "XXX", "matrix": [9, 5], "x": 7.8, "y": 3.45}, - {"label": "N", "matrix": [8, 5], "x": 9, "y": 3.45}, - {"label": "M", "matrix": [8, 4], "x": 10, "y": 3.3}, - {"label": ",", "matrix": [8, 3], "x": 11, "y": 3}, - {"label": ".", "matrix": [8, 2], "x": 12, "y": 3.3}, - {"label": "/", "matrix": [8, 1], "x": 13, "y": 3.7}, - {"label": "Shift", "matrix": [8, 0], "x": 14, "y": 3.7}, - - {"label": "Ctrl", "matrix": [4, 0], "x": 2, "y": 4.3}, - {"label": "Win", "matrix": [4, 1], "x": 3, "y": 4}, - {"label": "Alt", "matrix": [4, 2], "x": 4, "y": 4.3}, - {"label": "Del", "matrix": [4, 3], "x": 5.1, "y": 4.5, "h": 1.5}, - {"label": "Spc", "matrix": [4, 4], "x": 6.1, "y": 4.5, "h": 1.5}, - {"label": "Shift", "matrix": [9, 3], "x": 7.9, "y": 4.5, "h": 1.5}, - {"label": "Bspc", "matrix": [9, 4], "x": 8.9, "y": 4.5, "h": 1.5}, - {"label": "Alt", "matrix": [9, 2], "x": 10, "y": 4.3}, - {"label": "Win", "matrix": [9, 1], "x": 11, "y": 4}, - {"label": "Ctrl", "matrix": [9, 0], "x": 12, "y": 4.3} - ] - } - } -}diff --git a/keyboards/junco/rev1/keyboard.json b/keyboards/junco/rev1/keyboard.json@@ -0,0 +1,116 @@ +{ + "manufacturer": "Dane Skalski", + "keyboard_name": "Junco", + "url": "https://github.com/Daneski13/Junco", + "maintainer": "Daneski13", + "usb": { + "vid": "0x4413", + "pid": "0x4A13", + "device_version": "1.0.0" + }, + "features": { + "bootmagic": true + }, + "matrix_pins": { + "cols": ["GP2", "GP3", "GP4", "GP5", "GP6", "GP7"], + "rows": ["GP8", "GP9", "GP10", "GP11", "GP12"] + }, + "diode_direction": "COL2ROW", + "ws2812": { + "pin": "GP15", + "driver": "vendor" + }, + "rgb_matrix": { + "driver": "ws2812", + "split_count": [37, 37] + }, + "encoder": { + "rotary": [ + {"pin_a": "GP16", "pin_b": "GP17"}, + {"pin_a": "GP14", "pin_b": "GP13"} + ] + }, + "split": { + "enabled": true, + "encoder": { + "right": { + "rotary": [ + {"pin_a": "GP14", "pin_b": "GP13"}, + {"pin_a": "GP16", "pin_b": "GP17"} + ] + } + } + }, + "processor": "RP2040", + "bootloader": "rp2040", + "layouts": { + "LAYOUT_split4x6_r1": { + "layout": [ + {"label": "`", "matrix": [0, 0], "x": 0, "y": 0.7}, + {"label": "1", "matrix": [0, 1], "x": 1, "y": 0.7}, + {"label": "2", "matrix": [0, 2], "x": 2, "y": 0.3}, + {"label": "3", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "4", "matrix": [0, 4], "x": 4, "y": 0.3}, + {"label": "5", "matrix": [0, 5], "x": 5, "y": 0.45}, + {"label": "6", "matrix": [5, 5], "x": 9, "y": 0.45}, + {"label": "7", "matrix": [5, 4], "x": 10, "y": 0.3}, + {"label": "8", "matrix": [5, 3], "x": 11, "y": 0}, + {"label": "9", "matrix": [5, 2], "x": 12, "y": 0.3}, + {"label": "0", "matrix": [5, 1], "x": 13, "y": 0.7}, + {"label": "-", "matrix": [5, 0], "x": 14, "y": 0.7}, + + {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1.7}, + {"label": "Q", "matrix": [1, 1], "x": 1, "y": 1.7}, + {"label": "W", "matrix": [1, 2], "x": 2, "y": 1.3}, + {"label": "E", "matrix": [1, 3], "x": 3, "y": 1}, + {"label": "R", "matrix": [1, 4], "x": 4, "y": 1.3}, + {"label": "T", "matrix": [1, 5], "x": 5, "y": 1.45}, + {"label": "Y", "matrix": [6, 5], "x": 9, "y": 1.45}, + {"label": "U", "matrix": [6, 4], "x": 10, "y": 1.3}, + {"label": "I", "matrix": [6, 3], "x": 11, "y": 1}, + {"label": "O", "matrix": [6, 2], "x": 12, "y": 1.3}, + {"label": "P", "matrix": [6, 1], "x": 13, "y": 1.7}, + {"label": "Enter", "matrix": [6, 0], "x": 14, "y": 1.7}, + + {"label": "Esc", "matrix": [2, 0], "x": 0, "y": 2.7}, + {"label": "A", "matrix": [2, 1], "x": 1, "y": 2.7}, + {"label": "S", "matrix": [2, 2], "x": 2, "y": 2.3}, + {"label": "D", "matrix": [2, 3], "x": 3, "y": 2}, + {"label": "F", "matrix": [2, 4], "x": 4, "y": 2.3}, + {"label": "G", "matrix": [2, 5], "x": 5, "y": 2.45}, + {"label": "H", "matrix": [7, 5], "x": 9, "y": 2.45}, + {"label": "J", "matrix": [7, 4], "x": 10, "y": 2.3}, + {"label": "K", "matrix": [7, 3], "x": 11, "y": 2}, + {"label": "L", "matrix": [7, 2], "x": 12, "y": 2.3}, + {"label": ";", "matrix": [7, 1], "x": 13, "y": 2.7}, + {"label": "'", "matrix": [7, 0], "x": 14, "y": 2.7}, + + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3.7}, + {"label": "Z", "matrix": [3, 1], "x": 1, "y": 3.7}, + {"label": "X", "matrix": [3, 2], "x": 2, "y": 3.3}, + {"label": "C", "matrix": [3, 3], "x": 3, "y": 3}, + {"label": "V", "matrix": [3, 4], "x": 4, "y": 3.3}, + {"label": "B", "matrix": [3, 5], "x": 5, "y": 3.45}, + {"label": "Mute", "matrix": [4, 5], "x": 6.2, "y": 3.45}, + {"label": "XXX", "matrix": [9, 5], "x": 7.8, "y": 3.45}, + {"label": "N", "matrix": [8, 5], "x": 9, "y": 3.45}, + {"label": "M", "matrix": [8, 4], "x": 10, "y": 3.3}, + {"label": ",", "matrix": [8, 3], "x": 11, "y": 3}, + {"label": ".", "matrix": [8, 2], "x": 12, "y": 3.3}, + {"label": "/", "matrix": [8, 1], "x": 13, "y": 3.7}, + {"label": "Shift", "matrix": [8, 0], "x": 14, "y": 3.7}, + + {"label": "Ctrl", "matrix": [4, 0], "x": 2, "y": 4.3}, + {"label": "Win", "matrix": [4, 1], "x": 3, "y": 4}, + {"label": "Alt", "matrix": [4, 2], "x": 4, "y": 4.3}, + {"label": "Del", "matrix": [4, 3], "x": 5.1, "y": 4.5, "h": 1.5}, + {"label": "Spc", "matrix": [4, 4], "x": 6.1, "y": 4.5, "h": 1.5}, + {"label": "Shift", "matrix": [9, 3], "x": 7.9, "y": 4.5, "h": 1.5}, + {"label": "Bspc", "matrix": [9, 4], "x": 8.9, "y": 4.5, "h": 1.5}, + {"label": "Alt", "matrix": [9, 2], "x": 10, "y": 4.3}, + {"label": "Win", "matrix": [9, 1], "x": 11, "y": 4}, + {"label": "Ctrl", "matrix": [9, 0], "x": 12, "y": 4.3} + ] + } + } +}diff --git a/keyboards/junco/rev1/rules.mk b/keyboards/junco/rev1/rules.mk@@ -0,0 +1 @@ +SERIAL_DRIVER = vendordiff --git a/keyboards/junco/rules.mk b/keyboards/junco/rules.mk@@ -1,9 +1 @@ -# Split Keyboard Stuff -SPLIT_KEYBOARD = yes -SERIAL_DRIVER = vendor - -# Enable Bootmagic Lite -BOOTMAGIC_ENABLE = yes - -# Default Folder DEFAULT_FOLDER = junco/rev1diff --git a/keyboards/keaboard/info.json b/keyboards/keaboard/rev1/keyboard.jsondiff --git a/keyboards/keaboard/rev1/rules.mk b/keyboards/keaboard/rev1/rules.mk@@ -1 +0,0 @@ -# This file intentionally left blankdiff --git a/keyboards/melgeek/mj65/info.json b/keyboards/melgeek/mj65/info.json@@ -1,150 +0,0 @@ -{ - "keyboard_name": "MJ65", - "manufacturer": "MelGeek", - "url": "", - "maintainer": "melgeek001365", - "usb": { - "vid": "0xEDED", - "pid": "0x0065", - "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, - "solid_splash": true - }, - "default": { - "animation": "cycle_all" - }, - "driver": "is31fl3741", - "led_flush_limit": 26, - "led_process_limit": 4, - "sleep": true - }, - "matrix_pins": { - "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "B14"], - "rows": ["B12", "B11", "B10", "B1", "A3"] - }, - "diode_direction": "COL2ROW", - "processor": "STM32F303", - "bootloader": "stm32-dfu", - "board": "QMK_PROTON_C", - "debounce": 3, - "community_layouts": ["65_ansi"], - "layouts": { - "LAYOUT_65_ansi": { - "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, 12], "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, 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, 10], "x": 11.25, "y": 3}, - {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, - {"matrix": [3, 12], "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, 5], "x": 3.75, "y": 4, "w": 6.25}, - {"matrix": [4, 9], "x": 10, "y": 4}, - {"matrix": [4, 10], "x": 11, "y": 4}, - {"matrix": [4, 11], "x": 12, "y": 4}, - {"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/melgeek/mj65/config.h b/keyboards/melgeek/mj65/rev3/config.hdiff --git a/keyboards/melgeek/mj65/rev3/keyboard.json b/keyboards/melgeek/mj65/rev3/keyboard.json@@ -0,0 +1,157 @@ +{ + "keyboard_name": "MJ65", + "manufacturer": "MelGeek", + "url": "", + "maintainer": "melgeek001365", + "usb": { + "vid": "0xEDED", + "pid": "0x0065", + "device_version": "0.0.1" + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, + "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, + "solid_splash": true + }, + "default": { + "animation": "cycle_all" + }, + "driver": "is31fl3741", + "led_flush_limit": 26, + "led_process_limit": 4, + "sleep": true + }, + "matrix_pins": { + "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "B14"], + "rows": ["B12", "B11", "B10", "B1", "A3"] + }, + "diode_direction": "COL2ROW", + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", + "debounce": 3, + "community_layouts": ["65_ansi"], + "layouts": { + "LAYOUT_65_ansi": { + "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, 12], "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, 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, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 12], "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, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 10, "y": 4}, + {"matrix": [4, 10], "x": 11, "y": 4}, + {"matrix": [4, 11], "x": 12, "y": 4}, + {"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/melgeek/mj65/rev3/rules.mk b/keyboards/melgeek/mj65/rev3/rules.mk@@ -1,16 +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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -RGB_MATRIX_ENABLE = yes # Use RGB matrix - RGB_MATRIX_SUPPORTED = yes RGBLIGHT_SUPPORTED = no BACKLIGHT_SUPPORTED = nodiff --git a/keyboards/melgeek/mojo68/rev1/config.h b/keyboards/melgeek/mojo68/rev1/config.h@@ -16,4 +16,7 @@ #pragma once +#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND +#define IS31FL3741_SDB_PIN B7 + #define DRIVER_INDICATOR_LED_TOTAL 3diff --git a/keyboards/melgeek/mojo68/info.json b/keyboards/melgeek/mojo68/rev1/keyboard.jsondiff --git a/keyboards/melgeek/mojo68/rev1/rules.mk b/keyboards/melgeek/mojo68/rev1/rules.mk@@ -1 +0,0 @@ -# This file intentionally left blankdiff --git a/keyboards/melgeek/mojo75/config.h b/keyboards/melgeek/mojo75/rev1/config.hdiff --git a/keyboards/melgeek/mojo75/info.json b/keyboards/melgeek/mojo75/rev1/keyboard.jsondiff --git a/keyboards/melgeek/mojo75/rev1/rules.mk b/keyboards/melgeek/mojo75/rev1/rules.mk@@ -1 +0,0 @@ -# This file intentionally left blankdiff --git a/keyboards/melgeek/tegic/config.h b/keyboards/melgeek/tegic/config.h@@ -1,20 +0,0 @@ -/* Copyright 2020 MelGeek <melgeek001365@gmail.com> - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#pragma once - -#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND -#define IS31FL3741_SDB_PIN B7diff --git a/keyboards/melgeek/mojo68/config.h b/keyboards/melgeek/tegic/rev1/config.hdiff --git a/keyboards/melgeek/tegic/info.json b/keyboards/melgeek/tegic/rev1/keyboard.jsondiff --git a/keyboards/melgeek/tegic/rev1/rules.mk b/keyboards/melgeek/tegic/rev1/rules.mk@@ -1 +0,0 @@ -# This file intentionally left blankdiff --git a/keyboards/melgeek/z70ultra/config.h b/keyboards/melgeek/z70ultra/rev1/config.hdiff --git a/keyboards/melgeek/z70ultra/info.json b/keyboards/melgeek/z70ultra/rev1/keyboard.jsondiff --git a/keyboards/melgeek/z70ultra/z70ultra.c b/keyboards/melgeek/z70ultra/rev1/rev1.cdiff --git a/keyboards/melgeek/z70ultra/rev1/rules.mk b/keyboards/melgeek/z70ultra/rev1/rules.mk@@ -1 +0,0 @@ -# This file intentionally left blankdiff --git a/keyboards/miiiw/blackio83/blackio83.c b/keyboards/miiiw/blackio83/blackio83.c@@ -1,192 +0,0 @@ -/* Copyright 2023 ArthurCyy <https://github.com/ArthurCyy> - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#include "blackio83.h" -#include "usb_main.h" -#include "usb_util.h" - -#define LOOP_10HZ_PERIOD 100 -deferred_token loop10hz_token = INVALID_DEFERRED_TOKEN; -uint32_t loop_10Hz(uint32_t trigger_time, void *cb_arg); - -static const SerialConfig mwproto_uart_config = { - .speed = MWPROTO_BITRATE, -}; - -static void POWER_EnterSleep(void) { - /* Clear Wake-up flag */ - PWR->CR |= PWR_CR_CWUF | PWR_CR_CSBF; - /* Select Sleep mode */ - /* PWR->CR |= PWR_CR_PDDS | PWR_CR_LPDS; */ - /* Set SLEEPDEEP bit of Cortex System Control Register */ - SCB->SCR |= SCB_SCR_SLEEPDEEP_Msk; - /* Request Wait For Interrupt */ - __WFI(); - /* Reset SLEEPDEEP bit of Cortex System Control Register */ - SCB->SCR &= ~SCB_SCR_SLEEPDEEP_Msk; - NVIC_SystemReset(); -} - -extern void ws2812_poweron(void); -extern void ws2812_poweroff(void); - -static bool p_setup = false; -static bool s_init = false; -void ws2812_poweron(void) { - if(p_setup) return; - p_setup = true; - s_init = false; - setPinOutput(RGB_EN_PIN); - writePinHigh(RGB_EN_PIN); -} - -void ws2812_poweroff(void) { - if(!p_setup) return; - p_setup = false; - setPinInputLow(WS2812_DI_PIN); - writePinLow(RGB_EN_PIN); -} - -void keyboard_pre_init_kb() { - keyboard_pre_init_user(); - - setPinInputLow(MWPROTO_STATUS_PIN); - setPinOutput(MWPROTO_WAKEUP_PIN); - writePinLow(MWPROTO_WAKEUP_PIN); - wait_ms(2); - writePinHigh(MWPROTO_WAKEUP_PIN); - - palSetLineMode(MWPROTO_TX_PIN, PAL_MODE_ALTERNATE(MWPROTO_TX_PAL_MODE) | PAL_OUTPUT_TYPE_OPENDRAIN); - sdStart(&MWPROTO_DRIVER, &mwproto_uart_config); -} - -void keyboard_post_init_kb(void) { - keyboard_post_init_user(); - - print(/* clang-format off */ - "\n<--QMK Keyboard-->\n" - "Vendor: " STR(MANUFACTURER) "(" STR(VENDOR_ID) ")\n" - "Product: " STR(PRODUCT) " (" STR(PRODUCT_ID) ")\n" - "Version: " STR(DEVICE_VER) "\n" - "BUILD: " __DATE__ "\n" - ); /* clang-format on */ - - writePinLow(MWPROTO_WAKEUP_PIN); - wait_ms(50); - sdPutI(&MWPROTO_DRIVER, 0xA5); - sdPutI(&MWPROTO_DRIVER, 0x12); - sdPutI(&MWPROTO_DRIVER, 0x01); - sdPutI(&MWPROTO_DRIVER, 0x02); - sdPutI(&MWPROTO_DRIVER, 0xB4); - writePinHigh(MWPROTO_WAKEUP_PIN); - - ws2812_poweron(); - loop10hz_token = defer_exec(LOOP_10HZ_PERIOD, loop_10Hz, NULL); -} - -bool shutdown_kb(bool jump_to_bootloader) { - if (shutdown_user(jump_to_bootloader)) { -#ifdef RGB_MATRIX_ENABLE - rgb_matrix_set_suspend_state(true); -#endif // RGB_MATRIX_ENABLE - wait_ms(10); - } - ws2812_poweroff(); - return true; -} - -#ifdef DIP_SWITCH_ENABLE -bool dip_switch_update_mask_kb(uint32_t state) { - if (!dip_switch_update_mask_user(state)) { return false; } - - if(state & 0x01) { - led_suspend(); - usbDisconnectBus(&USB_DRIVER); - usbStop(&USB_DRIVER); - shutdown_user(true); - setPinInputHigh(POWER_SWITCH_PIN); - palEnableLineEvent(POWER_SWITCH_PIN, PAL_EVENT_MODE_RISING_EDGE); - POWER_EnterSleep(); - } - - return true; -} -#endif - -uint32_t loop_10Hz(uint32_t trigger_time, void *cb_arg) { - - if(last_input_activity_elapsed() > 1000) { - static uint32_t pmu_timer = 0; - if(timer_elapsed32(pmu_timer) > 3000) { - pmu_timer = timer_read32(); - writePinLow(MWPROTO_WAKEUP_PIN); - if(readPin(MWPROTO_STATUS_PIN)) - wait_us(500); - else - wait_us(1500); - sdPutI(&MWPROTO_DRIVER, 0xA5); - sdPutI(&MWPROTO_DRIVER, 0x28); - sdPutI(&MWPROTO_DRIVER, 0x00); - sdPutI(&MWPROTO_DRIVER, 0x8D); - writePinHigh(MWPROTO_WAKEUP_PIN); - } - } - - extern matrix_row_t matrix[MATRIX_ROWS]; - static uint32_t restore_tick = 0; - if(matrix[0] == 0x4000 && matrix[1] == 0 && - matrix[2] == 0 && matrix[3] == 0 && matrix[4] == 0 && matrix[5] == 0x201) { - if(restore_tick++ > 50) { - restore_tick = 0; - writePinLow(MWPROTO_WAKEUP_PIN); - if(readPin(MWPROTO_STATUS_PIN)) - wait_us(500); - else - wait_us(1500); - sdPutI(&MWPROTO_DRIVER, 0xA5); - sdPutI(&MWPROTO_DRIVER, 0x1F); - sdPutI(&MWPROTO_DRIVER, 0x01); - sdPutI(&MWPROTO_DRIVER, 0x0F); - sdPutI(&MWPROTO_DRIVER, 0xB4); - writePinHigh(MWPROTO_WAKEUP_PIN); - wait_ms(50); - eeconfig_init(); - #ifdef RGB_MATRIX_ENABLE - extern void rgb_matrix_update_pwm_buffers(void); - for(int i = 0; i < 5; i++) { - rgb_matrix_set_color_all(RGB_WHITE); - rgb_matrix_update_pwm_buffers(); - wait_ms(500); - rgb_matrix_set_color_all(RGB_OFF); - rgb_matrix_update_pwm_buffers(); - wait_ms(500); - } - #endif - wait_ms(500); - soft_reset_keyboard(); - } - } else { - restore_tick = 0; - } - - static uint32_t debug_tick = 0; - if (debug_tick++ > 9 ) { - dprintf("trigger %d\n", trigger_time); - debug_tick = 0; - } - - return LOOP_10HZ_PERIOD; -}diff --git a/keyboards/miiiw/blackio83/config.h b/keyboards/miiiw/blackio83/config.h@@ -1,20 +0,0 @@ -/* Copyright 2023 ArthurCyy <https://github.com/ArthurCyy> - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#pragma once - -// EEPROM i2c chip -#define EEPROM_I2C_24LC256diff --git a/keyboards/miiiw/blackio83/rev_0100/config.h b/keyboards/miiiw/blackio83/rev_0100/config.h@@ -16,6 +16,9 @@ #pragma once +// EEPROM i2c chip +#define EEPROM_I2C_24LC256 + #define POWER_SWITCH_PIN B0 /* 16 with dummy columns for shift registers */diff --git a/keyboards/miiiw/blackio83/halconf.h b/keyboards/miiiw/blackio83/rev_0100/halconf.hdiff --git a/keyboards/miiiw/blackio83/info.json b/keyboards/miiiw/blackio83/rev_0100/keyboard.jsondiff --git a/keyboards/miiiw/blackio83/matrix.c b/keyboards/miiiw/blackio83/rev_0100/matrix.cdiff --git a/keyboards/miiiw/blackio83/mcuconf.h b/keyboards/miiiw/blackio83/rev_0100/mcuconf.hdiff --git a/keyboards/miiiw/blackio83/rev_0100/rev_0100.c b/keyboards/miiiw/blackio83/rev_0100/rev_0100.c@@ -0,0 +1,192 @@ +/* Copyright 2023 ArthurCyy <https://github.com/ArthurCyy> + * + * 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 <http://www.gnu.org/licenses/>. + */ + +#include "rev_0100.h" +#include "usb_main.h" +#include "usb_util.h" + +#define LOOP_10HZ_PERIOD 100 +deferred_token loop10hz_token = INVALID_DEFERRED_TOKEN; +uint32_t loop_10Hz(uint32_t trigger_time, void *cb_arg); + +static const SerialConfig mwproto_uart_config = { + .speed = MWPROTO_BITRATE, +}; + +static void POWER_EnterSleep(void) { + /* Clear Wake-up flag */ + PWR->CR |= PWR_CR_CWUF | PWR_CR_CSBF; + /* Select Sleep mode */ + /* PWR->CR |= PWR_CR_PDDS | PWR_CR_LPDS; */ + /* Set SLEEPDEEP bit of Cortex System Control Register */ + SCB->SCR |= SCB_SCR_SLEEPDEEP_Msk; + /* Request Wait For Interrupt */ + __WFI(); + /* Reset SLEEPDEEP bit of Cortex System Control Register */ + SCB->SCR &= ~SCB_SCR_SLEEPDEEP_Msk; + NVIC_SystemReset(); +} + +extern void ws2812_poweron(void); +extern void ws2812_poweroff(void); + +static bool p_setup = false; +static bool s_init = false; +void ws2812_poweron(void) { + if(p_setup) return; + p_setup = true; + s_init = false; + setPinOutput(RGB_EN_PIN); + writePinHigh(RGB_EN_PIN); +} + +void ws2812_poweroff(void) { + if(!p_setup) return; + p_setup = false; + setPinInputLow(WS2812_DI_PIN); + writePinLow(RGB_EN_PIN); +} + +void keyboard_pre_init_kb() { + keyboard_pre_init_user(); + + setPinInputLow(MWPROTO_STATUS_PIN); + setPinOutput(MWPROTO_WAKEUP_PIN); + writePinLow(MWPROTO_WAKEUP_PIN); + wait_ms(2); + writePinHigh(MWPROTO_WAKEUP_PIN); + + palSetLineMode(MWPROTO_TX_PIN, PAL_MODE_ALTERNATE(MWPROTO_TX_PAL_MODE) | PAL_OUTPUT_TYPE_OPENDRAIN); + sdStart(&MWPROTO_DRIVER, &mwproto_uart_config); +} + +void keyboard_post_init_kb(void) { + keyboard_post_init_user(); + + print(/* clang-format off */ + "\n<--QMK Keyboard-->\n" + "Vendor: " STR(MANUFACTURER) "(" STR(VENDOR_ID) ")\n" + "Product: " STR(PRODUCT) " (" STR(PRODUCT_ID) ")\n" + "Version: " STR(DEVICE_VER) "\n" + "BUILD: " __DATE__ "\n" + ); /* clang-format on */ + + writePinLow(MWPROTO_WAKEUP_PIN); + wait_ms(50); + sdPutI(&MWPROTO_DRIVER, 0xA5); + sdPutI(&MWPROTO_DRIVER, 0x12); + sdPutI(&MWPROTO_DRIVER, 0x01); + sdPutI(&MWPROTO_DRIVER, 0x02); + sdPutI(&MWPROTO_DRIVER, 0xB4); + writePinHigh(MWPROTO_WAKEUP_PIN); + + ws2812_poweron(); + loop10hz_token = defer_exec(LOOP_10HZ_PERIOD, loop_10Hz, NULL); +} + +bool shutdown_kb(bool jump_to_bootloader) { + if (shutdown_user(jump_to_bootloader)) { +#ifdef RGB_MATRIX_ENABLE + rgb_matrix_set_suspend_state(true); +#endif // RGB_MATRIX_ENABLE + wait_ms(10); + } + ws2812_poweroff(); + return true; +} + +#ifdef DIP_SWITCH_ENABLE +bool dip_switch_update_mask_kb(uint32_t state) { + if (!dip_switch_update_mask_user(state)) { return false; } + + if(state & 0x01) { + led_suspend(); + usbDisconnectBus(&USB_DRIVER); + usbStop(&USB_DRIVER); + shutdown_user(true); + setPinInputHigh(POWER_SWITCH_PIN); + palEnableLineEvent(POWER_SWITCH_PIN, PAL_EVENT_MODE_RISING_EDGE); + POWER_EnterSleep(); + } + + return true; +} +#endif + +uint32_t loop_10Hz(uint32_t trigger_time, void *cb_arg) { + + if(last_input_activity_elapsed() > 1000) { + static uint32_t pmu_timer = 0; + if(timer_elapsed32(pmu_timer) > 3000) { + pmu_timer = timer_read32(); + writePinLow(MWPROTO_WAKEUP_PIN); + if(readPin(MWPROTO_STATUS_PIN)) + wait_us(500); + else + wait_us(1500); + sdPutI(&MWPROTO_DRIVER, 0xA5); + sdPutI(&MWPROTO_DRIVER, 0x28); + sdPutI(&MWPROTO_DRIVER, 0x00); + sdPutI(&MWPROTO_DRIVER, 0x8D); + writePinHigh(MWPROTO_WAKEUP_PIN); + } + } + + extern matrix_row_t matrix[MATRIX_ROWS]; + static uint32_t restore_tick = 0; + if(matrix[0] == 0x4000 && matrix[1] == 0 && + matrix[2] == 0 && matrix[3] == 0 && matrix[4] == 0 && matrix[5] == 0x201) { + if(restore_tick++ > 50) { + restore_tick = 0; + writePinLow(MWPROTO_WAKEUP_PIN); + if(readPin(MWPROTO_STATUS_PIN)) + wait_us(500); + else + wait_us(1500); + sdPutI(&MWPROTO_DRIVER, 0xA5); + sdPutI(&MWPROTO_DRIVER, 0x1F); + sdPutI(&MWPROTO_DRIVER, 0x01); + sdPutI(&MWPROTO_DRIVER, 0x0F); + sdPutI(&MWPROTO_DRIVER, 0xB4); + writePinHigh(MWPROTO_WAKEUP_PIN); + wait_ms(50); + eeconfig_init(); + #ifdef RGB_MATRIX_ENABLE + extern void rgb_matrix_update_pwm_buffers(void); + for(int i = 0; i < 5; i++) { + rgb_matrix_set_color_all(RGB_WHITE); + rgb_matrix_update_pwm_buffers(); + wait_ms(500); + rgb_matrix_set_color_all(RGB_OFF); + rgb_matrix_update_pwm_buffers(); + wait_ms(500); + } + #endif + wait_ms(500); + soft_reset_keyboard(); + } + } else { + restore_tick = 0; + } + + static uint32_t debug_tick = 0; + if (debug_tick++ > 9 ) { + dprintf("trigger %d\n", trigger_time); + debug_tick = 0; + } + + return LOOP_10HZ_PERIOD; +}diff --git a/keyboards/miiiw/blackio83/blackio83.h b/keyboards/miiiw/blackio83/rev_0100/rev_0100.hdiff --git a/keyboards/miiiw/blackio83/rev_0100/rules.mk b/keyboards/miiiw/blackio83/rev_0100/rules.mk@@ -1,7 +1,5 @@ CUSTOM_MATRIX = lite -WS2812_DRIVER_REQUIRED := yes - # Project specific files SRC += matrix.c \ common/shift_register.cdiff --git a/keyboards/murcielago/info.json b/keyboards/murcielago/rev1/keyboard.jsondiff --git a/keyboards/murcielago/rev1/rules.mk b/keyboards/murcielago/rev1/rules.mk@@ -1 +0,0 @@ -# This file intentionally left blankdiff --git a/keyboards/polilla/info.json b/keyboards/polilla/info.json@@ -1,101 +0,0 @@ -{ - "keyboard_name": "Polilla", - "manufacturer": "elagil", - "url": "", - "maintainer": "elagil", - "usb": { - "vid": "0x6166", - "pid": "0x0010", - "device_version": "0.0.1" - }, - "features": { - "bootmagic": false, - "command": false, - "console": false, - "extrakey": true, - "mousekey": false, - "nkro": false - }, - "matrix_pins": { - "cols": ["A6", "A5", "A4", "A3", "A2", "A1", "F0", "B7", "B6", "B5", "B4", "B3"], - "rows": ["B1", "B0", "A7", "F1", "A0"] - }, - "diode_direction": "ROW2COL", - "processor": "STM32F042", - "bootloader": "stm32-dfu", - "layouts": { - "LAYOUT": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0.25}, - {"matrix": [0, 1], "x": 1, "y": 0.25}, - {"matrix": [0, 2], "x": 2, "y": 0.125}, - {"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": 9.5, "y": 0}, - {"matrix": [0, 7], "x": 10.5, "y": 0}, - {"matrix": [0, 8], "x": 11.5, "y": 0}, - {"matrix": [0, 9], "x": 12.5, "y": 0.125}, - {"matrix": [0, 10], "x": 13.5, "y": 0.25}, - {"matrix": [0, 11], "x": 14.5, "y": 0.25}, - - {"matrix": [1, 0], "x": 0, "y": 1.25}, - {"matrix": [1, 1], "x": 1, "y": 1.25}, - {"matrix": [1, 2], "x": 2, "y": 1.125}, - {"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": 9.5, "y": 1}, - {"matrix": [1, 7], "x": 10.5, "y": 1}, - {"matrix": [1, 8], "x": 11.5, "y": 1}, - {"matrix": [1, 9], "x": 12.5, "y": 1.125}, - {"matrix": [1, 10], "x": 13.5, "y": 1.25}, - {"matrix": [1, 11], "x": 14.5, "y": 1.25}, - - {"matrix": [2, 0], "x": 0, "y": 2.25}, - {"matrix": [2, 1], "x": 1, "y": 2.25}, - {"matrix": [2, 2], "x": 2, "y": 2.125}, - {"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": 9.5, "y": 2}, - {"matrix": [2, 7], "x": 10.5, "y": 2}, - {"matrix": [2, 8], "x": 11.5, "y": 2}, - {"matrix": [2, 9], "x": 12.5, "y": 2.125}, - {"matrix": [2, 10], "x": 13.5, "y": 2.25}, - {"matrix": [2, 11], "x": 14.5, "y": 2.25}, - - {"matrix": [3, 0], "x": 0, "y": 3.25}, - {"matrix": [3, 1], "x": 1, "y": 3.25}, - {"matrix": [3, 2], "x": 2, "y": 3.125}, - {"matrix": [3, 3], "x": 3, "y": 3}, - {"matrix": [3, 4], "x": 4, "y": 3}, - {"matrix": [3, 5], "x": 5, "y": 3}, - - {"matrix": [4, 5], "x": 9.5, "y": 3}, - {"matrix": [4, 6], "x": 10.5, "y": 3}, - {"matrix": [3, 6], "x": 11.5, "y": 3}, - {"matrix": [3, 7], "x": 12.5, "y": 3.125}, - {"matrix": [3, 8], "x": 13.5, "y": 3.25}, - {"matrix": [3, 9], "x": 14.5, "y": 3.25}, - - {"matrix": [3, 10], "x": 2, "y": 4.125}, - {"matrix": [3, 11], "x": 3, "y": 4}, - {"matrix": [4, 0], "x": 4, "y": 4}, - {"matrix": [4, 1], "x": 5, "y": 4}, - {"matrix": [4, 2], "x": 6, "y": 3.75, "h": 1.5}, - {"matrix": [4, 3], "x": 6, "y": 2.75}, - - {"matrix": [4, 4], "x": 8.5, "y": 2.75}, - {"matrix": [4, 7], "x": 8.5, "y": 3.75, "h": 1.5}, - {"matrix": [4, 8], "x": 9.5, "y": 4}, - {"matrix": [4, 9], "x": 10.5, "y": 4}, - {"matrix": [4, 10], "x": 11.5, "y": 4}, - {"matrix": [4, 11], "x": 12.5, "y": 4.125} - ] - } - } -}diff --git a/keyboards/polilla/chconf.h b/keyboards/polilla/rev1/chconf.hdiff --git a/keyboards/polilla/rev1/config.h b/keyboards/polilla/rev1/config.h@@ -16,26 +16,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once - #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE - -/* 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 - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOTdiff --git a/keyboards/polilla/halconf.h b/keyboards/polilla/rev1/halconf.hdiff --git a/keyboards/polilla/rev1/keyboard.json b/keyboards/polilla/rev1/keyboard.json@@ -0,0 +1,107 @@ +{ + "keyboard_name": "Polilla", + "manufacturer": "elagil", + "url": "", + "maintainer": "elagil", + "usb": { + "vid": "0x6166", + "pid": "0x0010", + "device_version": "0.0.1" + }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, + "matrix_pins": { + "cols": ["A6", "A5", "A4", "A3", "A2", "A1", "F0", "B7", "B6", "B5", "B4", "B3"], + "rows": ["B1", "B0", "A7", "F1", "A0"] + }, + "diode_direction": "ROW2COL", + "processor": "STM32F042", + "bootloader": "stm32-dfu", + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.25}, + {"matrix": [0, 1], "x": 1, "y": 0.25}, + {"matrix": [0, 2], "x": 2, "y": 0.125}, + {"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": 9.5, "y": 0}, + {"matrix": [0, 7], "x": 10.5, "y": 0}, + {"matrix": [0, 8], "x": 11.5, "y": 0}, + {"matrix": [0, 9], "x": 12.5, "y": 0.125}, + {"matrix": [0, 10], "x": 13.5, "y": 0.25}, + {"matrix": [0, 11], "x": 14.5, "y": 0.25}, + + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.125}, + {"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": 9.5, "y": 1}, + {"matrix": [1, 7], "x": 10.5, "y": 1}, + {"matrix": [1, 8], "x": 11.5, "y": 1}, + {"matrix": [1, 9], "x": 12.5, "y": 1.125}, + {"matrix": [1, 10], "x": 13.5, "y": 1.25}, + {"matrix": [1, 11], "x": 14.5, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.25}, + {"matrix": [2, 1], "x": 1, "y": 2.25}, + {"matrix": [2, 2], "x": 2, "y": 2.125}, + {"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": 9.5, "y": 2}, + {"matrix": [2, 7], "x": 10.5, "y": 2}, + {"matrix": [2, 8], "x": 11.5, "y": 2}, + {"matrix": [2, 9], "x": 12.5, "y": 2.125}, + {"matrix": [2, 10], "x": 13.5, "y": 2.25}, + {"matrix": [2, 11], "x": 14.5, "y": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3.25}, + {"matrix": [3, 1], "x": 1, "y": 3.25}, + {"matrix": [3, 2], "x": 2, "y": 3.125}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + + {"matrix": [4, 5], "x": 9.5, "y": 3}, + {"matrix": [4, 6], "x": 10.5, "y": 3}, + {"matrix": [3, 6], "x": 11.5, "y": 3}, + {"matrix": [3, 7], "x": 12.5, "y": 3.125}, + {"matrix": [3, 8], "x": 13.5, "y": 3.25}, + {"matrix": [3, 9], "x": 14.5, "y": 3.25}, + + {"matrix": [3, 10], "x": 2, "y": 4.125}, + {"matrix": [3, 11], "x": 3, "y": 4}, + {"matrix": [4, 0], "x": 4, "y": 4}, + {"matrix": [4, 1], "x": 5, "y": 4}, + {"matrix": [4, 2], "x": 6, "y": 3.75, "h": 1.5}, + {"matrix": [4, 3], "x": 6, "y": 2.75}, + + {"matrix": [4, 4], "x": 8.5, "y": 2.75}, + {"matrix": [4, 7], "x": 8.5, "y": 3.75, "h": 1.5}, + {"matrix": [4, 8], "x": 9.5, "y": 4}, + {"matrix": [4, 9], "x": 10.5, "y": 4}, + {"matrix": [4, 10], "x": 11.5, "y": 4}, + {"matrix": [4, 11], "x": 12.5, "y": 4.125} + ] + } + } +}diff --git a/keyboards/polilla/mcuconf.h b/keyboards/polilla/rev1/mcuconf.hdiff --git a/keyboards/polilla/rev1/rules.mk b/keyboards/polilla/rev1/rules.mk@@ -1 +0,0 @@ -# This file intentionally left blankdiff --git a/keyboards/qwertyydox/config.h b/keyboards/qwertyydox/config.h@@ -1,46 +0,0 @@ -/* -Copyright 2018 Ayden <aydenvis@gmail.com> - -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 <http://www.gnu.org/licenses/>. -*/ - -#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 - -#define MOUSEKEY_DELAY 150 -#define MOUSEKEY_INTERVAL 20 -#define MOUSEKEY_MAX_SPEED 10 -#define MOUSEKEY_TIME_TO_MAX 10 -#define MOUSEKEY_WHEEL_MAX_SPEED 8 -#define MOUSEKEY_WHEEL_TIME_TO_MAX 40 - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -// #define NO_DEBUG - -/* disable print */ -// #define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOTdiff --git a/keyboards/qwertyydox/info.json b/keyboards/qwertyydox/info.json@@ -1,109 +0,0 @@ -{ - "keyboard_name": "QWERTYYdox", - "manufacturer": "AYDENandDAD Youtube", - "identifier": "0x1256", - "url": "", - "maintainer": "qmk", - "usb": { - "vid": "0xCEEB", - "pid": "0x1256", - "device_version": "1.0.0" - }, - "matrix_pins": { - "cols": ["F7", "F6", "F5", "C6", "D7", "D4", "D1"], - "rows": ["B6", "B2", "B3", "B1"] - }, - "rgblight": { - "saturation_steps": 8, - "brightness_steps": 8, - "led_count": 12, - "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": "D6" - }, - "diode_direction": "COL2ROW", - "split": { - "soft_serial_pin": "D0" - }, - "bootloader": "caterina", - "processor": "atmega32u4", - "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": [4, 6], "x": 9, "y": 0}, - {"matrix": [4, 5], "x": 10, "y": 0}, - {"matrix": [4, 4], "x": 11, "y": 0}, - {"matrix": [4, 3], "x": 12, "y": 0}, - {"matrix": [4, 2], "x": 13, "y": 0}, - {"matrix": [4, 1], "x": 14, "y": 0}, - {"matrix": [4, 0], "x": 15, "y": 0}, - - {"matrix": [1, 0], "x": 0.25, "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": [5, 6], "x": 9.25, "y": 1}, - {"matrix": [5, 5], "x": 10.25, "y": 1}, - {"matrix": [5, 4], "x": 11.25, "y": 1}, - {"matrix": [5, 3], "x": 12.25, "y": 1}, - {"matrix": [5, 2], "x": 13.25, "y": 1}, - {"matrix": [5, 1], "x": 14.25, "y": 1}, - {"matrix": [5, 0], "x": 15.25, "y": 1}, - - {"matrix": [2, 0], "x": 0.75, "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": [6, 5], "x": 9.75, "y": 2}, - {"matrix": [6, 4], "x": 10.75, "y": 2}, - {"matrix": [6, 3], "x": 11.75, "y": 2}, - {"matrix": [6, 2], "x": 12.75, "y": 2}, - {"matrix": [6, 1], "x": 13.75, "y": 2}, - {"matrix": [6, 0], "x": 14.75, "y": 2}, - - {"matrix": [3, 0], "x": 0.75, "y": 3}, - {"matrix": [3, 1], "x": 1.75, "y": 3}, - {"matrix": [3, 2], "x": 2.75, "y": 3}, - {"matrix": [3, 3], "x": 3.75, "y": 3}, - {"matrix": [3, 4], "x": 4.75, "y": 3.33}, - {"matrix": [3, 5], "x": 5.75, "y": 3.67}, - {"matrix": [3, 6], "x": 6.75, "y": 4}, - - {"matrix": [7, 6], "x": 8.75, "y": 4}, - {"matrix": [7, 5], "x": 9.75, "y": 3.67}, - {"matrix": [7, 4], "x": 10.75, "y": 3.33}, - {"matrix": [7, 3], "x": 11.75, "y": 3}, - {"matrix": [7, 2], "x": 12.75, "y": 3}, - {"matrix": [7, 1], "x": 13.75, "y": 3}, - {"matrix": [7, 0], "x": 14.75, "y": 3} - ] - } - } -}diff --git a/keyboards/qwertyydox/rev1/config.h b/keyboards/qwertyydox/rev1/config.h@@ -0,0 +1,41 @@ +/* +Copyright 2018 Ayden <aydenvis@gmail.com> + +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 <http://www.gnu.org/licenses/>. +*/ + +#pragma once + +#define MOUSEKEY_DELAY 150 +#define MOUSEKEY_INTERVAL 20 +#define MOUSEKEY_MAX_SPEED 10 +#define MOUSEKEY_TIME_TO_MAX 10 +#define MOUSEKEY_WHEEL_MAX_SPEED 8 +#define MOUSEKEY_WHEEL_TIME_TO_MAX 40 + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +// #define NO_DEBUG + +/* disable print */ +// #define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOTdiff --git a/keyboards/qwertyydox/rev1/keyboard.json b/keyboards/qwertyydox/rev1/keyboard.json@@ -0,0 +1,119 @@ +{ + "keyboard_name": "QWERTYYdox", + "manufacturer": "AYDENandDAD Youtube", + "identifier": "0x1256", + "url": "", + "maintainer": "qmk", + "usb": { + "vid": "0xCEEB", + "pid": "0x1256", + "device_version": "1.0.0" + }, + "features": { + "mousekey": true + }, + "matrix_pins": { + "cols": ["F7", "F6", "F5", "C6", "D7", "D4", "D1"], + "rows": ["B6", "B2", "B3", "B1"] + }, + "rgblight": { + "saturation_steps": 8, + "brightness_steps": 8, + "led_count": 12, + "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": "D6" + }, + "diode_direction": "COL2ROW", + "split": { + "enabled": true, + "soft_serial_pin": "D0" + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, + "bootloader": "caterina", + "processor": "atmega32u4", + "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": [4, 6], "x": 9, "y": 0}, + {"matrix": [4, 5], "x": 10, "y": 0}, + {"matrix": [4, 4], "x": 11, "y": 0}, + {"matrix": [4, 3], "x": 12, "y": 0}, + {"matrix": [4, 2], "x": 13, "y": 0}, + {"matrix": [4, 1], "x": 14, "y": 0}, + {"matrix": [4, 0], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0.25, "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": [5, 6], "x": 9.25, "y": 1}, + {"matrix": [5, 5], "x": 10.25, "y": 1}, + {"matrix": [5, 4], "x": 11.25, "y": 1}, + {"matrix": [5, 3], "x": 12.25, "y": 1}, + {"matrix": [5, 2], "x": 13.25, "y": 1}, + {"matrix": [5, 1], "x": 14.25, "y": 1}, + {"matrix": [5, 0], "x": 15.25, "y": 1}, + + {"matrix": [2, 0], "x": 0.75, "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": [6, 5], "x": 9.75, "y": 2}, + {"matrix": [6, 4], "x": 10.75, "y": 2}, + {"matrix": [6, 3], "x": 11.75, "y": 2}, + {"matrix": [6, 2], "x": 12.75, "y": 2}, + {"matrix": [6, 1], "x": 13.75, "y": 2}, + {"matrix": [6, 0], "x": 14.75, "y": 2}, + + {"matrix": [3, 0], "x": 0.75, "y": 3}, + {"matrix": [3, 1], "x": 1.75, "y": 3}, + {"matrix": [3, 2], "x": 2.75, "y": 3}, + {"matrix": [3, 3], "x": 3.75, "y": 3}, + {"matrix": [3, 4], "x": 4.75, "y": 3.33}, + {"matrix": [3, 5], "x": 5.75, "y": 3.67}, + {"matrix": [3, 6], "x": 6.75, "y": 4}, + + {"matrix": [7, 6], "x": 8.75, "y": 4}, + {"matrix": [7, 5], "x": 9.75, "y": 3.67}, + {"matrix": [7, 4], "x": 10.75, "y": 3.33}, + {"matrix": [7, 3], "x": 11.75, "y": 3}, + {"matrix": [7, 2], "x": 12.75, "y": 3}, + {"matrix": [7, 1], "x": 13.75, "y": 3}, + {"matrix": [7, 0], "x": 14.75, "y": 3} + ] + } + } +}diff --git a/keyboards/qwertyydox/rev1/rules.mk b/keyboards/qwertyydox/rev1/rules.mkdiff --git a/keyboards/qwertyydox/rules.mk b/keyboards/qwertyydox/rules.mk@@ -1,16 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = qwertyydox/rev1diff --git a/keyboards/spacetime/config.h b/keyboards/spacetime/config.h@@ -1,39 +0,0 @@ -/* -Copyright 2019 Kyle Terry - -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 <http://www.gnu.org/licenses/>. -*/ - -#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 - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOTdiff --git a/keyboards/spacetime/info.json b/keyboards/spacetime/info.json@@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], "rows": ["D4", "C6", "D7", "E6"]diff --git a/keyboards/spacetime/rev1/keyboard.json b/keyboards/spacetime/rev1/keyboard.json@@ -0,0 +1 @@ +{}diff --git a/keyboards/spacetime/rev1/rules.mk b/keyboards/spacetime/rev1/rules.mk@@ -1 +0,0 @@ -# This file intentionally left blankdiff --git a/keyboards/splitty/info.json b/keyboards/splitty/info.json@@ -1,97 +0,0 @@ -{ - "keyboard_name": "Splitty", - "manufacturer": "Nicolas Schodet", - "url": "https://git.ni.fr.eu.org/splitty.git/about/", - "maintainer": "schodet", - "usb": { - "vid": "0x1D50", - "pid": "0x6052", - "device_version": "0.0.1" - }, - "matrix_pins": { - "cols": ["B0", "B1", "B2", "B3", "B4", "B5", "B6"], - "rows": ["F0", "F1", "D4", "D5", "D6"] - }, - "diode_direction": "COL2ROW", - "processor": "atmega32u4", - "bootloader": "atmel-dfu", - "layouts": { - "LAYOUT": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0.6667}, - {"matrix": [0, 1], "x": 1, "y": 0.6667}, - {"matrix": [0, 2], "x": 2, "y": 0.2667}, - {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0.2667}, - {"matrix": [0, 5], "x": 5, "y": 0}, - {"matrix": [0, 6], "x": 6, "y": 0}, - - {"matrix": [5, 6], "x": 10, "y": 0}, - {"matrix": [5, 5], "x": 11, "y": 0}, - {"matrix": [5, 4], "x": 12, "y": 0.2667}, - {"matrix": [5, 3], "x": 13, "y": 0}, - {"matrix": [5, 2], "x": 14, "y": 0.2667}, - {"matrix": [5, 1], "x": 15, "y": 0.6667}, - {"matrix": [5, 0], "x": 16, "y": 0.6667}, - - {"matrix": [1, 0], "x": 0, "y": 1.6667}, - {"matrix": [1, 1], "x": 1, "y": 1.6667}, - {"matrix": [1, 2], "x": 2, "y": 1.2667}, - {"matrix": [1, 3], "x": 3, "y": 1}, - {"matrix": [1, 4], "x": 4, "y": 1.2667}, - {"matrix": [1, 5], "x": 5, "y": 1}, - {"matrix": [1, 6], "x": 6, "y": 1, "h": 1.5}, - - {"matrix": [6, 6], "x": 10, "y": 1, "h": 1.5}, - {"matrix": [6, 5], "x": 11, "y": 1}, - {"matrix": [6, 4], "x": 12, "y": 1.2667}, - {"matrix": [6, 3], "x": 13, "y": 1}, - {"matrix": [6, 2], "x": 14, "y": 1.2667}, - {"matrix": [6, 1], "x": 15, "y": 1.6667}, - {"matrix": [6, 0], "x": 16, "y": 1.6667}, - - {"matrix": [2, 0], "x": 0, "y": 2.6667}, - {"matrix": [2, 1], "x": 1, "y": 2.6667}, - {"matrix": [2, 2], "x": 2, "y": 2.2667}, - {"matrix": [2, 3], "x": 3, "y": 2}, - {"matrix": [2, 4], "x": 4, "y": 2.2667}, - {"matrix": [2, 5], "x": 5, "y": 2}, - - {"matrix": [7, 5], "x": 11, "y": 2}, - {"matrix": [7, 4], "x": 12, "y": 2.2667}, - {"matrix": [7, 3], "x": 13, "y": 2}, - {"matrix": [7, 2], "x": 14, "y": 2.2667}, - {"matrix": [7, 1], "x": 15, "y": 2.6667}, - {"matrix": [7, 0], "x": 16, "y": 2.6667}, - - {"matrix": [3, 0], "x": 0, "y": 3.6667}, - {"matrix": [3, 1], "x": 1, "y": 3.6667}, - {"matrix": [3, 2], "x": 2, "y": 3.2667}, - {"matrix": [3, 3], "x": 3, "y": 3}, - {"matrix": [3, 4], "x": 4, "y": 3.2667}, - {"matrix": [3, 5], "x": 5, "y": 3}, - {"matrix": [3, 6], "x": 6, "y": 2.5, "h": 1.5}, - - {"matrix": [8, 6], "x": 10, "y": 2.5, "h": 1.5}, - {"matrix": [8, 5], "x": 11, "y": 3}, - {"matrix": [8, 4], "x": 12, "y": 3.2667}, - {"matrix": [8, 3], "x": 13, "y": 3}, - {"matrix": [8, 2], "x": 14, "y": 3.2667}, - {"matrix": [8, 1], "x": 15, "y": 3.6667}, - {"matrix": [8, 0], "x": 16, "y": 3.6667}, - - {"matrix": [4, 2], "x": 2, "y": 4.2667}, - {"matrix": [4, 3], "x": 3, "y": 4}, - {"matrix": [4, 4], "x": 4, "y": 4.2667}, - {"matrix": [4, 5], "x": 5, "y": 4}, - {"matrix": [4, 6], "x": 6, "y": 4}, - - {"matrix": [9, 6], "x": 10, "y": 4}, - {"matrix": [9, 5], "x": 11, "y": 4}, - {"matrix": [9, 4], "x": 12, "y": 4.2667}, - {"matrix": [9, 3], "x": 13, "y": 4}, - {"matrix": [9, 2], "x": 14, "y": 4.2667} - ] - } - } -}diff --git a/keyboards/splitty/config.h b/keyboards/splitty/rev1/config.hdiff --git a/keyboards/splitty/rev1/keyboard.json b/keyboards/splitty/rev1/keyboard.json@@ -0,0 +1,104 @@ +{ + "keyboard_name": "Splitty", + "manufacturer": "Nicolas Schodet", + "url": "https://git.ni.fr.eu.org/splitty.git/about/", + "maintainer": "schodet", + "usb": { + "vid": "0x1D50", + "pid": "0x6052", + "device_version": "0.0.1" + }, + "features": { + "mousekey": true, + "extrakey": true + }, + "split": { + "enabled": true + }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "B4", "B5", "B6"], + "rows": ["F0", "F1", "D4", "D5", "D6"] + }, + "diode_direction": "COL2ROW", + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.6667}, + {"matrix": [0, 1], "x": 1, "y": 0.6667}, + {"matrix": [0, 2], "x": 2, "y": 0.2667}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.2667}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + + {"matrix": [5, 6], "x": 10, "y": 0}, + {"matrix": [5, 5], "x": 11, "y": 0}, + {"matrix": [5, 4], "x": 12, "y": 0.2667}, + {"matrix": [5, 3], "x": 13, "y": 0}, + {"matrix": [5, 2], "x": 14, "y": 0.2667}, + {"matrix": [5, 1], "x": 15, "y": 0.6667}, + {"matrix": [5, 0], "x": 16, "y": 0.6667}, + + {"matrix": [1, 0], "x": 0, "y": 1.6667}, + {"matrix": [1, 1], "x": 1, "y": 1.6667}, + {"matrix": [1, 2], "x": 2, "y": 1.2667}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.2667}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1, "h": 1.5}, + + {"matrix": [6, 6], "x": 10, "y": 1, "h": 1.5}, + {"matrix": [6, 5], "x": 11, "y": 1}, + {"matrix": [6, 4], "x": 12, "y": 1.2667}, + {"matrix": [6, 3], "x": 13, "y": 1}, + {"matrix": [6, 2], "x": 14, "y": 1.2667}, + {"matrix": [6, 1], "x": 15, "y": 1.6667}, + {"matrix": [6, 0], "x": 16, "y": 1.6667}, + + {"matrix": [2, 0], "x": 0, "y": 2.6667}, + {"matrix": [2, 1], "x": 1, "y": 2.6667}, + {"matrix": [2, 2], "x": 2, "y": 2.2667}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.2667}, + {"matrix": [2, 5], "x": 5, "y": 2}, + + {"matrix": [7, 5], "x": 11, "y": 2}, + {"matrix": [7, 4], "x": 12, "y": 2.2667}, + {"matrix": [7, 3], "x": 13, "y": 2}, + {"matrix": [7, 2], "x": 14, "y": 2.2667}, + {"matrix": [7, 1], "x": 15, "y": 2.6667}, + {"matrix": [7, 0], "x": 16, "y": 2.6667}, + + {"matrix": [3, 0], "x": 0, "y": 3.6667}, + {"matrix": [3, 1], "x": 1, "y": 3.6667}, + {"matrix": [3, 2], "x": 2, "y": 3.2667}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.2667}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 2.5, "h": 1.5}, + + {"matrix": [8, 6], "x": 10, "y": 2.5, "h": 1.5}, + {"matrix": [8, 5], "x": 11, "y": 3}, + {"matrix": [8, 4], "x": 12, "y": 3.2667}, + {"matrix": [8, 3], "x": 13, "y": 3}, + {"matrix": [8, 2], "x": 14, "y": 3.2667}, + {"matrix": [8, 1], "x": 15, "y": 3.6667}, + {"matrix": [8, 0], "x": 16, "y": 3.6667}, + + {"matrix": [4, 2], "x": 2, "y": 4.2667}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4.2667}, + {"matrix": [4, 5], "x": 5, "y": 4}, + {"matrix": [4, 6], "x": 6, "y": 4}, + + {"matrix": [9, 6], "x": 10, "y": 4}, + {"matrix": [9, 5], "x": 11, "y": 4}, + {"matrix": [9, 4], "x": 12, "y": 4.2667}, + {"matrix": [9, 3], "x": 13, "y": 4}, + {"matrix": [9, 2], "x": 14, "y": 4.2667} + ] + } + } +}diff --git a/keyboards/splitty/rev1/rules.mk b/keyboards/splitty/rev1/rules.mkdiff --git a/keyboards/splitty/rules.mk b/keyboards/splitty/rules.mk@@ -1,16 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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 - -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = splitty/rev1diff --git a/keyboards/woodkeys/meira/featherble/info.json b/keyboards/woodkeys/meira/featherble/info.json@@ -1,5 +0,0 @@ -{ - "bluetooth": { - "driver": "bluefruit_le" - } -}diff --git a/keyboards/woodkeys/meira/featherble/keyboard.json b/keyboards/woodkeys/meira/featherble/keyboard.json@@ -0,0 +1,7 @@ +{ + "processor": "atmega32u4", + "bootloader": "caterina", + "bluetooth": { + "driver": "bluefruit_le" + } +}diff --git a/keyboards/woodkeys/meira/info.json b/keyboards/woodkeys/meira/info.json@@ -8,8 +8,9 @@ "pid": "0x6061", "device_version": "0.0.1" }, - "processor": "atmega32u4", - "bootloader": "caterina", + "features": { + "extrakey": true + }, "layout_aliases": { "LAYOUT": "LAYOUT_ortho_4x12" },diff --git a/keyboards/woodkeys/meira/promicro/keyboard.json b/keyboards/woodkeys/meira/promicro/keyboard.json@@ -0,0 +1,3 @@ +{ + "development_board": "promicro" +}diff --git a/keyboards/woodkeys/meira/rules.mk b/keyboards/woodkeys/meira/rules.mk@@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = 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 - CUSTOM_MATRIX = yes SRC += matrix.c