Shoc: physically arrange keymaps/layout macro (#22100)

3 files changed, 50 insertions, 58 deletions

diff --git a/keyboards/shoc/info.json b/keyboards/shoc/info.json
index fca5fdca0b..276e64adee 100644
--- a/keyboards/shoc/info.json
+++ b/keyboards/shoc/info.json
@@ -26,6 +26,12 @@
                 {"matrix": [0, 5], "x": 5, "y": 0},
                 {"matrix": [0, 6], "x": 6, "y": 0},
                 {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [5, 4], "x": 8, "y": 0},
+                {"matrix": [5, 3], "x": 9, "y": 0},
+                {"matrix": [5, 2], "x": 10, "y": 0},
+                {"matrix": [5, 1], "x": 11, "y": 0},
+                {"matrix": [5, 0], "x": 12, "y": 0, "w": 2},
+
                 {"matrix": [1, 0], "x": 0, "y": 1},
                 {"matrix": [1, 1], "x": 1, "y": 1},
                 {"matrix": [1, 2], "x": 2, "y": 1},
@@ -34,6 +40,13 @@
                 {"matrix": [1, 5], "x": 5, "y": 1},
                 {"matrix": [1, 6], "x": 6, "y": 1},
                 {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [5, 5], "x": 8, "y": 1},
+                {"matrix": [5, 6], "x": 9, "y": 1},
+                {"matrix": [5, 7], "x": 10, "y": 1},
+                {"matrix": [7, 0], "x": 11, "y": 1},
+                {"matrix": [7, 1], "x": 12, "y": 1},
+                {"matrix": [7, 2], "x": 13, "y": 1},
+
                 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
                 {"matrix": [2, 1], "x": 1.5, "y": 2},
                 {"matrix": [2, 2], "x": 2.5, "y": 2},
@@ -42,6 +55,12 @@
                 {"matrix": [2, 5], "x": 5.5, "y": 2},
                 {"matrix": [2, 6], "x": 6.5, "y": 2},
                 {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [7, 7], "x": 8.5, "y": 2},
+                {"matrix": [7, 6], "x": 9.5, "y": 2},
+                {"matrix": [7, 5], "x": 10.5, "y": 2},
+                {"matrix": [7, 4], "x": 11.5, "y": 2},
+                {"matrix": [7, 3], "x": 12.5, "y": 2, "w": 1.5},
+
                 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2},
                 {"matrix": [3, 1], "x": 2, "y": 3},
                 {"matrix": [3, 2], "x": 3, "y": 3},
@@ -50,6 +69,12 @@
                 {"matrix": [3, 5], "x": 6, "y": 3},
                 {"matrix": [3, 6], "x": 7, "y": 3},
                 {"matrix": [3, 7], "x": 8, "y": 3},
+                {"matrix": [6, 7], "x": 9, "y": 3},
+                {"matrix": [6, 6], "x": 10, "y": 3},
+                {"matrix": [6, 5], "x": 11, "y": 3},
+                {"matrix": [6, 4], "x": 12, "y": 3},
+                {"matrix": [6, 3], "x": 13, "y": 3},
+
                 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
                 {"matrix": [4, 1], "x": 1.5, "y": 4},
                 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
@@ -58,30 +83,9 @@
                 {"matrix": [4, 5], "x": 7, "y": 4, "w": 2},
                 {"matrix": [4, 6], "x": 9, "y": 4},
                 {"matrix": [4, 7], "x": 10, "y": 4},
-                {"matrix": [5, 0], "x": 12, "y": 0, "w": 2},
-                {"matrix": [5, 1], "x": 11, "y": 0},
-                {"matrix": [5, 2], "x": 10, "y": 0},
-                {"matrix": [5, 3], "x": 9, "y": 0},
-                {"matrix": [5, 4], "x": 8, "y": 0},
-                {"matrix": [5, 5], "x": 8, "y": 1},
-                {"matrix": [5, 6], "x": 9, "y": 1},
-                {"matrix": [5, 7], "x": 10, "y": 1},
-                {"matrix": [6, 0], "x": 13, "y": 4},
-                {"matrix": [6, 1], "x": 12, "y": 4},
                 {"matrix": [6, 2], "x": 11, "y": 4},
-                {"matrix": [6, 3], "x": 13, "y": 3},
-                {"matrix": [6, 4], "x": 12, "y": 3},
-                {"matrix": [6, 5], "x": 11, "y": 3},
-                {"matrix": [6, 6], "x": 10, "y": 3},
-                {"matrix": [6, 7], "x": 9, "y": 3},
-                {"matrix": [7, 0], "x": 11, "y": 1},
-                {"matrix": [7, 1], "x": 12, "y": 1},
-                {"matrix": [7, 2], "x": 13, "y": 1},
-                {"matrix": [7, 3], "x": 12.5, "y": 2, "w": 1.5},
-                {"matrix": [7, 4], "x": 11.5, "y": 2},
-                {"matrix": [7, 5], "x": 10.5, "y": 2},
-                {"matrix": [7, 6], "x": 9.5, "y": 2},
-                {"matrix": [7, 7], "x": 8.5, "y": 2}
+                {"matrix": [6, 1], "x": 12, "y": 4},
+                {"matrix": [6, 0], "x": 13, "y": 4}
             ]
         }
     }
