From 93b3d9b33c91f4e0a2cc4528cd1e7353d691458a Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Mon, 8 Nov 2021 04:40:30 +0000
Subject: [PATCH] Mechlovin Pisces Refactor (#15080)
---
keyboards/mechlovin/pisces/config.h | 3 -
keyboards/mechlovin/pisces/info.json | 84 ++++++++++++++++++-
.../mechlovin/pisces/keymaps/default/keymap.c | 28 ++++---
.../mechlovin/pisces/keymaps/via/keymap.c | 52 ++++++------
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 1debf021c8..48a94eb262 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/>.
// #define RGBLIGHT_EFFECT_RGB_TEST
// #define RGBLIGHT_EFFECT_ALTERNATING
#endif
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/mechlovin/pisces/info.json b/keyboards/mechlovin/pisces/info.json
index f812317c1b..57da5b4a0e 100644
--- a/keyboards/mechlovin/pisces/info.json
+++ b/keyboards/mechlovin/pisces/info.json
@@ -1,8 +1,85 @@
{
"keyboard_name": "pisces",
"url": "",
- "maintainer": "qmk",
+ "maintainer": "mechlovin",
"layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ {"label":"K00 (B0,E6)", "x":0, "y":0},
+ {"label":"K01 (B0,B1)", "x":1, "y":0},
+ {"label":"K02 (B0,B3)", "x":2, "y":0},
+ {"label":"K03 (B0,D0)", "x":3, "y":0},
+ {"label":"K04 (B0,D1)", "x":4, "y":0},
+ {"label":"K05 (B0,D2)", "x":5, "y":0},
+ {"label":"K06 (B0,D3)", "x":6, "y":0},
+ {"label":"K07 (B0,D5)", "x":7, "y":0},
+ {"label":"K08 (B0,F4)", "x":8, "y":0},
+ {"label":"K09 (B0,F1)", "x":9, "y":0},
+ {"label":"K0A (B0,D4)", "x":10, "y":0},
+ {"label":"K0B (B0,D6)", "x":11, "y":0},
+ {"label":"K0C (B0,D7)", "x":12, "y":0},
+ {"label":"K0D (B0,B4)", "x":13, "y":0},
+ {"label":"K0E (B0,B5)", "x":14, "y":0},
+
+ {"label":"K10 (F0,E6)", "x":0, "y":1, "w":1.5},
+ {"label":"K11 (F0,B1)", "x":1.5, "y":1},
+ {"label":"K12 (F0,B3)", "x":2.5, "y":1},
+ {"label":"K13 (F0,D0)", "x":3.5, "y":1},
+ {"label":"K14 (F0,D1)", "x":4.5, "y":1},
+ {"label":"K15 (F0,D2)", "x":5.5, "y":1},
+ {"label":"K16 (F0,D3)", "x":6.5, "y":1},
+ {"label":"K17 (F0,D5)", "x":7.5, "y":1},
+ {"label":"K18 (F0,F4)", "x":8.5, "y":1},
+ {"label":"K19 (F0,F1)", "x":9.5, "y":1},
+ {"label":"K1A (F0,D4)", "x":10.5, "y":1},
+ {"label":"K1B (F0,D6)", "x":11.5, "y":1},
+ {"label":"K1C (F0,D7)", "x":12.5, "y":1},
+ {"label":"K1D (F0,B4)", "x":13.5, "y":1, "w":1.5},
+ {"label":"K1E (F0,B5)", "x":15, "y":1},
+
+ {"label":"K20 (F5,E6)", "x":0, "y":2, "w":1.75},
+ {"label":"K21 (F5,B1)", "x":1.75, "y":2},
+ {"label":"K22 (F5,B3)", "x":2.75, "y":2},
+ {"label":"K23 (F5,D0)", "x":3.75, "y":2},
+ {"label":"K24 (F5,D1)", "x":4.75, "y":2},
+ {"label":"K25 (F5,D2)", "x":5.75, "y":2},
+ {"label":"K26 (F5,D3)", "x":6.75, "y":2},
+ {"label":"K27 (F5,D5)", "x":7.75, "y":2},
+ {"label":"K28 (F5,F4)", "x":8.75, "y":2},
+ {"label":"K29 (F5,F1)", "x":9.75, "y":2},
+ {"label":"K2A (F5,D4)", "x":10.75, "y":2},
+ {"label":"K2B (F5,D6)", "x":11.75, "y":2},
+ {"label":"K2C (F5,D7)", "x":12.75, "y":2},
+ {"label":"K2D (F5,B4)", "x":13.75, "y":2, "w":1.25},
+ {"label":"K2E (F5,B5)", "x":15, "y":2},
+
+ {"label":"K30 (F6,E6)", "x":0, "y":3, "w":1.25},
+ {"label":"K31 (F6,B1)", "x":1.25, "y":3},
+ {"label":"K32 (F6,B3)", "x":2.25, "y":3},
+ {"label":"K33 (F6,D0)", "x":3.25, "y":3},
+ {"label":"K34 (F6,D1)", "x":4.25, "y":3},
+ {"label":"K35 (F6,D2)", "x":5.25, "y":3},
+ {"label":"K36 (F6,D3)", "x":6.25, "y":3},
+ {"label":"K37 (F6,D5)", "x":7.25, "y":3},
+ {"label":"K38 (F6,F4)", "x":8.25, "y":3},
+ {"label":"K39 (F6,F1)", "x":9.25, "y":3},
+ {"label":"K3A (F6,D4)", "x":10.25, "y":3},
+ {"label":"K3B (F6,D6)", "x":11.25, "y":3},
+ {"label":"K3C (F6,D7)", "x":12.25, "y":3, "w":1.75},
+ {"label":"K3D (F6,B4)", "x":14, "y":3},
+ {"label":"K3E (F6,B5)", "x":15, "y":3},
+
+ {"label":"K40 (F7,E6)", "x":0, "y":4, "w":1.25},
+ {"label":"K41 (F7,B1)", "x":1.25, "y":4, "w":1.25},
+ {"label":"K42 (F7,B3)", "x":2.5, "y":4, "w":1.25},
+ {"label":"K46 (F7,D3)", "x":3.75, "y":4, "w":6.25},
+ {"label":"K4A (F7,D4)", "x":10, "y":4, "w":1.25},
+ {"label":"K4B (F7,D6)", "x":11.25, "y":4, "w":1.25},
+ {"label":"K4C (F7,D7)", "x":13, "y":4},
+ {"label":"K4D (F7,B4)", "x":14, "y":4},
+ {"label":"K4E (F7,B5)", "x":15, "y":4}
+ ]
+ },
"LAYOUT": {
"layout": [
{"label":"K00 (B0,E6)", "x":0, "y":0},
@@ -19,6 +96,7 @@
{"label":"K0B (B0,D6)", "x":11, "y":0},
{"label":"K0C (B0,D7)", "x":12, "y":0},
{"label":"K0D (B0,B4)", "x":13, "y":0, "w":2},
+
{"label":"K10 (F0,E6)", "x":0, "y":1, "w":1.5},
{"label":"K11 (F0,B1)", "x":1.5, "y":1},
{"label":"K12 (F0,B3)", "x":2.5, "y":1},
@@ -34,6 +112,7 @@
{"label":"K1C (F0,D7)", "x":12.5, "y":1},
{"label":"K1D (F0,B4)", "x":13.5, "y":1, "w":1.5},
{"label":"K1E (F0,B5)", "x":15, "y":1},
+
{"label":"K20 (F5,E6)", "x":0, "y":2, "w":1.75},
{"label":"K21 (F5,B1)", "x":1.75, "y":2},
{"label":"K22 (F5,B3)", "x":2.75, "y":2},
@@ -48,6 +127,7 @@
{"label":"K2B (F5,D6)", "x":11.75, "y":2},
{"label":"K2D (F5,B4)", "x":12.75, "y":2, "w":2.25},
{"label":"K2E (F5,B5)", "x":15, "y":2},
+
{"label":"K30 (F6,E6)", "x":0, "y":3, "w":2.25},
{"label":"K32 (F6,B3)", "x":2.25, "y":3},
{"label":"K33 (F6,D0)", "x":3.25, "y":3},
@@ -62,6 +142,7 @@
{"label":"K3C (F6,D7)", "x":12.25, "y":3, "w":1.75},
{"label":"K3D (F6,B4)", "x":14, "y":3},
{"label":"K3E (F6,B5)", "x":15, "y":3},
+
{"label":"K40 (F7,E6)", "x":0, "y":4, "w":1.25},
{"label":"K41 (F7,B1)", "x":1.25, "y":4, "w":1.25},
{"label":"K42 (F7,B3)", "x":2.5, "y":4, "w":1.25},
@@ -74,5 +155,4 @@
]
}
}
- ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
}
diff --git a/keyboards/mechlovin/pisces/keymaps/default/keymap.c b/keyboards/mechlovin/pisces/keymaps/default/keymap.c
index d4890a11ad..c717f92bea 100644
--- a/keyboards/mechlovin/pisces/keymaps/default/keymap.c
+++ b/keyboards/mechlovin/pisces/keymaps/default/keymap.c
@@ -15,20 +15,22 @@
*/
#include QMK_KEYBOARD_H
+#define CTL_CAP LCTL_T(KC_CAPS)
+
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT(
- 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,
- 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,
- 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,
- 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,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RCTL, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+ [0] = LAYOUT_all(
+ 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,
+ 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,
+ 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,
+ 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,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RCTL, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
),
- [1] = LAYOUT(
- 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,
- 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,
- 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, 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, KC_TRNS, KC_SPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ [1] = LAYOUT_all(
+ _______, BL_STEP, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, KC_SPC, _______, _______, _______, _______, _______
),
-};
\ No newline at end of file
+};
diff --git a/keyboards/mechlovin/pisces/keymaps/via/keymap.c b/keyboards/mechlovin/pisces/keymaps/via/keymap.c
index 4ea597a9f1..874d9ccc42 100644
--- a/keyboards/mechlovin/pisces/keymaps/via/keymap.c
+++ b/keyboards/mechlovin/pisces/keymaps/via/keymap.c
@@ -15,34 +15,36 @@
*/
#include QMK_KEYBOARD_H
+#define CTL_CAP LCTL_T(KC_CAPS)
+
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT(
- 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,
- 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,
- 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,
- 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,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RCTL, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+ [0] = LAYOUT_all(
+ 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,
+ 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,
+ 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,
+ 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,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RCTL, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
),
- [1] = LAYOUT(
- 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,
- 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,
- 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, 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, KC_TRNS, KC_SPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ [1] = LAYOUT_all(
+ _______, BL_STEP, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, KC_SPC, _______, _______, _______, _______, _______
),
- [2] = LAYOUT(
- 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,
- 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,
- 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, 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, KC_TRNS, KC_SPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ [2] = LAYOUT_all(
+ _______, BL_STEP, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, KC_SPC, _______, _______, _______, _______, _______
),
- [3] = LAYOUT(
- 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,
- 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,
- 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, 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, KC_TRNS, KC_SPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ [3] = LAYOUT_all(
+ _______, BL_STEP, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, KC_SPC, _______, _______, _______, _______, _______
),
-};
\ No newline at end of file
+};
diff --git a/keyboards/mechlovin/pisces/pisces.h b/keyboards/mechlovin/pisces/pisces.h
index 743b787b7c..7ff54ecdde 100644
--- a/keyboards/mechlovin/pisces/pisces.h
+++ b/keyboards/mechlovin/pisces/pisces.h
@@ -18,6 +18,40 @@
#include "quantum.h"
+#define XXX KC_NO
+
+/*
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───────┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │ │0D │ 2u Backspace
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┐ └─┬─────┤
+ * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │ │ │
+ * 2.25u ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ ┌──┴┐2D │ ISO Enter
+ * LShift │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D │2E │ │2C │ │
+ * ┌────────┐ ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ └───┴────┘
+ * │30 │ │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3E │
+ * └────────┘ ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+ * │40 │41 │42 │46 │4A │4B │││4C │4D │4E │
+ * └────┴────┴────┴────────────────────────┴────┴────┘│└───┴───┴───┘
+ * ──────┴─────
+ * ┌──────────┐
+ * │3C │ 2.75u RShift
+ * └──────────┘
+ */
+
+#define LAYOUT_all( \
+ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
+ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
+ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
+ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
+ K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E \
+) { \
+ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+ { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+ { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
+ { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
+ { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E }, \
+}
+
#define LAYOUT( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
@@ -25,12 +59,9 @@
K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E \
) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E }, \
+ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX }, \
+ { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+ { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, K2E }, \
+ { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
+ { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E }, \
}
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
\ No newline at end of file