Swift65 Solder Refactor (#14579)

keyboards/alfredslab/swift65/solder/info.json

@@ -2,8 +2,86 @@
     "keyboard_name": "Swift65",
     "url": "https://swiftcables.net/",
     "maintainer": "Spooknik",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_625u_space_split_bs",
+        "LAYOUT_all": "LAYOUT_625u_space_split_bs"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_625u_space": {
+            "layout": [
+                {"label":"K00 (B1,F7)", "x":0, "y":0},
+                {"label":"K01 (B1,F6)", "x":1, "y":0},
+                {"label":"K02 (B1,F5)", "x":2, "y":0},
+                {"label":"K03 (B1,F4)", "x":3, "y":0},
+                {"label":"K04 (B1,F1)", "x":4, "y":0},
+                {"label":"K05 (B1,F0)", "x":5, "y":0},
+                {"label":"K06 (B1,C7)", "x":6, "y":0},
+                {"label":"K07 (B1,C6)", "x":7, "y":0},
+                {"label":"K08 (B1,B6)", "x":8, "y":0},
+                {"label":"K09 (B1,B5)", "x":9, "y":0},
+                {"label":"K0A (B1,B4)", "x":10, "y":0},
+                {"label":"K0B (B1,D7)", "x":11, "y":0},
+                {"label":"K0C (B1,D5)", "x":12, "y":0},
+                {"label":"K0D (B1,D3)", "x":13, "y":0, "w":2},
+                {"label":"K0E (B1,D1)", "x":15.25, "y":0},
+
+                {"label":"K10 (B2,F7)", "x":0, "y":1, "w":1.5},
+                {"label":"K11 (B2,F6)", "x":1.5, "y":1},
+                {"label":"K12 (B2,F5)", "x":2.5, "y":1},
+                {"label":"K13 (B2,F4)", "x":3.5, "y":1},
+                {"label":"K14 (B2,F1)", "x":4.5, "y":1},
+                {"label":"K15 (B2,F0)", "x":5.5, "y":1},
+                {"label":"K16 (B2,C7)", "x":6.5, "y":1},
+                {"label":"K17 (B2,C6)", "x":7.5, "y":1},
+                {"label":"K18 (B2,B6)", "x":8.5, "y":1},
+                {"label":"K19 (B2,B5)", "x":9.5, "y":1},
+                {"label":"K1A (B2,B4)", "x":10.5, "y":1},
+                {"label":"K1B (B2,D7)", "x":11.5, "y":1},
+                {"label":"K1C (B2,D5)", "x":12.5, "y":1},
+                {"label":"K1D (B2,D3)", "x":13.5, "y":1, "w":1.5},
+                {"label":"K1E (B2,D1)", "x":15.25, "y":1},
+
+                {"label":"K20 (B3,F7)", "x":0, "y":2, "w":1.75},
+                {"label":"K21 (B3,F6)", "x":1.75, "y":2},
+                {"label":"K22 (B3,F5)", "x":2.75, "y":2},
+                {"label":"K23 (B3,F4)", "x":3.75, "y":2},
+                {"label":"K24 (B3,F1)", "x":4.75, "y":2},
+                {"label":"K25 (B3,F0)", "x":5.75, "y":2},
+                {"label":"K26 (B3,C7)", "x":6.75, "y":2},
+                {"label":"K27 (B3,C6)", "x":7.75, "y":2},
+                {"label":"K28 (B3,B6)", "x":8.75, "y":2},
+                {"label":"K29 (B3,B5)", "x":9.75, "y":2},
+                {"label":"K2A (B3,B4)", "x":10.75, "y":2},
+                {"label":"K2B (B3,D7)", "x":11.75, "y":2},
+                {"label":"K2C (B3,D5)", "x":12.75, "y":2, "w":2.25},
+                {"label":"K2E (B3,D1)", "x":15.25, "y":2},
+
+                {"label":"K30 (D4,F7)", "x":0, "y":3, "w":2.25},
+                {"label":"K32 (D4,F5)", "x":2.25, "y":3},
+                {"label":"K33 (D4,F4)", "x":3.25, "y":3},
+                {"label":"K34 (D4,F1)", "x":4.25, "y":3},
+                {"label":"K35 (D4,F0)", "x":5.25, "y":3},
+                {"label":"K36 (D4,C7)", "x":6.25, "y":3},
+                {"label":"K37 (D4,C6)", "x":7.25, "y":3},
+                {"label":"K38 (D4,B6)", "x":8.25, "y":3},
+                {"label":"K39 (D4,B5)", "x":9.25, "y":3},
+                {"label":"K3A (D4,B4)", "x":10.25, "y":3},
+                {"label":"K3B (D4,D7)", "x":11.25, "y":3},
+                {"label":"K3C (D4,D5)", "x":12.25, "y":3, "w":1.75},
+                {"label":"K3D (D4,D3)", "x":14, "y":3},
+
+                {"label":"K40 (D6,F7)", "x":0, "y":4, "w":1.25},
+                {"label":"K41 (D6,F6)", "x":1.25, "y":4, "w":1.25},
+                {"label":"K43 (D6,F4)", "x":2.5, "y":4, "w":1.25},
+                {"label":"K46 (D6,C7)", "x":3.75, "y":4, "w":6.25},
+                {"label":"K4A (D6,B4)", "x":10, "y":4, "w":1.25},
+                {"label":"K4B (D6,D7)", "x":11.25, "y":4, "w":1.25},
+                {"label":"K4C (D6,D5)", "x":13, "y":4},
+                {"label":"K4D (D6,D3)", "x":14, "y":4},
+                {"label":"K4E (D6,D1)", "x":15, "y":4}
+            ]
+        },
+        "LAYOUT_625u_space_split_bs": {
             "layout": [
                 {"label":"K00 (B1,F7)", "x":0, "y":0},
                 {"label":"K01 (B1,F6)", "x":1, "y":0},
@@ -21,6 +99,7 @@
                 {"label":"K0D (B1,D3)", "x":13, "y":0},
                 {"label":"K0F (B1,D0)", "x":14, "y":0},
                 {"label":"K0E (B1,D1)", "x":15.25, "y":0},
+
                 {"label":"K10 (B2,F7)", "x":0, "y":1, "w":1.5},
                 {"label":"K11 (B2,F6)", "x":1.5, "y":1},
                 {"label":"K12 (B2,F5)", "x":2.5, "y":1},
@@ -36,6 +115,7 @@
                 {"label":"K1C (B2,D5)", "x":12.5, "y":1},
                 {"label":"K1D (B2,D3)", "x":13.5, "y":1, "w":1.5},
                 {"label":"K1E (B2,D1)", "x":15.25, "y":1},
+
                 {"label":"K20 (B3,F7)", "x":0, "y":2, "w":1.75},
                 {"label":"K21 (B3,F6)", "x":1.75, "y":2},
                 {"label":"K22 (B3,F5)", "x":2.75, "y":2},
@@ -50,6 +130,7 @@
                 {"label":"K2B (B3,D7)", "x":11.75, "y":2},
                 {"label":"K2C (B3,D5)", "x":12.75, "y":2, "w":2.25},
                 {"label":"K2E (B3,D1)", "x":15.25, "y":2},
+
                 {"label":"K30 (D4,F7)", "x":0, "y":3, "w":2.25},
                 {"label":"K32 (D4,F5)", "x":2.25, "y":3},
                 {"label":"K33 (D4,F4)", "x":3.25, "y":3},
@@ -63,6 +144,7 @@
                 {"label":"K3B (D4,D7)", "x":11.25, "y":3},
                 {"label":"K3C (D4,D5)", "x":12.25, "y":3, "w":1.75},
                 {"label":"K3D (D4,D3)", "x":14, "y":3},
+
                 {"label":"K40 (D6,F7)", "x":0, "y":4, "w":1.25},
                 {"label":"K41 (D6,F6)", "x":1.25, "y":4, "w":1.25},
                 {"label":"K43 (D6,F4)", "x":2.5, "y":4, "w":1.25},
@@ -73,7 +155,153 @@
                 {"label":"K4D (D6,D3)", "x":14, "y":4},
                 {"label":"K4E (D6,D1)", "x":15, "y":4}
             ]
+        },
+        "LAYOUT_7u_space": {
+            "layout": [
+                {"label":"K00 (B1,F7)", "x":0, "y":0},
+                {"label":"K01 (B1,F6)", "x":1, "y":0},
+                {"label":"K02 (B1,F5)", "x":2, "y":0},
+                {"label":"K03 (B1,F4)", "x":3, "y":0},
+                {"label":"K04 (B1,F1)", "x":4, "y":0},
+                {"label":"K05 (B1,F0)", "x":5, "y":0},
+                {"label":"K06 (B1,C7)", "x":6, "y":0},
+                {"label":"K07 (B1,C6)", "x":7, "y":0},
+                {"label":"K08 (B1,B6)", "x":8, "y":0},
+                {"label":"K09 (B1,B5)", "x":9, "y":0},
+                {"label":"K0A (B1,B4)", "x":10, "y":0},
+                {"label":"K0B (B1,D7)", "x":11, "y":0},
+                {"label":"K0C (B1,D5)", "x":12, "y":0},
+                {"label":"K0D (B1,D3)", "x":13, "y":0, "w":2},
+                {"label":"K0E (B1,D1)", "x":15.25, "y":0},
+
+                {"label":"K10 (B2,F7)", "x":0, "y":1, "w":1.5},
+                {"label":"K11 (B2,F6)", "x":1.5, "y":1},
+                {"label":"K12 (B2,F5)", "x":2.5, "y":1},
+                {"label":"K13 (B2,F4)", "x":3.5, "y":1},
+                {"label":"K14 (B2,F1)", "x":4.5, "y":1},
+                {"label":"K15 (B2,F0)", "x":5.5, "y":1},
+                {"label":"K16 (B2,C7)", "x":6.5, "y":1},
+                {"label":"K17 (B2,C6)", "x":7.5, "y":1},
+                {"label":"K18 (B2,B6)", "x":8.5, "y":1},
+                {"label":"K19 (B2,B5)", "x":9.5, "y":1},
+                {"label":"K1A (B2,B4)", "x":10.5, "y":1},
+                {"label":"K1B (B2,D7)", "x":11.5, "y":1},
+                {"label":"K1C (B2,D5)", "x":12.5, "y":1},
+                {"label":"K1D (B2,D3)", "x":13.5, "y":1, "w":1.5},
+                {"label":"K1E (B2,D1)", "x":15.25, "y":1},
+
+                {"label":"K20 (B3,F7)", "x":0, "y":2, "w":1.75},
+                {"label":"K21 (B3,F6)", "x":1.75, "y":2},
+                {"label":"K22 (B3,F5)", "x":2.75, "y":2},
+                {"label":"K23 (B3,F4)", "x":3.75, "y":2},
+                {"label":"K24 (B3,F1)", "x":4.75, "y":2},
+                {"label":"K25 (B3,F0)", "x":5.75, "y":2},
+                {"label":"K26 (B3,C7)", "x":6.75, "y":2},
+                {"label":"K27 (B3,C6)", "x":7.75, "y":2},
+                {"label":"K28 (B3,B6)", "x":8.75, "y":2},
+                {"label":"K29 (B3,B5)", "x":9.75, "y":2},
+                {"label":"K2A (B3,B4)", "x":10.75, "y":2},
+                {"label":"K2B (B3,D7)", "x":11.75, "y":2},
+                {"label":"K2C (B3,D5)", "x":12.75, "y":2, "w":2.25},
+                {"label":"K2E (B3,D1)", "x":15.25, "y":2},
+
+                {"label":"K30 (D4,F7)", "x":0, "y":3, "w":2.25},
+                {"label":"K32 (D4,F5)", "x":2.25, "y":3},
+                {"label":"K33 (D4,F4)", "x":3.25, "y":3},
+                {"label":"K34 (D4,F1)", "x":4.25, "y":3},
+                {"label":"K35 (D4,F0)", "x":5.25, "y":3},
+                {"label":"K36 (D4,C7)", "x":6.25, "y":3},
+                {"label":"K37 (D4,C6)", "x":7.25, "y":3},
+                {"label":"K38 (D4,B6)", "x":8.25, "y":3},
+                {"label":"K39 (D4,B5)", "x":9.25, "y":3},
+                {"label":"K3A (D4,B4)", "x":10.25, "y":3},
+                {"label":"K3B (D4,D7)", "x":11.25, "y":3},
+                {"label":"K3C (D4,D5)", "x":12.25, "y":3, "w":1.75},
+                {"label":"K3D (D4,D3)", "x":14, "y":3},
+
+                {"label":"K40 (D6,F7)", "x":0, "y":4, "w":1.5},
+                {"label":"K41 (D6,F6)", "x":1.5, "y":4},
+                {"label":"K43 (D6,F4)", "x":2.5, "y":4, "w":1.5},
+                {"label":"K46 (D6,C7)", "x":4, "y":4, "w":7},
+                {"label":"K4B (D6,D7)", "x":11, "y":4, "w":1.5},
+                {"label":"K4C (D6,D5)", "x":13, "y":4},
+                {"label":"K4D (D6,D3)", "x":14, "y":4},
+                {"label":"K4E (D6,D1)", "x":15, "y":4}
+            ]
+        },
+        "LAYOUT_7u_space_split_bs": {
+            "layout": [
+                {"label":"K00 (B1,F7)", "x":0, "y":0},
+                {"label":"K01 (B1,F6)", "x":1, "y":0},
+                {"label":"K02 (B1,F5)", "x":2, "y":0},
+                {"label":"K03 (B1,F4)", "x":3, "y":0},
+                {"label":"K04 (B1,F1)", "x":4, "y":0},
+                {"label":"K05 (B1,F0)", "x":5, "y":0},
+                {"label":"K06 (B1,C7)", "x":6, "y":0},
+                {"label":"K07 (B1,C6)", "x":7, "y":0},
+                {"label":"K08 (B1,B6)", "x":8, "y":0},
+                {"label":"K09 (B1,B5)", "x":9, "y":0},
+                {"label":"K0A (B1,B4)", "x":10, "y":0},
+                {"label":"K0B (B1,D7)", "x":11, "y":0},
+                {"label":"K0C (B1,D5)", "x":12, "y":0},
+                {"label":"K0D (B1,D3)", "x":13, "y":0},
+                {"label":"K0F (B1,D0)", "x":14, "y":0},
+                {"label":"K0E (B1,D1)", "x":15.25, "y":0},
+
+                {"label":"K10 (B2,F7)", "x":0, "y":1, "w":1.5},
+                {"label":"K11 (B2,F6)", "x":1.5, "y":1},
+                {"label":"K12 (B2,F5)", "x":2.5, "y":1},
+                {"label":"K13 (B2,F4)", "x":3.5, "y":1},
+                {"label":"K14 (B2,F1)", "x":4.5, "y":1},
+                {"label":"K15 (B2,F0)", "x":5.5, "y":1},
+                {"label":"K16 (B2,C7)", "x":6.5, "y":1},
+                {"label":"K17 (B2,C6)", "x":7.5, "y":1},
+                {"label":"K18 (B2,B6)", "x":8.5, "y":1},
+                {"label":"K19 (B2,B5)", "x":9.5, "y":1},
+                {"label":"K1A (B2,B4)", "x":10.5, "y":1},
+                {"label":"K1B (B2,D7)", "x":11.5, "y":1},
+                {"label":"K1C (B2,D5)", "x":12.5, "y":1},
+                {"label":"K1D (B2,D3)", "x":13.5, "y":1, "w":1.5},
+                {"label":"K1E (B2,D1)", "x":15.25, "y":1},
+
+                {"label":"K20 (B3,F7)", "x":0, "y":2, "w":1.75},
+                {"label":"K21 (B3,F6)", "x":1.75, "y":2},
+                {"label":"K22 (B3,F5)", "x":2.75, "y":2},
+                {"label":"K23 (B3,F4)", "x":3.75, "y":2},
+                {"label":"K24 (B3,F1)", "x":4.75, "y":2},
+                {"label":"K25 (B3,F0)", "x":5.75, "y":2},
+                {"label":"K26 (B3,C7)", "x":6.75, "y":2},
+                {"label":"K27 (B3,C6)", "x":7.75, "y":2},
+                {"label":"K28 (B3,B6)", "x":8.75, "y":2},
+                {"label":"K29 (B3,B5)", "x":9.75, "y":2},
+                {"label":"K2A (B3,B4)", "x":10.75, "y":2},
+                {"label":"K2B (B3,D7)", "x":11.75, "y":2},
+                {"label":"K2C (B3,D5)", "x":12.75, "y":2, "w":2.25},
+                {"label":"K2E (B3,D1)", "x":15.25, "y":2},
+
+                {"label":"K30 (D4,F7)", "x":0, "y":3, "w":2.25},
+                {"label":"K32 (D4,F5)", "x":2.25, "y":3},
+                {"label":"K33 (D4,F4)", "x":3.25, "y":3},
+                {"label":"K34 (D4,F1)", "x":4.25, "y":3},
+                {"label":"K35 (D4,F0)", "x":5.25, "y":3},
+                {"label":"K36 (D4,C7)", "x":6.25, "y":3},
+                {"label":"K37 (D4,C6)", "x":7.25, "y":3},
+                {"label":"K38 (D4,B6)", "x":8.25, "y":3},
+                {"label":"K39 (D4,B5)", "x":9.25, "y":3},
+                {"label":"K3A (D4,B4)", "x":10.25, "y":3},
+                {"label":"K3B (D4,D7)", "x":11.25, "y":3},
+                {"label":"K3C (D4,D5)", "x":12.25, "y":3, "w":1.75},
+                {"label":"K3D (D4,D3)", "x":14, "y":3},
+
+                {"label":"K40 (D6,F7)", "x":0, "y":4, "w":1.5},
+                {"label":"K41 (D6,F6)", "x":1.5, "y":4},
+                {"label":"K43 (D6,F4)", "x":2.5, "y":4, "w":1.5},
+                {"label":"K46 (D6,C7)", "x":4, "y":4, "w":7},
+                {"label":"K4B (D6,D7)", "x":11, "y":4, "w":1.5},
+                {"label":"K4C (D6,D5)", "x":13, "y":4},
+                {"label":"K4D (D6,D3)", "x":14, "y":4},
+                {"label":"K4E (D6,D1)", "x":15, "y":4}
+            ]
         }
     }
