Karn: correct layout data (#22201)

3 files changed, 56 insertions, 54 deletions

diff --git a/keyboards/karn/info.json b/keyboards/karn/info.json
index c15801da35..b088f61425 100644
--- a/keyboards/karn/info.json
+++ b/keyboards/karn/info.json
@@ -23,52 +23,54 @@
     "split": {
         "enabled": true
     },
-    "community_layouts": ["split_3x6_3"],
     "layouts": {
-        "LAYOUT_split_3x6_3": {
+        "LAYOUT": {
             "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
                 {"matrix": [0, 2], "x": 2, "y": 0},
                 {"matrix": [0, 3], "x": 3, "y": 0},
                 {"matrix": [0, 4], "x": 4, "y": 0},
                 {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [4, 0], "x": 8, "y": 0},
-                {"matrix": [4, 1], "x": 9, "y": 0},
-                {"matrix": [4, 2], "x": 10, "y": 0},
-                {"matrix": [4, 3], "x": 11, "y": 0},
-                {"matrix": [4, 4], "x": 12, "y": 0},
-                {"matrix": [4, 5], "x": 13, "y": 0},
-                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [4, 0], "x": 9, "y": 0},
+                {"matrix": [4, 1], "x": 10, "y": 0},
+                {"matrix": [4, 2], "x": 11, "y": 0},
+                {"matrix": [4, 3], "x": 12, "y": 0},
+                {"matrix": [4, 4], "x": 13, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 0.75, "h": 1.5},
                 {"matrix": [1, 1], "x": 1, "y": 1},
                 {"matrix": [1, 2], "x": 2, "y": 1},
                 {"matrix": [1, 3], "x": 3, "y": 1},
                 {"matrix": [1, 4], "x": 4, "y": 1},
                 {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [5, 0], "x": 8, "y": 1},
-                {"matrix": [5, 1], "x": 9, "y": 1},
-                {"matrix": [5, 2], "x": 10, "y": 1},
-                {"matrix": [5, 3], "x": 11, "y": 1},
-                {"matrix": [5, 4], "x": 12, "y": 1},
-                {"matrix": [5, 5], "x": 13, "y": 1},
-                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [5, 0], "x": 9, "y": 1},
+                {"matrix": [5, 1], "x": 10, "y": 1},
+                {"matrix": [5, 2], "x": 11, "y": 1},
+                {"matrix": [5, 3], "x": 12, "y": 1},
+                {"matrix": [5, 4], "x": 13, "y": 1},
+                {"matrix": [5, 5], "x": 14, "y": 0.75, "h": 1.5},
+
                 {"matrix": [2, 1], "x": 1, "y": 2},
                 {"matrix": [2, 2], "x": 2, "y": 2},
                 {"matrix": [2, 3], "x": 3, "y": 2},
                 {"matrix": [2, 4], "x": 4, "y": 2},
                 {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [6, 0], "x": 8, "y": 2},
-                {"matrix": [6, 1], "x": 9, "y": 2},
-                {"matrix": [6, 2], "x": 10, "y": 2},
-                {"matrix": [6, 3], "x": 11, "y": 2},
-                {"matrix": [6, 4], "x": 12, "y": 2},
-                {"matrix": [6, 5], "x": 13, "y": 2},
-                {"matrix": [3, 0], "x": 3.5, "y": 3.25},
-                {"matrix": [3, 1], "x": 4.5, "y": 3.5},
-                {"matrix": [3, 2], "x": 5.5, "y": 3.75},
-                {"matrix": [7, 0], "x": 7.5, "y": 3.75},
-                {"matrix": [7, 1], "x": 8.5, "y": 3.5},
-                {"matrix": [7, 2], "x": 9.5, "y": 3.25}
+
+                {"matrix": [6, 0], "x": 9, "y": 2},
+                {"matrix": [6, 1], "x": 10, "y": 2},
+                {"matrix": [6, 2], "x": 11, "y": 2},
+                {"matrix": [6, 3], "x": 12, "y": 2},
+                {"matrix": [6, 4], "x": 13, "y": 2},
+
+                {"matrix": [3, 0], "x": 4, "y": 3, "h": 1.5},
+                {"matrix": [3, 1], "x": 5, "y": 3.25, "h": 1.5},
+                {"matrix": [3, 2], "x": 6, "y": 3.5, "h": 1.5},
+
+                {"matrix": [7, 0], "x": 8, "y": 3.5, "h": 1.5},
+                {"matrix": [7, 1], "x": 9, "y": 3.25, "h": 1.5},
+                {"matrix": [7, 2], "x": 10, "y": 3, "h": 1.5}
             ]
         }
     }
