`atreus`: restore intended matrix implementations (#24082)

* `atreus`: restore intended matrix implementations

PR 24010 inadvertently changed the switch matrix for the
`atreus/astar_mirrored` keyboard in removing the `PCBDOWN` configuration
option, and also made PCB up and down implementations available for all
Atreus variants, which is not intended usage.

This commit restores the intended behaviour, and makes all the keymaps
which are currently present agnostic to hardware variant.

keyboards/atreus/astar/keyboard.json

@@ -5,5 +5,64 @@
     },
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
-    "bootloader": "caterina"
+    "bootloader": "caterina",
+    "layout_aliases": {
+        "LAYOUT_pcb_up": "LAYOUT",
+        "LAYOUT_pcb_down": "LAYOUT"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.6},
+                {"matrix": [0, 1], "x": 1, "y": 0.35},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.35},
+                {"matrix": [0, 4], "x": 4, "y": 0.7},
+
+                {"matrix": [0, 6], "x": 8, "y": 0.7},
+                {"matrix": [0, 7], "x": 9, "y": 0.35},
+                {"matrix": [0, 8], "x": 10, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0.35},
+                {"matrix": [0, 10], "x": 12, "y": 0.6},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.6},
+                {"matrix": [1, 1], "x": 1, "y": 1.35},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.35},
+                {"matrix": [1, 4], "x": 4, "y": 1.7},
+
+                {"matrix": [1, 6], "x": 8, "y": 1.7},
+                {"matrix": [1, 7], "x": 9, "y": 1.35},
+                {"matrix": [1, 8], "x": 10, "y": 1},
+                {"matrix": [1, 9], "x": 11, "y": 1.35},
+                {"matrix": [1, 10], "x": 12, "y": 1.6},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.6},
+                {"matrix": [2, 1], "x": 1, "y": 2.35},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.35},
+                {"matrix": [2, 4], "x": 4, "y": 2.7},
+
+                {"matrix": [2, 6], "x": 8, "y": 2.7},
+                {"matrix": [2, 7], "x": 9, "y": 2.35},
+                {"matrix": [2, 8], "x": 10, "y": 2},
+                {"matrix": [2, 9], "x": 11, "y": 2.35},
+                {"matrix": [2, 10], "x": 12, "y": 2.6},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.6},
+                {"matrix": [3, 1], "x": 1, "y": 3.35},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3.35},
+                {"matrix": [3, 4], "x": 4, "y": 3.7},
+                {"matrix": [2, 5], "x": 5, "y": 2.95, "h": 1.5},
+
+                {"matrix": [3, 5], "x": 7, "y": 2.95, "h": 1.5},
+                {"matrix": [3, 6], "x": 8, "y": 3.7},
+                {"matrix": [3, 7], "x": 9, "y": 3.35},
+                {"matrix": [3, 8], "x": 10, "y": 3},
+                {"matrix": [3, 9], "x": 11, "y": 3.35},
+                {"matrix": [3, 10], "x": 12, "y": 3.6}
+            ]
+        }
+    }
 }

keyboards/atreus/astar_mirrored/keyboard.json

