logo

qmk_firmware

custom branch of QMK firmware git clone https://anongit.hacktivis.me/git/qmk_firmware.git
commit: d0e1d36144e1c1b2269be171c748a01f15ec32f2
parent 435aab534b83e0122fab38d995a85f96ddc856cd
Author: James Young <18669334+noroadsleft@users.noreply.github.com>
Date:   Thu, 18 Apr 2024 17:49:15 -0700

Data-Driven Keyboard Conversions: J (#23547)


Diffstat:

Dkeyboards/jacky_studio/bear_65/rev1/info.json230-------------------------------------------------------------------------------
Akeyboards/jacky_studio/bear_65/rev1/keyboard.json240+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Dkeyboards/jacky_studio/bear_65/rev1/rules.mk16----------------
Dkeyboards/jacky_studio/bear_65/rev2/info.json409-------------------------------------------------------------------------------
Akeyboards/jacky_studio/bear_65/rev2/keyboard.json419+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Dkeyboards/jacky_studio/bear_65/rev2/rules.mk16----------------
Rkeyboards/jian/handwired/info.json -> keyboards/jian/handwired/keyboard.json0
Dkeyboards/jian/handwired/rules.mk5-----
Mkeyboards/jian/info.json3+++
Dkeyboards/jian/nsrev2/info.json100-------------------------------------------------------------------------------
Akeyboards/jian/nsrev2/keyboard.json103+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Dkeyboards/jian/nsrev2/rules.mk6------
Dkeyboards/jian/rev1/info.json104-------------------------------------------------------------------------------
Akeyboards/jian/rev1/keyboard.json109+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Dkeyboards/jian/rev1/rules.mk7-------
Dkeyboards/jian/rev2/info.json103-------------------------------------------------------------------------------
Akeyboards/jian/rev2/keyboard.json107+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Dkeyboards/jian/rev2/rules.mk6------
Mkeyboards/jian/rules.mk1-
Dkeyboards/jiran/rev1/info.json77-----------------------------------------------------------------------------
Akeyboards/jiran/rev1/keyboard.json83+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Dkeyboards/jiran/rev1/rules.mk1-
Dkeyboards/jiran/rev2/info.json93-------------------------------------------------------------------------------
Akeyboards/jiran/rev2/keyboard.json99+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Dkeyboards/jiran/rev2/rules.mk1-
Mkeyboards/jiran/rules.mk13-------------
Mkeyboards/jones/v03/info.json10++++++++++
Mkeyboards/jones/v03/rules.mk19+------------------
Mkeyboards/jones/v03_1/info.json11+++++++++++
Mkeyboards/jones/v03_1/rules.mk19+------------------
Dkeyboards/jones/v1/info.json122-------------------------------------------------------------------------------
Akeyboards/jones/v1/keyboard.json133+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Dkeyboards/jones/v1/rules.mk15---------------
Dkeyboards/jorne/rev1/info.json92-------------------------------------------------------------------------------
Akeyboards/jorne/rev1/keyboard.json102+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Dkeyboards/jorne/rev1/rules.mk2--
Mkeyboards/jorne/rules.mk13-------------
Mkeyboards/joshajohnson/hub16/info.json7+++++++
Mkeyboards/joshajohnson/hub16/rules.mk13-------------
Mkeyboards/jpe230/big_knob/info.json3++-
Mkeyboards/jpe230/big_knob/rules.mk1-
41 files changed, 1430 insertions(+), 1483 deletions(-)

diff --git a/keyboards/jacky_studio/bear_65/rev1/info.json b/keyboards/jacky_studio/bear_65/rev1/info.json @@ -1,230 +0,0 @@ -{ - "keyboard_name": "Bear 65", - "manufacturer": "Jacky", - "url": "https://qmk.fm/keyboards", - "maintainer": "qmk", - "processor": "atmega32u4", - "bootloader": "atmel-dfu", - "usb": { - "vid": "0xA13B", - "pid": "0x000A", - "device_version": "0.0.1" - }, - "rgb_matrix": { - "driver": "ws2812" - }, - "matrix_pins": { - "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"], - "rows": ["B0", "B1", "B2", "B3", "B7"] - }, - "diode_direction": "ROW2COL", - "backlight": { - "pin": "B6" - }, - "ws2812": { - "pin": "E2" - }, - "rgblight": { - "saturation_steps": 8, - "brightness_steps": 8, - "led_count": 20, - "max_brightness": 200, - "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 - }, - "default": { - "val": 50 - } - }, - "indicators": { - "caps_lock": "C7", - "on_state": 0 - }, - "layouts": { - "LAYOUT_all": { - "layout": [ - {"matrix": [3, 1], "x": 0.5, "y": 0}, - - {"matrix": [0, 0], "x": 1.75, "y": 0}, - {"matrix": [0, 1], "x": 2.75, "y": 0}, - {"matrix": [0, 2], "x": 3.75, "y": 0}, - {"matrix": [0, 3], "x": 4.75, "y": 0}, - {"matrix": [0, 4], "x": 5.75, "y": 0}, - {"matrix": [0, 5], "x": 6.75, "y": 0}, - {"matrix": [0, 6], "x": 7.75, "y": 0}, - - {"matrix": [0, 7], "x": 11.25, "y": 0}, - {"matrix": [0, 8], "x": 12.25, "y": 0}, - {"matrix": [0, 9], "x": 13.25, "y": 0}, - {"matrix": [0, 10], "x": 14.25, "y": 0}, - {"matrix": [0, 11], "x": 15.25, "y": 0}, - {"matrix": [0, 12], "x": 16.25, "y": 0}, - {"matrix": [0, 13], "x": 17.25, "y": 0}, - {"matrix": [0, 14], "x": 18.25, "y": 0}, - - {"matrix": [4, 14], "x": 19.75, "y": 0}, - - {"matrix": [1, 14], "x": 0.25, "y": 1}, - - {"matrix": [1, 0], "x": 1.75, "y": 1, "w": 1.5}, - {"matrix": [1, 1], "x": 3.25, "y": 1}, - {"matrix": [1, 2], "x": 4.25, "y": 1}, - {"matrix": [1, 3], "x": 5.25, "y": 1}, - {"matrix": [1, 4], "x": 6.25, "y": 1}, - {"matrix": [1, 5], "x": 7.25, "y": 1}, - - {"matrix": [1, 6], "x": 10.75, "y": 1}, - {"matrix": [1, 7], "x": 11.75, "y": 1}, - {"matrix": [1, 8], "x": 12.75, "y": 1}, - {"matrix": [1, 9], "x": 13.75, "y": 1}, - {"matrix": [1, 10], "x": 14.75, "y": 1}, - {"matrix": [1, 11], "x": 15.75, "y": 1}, - {"matrix": [1, 12], "x": 16.75, "y": 1}, - {"matrix": [1, 13], "x": 17.75, "y": 1, "w": 1.5}, - - {"matrix": [2, 14], "x": 0, "y": 2}, - - {"matrix": [2, 0], "x": 1.75, "y": 2, "w": 1.75}, - {"matrix": [2, 1], "x": 3.5, "y": 2}, - {"matrix": [2, 2], "x": 4.5, "y": 2}, - {"matrix": [2, 3], "x": 5.5, "y": 2}, - {"matrix": [2, 4], "x": 6.5, "y": 2}, - {"matrix": [2, 5], "x": 7.5, "y": 2}, - - {"matrix": [2, 6], "x": 11, "y": 2}, - {"matrix": [2, 7], "x": 12, "y": 2}, - {"matrix": [2, 8], "x": 13, "y": 2}, - {"matrix": [2, 9], "x": 14, "y": 2}, - {"matrix": [2, 10], "x": 15, "y": 2}, - {"matrix": [2, 11], "x": 16, "y": 2}, - {"matrix": [2, 13], "x": 17, "y": 2, "w": 2.25}, - - {"matrix": [3, 0], "x": 1.75, "y": 3, "w": 2.25}, - {"matrix": [3, 2], "x": 4, "y": 3}, - {"matrix": [3, 3], "x": 5, "y": 3}, - {"matrix": [3, 4], "x": 6, "y": 3}, - {"matrix": [3, 5], "x": 7, "y": 3}, - {"matrix": [3, 6], "x": 8, "y": 3}, - - {"matrix": [3, 7], "x": 10.5, "y": 3}, - {"matrix": [3, 8], "x": 11.5, "y": 3}, - {"matrix": [3, 9], "x": 12.5, "y": 3}, - {"matrix": [3, 10], "x": 13.5, "y": 3}, - {"matrix": [3, 11], "x": 14.5, "y": 3}, - {"matrix": [3, 12], "x": 15.5, "y": 3}, - {"matrix": [3, 13], "x": 16.5, "y": 3, "w": 1.75}, - - {"matrix": [3, 14], "x": 18.25, "y": 3}, - - {"matrix": [4, 0], "x": 1.75, "y": 4, "w": 1.5}, - {"matrix": [4, 3], "x": 4.75, "y": 4, "w": 1.25}, - {"matrix": [4, 5], "x": 6, "y": 4, "w": 2.25}, - {"matrix": [4, 6], "x": 8.25, "y": 4}, - - {"matrix": [4, 8], "x": 10.5, "y": 4, "w": 2.75}, - {"matrix": [4, 10], "x": 13.25, "y": 4, "w": 1.5}, - - {"matrix": [4, 11], "x": 17.25, "y": 4}, - {"matrix": [4, 12], "x": 18.25, "y": 4}, - {"matrix": [4, 13], "x": 19.25, "y": 4} - ] - }, - "LAYOUT_full_bs": { - "layout": [ - {"matrix": [3, 1], "x": 0.5, "y": 0}, - - {"matrix": [0, 0], "x": 1.75, "y": 0}, - {"matrix": [0, 1], "x": 2.75, "y": 0}, - {"matrix": [0, 2], "x": 3.75, "y": 0}, - {"matrix": [0, 3], "x": 4.75, "y": 0}, - {"matrix": [0, 4], "x": 5.75, "y": 0}, - {"matrix": [0, 5], "x": 6.75, "y": 0}, - {"matrix": [0, 6], "x": 7.75, "y": 0}, - - {"matrix": [0, 7], "x": 11.25, "y": 0}, - {"matrix": [0, 8], "x": 12.25, "y": 0}, - {"matrix": [0, 9], "x": 13.25, "y": 0}, - {"matrix": [0, 10], "x": 14.25, "y": 0}, - {"matrix": [0, 11], "x": 15.25, "y": 0}, - {"matrix": [0, 12], "x": 16.25, "y": 0}, - {"matrix": [0, 13], "x": 17.25, "y": 0, "w": 2}, - - {"matrix": [4, 14], "x": 19.75, "y": 0}, - - {"matrix": [1, 14], "x": 0.25, "y": 1}, - - {"matrix": [1, 0], "x": 1.75, "y": 1, "w": 1.5}, - {"matrix": [1, 1], "x": 3.25, "y": 1}, - {"matrix": [1, 2], "x": 4.25, "y": 1}, - {"matrix": [1, 3], "x": 5.25, "y": 1}, - {"matrix": [1, 4], "x": 6.25, "y": 1}, - {"matrix": [1, 5], "x": 7.25, "y": 1}, - - {"matrix": [1, 6], "x": 10.75, "y": 1}, - {"matrix": [1, 7], "x": 11.75, "y": 1}, - {"matrix": [1, 8], "x": 12.75, "y": 1}, - {"matrix": [1, 9], "x": 13.75, "y": 1}, - {"matrix": [1, 10], "x": 14.75, "y": 1}, - {"matrix": [1, 11], "x": 15.75, "y": 1}, - {"matrix": [1, 12], "x": 16.75, "y": 1}, - {"matrix": [1, 13], "x": 17.75, "y": 1, "w": 1.5}, - - {"matrix": [2, 14], "x": 0, "y": 2}, - - {"matrix": [2, 0], "x": 1.75, "y": 2, "w": 1.75}, - {"matrix": [2, 1], "x": 3.5, "y": 2}, - {"matrix": [2, 2], "x": 4.5, "y": 2}, - {"matrix": [2, 3], "x": 5.5, "y": 2}, - {"matrix": [2, 4], "x": 6.5, "y": 2}, - {"matrix": [2, 5], "x": 7.5, "y": 2}, - - {"matrix": [2, 6], "x": 11, "y": 2}, - {"matrix": [2, 7], "x": 12, "y": 2}, - {"matrix": [2, 8], "x": 13, "y": 2}, - {"matrix": [2, 9], "x": 14, "y": 2}, - {"matrix": [2, 10], "x": 15, "y": 2}, - {"matrix": [2, 11], "x": 16, "y": 2}, - {"matrix": [2, 13], "x": 17, "y": 2, "w": 2.25}, - - {"matrix": [3, 0], "x": 1.75, "y": 3, "w": 2.25}, - {"matrix": [3, 2], "x": 4, "y": 3}, - {"matrix": [3, 3], "x": 5, "y": 3}, - {"matrix": [3, 4], "x": 6, "y": 3}, - {"matrix": [3, 5], "x": 7, "y": 3}, - {"matrix": [3, 6], "x": 8, "y": 3}, - - {"matrix": [3, 7], "x": 10.5, "y": 3}, - {"matrix": [3, 8], "x": 11.5, "y": 3}, - {"matrix": [3, 9], "x": 12.5, "y": 3}, - {"matrix": [3, 10], "x": 13.5, "y": 3}, - {"matrix": [3, 11], "x": 14.5, "y": 3}, - {"matrix": [3, 12], "x": 15.5, "y": 3}, - {"matrix": [3, 13], "x": 16.5, "y": 3, "w": 1.75}, - - {"matrix": [3, 14], "x": 18.25, "y": 3}, - - {"matrix": [4, 0], "x": 1.75, "y": 4, "w": 1.5}, - {"matrix": [4, 3], "x": 4.75, "y": 4, "w": 1.25}, - {"matrix": [4, 5], "x": 6, "y": 4, "w": 2.25}, - {"matrix": [4, 6], "x": 8.25, "y": 4}, - - {"matrix": [4, 8], "x": 10.5, "y": 4, "w": 2.75}, - {"matrix": [4, 10], "x": 13.25, "y": 4, "w": 1.5}, - - {"matrix": [4, 11], "x": 17.25, "y": 4}, - {"matrix": [4, 12], "x": 18.25, "y": 4}, - {"matrix": [4, 13], "x": 19.25, "y": 4} - ] - } - } -} diff --git a/keyboards/jacky_studio/bear_65/rev1/keyboard.json b/keyboards/jacky_studio/bear_65/rev1/keyboard.json @@ -0,0 +1,240 @@ +{ + "keyboard_name": "Bear 65", + "manufacturer": "Jacky", + "url": "https://qmk.fm/keyboards", + "maintainer": "qmk", + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "backlight": true, + "rgblight": true + }, + "build": { + "lto": true + }, + "usb": { + "vid": "0xA13B", + "pid": "0x000A", + "device_version": "0.0.1" + }, + "rgb_matrix": { + "driver": "ws2812" + }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["B0", "B1", "B2", "B3", "B7"] + }, + "diode_direction": "ROW2COL", + "backlight": { + "pin": "B6" + }, + "ws2812": { + "pin": "E2" + }, + "rgblight": { + "saturation_steps": 8, + "brightness_steps": 8, + "led_count": 20, + "max_brightness": 200, + "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 + }, + "default": { + "val": 50 + } + }, + "indicators": { + "caps_lock": "C7", + "on_state": 0 + }, + "layouts": { + "LAYOUT_all": { + "layout": [ + {"matrix": [3, 1], "x": 0.5, "y": 0}, + + {"matrix": [0, 0], "x": 1.75, "y": 0}, + {"matrix": [0, 1], "x": 2.75, "y": 0}, + {"matrix": [0, 2], "x": 3.75, "y": 0}, + {"matrix": [0, 3], "x": 4.75, "y": 0}, + {"matrix": [0, 4], "x": 5.75, "y": 0}, + {"matrix": [0, 5], "x": 6.75, "y": 0}, + {"matrix": [0, 6], "x": 7.75, "y": 0}, + + {"matrix": [0, 7], "x": 11.25, "y": 0}, + {"matrix": [0, 8], "x": 12.25, "y": 0}, + {"matrix": [0, 9], "x": 13.25, "y": 0}, + {"matrix": [0, 10], "x": 14.25, "y": 0}, + {"matrix": [0, 11], "x": 15.25, "y": 0}, + {"matrix": [0, 12], "x": 16.25, "y": 0}, + {"matrix": [0, 13], "x": 17.25, "y": 0}, + {"matrix": [0, 14], "x": 18.25, "y": 0}, + + {"matrix": [4, 14], "x": 19.75, "y": 0}, + + {"matrix": [1, 14], "x": 0.25, "y": 1}, + + {"matrix": [1, 0], "x": 1.75, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 3.25, "y": 1}, + {"matrix": [1, 2], "x": 4.25, "y": 1}, + {"matrix": [1, 3], "x": 5.25, "y": 1}, + {"matrix": [1, 4], "x": 6.25, "y": 1}, + {"matrix": [1, 5], "x": 7.25, "y": 1}, + + {"matrix": [1, 6], "x": 10.75, "y": 1}, + {"matrix": [1, 7], "x": 11.75, "y": 1}, + {"matrix": [1, 8], "x": 12.75, "y": 1}, + {"matrix": [1, 9], "x": 13.75, "y": 1}, + {"matrix": [1, 10], "x": 14.75, "y": 1}, + {"matrix": [1, 11], "x": 15.75, "y": 1}, + {"matrix": [1, 12], "x": 16.75, "y": 1}, + {"matrix": [1, 13], "x": 17.75, "y": 1, "w": 1.5}, + + {"matrix": [2, 14], "x": 0, "y": 2}, + + {"matrix": [2, 0], "x": 1.75, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 3.5, "y": 2}, + {"matrix": [2, 2], "x": 4.5, "y": 2}, + {"matrix": [2, 3], "x": 5.5, "y": 2}, + {"matrix": [2, 4], "x": 6.5, "y": 2}, + {"matrix": [2, 5], "x": 7.5, "y": 2}, + + {"matrix": [2, 6], "x": 11, "y": 2}, + {"matrix": [2, 7], "x": 12, "y": 2}, + {"matrix": [2, 8], "x": 13, "y": 2}, + {"matrix": [2, 9], "x": 14, "y": 2}, + {"matrix": [2, 10], "x": 15, "y": 2}, + {"matrix": [2, 11], "x": 16, "y": 2}, + {"matrix": [2, 13], "x": 17, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 1.75, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 4, "y": 3}, + {"matrix": [3, 3], "x": 5, "y": 3}, + {"matrix": [3, 4], "x": 6, "y": 3}, + {"matrix": [3, 5], "x": 7, "y": 3}, + {"matrix": [3, 6], "x": 8, "y": 3}, + + {"matrix": [3, 7], "x": 10.5, "y": 3}, + {"matrix": [3, 8], "x": 11.5, "y": 3}, + {"matrix": [3, 9], "x": 12.5, "y": 3}, + {"matrix": [3, 10], "x": 13.5, "y": 3}, + {"matrix": [3, 11], "x": 14.5, "y": 3}, + {"matrix": [3, 12], "x": 15.5, "y": 3}, + {"matrix": [3, 13], "x": 16.5, "y": 3, "w": 1.75}, + + {"matrix": [3, 14], "x": 18.25, "y": 3}, + + {"matrix": [4, 0], "x": 1.75, "y": 4, "w": 1.5}, + {"matrix": [4, 3], "x": 4.75, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 6, "y": 4, "w": 2.25}, + {"matrix": [4, 6], "x": 8.25, "y": 4}, + + {"matrix": [4, 8], "x": 10.5, "y": 4, "w": 2.75}, + {"matrix": [4, 10], "x": 13.25, "y": 4, "w": 1.5}, + + {"matrix": [4, 11], "x": 17.25, "y": 4}, + {"matrix": [4, 12], "x": 18.25, "y": 4}, + {"matrix": [4, 13], "x": 19.25, "y": 4} + ] + }, + "LAYOUT_full_bs": { + "layout": [ + {"matrix": [3, 1], "x": 0.5, "y": 0}, + + {"matrix": [0, 0], "x": 1.75, "y": 0}, + {"matrix": [0, 1], "x": 2.75, "y": 0}, + {"matrix": [0, 2], "x": 3.75, "y": 0}, + {"matrix": [0, 3], "x": 4.75, "y": 0}, + {"matrix": [0, 4], "x": 5.75, "y": 0}, + {"matrix": [0, 5], "x": 6.75, "y": 0}, + {"matrix": [0, 6], "x": 7.75, "y": 0}, + + {"matrix": [0, 7], "x": 11.25, "y": 0}, + {"matrix": [0, 8], "x": 12.25, "y": 0}, + {"matrix": [0, 9], "x": 13.25, "y": 0}, + {"matrix": [0, 10], "x": 14.25, "y": 0}, + {"matrix": [0, 11], "x": 15.25, "y": 0}, + {"matrix": [0, 12], "x": 16.25, "y": 0}, + {"matrix": [0, 13], "x": 17.25, "y": 0, "w": 2}, + + {"matrix": [4, 14], "x": 19.75, "y": 0}, + + {"matrix": [1, 14], "x": 0.25, "y": 1}, + + {"matrix": [1, 0], "x": 1.75, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 3.25, "y": 1}, + {"matrix": [1, 2], "x": 4.25, "y": 1}, + {"matrix": [1, 3], "x": 5.25, "y": 1}, + {"matrix": [1, 4], "x": 6.25, "y": 1}, + {"matrix": [1, 5], "x": 7.25, "y": 1}, + + {"matrix": [1, 6], "x": 10.75, "y": 1}, + {"matrix": [1, 7], "x": 11.75, "y": 1}, + {"matrix": [1, 8], "x": 12.75, "y": 1}, + {"matrix": [1, 9], "x": 13.75, "y": 1}, + {"matrix": [1, 10], "x": 14.75, "y": 1}, + {"matrix": [1, 11], "x": 15.75, "y": 1}, + {"matrix": [1, 12], "x": 16.75, "y": 1}, + {"matrix": [1, 13], "x": 17.75, "y": 1, "w": 1.5}, + + {"matrix": [2, 14], "x": 0, "y": 2}, + + {"matrix": [2, 0], "x": 1.75, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 3.5, "y": 2}, + {"matrix": [2, 2], "x": 4.5, "y": 2}, + {"matrix": [2, 3], "x": 5.5, "y": 2}, + {"matrix": [2, 4], "x": 6.5, "y": 2}, + {"matrix": [2, 5], "x": 7.5, "y": 2}, + + {"matrix": [2, 6], "x": 11, "y": 2}, + {"matrix": [2, 7], "x": 12, "y": 2}, + {"matrix": [2, 8], "x": 13, "y": 2}, + {"matrix": [2, 9], "x": 14, "y": 2}, + {"matrix": [2, 10], "x": 15, "y": 2}, + {"matrix": [2, 11], "x": 16, "y": 2}, + {"matrix": [2, 13], "x": 17, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 1.75, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 4, "y": 3}, + {"matrix": [3, 3], "x": 5, "y": 3}, + {"matrix": [3, 4], "x": 6, "y": 3}, + {"matrix": [3, 5], "x": 7, "y": 3}, + {"matrix": [3, 6], "x": 8, "y": 3}, + + {"matrix": [3, 7], "x": 10.5, "y": 3}, + {"matrix": [3, 8], "x": 11.5, "y": 3}, + {"matrix": [3, 9], "x": 12.5, "y": 3}, + {"matrix": [3, 10], "x": 13.5, "y": 3}, + {"matrix": [3, 11], "x": 14.5, "y": 3}, + {"matrix": [3, 12], "x": 15.5, "y": 3}, + {"matrix": [3, 13], "x": 16.5, "y": 3, "w": 1.75}, + + {"matrix": [3, 14], "x": 18.25, "y": 3}, + + {"matrix": [4, 0], "x": 1.75, "y": 4, "w": 1.5}, + {"matrix": [4, 3], "x": 4.75, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 6, "y": 4, "w": 2.25}, + {"matrix": [4, 6], "x": 8.25, "y": 4}, + + {"matrix": [4, 8], "x": 10.5, "y": 4, "w": 2.75}, + {"matrix": [4, 10], "x": 13.25, "y": 4, "w": 1.5}, + + {"matrix": [4, 11], "x": 17.25, "y": 4}, + {"matrix": [4, 12], "x": 18.25, "y": 4}, + {"matrix": [4, 13], "x": 19.25, "y": 4} + ] + } + } +} diff --git a/keyboards/jacky_studio/bear_65/rev1/rules.mk b/keyboards/jacky_studio/bear_65/rev1/rules.mk @@ -1,16 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -LTO_ENABLE = yes # Use LTO flags to reduce firmware size - -RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE) diff --git a/keyboards/jacky_studio/bear_65/rev2/info.json b/keyboards/jacky_studio/bear_65/rev2/info.json @@ -1,409 +0,0 @@ -{ - "keyboard_name": "Bear65 V2", - "manufacturer": "Jacky", - "url": "https://qmk.fm/keyboards", - "maintainer": "qmk", - "processor": "atmega32u4", - "bootloader": "atmel-dfu", - "usb": { - "vid": "0x45D4", - "pid": "0x0428", - "device_version": "0.0.1" - }, - "rgb_matrix": { - "driver": "ws2812" - }, - "matrix_pins": { - "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"], - "rows": ["B0", "B1", "B2", "B3", "B7"] - }, - "diode_direction": "ROW2COL", - "backlight": { - "pin": "B6" - }, - "ws2812": { - "pin": "E2" - }, - "rgblight": { - "saturation_steps": 8, - "brightness_steps": 8, - "led_count": 20, - "max_brightness": 200, - "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 - }, - "default": { - "val": 50 - } - }, - "indicators": { - "caps_lock": "C7", - "on_state": 0 - }, - "layout_aliases": { - "LAYOUT_all": "LAYOUT_wkl_full", - "LAYOUT_full_bs": "LAYOUT_wkl_bs" - }, - "layouts": { - "LAYOUT_wk_full": { - "layout": [ - {"matrix": [3, 1], "x": 0.5, "y": 0}, - - {"matrix": [0, 0], "x": 1.75, "y": 0}, - {"matrix": [0, 1], "x": 2.75, "y": 0}, - {"matrix": [0, 2], "x": 3.75, "y": 0}, - {"matrix": [0, 3], "x": 4.75, "y": 0}, - {"matrix": [0, 4], "x": 5.75, "y": 0}, - {"matrix": [0, 5], "x": 6.75, "y": 0}, - {"matrix": [0, 6], "x": 7.75, "y": 0}, - - {"matrix": [0, 7], "x": 11.25, "y": 0}, - {"matrix": [0, 8], "x": 12.25, "y": 0}, - {"matrix": [0, 9], "x": 13.25, "y": 0}, - {"matrix": [0, 10], "x": 14.25, "y": 0}, - {"matrix": [0, 11], "x": 15.25, "y": 0}, - {"matrix": [0, 12], "x": 16.25, "y": 0}, - {"matrix": [0, 13], "x": 17.25, "y": 0}, - {"matrix": [0, 14], "x": 18.25, "y": 0}, - - {"matrix": [4, 14], "x": 19.75, "y": 0}, - - {"matrix": [1, 14], "x": 0.25, "y": 1}, - - {"matrix": [1, 0], "x": 1.75, "y": 1, "w": 1.5}, - {"matrix": [1, 1], "x": 3.25, "y": 1}, - {"matrix": [1, 2], "x": 4.25, "y": 1}, - {"matrix": [1, 3], "x": 5.25, "y": 1}, - {"matrix": [1, 4], "x": 6.25, "y": 1}, - {"matrix": [1, 5], "x": 7.25, "y": 1}, - - {"matrix": [1, 6], "x": 10.75, "y": 1}, - {"matrix": [1, 7], "x": 11.75, "y": 1}, - {"matrix": [1, 8], "x": 12.75, "y": 1}, - {"matrix": [1, 9], "x": 13.75, "y": 1}, - {"matrix": [1, 10], "x": 14.75, "y": 1}, - {"matrix": [1, 11], "x": 15.75, "y": 1}, - {"matrix": [1, 12], "x": 16.75, "y": 1}, - {"matrix": [1, 13], "x": 17.75, "y": 1, "w": 1.5}, - - {"matrix": [2, 14], "x": 0, "y": 2}, - - {"matrix": [2, 0], "x": 1.75, "y": 2, "w": 1.75}, - {"matrix": [2, 1], "x": 3.5, "y": 2}, - {"matrix": [2, 2], "x": 4.5, "y": 2}, - {"matrix": [2, 3], "x": 5.5, "y": 2}, - {"matrix": [2, 4], "x": 6.5, "y": 2}, - {"matrix": [2, 5], "x": 7.5, "y": 2}, - - {"matrix": [2, 6], "x": 11, "y": 2}, - {"matrix": [2, 7], "x": 12, "y": 2}, - {"matrix": [2, 8], "x": 13, "y": 2}, - {"matrix": [2, 9], "x": 14, "y": 2}, - {"matrix": [2, 10], "x": 15, "y": 2}, - {"matrix": [2, 11], "x": 16, "y": 2}, - {"matrix": [2, 13], "x": 17, "y": 2, "w": 2.25}, - - {"matrix": [3, 0], "x": 1.75, "y": 3, "w": 2.25}, - {"matrix": [3, 2], "x": 4, "y": 3}, - {"matrix": [3, 3], "x": 5, "y": 3}, - {"matrix": [3, 4], "x": 6, "y": 3}, - {"matrix": [3, 5], "x": 7, "y": 3}, - {"matrix": [3, 6], "x": 8, "y": 3}, - - {"matrix": [3, 7], "x": 10.5, "y": 3}, - {"matrix": [3, 8], "x": 11.5, "y": 3}, - {"matrix": [3, 9], "x": 12.5, "y": 3}, - {"matrix": [3, 10], "x": 13.5, "y": 3}, - {"matrix": [3, 11], "x": 14.5, "y": 3}, - {"matrix": [3, 12], "x": 15.5, "y": 3}, - {"matrix": [3, 13], "x": 16.5, "y": 3, "w": 1.75}, - {"matrix": [3, 14], "x": 18.25, "y": 3}, - - {"matrix": [4, 0], "x": 1.75, "y": 4, "w": 1.25}, - {"matrix": [4, 1], "x": 3, "y": 4}, - {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.25}, - {"matrix": [4, 5], "x": 5.25, "y": 4, "w": 2.25}, - {"matrix": [4, 6], "x": 8.25, "y": 4}, - - {"matrix": [4, 8], "x": 11, "y": 4, "w": 2.75}, - {"matrix": [4, 9], "x": 13.75, "y": 4, "w": 1.25}, - {"matrix": [4, 10], "x": 15, "y": 4}, - - {"matrix": [4, 11], "x": 17.25, "y": 4}, - {"matrix": [4, 12], "x": 18.25, "y": 4}, - {"matrix": [4, 13], "x": 19.25, "y": 4} - ] - }, - "LAYOUT_wkl_full": { - "layout": [ - {"matrix": [3, 1], "x": 0.5, "y": 0}, - - {"matrix": [0, 0], "x": 1.75, "y": 0}, - {"matrix": [0, 1], "x": 2.75, "y": 0}, - {"matrix": [0, 2], "x": 3.75, "y": 0}, - {"matrix": [0, 3], "x": 4.75, "y": 0}, - {"matrix": [0, 4], "x": 5.75, "y": 0}, - {"matrix": [0, 5], "x": 6.75, "y": 0}, - {"matrix": [0, 6], "x": 7.75, "y": 0}, - - {"matrix": [0, 7], "x": 11.25, "y": 0}, - {"matrix": [0, 8], "x": 12.25, "y": 0}, - {"matrix": [0, 9], "x": 13.25, "y": 0}, - {"matrix": [0, 10], "x": 14.25, "y": 0}, - {"matrix": [0, 11], "x": 15.25, "y": 0}, - {"matrix": [0, 12], "x": 16.25, "y": 0}, - {"matrix": [0, 13], "x": 17.25, "y": 0}, - {"matrix": [0, 14], "x": 18.25, "y": 0}, - - {"matrix": [4, 14], "x": 19.75, "y": 0}, - - {"matrix": [1, 14], "x": 0.25, "y": 1}, - - {"matrix": [1, 0], "x": 1.75, "y": 1, "w": 1.5}, - {"matrix": [1, 1], "x": 3.25, "y": 1}, - {"matrix": [1, 2], "x": 4.25, "y": 1}, - {"matrix": [1, 3], "x": 5.25, "y": 1}, - {"matrix": [1, 4], "x": 6.25, "y": 1}, - {"matrix": [1, 5], "x": 7.25, "y": 1}, - - {"matrix": [1, 6], "x": 10.75, "y": 1}, - {"matrix": [1, 7], "x": 11.75, "y": 1}, - {"matrix": [1, 8], "x": 12.75, "y": 1}, - {"matrix": [1, 9], "x": 13.75, "y": 1}, - {"matrix": [1, 10], "x": 14.75, "y": 1}, - {"matrix": [1, 11], "x": 15.75, "y": 1}, - {"matrix": [1, 12], "x": 16.75, "y": 1}, - {"matrix": [1, 13], "x": 17.75, "y": 1, "w": 1.5}, - - {"matrix": [2, 14], "x": 0, "y": 2}, - - {"matrix": [2, 0], "x": 1.75, "y": 2, "w": 1.75}, - {"matrix": [2, 1], "x": 3.5, "y": 2}, - {"matrix": [2, 2], "x": 4.5, "y": 2}, - {"matrix": [2, 3], "x": 5.5, "y": 2}, - {"matrix": [2, 4], "x": 6.5, "y": 2}, - {"matrix": [2, 5], "x": 7.5, "y": 2}, - - {"matrix": [2, 6], "x": 11, "y": 2}, - {"matrix": [2, 7], "x": 12, "y": 2}, - {"matrix": [2, 8], "x": 13, "y": 2}, - {"matrix": [2, 9], "x": 14, "y": 2}, - {"matrix": [2, 10], "x": 15, "y": 2}, - {"matrix": [2, 11], "x": 16, "y": 2}, - {"matrix": [2, 13], "x": 17, "y": 2, "w": 2.25}, - - {"matrix": [3, 0], "x": 1.75, "y": 3, "w": 2.25}, - {"matrix": [3, 2], "x": 4, "y": 3}, - {"matrix": [3, 3], "x": 5, "y": 3}, - {"matrix": [3, 4], "x": 6, "y": 3}, - {"matrix": [3, 5], "x": 7, "y": 3}, - {"matrix": [3, 6], "x": 8, "y": 3}, - - {"matrix": [3, 7], "x": 10.5, "y": 3}, - {"matrix": [3, 8], "x": 11.5, "y": 3}, - {"matrix": [3, 9], "x": 12.5, "y": 3}, - {"matrix": [3, 10], "x": 13.5, "y": 3}, - {"matrix": [3, 11], "x": 14.5, "y": 3}, - {"matrix": [3, 12], "x": 15.5, "y": 3}, - {"matrix": [3, 13], "x": 16.5, "y": 3, "w": 1.75}, - {"matrix": [3, 14], "x": 18.25, "y": 3}, - - {"matrix": [4, 0], "x": 1.75, "y": 4, "w": 1.25}, - {"matrix": [4, 3], "x": 3, "y": 4}, - {"matrix": [4, 5], "x": 5.25, "y": 4, "w": 2.25}, - {"matrix": [4, 6], "x": 8.25, "y": 4}, - - {"matrix": [4, 8], "x": 11, "y": 4, "w": 2.75}, - {"matrix": [4, 9], "x": 13.75, "y": 4, "w": 1.25}, - - {"matrix": [4, 11], "x": 17.25, "y": 4}, - {"matrix": [4, 12], "x": 18.25, "y": 4}, - {"matrix": [4, 13], "x": 19.25, "y": 4} - ] - }, - "LAYOUT_wk_bs": { - "layout": [ - {"matrix": [3, 1], "x": 0.5, "y": 0}, - - {"matrix": [0, 0], "x": 1.75, "y": 0}, - {"matrix": [0, 1], "x": 2.75, "y": 0}, - {"matrix": [0, 2], "x": 3.75, "y": 0}, - {"matrix": [0, 3], "x": 4.75, "y": 0}, - {"matrix": [0, 4], "x": 5.75, "y": 0}, - {"matrix": [0, 5], "x": 6.75, "y": 0}, - {"matrix": [0, 6], "x": 7.75, "y": 0}, - - {"matrix": [0, 7], "x": 11.25, "y": 0}, - {"matrix": [0, 8], "x": 12.25, "y": 0}, - {"matrix": [0, 9], "x": 13.25, "y": 0}, - {"matrix": [0, 10], "x": 14.25, "y": 0}, - {"matrix": [0, 11], "x": 15.25, "y": 0}, - {"matrix": [0, 12], "x": 16.25, "y": 0}, - {"matrix": [0, 13], "x": 17.25, "y": 0}, - - {"matrix": [4, 14], "x": 19.75, "y": 0}, - - {"matrix": [1, 14], "x": 0.25, "y": 1}, - - {"matrix": [1, 0], "x": 1.75, "y": 1, "w": 1.5}, - {"matrix": [1, 1], "x": 3.25, "y": 1}, - {"matrix": [1, 2], "x": 4.25, "y": 1}, - {"matrix": [1, 3], "x": 5.25, "y": 1}, - {"matrix": [1, 4], "x": 6.25, "y": 1}, - {"matrix": [1, 5], "x": 7.25, "y": 1}, - - {"matrix": [1, 6], "x": 10.75, "y": 1}, - {"matrix": [1, 7], "x": 11.75, "y": 1}, - {"matrix": [1, 8], "x": 12.75, "y": 1}, - {"matrix": [1, 9], "x": 13.75, "y": 1}, - {"matrix": [1, 10], "x": 14.75, "y": 1}, - {"matrix": [1, 11], "x": 15.75, "y": 1}, - {"matrix": [1, 12], "x": 16.75, "y": 1}, - {"matrix": [1, 13], "x": 17.75, "y": 1, "w": 1.5}, - - {"matrix": [2, 14], "x": 0, "y": 2}, - - {"matrix": [2, 0], "x": 1.75, "y": 2, "w": 1.75}, - {"matrix": [2, 1], "x": 3.5, "y": 2}, - {"matrix": [2, 2], "x": 4.5, "y": 2}, - {"matrix": [2, 3], "x": 5.5, "y": 2}, - {"matrix": [2, 4], "x": 6.5, "y": 2}, - {"matrix": [2, 5], "x": 7.5, "y": 2}, - - {"matrix": [2, 6], "x": 11, "y": 2}, - {"matrix": [2, 7], "x": 12, "y": 2}, - {"matrix": [2, 8], "x": 13, "y": 2}, - {"matrix": [2, 9], "x": 14, "y": 2}, - {"matrix": [2, 10], "x": 15, "y": 2}, - {"matrix": [2, 11], "x": 16, "y": 2}, - {"matrix": [2, 13], "x": 17, "y": 2, "w": 2.25}, - - {"matrix": [3, 0], "x": 1.75, "y": 3, "w": 2.25}, - {"matrix": [3, 2], "x": 4, "y": 3}, - {"matrix": [3, 3], "x": 5, "y": 3}, - {"matrix": [3, 4], "x": 6, "y": 3}, - {"matrix": [3, 5], "x": 7, "y": 3}, - {"matrix": [3, 6], "x": 8, "y": 3}, - - {"matrix": [3, 7], "x": 10.5, "y": 3}, - {"matrix": [3, 8], "x": 11.5, "y": 3}, - {"matrix": [3, 9], "x": 12.5, "y": 3}, - {"matrix": [3, 10], "x": 13.5, "y": 3}, - {"matrix": [3, 11], "x": 14.5, "y": 3}, - {"matrix": [3, 12], "x": 15.5, "y": 3}, - {"matrix": [3, 13], "x": 16.5, "y": 3, "w": 1.75}, - {"matrix": [3, 14], "x": 18.25, "y": 3}, - - {"matrix": [4, 0], "x": 1.75, "y": 4, "w": 1.25}, - {"matrix": [4, 1], "x": 3, "y": 4}, - {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.25}, - {"matrix": [4, 5], "x": 5.25, "y": 4, "w": 2.25}, - {"matrix": [4, 6], "x": 8.25, "y": 4}, - - {"matrix": [4, 8], "x": 11, "y": 4, "w": 2.75}, - {"matrix": [4, 9], "x": 13.75, "y": 4, "w": 1.25}, - {"matrix": [4, 10], "x": 15, "y": 4}, - - {"matrix": [4, 11], "x": 17.25, "y": 4}, - {"matrix": [4, 12], "x": 18.25, "y": 4}, - {"matrix": [4, 13], "x": 19.25, "y": 4} - ] - }, - "LAYOUT_wkl_bs": { - "layout": [ - {"matrix": [3, 1], "x": 0.5, "y": 0}, - - {"matrix": [0, 0], "x": 1.75, "y": 0}, - {"matrix": [0, 1], "x": 2.75, "y": 0}, - {"matrix": [0, 2], "x": 3.75, "y": 0}, - {"matrix": [0, 3], "x": 4.75, "y": 0}, - {"matrix": [0, 4], "x": 5.75, "y": 0}, - {"matrix": [0, 5], "x": 6.75, "y": 0}, - {"matrix": [0, 6], "x": 7.75, "y": 0}, - - {"matrix": [0, 7], "x": 11.25, "y": 0}, - {"matrix": [0, 8], "x": 12.25, "y": 0}, - {"matrix": [0, 9], "x": 13.25, "y": 0}, - {"matrix": [0, 10], "x": 14.25, "y": 0}, - {"matrix": [0, 11], "x": 15.25, "y": 0}, - {"matrix": [0, 12], "x": 16.25, "y": 0}, - {"matrix": [0, 13], "x": 17.25, "y": 0}, - - {"matrix": [4, 14], "x": 19.75, "y": 0}, - - {"matrix": [1, 14], "x": 0.25, "y": 1}, - - {"matrix": [1, 0], "x": 1.75, "y": 1, "w": 1.5}, - {"matrix": [1, 1], "x": 3.25, "y": 1}, - {"matrix": [1, 2], "x": 4.25, "y": 1}, - {"matrix": [1, 3], "x": 5.25, "y": 1}, - {"matrix": [1, 4], "x": 6.25, "y": 1}, - {"matrix": [1, 5], "x": 7.25, "y": 1}, - - {"matrix": [1, 6], "x": 10.75, "y": 1}, - {"matrix": [1, 7], "x": 11.75, "y": 1}, - {"matrix": [1, 8], "x": 12.75, "y": 1}, - {"matrix": [1, 9], "x": 13.75, "y": 1}, - {"matrix": [1, 10], "x": 14.75, "y": 1}, - {"matrix": [1, 11], "x": 15.75, "y": 1}, - {"matrix": [1, 12], "x": 16.75, "y": 1}, - {"matrix": [1, 13], "x": 17.75, "y": 1, "w": 1.5}, - - {"matrix": [2, 14], "x": 0, "y": 2}, - - {"matrix": [2, 0], "x": 1.75, "y": 2, "w": 1.75}, - {"matrix": [2, 1], "x": 3.5, "y": 2}, - {"matrix": [2, 2], "x": 4.5, "y": 2}, - {"matrix": [2, 3], "x": 5.5, "y": 2}, - {"matrix": [2, 4], "x": 6.5, "y": 2}, - {"matrix": [2, 5], "x": 7.5, "y": 2}, - - {"matrix": [2, 6], "x": 11, "y": 2}, - {"matrix": [2, 7], "x": 12, "y": 2}, - {"matrix": [2, 8], "x": 13, "y": 2}, - {"matrix": [2, 9], "x": 14, "y": 2}, - {"matrix": [2, 10], "x": 15, "y": 2}, - {"matrix": [2, 11], "x": 16, "y": 2}, - {"matrix": [2, 13], "x": 17, "y": 2, "w": 2.25}, - - {"matrix": [3, 0], "x": 1.75, "y": 3, "w": 2.25}, - {"matrix": [3, 2], "x": 4, "y": 3}, - {"matrix": [3, 3], "x": 5, "y": 3}, - {"matrix": [3, 4], "x": 6, "y": 3}, - {"matrix": [3, 5], "x": 7, "y": 3}, - {"matrix": [3, 6], "x": 8, "y": 3}, - - {"matrix": [3, 7], "x": 10.5, "y": 3}, - {"matrix": [3, 8], "x": 11.5, "y": 3}, - {"matrix": [3, 9], "x": 12.5, "y": 3}, - {"matrix": [3, 10], "x": 13.5, "y": 3}, - {"matrix": [3, 11], "x": 14.5, "y": 3}, - {"matrix": [3, 12], "x": 15.5, "y": 3}, - {"matrix": [3, 13], "x": 16.5, "y": 3, "w": 1.75}, - {"matrix": [3, 14], "x": 18.25, "y": 3}, - - {"matrix": [4, 0], "x": 1.75, "y": 4, "w": 1.5}, - {"matrix": [4, 3], "x": 4.75, "y": 4, "w": 1.25}, - {"matrix": [4, 5], "x": 6, "y": 4, "w": 2.25}, - {"matrix": [4, 6], "x": 8.25, "y": 4}, - - {"matrix": [4, 8], "x": 10.5, "y": 4, "w": 2.75}, - {"matrix": [4, 10], "x": 13.25, "y": 4, "w": 1.5}, - - {"matrix": [4, 11], "x": 17.25, "y": 4}, - {"matrix": [4, 12], "x": 18.25, "y": 4}, - {"matrix": [4, 13], "x": 19.25, "y": 4} - ] - } - } -} diff --git a/keyboards/jacky_studio/bear_65/rev2/keyboard.json b/keyboards/jacky_studio/bear_65/rev2/keyboard.json @@ -0,0 +1,419 @@ +{ + "keyboard_name": "Bear65 V2", + "manufacturer": "Jacky", + "url": "https://qmk.fm/keyboards", + "maintainer": "qmk", + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "backlight": true, + "rgblight": true + }, + "build": { + "lto": true + }, + "usb": { + "vid": "0x45D4", + "pid": "0x0428", + "device_version": "0.0.1" + }, + "rgb_matrix": { + "driver": "ws2812" + }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["B0", "B1", "B2", "B3", "B7"] + }, + "diode_direction": "ROW2COL", + "backlight": { + "pin": "B6" + }, + "ws2812": { + "pin": "E2" + }, + "rgblight": { + "saturation_steps": 8, + "brightness_steps": 8, + "led_count": 20, + "max_brightness": 200, + "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 + }, + "default": { + "val": 50 + } + }, + "indicators": { + "caps_lock": "C7", + "on_state": 0 + }, + "layout_aliases": { + "LAYOUT_all": "LAYOUT_wkl_full", + "LAYOUT_full_bs": "LAYOUT_wkl_bs" + }, + "layouts": { + "LAYOUT_wk_full": { + "layout": [ + {"matrix": [3, 1], "x": 0.5, "y": 0}, + + {"matrix": [0, 0], "x": 1.75, "y": 0}, + {"matrix": [0, 1], "x": 2.75, "y": 0}, + {"matrix": [0, 2], "x": 3.75, "y": 0}, + {"matrix": [0, 3], "x": 4.75, "y": 0}, + {"matrix": [0, 4], "x": 5.75, "y": 0}, + {"matrix": [0, 5], "x": 6.75, "y": 0}, + {"matrix": [0, 6], "x": 7.75, "y": 0}, + + {"matrix": [0, 7], "x": 11.25, "y": 0}, + {"matrix": [0, 8], "x": 12.25, "y": 0}, + {"matrix": [0, 9], "x": 13.25, "y": 0}, + {"matrix": [0, 10], "x": 14.25, "y": 0}, + {"matrix": [0, 11], "x": 15.25, "y": 0}, + {"matrix": [0, 12], "x": 16.25, "y": 0}, + {"matrix": [0, 13], "x": 17.25, "y": 0}, + {"matrix": [0, 14], "x": 18.25, "y": 0}, + + {"matrix": [4, 14], "x": 19.75, "y": 0}, + + {"matrix": [1, 14], "x": 0.25, "y": 1}, + + {"matrix": [1, 0], "x": 1.75, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 3.25, "y": 1}, + {"matrix": [1, 2], "x": 4.25, "y": 1}, + {"matrix": [1, 3], "x": 5.25, "y": 1}, + {"matrix": [1, 4], "x": 6.25, "y": 1}, + {"matrix": [1, 5], "x": 7.25, "y": 1}, + + {"matrix": [1, 6], "x": 10.75, "y": 1}, + {"matrix": [1, 7], "x": 11.75, "y": 1}, + {"matrix": [1, 8], "x": 12.75, "y": 1}, + {"matrix": [1, 9], "x": 13.75, "y": 1}, + {"matrix": [1, 10], "x": 14.75, "y": 1}, + {"matrix": [1, 11], "x": 15.75, "y": 1}, + {"matrix": [1, 12], "x": 16.75, "y": 1}, + {"matrix": [1, 13], "x": 17.75, "y": 1, "w": 1.5}, + + {"matrix": [2, 14], "x": 0, "y": 2}, + + {"matrix": [2, 0], "x": 1.75, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 3.5, "y": 2}, + {"matrix": [2, 2], "x": 4.5, "y": 2}, + {"matrix": [2, 3], "x": 5.5, "y": 2}, + {"matrix": [2, 4], "x": 6.5, "y": 2}, + {"matrix": [2, 5], "x": 7.5, "y": 2}, + + {"matrix": [2, 6], "x": 11, "y": 2}, + {"matrix": [2, 7], "x": 12, "y": 2}, + {"matrix": [2, 8], "x": 13, "y": 2}, + {"matrix": [2, 9], "x": 14, "y": 2}, + {"matrix": [2, 10], "x": 15, "y": 2}, + {"matrix": [2, 11], "x": 16, "y": 2}, + {"matrix": [2, 13], "x": 17, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 1.75, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 4, "y": 3}, + {"matrix": [3, 3], "x": 5, "y": 3}, + {"matrix": [3, 4], "x": 6, "y": 3}, + {"matrix": [3, 5], "x": 7, "y": 3}, + {"matrix": [3, 6], "x": 8, "y": 3}, + + {"matrix": [3, 7], "x": 10.5, "y": 3}, + {"matrix": [3, 8], "x": 11.5, "y": 3}, + {"matrix": [3, 9], "x": 12.5, "y": 3}, + {"matrix": [3, 10], "x": 13.5, "y": 3}, + {"matrix": [3, 11], "x": 14.5, "y": 3}, + {"matrix": [3, 12], "x": 15.5, "y": 3}, + {"matrix": [3, 13], "x": 16.5, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 18.25, "y": 3}, + + {"matrix": [4, 0], "x": 1.75, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 3, "y": 4}, + {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4, "w": 2.25}, + {"matrix": [4, 6], "x": 8.25, "y": 4}, + + {"matrix": [4, 8], "x": 11, "y": 4, "w": 2.75}, + {"matrix": [4, 9], "x": 13.75, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 15, "y": 4}, + + {"matrix": [4, 11], "x": 17.25, "y": 4}, + {"matrix": [4, 12], "x": 18.25, "y": 4}, + {"matrix": [4, 13], "x": 19.25, "y": 4} + ] + }, + "LAYOUT_wkl_full": { + "layout": [ + {"matrix": [3, 1], "x": 0.5, "y": 0}, + + {"matrix": [0, 0], "x": 1.75, "y": 0}, + {"matrix": [0, 1], "x": 2.75, "y": 0}, + {"matrix": [0, 2], "x": 3.75, "y": 0}, + {"matrix": [0, 3], "x": 4.75, "y": 0}, + {"matrix": [0, 4], "x": 5.75, "y": 0}, + {"matrix": [0, 5], "x": 6.75, "y": 0}, + {"matrix": [0, 6], "x": 7.75, "y": 0}, + + {"matrix": [0, 7], "x": 11.25, "y": 0}, + {"matrix": [0, 8], "x": 12.25, "y": 0}, + {"matrix": [0, 9], "x": 13.25, "y": 0}, + {"matrix": [0, 10], "x": 14.25, "y": 0}, + {"matrix": [0, 11], "x": 15.25, "y": 0}, + {"matrix": [0, 12], "x": 16.25, "y": 0}, + {"matrix": [0, 13], "x": 17.25, "y": 0}, + {"matrix": [0, 14], "x": 18.25, "y": 0}, + + {"matrix": [4, 14], "x": 19.75, "y": 0}, + + {"matrix": [1, 14], "x": 0.25, "y": 1}, + + {"matrix": [1, 0], "x": 1.75, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 3.25, "y": 1}, + {"matrix": [1, 2], "x": 4.25, "y": 1}, + {"matrix": [1, 3], "x": 5.25, "y": 1}, + {"matrix": [1, 4], "x": 6.25, "y": 1}, + {"matrix": [1, 5], "x": 7.25, "y": 1}, + + {"matrix": [1, 6], "x": 10.75, "y": 1}, + {"matrix": [1, 7], "x": 11.75, "y": 1}, + {"matrix": [1, 8], "x": 12.75, "y": 1}, + {"matrix": [1, 9], "x": 13.75, "y": 1}, + {"matrix": [1, 10], "x": 14.75, "y": 1}, + {"matrix": [1, 11], "x": 15.75, "y": 1}, + {"matrix": [1, 12], "x": 16.75, "y": 1}, + {"matrix": [1, 13], "x": 17.75, "y": 1, "w": 1.5}, + + {"matrix": [2, 14], "x": 0, "y": 2}, + + {"matrix": [2, 0], "x": 1.75, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 3.5, "y": 2}, + {"matrix": [2, 2], "x": 4.5, "y": 2}, + {"matrix": [2, 3], "x": 5.5, "y": 2}, + {"matrix": [2, 4], "x": 6.5, "y": 2}, + {"matrix": [2, 5], "x": 7.5, "y": 2}, + + {"matrix": [2, 6], "x": 11, "y": 2}, + {"matrix": [2, 7], "x": 12, "y": 2}, + {"matrix": [2, 8], "x": 13, "y": 2}, + {"matrix": [2, 9], "x": 14, "y": 2}, + {"matrix": [2, 10], "x": 15, "y": 2}, + {"matrix": [2, 11], "x": 16, "y": 2}, + {"matrix": [2, 13], "x": 17, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 1.75, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 4, "y": 3}, + {"matrix": [3, 3], "x": 5, "y": 3}, + {"matrix": [3, 4], "x": 6, "y": 3}, + {"matrix": [3, 5], "x": 7, "y": 3}, + {"matrix": [3, 6], "x": 8, "y": 3}, + + {"matrix": [3, 7], "x": 10.5, "y": 3}, + {"matrix": [3, 8], "x": 11.5, "y": 3}, + {"matrix": [3, 9], "x": 12.5, "y": 3}, + {"matrix": [3, 10], "x": 13.5, "y": 3}, + {"matrix": [3, 11], "x": 14.5, "y": 3}, + {"matrix": [3, 12], "x": 15.5, "y": 3}, + {"matrix": [3, 13], "x": 16.5, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 18.25, "y": 3}, + + {"matrix": [4, 0], "x": 1.75, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 5], "x": 5.25, "y": 4, "w": 2.25}, + {"matrix": [4, 6], "x": 8.25, "y": 4}, + + {"matrix": [4, 8], "x": 11, "y": 4, "w": 2.75}, + {"matrix": [4, 9], "x": 13.75, "y": 4, "w": 1.25}, + + {"matrix": [4, 11], "x": 17.25, "y": 4}, + {"matrix": [4, 12], "x": 18.25, "y": 4}, + {"matrix": [4, 13], "x": 19.25, "y": 4} + ] + }, + "LAYOUT_wk_bs": { + "layout": [ + {"matrix": [3, 1], "x": 0.5, "y": 0}, + + {"matrix": [0, 0], "x": 1.75, "y": 0}, + {"matrix": [0, 1], "x": 2.75, "y": 0}, + {"matrix": [0, 2], "x": 3.75, "y": 0}, + {"matrix": [0, 3], "x": 4.75, "y": 0}, + {"matrix": [0, 4], "x": 5.75, "y": 0}, + {"matrix": [0, 5], "x": 6.75, "y": 0}, + {"matrix": [0, 6], "x": 7.75, "y": 0}, + + {"matrix": [0, 7], "x": 11.25, "y": 0}, + {"matrix": [0, 8], "x": 12.25, "y": 0}, + {"matrix": [0, 9], "x": 13.25, "y": 0}, + {"matrix": [0, 10], "x": 14.25, "y": 0}, + {"matrix": [0, 11], "x": 15.25, "y": 0}, + {"matrix": [0, 12], "x": 16.25, "y": 0}, + {"matrix": [0, 13], "x": 17.25, "y": 0}, + + {"matrix": [4, 14], "x": 19.75, "y": 0}, + + {"matrix": [1, 14], "x": 0.25, "y": 1}, + + {"matrix": [1, 0], "x": 1.75, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 3.25, "y": 1}, + {"matrix": [1, 2], "x": 4.25, "y": 1}, + {"matrix": [1, 3], "x": 5.25, "y": 1}, + {"matrix": [1, 4], "x": 6.25, "y": 1}, + {"matrix": [1, 5], "x": 7.25, "y": 1}, + + {"matrix": [1, 6], "x": 10.75, "y": 1}, + {"matrix": [1, 7], "x": 11.75, "y": 1}, + {"matrix": [1, 8], "x": 12.75, "y": 1}, + {"matrix": [1, 9], "x": 13.75, "y": 1}, + {"matrix": [1, 10], "x": 14.75, "y": 1}, + {"matrix": [1, 11], "x": 15.75, "y": 1}, + {"matrix": [1, 12], "x": 16.75, "y": 1}, + {"matrix": [1, 13], "x": 17.75, "y": 1, "w": 1.5}, + + {"matrix": [2, 14], "x": 0, "y": 2}, + + {"matrix": [2, 0], "x": 1.75, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 3.5, "y": 2}, + {"matrix": [2, 2], "x": 4.5, "y": 2}, + {"matrix": [2, 3], "x": 5.5, "y": 2}, + {"matrix": [2, 4], "x": 6.5, "y": 2}, + {"matrix": [2, 5], "x": 7.5, "y": 2}, + + {"matrix": [2, 6], "x": 11, "y": 2}, + {"matrix": [2, 7], "x": 12, "y": 2}, + {"matrix": [2, 8], "x": 13, "y": 2}, + {"matrix": [2, 9], "x": 14, "y": 2}, + {"matrix": [2, 10], "x": 15, "y": 2}, + {"matrix": [2, 11], "x": 16, "y": 2}, + {"matrix": [2, 13], "x": 17, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 1.75, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 4, "y": 3}, + {"matrix": [3, 3], "x": 5, "y": 3}, + {"matrix": [3, 4], "x": 6, "y": 3}, + {"matrix": [3, 5], "x": 7, "y": 3}, + {"matrix": [3, 6], "x": 8, "y": 3}, + + {"matrix": [3, 7], "x": 10.5, "y": 3}, + {"matrix": [3, 8], "x": 11.5, "y": 3}, + {"matrix": [3, 9], "x": 12.5, "y": 3}, + {"matrix": [3, 10], "x": 13.5, "y": 3}, + {"matrix": [3, 11], "x": 14.5, "y": 3}, + {"matrix": [3, 12], "x": 15.5, "y": 3}, + {"matrix": [3, 13], "x": 16.5, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 18.25, "y": 3}, + + {"matrix": [4, 0], "x": 1.75, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 3, "y": 4}, + {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4, "w": 2.25}, + {"matrix": [4, 6], "x": 8.25, "y": 4}, + + {"matrix": [4, 8], "x": 11, "y": 4, "w": 2.75}, + {"matrix": [4, 9], "x": 13.75, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 15, "y": 4}, + + {"matrix": [4, 11], "x": 17.25, "y": 4}, + {"matrix": [4, 12], "x": 18.25, "y": 4}, + {"matrix": [4, 13], "x": 19.25, "y": 4} + ] + }, + "LAYOUT_wkl_bs": { + "layout": [ + {"matrix": [3, 1], "x": 0.5, "y": 0}, + + {"matrix": [0, 0], "x": 1.75, "y": 0}, + {"matrix": [0, 1], "x": 2.75, "y": 0}, + {"matrix": [0, 2], "x": 3.75, "y": 0}, + {"matrix": [0, 3], "x": 4.75, "y": 0}, + {"matrix": [0, 4], "x": 5.75, "y": 0}, + {"matrix": [0, 5], "x": 6.75, "y": 0}, + {"matrix": [0, 6], "x": 7.75, "y": 0}, + + {"matrix": [0, 7], "x": 11.25, "y": 0}, + {"matrix": [0, 8], "x": 12.25, "y": 0}, + {"matrix": [0, 9], "x": 13.25, "y": 0}, + {"matrix": [0, 10], "x": 14.25, "y": 0}, + {"matrix": [0, 11], "x": 15.25, "y": 0}, + {"matrix": [0, 12], "x": 16.25, "y": 0}, + {"matrix": [0, 13], "x": 17.25, "y": 0}, + + {"matrix": [4, 14], "x": 19.75, "y": 0}, + + {"matrix": [1, 14], "x": 0.25, "y": 1}, + + {"matrix": [1, 0], "x": 1.75, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 3.25, "y": 1}, + {"matrix": [1, 2], "x": 4.25, "y": 1}, + {"matrix": [1, 3], "x": 5.25, "y": 1}, + {"matrix": [1, 4], "x": 6.25, "y": 1}, + {"matrix": [1, 5], "x": 7.25, "y": 1}, + + {"matrix": [1, 6], "x": 10.75, "y": 1}, + {"matrix": [1, 7], "x": 11.75, "y": 1}, + {"matrix": [1, 8], "x": 12.75, "y": 1}, + {"matrix": [1, 9], "x": 13.75, "y": 1}, + {"matrix": [1, 10], "x": 14.75, "y": 1}, + {"matrix": [1, 11], "x": 15.75, "y": 1}, + {"matrix": [1, 12], "x": 16.75, "y": 1}, + {"matrix": [1, 13], "x": 17.75, "y": 1, "w": 1.5}, + + {"matrix": [2, 14], "x": 0, "y": 2}, + + {"matrix": [2, 0], "x": 1.75, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 3.5, "y": 2}, + {"matrix": [2, 2], "x": 4.5, "y": 2}, + {"matrix": [2, 3], "x": 5.5, "y": 2}, + {"matrix": [2, 4], "x": 6.5, "y": 2}, + {"matrix": [2, 5], "x": 7.5, "y": 2}, + + {"matrix": [2, 6], "x": 11, "y": 2}, + {"matrix": [2, 7], "x": 12, "y": 2}, + {"matrix": [2, 8], "x": 13, "y": 2}, + {"matrix": [2, 9], "x": 14, "y": 2}, + {"matrix": [2, 10], "x": 15, "y": 2}, + {"matrix": [2, 11], "x": 16, "y": 2}, + {"matrix": [2, 13], "x": 17, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 1.75, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 4, "y": 3}, + {"matrix": [3, 3], "x": 5, "y": 3}, + {"matrix": [3, 4], "x": 6, "y": 3}, + {"matrix": [3, 5], "x": 7, "y": 3}, + {"matrix": [3, 6], "x": 8, "y": 3}, + + {"matrix": [3, 7], "x": 10.5, "y": 3}, + {"matrix": [3, 8], "x": 11.5, "y": 3}, + {"matrix": [3, 9], "x": 12.5, "y": 3}, + {"matrix": [3, 10], "x": 13.5, "y": 3}, + {"matrix": [3, 11], "x": 14.5, "y": 3}, + {"matrix": [3, 12], "x": 15.5, "y": 3}, + {"matrix": [3, 13], "x": 16.5, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 18.25, "y": 3}, + + {"matrix": [4, 0], "x": 1.75, "y": 4, "w": 1.5}, + {"matrix": [4, 3], "x": 4.75, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 6, "y": 4, "w": 2.25}, + {"matrix": [4, 6], "x": 8.25, "y": 4}, + + {"matrix": [4, 8], "x": 10.5, "y": 4, "w": 2.75}, + {"matrix": [4, 10], "x": 13.25, "y": 4, "w": 1.5}, + + {"matrix": [4, 11], "x": 17.25, "y": 4}, + {"matrix": [4, 12], "x": 18.25, "y": 4}, + {"matrix": [4, 13], "x": 19.25, "y": 4} + ] + } + } +} diff --git a/keyboards/jacky_studio/bear_65/rev2/rules.mk b/keyboards/jacky_studio/bear_65/rev2/rules.mk @@ -1,16 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -LTO_ENABLE = yes # Use LTO flags to reduce firmware size - -RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE) diff --git a/keyboards/jian/handwired/info.json b/keyboards/jian/handwired/keyboard.json diff --git a/keyboards/jian/handwired/rules.mk b/keyboards/jian/handwired/rules.mk @@ -1,5 +0,0 @@ -# Build Options -# change yes to no to disable -# -BACKLIGHT_ENABLE = no -RGBLIGHT_ENABLE = no diff --git a/keyboards/jian/info.json b/keyboards/jian/info.json @@ -5,5 +5,8 @@ "usb": { "vid": "0xC0DE", "pid": "0x1337" + }, + "build": { + "lto": true } } diff --git a/keyboards/jian/nsrev2/info.json b/keyboards/jian/nsrev2/info.json @@ -1,100 +0,0 @@ -{ - "keyboard_name": "Huma", - "usb": { - "device_version": "2.1.0" - }, - "matrix_pins": { - "cols": ["D3", "D2", "B4", "F6", "F7", "B2"], - "rows": ["F4", "F5", "B1", "B3", "D1", "D0", "D7", "E6"] - }, - "diode_direction": "COL2ROW", - "backlight": { - "pin": "C6", - "levels": 5, - "breathing": true - }, - "rgblight": { - "hue_steps": 10, - "led_count": 7, - "sleep": true, - "split": 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": "D4" - }, - "qmk_lufa_bootloader": { - "esc_input": "B1", - "esc_output": "D3" - }, - "processor": "atmega32u4", - "bootloader": "qmk-dfu", - "layouts": { - "LAYOUT": { - "layout": [ - {"matrix": [2, 0], "x": 0, "y": 1.5}, - {"matrix": [0, 0], "x": 1, "y": 0.75}, - {"matrix": [0, 1], "x": 2, "y": 0.625}, - {"matrix": [1, 2], "x": 3, "y": 0.25}, - {"matrix": [0, 2], "x": 4, "y": 0}, - {"matrix": [0, 3], "x": 5, "y": 0.25}, - {"matrix": [0, 4], "x": 6, "y": 0.375}, - - {"matrix": [4, 4], "x": 10, "y": 0.375}, - {"matrix": [4, 3], "x": 11, "y": 0.25}, - {"matrix": [4, 2], "x": 12, "y": 0}, - {"matrix": [5, 2], "x": 13, "y": 0.25}, - {"matrix": [4, 1], "x": 14, "y": 0.625}, - {"matrix": [4, 0], "x": 15, "y": 0.75}, - {"matrix": [6, 0], "x": 16, "y": 1.5}, - - {"matrix": [1, 0], "x": 1, "y": 1.75}, - {"matrix": [1, 1], "x": 2, "y": 1.625}, - {"matrix": [2, 2], "x": 3, "y": 1.25}, - {"matrix": [1, 3], "x": 4, "y": 1}, - {"matrix": [1, 4], "x": 5, "y": 1.25}, - {"matrix": [0, 5], "x": 6, "y": 1.375}, - - {"matrix": [4, 5], "x": 10, "y": 1.375}, - {"matrix": [5, 4], "x": 11, "y": 1.25}, - {"matrix": [5, 3], "x": 12, "y": 1}, - {"matrix": [6, 2], "x": 13, "y": 1.25}, - {"matrix": [5, 1], "x": 14, "y": 1.625}, - {"matrix": [5, 0], "x": 15, "y": 1.75}, - - {"matrix": [2, 1], "x": 1, "y": 2.75}, - {"matrix": [3, 2], "x": 2, "y": 2.625}, - {"matrix": [3, 3], "x": 3, "y": 2.25}, - {"matrix": [2, 3], "x": 4, "y": 2}, - {"matrix": [2, 4], "x": 5, "y": 2.25}, - {"matrix": [1, 5], "x": 6, "y": 2.375}, - - {"matrix": [5, 5], "x": 10, "y": 2.375}, - {"matrix": [6, 4], "x": 11, "y": 2.25}, - {"matrix": [6, 3], "x": 12, "y": 2}, - {"matrix": [7, 3], "x": 13, "y": 2.25}, - {"matrix": [7, 2], "x": 14, "y": 2.625}, - {"matrix": [6, 1], "x": 15, "y": 2.75}, - - {"matrix": [3, 4], "x": 5, "y": 3.25}, - {"matrix": [2, 5], "x": 6, "y": 3.375}, - {"matrix": [3, 5], "x": 7, "y": 3.5}, - - {"matrix": [7, 5], "x": 9, "y": 3.5}, - {"matrix": [6, 5], "x": 10, "y": 3.375}, - {"matrix": [7, 4], "x": 11, "y": 3.25} - ] - } - } -} diff --git a/keyboards/jian/nsrev2/keyboard.json b/keyboards/jian/nsrev2/keyboard.json @@ -0,0 +1,103 @@ +{ + "keyboard_name": "Huma", + "usb": { + "device_version": "2.1.0" + }, + "matrix_pins": { + "cols": ["D3", "D2", "B4", "F6", "F7", "B2"], + "rows": ["F4", "F5", "B1", "B3", "D1", "D0", "D7", "E6"] + }, + "diode_direction": "COL2ROW", + "backlight": { + "pin": "C6", + "levels": 5, + "breathing": true + }, + "rgblight": { + "hue_steps": 10, + "led_count": 7, + "sleep": true, + "split": 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": "D4" + }, + "qmk_lufa_bootloader": { + "esc_input": "B1", + "esc_output": "D3" + }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", + "features": { + "backlight": true + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [2, 0], "x": 0, "y": 1.5}, + {"matrix": [0, 0], "x": 1, "y": 0.75}, + {"matrix": [0, 1], "x": 2, "y": 0.625}, + {"matrix": [1, 2], "x": 3, "y": 0.25}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [0, 3], "x": 5, "y": 0.25}, + {"matrix": [0, 4], "x": 6, "y": 0.375}, + + {"matrix": [4, 4], "x": 10, "y": 0.375}, + {"matrix": [4, 3], "x": 11, "y": 0.25}, + {"matrix": [4, 2], "x": 12, "y": 0}, + {"matrix": [5, 2], "x": 13, "y": 0.25}, + {"matrix": [4, 1], "x": 14, "y": 0.625}, + {"matrix": [4, 0], "x": 15, "y": 0.75}, + {"matrix": [6, 0], "x": 16, "y": 1.5}, + + {"matrix": [1, 0], "x": 1, "y": 1.75}, + {"matrix": [1, 1], "x": 2, "y": 1.625}, + {"matrix": [2, 2], "x": 3, "y": 1.25}, + {"matrix": [1, 3], "x": 4, "y": 1}, + {"matrix": [1, 4], "x": 5, "y": 1.25}, + {"matrix": [0, 5], "x": 6, "y": 1.375}, + + {"matrix": [4, 5], "x": 10, "y": 1.375}, + {"matrix": [5, 4], "x": 11, "y": 1.25}, + {"matrix": [5, 3], "x": 12, "y": 1}, + {"matrix": [6, 2], "x": 13, "y": 1.25}, + {"matrix": [5, 1], "x": 14, "y": 1.625}, + {"matrix": [5, 0], "x": 15, "y": 1.75}, + + {"matrix": [2, 1], "x": 1, "y": 2.75}, + {"matrix": [3, 2], "x": 2, "y": 2.625}, + {"matrix": [3, 3], "x": 3, "y": 2.25}, + {"matrix": [2, 3], "x": 4, "y": 2}, + {"matrix": [2, 4], "x": 5, "y": 2.25}, + {"matrix": [1, 5], "x": 6, "y": 2.375}, + + {"matrix": [5, 5], "x": 10, "y": 2.375}, + {"matrix": [6, 4], "x": 11, "y": 2.25}, + {"matrix": [6, 3], "x": 12, "y": 2}, + {"matrix": [7, 3], "x": 13, "y": 2.25}, + {"matrix": [7, 2], "x": 14, "y": 2.625}, + {"matrix": [6, 1], "x": 15, "y": 2.75}, + + {"matrix": [3, 4], "x": 5, "y": 3.25}, + {"matrix": [2, 5], "x": 6, "y": 3.375}, + {"matrix": [3, 5], "x": 7, "y": 3.5}, + + {"matrix": [7, 5], "x": 9, "y": 3.5}, + {"matrix": [6, 5], "x": 10, "y": 3.375}, + {"matrix": [7, 4], "x": 11, "y": 3.25} + ] + } + } +} diff --git a/keyboards/jian/nsrev2/rules.mk b/keyboards/jian/nsrev2/rules.mk @@ -1,6 +0,0 @@ -# Build Options -# change yes to no to disable -# -CONSOLE_ENABLE = no -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = no diff --git a/keyboards/jian/rev1/info.json b/keyboards/jian/rev1/info.json @@ -1,104 +0,0 @@ -{ - "keyboard_name": "Jian", - "usb": { - "device_version": "1.0.0" - }, - "split": { - "enabled": true - }, - "matrix_pins": { - "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], - "rows": ["D3", "D2", "E6", "B4"] - }, - "diode_direction": "COL2ROW", - "dip_switch": { - "matrix_grid": [ - [1, 0], [2, 0], [3, 0], [3, 1], [3, 2], [3, 3], - [7, 3], [7, 2], [7, 1], [7, 0], [6, 0], [5, 0] - ] - }, - "backlight": { - "pin": "B6", - "levels": 5 - }, - "rgblight": { - "hue_steps": 10, - "led_count": 7, - "sleep": true, - "split": 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": "D4" - }, - "processor": "atmega32u4", - "bootloader": "caterina", - "layouts": { - "LAYOUT": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 1.5}, - {"matrix": [0, 1], "x": 1, "y": 0.75}, - {"matrix": [0, 2], "x": 2, "y": 0.625}, - {"matrix": [0, 3], "x": 3, "y": 0.25}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0.25}, - {"matrix": [0, 6], "x": 6, "y": 0.375}, - - {"matrix": [4, 6], "x": 10, "y": 0.375}, - {"matrix": [4, 5], "x": 11, "y": 0.25}, - {"matrix": [4, 4], "x": 12, "y": 0}, - {"matrix": [4, 3], "x": 13, "y": 0.25}, - {"matrix": [4, 2], "x": 14, "y": 0.625}, - {"matrix": [4, 1], "x": 15, "y": 0.75}, - {"matrix": [4, 0], "x": 16, "y": 1.5}, - - {"matrix": [1, 1], "x": 1, "y": 1.75}, - {"matrix": [1, 2], "x": 2, "y": 1.625}, - {"matrix": [1, 3], "x": 3, "y": 1.25}, - {"matrix": [1, 4], "x": 4, "y": 1}, - {"matrix": [1, 5], "x": 5, "y": 1.25}, - {"matrix": [1, 6], "x": 6, "y": 1.375}, - - {"matrix": [5, 6], "x": 10, "y": 1.375}, - {"matrix": [5, 5], "x": 11, "y": 1.25}, - {"matrix": [5, 4], "x": 12, "y": 1}, - {"matrix": [5, 3], "x": 13, "y": 1.25}, - {"matrix": [5, 2], "x": 14, "y": 1.625}, - {"matrix": [5, 1], "x": 15, "y": 1.75}, - - {"matrix": [2, 1], "x": 1, "y": 2.75}, - {"matrix": [2, 2], "x": 2, "y": 2.625}, - {"matrix": [2, 3], "x": 3, "y": 2.25}, - {"matrix": [2, 4], "x": 4, "y": 2}, - {"matrix": [2, 5], "x": 5, "y": 2.25}, - {"matrix": [2, 6], "x": 6, "y": 2.375}, - - {"matrix": [6, 6], "x": 10, "y": 2.375}, - {"matrix": [6, 5], "x": 11, "y": 2.25}, - {"matrix": [6, 4], "x": 12, "y": 2}, - {"matrix": [6, 3], "x": 13, "y": 2.25}, - {"matrix": [6, 2], "x": 14, "y": 2.625}, - {"matrix": [6, 1], "x": 15, "y": 2.75}, - - {"matrix": [3, 4], "x": 5, "y": 3.25}, - {"matrix": [3, 5], "x": 6, "y": 3.375}, - {"matrix": [3, 6], "x": 7, "y": 3.5}, - - {"matrix": [7, 6], "x": 9, "y": 3.5}, - {"matrix": [7, 5], "x": 10, "y": 3.375}, - {"matrix": [7, 4], "x": 11, "y": 3.25} - ] - } - } -} diff --git a/keyboards/jian/rev1/keyboard.json b/keyboards/jian/rev1/keyboard.json @@ -0,0 +1,109 @@ +{ + "keyboard_name": "Jian", + "usb": { + "device_version": "1.0.0" + }, + "split": { + "enabled": true + }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], + "rows": ["D3", "D2", "E6", "B4"] + }, + "diode_direction": "COL2ROW", + "dip_switch": { + "matrix_grid": [ + [1, 0], [2, 0], [3, 0], [3, 1], [3, 2], [3, 3], + [7, 3], [7, 2], [7, 1], [7, 0], [6, 0], [5, 0] + ] + }, + "backlight": { + "pin": "B6", + "levels": 5 + }, + "rgblight": { + "hue_steps": 10, + "led_count": 7, + "sleep": true, + "split": 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": "D4" + }, + "processor": "atmega32u4", + "bootloader": "caterina", + "features": { + "backlight": true, + "rgblight": true, + "dip_switch": true + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 1.5}, + {"matrix": [0, 1], "x": 1, "y": 0.75}, + {"matrix": [0, 2], "x": 2, "y": 0.625}, + {"matrix": [0, 3], "x": 3, "y": 0.25}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + {"matrix": [0, 6], "x": 6, "y": 0.375}, + + {"matrix": [4, 6], "x": 10, "y": 0.375}, + {"matrix": [4, 5], "x": 11, "y": 0.25}, + {"matrix": [4, 4], "x": 12, "y": 0}, + {"matrix": [4, 3], "x": 13, "y": 0.25}, + {"matrix": [4, 2], "x": 14, "y": 0.625}, + {"matrix": [4, 1], "x": 15, "y": 0.75}, + {"matrix": [4, 0], "x": 16, "y": 1.5}, + + {"matrix": [1, 1], "x": 1, "y": 1.75}, + {"matrix": [1, 2], "x": 2, "y": 1.625}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.375}, + + {"matrix": [5, 6], "x": 10, "y": 1.375}, + {"matrix": [5, 5], "x": 11, "y": 1.25}, + {"matrix": [5, 4], "x": 12, "y": 1}, + {"matrix": [5, 3], "x": 13, "y": 1.25}, + {"matrix": [5, 2], "x": 14, "y": 1.625}, + {"matrix": [5, 1], "x": 15, "y": 1.75}, + + {"matrix": [2, 1], "x": 1, "y": 2.75}, + {"matrix": [2, 2], "x": 2, "y": 2.625}, + {"matrix": [2, 3], "x": 3, "y": 2.25}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + {"matrix": [2, 6], "x": 6, "y": 2.375}, + + {"matrix": [6, 6], "x": 10, "y": 2.375}, + {"matrix": [6, 5], "x": 11, "y": 2.25}, + {"matrix": [6, 4], "x": 12, "y": 2}, + {"matrix": [6, 3], "x": 13, "y": 2.25}, + {"matrix": [6, 2], "x": 14, "y": 2.625}, + {"matrix": [6, 1], "x": 15, "y": 2.75}, + + {"matrix": [3, 4], "x": 5, "y": 3.25}, + {"matrix": [3, 5], "x": 6, "y": 3.375}, + {"matrix": [3, 6], "x": 7, "y": 3.5}, + + {"matrix": [7, 6], "x": 9, "y": 3.5}, + {"matrix": [7, 5], "x": 10, "y": 3.375}, + {"matrix": [7, 4], "x": 11, "y": 3.25} + ] + } + } +} diff --git a/keyboards/jian/rev1/rules.mk b/keyboards/jian/rev1/rules.mk @@ -1,7 +0,0 @@ -# Build Options -# change yes to no to disable -# -CONSOLE_ENABLE = no -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes -DIP_SWITCH_ENABLE = yes diff --git a/keyboards/jian/rev2/info.json b/keyboards/jian/rev2/info.json @@ -1,103 +0,0 @@ -{ - "keyboard_name": "Jian", - "usb": { - "device_version": "2.0.0" - }, - "matrix_pins": { - "cols": ["D3", "D2", "B4", "F6", "F7", "B2"], - "rows": ["F4", "F5", "B1", "B3"] - }, - "diode_direction": "COL2ROW", - "backlight": { - "pin": "C6", - "levels": 5 - }, - "rgblight": { - "hue_steps": 10, - "led_count": 7, - "sleep": true, - "split": 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": "D4" - }, - "qmk_lufa_bootloader": { - "esc_input": "B1", - "esc_output": "D3" - }, - "split": { - "enabled": true, - "soft_serial_pin": "D1" - }, - "processor": "atmega32u4", - "bootloader": "qmk-dfu", - "layouts": { - "LAYOUT": { - "layout": [ - {"matrix": [2, 0], "x": 0, "y": 1.5}, - {"matrix": [0, 0], "x": 1, "y": 0.75}, - {"matrix": [0, 1], "x": 2, "y": 0.625}, - {"matrix": [1, 2], "x": 3, "y": 0.25}, - {"matrix": [0, 2], "x": 4, "y": 0}, - {"matrix": [0, 3], "x": 5, "y": 0.25}, - {"matrix": [0, 4], "x": 6, "y": 0.375}, - - {"matrix": [4, 4], "x": 10, "y": 0.375}, - {"matrix": [4, 3], "x": 11, "y": 0.25}, - {"matrix": [4, 2], "x": 12, "y": 0}, - {"matrix": [5, 2], "x": 13, "y": 0.25}, - {"matrix": [4, 1], "x": 14, "y": 0.625}, - {"matrix": [4, 0], "x": 15, "y": 0.75}, - {"matrix": [6, 0], "x": 16, "y": 1.5}, - - {"matrix": [1, 0], "x": 1, "y": 1.75}, - {"matrix": [1, 1], "x": 2, "y": 1.625}, - {"matrix": [2, 2], "x": 3, "y": 1.25}, - {"matrix": [1, 3], "x": 4, "y": 1}, - {"matrix": [1, 4], "x": 5, "y": 1.25}, - {"matrix": [0, 5], "x": 6, "y": 1.375}, - - {"matrix": [4, 5], "x": 10, "y": 1.375}, - {"matrix": [5, 4], "x": 11, "y": 1.25}, - {"matrix": [5, 3], "x": 12, "y": 1}, - {"matrix": [6, 2], "x": 13, "y": 1.25}, - {"matrix": [5, 1], "x": 14, "y": 1.625}, - {"matrix": [5, 0], "x": 15, "y": 1.75}, - - {"matrix": [2, 1], "x": 1, "y": 2.75}, - {"matrix": [3, 2], "x": 2, "y": 2.625}, - {"matrix": [3, 3], "x": 3, "y": 2.25}, - {"matrix": [2, 3], "x": 4, "y": 2}, - {"matrix": [2, 4], "x": 5, "y": 2.25}, - {"matrix": [1, 5], "x": 6, "y": 2.375}, - - {"matrix": [5, 5], "x": 10, "y": 2.375}, - {"matrix": [6, 4], "x": 11, "y": 2.25}, - {"matrix": [6, 3], "x": 12, "y": 2}, - {"matrix": [7, 3], "x": 13, "y": 2.25}, - {"matrix": [7, 2], "x": 14, "y": 2.625}, - {"matrix": [6, 1], "x": 15, "y": 2.75}, - - {"matrix": [3, 4], "x": 5, "y": 3.25}, - {"matrix": [2, 5], "x": 6, "y": 3.375}, - {"matrix": [3, 5], "x": 7, "y": 3.5}, - - {"matrix": [7, 5], "x": 9, "y": 3.5}, - {"matrix": [6, 5], "x": 10, "y": 3.375}, - {"matrix": [7, 4], "x": 11, "y": 3.25} - ] - } - } -} diff --git a/keyboards/jian/rev2/keyboard.json b/keyboards/jian/rev2/keyboard.json @@ -0,0 +1,107 @@ +{ + "keyboard_name": "Jian", + "usb": { + "device_version": "2.0.0" + }, + "matrix_pins": { + "cols": ["D3", "D2", "B4", "F6", "F7", "B2"], + "rows": ["F4", "F5", "B1", "B3"] + }, + "diode_direction": "COL2ROW", + "backlight": { + "pin": "C6", + "levels": 5 + }, + "rgblight": { + "hue_steps": 10, + "led_count": 7, + "sleep": true, + "split": 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": "D4" + }, + "qmk_lufa_bootloader": { + "esc_input": "B1", + "esc_output": "D3" + }, + "split": { + "enabled": true, + "soft_serial_pin": "D1" + }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", + "features": { + "backlight": true, + "rgblight": true + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [2, 0], "x": 0, "y": 1.5}, + {"matrix": [0, 0], "x": 1, "y": 0.75}, + {"matrix": [0, 1], "x": 2, "y": 0.625}, + {"matrix": [1, 2], "x": 3, "y": 0.25}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [0, 3], "x": 5, "y": 0.25}, + {"matrix": [0, 4], "x": 6, "y": 0.375}, + + {"matrix": [4, 4], "x": 10, "y": 0.375}, + {"matrix": [4, 3], "x": 11, "y": 0.25}, + {"matrix": [4, 2], "x": 12, "y": 0}, + {"matrix": [5, 2], "x": 13, "y": 0.25}, + {"matrix": [4, 1], "x": 14, "y": 0.625}, + {"matrix": [4, 0], "x": 15, "y": 0.75}, + {"matrix": [6, 0], "x": 16, "y": 1.5}, + + {"matrix": [1, 0], "x": 1, "y": 1.75}, + {"matrix": [1, 1], "x": 2, "y": 1.625}, + {"matrix": [2, 2], "x": 3, "y": 1.25}, + {"matrix": [1, 3], "x": 4, "y": 1}, + {"matrix": [1, 4], "x": 5, "y": 1.25}, + {"matrix": [0, 5], "x": 6, "y": 1.375}, + + {"matrix": [4, 5], "x": 10, "y": 1.375}, + {"matrix": [5, 4], "x": 11, "y": 1.25}, + {"matrix": [5, 3], "x": 12, "y": 1}, + {"matrix": [6, 2], "x": 13, "y": 1.25}, + {"matrix": [5, 1], "x": 14, "y": 1.625}, + {"matrix": [5, 0], "x": 15, "y": 1.75}, + + {"matrix": [2, 1], "x": 1, "y": 2.75}, + {"matrix": [3, 2], "x": 2, "y": 2.625}, + {"matrix": [3, 3], "x": 3, "y": 2.25}, + {"matrix": [2, 3], "x": 4, "y": 2}, + {"matrix": [2, 4], "x": 5, "y": 2.25}, + {"matrix": [1, 5], "x": 6, "y": 2.375}, + + {"matrix": [5, 5], "x": 10, "y": 2.375}, + {"matrix": [6, 4], "x": 11, "y": 2.25}, + {"matrix": [6, 3], "x": 12, "y": 2}, + {"matrix": [7, 3], "x": 13, "y": 2.25}, + {"matrix": [7, 2], "x": 14, "y": 2.625}, + {"matrix": [6, 1], "x": 15, "y": 2.75}, + + {"matrix": [3, 4], "x": 5, "y": 3.25}, + {"matrix": [2, 5], "x": 6, "y": 3.375}, + {"matrix": [3, 5], "x": 7, "y": 3.5}, + + {"matrix": [7, 5], "x": 9, "y": 3.5}, + {"matrix": [6, 5], "x": 10, "y": 3.375}, + {"matrix": [7, 4], "x": 11, "y": 3.25} + ] + } + } +} diff --git a/keyboards/jian/rev2/rules.mk b/keyboards/jian/rev2/rules.mk @@ -1,6 +0,0 @@ -# Build Options -# change yes to no to disable -# -CONSOLE_ENABLE = no -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes diff --git a/keyboards/jian/rules.mk b/keyboards/jian/rules.mk @@ -1,2 +1 @@ DEFAULT_FOLDER = jian/rev2 -LTO_ENABLE = yes diff --git a/keyboards/jiran/rev1/info.json b/keyboards/jiran/rev1/info.json @@ -1,77 +0,0 @@ -{ - "backlight": { - "pin": "B6", - "levels": 5 - }, - "layouts": { - "LAYOUT": { - "layout": [ - {"matrix": [0, 0], "x": 1, "y": 0.75}, - {"matrix": [0, 1], "x": 2, "y": 0.62}, - {"matrix": [0, 2], "x": 3, "y": 0.25}, - {"matrix": [0, 3], "x": 4, "y": 0}, - {"matrix": [0, 4], "x": 5, "y": 0.25}, - {"matrix": [0, 5], "x": 6, "y": 0.37}, - - {"matrix": [5, 5], "x": 11.75, "y": 0.37}, - {"matrix": [5, 4], "x": 12.75, "y": 0.25}, - {"matrix": [5, 3], "x": 13.75, "y": 0}, - {"matrix": [5, 2], "x": 14.75, "y": 0.25}, - {"matrix": [5, 1], "x": 15.75, "y": 0.62}, - {"matrix": [5, 0], "x": 16.75, "y": 0.75}, - - {"matrix": [4, 0], "x": 0, "y": 2.5}, - {"matrix": [1, 0], "x": 1, "y": 1.75}, - {"matrix": [1, 1], "x": 2, "y": 1.62}, - {"matrix": [1, 2], "x": 3, "y": 1.25}, - {"matrix": [1, 3], "x": 4, "y": 1}, - {"matrix": [1, 4], "x": 5, "y": 1.25}, - {"matrix": [1, 5], "x": 6, "y": 1.37}, - - {"matrix": [6, 5], "x": 11.75, "y": 1.37}, - {"matrix": [6, 4], "x": 12.75, "y": 1.25}, - {"matrix": [6, 3], "x": 13.75, "y": 1}, - {"matrix": [6, 2], "x": 14.75, "y": 1.25}, - {"matrix": [6, 1], "x": 15.75, "y": 1.62}, - {"matrix": [6, 0], "x": 16.75, "y": 1.75}, - {"matrix": [9, 0], "x": 17.75, "y": 2.5}, - - {"matrix": [2, 0], "x": 1, "y": 2.75}, - {"matrix": [2, 1], "x": 2, "y": 2.62}, - {"matrix": [2, 2], "x": 3, "y": 2.25}, - {"matrix": [2, 3], "x": 4, "y": 2}, - {"matrix": [2, 4], "x": 5, "y": 2.25}, - {"matrix": [2, 5], "x": 6, "y": 2.37}, - - {"matrix": [7, 5], "x": 11.75, "y": 2.37}, - {"matrix": [7, 4], "x": 12.75, "y": 2.25}, - {"matrix": [7, 3], "x": 13.75, "y": 2}, - {"matrix": [7, 2], "x": 14.75, "y": 2.25}, - {"matrix": [7, 1], "x": 15.75, "y": 2.62}, - {"matrix": [7, 0], "x": 16.75, "y": 2.75}, - - {"matrix": [3, 0], "x": 1, "y": 3.75}, - {"matrix": [3, 1], "x": 2, "y": 3.62}, - {"matrix": [3, 2], "x": 3, "y": 3.25}, - {"matrix": [3, 3], "x": 4, "y": 3}, - {"matrix": [3, 4], "x": 5, "y": 3.25}, - {"matrix": [3, 5], "x": 6, "y": 3.37}, - - {"matrix": [8, 5], "x": 11.75, "y": 3.37}, - {"matrix": [8, 4], "x": 12.75, "y": 3.25}, - {"matrix": [8, 3], "x": 13.75, "y": 3}, - {"matrix": [8, 2], "x": 14.75, "y": 3.25}, - {"matrix": [8, 1], "x": 15.75, "y": 3.62}, - {"matrix": [8, 0], "x": 16.75, "y": 3.75}, - - {"matrix": [4, 3], "x": 5, "y": 4.25}, - {"matrix": [4, 4], "x": 6, "y": 4.37}, - {"matrix": [4, 5], "x": 7, "y": 4.5}, - - {"matrix": [9, 5], "x": 10.75, "y": 4.5}, - {"matrix": [9, 4], "x": 11.75, "y": 4.37}, - {"matrix": [9, 3], "x": 12.75, "y": 4.25} - ] - } - } -} diff --git a/keyboards/jiran/rev1/keyboard.json b/keyboards/jiran/rev1/keyboard.json @@ -0,0 +1,83 @@ +{ + "backlight": { + "pin": "B6", + "levels": 5 + }, + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false, + "backlight": true + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 1, "y": 0.75}, + {"matrix": [0, 1], "x": 2, "y": 0.62}, + {"matrix": [0, 2], "x": 3, "y": 0.25}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0.25}, + {"matrix": [0, 5], "x": 6, "y": 0.37}, + + {"matrix": [5, 5], "x": 11.75, "y": 0.37}, + {"matrix": [5, 4], "x": 12.75, "y": 0.25}, + {"matrix": [5, 3], "x": 13.75, "y": 0}, + {"matrix": [5, 2], "x": 14.75, "y": 0.25}, + {"matrix": [5, 1], "x": 15.75, "y": 0.62}, + {"matrix": [5, 0], "x": 16.75, "y": 0.75}, + + {"matrix": [4, 0], "x": 0, "y": 2.5}, + {"matrix": [1, 0], "x": 1, "y": 1.75}, + {"matrix": [1, 1], "x": 2, "y": 1.62}, + {"matrix": [1, 2], "x": 3, "y": 1.25}, + {"matrix": [1, 3], "x": 4, "y": 1}, + {"matrix": [1, 4], "x": 5, "y": 1.25}, + {"matrix": [1, 5], "x": 6, "y": 1.37}, + + {"matrix": [6, 5], "x": 11.75, "y": 1.37}, + {"matrix": [6, 4], "x": 12.75, "y": 1.25}, + {"matrix": [6, 3], "x": 13.75, "y": 1}, + {"matrix": [6, 2], "x": 14.75, "y": 1.25}, + {"matrix": [6, 1], "x": 15.75, "y": 1.62}, + {"matrix": [6, 0], "x": 16.75, "y": 1.75}, + {"matrix": [9, 0], "x": 17.75, "y": 2.5}, + + {"matrix": [2, 0], "x": 1, "y": 2.75}, + {"matrix": [2, 1], "x": 2, "y": 2.62}, + {"matrix": [2, 2], "x": 3, "y": 2.25}, + {"matrix": [2, 3], "x": 4, "y": 2}, + {"matrix": [2, 4], "x": 5, "y": 2.25}, + {"matrix": [2, 5], "x": 6, "y": 2.37}, + + {"matrix": [7, 5], "x": 11.75, "y": 2.37}, + {"matrix": [7, 4], "x": 12.75, "y": 2.25}, + {"matrix": [7, 3], "x": 13.75, "y": 2}, + {"matrix": [7, 2], "x": 14.75, "y": 2.25}, + {"matrix": [7, 1], "x": 15.75, "y": 2.62}, + {"matrix": [7, 0], "x": 16.75, "y": 2.75}, + + {"matrix": [3, 0], "x": 1, "y": 3.75}, + {"matrix": [3, 1], "x": 2, "y": 3.62}, + {"matrix": [3, 2], "x": 3, "y": 3.25}, + {"matrix": [3, 3], "x": 4, "y": 3}, + {"matrix": [3, 4], "x": 5, "y": 3.25}, + {"matrix": [3, 5], "x": 6, "y": 3.37}, + + {"matrix": [8, 5], "x": 11.75, "y": 3.37}, + {"matrix": [8, 4], "x": 12.75, "y": 3.25}, + {"matrix": [8, 3], "x": 13.75, "y": 3}, + {"matrix": [8, 2], "x": 14.75, "y": 3.25}, + {"matrix": [8, 1], "x": 15.75, "y": 3.62}, + {"matrix": [8, 0], "x": 16.75, "y": 3.75}, + + {"matrix": [4, 3], "x": 5, "y": 4.25}, + {"matrix": [4, 4], "x": 6, "y": 4.37}, + {"matrix": [4, 5], "x": 7, "y": 4.5}, + + {"matrix": [9, 5], "x": 10.75, "y": 4.5}, + {"matrix": [9, 4], "x": 11.75, "y": 4.37}, + {"matrix": [9, 3], "x": 12.75, "y": 4.25} + ] + } + } +} diff --git a/keyboards/jiran/rev1/rules.mk b/keyboards/jiran/rev1/rules.mk @@ -1 +0,0 @@ -BACKLIGHT_ENABLE = yes diff --git a/keyboards/jiran/rev2/info.json b/keyboards/jiran/rev2/info.json @@ -1,93 +0,0 @@ -{ - "rgblight": { - "hue_steps": 10, - "led_count": 56, - "split_count": [28, 28], - "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" - }, - "layouts": { - "LAYOUT": { - "layout": [ - {"matrix": [0, 0], "x": 1, "y": 0.75}, - {"matrix": [0, 1], "x": 2, "y": 0.62}, - {"matrix": [0, 2], "x": 3, "y": 0.25}, - {"matrix": [0, 3], "x": 4, "y": 0}, - {"matrix": [0, 4], "x": 5, "y": 0.25}, - {"matrix": [0, 5], "x": 6, "y": 0.37}, - - {"matrix": [5, 5], "x": 11.75, "y": 0.37}, - {"matrix": [5, 4], "x": 12.75, "y": 0.25}, - {"matrix": [5, 3], "x": 13.75, "y": 0}, - {"matrix": [5, 2], "x": 14.75, "y": 0.25}, - {"matrix": [5, 1], "x": 15.75, "y": 0.62}, - {"matrix": [5, 0], "x": 16.75, "y": 0.75}, - - {"matrix": [4, 0], "x": 0, "y": 2.5}, - {"matrix": [1, 0], "x": 1, "y": 1.75}, - {"matrix": [1, 1], "x": 2, "y": 1.62}, - {"matrix": [1, 2], "x": 3, "y": 1.25}, - {"matrix": [1, 3], "x": 4, "y": 1}, - {"matrix": [1, 4], "x": 5, "y": 1.25}, - {"matrix": [1, 5], "x": 6, "y": 1.37}, - - {"matrix": [6, 5], "x": 11.75, "y": 1.37}, - {"matrix": [6, 4], "x": 12.75, "y": 1.25}, - {"matrix": [6, 3], "x": 13.75, "y": 1}, - {"matrix": [6, 2], "x": 14.75, "y": 1.25}, - {"matrix": [6, 1], "x": 15.75, "y": 1.62}, - {"matrix": [6, 0], "x": 16.75, "y": 1.75}, - {"matrix": [9, 0], "x": 17.75, "y": 2.5}, - - {"matrix": [2, 0], "x": 1, "y": 2.75}, - {"matrix": [2, 1], "x": 2, "y": 2.62}, - {"matrix": [2, 2], "x": 3, "y": 2.25}, - {"matrix": [2, 3], "x": 4, "y": 2}, - {"matrix": [2, 4], "x": 5, "y": 2.25}, - {"matrix": [2, 5], "x": 6, "y": 2.37}, - - {"matrix": [7, 5], "x": 11.75, "y": 2.37}, - {"matrix": [7, 4], "x": 12.75, "y": 2.25}, - {"matrix": [7, 3], "x": 13.75, "y": 2}, - {"matrix": [7, 2], "x": 14.75, "y": 2.25}, - {"matrix": [7, 1], "x": 15.75, "y": 2.62}, - {"matrix": [7, 0], "x": 16.75, "y": 2.75}, - - {"matrix": [3, 0], "x": 1, "y": 3.75}, - {"matrix": [3, 1], "x": 2, "y": 3.62}, - {"matrix": [3, 2], "x": 3, "y": 3.25}, - {"matrix": [3, 3], "x": 4, "y": 3}, - {"matrix": [3, 4], "x": 5, "y": 3.25}, - {"matrix": [3, 5], "x": 6, "y": 3.37}, - - {"matrix": [8, 5], "x": 11.75, "y": 3.37}, - {"matrix": [8, 4], "x": 12.75, "y": 3.25}, - {"matrix": [8, 3], "x": 13.75, "y": 3}, - {"matrix": [8, 2], "x": 14.75, "y": 3.25}, - {"matrix": [8, 1], "x": 15.75, "y": 3.62}, - {"matrix": [8, 0], "x": 16.75, "y": 3.75}, - - {"matrix": [4, 3], "x": 5, "y": 4.25}, - {"matrix": [4, 4], "x": 6, "y": 4.37}, - {"matrix": [4, 5], "x": 7, "y": 4.5}, - - {"matrix": [9, 5], "x": 10.75, "y": 4.5}, - {"matrix": [9, 4], "x": 11.75, "y": 4.37}, - {"matrix": [9, 3], "x": 12.75, "y": 4.25} - ] - } - } -} diff --git a/keyboards/jiran/rev2/keyboard.json b/keyboards/jiran/rev2/keyboard.json @@ -0,0 +1,99 @@ +{ + "rgblight": { + "hue_steps": 10, + "led_count": 56, + "split_count": [28, 28], + "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" + }, + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false, + "rgblight": true + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 1, "y": 0.75}, + {"matrix": [0, 1], "x": 2, "y": 0.62}, + {"matrix": [0, 2], "x": 3, "y": 0.25}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0.25}, + {"matrix": [0, 5], "x": 6, "y": 0.37}, + + {"matrix": [5, 5], "x": 11.75, "y": 0.37}, + {"matrix": [5, 4], "x": 12.75, "y": 0.25}, + {"matrix": [5, 3], "x": 13.75, "y": 0}, + {"matrix": [5, 2], "x": 14.75, "y": 0.25}, + {"matrix": [5, 1], "x": 15.75, "y": 0.62}, + {"matrix": [5, 0], "x": 16.75, "y": 0.75}, + + {"matrix": [4, 0], "x": 0, "y": 2.5}, + {"matrix": [1, 0], "x": 1, "y": 1.75}, + {"matrix": [1, 1], "x": 2, "y": 1.62}, + {"matrix": [1, 2], "x": 3, "y": 1.25}, + {"matrix": [1, 3], "x": 4, "y": 1}, + {"matrix": [1, 4], "x": 5, "y": 1.25}, + {"matrix": [1, 5], "x": 6, "y": 1.37}, + + {"matrix": [6, 5], "x": 11.75, "y": 1.37}, + {"matrix": [6, 4], "x": 12.75, "y": 1.25}, + {"matrix": [6, 3], "x": 13.75, "y": 1}, + {"matrix": [6, 2], "x": 14.75, "y": 1.25}, + {"matrix": [6, 1], "x": 15.75, "y": 1.62}, + {"matrix": [6, 0], "x": 16.75, "y": 1.75}, + {"matrix": [9, 0], "x": 17.75, "y": 2.5}, + + {"matrix": [2, 0], "x": 1, "y": 2.75}, + {"matrix": [2, 1], "x": 2, "y": 2.62}, + {"matrix": [2, 2], "x": 3, "y": 2.25}, + {"matrix": [2, 3], "x": 4, "y": 2}, + {"matrix": [2, 4], "x": 5, "y": 2.25}, + {"matrix": [2, 5], "x": 6, "y": 2.37}, + + {"matrix": [7, 5], "x": 11.75, "y": 2.37}, + {"matrix": [7, 4], "x": 12.75, "y": 2.25}, + {"matrix": [7, 3], "x": 13.75, "y": 2}, + {"matrix": [7, 2], "x": 14.75, "y": 2.25}, + {"matrix": [7, 1], "x": 15.75, "y": 2.62}, + {"matrix": [7, 0], "x": 16.75, "y": 2.75}, + + {"matrix": [3, 0], "x": 1, "y": 3.75}, + {"matrix": [3, 1], "x": 2, "y": 3.62}, + {"matrix": [3, 2], "x": 3, "y": 3.25}, + {"matrix": [3, 3], "x": 4, "y": 3}, + {"matrix": [3, 4], "x": 5, "y": 3.25}, + {"matrix": [3, 5], "x": 6, "y": 3.37}, + + {"matrix": [8, 5], "x": 11.75, "y": 3.37}, + {"matrix": [8, 4], "x": 12.75, "y": 3.25}, + {"matrix": [8, 3], "x": 13.75, "y": 3}, + {"matrix": [8, 2], "x": 14.75, "y": 3.25}, + {"matrix": [8, 1], "x": 15.75, "y": 3.62}, + {"matrix": [8, 0], "x": 16.75, "y": 3.75}, + + {"matrix": [4, 3], "x": 5, "y": 4.25}, + {"matrix": [4, 4], "x": 6, "y": 4.37}, + {"matrix": [4, 5], "x": 7, "y": 4.5}, + + {"matrix": [9, 5], "x": 10.75, "y": 4.5}, + {"matrix": [9, 4], "x": 11.75, "y": 4.37}, + {"matrix": [9, 3], "x": 12.75, "y": 4.25} + ] + } + } +} diff --git a/keyboards/jiran/rev2/rules.mk b/keyboards/jiran/rev2/rules.mk @@ -1 +0,0 @@ -RGBLIGHT_ENABLE = yes diff --git a/keyboards/jiran/rules.mk b/keyboards/jiran/rules.mk @@ -1,14 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = 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 -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - DEFAULT_FOLDER = jiran/rev1 diff --git a/keyboards/jones/v03/info.json b/keyboards/jones/v03/info.json @@ -28,6 +28,16 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "rgblight": true, + "encoder": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/jones/v03/rules.mk b/keyboards/jones/v03/rules.mk @@ -1,19 +1,2 @@ -# 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -ENCODER_ENABLE = yes # Rotary Encoder - -CUSTOM_MATRIX = lite # Custom matrix for "Round-Robin Matrix" +CUSTOM_MATRIX = lite SRC += matrix.c - -LTO_ENABLE = yes diff --git a/keyboards/jones/v03_1/info.json b/keyboards/jones/v03_1/info.json @@ -29,6 +29,17 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "rgblight": true, + "audio": true, + "encoder": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/jones/v03_1/rules.mk b/keyboards/jones/v03_1/rules.mk @@ -1,19 +1,2 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = yes # Audio output - -ENCODER_ENABLE = yes # Rotary Encoder - -CUSTOM_MATRIX = lite # Custom matrix for "Round-Robin Matrix" +CUSTOM_MATRIX = lite SRC += matrix.c - -LTO_ENABLE = yes diff --git a/keyboards/jones/v1/info.json b/keyboards/jones/v1/info.json @@ -1,122 +0,0 @@ -{ - "keyboard_name": "Jones", - "manufacturer": "jpskenn", - "url": "https://github.com/jpskenn/Jones", - "maintainer": "jpskenn", - "usb": { - "vid": "0xB9DD", - "pid": "0x175A", - "device_version": "1.0.0" - }, - "matrix_pins": { - "cols": ["B3", "B2", "E6", "D6", "D4", "B0", "B1", "B7", "B4", "D7"], - "rows": ["B3", "B2", "E6", "D6", "D4", "B0", "B1", "B7", "B4", "D7"] - }, - "rgblight": { - "saturation_steps": 8, - "brightness_steps": 8, - "led_count": 4 - }, - "ws2812": { - "pin": "F1" - }, - "diode_direction": "COL2ROW", - "dynamic_keymap": { - "layer_count": 6 - }, - "eeprom": { - "driver": "i2c" - }, - "encoder": { - "rotary": [ - {"pin_a": "F5", "pin_b": "F4"}, - {"pin_a": "D2", "pin_b": "D3"} - ] - }, - "bootmagic": { - "matrix": [0, 9] - }, - "processor": "atmega32u4", - "bootloader": "atmel-dfu", - "layouts": { - "LAYOUT": { - "layout": [ - {"label": "k09", "matrix": [0, 9], "x": 0, "y": 0}, - {"label": "k59", "matrix": [5, 9], "x": 1, "y": 0}, - {"label": "k08", "matrix": [0, 8], "x": 2, "y": 0}, - {"label": "k54", "matrix": [5, 4], "x": 3, "y": 0}, - {"label": "k04", "matrix": [0, 4], "x": 4, "y": 0}, - {"label": "k50", "matrix": [5, 0], "x": 5, "y": 0}, - {"label": "k56", "matrix": [5, 6], "x": 6, "y": 0}, - {"label": "k06", "matrix": [0, 6], "x": 7, "y": 0}, - {"label": "k05", "matrix": [0, 5], "x": 8, "y": 0}, - {"label": "k52", "matrix": [5, 2], "x": 9, "y": 0}, - {"label": "k02", "matrix": [0, 2], "x": 10, "y": 0}, - {"label": "k53", "matrix": [5, 3], "x": 11, "y": 0}, - {"label": "k07", "matrix": [0, 7], "x": 12, "y": 0}, - {"label": "k51", "matrix": [5, 1], "x": 13, "y": 0}, - {"label": "k01", "matrix": [0, 1], "x": 14, "y": 0}, - - {"label": "k19", "matrix": [1, 9], "x": 0, "y": 1, "w": 1.5}, - {"label": "k69", "matrix": [6, 9], "x": 1.5, "y": 1}, - {"label": "k18", "matrix": [1, 8], "x": 2.5, "y": 1}, - {"label": "k64", "matrix": [6, 4], "x": 3.5, "y": 1}, - {"label": "k14", "matrix": [1, 4], "x": 4.5, "y": 1}, - {"label": "k60", "matrix": [6, 0], "x": 5.5, "y": 1}, - {"label": "k10", "matrix": [1, 0], "x": 6.5, "y": 1}, - {"label": "k16", "matrix": [1, 6], "x": 7.5, "y": 1}, - {"label": "k15", "matrix": [1, 5], "x": 8.5, "y": 1}, - {"label": "k62", "matrix": [6, 2], "x": 9.5, "y": 1}, - {"label": "k12", "matrix": [1, 2], "x": 10.5, "y": 1}, - {"label": "k63", "matrix": [6, 3], "x": 11.5, "y": 1}, - {"label": "k17", "matrix": [1, 7], "x": 12.5, "y": 1}, - {"label": "k61", "matrix": [6, 1], "x": 13.5, "y": 1, "w": 1.5}, - - {"label": "k29", "matrix": [2, 9], "x": 0, "y": 2, "w": 1.5}, - {"label": "k79", "matrix": [7, 9], "x": 1.5, "y": 2}, - {"label": "k28", "matrix": [2, 8], "x": 2.5, "y": 2}, - {"label": "k74", "matrix": [7, 4], "x": 3.5, "y": 2}, - {"label": "k24", "matrix": [2, 4], "x": 4.5, "y": 2}, - {"label": "k70", "matrix": [7, 0], "x": 5.5, "y": 2}, - {"label": "k20", "matrix": [2, 0], "x": 6.5, "y": 2}, - {"label": "k26", "matrix": [2, 6], "x": 7.5, "y": 2}, - {"label": "k25", "matrix": [2, 5], "x": 8.5, "y": 2}, - {"label": "k72", "matrix": [7, 2], "x": 9.5, "y": 2}, - {"label": "k23", "matrix": [2, 3], "x": 10.5, "y": 2}, - {"label": "k73", "matrix": [7, 3], "x": 11.5, "y": 2}, - {"label": "k27", "matrix": [2, 7], "x": 12.5, "y": 2}, - {"label": "k71", "matrix": [7, 1], "x": 13.5, "y": 2, "w": 1.5}, - - {"label": "k39", "matrix": [3, 9], "x": 0, "y": 3}, - {"label": "k89", "matrix": [8, 9], "x": 1, "y": 3}, - {"label": "k38", "matrix": [3, 8], "x": 2, "y": 3}, - {"label": "k84", "matrix": [8, 4], "x": 3, "y": 3}, - {"label": "k34", "matrix": [3, 4], "x": 4, "y": 3}, - {"label": "k80", "matrix": [8, 0], "x": 5, "y": 3}, - {"label": "k30", "matrix": [3, 0], "x": 6, "y": 3}, - {"label": "k36", "matrix": [3, 6], "x": 7, "y": 3}, - {"label": "k35", "matrix": [3, 5], "x": 8, "y": 3}, - {"label": "k82", "matrix": [8, 2], "x": 9, "y": 3}, - {"label": "k32", "matrix": [3, 2], "x": 10, "y": 3}, - {"label": "k83", "matrix": [8, 3], "x": 11, "y": 3}, - {"label": "k37", "matrix": [3, 7], "x": 12, "y": 3}, - {"label": "k81", "matrix": [8, 1], "x": 13, "y": 3}, - {"label": "k31", "matrix": [3, 1], "x": 14, "y": 3}, - - {"label": "k49", "matrix": [4, 9], "x": 0, "y": 4}, - {"label": "k98", "matrix": [9, 8], "x": 1, "y": 4}, - {"label": "k48", "matrix": [4, 8], "x": 2, "y": 4, "w": 1.25}, - {"label": "k94", "matrix": [9, 4], "x": 3.25, "y": 4, "w": 1.25}, - {"label": "k90", "matrix": [9, 0], "x": 4.5, "y": 4, "w": 1.5}, - {"label": "k46", "matrix": [4, 6], "x": 6, "y": 4}, - {"label": "k45", "matrix": [4, 5], "x": 7, "y": 4}, - {"label": "k92", "matrix": [9, 2], "x": 8, "y": 4}, - {"label": "k42", "matrix": [4, 2], "x": 9, "y": 4, "w": 1.5}, - {"label": "k93", "matrix": [9, 3], "x": 10.5, "y": 4, "w": 1.25}, - {"label": "k47", "matrix": [4, 7], "x": 11.75, "y": 4, "w": 1.25}, - {"label": "k91", "matrix": [9, 1], "x": 13, "y": 4}, - {"label": "k41", "matrix": [4, 1], "x": 14, "y": 4} - ] - } - } -} diff --git a/keyboards/jones/v1/keyboard.json b/keyboards/jones/v1/keyboard.json @@ -0,0 +1,133 @@ +{ + "keyboard_name": "Jones", + "manufacturer": "jpskenn", + "url": "https://github.com/jpskenn/Jones", + "maintainer": "jpskenn", + "usb": { + "vid": "0xB9DD", + "pid": "0x175A", + "device_version": "1.0.0" + }, + "matrix_pins": { + "cols": ["B3", "B2", "E6", "D6", "D4", "B0", "B1", "B7", "B4", "D7"], + "rows": ["B3", "B2", "E6", "D6", "D4", "B0", "B1", "B7", "B4", "D7"] + }, + "rgblight": { + "saturation_steps": 8, + "brightness_steps": 8, + "led_count": 4 + }, + "ws2812": { + "pin": "F1" + }, + "diode_direction": "COL2ROW", + "dynamic_keymap": { + "layer_count": 6 + }, + "eeprom": { + "driver": "i2c" + }, + "encoder": { + "rotary": [ + {"pin_a": "F5", "pin_b": "F4"}, + {"pin_a": "D2", "pin_b": "D3"} + ] + }, + "bootmagic": { + "matrix": [0, 9] + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "rgblight": true, + "audio": true, + "encoder": true + }, + "build": { + "lto": true + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"label": "k09", "matrix": [0, 9], "x": 0, "y": 0}, + {"label": "k59", "matrix": [5, 9], "x": 1, "y": 0}, + {"label": "k08", "matrix": [0, 8], "x": 2, "y": 0}, + {"label": "k54", "matrix": [5, 4], "x": 3, "y": 0}, + {"label": "k04", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "k50", "matrix": [5, 0], "x": 5, "y": 0}, + {"label": "k56", "matrix": [5, 6], "x": 6, "y": 0}, + {"label": "k06", "matrix": [0, 6], "x": 7, "y": 0}, + {"label": "k05", "matrix": [0, 5], "x": 8, "y": 0}, + {"label": "k52", "matrix": [5, 2], "x": 9, "y": 0}, + {"label": "k02", "matrix": [0, 2], "x": 10, "y": 0}, + {"label": "k53", "matrix": [5, 3], "x": 11, "y": 0}, + {"label": "k07", "matrix": [0, 7], "x": 12, "y": 0}, + {"label": "k51", "matrix": [5, 1], "x": 13, "y": 0}, + {"label": "k01", "matrix": [0, 1], "x": 14, "y": 0}, + + {"label": "k19", "matrix": [1, 9], "x": 0, "y": 1, "w": 1.5}, + {"label": "k69", "matrix": [6, 9], "x": 1.5, "y": 1}, + {"label": "k18", "matrix": [1, 8], "x": 2.5, "y": 1}, + {"label": "k64", "matrix": [6, 4], "x": 3.5, "y": 1}, + {"label": "k14", "matrix": [1, 4], "x": 4.5, "y": 1}, + {"label": "k60", "matrix": [6, 0], "x": 5.5, "y": 1}, + {"label": "k10", "matrix": [1, 0], "x": 6.5, "y": 1}, + {"label": "k16", "matrix": [1, 6], "x": 7.5, "y": 1}, + {"label": "k15", "matrix": [1, 5], "x": 8.5, "y": 1}, + {"label": "k62", "matrix": [6, 2], "x": 9.5, "y": 1}, + {"label": "k12", "matrix": [1, 2], "x": 10.5, "y": 1}, + {"label": "k63", "matrix": [6, 3], "x": 11.5, "y": 1}, + {"label": "k17", "matrix": [1, 7], "x": 12.5, "y": 1}, + {"label": "k61", "matrix": [6, 1], "x": 13.5, "y": 1, "w": 1.5}, + + {"label": "k29", "matrix": [2, 9], "x": 0, "y": 2, "w": 1.5}, + {"label": "k79", "matrix": [7, 9], "x": 1.5, "y": 2}, + {"label": "k28", "matrix": [2, 8], "x": 2.5, "y": 2}, + {"label": "k74", "matrix": [7, 4], "x": 3.5, "y": 2}, + {"label": "k24", "matrix": [2, 4], "x": 4.5, "y": 2}, + {"label": "k70", "matrix": [7, 0], "x": 5.5, "y": 2}, + {"label": "k20", "matrix": [2, 0], "x": 6.5, "y": 2}, + {"label": "k26", "matrix": [2, 6], "x": 7.5, "y": 2}, + {"label": "k25", "matrix": [2, 5], "x": 8.5, "y": 2}, + {"label": "k72", "matrix": [7, 2], "x": 9.5, "y": 2}, + {"label": "k23", "matrix": [2, 3], "x": 10.5, "y": 2}, + {"label": "k73", "matrix": [7, 3], "x": 11.5, "y": 2}, + {"label": "k27", "matrix": [2, 7], "x": 12.5, "y": 2}, + {"label": "k71", "matrix": [7, 1], "x": 13.5, "y": 2, "w": 1.5}, + + {"label": "k39", "matrix": [3, 9], "x": 0, "y": 3}, + {"label": "k89", "matrix": [8, 9], "x": 1, "y": 3}, + {"label": "k38", "matrix": [3, 8], "x": 2, "y": 3}, + {"label": "k84", "matrix": [8, 4], "x": 3, "y": 3}, + {"label": "k34", "matrix": [3, 4], "x": 4, "y": 3}, + {"label": "k80", "matrix": [8, 0], "x": 5, "y": 3}, + {"label": "k30", "matrix": [3, 0], "x": 6, "y": 3}, + {"label": "k36", "matrix": [3, 6], "x": 7, "y": 3}, + {"label": "k35", "matrix": [3, 5], "x": 8, "y": 3}, + {"label": "k82", "matrix": [8, 2], "x": 9, "y": 3}, + {"label": "k32", "matrix": [3, 2], "x": 10, "y": 3}, + {"label": "k83", "matrix": [8, 3], "x": 11, "y": 3}, + {"label": "k37", "matrix": [3, 7], "x": 12, "y": 3}, + {"label": "k81", "matrix": [8, 1], "x": 13, "y": 3}, + {"label": "k31", "matrix": [3, 1], "x": 14, "y": 3}, + + {"label": "k49", "matrix": [4, 9], "x": 0, "y": 4}, + {"label": "k98", "matrix": [9, 8], "x": 1, "y": 4}, + {"label": "k48", "matrix": [4, 8], "x": 2, "y": 4, "w": 1.25}, + {"label": "k94", "matrix": [9, 4], "x": 3.25, "y": 4, "w": 1.25}, + {"label": "k90", "matrix": [9, 0], "x": 4.5, "y": 4, "w": 1.5}, + {"label": "k46", "matrix": [4, 6], "x": 6, "y": 4}, + {"label": "k45", "matrix": [4, 5], "x": 7, "y": 4}, + {"label": "k92", "matrix": [9, 2], "x": 8, "y": 4}, + {"label": "k42", "matrix": [4, 2], "x": 9, "y": 4, "w": 1.5}, + {"label": "k93", "matrix": [9, 3], "x": 10.5, "y": 4, "w": 1.25}, + {"label": "k47", "matrix": [4, 7], "x": 11.75, "y": 4, "w": 1.25}, + {"label": "k91", "matrix": [9, 1], "x": 13, "y": 4}, + {"label": "k41", "matrix": [4, 1], "x": 14, "y": 4} + ] + } + } +} diff --git a/keyboards/jones/v1/rules.mk b/keyboards/jones/v1/rules.mk @@ -1,15 +0,0 @@ -# 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = yes # Audio output -ENCODER_ENABLE = yes # Rotary Encoder - -LTO_ENABLE = yes diff --git a/keyboards/jorne/rev1/info.json b/keyboards/jorne/rev1/info.json @@ -1,92 +0,0 @@ -{ - "keyboard_name": "Jorne", - "manufacturer": "joric", - "url": "https://github.com/joric/jorne/wiki", - "maintainer": "joric", - "usb": { - "vid": "0x4753", - "pid": "0x0001", - "device_version": "0.0.1" - }, - "matrix_pins": { - "cols": ["F4", "F5", "F6", "F7", "B1", "B3"], - "rows": ["D4", "C6", "D7", "E6"] - }, - "diode_direction": "COL2ROW", - "split": { - "enabled": true, - "soft_serial_pin": "D2", - "transport": { - "sync": { - "indicators": true, - "layer_state": true - } - } - }, - "rgblight": { - "led_count": 56, - "split_count": [28, 28] - }, - "ws2812": { - "pin": "D3" - }, - "processor": "atmega32u4", - "bootloader": "caterina", - "layouts": { - "LAYOUT": { - "layout": [ - {"matrix": [3, 0], "x": 0, "y": 1.125}, - {"matrix": [0, 0], "x": 1, "y": 0.375}, - {"matrix": [0, 1], "x": 2, "y": 0.375}, - {"matrix": [0, 2], "x": 3, "y": 0.125}, - {"matrix": [0, 3], "x": 4, "y": 0}, - {"matrix": [0, 4], "x": 5, "y": 0.125}, - {"matrix": [0, 5], "x": 6, "y": 0.25}, - - {"matrix": [4, 5], "x": 10.5, "y": 0.25}, - {"matrix": [4, 4], "x": 11.5, "y": 0.125}, - {"matrix": [4, 3], "x": 12.5, "y": 0}, - {"matrix": [4, 2], "x": 13.5, "y": 0.125}, - {"matrix": [4, 1], "x": 14.5, "y": 0.375}, - {"matrix": [4, 0], "x": 15.5, "y": 0.375}, - {"matrix": [7, 0], "x": 16.5, "y": 1.125}, - - {"matrix": [1, 0], "x": 1, "y": 1.375}, - {"matrix": [1, 1], "x": 2, "y": 1.375}, - {"matrix": [1, 2], "x": 3, "y": 1.125}, - {"matrix": [1, 3], "x": 4, "y": 1}, - {"matrix": [1, 4], "x": 5, "y": 1.125}, - {"matrix": [1, 5], "x": 6, "y": 1.25}, - - {"matrix": [5, 5], "x": 10.5, "y": 1.25}, - {"matrix": [5, 4], "x": 11.5, "y": 1.125}, - {"matrix": [5, 3], "x": 12.5, "y": 1}, - {"matrix": [5, 2], "x": 13.5, "y": 1.125}, - {"matrix": [5, 1], "x": 14.5, "y": 1.375}, - {"matrix": [5, 0], "x": 15.5, "y": 1.375}, - - {"matrix": [2, 0], "x": 1, "y": 2.375}, - {"matrix": [2, 1], "x": 2, "y": 2.375}, - {"matrix": [2, 2], "x": 3, "y": 2.125}, - {"matrix": [2, 3], "x": 4, "y": 2}, - {"matrix": [2, 4], "x": 5, "y": 2.125}, - {"matrix": [2, 5], "x": 6, "y": 2.25}, - - {"matrix": [6, 5], "x": 10.5, "y": 2.25}, - {"matrix": [6, 4], "x": 11.5, "y": 2.125}, - {"matrix": [6, 3], "x": 12.5, "y": 2}, - {"matrix": [6, 2], "x": 13.5, "y": 2.125}, - {"matrix": [6, 1], "x": 14.5, "y": 2.375}, - {"matrix": [6, 0], "x": 15.5, "y": 2.375}, - - {"matrix": [3, 3], "x": 5, "y": 4}, - {"matrix": [3, 4], "x": 6, "y": 4}, - {"matrix": [3, 5], "x": 7, "y": 3.5, "h": 1.5}, - - {"matrix": [7, 5], "x": 9.5, "y": 3.5, "h": 1.5}, - {"matrix": [7, 4], "x": 10.5, "y": 4}, - {"matrix": [7, 3], "x": 11.5, "y": 4} - ] - } - } -} diff --git a/keyboards/jorne/rev1/keyboard.json b/keyboards/jorne/rev1/keyboard.json @@ -0,0 +1,102 @@ +{ + "keyboard_name": "Jorne", + "manufacturer": "joric", + "url": "https://github.com/joric/jorne/wiki", + "maintainer": "joric", + "usb": { + "vid": "0x4753", + "pid": "0x0001", + "device_version": "0.0.1" + }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3"], + "rows": ["D4", "C6", "D7", "E6"] + }, + "diode_direction": "COL2ROW", + "split": { + "enabled": true, + "soft_serial_pin": "D2", + "transport": { + "sync": { + "indicators": true, + "layer_state": true + } + } + }, + "rgblight": { + "led_count": 56, + "split_count": [28, 28] + }, + "ws2812": { + "pin": "D3" + }, + "processor": "atmega32u4", + "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "rgblight": true, + "oled": true + }, + "build": { + "lto": true + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [3, 0], "x": 0, "y": 1.125}, + {"matrix": [0, 0], "x": 1, "y": 0.375}, + {"matrix": [0, 1], "x": 2, "y": 0.375}, + {"matrix": [0, 2], "x": 3, "y": 0.125}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0.125}, + {"matrix": [0, 5], "x": 6, "y": 0.25}, + + {"matrix": [4, 5], "x": 10.5, "y": 0.25}, + {"matrix": [4, 4], "x": 11.5, "y": 0.125}, + {"matrix": [4, 3], "x": 12.5, "y": 0}, + {"matrix": [4, 2], "x": 13.5, "y": 0.125}, + {"matrix": [4, 1], "x": 14.5, "y": 0.375}, + {"matrix": [4, 0], "x": 15.5, "y": 0.375}, + {"matrix": [7, 0], "x": 16.5, "y": 1.125}, + + {"matrix": [1, 0], "x": 1, "y": 1.375}, + {"matrix": [1, 1], "x": 2, "y": 1.375}, + {"matrix": [1, 2], "x": 3, "y": 1.125}, + {"matrix": [1, 3], "x": 4, "y": 1}, + {"matrix": [1, 4], "x": 5, "y": 1.125}, + {"matrix": [1, 5], "x": 6, "y": 1.25}, + + {"matrix": [5, 5], "x": 10.5, "y": 1.25}, + {"matrix": [5, 4], "x": 11.5, "y": 1.125}, + {"matrix": [5, 3], "x": 12.5, "y": 1}, + {"matrix": [5, 2], "x": 13.5, "y": 1.125}, + {"matrix": [5, 1], "x": 14.5, "y": 1.375}, + {"matrix": [5, 0], "x": 15.5, "y": 1.375}, + + {"matrix": [2, 0], "x": 1, "y": 2.375}, + {"matrix": [2, 1], "x": 2, "y": 2.375}, + {"matrix": [2, 2], "x": 3, "y": 2.125}, + {"matrix": [2, 3], "x": 4, "y": 2}, + {"matrix": [2, 4], "x": 5, "y": 2.125}, + {"matrix": [2, 5], "x": 6, "y": 2.25}, + + {"matrix": [6, 5], "x": 10.5, "y": 2.25}, + {"matrix": [6, 4], "x": 11.5, "y": 2.125}, + {"matrix": [6, 3], "x": 12.5, "y": 2}, + {"matrix": [6, 2], "x": 13.5, "y": 2.125}, + {"matrix": [6, 1], "x": 14.5, "y": 2.375}, + {"matrix": [6, 0], "x": 15.5, "y": 2.375}, + + {"matrix": [3, 3], "x": 5, "y": 4}, + {"matrix": [3, 4], "x": 6, "y": 4}, + {"matrix": [3, 5], "x": 7, "y": 3.5, "h": 1.5}, + + {"matrix": [7, 5], "x": 9.5, "y": 3.5, "h": 1.5}, + {"matrix": [7, 4], "x": 10.5, "y": 4}, + {"matrix": [7, 3], "x": 11.5, "y": 4} + ] + } + } +} diff --git a/keyboards/jorne/rev1/rules.mk b/keyboards/jorne/rev1/rules.mk @@ -1,2 +0,0 @@ -OLED_ENABLE = yes # Enable OLED -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow diff --git a/keyboards/jorne/rules.mk b/keyboards/jorne/rules.mk @@ -1,14 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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 -LTO_ENABLE = yes - DEFAULT_FOLDER = jorne/rev1 diff --git a/keyboards/joshajohnson/hub16/info.json b/keyboards/joshajohnson/hub16/info.json @@ -37,6 +37,13 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgblight": true, + "encoder": true + }, "debounce": 20, "layouts": { "LAYOUT": { diff --git a/keyboards/joshajohnson/hub16/rules.mk b/keyboards/joshajohnson/hub16/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# CUSTOM_MATRIX = lite # Custom scanning of matrix -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Rotary Encoder support SRC = matrix.c diff --git a/keyboards/jpe230/big_knob/info.json b/keyboards/jpe230/big_knob/info.json @@ -16,7 +16,8 @@ "extrakey": true, "mousekey": true, "encoder": true, - "backlight": true + "backlight": true, + "quantum_painter": true }, "matrix_pins": { "direct": [ diff --git a/keyboards/jpe230/big_knob/rules.mk b/keyboards/jpe230/big_knob/rules.mk @@ -1,3 +1,2 @@ -QUANTUM_PAINTER_ENABLE = yes QUANTUM_PAINTER_DRIVERS += st7735_spi SRC += gfx/logo.qgf.c