summaryrefslogtreecommitdiff
path: root/keyboards/jian
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/jian')
-rw-r--r--keyboards/jian/handwired/config.h25
-rw-r--r--keyboards/jian/handwired/handwired.c2
-rw-r--r--keyboards/jian/handwired/handwired.h30
-rw-r--r--keyboards/jian/handwired/info.json64
-rw-r--r--keyboards/jian/info.json60
-rw-r--r--keyboards/jian/jian.c1
-rw-r--r--keyboards/jian/jian.h19
-rw-r--r--keyboards/jian/keymaps/advanced/keymap.c20
-rw-r--r--keyboards/jian/keymaps/default/keymap.c20
-rw-r--r--keyboards/jian/keymaps/left_hand/keymap.c70
-rw-r--r--keyboards/jian/keymaps/via/keymap.c10
-rw-r--r--keyboards/jian/nsrev2/config.h8
-rw-r--r--keyboards/jian/nsrev2/info.json64
-rw-r--r--keyboards/jian/nsrev2/nsrev2.c2
-rw-r--r--keyboards/jian/nsrev2/nsrev2.h39
-rw-r--r--keyboards/jian/rev1/config.h7
-rw-r--r--keyboards/jian/rev1/info.json64
-rw-r--r--keyboards/jian/rev1/rev1.h36
-rw-r--r--keyboards/jian/rev2/config.h7
-rw-r--r--keyboards/jian/rev2/info.json64
-rw-r--r--keyboards/jian/rev2/rev2.c2
-rw-r--r--keyboards/jian/rev2/rev2.h58
22 files changed, 316 insertions, 356 deletions
diff --git a/keyboards/jian/handwired/config.h b/keyboards/jian/handwired/config.h
deleted file mode 100644
index d968a5bf93..0000000000
--- a/keyboards/jian/handwired/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-
-#define DIODE_DIRECTION COL2ROW
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D3, D2, B5, B6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B4, E6, D7, C6, D4, D0, D1 }
diff --git a/keyboards/jian/handwired/handwired.c b/keyboards/jian/handwired/handwired.c
index 2c14518299..f803394c74 100644
--- a/keyboards/jian/handwired/handwired.c
+++ b/keyboards/jian/handwired/handwired.c
@@ -1,4 +1,4 @@
-#include "handwired.h"
+#include "quantum.h"
const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
{{13, 0}, {12, 0}, {11, 0}, {10, 0}, {9, 0}, {8, 0}, {7, 0}, {6, 0}, {5, 0}, {4, 0}, {3, 0}, {2, 0}, {1, 0}, {0, 0}},
diff --git a/keyboards/jian/handwired/handwired.h b/keyboards/jian/handwired/handwired.h
deleted file mode 100644
index 9b388b94ae..0000000000
--- a/keyboards/jian/handwired/handwired.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#pragma once
-
-#include "jian.h"
-
-#define XXX KC_NO
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, L06, R06, R05, R04, R03, R02, R01, R00, \
- L11, L12, L13, L14, L15, L16, R16, R15, R14, R13, R12, R11, \
- L21, L22, L23, L24, L25, L26, R26, R25, R24, R23, R22, R21, \
- L34, L35, L36, R36, R35, R34 \
-) \
-{ \
- {L00, L01, L02, L03, L04, L05, L06, R06, R05, R04, R03, R02, R01, R00}, \
- {XXX, L11, L12, L13, L14, L15, L16, R16, R15, R14, R13, R12, R11, XXX}, \
- {XXX, L21, L22, L23, L24, L25, L26, R26, R25, R24, R23, R22, R21, XXX}, \
- {XXX, XXX, XXX, XXX, L34, L35, L36, R36, R35, R34, XXX, XXX, XXX, XXX} \
-}
-
-#define LAYOUT_symmetric( \
- K00, K01, K02, K03, K04, K05, K06, \
- K11, K12, K13, K14, K15, K16, \
- K21, K22, K23, K24, K25, K26, \
- K34, K35, K36 \
-) \
-{ \
- {K00, K01, K02, K03, K04, K05, K06, K06, K05, K04, K03, K02, K01, K00}, \
- {XXX, K11, K12, K13, K14, K15, K16, K16, K15, K14, K13, K12, K11, XXX}, \
- {XXX, K21, K22, K23, K24, K25, K26, K26, K25, K24, K23, K22, K21, XXX}, \
- {XXX, XXX, XXX, XXX, K34, K35, K36, K36, K35, K34, XXX, XXX, XXX, XXX} \
-}
diff --git a/keyboards/jian/handwired/info.json b/keyboards/jian/handwired/info.json
index 712c3d9b01..dc68963b6b 100644
--- a/keyboards/jian/handwired/info.json
+++ b/keyboards/jian/handwired/info.json
@@ -3,6 +3,68 @@
"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"
+ "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/info.json b/keyboards/jian/info.json
index 2e59944921..f0b0261dc9 100644
--- a/keyboards/jian/info.json
+++ b/keyboards/jian/info.json
@@ -5,65 +5,5 @@
"usb": {
"vid": "0xC0DE",
"pid": "0x1337"
- },
- "layouts": {
- "LAYOUT": {
- "layout": [
- { "label": "Super", "x": 0, "y": 1.5 },
- { "label": "~", "x": 1, "y": 0.75 },
- { "label": "Q", "x": 2, "y": 0.625 },
- { "label": "W", "x": 3, "y": 0.25 },
- { "label": "E", "x": 4, "y": 0 },
- { "label": "R", "x": 5, "y": 0.25 },
- { "label": "T", "x": 6, "y": 0.375 },
-
- { "label": "Y", "x": 10, "y": 0.375 },
- { "label": "U", "x": 11, "y": 0.25 },
- { "label": "I", "x": 12, "y": 0 },
- { "label": "O", "x": 13, "y": 0.25 },
- { "label": "P", "x": 14, "y": 0.625 },
- { "label": "{[", "x": 15, "y": 0.75 },
- { "label": "}]", "x": 16, "y": 1.5 },
-
-
- { "label": "Ctrl", "x": 1, "y": 1.75 },
- { "label": "A", "x": 2, "y": 1.625 },
- { "label": "S", "x": 3, "y": 1.25 },
- { "label": "D", "x": 4, "y": 1 },
- { "label": "F", "x": 5, "y": 1.25 },
- { "label": "G", "x": 6, "y": 1.375 },
-
- { "label": "H", "x": 10, "y": 1.375 },
- { "label": "J", "x": 11, "y": 1.25 },
- { "label": "K", "x": 12, "y": 1 },
- { "label": "L", "x": 13, "y": 1.25 },
- { "label": ":;", "x": 14, "y": 1.625 },
- { "label": "\"'", "x": 15, "y": 1.75 },
-
-
- { "label": "Alt", "x": 1, "y": 2.75 },
- { "label": "Z", "x": 2, "y": 2.625 },
- { "label": "X", "x": 3, "y": 2.25 },
- { "label": "C", "x": 4, "y": 2 },
- { "label": "V", "x": 5, "y": 2.25 },
- { "label": "B", "x": 6, "y": 2.375 },
-
- { "label": "N", "x": 10, "y": 2.375 },
- { "label": "M", "x": 11, "y": 2.25 },
- { "label": "<,", "x": 12, "y": 2 },
- { "label": ">.", "x": 13, "y": 2.25 },
- { "label": "?/", "x": 14, "y": 2.625 },
- { "label": "|\\", "x": 15, "y": 2.75 },
-
-
- { "label": "Tab", "x": 5, "y": 3.25 },
- { "label": "Spc", "x": 6, "y": 3.375 },
- { "label": "Enter", "x": 7, "y": 3.5 },
-
- { "label": "Esc", "x": 9, "y": 3.5 },
- { "label": "Bscp", "x": 10, "y": 3.375 },
- { "label": "Del", "x": 11, "y": 3.25 }
- ]
- }
}
}
diff --git a/keyboards/jian/jian.c b/keyboards/jian/jian.c
deleted file mode 100644
index e85b8554f0..0000000000
--- a/keyboards/jian/jian.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "jian.h"
diff --git a/keyboards/jian/jian.h b/keyboards/jian/jian.h
deleted file mode 100644
index d09d056e9b..0000000000
--- a/keyboards/jian/jian.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_jian_handwired
- #include "handwired.h"
-#endif
-
-#ifdef KEYBOARD_jian_rev1
- #include "rev1.h"
-#endif
-
-#ifdef KEYBOARD_jian_rev2
-#include "rev2.h"
-#endif
-
-#ifdef KEYBOARD_jian_nsrev2
- #include "nsrev2.h"
-#endif
diff --git a/keyboards/jian/keymaps/advanced/keymap.c b/keyboards/jian/keymaps/advanced/keymap.c
index 6b308a4820..a825e061b5 100644
--- a/keyboards/jian/keymaps/advanced/keymap.c
+++ b/keyboards/jian/keymaps/advanced/keymap.c
@@ -211,18 +211,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______
),
-[_ADJUST] = LAYOUT_symmetric(
- QK_BOOT, DB_TOGG, AS_UP, CH_WMN, CH_CMK, CH_QWE, CH_DVK,
- AS_RPT, AS_TOGG, XXXXXXX, XXXXXXX, QWERTY, PLOVER,
- BL_ADJ, AS_DOWN, XXXXXXX, XXXXXXX, ISO, THUMB_ALT,
- _______, SW_TG, _______
+[_ADJUST] = LAYOUT(
+ QK_BOOT, DB_TOGG, AS_UP, CH_WMN, CH_CMK, CH_QWE, CH_DVK, CH_DVK, CH_QWE, CH_CMK, CH_WMN, AS_UP, DB_TOGG, QK_BOOT,
+ AS_RPT, AS_TOGG, XXXXXXX, XXXXXXX, QWERTY, PLOVER, PLOVER, QWERTY, XXXXXXX, XXXXXXX, AS_TOGG, AS_RPT,
+ BL_ADJ, AS_DOWN, XXXXXXX, XXXXXXX, ISO, THUMB_ALT, THUMB_ALT, ISO, XXXXXXX, XXXXXXX, AS_DOWN, BL_ADJ,
+ _______, SW_TG, _______, _______, SW_TG, _______
),
#if defined(RGBLIGHT) | defined(BACKLIGHT_ENABLE)
-[_BCKLT_ADJ] = LAYOUT_symmetric(
- XXXXXXX, XXXXXXX, XXXXXXX, BL_UP, RGB_VAI, RGB_HUD, RGB_HUI,
- XXXXXXX, XXXXXXX, BL_DOWN, RGB_VAD, RGB_SAD, RGB_SAI,
- BL_ADJ, BL_BRTG, BL_TOGG, RGB_TOG, RGB_RMOD,RGB_MOD,
- _______, _______, _______
+[_BCKLT_ADJ] = LAYOUT(
+ XXXXXXX, XXXXXXX, XXXXXXX, BL_UP, RGB_VAI, RGB_HUD, RGB_HUI, RGB_HUI, RGB_HUD, RGB_VAI, BL_UP, XXXXXXX, XXXXXXX, XXXXXXX,
+ XXXXXXX, XXXXXXX, BL_DOWN, RGB_VAD, RGB_SAD, RGB_SAI, RGB_SAI, RGB_SAD, RGB_VAD, BL_DOWN, XXXXXXX, XXXXXXX,
+ BL_ADJ, BL_BRTG, BL_TOGG, RGB_TOG, RGB_RMOD,RGB_MOD, RGB_MOD, RGB_RMOD,RGB_TOG, BL_TOGG, BL_BRTG, BL_ADJ,
+ _______, _______, _______, _______, _______, _______
),
#endif // defined(RGBLIGHT) | defined(BACKLIGHT_ENABLE)
#ifdef TRAINING_HALFES_LOCK
diff --git a/keyboards/jian/keymaps/default/keymap.c b/keyboards/jian/keymaps/default/keymap.c
index 3948dd119f..4d0de652f1 100644
--- a/keyboards/jian/keymaps/default/keymap.c
+++ b/keyboards/jian/keymaps/default/keymap.c
@@ -71,19 +71,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______
),
-[_ADJUST] = LAYOUT_symmetric(
- QK_BOOT, DB_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
- XXXXXXX, WORKMAN, COLEMAK, DVORAK, QWERTY, XXXXXXX,
- TG(_BCKLT_ADJ), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
- _______, SW_TG, _______
+[_ADJUST] = LAYOUT(
+ QK_BOOT, DB_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DB_TOGG, QK_BOOT,
+ XXXXXXX, WORKMAN, COLEMAK, DVORAK, QWERTY, XXXXXXX, XXXXXXX, QWERTY, DVORAK, COLEMAK, WORKMAN, XXXXXXX,
+ TG(_BCKLT_ADJ), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG(_BCKLT_ADJ),
+ _______, SW_TG, _______, _______, SW_TG, _______
),
#if defined(RGBLIGHT) || defined(BACKLIGHT_ENABLE)
-[_BCKLT_ADJ] = LAYOUT_symmetric(
- XXXXXXX, XXXXXXX, XXXXXXX, BL_UP, RGB_VAI, RGB_HUD, RGB_HUI,
- XXXXXXX, XXXXXXX, BL_DOWN, RGB_VAD, RGB_SAD, RGB_SAI,
- TG(_BCKLT_ADJ), BL_BRTG, BL_TOGG, RGB_TOG, RGB_RMOD,RGB_MOD,
- _______, _______, _______
+[_BCKLT_ADJ] = LAYOUT(
+ XXXXXXX, XXXXXXX, XXXXXXX, BL_UP, RGB_VAI, RGB_HUD, RGB_HUI, RGB_HUI, RGB_HUD, RGB_VAI, BL_UP, XXXXXXX, XXXXXXX, XXXXXXX,
+ XXXXXXX, XXXXXXX, BL_DOWN, RGB_VAD, RGB_SAD, RGB_SAI, RGB_SAI, RGB_SAD, RGB_VAD, BL_DOWN, XXXXXXX, XXXXXXX,
+ TG(_BCKLT_ADJ), BL_BRTG, BL_TOGG, RGB_TOG, RGB_RMOD,RGB_MOD, RGB_MOD, RGB_RMOD,RGB_TOG, BL_TOGG, BL_BRTG, TG(_BCKLT_ADJ),
+ _______, _______, _______, _______, _______, _______
)
#endif // defined(RGBLIGHT) || defined(BACKLIGHT_ENABLE)
diff --git a/keyboards/jian/keymaps/left_hand/keymap.c b/keyboards/jian/keymaps/left_hand/keymap.c
index 5f6b93bc6e..3f67215b8b 100644
--- a/keyboards/jian/keymaps/left_hand/keymap.c
+++ b/keyboards/jian/keymaps/left_hand/keymap.c
@@ -26,46 +26,46 @@ enum jian_layers {
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_DFLT_L] = LAYOUT_symmetric_left(
- KC_LSFT, LGUI_T(KC_GRV), KC_Q, KC_W, KC_E, KC_R, KC_T,
- KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G,
- KC_LALT, KC_Z, KC_X, KC_C, KC_V, KC_B,
- LT(_RAIS_L, KC_BSPC), LT(_DFLT_R, KC_SPC), LT(_LOWR_L, KC_ENT)
+[_DFLT_L] = LAYOUT(
+ KC_LSFT, LGUI_T(KC_GRV), KC_Q, KC_W, KC_E, KC_R, KC_T, KC_T, KC_R, KC_E, KC_W, KC_Q, LGUI_T(KC_GRV), KC_LSFT,
+ KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_G, KC_F, KC_D, KC_S, KC_A, KC_LCTL,
+ KC_LALT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_V, KC_C, KC_X, KC_Z, KC_LALT,
+ LT(_RAIS_L, KC_BSPC), LT(_DFLT_R, KC_SPC), LT(_LOWR_L, KC_ENT), LT(_LOWR_L, KC_ENT), LT(_DFLT_R, KC_SPC), LT(_RAIS_L, KC_BSPC),
),
-[_DFLT_R] = LAYOUT_symmetric_right(
- KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,
- KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
- KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_BSLS,
- LT(_LOWR_R, KC_ESC), _______, LT(_RAIS_R, KC_DEL)
+[_DFLT_R] = LAYOUT(
+ KC_RBRC, KC_LBRC, KC_P, KC_O, KC_I, KC_U, KC_Y, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,
+ KC_QUOT, KC_SCLN, KC_L, KC_K, KC_J, KC_H, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
+ KC_BSLS, KC_SLSH, KC_DOT, KC_COMM, KC_M, KC_N, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_BSLS,
+ LT(_RAIS_R, KC_DEL), _______, LT(_LOWR_R, KC_ESC), LT(_LOWR_R, KC_ESC), _______, LT(_RAIS_R, KC_DEL)
),
-[_RAIS_L] = LAYOUT_symmetric_left(
- _______, LGUI_T(KC_CAPS), KC_SCRL, KC_HOME, KC_PSCR, KC_PGUP, KC_VOLU,
- LCTL_T(KC_APP), KC_INS, KC_LEFT, KC_UP, KC_RGHT, KC_MUTE,
- _______, KC_PAUS, KC_END, KC_DOWN, KC_PGDN, KC_VOLD,
- _______, LT(_RAIS_R, KC_TAB) , LT(_ADJUST, KC_ESC)
+[_RAIS_L] = LAYOUT(
+ _______, LGUI_T(KC_CAPS), KC_SCRL, KC_HOME, KC_PSCR, KC_PGUP, KC_VOLU, KC_VOLU, KC_PGUP, KC_PSCR, KC_HOME, KC_SCRL, LGUI_T(KC_CAPS), _______,
+ LCTL_T(KC_APP), KC_INS, KC_LEFT, KC_UP, KC_RGHT, KC_MUTE, KC_MUTE, KC_RGHT, KC_UP, KC_LEFT, KC_INS, LGUI_T(KC_APP),
+ _______, KC_PAUS, KC_END, KC_DOWN, KC_PGDN, KC_VOLD, KC_VOLD, KC_PGDN, KC_DOWN, KC_END, KC_PAUS, _______,
+ _______, LT(_RAIS_R, KC_TAB) , LT(_ADJUST, KC_ESC), LT(_ADJUST, KC_ESC), LT(_RAIS_R, KC_TAB), _______
),
-[_RAIS_R] = LAYOUT_symmetric_left(
- KC_RSFT, KC_RGUI, XXXXXXX, KC_F7, KC_F8, KC_F9, KC_F10,
- KC_RCTL, XXXXXXX, KC_F4, KC_F5, KC_F6, KC_F11,
- KC_LALT, XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F12,
- LT(_ADJUST, KC_DEL), _______, _______
+[_RAIS_R] = LAYOUT(
+ KC_RSFT, KC_RGUI, XXXXXXX, KC_F7, KC_F8, KC_F9, KC_F10, KC_F10, KC_F9, KC_F8, KC_F7, XXXXXXX, KC_RGUI, KC_RSFT,
+ KC_RCTL, XXXXXXX, KC_F4, KC_F5, KC_F6, KC_F11, KC_F11, KC_F6, KC_F5, KC_F4, XXXXXXX, KC_RCTL,
+ KC_LALT, XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F12, KC_F12, KC_F3, KC_F2, KC_F1, XXXXXXX, KC_LALT,
+ LT(_ADJUST, KC_DEL), _______, _______, _______, _______, LT(_ADJUST, KC_DEL)
),
-[_LOWR_L] = LAYOUT_symmetric_left(
- _______, _______, XXXXXXX, KC_7, KC_8, KC_9, KC_0,
- _______, KC_GRV, KC_4, KC_5, KC_6, KC_MINS,
- _______, KC_0, KC_1, KC_2, KC_3, KC_EQL,
- LT(_ADJUST, KC_DEL), LT(_LOWR_R, KC_TAB), _______
+[_LOWR_L] = LAYOUT(
+ _______, _______, XXXXXXX, KC_7, KC_8, KC_9, KC_0, KC_0, KC_9, KC_8, KC_7, XXXXXXX, _______, _______,
+ _______, KC_GRV, KC_4, KC_5, KC_6, KC_MINS, KC_MINS, KC_6, KC_5, KC_4, KC_GRV, _______,
+ _______, KC_0, KC_1, KC_2, KC_3, KC_EQL, KC_EQL, KC_3, KC_2, KC_1, KC_0, _______,
+ LT(_ADJUST, KC_DEL), LT(_LOWR_R, KC_TAB), _______, _______, LT(_LOWR_R, KC_TAB), LT(_ADJUST, KC_DEL)
),
-[_LOWR_R] = LAYOUT_symmetric_left(
- _______, _______, XXXXXXX, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
- _______, KC_TILD, KC_DLR, KC_PERC, KC_CIRC, KC_UNDS,
- _______, KC_LPRN, KC_EXLM, KC_AT, KC_HASH, KC_PLUS,
- _______, _______, LT(_ADJUST, KC_ESC)
+[_LOWR_R] = LAYOUT(
+ _______, _______, XXXXXXX, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_RPRN, KC_LPRN, KC_ASTR, KC_AMPR, XXXXXXX, _______, _______,
+ _______, KC_TILD, KC_DLR, KC_PERC, KC_CIRC, KC_UNDS, KC_UNDS, KC_CIRC, KC_PERC, KC_DLR, KC_TILD, _______,
+ _______, KC_LPRN, KC_EXLM, KC_AT, KC_HASH, KC_PLUS, KC_PLUS, KC_HASH, KC_AT, KC_EXLM, KC_LPRN, _______,
+ _______, _______, LT(_ADJUST, KC_ESC), LT(_ADJUST, KC_ESC), _______, _______
),
-[_ADJUST] = LAYOUT_symmetric_left(
- QK_BOOT, DB_TOGG, XXXXXXX, BL_UP, RGB_VAI, RGB_HUD, RGB_HUI,
- XXXXXXX, XXXXXXX, BL_DOWN, RGB_VAD, RGB_SAD, RGB_SAI,
- XXXXXXX, BL_BRTG, BL_TOGG, RGB_TOG, RGB_RMOD,RGB_MOD,
- _______, _______, _______
+[_ADJUST] = LAYOUT(
+ QK_BOOT, DB_TOGG, XXXXXXX, BL_UP, RGB_VAI, RGB_HUD, RGB_HUI, RGB_HUI, RGB_HUD, RGB_VAI, BL_UP, XXXXXXX, DB_TOGG, QK_BOOT,
+ XXXXXXX, XXXXXXX, BL_DOWN, RGB_VAD, RGB_SAD, RGB_SAI, RGB_SAI, RGB_SAD, RGB_VAD, BL_DOWN, XXXXXXX, XXXXXXX,
+ XXXXXXX, BL_BRTG, BL_TOGG, RGB_TOG, RGB_RMOD,RGB_MOD, RGB_MOD, RGB_RMOD,RGB_TOG, BL_TOGG, BL_BRTG, XXXXXXX,
+ _______, _______, _______, _______, _______, _______
)
};
diff --git a/keyboards/jian/keymaps/via/keymap.c b/keyboards/jian/keymaps/via/keymap.c
index 3d6c7507ba..281cbc64eb 100644
--- a/keyboards/jian/keymaps/via/keymap.c
+++ b/keyboards/jian/keymaps/via/keymap.c
@@ -19,10 +19,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, KC_P0, KC_P1, KC_P2, KC_P3, KC_PCMM, KC_VOLD, KC_END, KC_DOWN, KC_PGDN, KC_PAUS, _______,
_______, _______, LT(3, KC_ENT), LT(3, KC_ESC), _______, _______
),
-[3] = LAYOUT_symmetric(
- QK_BOOT, DB_TOGG, XXXXXXX, BL_UP, RGB_VAI, RGB_HUD, RGB_HUI,
- XXXXXXX, XXXXXXX, BL_DOWN, RGB_VAD, RGB_SAD, RGB_SAI,
- XXXXXXX, BL_BRTG, BL_TOGG, RGB_TOG, RGB_RMOD,RGB_MOD,
- _______, SH_TOGG, _______
+[3] = LAYOUT(
+ QK_BOOT, DB_TOGG, XXXXXXX, BL_UP, RGB_VAI, RGB_HUD, RGB_HUI, RGB_HUI, RGB_HUD, RGB_VAI, BL_UP, XXXXXXX, DB_TOGG, QK_BOOT,
+ XXXXXXX, XXXXXXX, BL_DOWN, RGB_VAD, RGB_SAD, RGB_SAI, RGB_SAI, RGB_SAD, RGB_VAD, BL_DOWN, XXXXXXX, XXXXXXX,
+ XXXXXXX, BL_BRTG, BL_TOGG, RGB_TOG, RGB_RMOD,RGB_MOD, RGB_MOD, RGB_RMOD,RGB_TOG, BL_TOGG, BL_BRTG, XXXXXXX,
+ _______, SH_TOGG, _______, _______, SH_TOGG, _______
)
};
diff --git a/keyboards/jian/nsrev2/config.h b/keyboards/jian/nsrev2/config.h
index 3e2fa93f31..5eda1a6724 100644
--- a/keyboards/jian/nsrev2/config.h
+++ b/keyboards/jian/nsrev2/config.h
@@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-
-#define DIODE_DIRECTION COL2ROW
-
-
-// wiring of each half
-#define MATRIX_ROW_PINS { F4, F5, B1, B3, D1, D0, D7, E6 }
-#define MATRIX_COL_PINS { D3, D2, B4, F6, F7, B2 }
-
#define PHYSICAL_LEDS_ENABLE
/* ws2812 RGB LED */
diff --git a/keyboards/jian/nsrev2/info.json b/keyboards/jian/nsrev2/info.json
index 74121b2fda..e7ec688b88 100644
--- a/keyboards/jian/nsrev2/info.json
+++ b/keyboards/jian/nsrev2/info.json
@@ -3,6 +3,11 @@
"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,
@@ -13,5 +18,62 @@
"esc_output": "D3"
},
"processor": "atmega32u4",
- "bootloader": "qmk-dfu"
+ "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/nsrev2.c b/keyboards/jian/nsrev2/nsrev2.c
index 48827416f1..1b65d4f016 100644
--- a/keyboards/jian/nsrev2/nsrev2.c
+++ b/keyboards/jian/nsrev2/nsrev2.c
@@ -1,4 +1,4 @@
-#include "nsrev2.h"
+#include "quantum.h"
#ifdef SWAP_HANDS_ENABLE
__attribute__ ((weak))
diff --git a/keyboards/jian/nsrev2/nsrev2.h b/keyboards/jian/nsrev2/nsrev2.h
deleted file mode 100644
index 9dfb7240b1..0000000000
--- a/keyboards/jian/nsrev2/nsrev2.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#pragma once
-
-#include "jian.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
- L20, L00, L01, L12, L02, L03, L04, R04, R03, R02, R12, R01, R00, R20, \
- L10, L11, L22, L13, L14, L05, R05, R14, R13, R22, R11, R10, \
- L21, L32, L33, L23, L24, L15, R15, R24, R23, R33, R32, R21, \
- L34, L25, L35, R35, R25, R34 \
-) \
-{ \
- {L00, L01, L02, L03, L04, L05 }, \
- {L10, L11, L12, L13, L14, L15 }, \
- {L20, L21, L22, L23, L24, L25 }, \
- {XXX, XXX, L32, L33, L34, L35 }, \
- {R00, R01, R02, R03, R04, R05 }, \
- {R10, R11, R12, R13, R14, R15 }, \
- {R20, R21, R22, R23, R24, R25 }, \
- {XXX, XXX, R32, R33, R34, R35 } \
-}
-
-#define LAYOUT_symmetric( \
- K20, K00, K01, K12, K02, K03, K04, \
- K10, K11, K22, K13, K14, K05, \
- K21, K32, K33, K23, K24, K15, \
- K34, K25, K35 \
-) \
-{ \
- {K00, K01, K02, K03, K04, K05 }, \
- {K10, K11, K12, K13, K14, K15 }, \
- {K20, K21, K22, K23, K24, K25 }, \
- {XXX, XXX, K32, K33, K34, K35 }, \
- {K00, K01, K02, K03, K04, K05 }, \
- {K10, K11, K12, K13, K14, K15 }, \
- {K20, K21, K22, K23, K24, K25 }, \
- {XXX, XXX, K32, K33, K34, K35 } \
-}
diff --git a/keyboards/jian/rev1/config.h b/keyboards/jian/rev1/config.h
index 083b235a2e..a00830b7f7 100644
--- a/keyboards/jian/rev1/config.h
+++ b/keyboards/jian/rev1/config.h
@@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-
-#define DIODE_DIRECTION COL2ROW
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D3, D2, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
-
#define USE_I2C
/* Select hand configuration */
diff --git a/keyboards/jian/rev1/info.json b/keyboards/jian/rev1/info.json
index fc65cb13b8..0f1efc95b3 100644
--- a/keyboards/jian/rev1/info.json
+++ b/keyboards/jian/rev1/info.json
@@ -3,10 +3,72 @@
"usb": {
"device_version": "1.0.0"
},
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+ "rows": ["D3", "D2", "E6", "B4"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B6",
"levels": 5
},
"processor": "atmega32u4",
- "bootloader": "caterina"
+ "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/rev1.h b/keyboards/jian/rev1/rev1.h
index ee55de6287..8f42184bdf 100644
--- a/keyboards/jian/rev1/rev1.h
+++ b/keyboards/jian/rev1/rev1.h
@@ -1,43 +1,9 @@
#pragma once
-#include "jian.h"
+#include "quantum.h"
#define XXX KC_NO
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, L06, R06, R05, R04, R03, R02, R01, R00, \
- L11, L12, L13, L14, L15, L16, R16, R15, R14, R13, R12, R11, \
- L21, L22, L23, L24, L25, L26, R26, R25, R24, R23, R22, R21, \
- L34, L35, L36, R36, R35, R34 \
-) \
-{ \
- {L00, L01, L02, L03, L04, L05, L06}, \
- {XXX, L11, L12, L13, L14, L15, L16}, \
- {XXX, L21, L22, L23, L24, L25, L26}, \
- {XXX, XXX, XXX, XXX, L34, L35, L36}, \
- {R00, R01, R02, R03, R04, R05, R06}, \
- {XXX, R11, R12, R13, R14, R15, R16}, \
- {XXX, R21, R22, R23, R24, R25, R26}, \
- {XXX, XXX, XXX, XXX, R34, R35, R36} \
-}
-
-#define LAYOUT_symmetric( \
- K00, K01, K02, K03, K04, K05, K06, \
- K11, K12, K13, K14, K15, K16, \
- K21, K22, K23, K24, K25, K26, \
- K34, K35, K36 \
-) \
-{ \
- {K00, K01, K02, K03, K04, K05, K06}, \
- {XXX, K11, K12, K13, K14, K15, K16}, \
- {XXX, K21, K22, K23, K24, K25, K26}, \
- {XXX, XXX, XXX, XXX, K34, K35, K36}, \
- {K00, K01, K02, K03, K04, K05, K06}, \
- {XXX, K11, K12, K13, K14, K15, K16}, \
- {XXX, K21, K22, K23, K24, K25, K26}, \
- {XXX, XXX, XXX, XXX, K34, K35, K36} \
-}
-
#ifdef DIPS_ENABLE
#define LAYOUT_dips( \
DL0, DL1, DL2, DL3, DL4, DL5, \
diff --git a/keyboards/jian/rev2/config.h b/keyboards/jian/rev2/config.h
index 37e8f0458d..92b15fab65 100644
--- a/keyboards/jian/rev2/config.h
+++ b/keyboards/jian/rev2/config.h
@@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-
-#define DIODE_DIRECTION COL2ROW
-
-// wiring of each half
-#define MATRIX_ROW_PINS { F4, F5, B1, B3 }
-#define MATRIX_COL_PINS { D3, D2, B4, F6, F7, B2 }
-
//#define EE_HANDS
#define SPLIT_HAND_PIN E6
diff --git a/keyboards/jian/rev2/info.json b/keyboards/jian/rev2/info.json
index 642bf83efc..3f04339046 100644
--- a/keyboards/jian/rev2/info.json
+++ b/keyboards/jian/rev2/info.json
@@ -3,6 +3,11 @@
"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
@@ -15,5 +20,62 @@
"soft_serial_pin": "D1"
},
"processor": "atmega32u4",
- "bootloader": "qmk-dfu"
+ "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/rev2.c b/keyboards/jian/rev2/rev2.c
index b18676af38..1b65d4f016 100644
--- a/keyboards/jian/rev2/rev2.c
+++ b/keyboards/jian/rev2/rev2.c
@@ -1,4 +1,4 @@
-#include "rev2.h"
+#include "quantum.h"
#ifdef SWAP_HANDS_ENABLE
__attribute__ ((weak))
diff --git a/keyboards/jian/rev2/rev2.h b/keyboards/jian/rev2/rev2.h
deleted file mode 100644
index d71fc8495d..0000000000
--- a/keyboards/jian/rev2/rev2.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#pragma once
-
-#include "jian.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
- L20, L00, L01, L12, L02, L03, L04, R04, R03, R02, R12, R01, R00, R20, \
- L10, L11, L22, L13, L14, L05, R05, R14, R13, R22, R11, R10, \
- L21, L32, L33, L23, L24, L15, R15, R24, R23, R33, R32, R21, \
- L34, L25, L35, R35, R25, R34 \
-) \
-{ \
- {L00, L01, L02, L03, L04, L05 }, \
- {L10, L11, L12, L13, L14, L15 }, \
- {L20, L21, L22, L23, L24, L25 }, \
- {XXX, XXX, L32, L33, L34, L35 }, \
- {R00, R01, R02, R03, R04, R05 }, \
- {R10, R11, R12, R13, R14, R15 }, \
- {R20, R21, R22, R23, R24, R25 }, \
- {XXX, XXX, R32, R33, R34, R35 } \
-}
-
-#define LAYOUT_symmetric( \
- K20, K00, K01, K12, K02, K03, K04, \
- K10, K11, K22, K13, K14, K05, \
- K21, K32, K33, K23, K24, K15, \
- K34, K25, K35 \
-) \
-{ \
- {K00, K01, K02, K03, K04, K05 }, \
- {K10, K11, K12, K13, K14, K15 }, \
- {K20, K21, K22, K23, K24, K25 }, \
- {XXX, XXX, K32, K33, K34, K35 }, \
- {K00, K01, K02, K03, K04, K05 }, \
- {K10, K11, K12, K13, K14, K15 }, \
- {K20, K21, K22, K23, K24, K25 }, \
- {XXX, XXX, K32, K33, K34, K35 } \
-}
-
-#define LAYOUT_symmetric_left LAYOUT_symmetric
-
-#define LAYOUT_symmetric_right( \
- K04, K03, K02, K12, K01, K00, K20, \
- K05, K14, K13, K22, K11, K10, \
- K15, K24, K23, K33, K32, K21, \
- K35, K25, K34 \
-) \
-{ \
- {K00, K01, K02, K03, K04, K05 }, \
- {K10, K11, K12, K13, K14, K15 }, \
- {K20, K21, K22, K23, K24, K25 }, \
- {XXX, XXX, K32, K33, K34, K35 }, \
- {K00, K01, K02, K03, K04, K05 }, \
- {K10, K11, K12, K13, K14, K15 }, \
- {K20, K21, K22, K23, K24, K25 }, \
- {XXX, XXX, K32, K33, K34, K35 } \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 06:59:04 +0000