@@ -5,5 +5,64 @@
     },
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
-    "bootloader": "caterina"
+    "bootloader": "caterina",
+    "layout_aliases": {
+        "LAYOUT_pcb_up": "LAYOUT",
+        "LAYOUT_pcb_down": "LAYOUT"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.6},
+                {"matrix": [0, 1], "x": 1, "y": 0.35},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.35},
+                {"matrix": [0, 4], "x": 4, "y": 0.7},
+
+                {"matrix": [0, 6], "x": 8, "y": 0.7},
+                {"matrix": [0, 7], "x": 9, "y": 0.35},
+                {"matrix": [0, 8], "x": 10, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0.35},
+                {"matrix": [0, 10], "x": 12, "y": 0.6},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.6},
+                {"matrix": [1, 1], "x": 1, "y": 1.35},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.35},
+                {"matrix": [1, 4], "x": 4, "y": 1.7},
+
+                {"matrix": [1, 6], "x": 8, "y": 1.7},
+                {"matrix": [1, 7], "x": 9, "y": 1.35},
+                {"matrix": [1, 8], "x": 10, "y": 1},
+                {"matrix": [1, 9], "x": 11, "y": 1.35},
+                {"matrix": [1, 10], "x": 12, "y": 1.6},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.6},
+                {"matrix": [2, 1], "x": 1, "y": 2.35},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.35},
+                {"matrix": [2, 4], "x": 4, "y": 2.7},
+
+                {"matrix": [2, 6], "x": 8, "y": 2.7},
+                {"matrix": [2, 7], "x": 9, "y": 2.35},
+                {"matrix": [2, 8], "x": 10, "y": 2},
+                {"matrix": [2, 9], "x": 11, "y": 2.35},
+                {"matrix": [2, 10], "x": 12, "y": 2.6},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.6},
+                {"matrix": [3, 1], "x": 1, "y": 3.35},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3.35},
+                {"matrix": [3, 4], "x": 4, "y": 3.7},
+                {"matrix": [3, 5], "x": 5, "y": 2.95, "h": 1.5},
+
+                {"matrix": [2, 5], "x": 7, "y": 2.95, "h": 1.5},
+                {"matrix": [3, 6], "x": 8, "y": 3.7},
+                {"matrix": [3, 7], "x": 9, "y": 3.35},
+                {"matrix": [3, 8], "x": 10, "y": 3},
+                {"matrix": [3, 9], "x": 11, "y": 3.35},
+                {"matrix": [3, 10], "x": 12, "y": 3.6}
+            ]
+        }
+    }
 }

keyboards/atreus/f103/keyboard.json

@@ -8,5 +8,64 @@
     "bootloader": "stm32duino",
     "features": {
         "bootmagic": true
+    },
+    "layout_aliases": {
+        "LAYOUT_pcb_up": "LAYOUT",
+        "LAYOUT_pcb_down": "LAYOUT"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.6},
+                {"matrix": [0, 1], "x": 1, "y": 0.35},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.35},
+                {"matrix": [0, 4], "x": 4, "y": 0.7},
+
+                {"matrix": [0, 6], "x": 8, "y": 0.7},
+                {"matrix": [0, 7], "x": 9, "y": 0.35},
+                {"matrix": [0, 8], "x": 10, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0.35},
+                {"matrix": [0, 10], "x": 12, "y": 0.6},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.6},
+                {"matrix": [1, 1], "x": 1, "y": 1.35},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.35},
+                {"matrix": [1, 4], "x": 4, "y": 1.7},
+
+                {"matrix": [1, 6], "x": 8, "y": 1.7},
+                {"matrix": [1, 7], "x": 9, "y": 1.35},
+                {"matrix": [1, 8], "x": 10, "y": 1},
+                {"matrix": [1, 9], "x": 11, "y": 1.35},
+                {"matrix": [1, 10], "x": 12, "y": 1.6},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.6},
+                {"matrix": [2, 1], "x": 1, "y": 2.35},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.35},
+                {"matrix": [2, 4], "x": 4, "y": 2.7},
+
+                {"matrix": [2, 6], "x": 8, "y": 2.7},
+                {"matrix": [2, 7], "x": 9, "y": 2.35},
+                {"matrix": [2, 8], "x": 10, "y": 2},
+                {"matrix": [2, 9], "x": 11, "y": 2.35},
+                {"matrix": [2, 10], "x": 12, "y": 2.6},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.6},
+                {"matrix": [3, 1], "x": 1, "y": 3.35},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3.35},
+                {"matrix": [3, 4], "x": 4, "y": 3.7},
+                {"matrix": [2, 5], "x": 5, "y": 2.95, "h": 1.5},
+
+                {"matrix": [3, 5], "x": 7, "y": 2.95, "h": 1.5},
+                {"matrix": [3, 6], "x": 8, "y": 3.7},
+                {"matrix": [3, 7], "x": 9, "y": 3.35},
+                {"matrix": [3, 8], "x": 10, "y": 3},
+                {"matrix": [3, 9], "x": 11, "y": 3.35},
+                {"matrix": [3, 10], "x": 12, "y": 3.6}
+            ]
+        }
     }
 }

keyboards/atreus/feather/keyboard.json

