YMDK Wings Hotswap: rename LAYOUT_all to LAYOUT (#20901)

* add matrix_diagram.md

* info.json: apply friendly formatting

* rename LAYOUT_all to LAYOUT

* info.json: update listed maintainer

4 files changed, 94 insertions, 74 deletions

diff --git a/keyboards/ymdk/wingshs/info.json b/keyboards/ymdk/wingshs/info.json
index 4823e6911a..745719a702 100644
--- a/keyboards/ymdk/wingshs/info.json
+++ b/keyboards/ymdk/wingshs/info.json
@@ -2,7 +2,7 @@
     "keyboard_name": "WINGS HOTSWAP",
     "manufacturer": "YMDK",
     "url": "http://ymdkey.com/",
-    "maintainer": "qmk",
+    "maintainer": "alittlepeace",
     "usb": {
         "vid": "0x594D",
         "pid": "0x4975",
@@ -26,88 +26,92 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT"
+    },
     "layouts": {
-        "LAYOUT_all": {
+        "LAYOUT": {
             "layout": [
-                {"matrix": [0, 0], "x": 0.25, "y": 0.25},
-                {"matrix": [0, 1], "x": 1.25, "y": 0.25},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0.25},
-                {"matrix": [0, 4], "x": 4.25, "y": 0.25},
-                {"matrix": [0, 5], "x": 5.25, "y": 0.25},
-                {"matrix": [0, 6], "x": 6.25, "y": 0.25},
+                {"label": "Esc", "matrix": [0, 0], "x": 0.25, "y": 0.25},
+                {"label": "1", "matrix": [0, 1], "x": 1.25, "y": 0.25},
+                {"label": "2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3.25, "y": 0.25},
+                {"label": "4", "matrix": [0, 4], "x": 4.25, "y": 0.25},
+                {"label": "5", "matrix": [0, 5], "x": 5.25, "y": 0.25},
+                {"label": "6", "matrix": [0, 6], "x": 6.25, "y": 0.25},
+
+                {"label": "7", "matrix": [0, 7], "x": 9.5, "y": 0.25},
+                {"label": "8", "matrix": [0, 8], "x": 10.5, "y": 0.25},
+                {"label": "9", "matrix": [0, 9], "x": 11.5, "y": 0.25},
+                {"label": "0", "matrix": [0, 10], "x": 12.5, "y": 0.25},
+                {"label": "-", "matrix": [0, 11], "x": 13.5, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 14.5, "y": 0.25},
+                {"label": "Backspace", "matrix": [0, 13], "x": 15.5, "y": 0.25, "w": 2},
 
-                {"matrix": [0, 7], "x": 9.5, "y": 0.25},
-                {"matrix": [0, 8], "x": 10.5, "y": 0.25},
-                {"matrix": [0, 9], "x": 11.5, "y": 0.25},
-                {"matrix": [0, 10], "x": 12.5, "y": 0.25},
-                {"matrix": [0, 11], "x": 13.5, "y": 0},
-                {"matrix": [0, 12], "x": 14.5, "y": 0.25},
-                {"matrix": [0, 13], "x": 15.5, "y": 0.25, "w": 2},
+                {"label": "Page Up", "matrix": [4, 14], "x": 18.25, "y": 0},
 
-                {"matrix": [4, 14], "x": 18.25, "y": 0},
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1.25},
+                {"label": "W", "matrix": [1, 2], "x": 2.75, "y": 1.25},
+                {"label": "E", "matrix": [1, 3], "x": 3.75, "y": 1.25},
+                {"label": "R", "matrix": [1, 4], "x": 4.75, "y": 1.25},
+                {"label": "T", "matrix": [1, 5], "x": 5.75, "y": 1.25},
 
-                {"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1.25},
-                {"matrix": [1, 2], "x": 2.75, "y": 1.25},
-                {"matrix": [1, 3], "x": 3.75, "y": 1.25},
-                {"matrix": [1, 4], "x": 4.75, "y": 1.25},
-                {"matrix": [1, 5], "x": 5.75, "y": 1.25},
+                {"label": "Y", "matrix": [1, 6], "x": 9, "y": 1.25},
+                {"label": "U", "matrix": [1, 7], "x": 10, "y": 1.25},
+                {"label": "I", "matrix": [1, 8], "x": 11, "y": 1.25},
+                {"label": "O", "matrix": [1, 9], "x": 12, "y": 1.25},
+                {"label": "P", "matrix": [1, 10], "x": 13.25, "y": 1.25},
+                {"label": "[", "matrix": [1, 11], "x": 14.25, "y": 1.25},
+                {"label": "]", "matrix": [1, 12], "x": 15.25, "y": 1.25},
+                {"label": "\\", "matrix": [1, 13], "x": 16.25, "y": 1.25, "w": 1.5},
 
-                {"matrix": [1, 6], "x": 9, "y": 1.25},
-                {"matrix": [1, 7], "x": 10, "y": 1.25},
-                {"matrix": [1, 8], "x": 11, "y": 1.25},
-                {"matrix": [1, 9], "x": 12, "y": 1.25},
-                {"matrix": [1, 10], "x": 13.25, "y": 1.25},
-                {"matrix": [1, 11], "x": 14.25, "y": 1.25},
-                {"matrix": [1, 12], "x": 15.25, "y": 1.25},
-                {"matrix": [1, 13], "x": 16.25, "y": 1.25, "w": 1.5},
+                {"label": "Page Down", "matrix": [1, 14], "x": 18.5, "y": 1},
 
-                {"matrix": [1, 14], "x": 18.5, "y": 1},
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2.25},
+                {"label": "S", "matrix": [2, 2], "x": 3, "y": 2.25},
+                {"label": "D", "matrix": [2, 3], "x": 4, "y": 2.25},
+                {"label": "F", "matrix": [2, 4], "x": 5, "y": 2.25},
+                {"label": "G", "matrix": [2, 5], "x": 6, "y": 2.25},
 
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2.25},
-                {"matrix": [2, 2], "x": 3, "y": 2.25},
-                {"matrix": [2, 3], "x": 4, "y": 2.25},
-                {"matrix": [2, 4], "x": 5, "y": 2.25},
-                {"matrix": [2, 5], "x": 6, "y": 2.25},
+                {"label": "H", "matrix": [2, 6], "x": 9.25, "y": 2.25},
+                {"label": "J", "matrix": [2, 7], "x": 10.25, "y": 2.25},
+                {"label": "K", "matrix": [2, 8], "x": 11.25, "y": 2.25},
+                {"label": "L", "matrix": [2, 9], "x": 12.25, "y": 2.25},
+                {"label": ";", "matrix": [2, 10], "x": 13.75, "y": 2.25},
+                {"label": "'", "matrix": [2, 11], "x": 14.75, "y": 2.25},
+                {"label": "Enter", "matrix": [2, 13], "x": 15.75, "y": 2.25, "w": 2.25},
 
-                {"matrix": [2, 6], "x": 9.25, "y": 2.25},
-                {"matrix": [2, 7], "x": 10.25, "y": 2.25},
-                {"matrix": [2, 8], "x": 11.25, "y": 2.25},
-                {"matrix": [2, 9], "x": 12.25, "y": 2.25},
-                {"matrix": [2, 10], "x": 13.75, "y": 2.25},
-                {"matrix": [2, 11], "x": 14.75, "y": 2.25},
-                {"matrix": [2, 13], "x": 15.75, "y": 2.25, "w": 2.25},
+                {"label": "Fn", "matrix": [2, 14], "x": 18.75, "y": 2},
 
-                {"matrix": [2, 14], "x": 18.75, "y": 2},
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+                {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3.25},
+                {"label": "X", "matrix": [3, 2], "x": 3.5, "y": 3.25},
+                {"label": "C", "matrix": [3, 3], "x": 4.5, "y": 3.25},
+                {"label": "V", "matrix": [3, 4], "x": 5.5, "y": 3.25},
+                {"label": "B", "matrix": [3, 5], "x": 6.5, "y": 3.25},
 
-                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3.25},
-                {"matrix": [3, 2], "x": 3.5, "y": 3.25},
-                {"matrix": [3, 3], "x": 4.5, "y": 3.25},
-                {"matrix": [3, 4], "x": 5.5, "y": 3.25},
-                {"matrix": [3, 5], "x": 6.5, "y": 3.25},
+                {"label": "N", "matrix": [3, 6], "x": 9.75, "y": 3.25},
+                {"label": "M", "matrix": [3, 7], "x": 10.75, "y": 3.25},
+                {"label": ",", "matrix": [3, 8], "x": 11.75, "y": 3.25},
+                {"label": ".", "matrix": [3, 9], "x": 13.5, "y": 3.25},
+                {"label": "/", "matrix": [3, 10], "x": 14.5, "y": 3.25},
+                {"label": "Shift", "matrix": [3, 11], "x": 15.5, "y": 3.25, "w": 1.75},
 
-                {"matrix": [3, 6], "x": 9.75, "y": 3.25},
-                {"matrix": [3, 7], "x": 10.75, "y": 3.25},
-                {"matrix": [3, 8], "x": 11.75, "y": 3.25},
-                {"matrix": [3, 9], "x": 13.5, "y": 3.25},
-                {"matrix": [3, 10], "x": 14.5, "y": 3.25},
-                {"matrix": [3, 11], "x": 15.5, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 13], "x": 17.5, "y": 3.25},
+                {"label": "\u2191", "matrix": [3, 13], "x": 17.5, "y": 3.25},
 
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.5},
-                {"matrix": [4, 2], "x": 3.5, "y": 4.25, "w": 1.5},
-                {"matrix": [4, 4], "x": 5, "y": 4.25, "w": 2},
-                {"matrix": [4, 5], "x": 7, "y": 4.25},
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 2], "x": 3.5, "y": 4.25, "w": 1.5},
+                {"label": "Space", "matrix": [4, 4], "x": 5, "y": 4.25, "w": 2},
+                {"label": "GUI", "matrix": [4, 5], "x": 7, "y": 4.25},
 