diff --git a/keyboards/karn/keymaps/colemak/keymap.c b/keyboards/karn/keymaps/colemak/keymap.c
index 585798e8a1..13f23170e1 100644
--- a/keyboards/karn/keymaps/colemak/keymap.c
+++ b/keyboards/karn/keymaps/colemak/keymap.c
@@ -31,34 +31,34 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 
     // default (colemak)
-    [0] = LAYOUT_split_3x6_3(
-        KC_NO,         KC_Q,       KC_W,       KC_F,       KC_P,       KC_G,                        KC_J,  KC_L,       KC_U,          KC_Y,         KC_SCLN,        KC_NO,
+    [0] = LAYOUT(
+                       KC_Q,       KC_W,       KC_F,       KC_P,       KC_G,                        KC_J,  KC_L,       KC_U,          KC_Y,         KC_SCLN,
         HYPR_T(KC_TAB),KC_A,       KC_R,       KC_S,       KC_T,       KC_D,                        KC_H,  KC_N,       KC_E,          KC_I,         KC_O,           HYPR_T(KC_ENT),
-        KC_NO,         SFT_T(KC_Z),CTL_T(KC_X),ALT_T(KC_C),CMD_T(KC_V),KC_B,                        KC_K,  CMD_T(KC_M),ALT_T(KC_COMM),CTL_T(KC_DOT),RSFT_T(KC_SLSH),KC_NO,
+                       SFT_T(KC_Z),CTL_T(KC_X),ALT_T(KC_C),CMD_T(KC_V),KC_B,                        KC_K,  CMD_T(KC_M),ALT_T(KC_COMM),CTL_T(KC_DOT),RSFT_T(KC_SLSH),
                                                            MO(1),      SFT_T(KC_ESC),MO(3), KC_BSPC,KC_SPC,MO(2)
     ),
 
     // symbols
-    [1] = LAYOUT_split_3x6_3(
-        _______, KC_BSLS, KC_GRV,  KC_QUOT, KC_DQT,  KC_LCBR,                    KC_RCBR, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, _______,
+    [1] = LAYOUT(
+                 KC_BSLS, KC_GRV,  KC_QUOT, KC_DQT,  KC_LCBR,                    KC_RCBR, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC,
         _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                    KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-        _______, _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______,
+                 _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______,
                                             _______, _______, _______,  KC_DEL,  _______, _______
     ),
 
     // nav
-    [2] = LAYOUT_split_3x6_3(
-        _______, _______, KC_Q,      _______,   _______,   KC_VOLU,                    _______, _______, _______, KC_SCLN, _______, _______,
+    [2] = LAYOUT(
+                 _______, KC_Q,      _______,   _______,   KC_VOLU,                    _______, _______, _______, KC_SCLN, _______,
         _______, C(KC_UP),C(KC_DOWN),G(KC_GRV), G(KC_TAB), KC_VOLD,                    KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_CAPS, _______,
-        _______, _______, _______,   _______,   _______,   KC_MUTE,                    _______, _______, _______, _______, _______, _______,
+                 _______, _______,   _______,   _______,   KC_MUTE,                    _______, _______, _______, _______, _______,
                                                 _______,   _______, _______,  _______, _______, _______
     ),
 
     // numbers
-    [3] = LAYOUT_split_3x6_3(
-        _______, TD(TD_F1_F11), TD(TD_F2_F12), KC_F3,   KC_F4,   KC_F5,                      KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
+    [3] = LAYOUT(
+                 TD(TD_F1_F11), TD(TD_F2_F12), KC_F3,   KC_F4,   KC_F5,                      KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,
         _______, KC_1,          KC_2,          KC_3,    KC_4,    KC_5,                       KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
-        _______, _______,       _______,       _______, _______, _______,                    _______, _______, _______, _______, _______, _______,
+                 _______,       _______,       _______, _______, _______,                    _______, _______, _______, _______, _______,
                                                         _______, _______, _______,  _______, _______, _______
     )
 };
diff --git a/keyboards/karn/keymaps/default/keymap.c b/keyboards/karn/keymaps/default/keymap.c
index 5f679552d9..b39fe99d5d 100644
--- a/keyboards/karn/keymaps/default/keymap.c
+++ b/keyboards/karn/keymaps/default/keymap.c
@@ -7,34 +7,34 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 
     // default (qwerty)
-    [0] = LAYOUT_split_3x6_3(
-        KC_NO,         KC_Q,       KC_W,       KC_E,       KC_R,       KC_T,                        KC_Y,  KC_U,       KC_I,          KC_O,         KC_P,           KC_NO,
-        HYPR_T(KC_TAB),KC_A,       KC_S,       KC_D,       KC_F,       KC_G,                        KC_H,  KC_J,       KC_K,          KC_L,         KC_SCLN,           HYPR_T(KC_ENT),
-        KC_NO,         SFT_T(KC_Z),CTL_T(KC_X),ALT_T(KC_C),CMD_T(KC_V),KC_B,                        KC_N,  CMD_T(KC_M),ALT_T(KC_COMM),CTL_T(KC_DOT),RSFT_T(KC_SLSH),KC_NO,
+    [0] = LAYOUT(
+                       KC_Q,       KC_W,       KC_E,       KC_R,       KC_T,                        KC_Y,  KC_U,       KC_I,          KC_O,         KC_P,
+        HYPR_T(KC_TAB),KC_A,       KC_S,       KC_D,       KC_F,       KC_G,                        KC_H,  KC_J,       KC_K,          KC_L,         KC_SCLN,         HYPR_T(KC_ENT),
+                       SFT_T(KC_Z),CTL_T(KC_X),ALT_T(KC_C),CMD_T(KC_V),KC_B,                        KC_N,  CMD_T(KC_M),ALT_T(KC_COMM),CTL_T(KC_DOT),RSFT_T(KC_SLSH),
                                                            MO(1),      SFT_T(KC_ESC),MO(3), KC_BSPC,KC_SPC,MO(2)
     ),
 
     // symbols
-    [1] = LAYOUT_split_3x6_3(
-        _______, KC_BSLS, KC_GRV,  KC_QUOT, KC_DQT,  KC_LCBR,                    KC_RCBR, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, _______,
+    [1] = LAYOUT(
+                 KC_BSLS, KC_GRV,  KC_QUOT, KC_DQT,  KC_LCBR,                    KC_RCBR, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC,
         _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                    KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-        _______, _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______,
+                 _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______,
                                             _______, _______, _______,  KC_DEL,  _______, _______
     ),
 
     // nav
-    [2] = LAYOUT_split_3x6_3(
-        _______, _______, _______,   _______,   _______,   KC_VOLU,                    _______, _______, _______, _______, _______, _______,
+    [2] = LAYOUT(
+                 _______, _______,   _______,   _______,   KC_VOLU,                    _______, _______, _______, _______, _______,
         _______, C(KC_UP),C(KC_DOWN),G(KC_GRV), G(KC_TAB), KC_VOLD,                    KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_CAPS, _______,
-        _______, _______, _______,   _______,   _______,   KC_MUTE,                    _______, _______, _______, _______, _______, _______,
+                 _______, _______,   _______,   _______,   KC_MUTE,                    _______, _______, _______, _______, _______,
                                                 _______,   _______, _______,  _______, _______, _______
     ),
 
     // numbers
-    [3] = LAYOUT_split_3x6_3(
-        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                      KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
+    [3] = LAYOUT(
+                 KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                      KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,
         _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                       KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
-        _______, _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______,
+                 _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______,
                                             _______, _______, _______,  _______, _______, _______
     )
 };