@@ -14,5 +14,64 @@
     },
     "bluetooth": {
         "driver": "bluefruit_le"
+    },
+    "layout_aliases": {
+        "LAYOUT_pcb_up": "LAYOUT",
+        "LAYOUT_pcb_down": "LAYOUT"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.6},
+                {"matrix": [0, 1], "x": 1, "y": 0.35},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.35},
+                {"matrix": [0, 4], "x": 4, "y": 0.7},
+
+                {"matrix": [0, 6], "x": 8, "y": 0.7},
+                {"matrix": [0, 7], "x": 9, "y": 0.35},
+                {"matrix": [0, 8], "x": 10, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0.35},
+                {"matrix": [0, 10], "x": 12, "y": 0.6},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.6},
+                {"matrix": [1, 1], "x": 1, "y": 1.35},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.35},
+                {"matrix": [1, 4], "x": 4, "y": 1.7},
+
+                {"matrix": [1, 6], "x": 8, "y": 1.7},
+                {"matrix": [1, 7], "x": 9, "y": 1.35},
+                {"matrix": [1, 8], "x": 10, "y": 1},
+                {"matrix": [1, 9], "x": 11, "y": 1.35},
+                {"matrix": [1, 10], "x": 12, "y": 1.6},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.6},
+                {"matrix": [2, 1], "x": 1, "y": 2.35},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.35},
+                {"matrix": [2, 4], "x": 4, "y": 2.7},
+
+                {"matrix": [2, 6], "x": 8, "y": 2.7},
+                {"matrix": [2, 7], "x": 9, "y": 2.35},
+                {"matrix": [2, 8], "x": 10, "y": 2},
+                {"matrix": [2, 9], "x": 11, "y": 2.35},
+                {"matrix": [2, 10], "x": 12, "y": 2.6},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.6},
+                {"matrix": [3, 1], "x": 1, "y": 3.35},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3.35},
+                {"matrix": [3, 4], "x": 4, "y": 3.7},
+                {"matrix": [2, 5], "x": 5, "y": 2.95, "h": 1.5},
+
+                {"matrix": [3, 5], "x": 7, "y": 2.95, "h": 1.5},
+                {"matrix": [3, 6], "x": 8, "y": 3.7},
+                {"matrix": [3, 7], "x": 9, "y": 3.35},
+                {"matrix": [3, 8], "x": 10, "y": 3},
+                {"matrix": [3, 9], "x": 11, "y": 3.35},
+                {"matrix": [3, 10], "x": 12, "y": 3.6}
+            ]
+        }
     }
 }

keyboards/atreus/info.json

@@ -21,116 +21,5 @@
       "enabled": true,
       "resync": true
     }
