diff options
author | QMK Bot <hello@qmk.fm> | 2021-11-08 04:41:15 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2021-11-08 04:41:15 +0000 |
commit | adb6012de1ef65bb2d796edc480d5cc0db14d5e6 (patch) | |
tree | 766faa0429e541991edc5cd9f1fd7a03b54b0399 /keyboards/mechlovin | |
parent | 7ef13e8fefdde90f338bef78bb2ffea38b3f6b1f (diff) | |
parent | 93b3d9b33c91f4e0a2cc4528cd1e7353d691458a (diff) | |
download | qmk_firmware-adb6012de1ef65bb2d796edc480d5cc0db14d5e6.tar.gz qmk_firmware-adb6012de1ef65bb2d796edc480d5cc0db14d5e6.zip |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/mechlovin')
-rw-r--r-- | keyboards/mechlovin/pisces/config.h | 3 | ||||
-rw-r--r-- | keyboards/mechlovin/pisces/info.json | 84 | ||||
-rw-r--r-- | keyboards/mechlovin/pisces/keymaps/default/keymap.c | 28 | ||||
-rw-r--r-- | keyboards/mechlovin/pisces/keymaps/via/keymap.c | 52 | ||||
-rw-r--r-- | keyboards/mechlovin/pisces/pisces.h | 47 |
5 files changed, 163 insertions, 51 deletions
diff --git a/keyboards/mechlovin/pisces/config.h b/keyboards/mechlovin/pisces/config.h index 1debf021c..48a94eb26 100644 --- a/keyboards/mechlovin/pisces/config.h +++ b/keyboards/mechlovin/pisces/config.h | |||
@@ -72,6 +72,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
72 | // #define RGBLIGHT_EFFECT_RGB_TEST | 72 | // #define RGBLIGHT_EFFECT_RGB_TEST |
73 | // #define RGBLIGHT_EFFECT_ALTERNATING | 73 | // #define RGBLIGHT_EFFECT_ALTERNATING |
74 | #endif | 74 | #endif |
75 | |||
76 | // generated by KBFirmware JSON to QMK Parser | ||
77 | // https://noroadsleft.github.io/kbf_qmk_converter/ | ||
diff --git a/keyboards/mechlovin/pisces/info.json b/keyboards/mechlovin/pisces/info.json index f812317c1..57da5b4a0 100644 --- a/keyboards/mechlovin/pisces/info.json +++ b/keyboards/mechlovin/pisces/info.json | |||
@@ -1,8 +1,85 @@ | |||
1 | { | 1 | { |
2 | "keyboard_name": "pisces", | 2 | "keyboard_name": "pisces", |
3 | "url": "", | 3 | "url": "", |
4 | "maintainer": "qmk", | 4 | "maintainer": "mechlovin", |
5 | "layouts": { | 5 | "layouts": { |
6 | "LAYOUT_all": { | ||
7 | "layout": [ | ||
8 | {"label":"K00 (B0,E6)", "x":0, "y":0}, | ||
9 | {"label":"K01 (B0,B1)", "x":1, "y":0}, | ||
10 | {"label":"K02 (B0,B3)", "x":2, "y":0}, | ||
11 | {"label":"K03 (B0,D0)", "x":3, "y":0}, | ||
12 | {"label":"K04 (B0,D1)", "x":4, "y":0}, | ||
13 | {"label":"K05 (B0,D2)", "x":5, "y":0}, | ||
14 | {"label":"K06 (B0,D3)", "x":6, "y":0}, | ||
15 | {"label":"K07 (B0,D5)", "x":7, "y":0}, | ||
16 | {"label":"K08 (B0,F4)", "x":8, "y":0}, | ||
17 | {"label":"K09 (B0,F1)", "x":9, "y":0}, | ||
18 | {"label":"K0A (B0,D4)", "x":10, "y":0}, | ||
19 | {"label":"K0B (B0,D6)", "x":11, "y":0}, | ||
20 | {"label":"K0C (B0,D7)", "x":12, "y":0}, | ||
21 | {"label":"K0D (B0,B4)", "x":13, "y":0}, | ||
22 | {"label":"K0E (B0,B5)", "x":14, "y":0}, | ||
23 | |||
24 | {"label":"K10 (F0,E6)", "x":0, "y":1, "w":1.5}, | ||
25 | {"label":"K11 (F0,B1)", "x":1.5, "y":1}, | ||
26 | {"label":"K12 (F0,B3)", "x":2.5, "y":1}, | ||
27 | {"label":"K13 (F0,D0)", "x":3.5, "y":1}, | ||
28 | {"label":"K14 (F0,D1)", "x":4.5, "y":1}, | ||
29 | {"label":"K15 (F0,D2)", "x":5.5, "y":1}, | ||
30 | {"label":"K16 (F0,D3)", "x":6.5, "y":1}, | ||
31 | {"label":"K17 (F0,D5)", "x":7.5, "y":1}, | ||
32 | {"label":"K18 (F0,F4)", "x":8.5, "y":1}, | ||
33 | {"label":"K19 (F0,F1)", "x":9.5, "y":1}, | ||
34 | {"label":"K1A (F0,D4)", "x":10.5, "y":1}, | ||
35 | {"label":"K1B (F0,D6)", "x":11.5, "y":1}, | ||
36 | {"label":"K1C (F0,D7)", "x":12.5, "y":1}, | ||
37 | {"label":"K1D (F0,B4)", "x":13.5, "y":1, "w":1.5}, | ||
38 | {"label":"K1E (F0,B5)", "x":15, "y":1}, | ||
39 | |||
40 | {"label":"K20 (F5,E6)", "x":0, "y":2, "w":1.75}, | ||
41 | {"label":"K21 (F5,B1)", "x":1.75, "y":2}, | ||
42 | {"label":"K22 (F5,B3)", "x":2.75, "y":2}, | ||
43 | {"label":"K23 (F5,D0)", "x":3.75, "y":2}, | ||
44 | {"label":"K24 (F5,D1)", "x":4.75, "y":2}, | ||
45 | {"label":"K25 (F5,D2)", "x":5.75, "y":2}, | ||
46 | {"label":"K26 (F5,D3)", "x":6.75, "y":2}, | ||
47 | {"label":"K27 (F5,D5)", "x":7.75, "y":2}, | ||
48 | {"label":"K28 (F5,F4)", "x":8.75, "y":2}, | ||
49 | {"label":"K29 (F5,F1)", "x":9.75, "y":2}, | ||
50 | {"label":"K2A (F5,D4)", "x":10.75, "y":2}, | ||
51 | {"label":"K2B (F5,D6)", "x":11.75, "y":2}, | ||
52 | {"label":"K2C (F5,D7)", "x":12.75, "y":2}, | ||
53 | {"label":"K2D (F5,B4)", "x":13.75, "y":2, "w":1.25}, | ||
54 | {"label":"K2E (F5,B5)", "x":15, "y":2}, | ||
55 | |||
56 | {"label":"K30 (F6,E6)", "x":0, "y":3, "w":1.25}, | ||
57 | {"label":"K31 (F6,B1)", "x":1.25, "y":3}, | ||
58 | {"label":"K32 (F6,B3)", "x":2.25, "y":3}, | ||
59 | {"label":"K33 (F6,D0)", "x":3.25, "y":3}, | ||
60 | {"label":"K34 (F6,D1)", "x":4.25, "y":3}, | ||
61 | {"label":"K35 (F6,D2)", "x":5.25, "y":3}, | ||
62 | {"label":"K36 (F6,D3)", "x":6.25, "y":3}, | ||
63 | {"label":"K37 (F6,D5)", "x":7.25, "y":3}, | ||
64 | {"label":"K38 (F6,F4)", "x":8.25, "y":3}, | ||
65 | {"label":"K39 (F6,F1)", "x":9.25, "y":3}, | ||
66 | {"label":"K3A (F6,D4)", "x":10.25, "y":3}, | ||
67 | {"label":"K3B (F6,D6)", "x":11.25, "y":3}, | ||
68 | {"label":"K3C (F6,D7)", "x":12.25, "y":3, "w":1.75}, | ||
69 | {"label":"K3D (F6,B4)", "x":14, "y":3}, | ||
70 | {"label":"K3E (F6,B5)", "x":15, "y":3}, | ||
71 | |||
72 | {"label":"K40 (F7,E6)", "x":0, "y":4, "w":1.25}, | ||
73 | {"label":"K41 (F7,B1)", "x":1.25, "y":4, "w":1.25}, | ||
74 | {"label":"K42 (F7,B3)", "x":2.5, "y":4, "w":1.25}, | ||
75 | {"label":"K46 (F7,D3)", "x":3.75, "y":4, "w":6.25}, | ||
76 | {"label":"K4A (F7,D4)", "x":10, "y":4, "w":1.25}, | ||
77 | {"label":"K4B (F7,D6)", "x":11.25, "y":4, "w":1.25}, | ||
78 | {"label":"K4C (F7,D7)", "x":13, "y":4}, | ||
79 | {"label":"K4D (F7,B4)", "x":14, "y":4}, | ||
80 | {"label":"K4E (F7,B5)", "x":15, "y":4} | ||
81 | ] | ||
82 | }, | ||
6 | "LAYOUT": { | 83 | "LAYOUT": { |
7 | "layout": [ | 84 | "layout": [ |
8 | {"label":"K00 (B0,E6)", "x":0, "y":0}, | 85 | {"label":"K00 (B0,E6)", "x":0, "y":0}, |
@@ -19,6 +96,7 @@ | |||
19 | {"label":"K0B (B0,D6)", "x":11, "y":0}, | 96 | {"label":"K0B (B0,D6)", "x":11, "y":0}, |
20 | {"label":"K0C (B0,D7)", "x":12, "y":0}, | 97 | {"label":"K0C (B0,D7)", "x":12, "y":0}, |
21 | {"label":"K0D (B0,B4)", "x":13, "y":0, "w":2}, | 98 | {"label":"K0D (B0,B4)", "x":13, "y":0, "w":2}, |
99 | |||
22 | {"label":"K10 (F0,E6)", "x":0, "y":1, "w":1.5}, | 100 | {"label":"K10 (F0,E6)", "x":0, "y":1, "w":1.5}, |
23 | {"label":"K11 (F0,B1)", "x":1.5, "y":1}, | 101 | {"label":"K11 (F0,B1)", "x":1.5, "y":1}, |
24 | {"label":"K12 (F0,B3)", "x":2.5, "y":1}, | 102 | {"label":"K12 (F0,B3)", "x":2.5, "y":1}, |
@@ -34,6 +112,7 @@ | |||
34 | {"label":"K1C (F0,D7)", "x":12.5, "y":1}, | 112 | {"label":"K1C (F0,D7)", "x":12.5, "y":1}, |
35 | {"label":"K1D (F0,B4)", "x":13.5, "y":1, "w":1.5}, | 113 | {"label":"K1D (F0,B4)", "x":13.5, "y":1, "w":1.5}, |
36 | {"label":"K1E (F0,B5)", "x":15, "y":1}, | 114 | {"label":"K1E (F0,B5)", "x":15, "y":1}, |
115 | |||
37 | {"label":"K20 (F5,E6)", "x":0, "y":2, "w":1.75}, | 116 | {"label":"K20 (F5,E6)", "x":0, "y":2, "w":1.75}, |
38 | {"label":"K21 (F5,B1)", "x":1.75, "y":2}, | 117 | {"label":"K21 (F5,B1)", "x":1.75, "y":2}, |
39 | {"label":"K22 (F5,B3)", "x":2.75, "y":2}, | 118 | {"label":"K22 (F5,B3)", "x":2.75, "y":2}, |
@@ -48,6 +127,7 @@ | |||
48 | {"label":"K2B (F5,D6)", "x":11.75, "y":2}, | 127 | {"label":"K2B (F5,D6)", "x":11.75, "y":2}, |
49 | {"label":"K2D (F5,B4)", "x":12.75, "y":2, "w":2.25}, | 128 | {"label":"K2D (F5,B4)", "x":12.75, "y":2, "w":2.25}, |
50 | {"label":"K2E (F5,B5)", "x":15, "y":2}, | 129 | {"label":"K2E (F5,B5)", "x":15, "y":2}, |
130 | |||
51 | {"label":"K30 (F6,E6)", "x":0, "y":3, "w":2.25}, | 131 | {"label":"K30 (F6,E6)", "x":0, "y":3, "w":2.25}, |
52 | {"label":"K32 (F6,B3)", "x":2.25, "y":3}, | 132 | {"label":"K32 (F6,B3)", "x":2.25, "y":3}, |
53 | {"label":"K33 (F6,D0)", "x":3.25, "y":3}, | 133 | {"label":"K33 (F6,D0)", "x":3.25, "y":3}, |
@@ -62,6 +142,7 @@ | |||
62 | {"label":"K3C (F6,D7)", "x":12.25, "y":3, "w":1.75}, | 142 | {"label":"K3C (F6,D7)", "x":12.25, "y":3, "w":1.75}, |
63 | {"label":"K3D (F6,B4)", "x":14, "y":3}, | 143 | {"label":"K3D (F6,B4)", "x":14, "y":3}, |
64 | {"label":"K3E (F6,B5)", "x":15, "y":3}, | 144 | {"label":"K3E (F6,B5)", "x":15, "y":3}, |
145 | |||
65 | {"label":"K40 (F7,E6)", "x":0, "y":4, "w":1.25}, | 146 | {"label":"K40 (F7,E6)", "x":0, "y":4, "w":1.25}, |
66 | {"label":"K41 (F7,B1)", "x":1.25, "y":4, "w":1.25}, | 147 | {"label":"K41 (F7,B1)", "x":1.25, "y":4, "w":1.25}, |
67 | {"label":"K42 (F7,B3)", "x":2.5, "y":4, "w":1.25}, | 148 | {"label":"K42 (F7,B3)", "x":2.5, "y":4, "w":1.25}, |
@@ -74,5 +155,4 @@ | |||
74 | ] | 155 | ] |
75 | } | 156 | } |
76 | } | 157 | } |
77 | ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/" | ||
78 | } | 158 | } |
diff --git a/keyboards/mechlovin/pisces/keymaps/default/keymap.c b/keyboards/mechlovin/pisces/keymaps/default/keymap.c index d4890a11a..c717f92be 100644 --- a/keyboards/mechlovin/pisces/keymaps/default/keymap.c +++ b/keyboards/mechlovin/pisces/keymaps/default/keymap.c | |||
@@ -15,20 +15,22 @@ | |||
15 | */ | 15 | */ |
16 | #include QMK_KEYBOARD_H | 16 | #include QMK_KEYBOARD_H |
17 | 17 | ||
18 | #define CTL_CAP LCTL_T(KC_CAPS) | ||
19 | |||
18 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 20 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
19 | [0] = LAYOUT( | 21 | [0] = LAYOUT_all( |
20 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, | 22 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, XXXXXXX, |
21 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, | 23 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, |
22 | LCTL_T(KC_CAPS), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, | 24 | CTL_CAP, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME, |
23 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, | 25 | KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, |
24 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RCTL, MO(1), KC_LEFT, KC_DOWN, KC_RGHT | 26 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RCTL, MO(1), KC_LEFT, KC_DOWN, KC_RGHT |
25 | ), | 27 | ), |
26 | [1] = LAYOUT( | 28 | [1] = LAYOUT_all( |
27 | KC_TRNS, BL_STEP, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 29 | _______, BL_STEP, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, |
28 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 30 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
29 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 31 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
30 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 32 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
31 | KC_TRNS, KC_TRNS, KC_TRNS, KC_SPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS | 33 | _______, _______, _______, KC_SPC, _______, _______, _______, _______, _______ |
32 | ), | 34 | ), |
33 | 35 | ||
34 | }; \ No newline at end of file | 36 | }; |
diff --git a/keyboards/mechlovin/pisces/keymaps/via/keymap.c b/keyboards/mechlovin/pisces/keymaps/via/keymap.c index 4ea597a9f..874d9ccc4 100644 --- a/keyboards/mechlovin/pisces/keymaps/via/keymap.c +++ b/keyboards/mechlovin/pisces/keymaps/via/keymap.c | |||
@@ -15,34 +15,36 @@ | |||
15 | */ | 15 | */ |
16 | #include QMK_KEYBOARD_H | 16 | #include QMK_KEYBOARD_H |
17 | 17 | ||
18 | #define CTL_CAP LCTL_T(KC_CAPS) | ||
19 | |||
18 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 20 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
19 | [0] = LAYOUT( | 21 | [0] = LAYOUT_all( |
20 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, | 22 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, XXXXXXX, |
21 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, | 23 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, |
22 | LCTL_T(KC_CAPS), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, | 24 | CTL_CAP, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME, |
23 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, | 25 | KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, |
24 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RCTL, MO(1), KC_LEFT, KC_DOWN, KC_RGHT | 26 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RCTL, MO(1), KC_LEFT, KC_DOWN, KC_RGHT |
25 | ), | 27 | ), |
26 | [1] = LAYOUT( | 28 | [1] = LAYOUT_all( |
27 | KC_TRNS, BL_STEP, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 29 | _______, BL_STEP, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, |
28 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 30 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
29 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 31 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
30 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 32 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
31 | KC_TRNS, KC_TRNS, KC_TRNS, KC_SPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS | 33 | _______, _______, _______, KC_SPC, _______, _______, _______, _______, _______ |
32 | ), | 34 | ), |
33 | [2] = LAYOUT( | 35 | [2] = LAYOUT_all( |
34 | KC_TRNS, BL_STEP, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 36 | _______, BL_STEP, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, |
35 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 37 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
36 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 38 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
37 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 39 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
38 | KC_TRNS, KC_TRNS, KC_TRNS, KC_SPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS | 40 | _______, _______, _______, KC_SPC, _______, _______, _______, _______, _______ |
39 | ), | 41 | ), |
40 | [3] = LAYOUT( | 42 | [3] = LAYOUT_all( |
41 | KC_TRNS, BL_STEP, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 43 | _______, BL_STEP, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, |
42 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 44 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
43 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 45 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
44 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 46 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
45 | KC_TRNS, KC_TRNS, KC_TRNS, KC_SPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS | 47 | _______, _______, _______, KC_SPC, _______, _______, _______, _______, _______ |
46 | ), | 48 | ), |
47 | 49 | ||
48 | }; \ No newline at end of file | 50 | }; |
diff --git a/keyboards/mechlovin/pisces/pisces.h b/keyboards/mechlovin/pisces/pisces.h index 743b787b7..7ff54ecdd 100644 --- a/keyboards/mechlovin/pisces/pisces.h +++ b/keyboards/mechlovin/pisces/pisces.h | |||
@@ -18,6 +18,40 @@ | |||
18 | 18 | ||
19 | #include "quantum.h" | 19 | #include "quantum.h" |
20 | 20 | ||
21 | #define XXX KC_NO | ||
22 | |||
23 | /* | ||
24 | * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───────┐ | ||
25 | * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │ │0D │ 2u Backspace | ||
26 | * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┐ └─┬─────┤ | ||
27 | * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │ │ │ | ||
28 | * 2.25u ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ ┌──┴┐2D │ ISO Enter | ||
29 | * LShift │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D │2E │ │2C │ │ | ||
30 | * ┌────────┐ ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ └───┴────┘ | ||
31 | * │30 │ │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3E │ | ||
32 | * └────────┘ ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ | ||
33 | * │40 │41 │42 │46 │4A │4B │││4C │4D │4E │ | ||
34 | * └────┴────┴────┴────────────────────────┴────┴────┘│└───┴───┴───┘ | ||
35 | * ──────┴───── | ||
36 | * ┌──────────┐ | ||
37 | * │3C │ 2.75u RShift | ||
38 | * └──────────┘ | ||
39 | */ | ||
40 | |||
41 | #define LAYOUT_all( \ | ||
42 | K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ | ||
43 | K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ | ||
44 | K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \ | ||
45 | K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ | ||
46 | K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E \ | ||
47 | ) { \ | ||
48 | { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ | ||
49 | { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ | ||
50 | { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \ | ||
51 | { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ | ||
52 | { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E }, \ | ||
53 | } | ||
54 | |||
21 | #define LAYOUT( \ | 55 | #define LAYOUT( \ |
22 | K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ | 56 | K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ |
23 | K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ | 57 | K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ |
@@ -25,12 +59,9 @@ | |||
25 | K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ | 59 | K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ |
26 | K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E \ | 60 | K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E \ |
27 | ) { \ | 61 | ) { \ |
28 | { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO }, \ | 62 | { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX }, \ |
29 | { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ | 63 | { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ |
30 | { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \ | 64 | { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, K2E }, \ |
31 | { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ | 65 | { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ |
32 | { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E }, \ | 66 | { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E }, \ |
33 | } | 67 | } |
34 | |||
35 | // generated by KBFirmware JSON to QMK Parser | ||
36 | // https://noroadsleft.github.io/kbf_qmk_converter/ \ No newline at end of file | ||