diff --git a/keyboards/shoc/keymaps/bongo/keymap.c b/keyboards/shoc/keymaps/bongo/keymap.c
index 8f57181330..0242e5adad 100644
--- a/keyboards/shoc/keymaps/bongo/keymap.c
+++ b/keyboards/shoc/keymaps/bongo/keymap.c
@@ -17,32 +17,26 @@
 
 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_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Z, KC_U,
-		KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J,
-		KC_LSFT, KC_Y, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M,
-		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL,
-		KC_BSPC, KC_MINS, KC_0, KC_9, KC_8, KC_I, KC_O, KC_P,
-		KC_RGHT, KC_DOWN, KC_LEFT, KC_EQL, KC_UP, KC_SLSH, KC_COMM, KC_DOT,
-		KC_RBRC, KC_LBRC, KC_BSLS, KC_ENT, KC_QUOT, KC_SCLN, KC_L, KC_K),
+    [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_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Z,    KC_U,    KC_I,    KC_O,    KC_P,    KC_RBRC, KC_LBRC, KC_BSLS,
+        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_LSFT,          KC_Y,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_DOT,  KC_COMM, KC_SLSH, KC_UP,   KC_EQL,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  MO(1),   KC_SPC,           KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
 
     [1] = LAYOUT(
-		KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7,
-		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Z, KC_U,
-		KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J,
-		KC_LSFT, KC_Y, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M,
-		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL,
-		KC_BSPC, KC_F11, KC_F10, KC_F9, KC_F8, KC_I, KC_O, KC_P,
-		KC_RGHT, KC_DOWN, KC_LEFT, KC_DEL, KC_UP, KC_SLSH, KC_COMM, KC_DOT,
-		KC_RBRC, KC_LBRC, KC_BSLS, KC_ENT, KC_QUOT, KC_SCLN, KC_L, KC_K)
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,           KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Z,    KC_U,    KC_I,    KC_O,    KC_P,    KC_RBRC, KC_LBRC, KC_BSLS,
+        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_LSFT,          KC_Y,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_DOT,  KC_COMM, KC_SLSH, KC_UP,   KC_DEL,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  MO(1),   KC_SPC,           KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT)
 
 
 };
 #ifdef OLED_ENABLE
 
 oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-	return OLED_ROTATION_0;
+    return OLED_ROTATION_0;
 }
 //full credit goes to https://www.reddit.com/user/Pop-X-/ only small feature comforts were added
 
diff --git a/keyboards/shoc/keymaps/default/keymap.c b/keyboards/shoc/keymaps/default/keymap.c
index a5916db65a..beb5fb7d3d 100644
--- a/keyboards/shoc/keymaps/default/keymap.c
+++ b/keyboards/shoc/keymaps/default/keymap.c
@@ -17,25 +17,19 @@
 
 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_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Z, KC_U,
-		KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J,
-		KC_LSFT, KC_Y, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M,
-		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL,
-		KC_BSPC, KC_MINS, KC_0, KC_9, KC_8, KC_I, KC_O, KC_P,
-		KC_RGHT, KC_DOWN, KC_LEFT, KC_EQL, KC_UP, KC_SLSH, KC_COMM, KC_DOT,
-		KC_RBRC, KC_LBRC, KC_BSLS, KC_ENT, KC_QUOT, KC_SCLN, KC_L, KC_K),
+    [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_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Z,    KC_U,    KC_I,    KC_O,    KC_P,    KC_RBRC, KC_LBRC, KC_BSLS,
+        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_LSFT,          KC_Y,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_DOT,  KC_COMM, KC_SLSH, KC_UP,   KC_EQL,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  MO(1),   KC_SPC,           KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
 
     [1] = LAYOUT(
-		KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7,
-		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Z, KC_U,
-		KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J,
-		KC_LSFT, KC_Y, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M,
-		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL,
-		KC_BSPC, KC_F11, KC_F10, KC_F9, KC_F8, KC_I, KC_O, KC_P,
-		KC_RGHT, KC_DOWN, KC_LEFT, KC_DEL, KC_UP, KC_SLSH, KC_COMM, KC_DOT,
-		KC_RBRC, KC_LBRC, KC_BSLS, KC_ENT, KC_QUOT, KC_SCLN, KC_L, KC_K)
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,           KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Z,    KC_U,    KC_I,    KC_O,    KC_P,    KC_RBRC, KC_LBRC, KC_BSLS,
+        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_LSFT,          KC_Y,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_DOT,  KC_COMM, KC_SLSH, KC_UP,   KC_DEL,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  MO(1),   KC_SPC,           KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT)
 
 
 };