-  },
-  "layout_aliases": {
-    "LAYOUT": "LAYOUT_pcb_up"
-  },
-  "layouts": {
-    "LAYOUT_pcb_up": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0.6},
-        {"matrix": [0, 1], "x": 1, "y": 0.35},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0.35},
-        {"matrix": [0, 4], "x": 4, "y": 0.7},
-
-        {"matrix": [0, 6], "x": 8, "y": 0.7},
-        {"matrix": [0, 7], "x": 9, "y": 0.35},
-        {"matrix": [0, 8], "x": 10, "y": 0},
-        {"matrix": [0, 9], "x": 11, "y": 0.35},
-        {"matrix": [0, 10], "x": 12, "y": 0.6},
-
-        {"matrix": [1, 0], "x": 0, "y": 1.6},
-        {"matrix": [1, 1], "x": 1, "y": 1.35},
-        {"matrix": [1, 2], "x": 2, "y": 1},
-        {"matrix": [1, 3], "x": 3, "y": 1.35},
-        {"matrix": [1, 4], "x": 4, "y": 1.7},
-
-        {"matrix": [1, 6], "x": 8, "y": 1.7},
-        {"matrix": [1, 7], "x": 9, "y": 1.35},
-        {"matrix": [1, 8], "x": 10, "y": 1},
-        {"matrix": [1, 9], "x": 11, "y": 1.35},
-        {"matrix": [1, 10], "x": 12, "y": 1.6},
-
-        {"matrix": [2, 0], "x": 0, "y": 2.6},
-        {"matrix": [2, 1], "x": 1, "y": 2.35},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [2, 3], "x": 3, "y": 2.35},
-        {"matrix": [2, 4], "x": 4, "y": 2.7},
-
-        {"matrix": [2, 6], "x": 8, "y": 2.7},
-        {"matrix": [2, 7], "x": 9, "y": 2.35},
-        {"matrix": [2, 8], "x": 10, "y": 2},
-        {"matrix": [2, 9], "x": 11, "y": 2.35},
-        {"matrix": [2, 10], "x": 12, "y": 2.6},
-
-        {"matrix": [3, 0], "x": 0, "y": 3.6},
-        {"matrix": [3, 1], "x": 1, "y": 3.35},
-        {"matrix": [3, 2], "x": 2, "y": 3},
-        {"matrix": [3, 3], "x": 3, "y": 3.35},
-        {"matrix": [3, 4], "x": 4, "y": 3.7},
-        {"matrix": [2, 5], "x": 5, "y": 2.95, "h": 1.5},
-
-        {"matrix": [3, 5], "x": 7, "y": 2.95, "h": 1.5},
-        {"matrix": [3, 6], "x": 8, "y": 3.7},
-        {"matrix": [3, 7], "x": 9, "y": 3.35},
-        {"matrix": [3, 8], "x": 10, "y": 3},
-        {"matrix": [3, 9], "x": 11, "y": 3.35},
-        {"matrix": [3, 10], "x": 12, "y": 3.6}
-      ]
-    },
-    "LAYOUT_pcb_down": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0.6},
-        {"matrix": [0, 1], "x": 1, "y": 0.35},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0.35},
-        {"matrix": [0, 4], "x": 4, "y": 0.7},
-
-        {"matrix": [0, 6], "x": 8, "y": 0.7},
-        {"matrix": [0, 7], "x": 9, "y": 0.35},
-        {"matrix": [0, 8], "x": 10, "y": 0},
-        {"matrix": [0, 9], "x": 11, "y": 0.35},
-        {"matrix": [0, 10], "x": 12, "y": 0.6},
-
-        {"matrix": [1, 0], "x": 0, "y": 1.6},
-        {"matrix": [1, 1], "x": 1, "y": 1.35},
-        {"matrix": [1, 2], "x": 2, "y": 1},
-        {"matrix": [1, 3], "x": 3, "y": 1.35},
-        {"matrix": [1, 4], "x": 4, "y": 1.7},
-
-        {"matrix": [1, 6], "x": 8, "y": 1.7},
-        {"matrix": [1, 7], "x": 9, "y": 1.35},
-        {"matrix": [1, 8], "x": 10, "y": 1},
-        {"matrix": [1, 9], "x": 11, "y": 1.35},
-        {"matrix": [1, 10], "x": 12, "y": 1.6},
-
-        {"matrix": [2, 0], "x": 0, "y": 2.6},
-        {"matrix": [2, 1], "x": 1, "y": 2.35},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [2, 3], "x": 3, "y": 2.35},
-        {"matrix": [2, 4], "x": 4, "y": 2.7},
-
-        {"matrix": [2, 6], "x": 8, "y": 2.7},
-        {"matrix": [2, 7], "x": 9, "y": 2.35},
-        {"matrix": [2, 8], "x": 10, "y": 2},
-        {"matrix": [2, 9], "x": 11, "y": 2.35},
-        {"matrix": [2, 10], "x": 12, "y": 2.6},
-
-        {"matrix": [3, 0], "x": 0, "y": 3.6},
-        {"matrix": [3, 1], "x": 1, "y": 3.35},
-        {"matrix": [3, 2], "x": 2, "y": 3},
-        {"matrix": [3, 3], "x": 3, "y": 3.35},
-        {"matrix": [3, 4], "x": 4, "y": 3.7},
-        {"matrix": [3, 5], "x": 5, "y": 2.95, "h": 1.5},
-
-        {"matrix": [2, 5], "x": 7, "y": 2.95, "h": 1.5},
-        {"matrix": [3, 6], "x": 8, "y": 3.7},
-        {"matrix": [3, 7], "x": 9, "y": 3.35},
-        {"matrix": [3, 8], "x": 10, "y": 3},
-        {"matrix": [3, 9], "x": 11, "y": 3.35},
-        {"matrix": [3, 10], "x": 12, "y": 3.6}
-      ]
-    }
   }
 }

keyboards/atreus/keymaps/default/keymap.c

