From d0e1d36144e1c1b2269be171c748a01f15ec32f2 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu, 18 Apr 2024 17:49:15 -0700 Subject: Data-Driven Keyboard Conversions: J (#23547) --- keyboards/jian/handwired/info.json | 70 --------------------- keyboards/jian/handwired/keyboard.json | 70 +++++++++++++++++++++ keyboards/jian/handwired/rules.mk | 5 -- keyboards/jian/info.json | 3 + keyboards/jian/nsrev2/info.json | 100 ------------------------------ keyboards/jian/nsrev2/keyboard.json | 103 +++++++++++++++++++++++++++++++ keyboards/jian/nsrev2/rules.mk | 6 -- keyboards/jian/rev1/info.json | 104 ------------------------------- keyboards/jian/rev1/keyboard.json | 109 +++++++++++++++++++++++++++++++++ keyboards/jian/rev1/rules.mk | 7 --- keyboards/jian/rev2/info.json | 103 ------------------------------- keyboards/jian/rev2/keyboard.json | 107 ++++++++++++++++++++++++++++++++ keyboards/jian/rev2/rules.mk | 6 -- keyboards/jian/rules.mk | 1 - 14 files changed, 392 insertions(+), 402 deletions(-) delete mode 100644 keyboards/jian/handwired/info.json create mode 100644 keyboards/jian/handwired/keyboard.json delete mode 100644 keyboards/jian/handwired/rules.mk delete mode 100644 keyboards/jian/nsrev2/info.json create mode 100644 keyboards/jian/nsrev2/keyboard.json delete mode 100644 keyboards/jian/nsrev2/rules.mk delete mode 100644 keyboards/jian/rev1/info.json create mode 100644 keyboards/jian/rev1/keyboard.json delete mode 100644 keyboards/jian/rev1/rules.mk delete mode 100644 keyboards/jian/rev2/info.json create mode 100644 keyboards/jian/rev2/keyboard.json delete mode 100644 keyboards/jian/rev2/rules.mk (limited to 'keyboards/jian') diff --git a/keyboards/jian/handwired/info.json b/keyboards/jian/handwired/info.json deleted file mode 100644 index dc68963b6b..0000000000 --- a/keyboards/jian/handwired/info.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "keyboard_name": "Huma", - "usb": { - "device_version": "0.1.0" - }, - "matrix_pins": { - "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B4", "E6", "D7", "C6", "D4", "D0", "D1"], - "rows": ["D3", "D2", "B5", "B6"] - }, - "diode_direction": "COL2ROW", - "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": [0, 7], "x": 10, "y": 0.375}, - {"matrix": [0, 8], "x": 11, "y": 0.25}, - {"matrix": [0, 9], "x": 12, "y": 0}, - {"matrix": [0, 10], "x": 13, "y": 0.25}, - {"matrix": [0, 11], "x": 14, "y": 0.625}, - {"matrix": [0, 12], "x": 15, "y": 0.75}, - {"matrix": [0, 13], "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": [1, 7], "x": 10, "y": 1.375}, - {"matrix": [1, 8], "x": 11, "y": 1.25}, - {"matrix": [1, 9], "x": 12, "y": 1}, - {"matrix": [1, 10], "x": 13, "y": 1.25}, - {"matrix": [1, 11], "x": 14, "y": 1.625}, - {"matrix": [1, 12], "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": [2, 7], "x": 10, "y": 2.375}, - {"matrix": [2, 8], "x": 11, "y": 2.25}, - {"matrix": [2, 9], "x": 12, "y": 2}, - {"matrix": [2, 10], "x": 13, "y": 2.25}, - {"matrix": [2, 11], "x": 14, "y": 2.625}, - {"matrix": [2, 12], "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": [3, 7], "x": 9, "y": 3.5}, - {"matrix": [3, 8], "x": 10, "y": 3.375}, - {"matrix": [3, 9], "x": 11, "y": 3.25} - ] - } - } -} diff --git a/keyboards/jian/handwired/keyboard.json b/keyboards/jian/handwired/keyboard.json new file mode 100644 index 0000000000..dc68963b6b --- /dev/null +++ b/keyboards/jian/handwired/keyboard.json @@ -0,0 +1,70 @@ +{ + "keyboard_name": "Huma", + "usb": { + "device_version": "0.1.0" + }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B4", "E6", "D7", "C6", "D4", "D0", "D1"], + "rows": ["D3", "D2", "B5", "B6"] + }, + "diode_direction": "COL2ROW", + "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": [0, 7], "x": 10, "y": 0.375}, + {"matrix": [0, 8], "x": 11, "y": 0.25}, + {"matrix": [0, 9], "x": 12, "y": 0}, + {"matrix": [0, 10], "x": 13, "y": 0.25}, + {"matrix": [0, 11], "x": 14, "y": 0.625}, + {"matrix": [0, 12], "x": 15, "y": 0.75}, + {"matrix": [0, 13], "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": [1, 7], "x": 10, "y": 1.375}, + {"matrix": [1, 8], "x": 11, "y": 1.25}, + {"matrix": [1, 9], "x": 12, "y": 1}, + {"matrix": [1, 10], "x": 13, "y": 1.25}, + {"matrix": [1, 11], "x": 14, "y": 1.625}, + {"matrix": [1, 12], "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": [2, 7], "x": 10, "y": 2.375}, + {"matrix": [2, 8], "x": 11, "y": 2.25}, + {"matrix": [2, 9], "x": 12, "y": 2}, + {"matrix": [2, 10], "x": 13, "y": 2.25}, + {"matrix": [2, 11], "x": 14, "y": 2.625}, + {"matrix": [2, 12], "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": [3, 7], "x": 9, "y": 3.5}, + {"matrix": [3, 8], "x": 10, "y": 3.375}, + {"matrix": [3, 9], "x": 11, "y": 3.25} + ] + } + } +} diff --git a/keyboards/jian/handwired/rules.mk b/keyboards/jian/handwired/rules.mk deleted file mode 100644 index a0c271ea25..0000000000 --- a/keyboards/jian/handwired/rules.mk +++ /dev/null @@ -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 index f0b0261dc9..c9f6f46c1a 100644 --- 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 deleted file mode 100644 index 4ea315f51e..0000000000 --- a/keyboards/jian/nsrev2/info.json +++ /dev/null @@ -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 new file mode 100644 index 0000000000..2981adf9b5 --- /dev/null +++ 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 deleted file mode 100644 index a05436d218..0000000000 --- a/keyboards/jian/nsrev2/rules.mk +++ /dev/null @@ -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 deleted file mode 100644 index 3cfc026667..0000000000 --- a/keyboards/jian/rev1/info.json +++ /dev/null @@ -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 new file mode 100644 index 0000000000..1a8957d8b3 --- /dev/null +++ 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 deleted file mode 100644 index bd3228c26e..0000000000 --- a/keyboards/jian/rev1/rules.mk +++ /dev/null @@ -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 deleted file mode 100644 index ebd015c9a4..0000000000 --- a/keyboards/jian/rev2/info.json +++ /dev/null @@ -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 new file mode 100644 index 0000000000..e64df224a5 --- /dev/null +++ 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 deleted file mode 100644 index e8415063bc..0000000000 --- a/keyboards/jian/rev2/rules.mk +++ /dev/null @@ -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 index 7227083305..c19fa00b5c 100644 --- a/keyboards/jian/rules.mk +++ b/keyboards/jian/rules.mk @@ -1,2 +1 @@ DEFAULT_FOLDER = jian/rev2 -LTO_ENABLE = yes -- cgit v1.2.3