-                {"matrix": [4, 6], "x": 9.75, "y": 4.25, "w": 2.75},
-                {"matrix": [4, 9], "x": 12.5, "y": 4.25, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 9.75, "y": 4.25, "w": 2.75},
+                {"label": "Alt", "matrix": [4, 9], "x": 12.5, "y": 4.25, "w": 1.5},
 
-                {"matrix": [4, 11], "x": 16.5, "y": 4.25},
-                {"matrix": [4, 12], "x": 17.5, "y": 4.25},
-                {"matrix": [4, 13], "x": 18.5, "y": 4.25}
+                {"label": "\u2190", "matrix": [4, 11], "x": 16.5, "y": 4.25},
+                {"label": "\u2193", "matrix": [4, 12], "x": 17.5, "y": 4.25},
+                {"label": "\u2192", "matrix": [4, 13], "x": 18.5, "y": 4.25}
             ]
         }
     }
diff --git a/keyboards/ymdk/wingshs/keymaps/default/keymap.c b/keyboards/ymdk/wingshs/keymaps/default/keymap.c
index 31da48fa69..91926c0747 100644
--- a/keyboards/ymdk/wingshs/keymaps/default/keymap.c
+++ b/keyboards/ymdk/wingshs/keymaps/default/keymap.c
@@ -16,7 +16,7 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_all(
+  [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_PGUP,  
     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_PGDN,
     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,                           MO(1),
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL,          KC_LALT,          KC_SPC,  KC_LGUI,          KC_SPC,           KC_RALT,                           KC_LEFT, KC_DOWN, KC_RGHT 
   ),
 
-  [1] = LAYOUT_all(
+  [1] = LAYOUT(
     QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  _______,          _______,
     _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______,  KC_DEL,           _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                    _______,
diff --git a/keyboards/ymdk/wingshs/keymaps/via/keymap.c b/keyboards/ymdk/wingshs/keymaps/via/keymap.c
index f5e1958556..0b9771c749 100644
--- a/keyboards/ymdk/wingshs/keymaps/via/keymap.c
+++ b/keyboards/ymdk/wingshs/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_all(
+  [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_PGUP,
     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_PGDN,
     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,                    MO(1),
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL, KC_LALT,          KC_SPC,  KC_LGUI,          KC_SPC,           KC_RALT,                   KC_LEFT, KC_DOWN, KC_RGHT
   ),
 
-  [1] = LAYOUT_all(
+  [1] = LAYOUT(
     _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,   KC_F11,  KC_F12,  _______,        _______,
     _______, _______, _______, _______, QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,           _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
@@ -33,14 +33,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,          _______,          _______, _______,          _______,          _______,                   _______, _______, _______
   ),
 
-  [2] = LAYOUT_all(
+  [2] = LAYOUT(
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
     _______,          _______,          _______, _______,          _______,          _______,                   _______, _______, _______
   ),
-  [3] = LAYOUT_all(
+  [3] = LAYOUT(
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
diff --git a/keyboards/ymdk/wingshs/matrix_diagram.md b/keyboards/ymdk/wingshs/matrix_diagram.md
new file mode 100644
index 0000000000..56f0ed7b49
--- /dev/null
+++ b/keyboards/ymdk/wingshs/matrix_diagram.md
@@ -0,0 +1,16 @@
+# Matrix Diagram for YMDK WINGS HOTSWAP
+
+```
+ ┌───┬───┬───┬───┬───┬───┬───┐      ┌───┬───┬───┬───┬───┬───┬───────┐┌───┐
+ │00 │01 │02 │03 │04 │05 │06 │      │07 │08 │09 │0A │0B │0C │0D     ││4E │
+┌┴───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┘    ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤└┬──┴┐
+│10   │11 │12 │13 │14 │15 │       │16 │17 │18 │19 │1A │1B │1C │1D   │ │1E │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐      └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └┬──┴┐
+│20    │21 │22 │23 │24 │25 │       │26 │27 │28 │29 │2A │2B │2D      │  │2E │
+├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     └─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘  └───┘
+│30      │31 │32 │33 │34 │35 │       │36 │37 │38 │39 │3A │3B    │┌───┐
+├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ┌─┴───┴───┴┬──┴──┬┴───┴──────┘│3D │
+│40   │     │42   │44     │45  │   │46        │49   │        ┌───┼───┼───┐
+└─────┘     └─────┴───────┴────┘   └──────────┴─────┘        │4B │4C │4D │
+                                                             └───┴───┴───┘
+```