@@ -12,7 +12,7 @@
 #define _LW 2
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QW] = LAYOUT_pcb_up( /* Qwerty */
+  [_QW] = LAYOUT( /* Qwerty */
     KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P    ,
     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN ,
     KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH ,
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    *  [       ]      (     )    &        ||       `     1     2     3    \
    * lower  insert super shift bksp ctrl || alt space   fn    .     0    =
    */
-  [_RS] = LAYOUT_pcb_up( /* [> RAISE <] */
+  [_RS] = LAYOUT( /* [> RAISE <] */
     KC_EXLM, KC_AT,   KC_UP,   KC_LCBR, KC_RCBR,                   KC_PGUP, KC_7,    KC_8,   KC_9, KC_ASTR ,
     KC_HASH, KC_LEFT, KC_DOWN, KC_RGHT, KC_DLR,                    KC_PGDN, KC_4,    KC_5,   KC_6, KC_PLUS ,
     KC_LBRC, KC_RBRC, KC_LPRN, KC_RPRN, KC_AMPR,                   KC_GRV,  KC_1,    KC_2,   KC_3, KC_BSLS ,
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    *       volup             reset      ||             F1    F2    F3   F12
    *       voldn  super shift bksp ctrl || alt space   L0  prtsc scroll pause
    */
-  [_LW] = LAYOUT_pcb_up( /* [> LOWER <] */
+  [_LW] = LAYOUT( /* [> LOWER <] */
     KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP,                   KC_UP,   KC_F7,   KC_F8,   KC_F9,   KC_F10  ,
     KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,                   KC_DOWN, KC_F4,   KC_F5,   KC_F6,   KC_F11  ,
     KC_NO,   KC_VOLU, KC_NO,   KC_NO,   QK_BOOT,                   KC_NO,   KC_F1,   KC_F2,   KC_F3,   KC_F12  ,

keyboards/atreus/keymaps/workman/keymap.c

@@ -25,7 +25,7 @@ enum custom_keycodes {
    */
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QW] = LAYOUT_pcb_down( /* Workman */
+  [_QW] = LAYOUT( /* Workman */
     KC_Q,    KC_D,    KC_R,    KC_W,    KC_B,                      KC_J,    KC_F,    KC_U,    KC_P,    KC_SCLN,
     KC_A,    KC_S,    KC_H,    KC_T,    KC_G,                      KC_Y,    KC_N,    KC_E,    KC_O,    KC_I,
     KC_Z,    KC_X,    KC_M,    KC_C,    KC_V,                      KC_K,    KC_L,    KC_COMM, KC_DOT,  KC_SLSH,
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * menu    caps   <      >     del       ||       _                    0      =
    */
 
-  [_RS] = LAYOUT_pcb_down( /* [> RAISE <] */
+  [_RS] = LAYOUT( /* [> RAISE <] */
     KC_EXLM, KC_AT,   KC_LCBR, KC_RCBR, KC_PIPE,                   KC_MINS, KC_7,    KC_8,    KC_9, KC_ASTR,
     KC_HASH, KC_DLR,  KC_LPRN, KC_RPRN, KC_GRV,                    KC_DOT,  KC_4,    KC_5,    KC_6, KC_PLUS,
     KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD,                   KC_AMPR, KC_1,    KC_2,    KC_3, KC_BSLS,
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    *                                       ||        –                    ¨    reset
    */
 
-  [_LW] = LAYOUT_pcb_down( /* [> LOWER <] */
+  [_LW] = LAYOUT( /* [> LOWER <] */
     KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP,                   KC_VOLU, KC_F7,   KC_F8,   KC_F9,   KC_F10,
     KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,                   KC_VOLD, KC_F4,   KC_F5,   KC_F6,   KC_F11,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_MUTE, KC_F1,   KC_F2,   KC_F3,   KC_F12,

keyboards/atreus/promicro/keyboard.json

@@ -4,5 +4,64 @@
         "rows": ["F4", "B2", "B4", "B5"]
     },
     "diode_direction": "COL2ROW",
-    "development_board": "promicro"
+    "development_board": "promicro",
+    "layout_aliases": {
+        "LAYOUT_pcb_up": "LAYOUT",
+        "LAYOUT_pcb_down": "LAYOUT"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.6},
+                {"matrix": [0, 1], "x": 1, "y": 0.35},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.35},
+                {"matrix": [0, 4], "x": 4, "y": 0.7},
+
+                {"matrix": [0, 6], "x": 8, "y": 0.7},
+                {"matrix": [0, 7], "x": 9, "y": 0.35},
+                {"matrix": [0, 8], "x": 10, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0.35},
+                {"matrix": [0, 10], "x": 12, "y": 0.6},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.6},
+                {"matrix": [1, 1], "x": 1, "y": 1.35},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.35},
+                {"matrix": [1, 4], "x": 4, "y": 1.7},
+
+                {"matrix": [1, 6], "x": 8, "y": 1.7},
+                {"matrix": [1, 7], "x": 9, "y": 1.35},
+                {"matrix": [1, 8], "x": 10, "y": 1},
+                {"matrix": [1, 9], "x": 11, "y": 1.35},
+                {"matrix": [1, 10], "x": 12, "y": 1.6},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.6},
+                {"matrix": [2, 1], "x": 1, "y": 2.35},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.35},
+                {"matrix": [2, 4], "x": 4, "y": 2.7},
+
+                {"matrix": [2, 6], "x": 8, "y": 2.7},
+                {"matrix": [2, 7], "x": 9, "y": 2.35},
+                {"matrix": [2, 8], "x": 10, "y": 2},
+                {"matrix": [2, 9], "x": 11, "y": 2.35},
+                {"matrix": [2, 10], "x": 12, "y": 2.6},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.6},
+                {"matrix": [3, 1], "x": 1, "y": 3.35},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3.35},
+                {"matrix": [3, 4], "x": 4, "y": 3.7},
+                {"matrix": [2, 5], "x": 5, "y": 2.95, "h": 1.5},
+
+                {"matrix": [3, 5], "x": 7, "y": 2.95, "h": 1.5},
+                {"matrix": [3, 6], "x": 8, "y": 3.7},
+                {"matrix": [3, 7], "x": 9, "y": 3.35},
+                {"matrix": [3, 8], "x": 10, "y": 3},
+                {"matrix": [3, 9], "x": 11, "y": 3.35},
+                {"matrix": [3, 10], "x": 12, "y": 3.6}
+            ]
+        }
+    }
 }

keyboards/atreus/teensy2/keyboard.json

@@ -5,5 +5,64 @@
     },
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
-    "bootloader": "halfkay"
+    "bootloader": "halfkay",
+    "layout_aliases": {
+        "LAYOUT_pcb_up": "LAYOUT",
+        "LAYOUT_pcb_down": "LAYOUT"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.6},
+                {"matrix": [0, 1], "x": 1, "y": 0.35},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.35},
+                {"matrix": [0, 4], "x": 4, "y": 0.7},
+
+                {"matrix": [0, 6], "x": 8, "y": 0.7},
+                {"matrix": [0, 7], "x": 9, "y": 0.35},
+                {"matrix": [0, 8], "x": 10, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0.35},
+                {"matrix": [0, 10], "x": 12, "y": 0.6},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.6},
+                {"matrix": [1, 1], "x": 1, "y": 1.35},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.35},
+                {"matrix": [1, 4], "x": 4, "y": 1.7},
+
+                {"matrix": [1, 6], "x": 8, "y": 1.7},
+                {"matrix": [1, 7], "x": 9, "y": 1.35},
+                {"matrix": [1, 8], "x": 10, "y": 1},
+                {"matrix": [1, 9], "x": 11, "y": 1.35},
+                {"matrix": [1, 10], "x": 12, "y": 1.6},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.6},
+                {"matrix": [2, 1], "x": 1, "y": 2.35},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.35},
+                {"matrix": [2, 4], "x": 4, "y": 2.7},
+
+                {"matrix": [2, 6], "x": 8, "y": 2.7},
+                {"matrix": [2, 7], "x": 9, "y": 2.35},
+                {"matrix": [2, 8], "x": 10, "y": 2},
+                {"matrix": [2, 9], "x": 11, "y": 2.35},
+                {"matrix": [2, 10], "x": 12, "y": 2.6},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.6},
+                {"matrix": [3, 1], "x": 1, "y": 3.35},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3.35},
+                {"matrix": [3, 4], "x": 4, "y": 3.7},
+                {"matrix": [2, 5], "x": 5, "y": 2.95, "h": 1.5},
+
+                {"matrix": [3, 5], "x": 7, "y": 2.95, "h": 1.5},
+                {"matrix": [3, 6], "x": 8, "y": 3.7},
+                {"matrix": [3, 7], "x": 9, "y": 3.35},
+                {"matrix": [3, 8], "x": 10, "y": 3},
+                {"matrix": [3, 9], "x": 11, "y": 3.35},
+                {"matrix": [3, 10], "x": 12, "y": 3.6}
+            ]
+        }
+    }
 }