-    ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
 }

keyboards/alfredslab/swift65/solder/keymaps/default/keymap.c

@@ -17,14 +17,14 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
+    [0] = LAYOUT_625u_space_split_bs(
         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_GRV,  KC_BSPC,   KC_HOME,
         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,
         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_PGUP,
         KC_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,        KC_UP,
         KC_LCTL,   KC_LGUI,   KC_LALT,                       KC_SPC,                              KC_LALT,   MO(1),          KC_LEFT, KC_DOWN, KC_RGHT
     ),
-    [1] = LAYOUT(
+    [1] = LAYOUT_625u_space_split_bs(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,    _______,
         _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______,
         _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,               KC_PGDN,

keyboards/alfredslab/swift65/solder/keymaps/default/readme.md

@@ -1,3 +0,0 @@
-# Default Swift65 Solder Layout
-
-![](https://i.imgur.com/7Capi8W.png)

keyboards/alfredslab/swift65/solder/keymaps/via/keymap.c

@@ -17,28 +17,28 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
+    [0] = LAYOUT_625u_space_split_bs(
         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_GRV,  KC_BSPC,   KC_HOME,
         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,
         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_PGUP,
         KC_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,        KC_UP,
         KC_LCTL,   KC_LGUI,   KC_LALT,                       KC_SPC,                              KC_LALT,   MO(1),          KC_LEFT, KC_DOWN, KC_RGHT
     ),
-    [1] = LAYOUT(
+    [1] = LAYOUT_625u_space_split_bs(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,    _______,
         _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______,
         _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,               KC_PGDN,
         RESET,              _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        KC_PGUP,
         _______,   _______,   _______,                      _______,                              _______,   _______,        KC_HOME, KC_PGDN, KC_END
     ),
-    [2] = LAYOUT(
+    [2] = LAYOUT_625u_space_split_bs(
         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_TRNS,        KC_TRNS,
         KC_TRNS,   KC_TRNS,   KC_TRNS,                      KC_TRNS,                              KC_TRNS,   KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS
     ),
-    [3] = LAYOUT(
+    [3] = LAYOUT_625u_space_split_bs(
         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,

keyboards/alfredslab/swift65/solder/keymaps/via/readme.md

@@ -1,3 +0,0 @@
-# Default Swift65 Solder Layout
-
-![](https://i.imgur.com/7Capi8W.png)

keyboards/alfredslab/swift65/solder/readme.md

@@ -2,7 +2,7 @@
 
 A 65% Keyboard from Swiftcables
 
-* Keyboard Maintainer: [Steven Phillips (spoonik)](https://github.com/keyboardcollective)
+* Keyboard Maintainer: [Steven Phillips (spooknik)](https://github.com/keyboardcollective)
 * Hardware Supported: Swift65 Solder
 * Hardware Availability: Soom from Swiftcables
 

keyboards/alfredslab/swift65/solder/solder.h

@@ -18,16 +18,60 @@
 
 #include "quantum.h"
 
-#define LAYOUT( \
+#define XXX KC_NO
+
+#define LAYOUT_625u_space( \
+    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,         K2E,  \
+    K30,       K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,     K3D,        \
+    K40,  K41,  K43,              K46,                K4A,  K4B,     K4C, K4D, K4E    \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, XXX }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, XXX }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, XXX }, \
+    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, XXX }, \
+    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E, XXX }, \
+}
+
+#define LAYOUT_625u_space_split_bs( \
     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F,  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,         K2E,  \
     K30,       K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,     K3D,        \
     K40,  K41,  K43,              K46,                K4A,  K4B,     K4C, K4D, K4E    \
 ) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   KC_NO }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   KC_NO, K2E,   KC_NO }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, KC_NO }, \
-    { K40,   K41,   KC_NO, K43,   KC_NO, KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   K4C,   K4D,   K4E,   KC_NO }, \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, XXX }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, XXX }, \
+    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, XXX }, \
+    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E, XXX }, \
+}
+
+#define LAYOUT_7u_space( \
+    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,         K2E,  \
+    K30,       K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,     K3D,        \
+    K40,  K41,  K43,              K46,                      K4B,     K4C, K4D, K4E    \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, XXX }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, XXX }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, XXX }, \
+    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, XXX }, \
+    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, XXX, K4B, K4C, K4D, K4E, XXX }, \
+}
+
+#define LAYOUT_7u_space_split_bs( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F,  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,         K2E,  \
+    K30,       K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,     K3D,        \
+    K40,  K41,  K43,              K46,                      K4B,     K4C, K4D, K4E    \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, XXX }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, XXX }, \
+    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, XXX }, \
+    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, XXX, K4B, K4C, K4D, K4E, XXX }, \
 }