From f29daff9b6ed178d1d9c3bdb5d504ca8782f8d5a Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 3 Apr 2024 23:14:03 +0100 Subject: Miscellaneous keyboard.json migrations (#23378) --- keyboards/canary/canary60rgb/canary60rgb.c | 120 ---- keyboards/canary/canary60rgb/info.json | 161 ----- keyboards/canary/canary60rgb/v1/keyboard.json | 161 +++++ keyboards/canary/canary60rgb/v1/rules.mk | 1 - keyboards/canary/canary60rgb/v1/v1.c | 120 ++++ keyboards/handwired/qc60/info.json | 654 --------------------- keyboards/handwired/qc60/proto/keyboard.json | 654 +++++++++++++++++++++ keyboards/handwired/qc60/proto/rules.mk | 1 - keyboards/handwired/stef9998/split_5x7/info.json | 119 ---- .../stef9998/split_5x7/rev1/keyboard.json | 119 ++++ keyboards/handwired/stef9998/split_5x7/rev1/rev1.c | 33 ++ keyboards/handwired/stef9998/split_5x7/split_5x7.c | 33 -- keyboards/junco/info.json | 112 ---- keyboards/junco/rev1/keyboard.json | 116 ++++ keyboards/junco/rev1/rules.mk | 1 + keyboards/junco/rules.mk | 8 - keyboards/keaboard/info.json | 84 --- keyboards/keaboard/rev1/keyboard.json | 84 +++ keyboards/keaboard/rev1/rules.mk | 1 - keyboards/melgeek/mj65/config.h | 20 - keyboards/melgeek/mj65/info.json | 150 ----- keyboards/melgeek/mj65/rev3/config.h | 20 + keyboards/melgeek/mj65/rev3/keyboard.json | 157 +++++ keyboards/melgeek/mj65/rev3/rules.mk | 13 - keyboards/melgeek/mojo68/config.h | 20 - keyboards/melgeek/mojo68/info.json | 158 ----- keyboards/melgeek/mojo68/rev1/config.h | 3 + keyboards/melgeek/mojo68/rev1/keyboard.json | 158 +++++ keyboards/melgeek/mojo68/rev1/rules.mk | 1 - keyboards/melgeek/mojo75/config.h | 20 - keyboards/melgeek/mojo75/info.json | 176 ------ keyboards/melgeek/mojo75/rev1/config.h | 20 + keyboards/melgeek/mojo75/rev1/keyboard.json | 176 ++++++ keyboards/melgeek/mojo75/rev1/rules.mk | 1 - keyboards/melgeek/tegic/config.h | 20 - keyboards/melgeek/tegic/info.json | 183 ------ keyboards/melgeek/tegic/rev1/config.h | 20 + keyboards/melgeek/tegic/rev1/keyboard.json | 183 ++++++ keyboards/melgeek/tegic/rev1/rules.mk | 1 - keyboards/melgeek/z70ultra/config.h | 21 - keyboards/melgeek/z70ultra/info.json | 234 -------- keyboards/melgeek/z70ultra/rev1/config.h | 21 + keyboards/melgeek/z70ultra/rev1/keyboard.json | 234 ++++++++ keyboards/melgeek/z70ultra/rev1/rev1.c | 168 ++++++ keyboards/melgeek/z70ultra/rev1/rules.mk | 1 - keyboards/melgeek/z70ultra/z70ultra.c | 168 ------ keyboards/miiiw/blackio83/blackio83.c | 192 ------ keyboards/miiiw/blackio83/blackio83.h | 30 - keyboards/miiiw/blackio83/config.h | 20 - keyboards/miiiw/blackio83/halconf.h | 32 - keyboards/miiiw/blackio83/info.json | 267 --------- keyboards/miiiw/blackio83/matrix.c | 139 ----- keyboards/miiiw/blackio83/mcuconf.h | 33 -- keyboards/miiiw/blackio83/rev_0100/config.h | 3 + keyboards/miiiw/blackio83/rev_0100/halconf.h | 32 + keyboards/miiiw/blackio83/rev_0100/keyboard.json | 267 +++++++++ keyboards/miiiw/blackio83/rev_0100/matrix.c | 139 +++++ keyboards/miiiw/blackio83/rev_0100/mcuconf.h | 33 ++ keyboards/miiiw/blackio83/rev_0100/rev_0100.c | 192 ++++++ keyboards/miiiw/blackio83/rev_0100/rev_0100.h | 30 + keyboards/miiiw/blackio83/rev_0100/rules.mk | 2 - keyboards/murcielago/info.json | 124 ---- keyboards/murcielago/rev1/keyboard.json | 124 ++++ keyboards/murcielago/rev1/rules.mk | 1 - keyboards/polilla/chconf.h | 27 - keyboards/polilla/halconf.h | 35 -- keyboards/polilla/info.json | 101 ---- keyboards/polilla/mcuconf.h | 28 - keyboards/polilla/rev1/chconf.h | 27 + keyboards/polilla/rev1/config.h | 22 - keyboards/polilla/rev1/halconf.h | 35 ++ keyboards/polilla/rev1/keyboard.json | 107 ++++ keyboards/polilla/rev1/mcuconf.h | 28 + keyboards/polilla/rev1/rules.mk | 1 - keyboards/qwertyydox/config.h | 46 -- keyboards/qwertyydox/info.json | 109 ---- keyboards/qwertyydox/rev1/config.h | 41 ++ keyboards/qwertyydox/rev1/keyboard.json | 119 ++++ keyboards/qwertyydox/rev1/rules.mk | 0 keyboards/qwertyydox/rules.mk | 15 - keyboards/spacetime/config.h | 39 -- keyboards/spacetime/info.json | 6 + keyboards/spacetime/rev1/keyboard.json | 1 + keyboards/spacetime/rev1/rules.mk | 1 - keyboards/splitty/config.h | 39 -- keyboards/splitty/info.json | 97 --- keyboards/splitty/rev1/config.h | 39 ++ keyboards/splitty/rev1/keyboard.json | 104 ++++ keyboards/splitty/rev1/rules.mk | 0 keyboards/splitty/rules.mk | 15 - keyboards/woodkeys/meira/featherble/info.json | 5 - keyboards/woodkeys/meira/featherble/keyboard.json | 7 + keyboards/woodkeys/meira/info.json | 5 +- keyboards/woodkeys/meira/promicro/keyboard.json | 3 + keyboards/woodkeys/meira/rules.mk | 13 - 95 files changed, 3788 insertions(+), 3916 deletions(-) delete mode 100644 keyboards/canary/canary60rgb/canary60rgb.c delete mode 100644 keyboards/canary/canary60rgb/info.json create mode 100644 keyboards/canary/canary60rgb/v1/keyboard.json delete mode 100644 keyboards/canary/canary60rgb/v1/rules.mk create mode 100644 keyboards/canary/canary60rgb/v1/v1.c delete mode 100644 keyboards/handwired/qc60/info.json create mode 100644 keyboards/handwired/qc60/proto/keyboard.json delete mode 100644 keyboards/handwired/qc60/proto/rules.mk delete mode 100644 keyboards/handwired/stef9998/split_5x7/info.json create mode 100644 keyboards/handwired/stef9998/split_5x7/rev1/keyboard.json create mode 100644 keyboards/handwired/stef9998/split_5x7/rev1/rev1.c delete mode 100644 keyboards/handwired/stef9998/split_5x7/split_5x7.c delete mode 100644 keyboards/junco/info.json create mode 100644 keyboards/junco/rev1/keyboard.json delete mode 100644 keyboards/keaboard/info.json create mode 100644 keyboards/keaboard/rev1/keyboard.json delete mode 100644 keyboards/keaboard/rev1/rules.mk delete mode 100644 keyboards/melgeek/mj65/config.h delete mode 100644 keyboards/melgeek/mj65/info.json create mode 100644 keyboards/melgeek/mj65/rev3/config.h create mode 100644 keyboards/melgeek/mj65/rev3/keyboard.json delete mode 100755 keyboards/melgeek/mojo68/config.h delete mode 100755 keyboards/melgeek/mojo68/info.json create mode 100755 keyboards/melgeek/mojo68/rev1/keyboard.json delete mode 100755 keyboards/melgeek/mojo68/rev1/rules.mk delete mode 100644 keyboards/melgeek/mojo75/config.h delete mode 100644 keyboards/melgeek/mojo75/info.json create mode 100644 keyboards/melgeek/mojo75/rev1/config.h create mode 100644 keyboards/melgeek/mojo75/rev1/keyboard.json delete mode 100644 keyboards/melgeek/mojo75/rev1/rules.mk delete mode 100755 keyboards/melgeek/tegic/config.h delete mode 100644 keyboards/melgeek/tegic/info.json create mode 100755 keyboards/melgeek/tegic/rev1/config.h create mode 100644 keyboards/melgeek/tegic/rev1/keyboard.json delete mode 100755 keyboards/melgeek/tegic/rev1/rules.mk delete mode 100644 keyboards/melgeek/z70ultra/config.h delete mode 100644 keyboards/melgeek/z70ultra/info.json create mode 100644 keyboards/melgeek/z70ultra/rev1/config.h create mode 100644 keyboards/melgeek/z70ultra/rev1/keyboard.json create mode 100644 keyboards/melgeek/z70ultra/rev1/rev1.c delete mode 100644 keyboards/melgeek/z70ultra/rev1/rules.mk delete mode 100644 keyboards/melgeek/z70ultra/z70ultra.c delete mode 100644 keyboards/miiiw/blackio83/blackio83.c delete mode 100644 keyboards/miiiw/blackio83/blackio83.h delete mode 100644 keyboards/miiiw/blackio83/config.h delete mode 100644 keyboards/miiiw/blackio83/halconf.h delete mode 100644 keyboards/miiiw/blackio83/info.json delete mode 100644 keyboards/miiiw/blackio83/matrix.c delete mode 100644 keyboards/miiiw/blackio83/mcuconf.h create mode 100644 keyboards/miiiw/blackio83/rev_0100/halconf.h create mode 100644 keyboards/miiiw/blackio83/rev_0100/keyboard.json create mode 100644 keyboards/miiiw/blackio83/rev_0100/matrix.c create mode 100644 keyboards/miiiw/blackio83/rev_0100/mcuconf.h create mode 100644 keyboards/miiiw/blackio83/rev_0100/rev_0100.c create mode 100644 keyboards/miiiw/blackio83/rev_0100/rev_0100.h delete mode 100644 keyboards/murcielago/info.json create mode 100644 keyboards/murcielago/rev1/keyboard.json delete mode 100644 keyboards/murcielago/rev1/rules.mk delete mode 100644 keyboards/polilla/chconf.h delete mode 100644 keyboards/polilla/halconf.h delete mode 100644 keyboards/polilla/info.json delete mode 100644 keyboards/polilla/mcuconf.h create mode 100644 keyboards/polilla/rev1/chconf.h create mode 100644 keyboards/polilla/rev1/halconf.h create mode 100644 keyboards/polilla/rev1/keyboard.json create mode 100644 keyboards/polilla/rev1/mcuconf.h delete mode 100644 keyboards/polilla/rev1/rules.mk delete mode 100644 keyboards/qwertyydox/config.h delete mode 100644 keyboards/qwertyydox/info.json create mode 100644 keyboards/qwertyydox/rev1/config.h create mode 100644 keyboards/qwertyydox/rev1/keyboard.json delete mode 100644 keyboards/qwertyydox/rev1/rules.mk delete mode 100644 keyboards/spacetime/config.h create mode 100644 keyboards/spacetime/rev1/keyboard.json delete mode 100644 keyboards/spacetime/rev1/rules.mk delete mode 100644 keyboards/splitty/config.h delete mode 100644 keyboards/splitty/info.json create mode 100644 keyboards/splitty/rev1/config.h create mode 100644 keyboards/splitty/rev1/keyboard.json delete mode 100644 keyboards/splitty/rev1/rules.mk delete mode 100644 keyboards/woodkeys/meira/featherble/info.json create mode 100644 keyboards/woodkeys/meira/featherble/keyboard.json create mode 100644 keyboards/woodkeys/meira/promicro/keyboard.json diff --git a/keyboards/canary/canary60rgb/canary60rgb.c b/keyboards/canary/canary60rgb/canary60rgb.c deleted file mode 100644 index b14878ff22..0000000000 --- a/keyboards/canary/canary60rgb/canary60rgb.c +++ /dev/null @@ -1,120 +0,0 @@ -/* Copyright 2021 CANARYTEAM - * - * 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 . - */ - #include "quantum.h" - -#ifdef RGB_MATRIX_ENABLE -const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = { - { 0, SW10_CS14, SW11_CS14, SW12_CS14 }, - { 0, SW10_CS13, SW11_CS13, SW12_CS13 }, - { 0, SW10_CS12, SW11_CS12, SW12_CS12 }, - { 0, SW10_CS11, SW11_CS11, SW12_CS11 }, - { 0, SW10_CS10, SW11_CS10, SW12_CS10 }, - { 0, SW10_CS9, SW11_CS9, SW12_CS9 }, - { 0, SW10_CS8, SW11_CS8, SW12_CS8 }, - { 0, SW10_CS7, SW11_CS7, SW12_CS7 }, - { 0, SW10_CS6, SW11_CS6, SW12_CS6 }, - { 0, SW10_CS5, SW11_CS5, SW12_CS5 }, - { 0, SW10_CS4, SW11_CS4, SW12_CS4 }, - { 0, SW10_CS3, SW11_CS3, SW12_CS3 }, - { 0, SW10_CS2, SW11_CS2, SW12_CS2 }, - { 0, SW10_CS1, SW11_CS1, SW12_CS1 }, - - { 0, SW7_CS14, SW8_CS14, SW9_CS14 }, - { 0, SW7_CS13, SW8_CS13, SW9_CS13 }, - { 0, SW7_CS12, SW8_CS12, SW9_CS12 }, - { 0, SW7_CS11, SW8_CS11, SW9_CS11 }, - { 0, SW7_CS10, SW8_CS10, SW9_CS10 }, - { 0, SW7_CS9, SW8_CS9, SW9_CS9 }, - { 0, SW7_CS8, SW8_CS8, SW9_CS8 }, - { 0, SW7_CS7, SW8_CS7, SW9_CS7 }, - { 0, SW7_CS6, SW8_CS6, SW9_CS6 }, - { 0, SW7_CS5, SW8_CS5, SW9_CS5 }, - { 0, SW7_CS4, SW8_CS4, SW9_CS4 }, - { 0, SW7_CS3, SW8_CS3, SW9_CS3 }, - { 0, SW7_CS2, SW8_CS2, SW9_CS2 }, - { 0, SW7_CS1, SW8_CS1, SW9_CS1 }, - - { 0, SW4_CS14, SW5_CS14, SW6_CS14 }, - { 0, SW4_CS12, SW5_CS12, SW6_CS12 }, - { 0, SW4_CS11, SW5_CS11, SW6_CS11 }, - { 0, SW4_CS10, SW5_CS10, SW6_CS10 }, - { 0, SW4_CS9, SW5_CS9, SW6_CS9 }, - { 0, SW4_CS8, SW5_CS8, SW6_CS8 }, - { 0, SW4_CS7, SW5_CS7, SW6_CS7 }, - { 0, SW4_CS6, SW5_CS6, SW6_CS6 }, - { 0, SW4_CS5, SW5_CS5, SW6_CS5 }, - { 0, SW4_CS4, SW5_CS4, SW6_CS4 }, - { 0, SW4_CS3, SW5_CS3, SW6_CS3 }, - { 0, SW4_CS2, SW5_CS2, SW6_CS2 }, - { 0, SW4_CS1, SW5_CS1, SW6_CS1 }, - - { 0, SW1_CS14, SW2_CS14, SW3_CS14 }, - { 0, SW1_CS13, SW2_CS13, SW3_CS13 }, - { 0, SW1_CS11, SW2_CS11, SW3_CS11 }, - { 0, SW1_CS10, SW2_CS10, SW3_CS10 }, - { 0, SW1_CS9, SW2_CS9, SW3_CS9 }, - { 0, SW1_CS8, SW2_CS8, SW3_CS8 }, - { 0, SW1_CS7, SW2_CS7, SW3_CS7 }, - { 0, SW1_CS6, SW2_CS6, SW3_CS6 }, - { 0, SW1_CS5, SW2_CS5, SW3_CS5 }, - { 0, SW1_CS4, SW2_CS4, SW3_CS4 }, - { 0, SW1_CS3, SW2_CS3, SW3_CS3 }, - { 0, SW1_CS2, SW2_CS2, SW3_CS2 }, - { 0, SW1_CS1, SW2_CS1, SW3_CS1 }, - - { 0, SW1_CS15, SW2_CS15, SW3_CS15 }, - { 0, SW4_CS13, SW5_CS13, SW6_CS13 }, - { 0, SW1_CS12, SW2_CS12, SW3_CS12 }, - { 0, SW4_CS15, SW5_CS15, SW6_CS15 }, - { 0, SW7_CS15, SW8_CS15, SW9_CS15 }, - { 0, SW1_CS16, SW2_CS16, SW3_CS16 }, - { 0, SW4_CS16, SW5_CS16, SW6_CS16 }, - { 0, SW7_CS16, SW8_CS16, SW9_CS16 }, - { 0, SW10_CS16, SW11_CS16, SW12_CS16 } -}; - -led_config_t g_led_config = { - { - { 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 }, - { 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14 }, - { 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, NO_LED, 28 }, - { 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, NO_LED, 41 }, - { 62, 61, 60, NO_LED, NO_LED, 59, NO_LED, NO_LED, 58, 57, 56, 55, NO_LED, 54 } - }, { - { 216, 0 }, { 192, 0 }, { 176, 0 }, { 160, 0 }, { 144, 0 }, { 128, 0 }, { 112, 0 }, { 96, 0 }, { 80, 0 }, { 64, 0 }, { 48, 0 }, { 32, 0 }, { 16, 0 }, { 0, 0 }, - { 220, 16 }, { 200, 16 }, { 184, 16 }, { 168, 16 }, { 152, 16 }, { 136, 16 }, { 120, 16 }, { 104, 16 }, { 88, 16 }, { 72, 16 }, { 56, 16 }, { 40, 16 }, { 24, 16 }, { 4, 16 }, - { 214, 32 }, { 188, 32 }, { 172, 32 }, { 156, 32 }, { 140, 32 }, { 124, 32 }, { 108, 32 }, { 92, 32 }, { 76, 32 }, { 60, 32 }, { 44, 32 }, { 28, 32 }, { 6, 32 }, - { 224, 48 }, { 208, 48 }, { 186, 48 }, { 164, 48 }, { 148, 48 }, { 132, 48 }, { 116, 48 }, { 100, 48 }, { 84, 48 }, { 68, 48 }, { 52, 48 }, { 36, 48 }, { 9, 48 }, - { 224, 64 }, { 208, 64 }, { 192, 64 }, { 176, 64 }, { 160, 64 }, { 102, 64 }, { 42, 64 }, { 22, 64 }, { 2, 64 } - }, { - 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, - 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, - 1, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, - 1, 1, 1, 1, 1, 4, 1, 1, 1 - } -}; - -bool rgb_matrix_indicators_kb(void) { - if (!rgb_matrix_indicators_user()) { - return false; - } - if (host_keyboard_led_state().caps_lock) { - rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF); - } - return true; -} -#endif diff --git a/keyboards/canary/canary60rgb/info.json b/keyboards/canary/canary60rgb/info.json deleted file mode 100644 index ac1ba67de0..0000000000 --- a/keyboards/canary/canary60rgb/info.json +++ /dev/null @@ -1,161 +0,0 @@ -{ - "keyboard_name": "CANARY60RGB", - "manufacturer": "CANARY", - "url": "", - "maintainer": "tuananhnguyen204", - "usb": { - "vid": "0x4341", - "pid": "0x0621", - "device_version": "0.0.1" - }, - "build": { - "lto": true - }, - "features": { - "bootmagic": true, - "command": false, - "console": false, - "extrakey": true, - "mousekey": false, - "nkro": true, - "rgblight": true, - "rgb_matrix": true - }, - "rgblight": { - "saturation_steps": 8, - "brightness_steps": 8, - "led_count": 20, - "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": "B6" - }, - "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, - "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 - }, - "driver": "is31fl3733", - "sleep": true - }, - "matrix_pins": { - "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"], - "rows": ["F5", "F4", "F1", "B3", "B2"] - }, - "diode_direction": "COL2ROW", - "processor": "atmega32u4", - "bootloader": "atmel-dfu", - "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": [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": [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": [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, "w": 1.75}, - {"matrix": [3, 11], "x": 13, "y": 3}, - {"matrix": [3, 13], "x": 14, "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, 8], "x": 10, "y": 4}, - {"matrix": [4, 9], "x": 11, "y": 4}, - {"matrix": [4, 10], "x": 12, "y": 4}, - {"matrix": [4, 11], "x": 13, "y": 4}, - {"matrix": [4, 13], "x": 14, "y": 4} - ] - } - } -} diff --git a/keyboards/canary/canary60rgb/v1/keyboard.json b/keyboards/canary/canary60rgb/v1/keyboard.json new file mode 100644 index 0000000000..ac1ba67de0 --- /dev/null +++ b/keyboards/canary/canary60rgb/v1/keyboard.json @@ -0,0 +1,161 @@ +{ + "keyboard_name": "CANARY60RGB", + "manufacturer": "CANARY", + "url": "", + "maintainer": "tuananhnguyen204", + "usb": { + "vid": "0x4341", + "pid": "0x0621", + "device_version": "0.0.1" + }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true, + "rgb_matrix": true + }, + "rgblight": { + "saturation_steps": 8, + "brightness_steps": 8, + "led_count": 20, + "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": "B6" + }, + "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, + "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 + }, + "driver": "is31fl3733", + "sleep": true + }, + "matrix_pins": { + "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"], + "rows": ["F5", "F4", "F1", "B3", "B2"] + }, + "diode_direction": "COL2ROW", + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "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": [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": [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": [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, "w": 1.75}, + {"matrix": [3, 11], "x": 13, "y": 3}, + {"matrix": [3, 13], "x": 14, "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, 8], "x": 10, "y": 4}, + {"matrix": [4, 9], "x": 11, "y": 4}, + {"matrix": [4, 10], "x": 12, "y": 4}, + {"matrix": [4, 11], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4} + ] + } + } +} diff --git a/keyboards/canary/canary60rgb/v1/rules.mk b/keyboards/canary/canary60rgb/v1/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/canary/canary60rgb/v1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/canary/canary60rgb/v1/v1.c b/keyboards/canary/canary60rgb/v1/v1.c new file mode 100644 index 0000000000..b14878ff22 --- /dev/null +++ b/keyboards/canary/canary60rgb/v1/v1.c @@ -0,0 +1,120 @@ +/* Copyright 2021 CANARYTEAM + * + * 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 . + */ + #include "quantum.h" + +#ifdef RGB_MATRIX_ENABLE +const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = { + { 0, SW10_CS14, SW11_CS14, SW12_CS14 }, + { 0, SW10_CS13, SW11_CS13, SW12_CS13 }, + { 0, SW10_CS12, SW11_CS12, SW12_CS12 }, + { 0, SW10_CS11, SW11_CS11, SW12_CS11 }, + { 0, SW10_CS10, SW11_CS10, SW12_CS10 }, + { 0, SW10_CS9, SW11_CS9, SW12_CS9 }, + { 0, SW10_CS8, SW11_CS8, SW12_CS8 }, + { 0, SW10_CS7, SW11_CS7, SW12_CS7 }, + { 0, SW10_CS6, SW11_CS6, SW12_CS6 }, + { 0, SW10_CS5, SW11_CS5, SW12_CS5 }, + { 0, SW10_CS4, SW11_CS4, SW12_CS4 }, + { 0, SW10_CS3, SW11_CS3, SW12_CS3 }, + { 0, SW10_CS2, SW11_CS2, SW12_CS2 }, + { 0, SW10_CS1, SW11_CS1, SW12_CS1 }, + + { 0, SW7_CS14, SW8_CS14, SW9_CS14 }, + { 0, SW7_CS13, SW8_CS13, SW9_CS13 }, + { 0, SW7_CS12, SW8_CS12, SW9_CS12 }, + { 0, SW7_CS11, SW8_CS11, SW9_CS11 }, + { 0, SW7_CS10, SW8_CS10, SW9_CS10 }, + { 0, SW7_CS9, SW8_CS9, SW9_CS9 }, + { 0, SW7_CS8, SW8_CS8, SW9_CS8 }, + { 0, SW7_CS7, SW8_CS7, SW9_CS7 }, + { 0, SW7_CS6, SW8_CS6, SW9_CS6 }, + { 0, SW7_CS5, SW8_CS5, SW9_CS5 }, + { 0, SW7_CS4, SW8_CS4, SW9_CS4 }, + { 0, SW7_CS3, SW8_CS3, SW9_CS3 }, + { 0, SW7_CS2, SW8_CS2, SW9_CS2 }, + { 0, SW7_CS1, SW8_CS1, SW9_CS1 }, + + { 0, SW4_CS14, SW5_CS14, SW6_CS14 }, + { 0, SW4_CS12, SW5_CS12, SW6_CS12 }, + { 0, SW4_CS11, SW5_CS11, SW6_CS11 }, + { 0, SW4_CS10, SW5_CS10, SW6_CS10 }, + { 0, SW4_CS9, SW5_CS9, SW6_CS9 }, + { 0, SW4_CS8, SW5_CS8, SW6_CS8 }, + { 0, SW4_CS7, SW5_CS7, SW6_CS7 }, + { 0, SW4_CS6, SW5_CS6, SW6_CS6 }, + { 0, SW4_CS5, SW5_CS5, SW6_CS5 }, + { 0, SW4_CS4, SW5_CS4, SW6_CS4 }, + { 0, SW4_CS3, SW5_CS3, SW6_CS3 }, + { 0, SW4_CS2, SW5_CS2, SW6_CS2 }, + { 0, SW4_CS1, SW5_CS1, SW6_CS1 }, + + { 0, SW1_CS14, SW2_CS14, SW3_CS14 }, + { 0, SW1_CS13, SW2_CS13, SW3_CS13 }, + { 0, SW1_CS11, SW2_CS11, SW3_CS11 }, + { 0, SW1_CS10, SW2_CS10, SW3_CS10 }, + { 0, SW1_CS9, SW2_CS9, SW3_CS9 }, + { 0, SW1_CS8, SW2_CS8, SW3_CS8 }, + { 0, SW1_CS7, SW2_CS7, SW3_CS7 }, + { 0, SW1_CS6, SW2_CS6, SW3_CS6 }, + { 0, SW1_CS5, SW2_CS5, SW3_CS5 }, + { 0, SW1_CS4, SW2_CS4, SW3_CS4 }, + { 0, SW1_CS3, SW2_CS3, SW3_CS3 }, + { 0, SW1_CS2, SW2_CS2, SW3_CS2 }, + { 0, SW1_CS1, SW2_CS1, SW3_CS1 }, + + { 0, SW1_CS15, SW2_CS15, SW3_CS15 }, + { 0, SW4_CS13, SW5_CS13, SW6_CS13 }, + { 0, SW1_CS12, SW2_CS12, SW3_CS12 }, + { 0, SW4_CS15, SW5_CS15, SW6_CS15 }, + { 0, SW7_CS15, SW8_CS15, SW9_CS15 }, + { 0, SW1_CS16, SW2_CS16, SW3_CS16 }, + { 0, SW4_CS16, SW5_CS16, SW6_CS16 }, + { 0, SW7_CS16, SW8_CS16, SW9_CS16 }, + { 0, SW10_CS16, SW11_CS16, SW12_CS16 } +}; + +led_config_t g_led_config = { + { + { 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 }, + { 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14 }, + { 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, NO_LED, 28 }, + { 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, NO_LED, 41 }, + { 62, 61, 60, NO_LED, NO_LED, 59, NO_LED, NO_LED, 58, 57, 56, 55, NO_LED, 54 } + }, { + { 216, 0 }, { 192, 0 }, { 176, 0 }, { 160, 0 }, { 144, 0 }, { 128, 0 }, { 112, 0 }, { 96, 0 }, { 80, 0 }, { 64, 0 }, { 48, 0 }, { 32, 0 }, { 16, 0 }, { 0, 0 }, + { 220, 16 }, { 200, 16 }, { 184, 16 }, { 168, 16 }, { 152, 16 }, { 136, 16 }, { 120, 16 }, { 104, 16 }, { 88, 16 }, { 72, 16 }, { 56, 16 }, { 40, 16 }, { 24, 16 }, { 4, 16 }, + { 214, 32 }, { 188, 32 }, { 172, 32 }, { 156, 32 }, { 140, 32 }, { 124, 32 }, { 108, 32 }, { 92, 32 }, { 76, 32 }, { 60, 32 }, { 44, 32 }, { 28, 32 }, { 6, 32 }, + { 224, 48 }, { 208, 48 }, { 186, 48 }, { 164, 48 }, { 148, 48 }, { 132, 48 }, { 116, 48 }, { 100, 48 }, { 84, 48 }, { 68, 48 }, { 52, 48 }, { 36, 48 }, { 9, 48 }, + { 224, 64 }, { 208, 64 }, { 192, 64 }, { 176, 64 }, { 160, 64 }, { 102, 64 }, { 42, 64 }, { 22, 64 }, { 2, 64 } + }, { + 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, + 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, + 1, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, + 1, 1, 1, 1, 1, 4, 1, 1, 1 + } +}; + +bool rgb_matrix_indicators_kb(void) { + if (!rgb_matrix_indicators_user()) { + return false; + } + if (host_keyboard_led_state().caps_lock) { + rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF); + } + return true; +} +#endif diff --git a/keyboards/handwired/qc60/info.json b/keyboards/handwired/qc60/info.json deleted file mode 100644 index 0015ac5f66..0000000000 --- a/keyboards/handwired/qc60/info.json +++ /dev/null @@ -1,654 +0,0 @@ -{ - "keyboard_name": "QC60", - "manufacturer": "PeiorisBoards", - "url": "", - "maintainer": "coarse", - "usb": { - "vid": "0xFEED", - "pid": "0x0C60", - "device_version": "1.0.0" - }, - "features": { - "bootmagic": false, - "command": false, - "console": false, - "extrakey": true, - "mousekey": false, - "nkro": false, - "rgblight": true - }, - "rgblight": { - "led_count": 1 - }, - "ws2812": { - "pin": "D3" - }, - "matrix_pins": { - "cols": ["F7", "F6", "B1", "B3", "B2", "B6", "B5", "B4"], - "rows": ["F4", "F5", "C6", "D7", "E6"] - }, - "diode_direction": "ROW2COL", - "split": { - "enabled": true, - "soft_serial_pin": "D0" - }, - "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": [0, 6], "x": 6, "y": 0}, - - {"matrix": [5, 7], "x": 8, "y": 0}, - {"matrix": [5, 6], "x": 9, "y": 0}, - {"matrix": [5, 5], "x": 10, "y": 0}, - {"matrix": [5, 4], "x": 11, "y": 0}, - {"matrix": [5, 3], "x": 12, "y": 0}, - {"matrix": [5, 2], "x": 13, "y": 0}, - {"matrix": [5, 1], "x": 14, "y": 0}, - {"matrix": [5, 0], "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": [6, 7], "x": 7.5, "y": 1}, - {"matrix": [6, 6], "x": 8.5, "y": 1}, - {"matrix": [6, 5], "x": 9.5, "y": 1}, - {"matrix": [6, 4], "x": 10.5, "y": 1}, - {"matrix": [6, 3], "x": 11.5, "y": 1}, - {"matrix": [6, 2], "x": 12.5, "y": 1}, - {"matrix": [6, 1], "x": 13.5, "y": 1}, - {"matrix": [6, 0], "x": 14.5, "y": 1, "w": 1.5}, - - {"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": [7, 6], "x": 7.75, "y": 2}, - {"matrix": [7, 5], "x": 8.75, "y": 2}, - {"matrix": [7, 4], "x": 9.75, "y": 2}, - {"matrix": [7, 3], "x": 10.75, "y": 2}, - {"matrix": [7, 2], "x": 11.75, "y": 2}, - {"matrix": [7, 1], "x": 12.75, "y": 2}, - {"matrix": [7, 0], "x": 13.75, "y": 2, "w": 2.25}, - - {"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": [8, 6], "x": 8.25, "y": 3}, - {"matrix": [8, 5], "x": 9.25, "y": 3}, - {"matrix": [8, 4], "x": 10.25, "y": 3}, - {"matrix": [8, 3], "x": 11.25, "y": 3}, - {"matrix": [8, 2], "x": 12.25, "y": 3}, - {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 1.75}, - {"matrix": [8, 0], "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.75}, - {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 1.25}, - - {"matrix": [9, 4], "x": 8.75, "y": 4, "w": 1.25}, - {"matrix": [9, 3], "x": 10, "y": 4, "w": 2}, - {"matrix": [9, 5], "x": 12, "y": 4}, - {"matrix": [9, 2], "x": 13, "y": 4}, - {"matrix": [9, 1], "x": 14, "y": 4}, - {"matrix": [9, 0], "x": 15, "y": 4} - ] - }, - "LAYOUT_ansi_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": [5, 7], "x": 8, "y": 0}, - {"matrix": [5, 6], "x": 9, "y": 0}, - {"matrix": [5, 5], "x": 10, "y": 0}, - {"matrix": [5, 4], "x": 11, "y": 0}, - {"matrix": [5, 3], "x": 12, "y": 0}, - {"matrix": [5, 2], "x": 13, "y": 0}, - {"matrix": [5, 0], "x": 14, "y": 0, "w": 2}, - - {"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, 7], "x": 7.5, "y": 1}, - {"matrix": [6, 6], "x": 8.5, "y": 1}, - {"matrix": [6, 5], "x": 9.5, "y": 1}, - {"matrix": [6, 4], "x": 10.5, "y": 1}, - {"matrix": [6, 3], "x": 11.5, "y": 1}, - {"matrix": [6, 2], "x": 12.5, "y": 1}, - {"matrix": [6, 1], "x": 13.5, "y": 1}, - {"matrix": [6, 0], "x": 14.5, "y": 1, "w": 1.5}, - - {"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": [7, 6], "x": 7.75, "y": 2}, - {"matrix": [7, 5], "x": 8.75, "y": 2}, - {"matrix": [7, 4], "x": 9.75, "y": 2}, - {"matrix": [7, 3], "x": 10.75, "y": 2}, - {"matrix": [7, 2], "x": 11.75, "y": 2}, - {"matrix": [7, 1], "x": 12.75, "y": 2}, - {"matrix": [7, 0], "x": 13.75, "y": 2, "w": 2.25}, - - {"matrix": [3, 1], "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": [8, 6], "x": 8.25, "y": 3}, - {"matrix": [8, 5], "x": 9.25, "y": 3}, - {"matrix": [8, 4], "x": 10.25, "y": 3}, - {"matrix": [8, 3], "x": 11.25, "y": 3}, - {"matrix": [8, 2], "x": 12.25, "y": 3}, - {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 2.75}, - - {"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.75}, - {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 1.25}, - - {"matrix": [9, 4], "x": 8.75, "y": 4, "w": 1.25}, - {"matrix": [9, 3], "x": 10, "y": 4, "w": 2}, - {"matrix": [9, 5], "x": 12, "y": 4}, - {"matrix": [9, 2], "x": 13, "y": 4}, - {"matrix": [9, 1], "x": 14, "y": 4}, - {"matrix": [9, 0], "x": 15, "y": 4} - ] - }, - "LAYOUT_ansi_alt": { - "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": [5, 7], "x": 8, "y": 0}, - {"matrix": [5, 6], "x": 9, "y": 0}, - {"matrix": [5, 5], "x": 10, "y": 0}, - {"matrix": [5, 4], "x": 11, "y": 0}, - {"matrix": [5, 3], "x": 12, "y": 0}, - {"matrix": [5, 2], "x": 13, "y": 0}, - {"matrix": [5, 0], "x": 14, "y": 0, "w": 2}, - - {"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, 7], "x": 7.5, "y": 1}, - {"matrix": [6, 6], "x": 8.5, "y": 1}, - {"matrix": [6, 5], "x": 9.5, "y": 1}, - {"matrix": [6, 4], "x": 10.5, "y": 1}, - {"matrix": [6, 3], "x": 11.5, "y": 1}, - {"matrix": [6, 2], "x": 12.5, "y": 1}, - {"matrix": [6, 1], "x": 13.5, "y": 1}, - {"matrix": [6, 0], "x": 14.5, "y": 1, "w": 1.5}, - - {"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": [7, 6], "x": 7.75, "y": 2}, - {"matrix": [7, 5], "x": 8.75, "y": 2}, - {"matrix": [7, 4], "x": 9.75, "y": 2}, - {"matrix": [7, 3], "x": 10.75, "y": 2}, - {"matrix": [7, 2], "x": 11.75, "y": 2}, - {"matrix": [7, 1], "x": 12.75, "y": 2}, - {"matrix": [7, 0], "x": 13.75, "y": 2, "w": 2.25}, - - {"matrix": [3, 1], "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": [8, 6], "x": 8.25, "y": 3}, - {"matrix": [8, 5], "x": 9.25, "y": 3}, - {"matrix": [8, 4], "x": 10.25, "y": 3}, - {"matrix": [8, 3], "x": 11.25, "y": 3}, - {"matrix": [8, 2], "x": 12.25, "y": 3}, - {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 2.75}, - - {"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, 3], "x": 4, "y": 4, "w": 2.75}, - {"matrix": [4, 4], "x": 6.75, "y": 4}, - - {"matrix": [9, 4], "x": 8.75, "y": 4}, - {"matrix": [9, 3], "x": 9.75, "y": 4, "w": 2.25}, - {"matrix": [9, 2], "x": 12, "y": 4, "w": 1.5}, - {"matrix": [9, 1], "x": 13.5, "y": 4}, - {"matrix": [9, 0], "x": 14.5, "y": 4, "w": 1.5} - ] - }, - "LAYOUT_iso_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": [5, 7], "x": 8, "y": 0}, - {"matrix": [5, 6], "x": 9, "y": 0}, - {"matrix": [5, 5], "x": 10, "y": 0}, - {"matrix": [5, 4], "x": 11, "y": 0}, - {"matrix": [5, 3], "x": 12, "y": 0}, - {"matrix": [5, 2], "x": 13, "y": 0}, - {"matrix": [5, 0], "x": 14, "y": 0, "w": 2}, - - {"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, 7], "x": 7.5, "y": 1}, - {"matrix": [6, 6], "x": 8.5, "y": 1}, - {"matrix": [6, 5], "x": 9.5, "y": 1}, - {"matrix": [6, 4], "x": 10.5, "y": 1}, - {"matrix": [6, 3], "x": 11.5, "y": 1}, - {"matrix": [6, 2], "x": 12.5, "y": 1}, - {"matrix": [6, 1], "x": 13.5, "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": [7, 6], "x": 7.75, "y": 2}, - {"matrix": [7, 5], "x": 8.75, "y": 2}, - {"matrix": [7, 4], "x": 9.75, "y": 2}, - {"matrix": [7, 3], "x": 10.75, "y": 2}, - {"matrix": [7, 2], "x": 11.75, "y": 2}, - {"matrix": [7, 1], "x": 12.75, "y": 2}, - {"matrix": [6, 0], "x": 13.75, "y": 2}, - {"matrix": [7, 0], "x": 14.75, "y": 1, "w": 1.25, "h": 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": [8, 6], "x": 8.25, "y": 3}, - {"matrix": [8, 5], "x": 9.25, "y": 3}, - {"matrix": [8, 4], "x": 10.25, "y": 3}, - {"matrix": [8, 3], "x": 11.25, "y": 3}, - {"matrix": [8, 2], "x": 12.25, "y": 3}, - {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 2.75}, - - {"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.75}, - {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 1.25}, - - {"matrix": [9, 4], "x": 8.75, "y": 4, "w": 1.25}, - {"matrix": [9, 3], "x": 10, "y": 4, "w": 2}, - {"matrix": [9, 5], "x": 12, "y": 4}, - {"matrix": [9, 2], "x": 13, "y": 4}, - {"matrix": [9, 1], "x": 14, "y": 4}, - {"matrix": [9, 0], "x": 15, "y": 4} - ] - }, - "LAYOUT_iso_alt": { - "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": [5, 7], "x": 8, "y": 0}, - {"matrix": [5, 6], "x": 9, "y": 0}, - {"matrix": [5, 5], "x": 10, "y": 0}, - {"matrix": [5, 4], "x": 11, "y": 0}, - {"matrix": [5, 3], "x": 12, "y": 0}, - {"matrix": [5, 2], "x": 13, "y": 0}, - {"matrix": [5, 0], "x": 14, "y": 0, "w": 2}, - - {"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, 7], "x": 7.5, "y": 1}, - {"matrix": [6, 6], "x": 8.5, "y": 1}, - {"matrix": [6, 5], "x": 9.5, "y": 1}, - {"matrix": [6, 4], "x": 10.5, "y": 1}, - {"matrix": [6, 3], "x": 11.5, "y": 1}, - {"matrix": [6, 2], "x": 12.5, "y": 1}, - {"matrix": [6, 1], "x": 13.5, "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": [7, 6], "x": 7.75, "y": 2}, - {"matrix": [7, 5], "x": 8.75, "y": 2}, - {"matrix": [7, 4], "x": 9.75, "y": 2}, - {"matrix": [7, 3], "x": 10.75, "y": 2}, - {"matrix": [7, 2], "x": 11.75, "y": 2}, - {"matrix": [7, 1], "x": 12.75, "y": 2}, - {"matrix": [6, 0], "x": 13.75, "y": 2}, - {"matrix": [7, 0], "x": 14.75, "y": 1, "w": 1.25, "h": 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": [8, 6], "x": 8.25, "y": 3}, - {"matrix": [8, 5], "x": 9.25, "y": 3}, - {"matrix": [8, 4], "x": 10.25, "y": 3}, - {"matrix": [8, 3], "x": 11.25, "y": 3}, - {"matrix": [8, 2], "x": 12.25, "y": 3}, - {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 2.75}, - - {"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, 3], "x": 4, "y": 4, "w": 2.75}, - {"matrix": [4, 4], "x": 6.75, "y": 4}, - - {"matrix": [9, 4], "x": 8.75, "y": 4}, - {"matrix": [9, 3], "x": 9.75, "y": 4, "w": 2.25}, - {"matrix": [9, 2], "x": 12, "y": 4, "w": 1.5}, - {"matrix": [9, 1], "x": 13.5, "y": 4}, - {"matrix": [9, 0], "x": 14.5, "y": 4, "w": 1.5} - ] - }, - "LAYOUT_hhkb_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": [5, 7], "x": 8, "y": 0}, - {"matrix": [5, 6], "x": 9, "y": 0}, - {"matrix": [5, 5], "x": 10, "y": 0}, - {"matrix": [5, 4], "x": 11, "y": 0}, - {"matrix": [5, 3], "x": 12, "y": 0}, - {"matrix": [5, 2], "x": 13, "y": 0}, - {"matrix": [5, 1], "x": 14, "y": 0}, - {"matrix": [5, 0], "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": [6, 7], "x": 7.5, "y": 1}, - {"matrix": [6, 6], "x": 8.5, "y": 1}, - {"matrix": [6, 5], "x": 9.5, "y": 1}, - {"matrix": [6, 4], "x": 10.5, "y": 1}, - {"matrix": [6, 3], "x": 11.5, "y": 1}, - {"matrix": [6, 2], "x": 12.5, "y": 1}, - {"matrix": [6, 1], "x": 13.5, "y": 1}, - {"matrix": [6, 0], "x": 14.5, "y": 1, "w": 1.5}, - - {"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": [7, 6], "x": 7.75, "y": 2}, - {"matrix": [7, 5], "x": 8.75, "y": 2}, - {"matrix": [7, 4], "x": 9.75, "y": 2}, - {"matrix": [7, 3], "x": 10.75, "y": 2}, - {"matrix": [7, 2], "x": 11.75, "y": 2}, - {"matrix": [7, 1], "x": 12.75, "y": 2}, - {"matrix": [7, 0], "x": 13.75, "y": 2, "w": 2.25}, - - {"matrix": [3, 1], "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": [8, 6], "x": 8.25, "y": 3}, - {"matrix": [8, 5], "x": 9.25, "y": 3}, - {"matrix": [8, 4], "x": 10.25, "y": 3}, - {"matrix": [8, 3], "x": 11.25, "y": 3}, - {"matrix": [8, 2], "x": 12.25, "y": 3}, - {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 1.75}, - {"matrix": [8, 0], "x": 15, "y": 3}, - - {"matrix": [4, 1], "x": 1.5, "y": 4}, - {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, - {"matrix": [4, 3], "x": 4, "y": 4, "w": 2.75}, - {"matrix": [4, 4], "x": 6.75, "y": 4}, - - {"matrix": [9, 4], "x": 8.75, "y": 4}, - {"matrix": [9, 3], "x": 9.75, "y": 4, "w": 2.25}, - {"matrix": [9, 2], "x": 12, "y": 4, "w": 1.5}, - {"matrix": [9, 1], "x": 13.5, "y": 4} - ] - }, - "LAYOUT_hhkb_split_lshift": { - "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": [5, 7], "x": 8, "y": 0}, - {"matrix": [5, 6], "x": 9, "y": 0}, - {"matrix": [5, 5], "x": 10, "y": 0}, - {"matrix": [5, 4], "x": 11, "y": 0}, - {"matrix": [5, 3], "x": 12, "y": 0}, - {"matrix": [5, 2], "x": 13, "y": 0}, - {"matrix": [5, 1], "x": 14, "y": 0}, - {"matrix": [5, 0], "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": [6, 7], "x": 7.5, "y": 1}, - {"matrix": [6, 6], "x": 8.5, "y": 1}, - {"matrix": [6, 5], "x": 9.5, "y": 1}, - {"matrix": [6, 4], "x": 10.5, "y": 1}, - {"matrix": [6, 3], "x": 11.5, "y": 1}, - {"matrix": [6, 2], "x": 12.5, "y": 1}, - {"matrix": [6, 1], "x": 13.5, "y": 1}, - {"matrix": [6, 0], "x": 14.5, "y": 1, "w": 1.5}, - - {"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": [7, 6], "x": 7.75, "y": 2}, - {"matrix": [7, 5], "x": 8.75, "y": 2}, - {"matrix": [7, 4], "x": 9.75, "y": 2}, - {"matrix": [7, 3], "x": 10.75, "y": 2}, - {"matrix": [7, 2], "x": 11.75, "y": 2}, - {"matrix": [7, 1], "x": 12.75, "y": 2}, - {"matrix": [7, 0], "x": 13.75, "y": 2, "w": 2.25}, - - {"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": [8, 6], "x": 8.25, "y": 3}, - {"matrix": [8, 5], "x": 9.25, "y": 3}, - {"matrix": [8, 4], "x": 10.25, "y": 3}, - {"matrix": [8, 3], "x": 11.25, "y": 3}, - {"matrix": [8, 2], "x": 12.25, "y": 3}, - {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 1.75}, - {"matrix": [8, 0], "x": 15, "y": 3}, - - {"matrix": [4, 1], "x": 1.5, "y": 4}, - {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, - {"matrix": [4, 3], "x": 4, "y": 4, "w": 2.75}, - {"matrix": [4, 4], "x": 6.75, "y": 4}, - - {"matrix": [9, 4], "x": 8.75, "y": 4}, - {"matrix": [9, 3], "x": 9.75, "y": 4, "w": 2.25}, - {"matrix": [9, 2], "x": 12, "y": 4, "w": 1.5}, - {"matrix": [9, 1], "x": 13.5, "y": 4} - ] - }, - "LAYOUT_wkl_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": [5, 7], "x": 8, "y": 0}, - {"matrix": [5, 6], "x": 9, "y": 0}, - {"matrix": [5, 5], "x": 10, "y": 0}, - {"matrix": [5, 4], "x": 11, "y": 0}, - {"matrix": [5, 3], "x": 12, "y": 0}, - {"matrix": [5, 2], "x": 13, "y": 0}, - {"matrix": [5, 0], "x": 14, "y": 0, "w": 2}, - - {"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, 7], "x": 7.5, "y": 1}, - {"matrix": [6, 6], "x": 8.5, "y": 1}, - {"matrix": [6, 5], "x": 9.5, "y": 1}, - {"matrix": [6, 4], "x": 10.5, "y": 1}, - {"matrix": [6, 3], "x": 11.5, "y": 1}, - {"matrix": [6, 2], "x": 12.5, "y": 1}, - {"matrix": [6, 1], "x": 13.5, "y": 1}, - {"matrix": [6, 0], "x": 14.5, "y": 1, "w": 1.5}, - - {"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": [7, 6], "x": 7.75, "y": 2}, - {"matrix": [7, 5], "x": 8.75, "y": 2}, - {"matrix": [7, 4], "x": 9.75, "y": 2}, - {"matrix": [7, 3], "x": 10.75, "y": 2}, - {"matrix": [7, 2], "x": 11.75, "y": 2}, - {"matrix": [7, 1], "x": 12.75, "y": 2}, - {"matrix": [7, 0], "x": 13.75, "y": 2, "w": 2.25}, - - {"matrix": [3, 1], "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": [8, 6], "x": 8.25, "y": 3}, - {"matrix": [8, 5], "x": 9.25, "y": 3}, - {"matrix": [8, 4], "x": 10.25, "y": 3}, - {"matrix": [8, 3], "x": 11.25, "y": 3}, - {"matrix": [8, 2], "x": 12.25, "y": 3}, - {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 2.75}, - - {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, - {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, - {"matrix": [4, 3], "x": 4, "y": 4, "w": 2.75}, - {"matrix": [4, 4], "x": 6.75, "y": 4}, - - {"matrix": [9, 4], "x": 8.75, "y": 4}, - {"matrix": [9, 3], "x": 9.75, "y": 4, "w": 2.25}, - {"matrix": [9, 2], "x": 12, "y": 4, "w": 1.5}, - {"matrix": [9, 0], "x": 14.5, "y": 4, "w": 1.5} - ] - } - } -} diff --git a/keyboards/handwired/qc60/proto/keyboard.json b/keyboards/handwired/qc60/proto/keyboard.json new file mode 100644 index 0000000000..0015ac5f66 --- /dev/null +++ b/keyboards/handwired/qc60/proto/keyboard.json @@ -0,0 +1,654 @@ +{ + "keyboard_name": "QC60", + "manufacturer": "PeiorisBoards", + "url": "", + "maintainer": "coarse", + "usb": { + "vid": "0xFEED", + "pid": "0x0C60", + "device_version": "1.0.0" + }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, + "rgblight": { + "led_count": 1 + }, + "ws2812": { + "pin": "D3" + }, + "matrix_pins": { + "cols": ["F7", "F6", "B1", "B3", "B2", "B6", "B5", "B4"], + "rows": ["F4", "F5", "C6", "D7", "E6"] + }, + "diode_direction": "ROW2COL", + "split": { + "enabled": true, + "soft_serial_pin": "D0" + }, + "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": [0, 6], "x": 6, "y": 0}, + + {"matrix": [5, 7], "x": 8, "y": 0}, + {"matrix": [5, 6], "x": 9, "y": 0}, + {"matrix": [5, 5], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 3], "x": 12, "y": 0}, + {"matrix": [5, 2], "x": 13, "y": 0}, + {"matrix": [5, 1], "x": 14, "y": 0}, + {"matrix": [5, 0], "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": [6, 7], "x": 7.5, "y": 1}, + {"matrix": [6, 6], "x": 8.5, "y": 1}, + {"matrix": [6, 5], "x": 9.5, "y": 1}, + {"matrix": [6, 4], "x": 10.5, "y": 1}, + {"matrix": [6, 3], "x": 11.5, "y": 1}, + {"matrix": [6, 2], "x": 12.5, "y": 1}, + {"matrix": [6, 1], "x": 13.5, "y": 1}, + {"matrix": [6, 0], "x": 14.5, "y": 1, "w": 1.5}, + + {"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": [7, 6], "x": 7.75, "y": 2}, + {"matrix": [7, 5], "x": 8.75, "y": 2}, + {"matrix": [7, 4], "x": 9.75, "y": 2}, + {"matrix": [7, 3], "x": 10.75, "y": 2}, + {"matrix": [7, 2], "x": 11.75, "y": 2}, + {"matrix": [7, 1], "x": 12.75, "y": 2}, + {"matrix": [7, 0], "x": 13.75, "y": 2, "w": 2.25}, + + {"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": [8, 6], "x": 8.25, "y": 3}, + {"matrix": [8, 5], "x": 9.25, "y": 3}, + {"matrix": [8, 4], "x": 10.25, "y": 3}, + {"matrix": [8, 3], "x": 11.25, "y": 3}, + {"matrix": [8, 2], "x": 12.25, "y": 3}, + {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 1.75}, + {"matrix": [8, 0], "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.75}, + {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 1.25}, + + {"matrix": [9, 4], "x": 8.75, "y": 4, "w": 1.25}, + {"matrix": [9, 3], "x": 10, "y": 4, "w": 2}, + {"matrix": [9, 5], "x": 12, "y": 4}, + {"matrix": [9, 2], "x": 13, "y": 4}, + {"matrix": [9, 1], "x": 14, "y": 4}, + {"matrix": [9, 0], "x": 15, "y": 4} + ] + }, + "LAYOUT_ansi_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": [5, 7], "x": 8, "y": 0}, + {"matrix": [5, 6], "x": 9, "y": 0}, + {"matrix": [5, 5], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 3], "x": 12, "y": 0}, + {"matrix": [5, 2], "x": 13, "y": 0}, + {"matrix": [5, 0], "x": 14, "y": 0, "w": 2}, + + {"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, 7], "x": 7.5, "y": 1}, + {"matrix": [6, 6], "x": 8.5, "y": 1}, + {"matrix": [6, 5], "x": 9.5, "y": 1}, + {"matrix": [6, 4], "x": 10.5, "y": 1}, + {"matrix": [6, 3], "x": 11.5, "y": 1}, + {"matrix": [6, 2], "x": 12.5, "y": 1}, + {"matrix": [6, 1], "x": 13.5, "y": 1}, + {"matrix": [6, 0], "x": 14.5, "y": 1, "w": 1.5}, + + {"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": [7, 6], "x": 7.75, "y": 2}, + {"matrix": [7, 5], "x": 8.75, "y": 2}, + {"matrix": [7, 4], "x": 9.75, "y": 2}, + {"matrix": [7, 3], "x": 10.75, "y": 2}, + {"matrix": [7, 2], "x": 11.75, "y": 2}, + {"matrix": [7, 1], "x": 12.75, "y": 2}, + {"matrix": [7, 0], "x": 13.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 1], "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": [8, 6], "x": 8.25, "y": 3}, + {"matrix": [8, 5], "x": 9.25, "y": 3}, + {"matrix": [8, 4], "x": 10.25, "y": 3}, + {"matrix": [8, 3], "x": 11.25, "y": 3}, + {"matrix": [8, 2], "x": 12.25, "y": 3}, + {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 2.75}, + + {"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.75}, + {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 1.25}, + + {"matrix": [9, 4], "x": 8.75, "y": 4, "w": 1.25}, + {"matrix": [9, 3], "x": 10, "y": 4, "w": 2}, + {"matrix": [9, 5], "x": 12, "y": 4}, + {"matrix": [9, 2], "x": 13, "y": 4}, + {"matrix": [9, 1], "x": 14, "y": 4}, + {"matrix": [9, 0], "x": 15, "y": 4} + ] + }, + "LAYOUT_ansi_alt": { + "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": [5, 7], "x": 8, "y": 0}, + {"matrix": [5, 6], "x": 9, "y": 0}, + {"matrix": [5, 5], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 3], "x": 12, "y": 0}, + {"matrix": [5, 2], "x": 13, "y": 0}, + {"matrix": [5, 0], "x": 14, "y": 0, "w": 2}, + + {"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, 7], "x": 7.5, "y": 1}, + {"matrix": [6, 6], "x": 8.5, "y": 1}, + {"matrix": [6, 5], "x": 9.5, "y": 1}, + {"matrix": [6, 4], "x": 10.5, "y": 1}, + {"matrix": [6, 3], "x": 11.5, "y": 1}, + {"matrix": [6, 2], "x": 12.5, "y": 1}, + {"matrix": [6, 1], "x": 13.5, "y": 1}, + {"matrix": [6, 0], "x": 14.5, "y": 1, "w": 1.5}, + + {"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": [7, 6], "x": 7.75, "y": 2}, + {"matrix": [7, 5], "x": 8.75, "y": 2}, + {"matrix": [7, 4], "x": 9.75, "y": 2}, + {"matrix": [7, 3], "x": 10.75, "y": 2}, + {"matrix": [7, 2], "x": 11.75, "y": 2}, + {"matrix": [7, 1], "x": 12.75, "y": 2}, + {"matrix": [7, 0], "x": 13.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 1], "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": [8, 6], "x": 8.25, "y": 3}, + {"matrix": [8, 5], "x": 9.25, "y": 3}, + {"matrix": [8, 4], "x": 10.25, "y": 3}, + {"matrix": [8, 3], "x": 11.25, "y": 3}, + {"matrix": [8, 2], "x": 12.25, "y": 3}, + {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 2.75}, + + {"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, 3], "x": 4, "y": 4, "w": 2.75}, + {"matrix": [4, 4], "x": 6.75, "y": 4}, + + {"matrix": [9, 4], "x": 8.75, "y": 4}, + {"matrix": [9, 3], "x": 9.75, "y": 4, "w": 2.25}, + {"matrix": [9, 2], "x": 12, "y": 4, "w": 1.5}, + {"matrix": [9, 1], "x": 13.5, "y": 4}, + {"matrix": [9, 0], "x": 14.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_iso_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": [5, 7], "x": 8, "y": 0}, + {"matrix": [5, 6], "x": 9, "y": 0}, + {"matrix": [5, 5], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 3], "x": 12, "y": 0}, + {"matrix": [5, 2], "x": 13, "y": 0}, + {"matrix": [5, 0], "x": 14, "y": 0, "w": 2}, + + {"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, 7], "x": 7.5, "y": 1}, + {"matrix": [6, 6], "x": 8.5, "y": 1}, + {"matrix": [6, 5], "x": 9.5, "y": 1}, + {"matrix": [6, 4], "x": 10.5, "y": 1}, + {"matrix": [6, 3], "x": 11.5, "y": 1}, + {"matrix": [6, 2], "x": 12.5, "y": 1}, + {"matrix": [6, 1], "x": 13.5, "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": [7, 6], "x": 7.75, "y": 2}, + {"matrix": [7, 5], "x": 8.75, "y": 2}, + {"matrix": [7, 4], "x": 9.75, "y": 2}, + {"matrix": [7, 3], "x": 10.75, "y": 2}, + {"matrix": [7, 2], "x": 11.75, "y": 2}, + {"matrix": [7, 1], "x": 12.75, "y": 2}, + {"matrix": [6, 0], "x": 13.75, "y": 2}, + {"matrix": [7, 0], "x": 14.75, "y": 1, "w": 1.25, "h": 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": [8, 6], "x": 8.25, "y": 3}, + {"matrix": [8, 5], "x": 9.25, "y": 3}, + {"matrix": [8, 4], "x": 10.25, "y": 3}, + {"matrix": [8, 3], "x": 11.25, "y": 3}, + {"matrix": [8, 2], "x": 12.25, "y": 3}, + {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 2.75}, + + {"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.75}, + {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 1.25}, + + {"matrix": [9, 4], "x": 8.75, "y": 4, "w": 1.25}, + {"matrix": [9, 3], "x": 10, "y": 4, "w": 2}, + {"matrix": [9, 5], "x": 12, "y": 4}, + {"matrix": [9, 2], "x": 13, "y": 4}, + {"matrix": [9, 1], "x": 14, "y": 4}, + {"matrix": [9, 0], "x": 15, "y": 4} + ] + }, + "LAYOUT_iso_alt": { + "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": [5, 7], "x": 8, "y": 0}, + {"matrix": [5, 6], "x": 9, "y": 0}, + {"matrix": [5, 5], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 3], "x": 12, "y": 0}, + {"matrix": [5, 2], "x": 13, "y": 0}, + {"matrix": [5, 0], "x": 14, "y": 0, "w": 2}, + + {"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, 7], "x": 7.5, "y": 1}, + {"matrix": [6, 6], "x": 8.5, "y": 1}, + {"matrix": [6, 5], "x": 9.5, "y": 1}, + {"matrix": [6, 4], "x": 10.5, "y": 1}, + {"matrix": [6, 3], "x": 11.5, "y": 1}, + {"matrix": [6, 2], "x": 12.5, "y": 1}, + {"matrix": [6, 1], "x": 13.5, "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": [7, 6], "x": 7.75, "y": 2}, + {"matrix": [7, 5], "x": 8.75, "y": 2}, + {"matrix": [7, 4], "x": 9.75, "y": 2}, + {"matrix": [7, 3], "x": 10.75, "y": 2}, + {"matrix": [7, 2], "x": 11.75, "y": 2}, + {"matrix": [7, 1], "x": 12.75, "y": 2}, + {"matrix": [6, 0], "x": 13.75, "y": 2}, + {"matrix": [7, 0], "x": 14.75, "y": 1, "w": 1.25, "h": 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": [8, 6], "x": 8.25, "y": 3}, + {"matrix": [8, 5], "x": 9.25, "y": 3}, + {"matrix": [8, 4], "x": 10.25, "y": 3}, + {"matrix": [8, 3], "x": 11.25, "y": 3}, + {"matrix": [8, 2], "x": 12.25, "y": 3}, + {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 2.75}, + + {"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, 3], "x": 4, "y": 4, "w": 2.75}, + {"matrix": [4, 4], "x": 6.75, "y": 4}, + + {"matrix": [9, 4], "x": 8.75, "y": 4}, + {"matrix": [9, 3], "x": 9.75, "y": 4, "w": 2.25}, + {"matrix": [9, 2], "x": 12, "y": 4, "w": 1.5}, + {"matrix": [9, 1], "x": 13.5, "y": 4}, + {"matrix": [9, 0], "x": 14.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_hhkb_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": [5, 7], "x": 8, "y": 0}, + {"matrix": [5, 6], "x": 9, "y": 0}, + {"matrix": [5, 5], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 3], "x": 12, "y": 0}, + {"matrix": [5, 2], "x": 13, "y": 0}, + {"matrix": [5, 1], "x": 14, "y": 0}, + {"matrix": [5, 0], "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": [6, 7], "x": 7.5, "y": 1}, + {"matrix": [6, 6], "x": 8.5, "y": 1}, + {"matrix": [6, 5], "x": 9.5, "y": 1}, + {"matrix": [6, 4], "x": 10.5, "y": 1}, + {"matrix": [6, 3], "x": 11.5, "y": 1}, + {"matrix": [6, 2], "x": 12.5, "y": 1}, + {"matrix": [6, 1], "x": 13.5, "y": 1}, + {"matrix": [6, 0], "x": 14.5, "y": 1, "w": 1.5}, + + {"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": [7, 6], "x": 7.75, "y": 2}, + {"matrix": [7, 5], "x": 8.75, "y": 2}, + {"matrix": [7, 4], "x": 9.75, "y": 2}, + {"matrix": [7, 3], "x": 10.75, "y": 2}, + {"matrix": [7, 2], "x": 11.75, "y": 2}, + {"matrix": [7, 1], "x": 12.75, "y": 2}, + {"matrix": [7, 0], "x": 13.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 1], "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": [8, 6], "x": 8.25, "y": 3}, + {"matrix": [8, 5], "x": 9.25, "y": 3}, + {"matrix": [8, 4], "x": 10.25, "y": 3}, + {"matrix": [8, 3], "x": 11.25, "y": 3}, + {"matrix": [8, 2], "x": 12.25, "y": 3}, + {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 1.75}, + {"matrix": [8, 0], "x": 15, "y": 3}, + + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 3], "x": 4, "y": 4, "w": 2.75}, + {"matrix": [4, 4], "x": 6.75, "y": 4}, + + {"matrix": [9, 4], "x": 8.75, "y": 4}, + {"matrix": [9, 3], "x": 9.75, "y": 4, "w": 2.25}, + {"matrix": [9, 2], "x": 12, "y": 4, "w": 1.5}, + {"matrix": [9, 1], "x": 13.5, "y": 4} + ] + }, + "LAYOUT_hhkb_split_lshift": { + "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": [5, 7], "x": 8, "y": 0}, + {"matrix": [5, 6], "x": 9, "y": 0}, + {"matrix": [5, 5], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 3], "x": 12, "y": 0}, + {"matrix": [5, 2], "x": 13, "y": 0}, + {"matrix": [5, 1], "x": 14, "y": 0}, + {"matrix": [5, 0], "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": [6, 7], "x": 7.5, "y": 1}, + {"matrix": [6, 6], "x": 8.5, "y": 1}, + {"matrix": [6, 5], "x": 9.5, "y": 1}, + {"matrix": [6, 4], "x": 10.5, "y": 1}, + {"matrix": [6, 3], "x": 11.5, "y": 1}, + {"matrix": [6, 2], "x": 12.5, "y": 1}, + {"matrix": [6, 1], "x": 13.5, "y": 1}, + {"matrix": [6, 0], "x": 14.5, "y": 1, "w": 1.5}, + + {"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": [7, 6], "x": 7.75, "y": 2}, + {"matrix": [7, 5], "x": 8.75, "y": 2}, + {"matrix": [7, 4], "x": 9.75, "y": 2}, + {"matrix": [7, 3], "x": 10.75, "y": 2}, + {"matrix": [7, 2], "x": 11.75, "y": 2}, + {"matrix": [7, 1], "x": 12.75, "y": 2}, + {"matrix": [7, 0], "x": 13.75, "y": 2, "w": 2.25}, + + {"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": [8, 6], "x": 8.25, "y": 3}, + {"matrix": [8, 5], "x": 9.25, "y": 3}, + {"matrix": [8, 4], "x": 10.25, "y": 3}, + {"matrix": [8, 3], "x": 11.25, "y": 3}, + {"matrix": [8, 2], "x": 12.25, "y": 3}, + {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 1.75}, + {"matrix": [8, 0], "x": 15, "y": 3}, + + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 3], "x": 4, "y": 4, "w": 2.75}, + {"matrix": [4, 4], "x": 6.75, "y": 4}, + + {"matrix": [9, 4], "x": 8.75, "y": 4}, + {"matrix": [9, 3], "x": 9.75, "y": 4, "w": 2.25}, + {"matrix": [9, 2], "x": 12, "y": 4, "w": 1.5}, + {"matrix": [9, 1], "x": 13.5, "y": 4} + ] + }, + "LAYOUT_wkl_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": [5, 7], "x": 8, "y": 0}, + {"matrix": [5, 6], "x": 9, "y": 0}, + {"matrix": [5, 5], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 3], "x": 12, "y": 0}, + {"matrix": [5, 2], "x": 13, "y": 0}, + {"matrix": [5, 0], "x": 14, "y": 0, "w": 2}, + + {"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, 7], "x": 7.5, "y": 1}, + {"matrix": [6, 6], "x": 8.5, "y": 1}, + {"matrix": [6, 5], "x": 9.5, "y": 1}, + {"matrix": [6, 4], "x": 10.5, "y": 1}, + {"matrix": [6, 3], "x": 11.5, "y": 1}, + {"matrix": [6, 2], "x": 12.5, "y": 1}, + {"matrix": [6, 1], "x": 13.5, "y": 1}, + {"matrix": [6, 0], "x": 14.5, "y": 1, "w": 1.5}, + + {"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": [7, 6], "x": 7.75, "y": 2}, + {"matrix": [7, 5], "x": 8.75, "y": 2}, + {"matrix": [7, 4], "x": 9.75, "y": 2}, + {"matrix": [7, 3], "x": 10.75, "y": 2}, + {"matrix": [7, 2], "x": 11.75, "y": 2}, + {"matrix": [7, 1], "x": 12.75, "y": 2}, + {"matrix": [7, 0], "x": 13.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 1], "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": [8, 6], "x": 8.25, "y": 3}, + {"matrix": [8, 5], "x": 9.25, "y": 3}, + {"matrix": [8, 4], "x": 10.25, "y": 3}, + {"matrix": [8, 3], "x": 11.25, "y": 3}, + {"matrix": [8, 2], "x": 12.25, "y": 3}, + {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 2.75}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 3], "x": 4, "y": 4, "w": 2.75}, + {"matrix": [4, 4], "x": 6.75, "y": 4}, + + {"matrix": [9, 4], "x": 8.75, "y": 4}, + {"matrix": [9, 3], "x": 9.75, "y": 4, "w": 2.25}, + {"matrix": [9, 2], "x": 12, "y": 4, "w": 1.5}, + {"matrix": [9, 0], "x": 14.5, "y": 4, "w": 1.5} + ] + } + } +} diff --git a/keyboards/handwired/qc60/proto/rules.mk b/keyboards/handwired/qc60/proto/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/handwired/qc60/proto/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/stef9998/split_5x7/info.json b/keyboards/handwired/stef9998/split_5x7/info.json deleted file mode 100644 index fe277ebde0..0000000000 --- a/keyboards/handwired/stef9998/split_5x7/info.json +++ /dev/null @@ -1,119 +0,0 @@ -{ - "keyboard_name": "Split_5x7", - "url": "", - "maintainer": "stef9998", - "manufacturer": "Stef9998", - "usb": { - "vid": "0x57EF", - "pid": "0x6063", - "device_version": "1.0.0" - }, - "features": { - "bootmagic": false, - "command": true, - "console": false, - "extrakey": true, - "mousekey": true, - "nkro": false - }, - "matrix_pins": { - "cols": ["B2", "B6", "B1", "B3", "F7", "F5", "F6"], - "rows": ["C6", "D7", "E6", "B4", "B5"] - }, - "diode_direction": "COL2ROW", - "split": { - "enabled": true, - "soft_serial_pin": "D0", - "matrix_pins": { - "right": { - "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], - "rows": ["B5", "B4", "E6", "D7", "C6"] - } - } - }, - "processor": "atmega32u4", - "bootloader": "caterina", - "layouts": { - "LAYOUT": { - "layout": [ - {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, - {"label": "1", "matrix": [0, 1], "x": 1, "y": 0}, - {"label": "2", "matrix": [0, 2], "x": 2, "y": 0}, - {"label": "3", "matrix": [0, 3], "x": 3, "y": 0}, - {"label": "4", "matrix": [0, 4], "x": 4, "y": 0}, - {"label": "5", "matrix": [0, 5], "x": 5, "y": 0}, - {"label": "F1", "matrix": [0, 6], "x": 6, "y": 0}, - - {"label": "Tab", "matrix": [5, 6], "x": 0, "y": 1}, - {"label": "Q", "matrix": [5, 5], "x": 1, "y": 1}, - {"label": "W", "matrix": [5, 4], "x": 2, "y": 1}, - {"label": "E", "matrix": [5, 3], "x": 3, "y": 1}, - {"label": "R", "matrix": [5, 2], "x": 4, "y": 1}, - {"label": "T", "matrix": [5, 1], "x": 5, "y": 1}, - {"label": "[", "matrix": [5, 0], "x": 6, "y": 1}, - - {"label": "Caps Lock", "matrix": [1, 0], "x": 0, "y": 2}, - {"label": "A", "matrix": [1, 1], "x": 1, "y": 2}, - {"label": "S", "matrix": [1, 2], "x": 2, "y": 2}, - {"label": "D", "matrix": [1, 3], "x": 3, "y": 2}, - {"label": "F", "matrix": [1, 4], "x": 4, "y": 2}, - {"label": "G", "matrix": [1, 5], "x": 5, "y": 2}, - {"label": "=", "matrix": [1, 6], "x": 6, "y": 2}, - - {"label": "Shift", "matrix": [6, 6], "x": 0, "y": 3}, - {"label": "Z", "matrix": [6, 5], "x": 1, "y": 3}, - {"label": "X", "matrix": [6, 4], "x": 2, "y": 3}, - {"label": "C", "matrix": [6, 3], "x": 3, "y": 3}, - {"label": "V", "matrix": [6, 2], "x": 4, "y": 3}, - {"label": "B", "matrix": [6, 1], "x": 5, "y": 3}, - {"label": "F3", "matrix": [6, 0], "x": 6, "y": 3}, - - {"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 4}, - {"label": "Ctrl", "matrix": [2, 1], "x": 1, "y": 4}, - {"label": "Gui", "matrix": [2, 2], "x": 2, "y": 4, "w": 1.25}, - {"label": "Alt", "matrix": [2, 3], "x": 3.25, "y": 4, "w": 1.25}, - {"label": "Space", "matrix": [2, 4], "x": 4.5, "y": 4, "w": 1.5}, - {"label": "F5", "matrix": [2, 5], "x": 6, "y": 4}, - - {"label": "F2", "matrix": [2, 6], "x": 14, "y": 0}, - {"label": "6", "matrix": [7, 6], "x": 9, "y": 0}, - {"label": "7", "matrix": [7, 5], "x": 10, "y": 0}, - {"label": "8", "matrix": [7, 4], "x": 11, "y": 0}, - {"label": "9", "matrix": [7, 3], "x": 12, "y": 0}, - {"label": "0", "matrix": [7, 2], "x": 13, "y": 0}, - {"label": "Backspace", "matrix": [7, 1], "x": 14, "y": 0}, - - {"label": "]", "matrix": [7, 0], "x": 8, "y": 1}, - {"label": "Y", "matrix": [3, 0], "x": 9, "y": 1}, - {"label": "U", "matrix": [3, 1], "x": 10, "y": 1}, - {"label": "I", "matrix": [3, 2], "x": 11, "y": 1}, - {"label": "O", "matrix": [3, 3], "x": 12, "y": 1}, - {"label": "P", "matrix": [3, 4], "x": 13, "y": 1}, - {"label": "\\", "matrix": [3, 5], "x": 14, "y": 1}, - - {"label": "-", "matrix": [3, 6], "x": 8, "y": 2}, - {"label": "H", "matrix": [8, 6], "x": 9, "y": 2}, - {"label": "J", "matrix": [8, 5], "x": 10, "y": 2}, - {"label": "K", "matrix": [8, 4], "x": 11, "y": 2}, - {"label": "L", "matrix": [8, 3], "x": 12, "y": 2}, - {"label": ";", "matrix": [8, 2], "x": 13, "y": 2}, - {"label": "Enter", "matrix": [8, 1], "x": 14, "y": 2}, - - {"label": "F4", "matrix": [8, 0], "x": 8, "y": 3}, - {"label": "N", "matrix": [4, 0], "x": 9, "y": 3}, - {"label": "M", "matrix": [4, 1], "x": 10, "y": 3}, - {"label": ",", "matrix": [4, 2], "x": 11, "y": 3}, - {"label": ".", "matrix": [4, 3], "x": 12, "y": 3}, - {"label": "/", "matrix": [4, 5], "x": 13, "y": 3}, - {"label": "Shift", "matrix": [4, 6], "x": 14, "y": 3}, - - {"label": "F5", "matrix": [9, 6], "x": 8, "y": 4}, - {"label": "Space", "matrix": [9, 5], "x": 9, "y": 4, "w": 1.5}, - {"label": "AltGr", "matrix": [9, 3], "x": 10.5, "y": 4, "w": 1.25}, - {"label": "Fn", "matrix": [9, 2], "x": 11.75, "y": 4, "w": 1.25}, - {"label": "Ctrl", "matrix": [9, 1], "x": 13, "y": 4}, - {"label": "Ctrl", "matrix": [9, 0], "x": 13, "y": 4} - ] - } - } -} diff --git a/keyboards/handwired/stef9998/split_5x7/rev1/keyboard.json b/keyboards/handwired/stef9998/split_5x7/rev1/keyboard.json new file mode 100644 index 0000000000..fe277ebde0 --- /dev/null +++ b/keyboards/handwired/stef9998/split_5x7/rev1/keyboard.json @@ -0,0 +1,119 @@ +{ + "keyboard_name": "Split_5x7", + "url": "", + "maintainer": "stef9998", + "manufacturer": "Stef9998", + "usb": { + "vid": "0x57EF", + "pid": "0x6063", + "device_version": "1.0.0" + }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, + "matrix_pins": { + "cols": ["B2", "B6", "B1", "B3", "F7", "F5", "F6"], + "rows": ["C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", + "split": { + "enabled": true, + "soft_serial_pin": "D0", + "matrix_pins": { + "right": { + "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["B5", "B4", "E6", "D7", "C6"] + } + } + }, + "processor": "atmega32u4", + "bootloader": "caterina", + "layouts": { + "LAYOUT": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "1", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "2", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "3", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "4", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "5", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "F1", "matrix": [0, 6], "x": 6, "y": 0}, + + {"label": "Tab", "matrix": [5, 6], "x": 0, "y": 1}, + {"label": "Q", "matrix": [5, 5], "x": 1, "y": 1}, + {"label": "W", "matrix": [5, 4], "x": 2, "y": 1}, + {"label": "E", "matrix": [5, 3], "x": 3, "y": 1}, + {"label": "R", "matrix": [5, 2], "x": 4, "y": 1}, + {"label": "T", "matrix": [5, 1], "x": 5, "y": 1}, + {"label": "[", "matrix": [5, 0], "x": 6, "y": 1}, + + {"label": "Caps Lock", "matrix": [1, 0], "x": 0, "y": 2}, + {"label": "A", "matrix": [1, 1], "x": 1, "y": 2}, + {"label": "S", "matrix": [1, 2], "x": 2, "y": 2}, + {"label": "D", "matrix": [1, 3], "x": 3, "y": 2}, + {"label": "F", "matrix": [1, 4], "x": 4, "y": 2}, + {"label": "G", "matrix": [1, 5], "x": 5, "y": 2}, + {"label": "=", "matrix": [1, 6], "x": 6, "y": 2}, + + {"label": "Shift", "matrix": [6, 6], "x": 0, "y": 3}, + {"label": "Z", "matrix": [6, 5], "x": 1, "y": 3}, + {"label": "X", "matrix": [6, 4], "x": 2, "y": 3}, + {"label": "C", "matrix": [6, 3], "x": 3, "y": 3}, + {"label": "V", "matrix": [6, 2], "x": 4, "y": 3}, + {"label": "B", "matrix": [6, 1], "x": 5, "y": 3}, + {"label": "F3", "matrix": [6, 0], "x": 6, "y": 3}, + + {"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 4}, + {"label": "Ctrl", "matrix": [2, 1], "x": 1, "y": 4}, + {"label": "Gui", "matrix": [2, 2], "x": 2, "y": 4, "w": 1.25}, + {"label": "Alt", "matrix": [2, 3], "x": 3.25, "y": 4, "w": 1.25}, + {"label": "Space", "matrix": [2, 4], "x": 4.5, "y": 4, "w": 1.5}, + {"label": "F5", "matrix": [2, 5], "x": 6, "y": 4}, + + {"label": "F2", "matrix": [2, 6], "x": 14, "y": 0}, + {"label": "6", "matrix": [7, 6], "x": 9, "y": 0}, + {"label": "7", "matrix": [7, 5], "x": 10, "y": 0}, + {"label": "8", "matrix": [7, 4], "x": 11, "y": 0}, + {"label": "9", "matrix": [7, 3], "x": 12, "y": 0}, + {"label": "0", "matrix": [7, 2], "x": 13, "y": 0}, + {"label": "Backspace", "matrix": [7, 1], "x": 14, "y": 0}, + + {"label": "]", "matrix": [7, 0], "x": 8, "y": 1}, + {"label": "Y", "matrix": [3, 0], "x": 9, "y": 1}, + {"label": "U", "matrix": [3, 1], "x": 10, "y": 1}, + {"label": "I", "matrix": [3, 2], "x": 11, "y": 1}, + {"label": "O", "matrix": [3, 3], "x": 12, "y": 1}, + {"label": "P", "matrix": [3, 4], "x": 13, "y": 1}, + {"label": "\\", "matrix": [3, 5], "x": 14, "y": 1}, + + {"label": "-", "matrix": [3, 6], "x": 8, "y": 2}, + {"label": "H", "matrix": [8, 6], "x": 9, "y": 2}, + {"label": "J", "matrix": [8, 5], "x": 10, "y": 2}, + {"label": "K", "matrix": [8, 4], "x": 11, "y": 2}, + {"label": "L", "matrix": [8, 3], "x": 12, "y": 2}, + {"label": ";", "matrix": [8, 2], "x": 13, "y": 2}, + {"label": "Enter", "matrix": [8, 1], "x": 14, "y": 2}, + + {"label": "F4", "matrix": [8, 0], "x": 8, "y": 3}, + {"label": "N", "matrix": [4, 0], "x": 9, "y": 3}, + {"label": "M", "matrix": [4, 1], "x": 10, "y": 3}, + {"label": ",", "matrix": [4, 2], "x": 11, "y": 3}, + {"label": ".", "matrix": [4, 3], "x": 12, "y": 3}, + {"label": "/", "matrix": [4, 5], "x": 13, "y": 3}, + {"label": "Shift", "matrix": [4, 6], "x": 14, "y": 3}, + + {"label": "F5", "matrix": [9, 6], "x": 8, "y": 4}, + {"label": "Space", "matrix": [9, 5], "x": 9, "y": 4, "w": 1.5}, + {"label": "AltGr", "matrix": [9, 3], "x": 10.5, "y": 4, "w": 1.25}, + {"label": "Fn", "matrix": [9, 2], "x": 11.75, "y": 4, "w": 1.25}, + {"label": "Ctrl", "matrix": [9, 1], "x": 13, "y": 4}, + {"label": "Ctrl", "matrix": [9, 0], "x": 13, "y": 4} + ] + } + } +} diff --git a/keyboards/handwired/stef9998/split_5x7/rev1/rev1.c b/keyboards/handwired/stef9998/split_5x7/rev1/rev1.c new file mode 100644 index 0000000000..18543078c7 --- /dev/null +++ b/keyboards/handwired/stef9998/split_5x7/rev1/rev1.c @@ -0,0 +1,33 @@ +/* Copyright 2017 REPLACE_WITH_YOUR_NAME + * + * 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 . + */ +#include "quantum.h" + +#ifdef SWAP_HANDS_ENABLE +__attribute__ ((weak)) +const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = { +{{0, 5}, {1, 5}, {2, 5}, {3, 5}, {4, 5}, {5, 5}, {6, 5}}, +{{0, 6}, {1, 6}, {2, 6}, {3, 6}, {4, 6}, {5, 6}, {6, 6}}, +{{0, 7}, {1, 7}, {2, 7}, {3, 7}, {4, 7}, {5, 7}, {6, 7}}, +{{0, 8}, {1, 8}, {2, 8}, {3, 8}, {4, 8}, {5, 8}, {6, 8}}, +{{0, 9}, {1, 9}, {2, 9}, {3, 9}, {4, 9}, {5, 9}, {6, 9}}, + +{{0, 0}, {1, 0}, {2, 0}, {3, 0}, {4, 0}, {5, 0}, {6, 0}}, +{{0, 1}, {1, 1}, {2, 1}, {3, 1}, {4, 1}, {5, 1}, {6, 1}}, +{{0, 2}, {1, 2}, {2, 2}, {3, 2}, {4, 2}, {5, 2}, {6, 2}}, +{{0, 3}, {1, 3}, {2, 3}, {3, 3}, {4, 3}, {5, 3}, {6, 3}}, +{{0, 4}, {1, 4}, {2, 4}, {3, 4}, {4, 4}, {5, 4}, {6, 4}}, +}; +#endif \ No newline at end of file diff --git a/keyboards/handwired/stef9998/split_5x7/split_5x7.c b/keyboards/handwired/stef9998/split_5x7/split_5x7.c deleted file mode 100644 index 18543078c7..0000000000 --- a/keyboards/handwired/stef9998/split_5x7/split_5x7.c +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2017 REPLACE_WITH_YOUR_NAME - * - * 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 . - */ -#include "quantum.h" - -#ifdef SWAP_HANDS_ENABLE -__attribute__ ((weak)) -const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = { -{{0, 5}, {1, 5}, {2, 5}, {3, 5}, {4, 5}, {5, 5}, {6, 5}}, -{{0, 6}, {1, 6}, {2, 6}, {3, 6}, {4, 6}, {5, 6}, {6, 6}}, -{{0, 7}, {1, 7}, {2, 7}, {3, 7}, {4, 7}, {5, 7}, {6, 7}}, -{{0, 8}, {1, 8}, {2, 8}, {3, 8}, {4, 8}, {5, 8}, {6, 8}}, -{{0, 9}, {1, 9}, {2, 9}, {3, 9}, {4, 9}, {5, 9}, {6, 9}}, - -{{0, 0}, {1, 0}, {2, 0}, {3, 0}, {4, 0}, {5, 0}, {6, 0}}, -{{0, 1}, {1, 1}, {2, 1}, {3, 1}, {4, 1}, {5, 1}, {6, 1}}, -{{0, 2}, {1, 2}, {2, 2}, {3, 2}, {4, 2}, {5, 2}, {6, 2}}, -{{0, 3}, {1, 3}, {2, 3}, {3, 3}, {4, 3}, {5, 3}, {6, 3}}, -{{0, 4}, {1, 4}, {2, 4}, {3, 4}, {4, 4}, {5, 4}, {6, 4}}, -}; -#endif \ No newline at end of file diff --git a/keyboards/junco/info.json b/keyboards/junco/info.json deleted file mode 100644 index 6956ab4834..0000000000 --- a/keyboards/junco/info.json +++ /dev/null @@ -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 new file mode 100644 index 0000000000..855628d3b1 --- /dev/null +++ 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 index e69de29bb2..161ec22b16 100644 --- a/keyboards/junco/rev1/rules.mk +++ b/keyboards/junco/rev1/rules.mk @@ -0,0 +1 @@ +SERIAL_DRIVER = vendor diff --git a/keyboards/junco/rules.mk b/keyboards/junco/rules.mk index a04c7822f9..bb94741e5a 100644 --- 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/rev1 diff --git a/keyboards/keaboard/info.json b/keyboards/keaboard/info.json deleted file mode 100644 index 5eee555e4b..0000000000 --- a/keyboards/keaboard/info.json +++ /dev/null @@ -1,84 +0,0 @@ -{ - "keyboard_name": "keaboard", - "manufacturer": "keawade", - "url": "https://github.com/keawade/keaboard", - "maintainer": "keawade", - "usb": { - "vid": "0xFEED", - "pid": "0x9090", - "device_version": "1.0.0" - }, - "diode_direction": "COL2ROW", - "matrix_pins": { - "rows": ["D7", "E6", "B4", "B5"], - "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"] - }, - "bootloader": "caterina", - "processor": "atmega32u4", - "split": { - "enabled": true, - "soft_serial_pin": "D0" - }, - "features": { - "extrakey": true, - "mousekey": true, - "unicode": true, - "command": true - }, - "layouts": { - "LAYOUT": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0.375}, - {"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.125}, - {"matrix": [0, 5], "x": 5, "y": 0.25}, - {"matrix": [4, 5], "x": 10, "y": 0.25}, - {"matrix": [4, 4], "x": 11, "y": 0.125}, - {"matrix": [4, 3], "x": 12, "y": 0}, - {"matrix": [4, 2], "x": 13, "y": 0.125}, - {"matrix": [4, 1], "x": 14, "y": 0.25}, - {"matrix": [4, 0], "x": 15, "y": 0.375}, - {"matrix": [1, 0], "x": 0, "y": 1.375}, - {"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.125}, - {"matrix": [1, 5], "x": 5, "y": 1.25}, - {"matrix": [5, 5], "x": 10, "y": 1.25}, - {"matrix": [5, 4], "x": 11, "y": 1.125}, - {"matrix": [5, 3], "x": 12, "y": 1}, - {"matrix": [5, 2], "x": 13, "y": 1.125}, - {"matrix": [5, 1], "x": 14, "y": 1.25}, - {"matrix": [5, 0], "x": 15, "y": 1.375}, - {"matrix": [2, 0], "x": 0, "y": 2.375}, - {"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.125}, - {"matrix": [2, 5], "x": 5, "y": 2.25}, - {"matrix": [2, 6], "x": 6.5, "y": 3}, - {"matrix": [6, 6], "x": 8.5, "y": 3}, - {"matrix": [6, 5], "x": 10, "y": 2.25}, - {"matrix": [6, 4], "x": 11, "y": 2.125}, - {"matrix": [6, 3], "x": 12, "y": 2}, - {"matrix": [6, 2], "x": 13, "y": 2.125}, - {"matrix": [6, 1], "x": 14, "y": 2.25}, - {"matrix": [6, 0], "x": 15, "y": 2.375}, - {"matrix": [3, 0], "x": 0, "y": 3.375}, - {"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": 5.5, "y": 4}, - {"matrix": [3, 6], "x": 6.5, "y": 4}, - {"matrix": [7, 6], "x": 8.5, "y": 4}, - {"matrix": [7, 4], "x": 9.5, "y": 4}, - {"matrix": [7, 3], "x": 12, "y": 3}, - {"matrix": [7, 2], "x": 13, "y": 3.125}, - {"matrix": [7, 1], "x": 14, "y": 3.25}, - {"matrix": [7, 0], "x": 15, "y": 3.375} - ] - } - } -} diff --git a/keyboards/keaboard/rev1/keyboard.json b/keyboards/keaboard/rev1/keyboard.json new file mode 100644 index 0000000000..5eee555e4b --- /dev/null +++ b/keyboards/keaboard/rev1/keyboard.json @@ -0,0 +1,84 @@ +{ + "keyboard_name": "keaboard", + "manufacturer": "keawade", + "url": "https://github.com/keawade/keaboard", + "maintainer": "keawade", + "usb": { + "vid": "0xFEED", + "pid": "0x9090", + "device_version": "1.0.0" + }, + "diode_direction": "COL2ROW", + "matrix_pins": { + "rows": ["D7", "E6", "B4", "B5"], + "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"] + }, + "bootloader": "caterina", + "processor": "atmega32u4", + "split": { + "enabled": true, + "soft_serial_pin": "D0" + }, + "features": { + "extrakey": true, + "mousekey": true, + "unicode": true, + "command": true + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.375}, + {"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.125}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + {"matrix": [4, 5], "x": 10, "y": 0.25}, + {"matrix": [4, 4], "x": 11, "y": 0.125}, + {"matrix": [4, 3], "x": 12, "y": 0}, + {"matrix": [4, 2], "x": 13, "y": 0.125}, + {"matrix": [4, 1], "x": 14, "y": 0.25}, + {"matrix": [4, 0], "x": 15, "y": 0.375}, + {"matrix": [1, 0], "x": 0, "y": 1.375}, + {"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.125}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [5, 5], "x": 10, "y": 1.25}, + {"matrix": [5, 4], "x": 11, "y": 1.125}, + {"matrix": [5, 3], "x": 12, "y": 1}, + {"matrix": [5, 2], "x": 13, "y": 1.125}, + {"matrix": [5, 1], "x": 14, "y": 1.25}, + {"matrix": [5, 0], "x": 15, "y": 1.375}, + {"matrix": [2, 0], "x": 0, "y": 2.375}, + {"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.125}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 3}, + {"matrix": [6, 6], "x": 8.5, "y": 3}, + {"matrix": [6, 5], "x": 10, "y": 2.25}, + {"matrix": [6, 4], "x": 11, "y": 2.125}, + {"matrix": [6, 3], "x": 12, "y": 2}, + {"matrix": [6, 2], "x": 13, "y": 2.125}, + {"matrix": [6, 1], "x": 14, "y": 2.25}, + {"matrix": [6, 0], "x": 15, "y": 2.375}, + {"matrix": [3, 0], "x": 0, "y": 3.375}, + {"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": 5.5, "y": 4}, + {"matrix": [3, 6], "x": 6.5, "y": 4}, + {"matrix": [7, 6], "x": 8.5, "y": 4}, + {"matrix": [7, 4], "x": 9.5, "y": 4}, + {"matrix": [7, 3], "x": 12, "y": 3}, + {"matrix": [7, 2], "x": 13, "y": 3.125}, + {"matrix": [7, 1], "x": 14, "y": 3.25}, + {"matrix": [7, 0], "x": 15, "y": 3.375} + ] + } + } +} diff --git a/keyboards/keaboard/rev1/rules.mk b/keyboards/keaboard/rev1/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/keaboard/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/melgeek/mj65/config.h b/keyboards/melgeek/mj65/config.h deleted file mode 100644 index 010e035e2e..0000000000 --- a/keyboards/melgeek/mj65/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2020 MelGeek - * - * 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 - -#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND -#define IS31FL3741_SDB_PIN A2 diff --git a/keyboards/melgeek/mj65/info.json b/keyboards/melgeek/mj65/info.json deleted file mode 100644 index 773c9a3198..0000000000 --- a/keyboards/melgeek/mj65/info.json +++ /dev/null @@ -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/rev3/config.h b/keyboards/melgeek/mj65/rev3/config.h new file mode 100644 index 0000000000..010e035e2e --- /dev/null +++ b/keyboards/melgeek/mj65/rev3/config.h @@ -0,0 +1,20 @@ +/* Copyright 2020 MelGeek + * + * 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 + +#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND +#define IS31FL3741_SDB_PIN A2 diff --git a/keyboards/melgeek/mj65/rev3/keyboard.json b/keyboards/melgeek/mj65/rev3/keyboard.json new file mode 100644 index 0000000000..adf0ef94bc --- /dev/null +++ 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 index 7a3d7020d9..8b7f40c50b 100644 --- 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 = no diff --git a/keyboards/melgeek/mojo68/config.h b/keyboards/melgeek/mojo68/config.h deleted file mode 100755 index 68088ba745..0000000000 --- a/keyboards/melgeek/mojo68/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2020 MelGeek - * - * 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 - -#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND -#define IS31FL3741_SDB_PIN B7 diff --git a/keyboards/melgeek/mojo68/info.json b/keyboards/melgeek/mojo68/info.json deleted file mode 100755 index b97de4fbd2..0000000000 --- a/keyboards/melgeek/mojo68/info.json +++ /dev/null @@ -1,158 +0,0 @@ -{ - "keyboard_name": "MoJo68", - "manufacturer": "MelGeek", - "url": "", - "maintainer": "melgeek001365", - "usb": { - "vid": "0xEDED", - "pid": "0x0068", - "device_version": "0.0.1" - }, - "features": { - "bootmagic": true, - "command": false, - "console": false, - "extrakey": true, - "mousekey": 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, - "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": ["B0", "B1", "B2", "B3", "D2", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"], - "rows": ["F0", "F1", "F4", "F5", "F6"] - }, - "diode_direction": "COL2ROW", - "processor": "atmega32u4", - "bootloader": "atmel-dfu", - "debounce": 3, - "community_layouts": ["68_ansi"], - "layouts": { - "LAYOUT_68_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/mojo68/rev1/config.h b/keyboards/melgeek/mojo68/rev1/config.h index 960bf58c52..829eb63fe6 100755 --- 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 3 diff --git a/keyboards/melgeek/mojo68/rev1/keyboard.json b/keyboards/melgeek/mojo68/rev1/keyboard.json new file mode 100755 index 0000000000..b97de4fbd2 --- /dev/null +++ b/keyboards/melgeek/mojo68/rev1/keyboard.json @@ -0,0 +1,158 @@ +{ + "keyboard_name": "MoJo68", + "manufacturer": "MelGeek", + "url": "", + "maintainer": "melgeek001365", + "usb": { + "vid": "0xEDED", + "pid": "0x0068", + "device_version": "0.0.1" + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": 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, + "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": ["B0", "B1", "B2", "B3", "D2", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"], + "rows": ["F0", "F1", "F4", "F5", "F6"] + }, + "diode_direction": "COL2ROW", + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "debounce": 3, + "community_layouts": ["68_ansi"], + "layouts": { + "LAYOUT_68_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/mojo68/rev1/rules.mk b/keyboards/melgeek/mojo68/rev1/rules.mk deleted file mode 100755 index 6e7633bfe0..0000000000 --- a/keyboards/melgeek/mojo68/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/melgeek/mojo75/config.h b/keyboards/melgeek/mojo75/config.h deleted file mode 100644 index 010e035e2e..0000000000 --- a/keyboards/melgeek/mojo75/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2020 MelGeek - * - * 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 - -#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND -#define IS31FL3741_SDB_PIN A2 diff --git a/keyboards/melgeek/mojo75/info.json b/keyboards/melgeek/mojo75/info.json deleted file mode 100644 index a1b93afb69..0000000000 --- a/keyboards/melgeek/mojo75/info.json +++ /dev/null @@ -1,176 +0,0 @@ -{ - "keyboard_name": "MoJo75", - "manufacturer": "MelGeek", - "url": "", - "maintainer": "melgeek001365", - "usb": { - "vid": "0xEDED", - "pid": "0x7075", - "device_version": "0.0.1" - }, - "features": { - "bootmagic": true, - "command": false, - "console": false, - "extrakey": true, - "mousekey": 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": ["B12", "B13", "B14", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"], - "rows": ["B11", "B10", "B1", "B0", "A7", "A6"] - }, - "diode_direction": "COL2ROW", - "processor": "STM32F303", - "bootloader": "stm32-dfu", - "board": "QMK_PROTON_C", - "debounce": 3, - "community_layouts": ["75_ansi"], - "layouts": { - "LAYOUT_75_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}, - {"matrix": [0, 14], "x": 14, "y": 0}, - {"matrix": [0, 15], "x": 15, "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": [1, 12], "x": 12, "y": 1}, - {"matrix": [1, 13], "x": 13, "y": 1, "w": 2}, - {"matrix": [1, 15], "x": 15, "y": 1}, - - {"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.5, "y": 2}, - {"matrix": [2, 7], "x": 7.5, "y": 2}, - {"matrix": [2, 8], "x": 8.5, "y": 2}, - {"matrix": [2, 9], "x": 9.5, "y": 2}, - {"matrix": [2, 10], "x": 10.5, "y": 2}, - {"matrix": [2, 11], "x": 11.5, "y": 2}, - {"matrix": [2, 12], "x": 12.5, "y": 2}, - {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5}, - {"matrix": [2, 15], "x": 15, "y": 2}, - - {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, - {"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}, - {"matrix": [3, 5], "x": 5.75, "y": 3}, - {"matrix": [3, 6], "x": 6.75, "y": 3}, - {"matrix": [3, 7], "x": 7.75, "y": 3}, - {"matrix": [3, 8], "x": 8.75, "y": 3}, - {"matrix": [3, 9], "x": 9.75, "y": 3}, - {"matrix": [3, 10], "x": 10.75, "y": 3}, - {"matrix": [3, 11], "x": 11.75, "y": 3}, - {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25}, - {"matrix": [3, 15], "x": 15, "y": 3}, - - {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25}, - {"matrix": [4, 1], "x": 2.25, "y": 4}, - {"matrix": [4, 2], "x": 3.25, "y": 4}, - {"matrix": [4, 3], "x": 4.25, "y": 4}, - {"matrix": [4, 4], "x": 5.25, "y": 4}, - {"matrix": [4, 5], "x": 6.25, "y": 4}, - {"matrix": [4, 6], "x": 7.25, "y": 4}, - {"matrix": [4, 7], "x": 8.25, "y": 4}, - {"matrix": [4, 8], "x": 9.25, "y": 4}, - {"matrix": [4, 9], "x": 10.25, "y": 4}, - {"matrix": [4, 10], "x": 11.25, "y": 4}, - {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75}, - {"matrix": [4, 14], "x": 14, "y": 4}, - {"matrix": [4, 15], "x": 15, "y": 4}, - - {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25}, - {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25}, - {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25}, - {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25}, - {"matrix": [5, 9], "x": 10, "y": 5}, - {"matrix": [5, 10], "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}, - {"matrix": [5, 15], "x": 15, "y": 5} - ] - } - } -} diff --git a/keyboards/melgeek/mojo75/rev1/config.h b/keyboards/melgeek/mojo75/rev1/config.h new file mode 100644 index 0000000000..010e035e2e --- /dev/null +++ b/keyboards/melgeek/mojo75/rev1/config.h @@ -0,0 +1,20 @@ +/* Copyright 2020 MelGeek + * + * 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 + +#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND +#define IS31FL3741_SDB_PIN A2 diff --git a/keyboards/melgeek/mojo75/rev1/keyboard.json b/keyboards/melgeek/mojo75/rev1/keyboard.json new file mode 100644 index 0000000000..a1b93afb69 --- /dev/null +++ b/keyboards/melgeek/mojo75/rev1/keyboard.json @@ -0,0 +1,176 @@ +{ + "keyboard_name": "MoJo75", + "manufacturer": "MelGeek", + "url": "", + "maintainer": "melgeek001365", + "usb": { + "vid": "0xEDED", + "pid": "0x7075", + "device_version": "0.0.1" + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": 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": ["B12", "B13", "B14", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"], + "rows": ["B11", "B10", "B1", "B0", "A7", "A6"] + }, + "diode_direction": "COL2ROW", + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", + "debounce": 3, + "community_layouts": ["75_ansi"], + "layouts": { + "LAYOUT_75_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}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "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": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1, "w": 2}, + {"matrix": [1, 15], "x": 15, "y": 1}, + + {"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.5, "y": 2}, + {"matrix": [2, 7], "x": 7.5, "y": 2}, + {"matrix": [2, 8], "x": 8.5, "y": 2}, + {"matrix": [2, 9], "x": 9.5, "y": 2}, + {"matrix": [2, 10], "x": 10.5, "y": 2}, + {"matrix": [2, 11], "x": 11.5, "y": 2}, + {"matrix": [2, 12], "x": 12.5, "y": 2}, + {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5}, + {"matrix": [2, 15], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"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}, + {"matrix": [3, 5], "x": 5.75, "y": 3}, + {"matrix": [3, 6], "x": 6.75, "y": 3}, + {"matrix": [3, 7], "x": 7.75, "y": 3}, + {"matrix": [3, 8], "x": 8.75, "y": 3}, + {"matrix": [3, 9], "x": 9.75, "y": 3}, + {"matrix": [3, 10], "x": 10.75, "y": 3}, + {"matrix": [3, 11], "x": 11.75, "y": 3}, + {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25}, + {"matrix": [3, 15], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4}, + {"matrix": [4, 2], "x": 3.25, "y": 4}, + {"matrix": [4, 3], "x": 4.25, "y": 4}, + {"matrix": [4, 4], "x": 5.25, "y": 4}, + {"matrix": [4, 5], "x": 6.25, "y": 4}, + {"matrix": [4, 6], "x": 7.25, "y": 4}, + {"matrix": [4, 7], "x": 8.25, "y": 4}, + {"matrix": [4, 8], "x": 9.25, "y": 4}, + {"matrix": [4, 9], "x": 10.25, "y": 4}, + {"matrix": [4, 10], "x": 11.25, "y": 4}, + {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25}, + {"matrix": [5, 9], "x": 10, "y": 5}, + {"matrix": [5, 10], "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}, + {"matrix": [5, 15], "x": 15, "y": 5} + ] + } + } +} diff --git a/keyboards/melgeek/mojo75/rev1/rules.mk b/keyboards/melgeek/mojo75/rev1/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/melgeek/mojo75/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/melgeek/tegic/config.h b/keyboards/melgeek/tegic/config.h deleted file mode 100755 index 68088ba745..0000000000 --- a/keyboards/melgeek/tegic/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2020 MelGeek - * - * 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 - -#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND -#define IS31FL3741_SDB_PIN B7 diff --git a/keyboards/melgeek/tegic/info.json b/keyboards/melgeek/tegic/info.json deleted file mode 100644 index 0a2e9306f6..0000000000 --- a/keyboards/melgeek/tegic/info.json +++ /dev/null @@ -1,183 +0,0 @@ -{ - "keyboard_name": "tegic", - "manufacturer": "MelGeek", - "url": "", - "maintainer": "melgeek001365", - "usb": { - "vid": "0xEDED", - "pid": "0x0081", - "device_version": "0.0.1" - }, - "build": { - "lto": true - }, - "features": { - "bootmagic": true, - "command": false, - "console": false, - "extrakey": true, - "mousekey": 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_fractal": 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 - }, - "center_point": [84, 24], - "default": { - "animation": "cycle_all" - }, - "driver": "is31fl3741", - "led_flush_limit": 26, - "led_process_limit": 4, - "sleep": true - }, - "matrix_pins": { - "cols": ["B0", "B1", "B2", "B3", "D2", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"], - "rows": ["F0", "F1", "F4", "F5", "F6", "D3"] - }, - "diode_direction": "COL2ROW", - "processor": "atmega32u4", - "bootloader": "atmel-dfu", - "debounce": 3, - "layout_aliases": { - "LAYOUT_tegic_ansi": "LAYOUT" - }, - "layouts": { - "LAYOUT": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1.25, "y": 0}, - {"matrix": [0, 2], "x": 2.25, "y": 0}, - {"matrix": [0, 3], "x": 3.25, "y": 0}, - {"matrix": [0, 4], "x": 4.25, "y": 0}, - {"matrix": [0, 5], "x": 5.25, "y": 0}, - {"matrix": [0, 6], "x": 6.25, "y": 0}, - {"matrix": [0, 7], "x": 7.5, "y": 0}, - {"matrix": [0, 8], "x": 8.5, "y": 0}, - {"matrix": [0, 9], "x": 9.5, "y": 0}, - {"matrix": [0, 10], "x": 10.5, "y": 0}, - {"matrix": [0, 11], "x": 11.5, "y": 0}, - {"matrix": [0, 12], "x": 12.5, "y": 0}, - {"matrix": [0, 13], "x": 14, "y": 0}, - - {"matrix": [0, 14], "x": 15.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": [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.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": [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.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": [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, "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": [4, 8], "x": 9.25, "y": 4.5}, - {"matrix": [4, 9], "x": 10.25, "y": 4.5}, - {"matrix": [4, 10], "x": 11.25, "y": 4.5}, - {"matrix": [4, 11], "x": 12.25, "y": 4.5, "w": 2.25}, - {"matrix": [4, 13], "x": 14.5, "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, 5], "x": 3.75, "y": 5.5, "w": 6.25}, - {"matrix": [5, 9], "x": 10, "y": 5.5, "w": 1.25}, - {"matrix": [5, 10], "x": 11.25, "y": 5.5}, - {"matrix": [5, 11], "x": 12.25, "y": 5.5, "w": 1.25}, - {"matrix": [5, 12], "x": 13.5, "y": 5.5}, - {"matrix": [5, 13], "x": 14.5, "y": 5.5}, - {"matrix": [5, 14], "x": 15.5, "y": 5.5} - ] - } - } -} diff --git a/keyboards/melgeek/tegic/rev1/config.h b/keyboards/melgeek/tegic/rev1/config.h new file mode 100755 index 0000000000..68088ba745 --- /dev/null +++ b/keyboards/melgeek/tegic/rev1/config.h @@ -0,0 +1,20 @@ +/* Copyright 2020 MelGeek + * + * 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 + +#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND +#define IS31FL3741_SDB_PIN B7 diff --git a/keyboards/melgeek/tegic/rev1/keyboard.json b/keyboards/melgeek/tegic/rev1/keyboard.json new file mode 100644 index 0000000000..0a2e9306f6 --- /dev/null +++ b/keyboards/melgeek/tegic/rev1/keyboard.json @@ -0,0 +1,183 @@ +{ + "keyboard_name": "tegic", + "manufacturer": "MelGeek", + "url": "", + "maintainer": "melgeek001365", + "usb": { + "vid": "0xEDED", + "pid": "0x0081", + "device_version": "0.0.1" + }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": 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_fractal": 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 + }, + "center_point": [84, 24], + "default": { + "animation": "cycle_all" + }, + "driver": "is31fl3741", + "led_flush_limit": 26, + "led_process_limit": 4, + "sleep": true + }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "D2", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"], + "rows": ["F0", "F1", "F4", "F5", "F6", "D3"] + }, + "diode_direction": "COL2ROW", + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "debounce": 3, + "layout_aliases": { + "LAYOUT_tegic_ansi": "LAYOUT" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1.25, "y": 0}, + {"matrix": [0, 2], "x": 2.25, "y": 0}, + {"matrix": [0, 3], "x": 3.25, "y": 0}, + {"matrix": [0, 4], "x": 4.25, "y": 0}, + {"matrix": [0, 5], "x": 5.25, "y": 0}, + {"matrix": [0, 6], "x": 6.25, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 10], "x": 10.5, "y": 0}, + {"matrix": [0, 11], "x": 11.5, "y": 0}, + {"matrix": [0, 12], "x": 12.5, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + + {"matrix": [0, 14], "x": 15.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": [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.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": [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.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": [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, "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": [4, 8], "x": 9.25, "y": 4.5}, + {"matrix": [4, 9], "x": 10.25, "y": 4.5}, + {"matrix": [4, 10], "x": 11.25, "y": 4.5}, + {"matrix": [4, 11], "x": 12.25, "y": 4.5, "w": 2.25}, + {"matrix": [4, 13], "x": 14.5, "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, 5], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [5, 9], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [5, 10], "x": 11.25, "y": 5.5}, + {"matrix": [5, 11], "x": 12.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 12], "x": 13.5, "y": 5.5}, + {"matrix": [5, 13], "x": 14.5, "y": 5.5}, + {"matrix": [5, 14], "x": 15.5, "y": 5.5} + ] + } + } +} diff --git a/keyboards/melgeek/tegic/rev1/rules.mk b/keyboards/melgeek/tegic/rev1/rules.mk deleted file mode 100755 index 6e7633bfe0..0000000000 --- a/keyboards/melgeek/tegic/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/melgeek/z70ultra/config.h b/keyboards/melgeek/z70ultra/config.h deleted file mode 100644 index 5d5ce04668..0000000000 --- a/keyboards/melgeek/z70ultra/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2020 MelGeek - * - * 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 - -#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND - -#define DRIVER_INDICATOR_LED_TOTAL 6 diff --git a/keyboards/melgeek/z70ultra/info.json b/keyboards/melgeek/z70ultra/info.json deleted file mode 100644 index de1b1df646..0000000000 --- a/keyboards/melgeek/z70ultra/info.json +++ /dev/null @@ -1,234 +0,0 @@ -{ - "keyboard_name": "Z70Ultra", - "manufacturer": "MelGeek", - "url": "", - "maintainer": "melgeek001365", - "usb": { - "vid": "0xEDED", - "pid": "0x6570", - "device_version": "0.0.1" - }, - "features": { - "bootmagic": true, - "command": false, - "console": false, - "extrakey": true, - "mousekey": 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": ["B11", "B10", "B1", "A10", "B5", "B4", "B3", "A15", "A2", "A1", "A0", "C15", "C14", "C13"], - "rows": ["B12", "B13", "B14", "B15", "A3", "B9"] - }, - "diode_direction": "COL2ROW", - "processor": "STM32F303", - "bootloader": "stm32-dfu", - "board": "QMK_PROTON_C", - "debounce": 3, - "community_layouts": ["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": [5, 6], "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": [5, 7], "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": [5, 9], "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": [5, 8], "x": 14, "y": 3}, - {"matrix": [5, 10], "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, "w": 1.25}, - {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, - {"matrix": [5, 11], "x": 13, "y": 4}, - {"matrix": [5, 12], "x": 14, "y": 4}, - {"matrix": [5, 13], "x": 15, "y": 4} - ] - }, - "LAYOUT_ansi_split_space": { - "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": [5, 6], "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": [5, 7], "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": [5, 9], "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": [5, 8], "x": 14, "y": 3}, - {"matrix": [5, 10], "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": 3}, - {"matrix": [4, 6], "x": 6.75, "y": 4, "w": 3}, - {"matrix": [4, 9], "x": 9.75, "y": 4, "w": 1.5}, - {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, - {"matrix": [5, 11], "x": 13, "y": 4}, - {"matrix": [5, 12], "x": 14, "y": 4}, - {"matrix": [5, 13], "x": 15, "y": 4} - ] - } - } -} diff --git a/keyboards/melgeek/z70ultra/rev1/config.h b/keyboards/melgeek/z70ultra/rev1/config.h new file mode 100644 index 0000000000..5d5ce04668 --- /dev/null +++ b/keyboards/melgeek/z70ultra/rev1/config.h @@ -0,0 +1,21 @@ +/* Copyright 2020 MelGeek + * + * 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 + +#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND + +#define DRIVER_INDICATOR_LED_TOTAL 6 diff --git a/keyboards/melgeek/z70ultra/rev1/keyboard.json b/keyboards/melgeek/z70ultra/rev1/keyboard.json new file mode 100644 index 0000000000..de1b1df646 --- /dev/null +++ b/keyboards/melgeek/z70ultra/rev1/keyboard.json @@ -0,0 +1,234 @@ +{ + "keyboard_name": "Z70Ultra", + "manufacturer": "MelGeek", + "url": "", + "maintainer": "melgeek001365", + "usb": { + "vid": "0xEDED", + "pid": "0x6570", + "device_version": "0.0.1" + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": 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": ["B11", "B10", "B1", "A10", "B5", "B4", "B3", "A15", "A2", "A1", "A0", "C15", "C14", "C13"], + "rows": ["B12", "B13", "B14", "B15", "A3", "B9"] + }, + "diode_direction": "COL2ROW", + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", + "debounce": 3, + "community_layouts": ["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": [5, 6], "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": [5, 7], "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": [5, 9], "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": [5, 8], "x": 14, "y": 3}, + {"matrix": [5, 10], "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, "w": 1.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [5, 11], "x": 13, "y": 4}, + {"matrix": [5, 12], "x": 14, "y": 4}, + {"matrix": [5, 13], "x": 15, "y": 4} + ] + }, + "LAYOUT_ansi_split_space": { + "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": [5, 6], "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": [5, 7], "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": [5, 9], "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": [5, 8], "x": 14, "y": 3}, + {"matrix": [5, 10], "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": 3}, + {"matrix": [4, 6], "x": 6.75, "y": 4, "w": 3}, + {"matrix": [4, 9], "x": 9.75, "y": 4, "w": 1.5}, + {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [5, 11], "x": 13, "y": 4}, + {"matrix": [5, 12], "x": 14, "y": 4}, + {"matrix": [5, 13], "x": 15, "y": 4} + ] + } + } +} diff --git a/keyboards/melgeek/z70ultra/rev1/rev1.c b/keyboards/melgeek/z70ultra/rev1/rev1.c new file mode 100644 index 0000000000..1cb46df643 --- /dev/null +++ b/keyboards/melgeek/z70ultra/rev1/rev1.c @@ -0,0 +1,168 @@ +/* Copyright 2020 MelGeek + * + * 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 . + */ + +#include "quantum.h" + + +#ifdef RGB_MATRIX_ENABLE +const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = { + {0, SW1_CS28, SW1_CS30, SW1_CS29}, /* RGB10 */ + {0, SW2_CS28, SW2_CS30, SW2_CS29}, /* RGB11 */ + {0, SW3_CS28, SW3_CS30, SW3_CS29}, /* RGB12 */ + {0, SW4_CS28, SW4_CS30, SW4_CS29}, /* RGB13 */ + {0, SW5_CS28, SW5_CS30, SW5_CS29}, /* RGB14 */ + {0, SW6_CS28, SW6_CS30, SW6_CS29}, /* RGB15 */ + {0, SW7_CS28, SW7_CS30, SW7_CS29}, /* RGB16 */ + {0, SW8_CS28, SW8_CS30, SW8_CS29}, /* RGB17 */ + {0, SW9_CS28, SW9_CS30, SW9_CS29}, /* RGB18 */ + {0, SW1_CS31, SW1_CS33, SW1_CS32}, /* RGB28 */ + {0, SW2_CS31, SW2_CS33, SW2_CS32}, /* RGB29 */ + {0, SW3_CS31, SW3_CS33, SW3_CS32}, /* RGB30 */ + {0, SW4_CS31, SW4_CS33, SW4_CS32}, /* RGB31 */ + {0, SW5_CS31, SW5_CS33, SW5_CS32}, /* RGB32 */ + {0, SW6_CS31, SW6_CS33, SW6_CS32}, /* RGB33 */ + {0, SW1_CS25, SW1_CS27, SW1_CS26}, /* RGB1 */ + {0, SW2_CS25, SW2_CS27, SW2_CS26}, /* RGB2 */ + {0, SW3_CS25, SW3_CS27, SW3_CS26}, /* RGB3 */ + {0, SW4_CS25, SW4_CS27, SW4_CS26}, /* RGB4 */ + {0, SW5_CS25, SW5_CS27, SW5_CS26}, /* RGB5 */ + {0, SW6_CS25, SW6_CS27, SW6_CS26}, /* RGB6 */ + {0, SW7_CS25, SW7_CS27, SW7_CS26}, /* RGB7 */ + {0, SW8_CS25, SW8_CS27, SW8_CS26}, /* RGB8 */ + {0, SW9_CS25, SW9_CS27, SW9_CS26}, /* RGB9 */ + {0, SW1_CS34, SW1_CS36, SW1_CS35}, /* RGB46 */ + {0, SW2_CS34, SW2_CS36, SW2_CS35}, /* RGB47 */ + {0, SW3_CS34, SW3_CS36, SW3_CS35}, /* RGB48 */ + {0, SW4_CS34, SW4_CS36, SW4_CS35}, /* RGB49 */ + {0, SW5_CS34, SW5_CS36, SW5_CS35}, /* RGB50 */ + {0, SW7_CS31, SW7_CS33, SW7_CS32}, /* RGB34 */ + {0, SW1_CS22, SW1_CS24, SW1_CS23}, /* RGB37 */ + {0, SW2_CS22, SW2_CS24, SW2_CS23}, /* RGB38 */ + {0, SW3_CS22, SW3_CS24, SW3_CS23}, /* RGB39 */ + {0, SW4_CS22, SW4_CS24, SW4_CS23}, /* RGB40 */ + {0, SW5_CS22, SW5_CS24, SW5_CS23}, /* RGB41 */ + {0, SW6_CS22, SW6_CS24, SW6_CS23}, /* RGB42 */ + {0, SW7_CS22, SW7_CS24, SW7_CS23}, /* RGB43 */ + {0, SW8_CS22, SW8_CS24, SW8_CS23}, /* RGB44 */ + {0, SW9_CS22, SW9_CS24, SW9_CS23}, /* RGB45 */ + {0, SW9_CS34, SW9_CS36, SW9_CS35}, /* RGB54 */ + {0, SW8_CS34, SW8_CS36, SW8_CS35}, /* RGB53 */ + {0, SW7_CS34, SW7_CS36, SW7_CS35}, /* RGB52 */ + {0, SW6_CS34, SW6_CS36, SW6_CS35}, /* RGB51 */ + {0, SW8_CS31, SW8_CS33, SW8_CS32}, /* RGB35 */ + {0, SW2_CS19, SW2_CS21, SW2_CS20}, /* RGB56 */ + {0, SW4_CS19, SW4_CS21, SW4_CS20}, /* RGB60 */ + {0, SW5_CS19, SW5_CS21, SW5_CS20}, /* RGB59 */ + {0, SW6_CS19, SW6_CS21, SW6_CS20}, /* RGB60 */ + {0, SW7_CS19, SW7_CS21, SW7_CS20}, /* RGB61 */ + {0, SW8_CS19, SW8_CS21, SW8_CS20}, /* RGB62 */ + {0, SW9_CS19, SW9_CS21, SW9_CS20}, /* RGB63 */ + {0, SW3_CS19, SW3_CS21, SW3_CS20}, /* RGB57 */ + {0, SW1_CS19, SW1_CS21, SW1_CS20}, /* RGB55 */ + {0, SW5_CS37, SW5_CS39, SW5_CS38}, /* RGB23 */ + {0, SW6_CS37, SW6_CS39, SW6_CS38}, /* RGB24 */ + {0, SW7_CS37, SW7_CS39, SW7_CS38}, /* RGB25 */ + {0, SW8_CS37, SW8_CS39, SW8_CS38}, /* RGB26 */ + {0, SW9_CS31, SW9_CS33, SW9_CS32}, /* RGB36 */ + + {0, SW1_CS6, SW1_CS8, SW1_CS7}, /* RGB64 */ + {0, SW3_CS6, SW3_CS8, SW3_CS7}, /* RGB66 */ + {0, SW4_CS6, SW4_CS8, SW4_CS7}, /* RGB67 */ + {0, SW5_CS6, SW5_CS8, SW5_CS7}, /* RGB69 */ + {0, SW6_CS6, SW6_CS8, SW6_CS7}, /* RGB70 */ + {0, SW2_CS6, SW2_CS8, SW2_CS7}, /* RGB65 */ + + {0, SW1_CS37, SW1_CS39, SW1_CS38}, /* RGB19 */ + {0, SW2_CS37, SW2_CS39, SW2_CS38}, /* RGB20 */ + {0, SW3_CS37, SW3_CS39, SW3_CS38}, /* RGB21 */ + {0, SW4_CS37, SW4_CS39, SW4_CS38}, /* RGB22 */ + {0, SW9_CS37, SW9_CS39, SW9_CS38}, /* RGB27 */ +}; +led_config_t g_led_config = { + { + /* C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C13 */ + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, }, /* R0 */ + { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, }, /* R1 */ + { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, NO_LED, 42, }, /* R2 */ + { 44, NO_LED, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, NO_LED, }, /* R3 */ + { 58, 59, 60, NO_LED, 61, 62, 63, NO_LED, NO_LED, 64, 65, NO_LED, NO_LED, NO_LED, }, /* R4 */ + { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, 14, 29, 56, 43, 57, 66, 67, 68, }, /* R5 */ + }, { + {0, 0}, {16, 0}, {32, 0}, {48, 0}, {64, 0}, {80, 0}, {96, 0}, {112, 0}, {128, 0}, {144, 0}, {160, 0}, {176, 0}, {192, 0}, {208, 0}, + {0, 16}, {16, 16}, {32, 16}, {48, 16}, {64, 16}, {80, 16}, {96, 16}, {112, 16}, {128, 16}, {144, 16}, {160, 16}, {176, 16}, {192, 16}, {208, 16}, + {0, 32}, {16, 32}, {32, 32}, {48, 32}, {64, 32}, {80, 32}, {96, 32}, {112, 32}, {128, 32}, {144, 32}, {160, 32}, {176, 32}, {192, 32}, + {0, 48}, {16, 48}, {32, 48}, {48, 48}, {64, 48}, {80, 48}, {96, 48}, {112, 48}, {128, 48}, {144, 48}, {160, 48}, {176, 48}, + {0, 64}, {16, 64}, {32, 64}, {48, 64}, {64, 64}, {80, 64}, {96, 64}, {112, 64}, + {0, 80}, {16, 80}, {32, 80}, {48, 80}, {64, 80}, {80, 80}, {96, 80}, {112, 80}, + }, { + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, + } +}; + +const is31fl3741_led_t g_is31_indicator_leds[6] = { + {0, SW1_CS5, SW1_CS3, SW1_CS4}, /* RGB71 */ + {0, SW2_CS5, SW2_CS3, SW2_CS4}, /* RGB72 */ + {0, SW3_CS5, SW3_CS3, SW3_CS4}, /* RGB73 */ + {0, SW4_CS5, SW4_CS3, SW4_CS4}, /* RGB74 */ + {0, SW5_CS5, SW5_CS3, SW5_CS4}, /* RGB75 */ + {0, SW6_CS5, SW6_CS3, SW6_CS4}, /* RGB76 */ +}; + +bool led_update_kb(led_t led_state) { + if (led_update_user(led_state)) { + if (led_state.caps_lock) { + is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[2], 0xff, 0x00, 0x00); + is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[3], 0xff, 0x00, 0x00); + } else { + is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[2], 0x00, 0x00, 0x00); + is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[3], 0x00, 0x00, 0x00); + } + + if (led_state.num_lock) { + is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[1], 0x00, 0xff, 0x00); + is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[4], 0x00, 0xff, 0x00); + } else { + is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[1], 0x00, 0x00, 0x00); + is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[4], 0x00, 0x00, 0x00); + } + + if (led_state.scroll_lock) { + is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[0], 0x00, 0x00, 0xff); + is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[5], 0x00, 0x00, 0xff); + } else { + is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[0], 0x00, 0x00, 0x00); + is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[5], 0x00, 0x00, 0x00); + } + } + return true; +} + +void matrix_init_kb(void) { + for (int i = 0; i < DRIVER_INDICATOR_LED_TOTAL; ++i) { + is31fl3741_led_t led = g_is31_indicator_leds[i]; + is31fl3741_set_scaling_registers(&led, 0xFF, 0xFF, 0xFF); + } + + is31fl3741_update_led_control_registers(0); + + matrix_init_user(); +} +#endif diff --git a/keyboards/melgeek/z70ultra/rev1/rules.mk b/keyboards/melgeek/z70ultra/rev1/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/melgeek/z70ultra/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/melgeek/z70ultra/z70ultra.c b/keyboards/melgeek/z70ultra/z70ultra.c deleted file mode 100644 index 1cb46df643..0000000000 --- a/keyboards/melgeek/z70ultra/z70ultra.c +++ /dev/null @@ -1,168 +0,0 @@ -/* Copyright 2020 MelGeek - * - * 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 . - */ - -#include "quantum.h" - - -#ifdef RGB_MATRIX_ENABLE -const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = { - {0, SW1_CS28, SW1_CS30, SW1_CS29}, /* RGB10 */ - {0, SW2_CS28, SW2_CS30, SW2_CS29}, /* RGB11 */ - {0, SW3_CS28, SW3_CS30, SW3_CS29}, /* RGB12 */ - {0, SW4_CS28, SW4_CS30, SW4_CS29}, /* RGB13 */ - {0, SW5_CS28, SW5_CS30, SW5_CS29}, /* RGB14 */ - {0, SW6_CS28, SW6_CS30, SW6_CS29}, /* RGB15 */ - {0, SW7_CS28, SW7_CS30, SW7_CS29}, /* RGB16 */ - {0, SW8_CS28, SW8_CS30, SW8_CS29}, /* RGB17 */ - {0, SW9_CS28, SW9_CS30, SW9_CS29}, /* RGB18 */ - {0, SW1_CS31, SW1_CS33, SW1_CS32}, /* RGB28 */ - {0, SW2_CS31, SW2_CS33, SW2_CS32}, /* RGB29 */ - {0, SW3_CS31, SW3_CS33, SW3_CS32}, /* RGB30 */ - {0, SW4_CS31, SW4_CS33, SW4_CS32}, /* RGB31 */ - {0, SW5_CS31, SW5_CS33, SW5_CS32}, /* RGB32 */ - {0, SW6_CS31, SW6_CS33, SW6_CS32}, /* RGB33 */ - {0, SW1_CS25, SW1_CS27, SW1_CS26}, /* RGB1 */ - {0, SW2_CS25, SW2_CS27, SW2_CS26}, /* RGB2 */ - {0, SW3_CS25, SW3_CS27, SW3_CS26}, /* RGB3 */ - {0, SW4_CS25, SW4_CS27, SW4_CS26}, /* RGB4 */ - {0, SW5_CS25, SW5_CS27, SW5_CS26}, /* RGB5 */ - {0, SW6_CS25, SW6_CS27, SW6_CS26}, /* RGB6 */ - {0, SW7_CS25, SW7_CS27, SW7_CS26}, /* RGB7 */ - {0, SW8_CS25, SW8_CS27, SW8_CS26}, /* RGB8 */ - {0, SW9_CS25, SW9_CS27, SW9_CS26}, /* RGB9 */ - {0, SW1_CS34, SW1_CS36, SW1_CS35}, /* RGB46 */ - {0, SW2_CS34, SW2_CS36, SW2_CS35}, /* RGB47 */ - {0, SW3_CS34, SW3_CS36, SW3_CS35}, /* RGB48 */ - {0, SW4_CS34, SW4_CS36, SW4_CS35}, /* RGB49 */ - {0, SW5_CS34, SW5_CS36, SW5_CS35}, /* RGB50 */ - {0, SW7_CS31, SW7_CS33, SW7_CS32}, /* RGB34 */ - {0, SW1_CS22, SW1_CS24, SW1_CS23}, /* RGB37 */ - {0, SW2_CS22, SW2_CS24, SW2_CS23}, /* RGB38 */ - {0, SW3_CS22, SW3_CS24, SW3_CS23}, /* RGB39 */ - {0, SW4_CS22, SW4_CS24, SW4_CS23}, /* RGB40 */ - {0, SW5_CS22, SW5_CS24, SW5_CS23}, /* RGB41 */ - {0, SW6_CS22, SW6_CS24, SW6_CS23}, /* RGB42 */ - {0, SW7_CS22, SW7_CS24, SW7_CS23}, /* RGB43 */ - {0, SW8_CS22, SW8_CS24, SW8_CS23}, /* RGB44 */ - {0, SW9_CS22, SW9_CS24, SW9_CS23}, /* RGB45 */ - {0, SW9_CS34, SW9_CS36, SW9_CS35}, /* RGB54 */ - {0, SW8_CS34, SW8_CS36, SW8_CS35}, /* RGB53 */ - {0, SW7_CS34, SW7_CS36, SW7_CS35}, /* RGB52 */ - {0, SW6_CS34, SW6_CS36, SW6_CS35}, /* RGB51 */ - {0, SW8_CS31, SW8_CS33, SW8_CS32}, /* RGB35 */ - {0, SW2_CS19, SW2_CS21, SW2_CS20}, /* RGB56 */ - {0, SW4_CS19, SW4_CS21, SW4_CS20}, /* RGB60 */ - {0, SW5_CS19, SW5_CS21, SW5_CS20}, /* RGB59 */ - {0, SW6_CS19, SW6_CS21, SW6_CS20}, /* RGB60 */ - {0, SW7_CS19, SW7_CS21, SW7_CS20}, /* RGB61 */ - {0, SW8_CS19, SW8_CS21, SW8_CS20}, /* RGB62 */ - {0, SW9_CS19, SW9_CS21, SW9_CS20}, /* RGB63 */ - {0, SW3_CS19, SW3_CS21, SW3_CS20}, /* RGB57 */ - {0, SW1_CS19, SW1_CS21, SW1_CS20}, /* RGB55 */ - {0, SW5_CS37, SW5_CS39, SW5_CS38}, /* RGB23 */ - {0, SW6_CS37, SW6_CS39, SW6_CS38}, /* RGB24 */ - {0, SW7_CS37, SW7_CS39, SW7_CS38}, /* RGB25 */ - {0, SW8_CS37, SW8_CS39, SW8_CS38}, /* RGB26 */ - {0, SW9_CS31, SW9_CS33, SW9_CS32}, /* RGB36 */ - - {0, SW1_CS6, SW1_CS8, SW1_CS7}, /* RGB64 */ - {0, SW3_CS6, SW3_CS8, SW3_CS7}, /* RGB66 */ - {0, SW4_CS6, SW4_CS8, SW4_CS7}, /* RGB67 */ - {0, SW5_CS6, SW5_CS8, SW5_CS7}, /* RGB69 */ - {0, SW6_CS6, SW6_CS8, SW6_CS7}, /* RGB70 */ - {0, SW2_CS6, SW2_CS8, SW2_CS7}, /* RGB65 */ - - {0, SW1_CS37, SW1_CS39, SW1_CS38}, /* RGB19 */ - {0, SW2_CS37, SW2_CS39, SW2_CS38}, /* RGB20 */ - {0, SW3_CS37, SW3_CS39, SW3_CS38}, /* RGB21 */ - {0, SW4_CS37, SW4_CS39, SW4_CS38}, /* RGB22 */ - {0, SW9_CS37, SW9_CS39, SW9_CS38}, /* RGB27 */ -}; -led_config_t g_led_config = { - { - /* C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C13 */ - { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, }, /* R0 */ - { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, }, /* R1 */ - { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, NO_LED, 42, }, /* R2 */ - { 44, NO_LED, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, NO_LED, }, /* R3 */ - { 58, 59, 60, NO_LED, 61, 62, 63, NO_LED, NO_LED, 64, 65, NO_LED, NO_LED, NO_LED, }, /* R4 */ - { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, 14, 29, 56, 43, 57, 66, 67, 68, }, /* R5 */ - }, { - {0, 0}, {16, 0}, {32, 0}, {48, 0}, {64, 0}, {80, 0}, {96, 0}, {112, 0}, {128, 0}, {144, 0}, {160, 0}, {176, 0}, {192, 0}, {208, 0}, - {0, 16}, {16, 16}, {32, 16}, {48, 16}, {64, 16}, {80, 16}, {96, 16}, {112, 16}, {128, 16}, {144, 16}, {160, 16}, {176, 16}, {192, 16}, {208, 16}, - {0, 32}, {16, 32}, {32, 32}, {48, 32}, {64, 32}, {80, 32}, {96, 32}, {112, 32}, {128, 32}, {144, 32}, {160, 32}, {176, 32}, {192, 32}, - {0, 48}, {16, 48}, {32, 48}, {48, 48}, {64, 48}, {80, 48}, {96, 48}, {112, 48}, {128, 48}, {144, 48}, {160, 48}, {176, 48}, - {0, 64}, {16, 64}, {32, 64}, {48, 64}, {64, 64}, {80, 64}, {96, 64}, {112, 64}, - {0, 80}, {16, 80}, {32, 80}, {48, 80}, {64, 80}, {80, 80}, {96, 80}, {112, 80}, - }, { - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, - } -}; - -const is31fl3741_led_t g_is31_indicator_leds[6] = { - {0, SW1_CS5, SW1_CS3, SW1_CS4}, /* RGB71 */ - {0, SW2_CS5, SW2_CS3, SW2_CS4}, /* RGB72 */ - {0, SW3_CS5, SW3_CS3, SW3_CS4}, /* RGB73 */ - {0, SW4_CS5, SW4_CS3, SW4_CS4}, /* RGB74 */ - {0, SW5_CS5, SW5_CS3, SW5_CS4}, /* RGB75 */ - {0, SW6_CS5, SW6_CS3, SW6_CS4}, /* RGB76 */ -}; - -bool led_update_kb(led_t led_state) { - if (led_update_user(led_state)) { - if (led_state.caps_lock) { - is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[2], 0xff, 0x00, 0x00); - is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[3], 0xff, 0x00, 0x00); - } else { - is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[2], 0x00, 0x00, 0x00); - is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[3], 0x00, 0x00, 0x00); - } - - if (led_state.num_lock) { - is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[1], 0x00, 0xff, 0x00); - is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[4], 0x00, 0xff, 0x00); - } else { - is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[1], 0x00, 0x00, 0x00); - is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[4], 0x00, 0x00, 0x00); - } - - if (led_state.scroll_lock) { - is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[0], 0x00, 0x00, 0xff); - is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[5], 0x00, 0x00, 0xff); - } else { - is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[0], 0x00, 0x00, 0x00); - is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[5], 0x00, 0x00, 0x00); - } - } - return true; -} - -void matrix_init_kb(void) { - for (int i = 0; i < DRIVER_INDICATOR_LED_TOTAL; ++i) { - is31fl3741_led_t led = g_is31_indicator_leds[i]; - is31fl3741_set_scaling_registers(&led, 0xFF, 0xFF, 0xFF); - } - - is31fl3741_update_led_control_registers(0); - - matrix_init_user(); -} -#endif diff --git a/keyboards/miiiw/blackio83/blackio83.c b/keyboards/miiiw/blackio83/blackio83.c deleted file mode 100644 index 8c80ebd73c..0000000000 --- a/keyboards/miiiw/blackio83/blackio83.c +++ /dev/null @@ -1,192 +0,0 @@ -/* Copyright 2023 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 . - */ - -#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/blackio83.h b/keyboards/miiiw/blackio83/blackio83.h deleted file mode 100644 index ea371443e3..0000000000 --- a/keyboards/miiiw/blackio83/blackio83.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright 2023 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 . - */ - -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -enum custom_keycodes { - DEV_BT1 = QK_KB, - DEV_BT2, - DEV_BT3, - DEV_RF24, - ALT_TAB, - RGB_RST, -}; \ No newline at end of file diff --git a/keyboards/miiiw/blackio83/config.h b/keyboards/miiiw/blackio83/config.h deleted file mode 100644 index 055e8e3579..0000000000 --- a/keyboards/miiiw/blackio83/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2023 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 . - */ - -#pragma once - -// EEPROM i2c chip -#define EEPROM_I2C_24LC256 diff --git a/keyboards/miiiw/blackio83/halconf.h b/keyboards/miiiw/blackio83/halconf.h deleted file mode 100644 index 037108a392..0000000000 --- a/keyboards/miiiw/blackio83/halconf.h +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright 2020 QMK - * - * 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 . - */ - -/* - * This file was auto-generated by: - * `qmk chibios-confmigrate -i keyboards/geekboards/macropad_v2/halconf.h -r platforms/chibios/common/configs/halconf.h` - */ - -#pragma once - -#define HAL_USE_SERIAL TRUE - -#define HAL_USE_I2C TRUE - -// This enables interrupt-driven mode -#define PAL_USE_WAIT TRUE -#define USB_USE_WAIT TRUE - -#include_next diff --git a/keyboards/miiiw/blackio83/info.json b/keyboards/miiiw/blackio83/info.json deleted file mode 100644 index d3fb31d109..0000000000 --- a/keyboards/miiiw/blackio83/info.json +++ /dev/null @@ -1,267 +0,0 @@ -{ - "manufacturer": "MIIIW", - "keyboard_name": "MIIIW BlackIO 83", - "maintainer": "ArthurCyy", - "bootloader": "stm32-dfu", - "debounce": 3, - "diode_direction": "COL2ROW", - "features": { - "bootmagic": true, - "command": false, - "console": false, - "deferred_exec": true, - "dip_switch": true, - "extrakey": true, - "mousekey": true, - "nkro": true, - "rgb_matrix": true - }, - "indicators": { - "caps_lock": "B2", - "num_lock": "B14" - }, - "matrix_pins": { - "cols": ["H0", "H1", "H2", "H3", "H4", "H5", "H6", "H7", "H8", "H9", "H10", "H11", "H12", "H13", "H14", "H15"], - "rows": ["A7", "A6", "A5", "A4", "A3", "A2"] - }, - "dip_switch": { - "pins": ["B0", "B1", "B8", "B12"] - }, - "processor": "STM32F072", - "rgb_matrix": { - "animations": { - "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 - }, - "center_point": [62, 42], - "default": { - "animation": "solid_color" - }, - "driver": "ws2812", - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, - {"matrix": [0, 2], "x": 10, "y": 0, "flags": 4}, - {"matrix": [0, 3], "x": 18, "y": 0, "flags": 4}, - {"matrix": [0, 4], "x": 26, "y": 0, "flags": 4}, - {"matrix": [0, 5], "x": 34, "y": 0, "flags": 4}, - {"matrix": [0, 6], "x": 44, "y": 0, "flags": 4}, - {"matrix": [0, 7], "x": 52, "y": 0, "flags": 4}, - {"matrix": [0, 8], "x": 60, "y": 0, "flags": 4}, - {"matrix": [0, 9], "x": 68, "y": 0, "flags": 4}, - {"matrix": [0, 10], "x": 78, "y": 0, "flags": 4}, - {"matrix": [0, 11], "x": 86, "y": 0, "flags": 4}, - {"matrix": [0, 12], "x": 94, "y": 0, "flags": 4}, - {"matrix": [0, 13], "x": 102, "y": 0, "flags": 4}, - {"matrix": [0, 14], "x": 112, "y": 0, "flags": 4}, - {"matrix": [0, 15], "x": 124, "y": 0, "flags": 4}, - {"matrix": [1, 15], "x": 124, "y": 20, "flags": 4}, - {"matrix": [1, 13], "x": 108, "y": 20, "flags": 4}, - {"matrix": [1, 12], "x": 96, "y": 20, "flags": 4}, - {"matrix": [1, 11], "x": 88, "y": 20, "flags": 4}, - {"matrix": [1, 10], "x": 80, "y": 20, "flags": 4}, - {"matrix": [1, 9], "x": 72, "y": 20, "flags": 4}, - {"matrix": [1, 8], "x": 64, "y": 20, "flags": 4}, - {"matrix": [1, 7], "x": 56, "y": 20, "flags": 4}, - {"matrix": [1, 6], "x": 48, "y": 20, "flags": 4}, - {"matrix": [1, 5], "x": 40, "y": 20, "flags": 4}, - {"matrix": [1, 4], "x": 32, "y": 20, "flags": 4}, - {"matrix": [1, 3], "x": 24, "y": 20, "flags": 4}, - {"matrix": [1, 2], "x": 16, "y": 20, "flags": 4}, - {"matrix": [1, 1], "x": 8, "y": 20, "flags": 4}, - {"matrix": [1, 0], "x": 0, "y": 20, "flags": 4}, - {"matrix": [2, 0], "x": 2, "y": 36, "flags": 4}, - {"matrix": [2, 1], "x": 12, "y": 36, "flags": 4}, - {"matrix": [2, 2], "x": 20, "y": 36, "flags": 4}, - {"matrix": [2, 3], "x": 28, "y": 36, "flags": 4}, - {"matrix": [2, 4], "x": 36, "y": 36, "flags": 4}, - {"matrix": [2, 5], "x": 44, "y": 36, "flags": 4}, - {"matrix": [2, 6], "x": 52, "y": 36, "flags": 4}, - {"matrix": [2, 7], "x": 60, "y": 36, "flags": 4}, - {"matrix": [2, 8], "x": 68, "y": 36, "flags": 4}, - {"matrix": [2, 9], "x": 76, "y": 36, "flags": 4}, - {"matrix": [2, 10], "x": 84, "y": 36, "flags": 4}, - {"matrix": [2, 11], "x": 92, "y": 36, "flags": 4}, - {"matrix": [2, 12], "x": 100, "y": 36, "flags": 4}, - {"matrix": [2, 13], "x": 110, "y": 36, "flags": 4}, - {"matrix": [2, 15], "x": 124, "y": 36, "flags": 4}, - {"matrix": [3, 15], "x": 124, "y": 52, "flags": 4}, - {"matrix": [3, 12], "x": 107, "y": 52, "flags": 4}, - {"matrix": [3, 11], "x": 94, "y": 52, "flags": 4}, - {"matrix": [3, 10], "x": 86, "y": 52, "flags": 4}, - {"matrix": [3, 9], "x": 78, "y": 52, "flags": 4}, - {"matrix": [3, 8], "x": 70, "y": 52, "flags": 4}, - {"matrix": [3, 7], "x": 62, "y": 52, "flags": 4}, - {"matrix": [3, 6], "x": 54, "y": 52, "flags": 4}, - {"matrix": [3, 5], "x": 46, "y": 52, "flags": 4}, - {"matrix": [3, 4], "x": 38, "y": 52, "flags": 4}, - {"matrix": [3, 3], "x": 30, "y": 52, "flags": 4}, - {"matrix": [3, 2], "x": 22, "y": 52, "flags": 4}, - {"matrix": [3, 1], "x": 14, "y": 52, "flags": 4}, - {"matrix": [3, 0], "x": 3, "y": 52, "flags": 4}, - {"matrix": [4, 0], "x": 5, "y": 68, "flags": 4}, - {"matrix": [4, 1], "x": 18, "y": 68, "flags": 4}, - {"matrix": [4, 2], "x": 26, "y": 68, "flags": 4}, - {"matrix": [4, 3], "x": 34, "y": 68, "flags": 4}, - {"matrix": [4, 4], "x": 42, "y": 68, "flags": 4}, - {"matrix": [4, 5], "x": 50, "y": 68, "flags": 4}, - {"matrix": [4, 6], "x": 58, "y": 68, "flags": 4}, - {"matrix": [4, 7], "x": 66, "y": 68, "flags": 4}, - {"matrix": [4, 8], "x": 74, "y": 68, "flags": 4}, - {"matrix": [4, 9], "x": 82, "y": 68, "flags": 4}, - {"matrix": [4, 10], "x": 90, "y": 68, "flags": 4}, - {"matrix": [4, 11], "x": 104, "y": 68, "flags": 4}, - {"matrix": [4, 13], "x": 114, "y": 68, "flags": 4}, - {"matrix": [4, 15], "x": 124, "y": 68, "flags": 4}, - {"matrix": [5, 14], "x": 122, "y": 84, "flags": 4}, - {"matrix": [5, 13], "x": 114, "y": 84, "flags": 4}, - {"matrix": [5, 12], "x": 106, "y": 84, "flags": 4}, - {"matrix": [5, 10], "x": 96, "y": 84, "flags": 4}, - {"matrix": [5, 9], "x": 88, "y": 84, "flags": 4}, - {"matrix": [5, 8], "x": 80, "y": 84, "flags": 4}, - {"matrix": [5, 5], "x": 50, "y": 84, "flags": 4}, - {"matrix": [5, 2], "x": 20, "y": 88, "flags": 4}, - {"matrix": [5, 1], "x": 10, "y": 88, "flags": 4}, - {"matrix": [5, 0], "x": 1, "y": 88, "flags": 4} - ], - "max_brightness": 160 - }, - "url": "https://github.com/ArthurCyy", - "usb": { - "device_version": "0.0.1", - "force_nkro": true, - "pid": "0x83A1", - "vid": "0x3044" - }, - "ws2812": { - "pin": "B15" - }, - "layouts": { - "LAYOUT": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 2], "x": 1.25, "y": 0}, - {"matrix": [0, 3], "x": 2.25, "y": 0}, - {"matrix": [0, 4], "x": 3.25, "y": 0}, - {"matrix": [0, 5], "x": 4.25, "y": 0}, - {"matrix": [0, 6], "x": 5.5, "y": 0}, - {"matrix": [0, 7], "x": 6.5, "y": 0}, - {"matrix": [0, 8], "x": 7.5, "y": 0}, - {"matrix": [0, 9], "x": 8.5, "y": 0}, - {"matrix": [0, 10], "x": 9.75, "y": 0}, - {"matrix": [0, 11], "x": 10.75, "y": 0}, - {"matrix": [0, 12], "x": 11.75, "y": 0}, - {"matrix": [0, 13], "x": 12.75, "y": 0}, - {"matrix": [0, 14], "x": 14, "y": 0}, - {"matrix": [0, 15], "x": 15.25, "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": [1, 12], "x": 12, "y": 1}, - {"matrix": [1, 13], "x": 13, "y": 1, "w": 2}, - {"matrix": [1, 15], "x": 15.25, "y": 1}, - {"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.5, "y": 2}, - {"matrix": [2, 7], "x": 7.5, "y": 2}, - {"matrix": [2, 8], "x": 8.5, "y": 2}, - {"matrix": [2, 9], "x": 9.5, "y": 2}, - {"matrix": [2, 10], "x": 10.5, "y": 2}, - {"matrix": [2, 11], "x": 11.5, "y": 2}, - {"matrix": [2, 12], "x": 12.5, "y": 2}, - {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5}, - {"matrix": [2, 15], "x": 15.25, "y": 2}, - {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, - {"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}, - {"matrix": [3, 5], "x": 5.75, "y": 3}, - {"matrix": [3, 6], "x": 6.75, "y": 3}, - {"matrix": [3, 7], "x": 7.75, "y": 3}, - {"matrix": [3, 8], "x": 8.75, "y": 3}, - {"matrix": [3, 9], "x": 9.75, "y": 3}, - {"matrix": [3, 10], "x": 10.75, "y": 3}, - {"matrix": [3, 11], "x": 11.75, "y": 3}, - {"matrix": [3, 12], "x": 12.75, "y": 3, "w": 2.25}, - {"matrix": [3, 15], "x": 15.25, "y": 3}, - {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25}, - {"matrix": [4, 1], "x": 2.25, "y": 4}, - {"matrix": [4, 2], "x": 3.25, "y": 4}, - {"matrix": [4, 3], "x": 4.25, "y": 4}, - {"matrix": [4, 4], "x": 5.25, "y": 4}, - {"matrix": [4, 5], "x": 6.25, "y": 4}, - {"matrix": [4, 6], "x": 7.25, "y": 4}, - {"matrix": [4, 7], "x": 8.25, "y": 4}, - {"matrix": [4, 8], "x": 9.25, "y": 4}, - {"matrix": [4, 9], "x": 10.25, "y": 4}, - {"matrix": [4, 10], "x": 11.25, "y": 4}, - {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.75}, - {"matrix": [4, 13], "x": 14.25, "y": 4.5}, - {"matrix": [4, 15], "x": 15.25, "y": 4.25}, - {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25}, - {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25}, - {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25}, - {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25}, - {"matrix": [5, 8], "x": 10, "y": 5}, - {"matrix": [5, 9], "x": 11, "y": 5}, - {"matrix": [5, 10], "x": 12, "y": 5}, - {"matrix": [5, 12], "x": 13.25, "y": 5.5}, - {"matrix": [5, 13], "x": 14.25, "y": 5.5}, - {"matrix": [5, 14], "x": 15.25, "y": 5.5} - ] - } - } -} diff --git a/keyboards/miiiw/blackio83/matrix.c b/keyboards/miiiw/blackio83/matrix.c deleted file mode 100644 index ab252f919b..0000000000 --- a/keyboards/miiiw/blackio83/matrix.c +++ /dev/null @@ -1,139 +0,0 @@ -/* Copyright 2023 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 . - */ - -#include "matrix.h" -#include "wait.h" -#include "common/shift_register.h" - -static uint8_t read_rows(void); -static void init_cols(void); -static void select_col(uint8_t col); -static void unselect_col(uint8_t col); -static void unselect_cols(void); - -static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; -static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; - -#ifdef DIP_SWITCH_PINS -# define NUMBER_OF_DIP_SWITCHES (sizeof(dip_switch_pad) / sizeof(pin_t)) -static pin_t dip_switch_pad[] = DIP_SWITCH_PINS; -#endif - -void matrix_init_custom(void) { - for (uint8_t row = 0; row < MATRIX_ROWS; row++) { - setPinInputLow(row_pins[row]); - } - - shift_init(); - init_cols(); -} - -bool matrix_scan_custom(matrix_row_t current_matrix[]) { - bool changed = false; - - for (uint8_t col = 0; col < MATRIX_COLS; col++) { - select_col(col); - waitInputPinDelay(); - uint8_t rows = read_rows(); - for (uint8_t row = 0; row < MATRIX_ROWS; row++) { - bool prev_bit = ((uint32_t)(current_matrix[row]) & (matrix_row_t)(1UL << col)) ? 1 : 0; - bool curr_bit = ((uint32_t)rows & (uint32_t)(1UL << row)) ? 1 : 0; - if (prev_bit != curr_bit) { - current_matrix[row] = (uint32_t)(current_matrix[row]) ^ (uint32_t)(1UL << col); - changed = true; - } - } - unselect_col(col); - } - - return changed; -} - -void matrix_power_up(void) { - for (uint8_t row = 0; row < MATRIX_ROWS; row++) { - palDisableLineEvent(row_pins[row]); - setPinInputLow(row_pins[row]); - } - init_cols(); -#ifdef DIP_SWITCH_PINS - for (uint8_t i = 1; i < NUMBER_OF_DIP_SWITCHES; i++) { - setPinInputHigh(dip_switch_pad[i]); - } -#endif -} - -void matrix_power_down(void) { - unselect_cols(); - for (uint8_t row = 0; row < MATRIX_ROWS; row++) { - setPinInputLow(row_pins[row]); - palEnableLineEvent(row_pins[row], PAL_EVENT_MODE_RISING_EDGE); - } -#ifdef DIP_SWITCH_PINS - for (uint8_t i = 1; i < NUMBER_OF_DIP_SWITCHES; i++) { - setPinInputLow(dip_switch_pad[i]); - } -#endif -} - -static uint8_t read_rows(void) { - uint8_t row_value = 0; - for(uint8_t row = 0; row < MATRIX_ROWS; row++) { - row_value |= (readPin(row_pins[row]) << row); - } - return row_value; -} - -static void init_cols(void) { - shift_writeAll(0); - for(uint8_t col = 0; col < MATRIX_COLS; col++) { - if(col_pins[col] < H0) { - setPinOutput(col_pins[col]); - writePinLow(col_pins[col]); - } - } -} - -static void select_col(uint8_t col) { - if(col_pins[col] < H0){ - writePinHigh(col_pins[col]); - waitInputPinDelay(); - waitInputPinDelay(); - waitInputPinDelay(); - waitInputPinDelay(); - waitInputPinDelay(); - waitInputPinDelay(); - }else{ - shift_writePin(col_pins[col], 1); - } -} - -static void unselect_col(uint8_t col) { - if(col_pins[col] < H0){ - writePinLow(col_pins[col]); - }else{ - shift_writePin(col_pins[col], 0); - } -} - -static void unselect_cols(void) { - shift_writeAll(1); - for(uint8_t col = 0; col < MATRIX_COLS; col++) { - if(col_pins[col] < H0) { - setPinOutput(col_pins[col]); - writePinHigh(col_pins[col]); - } - } -} diff --git a/keyboards/miiiw/blackio83/mcuconf.h b/keyboards/miiiw/blackio83/mcuconf.h deleted file mode 100644 index 89038eba82..0000000000 --- a/keyboards/miiiw/blackio83/mcuconf.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2020 QMK - * - * 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 . - */ - -/* - * This file was auto-generated by: - * `qmk chibios-confmigrate -i keyboards/geekboards/macropad_v2/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h` - */ - -#pragma once - -#include_next - -#undef STM32_SERIAL_USE_USART1 -#define STM32_SERIAL_USE_USART1 TRUE - -#undef STM32_I2C_USE_I2C1 -#define STM32_I2C_USE_I2C1 TRUE - -#undef STM32_I2C_USE_DMA -#define STM32_I2C_USE_DMA FALSE diff --git a/keyboards/miiiw/blackio83/rev_0100/config.h b/keyboards/miiiw/blackio83/rev_0100/config.h index b1eec364ed..008d1448f2 100644 --- 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/rev_0100/halconf.h b/keyboards/miiiw/blackio83/rev_0100/halconf.h new file mode 100644 index 0000000000..037108a392 --- /dev/null +++ b/keyboards/miiiw/blackio83/rev_0100/halconf.h @@ -0,0 +1,32 @@ +/* Copyright 2020 QMK + * + * 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 . + */ + +/* + * This file was auto-generated by: + * `qmk chibios-confmigrate -i keyboards/geekboards/macropad_v2/halconf.h -r platforms/chibios/common/configs/halconf.h` + */ + +#pragma once + +#define HAL_USE_SERIAL TRUE + +#define HAL_USE_I2C TRUE + +// This enables interrupt-driven mode +#define PAL_USE_WAIT TRUE +#define USB_USE_WAIT TRUE + +#include_next diff --git a/keyboards/miiiw/blackio83/rev_0100/keyboard.json b/keyboards/miiiw/blackio83/rev_0100/keyboard.json new file mode 100644 index 0000000000..d3fb31d109 --- /dev/null +++ b/keyboards/miiiw/blackio83/rev_0100/keyboard.json @@ -0,0 +1,267 @@ +{ + "manufacturer": "MIIIW", + "keyboard_name": "MIIIW BlackIO 83", + "maintainer": "ArthurCyy", + "bootloader": "stm32-dfu", + "debounce": 3, + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "deferred_exec": true, + "dip_switch": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "indicators": { + "caps_lock": "B2", + "num_lock": "B14" + }, + "matrix_pins": { + "cols": ["H0", "H1", "H2", "H3", "H4", "H5", "H6", "H7", "H8", "H9", "H10", "H11", "H12", "H13", "H14", "H15"], + "rows": ["A7", "A6", "A5", "A4", "A3", "A2"] + }, + "dip_switch": { + "pins": ["B0", "B1", "B8", "B12"] + }, + "processor": "STM32F072", + "rgb_matrix": { + "animations": { + "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 + }, + "center_point": [62, 42], + "default": { + "animation": "solid_color" + }, + "driver": "ws2812", + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, + {"matrix": [0, 2], "x": 10, "y": 0, "flags": 4}, + {"matrix": [0, 3], "x": 18, "y": 0, "flags": 4}, + {"matrix": [0, 4], "x": 26, "y": 0, "flags": 4}, + {"matrix": [0, 5], "x": 34, "y": 0, "flags": 4}, + {"matrix": [0, 6], "x": 44, "y": 0, "flags": 4}, + {"matrix": [0, 7], "x": 52, "y": 0, "flags": 4}, + {"matrix": [0, 8], "x": 60, "y": 0, "flags": 4}, + {"matrix": [0, 9], "x": 68, "y": 0, "flags": 4}, + {"matrix": [0, 10], "x": 78, "y": 0, "flags": 4}, + {"matrix": [0, 11], "x": 86, "y": 0, "flags": 4}, + {"matrix": [0, 12], "x": 94, "y": 0, "flags": 4}, + {"matrix": [0, 13], "x": 102, "y": 0, "flags": 4}, + {"matrix": [0, 14], "x": 112, "y": 0, "flags": 4}, + {"matrix": [0, 15], "x": 124, "y": 0, "flags": 4}, + {"matrix": [1, 15], "x": 124, "y": 20, "flags": 4}, + {"matrix": [1, 13], "x": 108, "y": 20, "flags": 4}, + {"matrix": [1, 12], "x": 96, "y": 20, "flags": 4}, + {"matrix": [1, 11], "x": 88, "y": 20, "flags": 4}, + {"matrix": [1, 10], "x": 80, "y": 20, "flags": 4}, + {"matrix": [1, 9], "x": 72, "y": 20, "flags": 4}, + {"matrix": [1, 8], "x": 64, "y": 20, "flags": 4}, + {"matrix": [1, 7], "x": 56, "y": 20, "flags": 4}, + {"matrix": [1, 6], "x": 48, "y": 20, "flags": 4}, + {"matrix": [1, 5], "x": 40, "y": 20, "flags": 4}, + {"matrix": [1, 4], "x": 32, "y": 20, "flags": 4}, + {"matrix": [1, 3], "x": 24, "y": 20, "flags": 4}, + {"matrix": [1, 2], "x": 16, "y": 20, "flags": 4}, + {"matrix": [1, 1], "x": 8, "y": 20, "flags": 4}, + {"matrix": [1, 0], "x": 0, "y": 20, "flags": 4}, + {"matrix": [2, 0], "x": 2, "y": 36, "flags": 4}, + {"matrix": [2, 1], "x": 12, "y": 36, "flags": 4}, + {"matrix": [2, 2], "x": 20, "y": 36, "flags": 4}, + {"matrix": [2, 3], "x": 28, "y": 36, "flags": 4}, + {"matrix": [2, 4], "x": 36, "y": 36, "flags": 4}, + {"matrix": [2, 5], "x": 44, "y": 36, "flags": 4}, + {"matrix": [2, 6], "x": 52, "y": 36, "flags": 4}, + {"matrix": [2, 7], "x": 60, "y": 36, "flags": 4}, + {"matrix": [2, 8], "x": 68, "y": 36, "flags": 4}, + {"matrix": [2, 9], "x": 76, "y": 36, "flags": 4}, + {"matrix": [2, 10], "x": 84, "y": 36, "flags": 4}, + {"matrix": [2, 11], "x": 92, "y": 36, "flags": 4}, + {"matrix": [2, 12], "x": 100, "y": 36, "flags": 4}, + {"matrix": [2, 13], "x": 110, "y": 36, "flags": 4}, + {"matrix": [2, 15], "x": 124, "y": 36, "flags": 4}, + {"matrix": [3, 15], "x": 124, "y": 52, "flags": 4}, + {"matrix": [3, 12], "x": 107, "y": 52, "flags": 4}, + {"matrix": [3, 11], "x": 94, "y": 52, "flags": 4}, + {"matrix": [3, 10], "x": 86, "y": 52, "flags": 4}, + {"matrix": [3, 9], "x": 78, "y": 52, "flags": 4}, + {"matrix": [3, 8], "x": 70, "y": 52, "flags": 4}, + {"matrix": [3, 7], "x": 62, "y": 52, "flags": 4}, + {"matrix": [3, 6], "x": 54, "y": 52, "flags": 4}, + {"matrix": [3, 5], "x": 46, "y": 52, "flags": 4}, + {"matrix": [3, 4], "x": 38, "y": 52, "flags": 4}, + {"matrix": [3, 3], "x": 30, "y": 52, "flags": 4}, + {"matrix": [3, 2], "x": 22, "y": 52, "flags": 4}, + {"matrix": [3, 1], "x": 14, "y": 52, "flags": 4}, + {"matrix": [3, 0], "x": 3, "y": 52, "flags": 4}, + {"matrix": [4, 0], "x": 5, "y": 68, "flags": 4}, + {"matrix": [4, 1], "x": 18, "y": 68, "flags": 4}, + {"matrix": [4, 2], "x": 26, "y": 68, "flags": 4}, + {"matrix": [4, 3], "x": 34, "y": 68, "flags": 4}, + {"matrix": [4, 4], "x": 42, "y": 68, "flags": 4}, + {"matrix": [4, 5], "x": 50, "y": 68, "flags": 4}, + {"matrix": [4, 6], "x": 58, "y": 68, "flags": 4}, + {"matrix": [4, 7], "x": 66, "y": 68, "flags": 4}, + {"matrix": [4, 8], "x": 74, "y": 68, "flags": 4}, + {"matrix": [4, 9], "x": 82, "y": 68, "flags": 4}, + {"matrix": [4, 10], "x": 90, "y": 68, "flags": 4}, + {"matrix": [4, 11], "x": 104, "y": 68, "flags": 4}, + {"matrix": [4, 13], "x": 114, "y": 68, "flags": 4}, + {"matrix": [4, 15], "x": 124, "y": 68, "flags": 4}, + {"matrix": [5, 14], "x": 122, "y": 84, "flags": 4}, + {"matrix": [5, 13], "x": 114, "y": 84, "flags": 4}, + {"matrix": [5, 12], "x": 106, "y": 84, "flags": 4}, + {"matrix": [5, 10], "x": 96, "y": 84, "flags": 4}, + {"matrix": [5, 9], "x": 88, "y": 84, "flags": 4}, + {"matrix": [5, 8], "x": 80, "y": 84, "flags": 4}, + {"matrix": [5, 5], "x": 50, "y": 84, "flags": 4}, + {"matrix": [5, 2], "x": 20, "y": 88, "flags": 4}, + {"matrix": [5, 1], "x": 10, "y": 88, "flags": 4}, + {"matrix": [5, 0], "x": 1, "y": 88, "flags": 4} + ], + "max_brightness": 160 + }, + "url": "https://github.com/ArthurCyy", + "usb": { + "device_version": "0.0.1", + "force_nkro": true, + "pid": "0x83A1", + "vid": "0x3044" + }, + "ws2812": { + "pin": "B15" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 2], "x": 1.25, "y": 0}, + {"matrix": [0, 3], "x": 2.25, "y": 0}, + {"matrix": [0, 4], "x": 3.25, "y": 0}, + {"matrix": [0, 5], "x": 4.25, "y": 0}, + {"matrix": [0, 6], "x": 5.5, "y": 0}, + {"matrix": [0, 7], "x": 6.5, "y": 0}, + {"matrix": [0, 8], "x": 7.5, "y": 0}, + {"matrix": [0, 9], "x": 8.5, "y": 0}, + {"matrix": [0, 10], "x": 9.75, "y": 0}, + {"matrix": [0, 11], "x": 10.75, "y": 0}, + {"matrix": [0, 12], "x": 11.75, "y": 0}, + {"matrix": [0, 13], "x": 12.75, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15.25, "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": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1, "w": 2}, + {"matrix": [1, 15], "x": 15.25, "y": 1}, + {"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.5, "y": 2}, + {"matrix": [2, 7], "x": 7.5, "y": 2}, + {"matrix": [2, 8], "x": 8.5, "y": 2}, + {"matrix": [2, 9], "x": 9.5, "y": 2}, + {"matrix": [2, 10], "x": 10.5, "y": 2}, + {"matrix": [2, 11], "x": 11.5, "y": 2}, + {"matrix": [2, 12], "x": 12.5, "y": 2}, + {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5}, + {"matrix": [2, 15], "x": 15.25, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"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}, + {"matrix": [3, 5], "x": 5.75, "y": 3}, + {"matrix": [3, 6], "x": 6.75, "y": 3}, + {"matrix": [3, 7], "x": 7.75, "y": 3}, + {"matrix": [3, 8], "x": 8.75, "y": 3}, + {"matrix": [3, 9], "x": 9.75, "y": 3}, + {"matrix": [3, 10], "x": 10.75, "y": 3}, + {"matrix": [3, 11], "x": 11.75, "y": 3}, + {"matrix": [3, 12], "x": 12.75, "y": 3, "w": 2.25}, + {"matrix": [3, 15], "x": 15.25, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4}, + {"matrix": [4, 2], "x": 3.25, "y": 4}, + {"matrix": [4, 3], "x": 4.25, "y": 4}, + {"matrix": [4, 4], "x": 5.25, "y": 4}, + {"matrix": [4, 5], "x": 6.25, "y": 4}, + {"matrix": [4, 6], "x": 7.25, "y": 4}, + {"matrix": [4, 7], "x": 8.25, "y": 4}, + {"matrix": [4, 8], "x": 9.25, "y": 4}, + {"matrix": [4, 9], "x": 10.25, "y": 4}, + {"matrix": [4, 10], "x": 11.25, "y": 4}, + {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.75}, + {"matrix": [4, 13], "x": 14.25, "y": 4.5}, + {"matrix": [4, 15], "x": 15.25, "y": 4.25}, + {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25}, + {"matrix": [5, 8], "x": 10, "y": 5}, + {"matrix": [5, 9], "x": 11, "y": 5}, + {"matrix": [5, 10], "x": 12, "y": 5}, + {"matrix": [5, 12], "x": 13.25, "y": 5.5}, + {"matrix": [5, 13], "x": 14.25, "y": 5.5}, + {"matrix": [5, 14], "x": 15.25, "y": 5.5} + ] + } + } +} diff --git a/keyboards/miiiw/blackio83/rev_0100/matrix.c b/keyboards/miiiw/blackio83/rev_0100/matrix.c new file mode 100644 index 0000000000..ab252f919b --- /dev/null +++ b/keyboards/miiiw/blackio83/rev_0100/matrix.c @@ -0,0 +1,139 @@ +/* Copyright 2023 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 . + */ + +#include "matrix.h" +#include "wait.h" +#include "common/shift_register.h" + +static uint8_t read_rows(void); +static void init_cols(void); +static void select_col(uint8_t col); +static void unselect_col(uint8_t col); +static void unselect_cols(void); + +static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; +static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; + +#ifdef DIP_SWITCH_PINS +# define NUMBER_OF_DIP_SWITCHES (sizeof(dip_switch_pad) / sizeof(pin_t)) +static pin_t dip_switch_pad[] = DIP_SWITCH_PINS; +#endif + +void matrix_init_custom(void) { + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + setPinInputLow(row_pins[row]); + } + + shift_init(); + init_cols(); +} + +bool matrix_scan_custom(matrix_row_t current_matrix[]) { + bool changed = false; + + for (uint8_t col = 0; col < MATRIX_COLS; col++) { + select_col(col); + waitInputPinDelay(); + uint8_t rows = read_rows(); + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + bool prev_bit = ((uint32_t)(current_matrix[row]) & (matrix_row_t)(1UL << col)) ? 1 : 0; + bool curr_bit = ((uint32_t)rows & (uint32_t)(1UL << row)) ? 1 : 0; + if (prev_bit != curr_bit) { + current_matrix[row] = (uint32_t)(current_matrix[row]) ^ (uint32_t)(1UL << col); + changed = true; + } + } + unselect_col(col); + } + + return changed; +} + +void matrix_power_up(void) { + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + palDisableLineEvent(row_pins[row]); + setPinInputLow(row_pins[row]); + } + init_cols(); +#ifdef DIP_SWITCH_PINS + for (uint8_t i = 1; i < NUMBER_OF_DIP_SWITCHES; i++) { + setPinInputHigh(dip_switch_pad[i]); + } +#endif +} + +void matrix_power_down(void) { + unselect_cols(); + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + setPinInputLow(row_pins[row]); + palEnableLineEvent(row_pins[row], PAL_EVENT_MODE_RISING_EDGE); + } +#ifdef DIP_SWITCH_PINS + for (uint8_t i = 1; i < NUMBER_OF_DIP_SWITCHES; i++) { + setPinInputLow(dip_switch_pad[i]); + } +#endif +} + +static uint8_t read_rows(void) { + uint8_t row_value = 0; + for(uint8_t row = 0; row < MATRIX_ROWS; row++) { + row_value |= (readPin(row_pins[row]) << row); + } + return row_value; +} + +static void init_cols(void) { + shift_writeAll(0); + for(uint8_t col = 0; col < MATRIX_COLS; col++) { + if(col_pins[col] < H0) { + setPinOutput(col_pins[col]); + writePinLow(col_pins[col]); + } + } +} + +static void select_col(uint8_t col) { + if(col_pins[col] < H0){ + writePinHigh(col_pins[col]); + waitInputPinDelay(); + waitInputPinDelay(); + waitInputPinDelay(); + waitInputPinDelay(); + waitInputPinDelay(); + waitInputPinDelay(); + }else{ + shift_writePin(col_pins[col], 1); + } +} + +static void unselect_col(uint8_t col) { + if(col_pins[col] < H0){ + writePinLow(col_pins[col]); + }else{ + shift_writePin(col_pins[col], 0); + } +} + +static void unselect_cols(void) { + shift_writeAll(1); + for(uint8_t col = 0; col < MATRIX_COLS; col++) { + if(col_pins[col] < H0) { + setPinOutput(col_pins[col]); + writePinHigh(col_pins[col]); + } + } +} diff --git a/keyboards/miiiw/blackio83/rev_0100/mcuconf.h b/keyboards/miiiw/blackio83/rev_0100/mcuconf.h new file mode 100644 index 0000000000..89038eba82 --- /dev/null +++ b/keyboards/miiiw/blackio83/rev_0100/mcuconf.h @@ -0,0 +1,33 @@ +/* Copyright 2020 QMK + * + * 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 . + */ + +/* + * This file was auto-generated by: + * `qmk chibios-confmigrate -i keyboards/geekboards/macropad_v2/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h` + */ + +#pragma once + +#include_next + +#undef STM32_SERIAL_USE_USART1 +#define STM32_SERIAL_USE_USART1 TRUE + +#undef STM32_I2C_USE_I2C1 +#define STM32_I2C_USE_I2C1 TRUE + +#undef STM32_I2C_USE_DMA +#define STM32_I2C_USE_DMA FALSE diff --git a/keyboards/miiiw/blackio83/rev_0100/rev_0100.c b/keyboards/miiiw/blackio83/rev_0100/rev_0100.c new file mode 100644 index 0000000000..7af6861f53 --- /dev/null +++ b/keyboards/miiiw/blackio83/rev_0100/rev_0100.c @@ -0,0 +1,192 @@ +/* Copyright 2023 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 . + */ + +#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/rev_0100/rev_0100.h b/keyboards/miiiw/blackio83/rev_0100/rev_0100.h new file mode 100644 index 0000000000..ea371443e3 --- /dev/null +++ b/keyboards/miiiw/blackio83/rev_0100/rev_0100.h @@ -0,0 +1,30 @@ +/* Copyright 2023 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 . + */ + +#pragma once + +#include "quantum.h" + +#define XXX KC_NO + +enum custom_keycodes { + DEV_BT1 = QK_KB, + DEV_BT2, + DEV_BT3, + DEV_RF24, + ALT_TAB, + RGB_RST, +}; \ No newline at end of file diff --git a/keyboards/miiiw/blackio83/rev_0100/rules.mk b/keyboards/miiiw/blackio83/rev_0100/rules.mk index 5558efa95d..7a361addb3 100644 --- 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.c diff --git a/keyboards/murcielago/info.json b/keyboards/murcielago/info.json deleted file mode 100644 index 2dd650666a..0000000000 --- a/keyboards/murcielago/info.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "keyboard_name": "Murci\u00e9lago", - "manufacturer": "elagil", - "url": "", - "maintainer": "elagil", - "usb": { - "vid": "0x6166", - "pid": "0x0001", - "device_version": "0.0.2" - }, - "features": { - "bootmagic": false, - "command": false, - "console": false, - "encoder": true, - "extrakey": true, - "mousekey": true, - "nkro": false - }, - "matrix_pins": { - "cols": ["C6", "B6", "B5", "D7", "D6", "D4"], - "rows": ["B4", "D5", "B3", "B2", "B1", "B0"] - }, - "diode_direction": "COL2ROW", - "encoder": { - "rotary": [ - {"pin_a": "F0", "pin_b": "F1"} - ] - }, - "split": { - "enabled": true, - "soft_serial_pin": "E6", - "encoder": { - "right": { - "rotary": [ - {"pin_a": "F6", "pin_b": "F7"} - ] - } - }, - "matrix_pins": { - "right": { - "cols": ["D6", "D7", "D3", "B2", "B1", "B0"], - "rows": ["B3", "B7", "D4", "B6", "C6", "C7"] - } - } - }, - "processor": "atmega32u4", - "bootloader": "atmel-dfu", - "layouts": { - "LAYOUT": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0.425}, - {"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.125}, - {"matrix": [0, 5], "x": 5, "y": 0.25}, - - {"matrix": [6, 0], "x": 9, "y": 0.25}, - {"matrix": [6, 1], "x": 10, "y": 0.125}, - {"matrix": [6, 2], "x": 11, "y": 0}, - {"matrix": [6, 3], "x": 12, "y": 0.125}, - {"matrix": [6, 4], "x": 13, "y": 0.25}, - {"matrix": [6, 5], "x": 14, "y": 0.425}, - - {"matrix": [1, 0], "x": 0, "y": 1.425}, - {"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.125}, - {"matrix": [1, 5], "x": 5, "y": 1.25}, - - {"matrix": [7, 0], "x": 9, "y": 1.25}, - {"matrix": [7, 1], "x": 10, "y": 1.125}, - {"matrix": [7, 2], "x": 11, "y": 1}, - {"matrix": [7, 3], "x": 12, "y": 1.125}, - {"matrix": [7, 4], "x": 13, "y": 1.25}, - {"matrix": [7, 5], "x": 14, "y": 1.425}, - - {"matrix": [2, 0], "x": 0, "y": 2.425}, - {"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.125}, - {"matrix": [2, 5], "x": 5, "y": 2.25}, - - {"matrix": [8, 0], "x": 9, "y": 2.25}, - {"matrix": [8, 1], "x": 10, "y": 2.125}, - {"matrix": [8, 2], "x": 11, "y": 2}, - {"matrix": [8, 3], "x": 12, "y": 2.125}, - {"matrix": [8, 4], "x": 13, "y": 2.25}, - {"matrix": [8, 5], "x": 14, "y": 2.425}, - - {"matrix": [3, 0], "x": 0, "y": 3.425}, - {"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.125}, - {"matrix": [3, 5], "x": 5, "y": 3.25}, - {"matrix": [5, 5], "x": 6, "y": 3.25}, - - {"matrix": [11, 0], "x": 8, "y": 3.25}, - {"matrix": [9, 0], "x": 9, "y": 3.25}, - {"matrix": [9, 1], "x": 10, "y": 3.125}, - {"matrix": [9, 2], "x": 11, "y": 3}, - {"matrix": [9, 3], "x": 12, "y": 3.125}, - {"matrix": [9, 4], "x": 13, "y": 3.25}, - {"matrix": [9, 5], "x": 14, "y": 3.425}, - - {"matrix": [4, 1], "x": 1.7, "y": 4.25}, - {"matrix": [4, 2], "x": 2.7, "y": 4.05}, - {"matrix": [4, 3], "x": 3.7, "y": 4.15}, - {"matrix": [4, 4], "x": 4.7, "y": 4.35}, - {"matrix": [4, 5], "x": 5.8, "y": 4.25, "h": 1.5}, - - {"matrix": [10, 0], "x": 8.2, "y": 4.25, "h": 1.5}, - {"matrix": [10, 1], "x": 9.3, "y": 4.35}, - {"matrix": [10, 2], "x": 10.3, "y": 4.15}, - {"matrix": [10, 3], "x": 11.3, "y": 4.05}, - {"matrix": [10, 4], "x": 12.3, "y": 4.25} - ] - } - } -} diff --git a/keyboards/murcielago/rev1/keyboard.json b/keyboards/murcielago/rev1/keyboard.json new file mode 100644 index 0000000000..2dd650666a --- /dev/null +++ b/keyboards/murcielago/rev1/keyboard.json @@ -0,0 +1,124 @@ +{ + "keyboard_name": "Murci\u00e9lago", + "manufacturer": "elagil", + "url": "", + "maintainer": "elagil", + "usb": { + "vid": "0x6166", + "pid": "0x0001", + "device_version": "0.0.2" + }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, + "matrix_pins": { + "cols": ["C6", "B6", "B5", "D7", "D6", "D4"], + "rows": ["B4", "D5", "B3", "B2", "B1", "B0"] + }, + "diode_direction": "COL2ROW", + "encoder": { + "rotary": [ + {"pin_a": "F0", "pin_b": "F1"} + ] + }, + "split": { + "enabled": true, + "soft_serial_pin": "E6", + "encoder": { + "right": { + "rotary": [ + {"pin_a": "F6", "pin_b": "F7"} + ] + } + }, + "matrix_pins": { + "right": { + "cols": ["D6", "D7", "D3", "B2", "B1", "B0"], + "rows": ["B3", "B7", "D4", "B6", "C6", "C7"] + } + } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.425}, + {"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.125}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + + {"matrix": [6, 0], "x": 9, "y": 0.25}, + {"matrix": [6, 1], "x": 10, "y": 0.125}, + {"matrix": [6, 2], "x": 11, "y": 0}, + {"matrix": [6, 3], "x": 12, "y": 0.125}, + {"matrix": [6, 4], "x": 13, "y": 0.25}, + {"matrix": [6, 5], "x": 14, "y": 0.425}, + + {"matrix": [1, 0], "x": 0, "y": 1.425}, + {"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.125}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + + {"matrix": [7, 0], "x": 9, "y": 1.25}, + {"matrix": [7, 1], "x": 10, "y": 1.125}, + {"matrix": [7, 2], "x": 11, "y": 1}, + {"matrix": [7, 3], "x": 12, "y": 1.125}, + {"matrix": [7, 4], "x": 13, "y": 1.25}, + {"matrix": [7, 5], "x": 14, "y": 1.425}, + + {"matrix": [2, 0], "x": 0, "y": 2.425}, + {"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.125}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + + {"matrix": [8, 0], "x": 9, "y": 2.25}, + {"matrix": [8, 1], "x": 10, "y": 2.125}, + {"matrix": [8, 2], "x": 11, "y": 2}, + {"matrix": [8, 3], "x": 12, "y": 2.125}, + {"matrix": [8, 4], "x": 13, "y": 2.25}, + {"matrix": [8, 5], "x": 14, "y": 2.425}, + + {"matrix": [3, 0], "x": 0, "y": 3.425}, + {"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.125}, + {"matrix": [3, 5], "x": 5, "y": 3.25}, + {"matrix": [5, 5], "x": 6, "y": 3.25}, + + {"matrix": [11, 0], "x": 8, "y": 3.25}, + {"matrix": [9, 0], "x": 9, "y": 3.25}, + {"matrix": [9, 1], "x": 10, "y": 3.125}, + {"matrix": [9, 2], "x": 11, "y": 3}, + {"matrix": [9, 3], "x": 12, "y": 3.125}, + {"matrix": [9, 4], "x": 13, "y": 3.25}, + {"matrix": [9, 5], "x": 14, "y": 3.425}, + + {"matrix": [4, 1], "x": 1.7, "y": 4.25}, + {"matrix": [4, 2], "x": 2.7, "y": 4.05}, + {"matrix": [4, 3], "x": 3.7, "y": 4.15}, + {"matrix": [4, 4], "x": 4.7, "y": 4.35}, + {"matrix": [4, 5], "x": 5.8, "y": 4.25, "h": 1.5}, + + {"matrix": [10, 0], "x": 8.2, "y": 4.25, "h": 1.5}, + {"matrix": [10, 1], "x": 9.3, "y": 4.35}, + {"matrix": [10, 2], "x": 10.3, "y": 4.15}, + {"matrix": [10, 3], "x": 11.3, "y": 4.05}, + {"matrix": [10, 4], "x": 12.3, "y": 4.25} + ] + } + } +} diff --git a/keyboards/murcielago/rev1/rules.mk b/keyboards/murcielago/rev1/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/murcielago/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/polilla/chconf.h b/keyboards/polilla/chconf.h deleted file mode 100644 index 86d045b3da..0000000000 --- a/keyboards/polilla/chconf.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright 2020 QMK - * - * 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 . - */ - -/* - * This file was auto-generated by: - * `qmk chibios-confmigrate -i keyboards/polilla/chconf.h -r platforms/chibios/common/configs/chconf.h` - */ - -#pragma once - -#define CH_CFG_ST_FREQUENCY 10000 - -#include_next - diff --git a/keyboards/polilla/halconf.h b/keyboards/polilla/halconf.h deleted file mode 100644 index 6849a69f20..0000000000 --- a/keyboards/polilla/halconf.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2020 QMK - * - * 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 . - */ - -/* - * This file was auto-generated by: - * `qmk chibios-confmigrate -i keyboards/polilla/halconf.h -r platforms/chibios/common/configs/halconf.h` - */ - -#pragma once - -#define ADC_USE_WAIT FALSE - -#define ADC_USE_MUTUAL_EXCLUSION FALSE - -#define SERIAL_USB_BUFFERS_SIZE 256 - -#define SPI_USE_WAIT FALSE - -#define SPI_USE_MUTUAL_EXCLUSION FALSE - -#include_next - diff --git a/keyboards/polilla/info.json b/keyboards/polilla/info.json deleted file mode 100644 index ea6c5aafa8..0000000000 --- a/keyboards/polilla/info.json +++ /dev/null @@ -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/mcuconf.h b/keyboards/polilla/mcuconf.h deleted file mode 100644 index c3ebb04abd..0000000000 --- a/keyboards/polilla/mcuconf.h +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright 2020 QMK - * - * 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 . - */ - -/* - * This file was auto-generated by: - * `qmk chibios-confmigrate -i keyboards/polilla/mcuconf.h -r platforms/chibios/GENERIC_STM32_F042X6/configs/mcuconf.h` - */ - -#pragma once - -#include_next - -#undef STM32_SERIAL_USE_USART2 -#define STM32_SERIAL_USE_USART2 TRUE - diff --git a/keyboards/polilla/rev1/chconf.h b/keyboards/polilla/rev1/chconf.h new file mode 100644 index 0000000000..86d045b3da --- /dev/null +++ b/keyboards/polilla/rev1/chconf.h @@ -0,0 +1,27 @@ +/* Copyright 2020 QMK + * + * 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 . + */ + +/* + * This file was auto-generated by: + * `qmk chibios-confmigrate -i keyboards/polilla/chconf.h -r platforms/chibios/common/configs/chconf.h` + */ + +#pragma once + +#define CH_CFG_ST_FREQUENCY 10000 + +#include_next + diff --git a/keyboards/polilla/rev1/config.h b/keyboards/polilla/rev1/config.h index 3b3b9b0fb7..c2b8d7aff9 100644 --- a/keyboards/polilla/rev1/config.h +++ b/keyboards/polilla/rev1/config.h @@ -16,26 +16,4 @@ along with this program. If not, see . */ #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_ONESHOT diff --git a/keyboards/polilla/rev1/halconf.h b/keyboards/polilla/rev1/halconf.h new file mode 100644 index 0000000000..6849a69f20 --- /dev/null +++ b/keyboards/polilla/rev1/halconf.h @@ -0,0 +1,35 @@ +/* Copyright 2020 QMK + * + * 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 . + */ + +/* + * This file was auto-generated by: + * `qmk chibios-confmigrate -i keyboards/polilla/halconf.h -r platforms/chibios/common/configs/halconf.h` + */ + +#pragma once + +#define ADC_USE_WAIT FALSE + +#define ADC_USE_MUTUAL_EXCLUSION FALSE + +#define SERIAL_USB_BUFFERS_SIZE 256 + +#define SPI_USE_WAIT FALSE + +#define SPI_USE_MUTUAL_EXCLUSION FALSE + +#include_next + diff --git a/keyboards/polilla/rev1/keyboard.json b/keyboards/polilla/rev1/keyboard.json new file mode 100644 index 0000000000..746f47963e --- /dev/null +++ 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/rev1/mcuconf.h b/keyboards/polilla/rev1/mcuconf.h new file mode 100644 index 0000000000..c3ebb04abd --- /dev/null +++ b/keyboards/polilla/rev1/mcuconf.h @@ -0,0 +1,28 @@ +/* Copyright 2020 QMK + * + * 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 . + */ + +/* + * This file was auto-generated by: + * `qmk chibios-confmigrate -i keyboards/polilla/mcuconf.h -r platforms/chibios/GENERIC_STM32_F042X6/configs/mcuconf.h` + */ + +#pragma once + +#include_next + +#undef STM32_SERIAL_USE_USART2 +#define STM32_SERIAL_USE_USART2 TRUE + diff --git a/keyboards/polilla/rev1/rules.mk b/keyboards/polilla/rev1/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/polilla/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/qwertyydox/config.h b/keyboards/qwertyydox/config.h deleted file mode 100644 index 8e59e903ac..0000000000 --- a/keyboards/qwertyydox/config.h +++ /dev/null @@ -1,46 +0,0 @@ -/* -Copyright 2018 Ayden - -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 - -#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_ONESHOT diff --git a/keyboards/qwertyydox/info.json b/keyboards/qwertyydox/info.json deleted file mode 100644 index 5f1eb80da8..0000000000 --- a/keyboards/qwertyydox/info.json +++ /dev/null @@ -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 new file mode 100644 index 0000000000..e5dc39eb77 --- /dev/null +++ b/keyboards/qwertyydox/rev1/config.h @@ -0,0 +1,41 @@ +/* +Copyright 2018 Ayden + +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 + +#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_ONESHOT diff --git a/keyboards/qwertyydox/rev1/keyboard.json b/keyboards/qwertyydox/rev1/keyboard.json new file mode 100644 index 0000000000..f2a335aa02 --- /dev/null +++ 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.mk deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/keyboards/qwertyydox/rules.mk b/keyboards/qwertyydox/rules.mk index 9bcd2f0741..688444b566 100644 --- 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/rev1 diff --git a/keyboards/spacetime/config.h b/keyboards/spacetime/config.h deleted file mode 100644 index b7ece10f6c..0000000000 --- a/keyboards/spacetime/config.h +++ /dev/null @@ -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 . -*/ - -#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_ONESHOT diff --git a/keyboards/spacetime/info.json b/keyboards/spacetime/info.json index a55223b653..1e04608349 100644 --- 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 new file mode 100644 index 0000000000..0967ef424b --- /dev/null +++ b/keyboards/spacetime/rev1/keyboard.json @@ -0,0 +1 @@ +{} diff --git a/keyboards/spacetime/rev1/rules.mk b/keyboards/spacetime/rev1/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/spacetime/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/splitty/config.h b/keyboards/splitty/config.h deleted file mode 100644 index e190122bc8..0000000000 --- a/keyboards/splitty/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2018 Nicolas Schodet - -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 - -/* Split Keyboard specific options. */ -#define USE_I2C -#define EE_HANDS -#define SPLIT_USB_DETECT - -/* - * 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_ONESHOT diff --git a/keyboards/splitty/info.json b/keyboards/splitty/info.json deleted file mode 100644 index 06e9c6a099..0000000000 --- a/keyboards/splitty/info.json +++ /dev/null @@ -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/rev1/config.h b/keyboards/splitty/rev1/config.h new file mode 100644 index 0000000000..e190122bc8 --- /dev/null +++ b/keyboards/splitty/rev1/config.h @@ -0,0 +1,39 @@ +/* +Copyright 2018 Nicolas Schodet + +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 + +/* Split Keyboard specific options. */ +#define USE_I2C +#define EE_HANDS +#define SPLIT_USB_DETECT + +/* + * 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_ONESHOT diff --git a/keyboards/splitty/rev1/keyboard.json b/keyboards/splitty/rev1/keyboard.json new file mode 100644 index 0000000000..d820993dbc --- /dev/null +++ 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.mk deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/keyboards/splitty/rules.mk b/keyboards/splitty/rules.mk index 2389937b0b..68b3198bfb 100644 --- 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/rev1 diff --git a/keyboards/woodkeys/meira/featherble/info.json b/keyboards/woodkeys/meira/featherble/info.json deleted file mode 100644 index 2ce28918df..0000000000 --- a/keyboards/woodkeys/meira/featherble/info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "bluetooth": { - "driver": "bluefruit_le" - } -} diff --git a/keyboards/woodkeys/meira/featherble/keyboard.json b/keyboards/woodkeys/meira/featherble/keyboard.json new file mode 100644 index 0000000000..8dc946dd57 --- /dev/null +++ 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 index 5fbcc9deaf..3ad2918d8e 100644 --- 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 new file mode 100644 index 0000000000..4c44b1c5bf --- /dev/null +++ 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 index bad7949ec0..423c14cfb7 100644 --- 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 -- cgit v1.2.3