Pluckey: Fix QMK Configurator Implementation (#15254)

* rename LAYOUT to LAYOUT_all

* pluckey.h: add matrix diagram

* pluckey.h: use XXX for KC_NO

* add LAYOUT_ergo macro with keymap

`info.json` had layout data for this macro, but the macro was not present in the source code.

* info.json: correct key sequence

Fixes incorrect key assignments in QMK Configurator.

1 files changed, 146 insertions, 135 deletions

diff --git a/keyboards/pluckey/info.json b/keyboards/pluckey/info.json
index 0a6bd1832d..de58bee802 100644
--- a/keyboards/pluckey/info.json
+++ b/keyboards/pluckey/info.json
@@ -2,147 +2,158 @@
     "keyboard_name": "pluckey",
     "url": "https://github.com/floookay/pluckey",
     "maintainer": "floookay",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_all"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_all": {
             "layout": [
-                {"x":3.5, "y":0},
-                {"x":15, "y":0},
-                {"x":2.5, "y":0.125},
-                {"x":4.5, "y":0.125},
-                {"x":14, "y":0.125},
-                {"x":16, "y":0.125},
-                {"x":5.5, "y":0.25},
-                {"x":6.5, "y":0.25},
-                {"x":12, "y":0.25},
-                {"x":13, "y":0.25},
-                {"x":0, "y":0.625, "w":1.5},
-                {"x":1.5, "y":0.625},
-                {"x":17, "y":0.625},
-                {"x":18, "y":0.625, "w":1.5},
-                {"x":3.5, "y":1.0},
-                {"x":15, "y":1.0},
-                {"x":2.5, "y":1.125},
-                {"x":4.5, "y":1.125},
-                {"x":14, "y":1.125},
-                {"x":16, "y":1.125},
-                {"x":5.5, "y":1.25},
-                {"x":6.5, "y":1.25},
-                {"x":12, "y":1.25},
-                {"x":13, "y":1.25},
-                {"x":0, "y":1.625, "w":1.5},
-                {"x":1.5, "y":1.625},
-                {"x":17, "y":1.625},
-                {"x":18, "y":1.625, "w":1.5},
-                {"x":3.5, "y":2},
-                {"x":15, "y":2},
-                {"x":2.5, "y":2.125},
-                {"x":4.5, "y":2.125},
-                {"x":14, "y":2.125},
-                {"x":16, "y":2.125},
-                {"x":5.5, "y":2.25},
-                {"x":6.5, "y":2.25},
-                {"x":12, "y":2.25},
-                {"x":13, "y":2.25},
-                {"x":0, "y":2.625, "w":1.5},
-                {"x":1.5, "y":2.625},
-                {"x":17, "y":2.625},
-                {"x":18, "y":2.625, "w":1.5},
-                {"x":6.5, "y":3.25},
-                {"x":12, "y":3.25},
-                {"x":3.5, "y":3},
-                {"x":15, "y":3},
-                {"x":2.5, "y":3.125},
-                {"x":4.5, "y":3.125},
-                {"x":14, "y":3.125},
-                {"x":16, "y":3.125},
-                {"x":5.5, "y":3.25},
-                {"x":13, "y":3.25},
-                {"x":0, "y":3.625, "w":1.5},
-                {"x":1.5, "y":3.625},
-                {"x":17, "y":3.625},
-                {"x":18, "y":3.625, "w":1.5},
-                {"x":7.5, "y":3.75},
-                {"x":11, "y":3.75},
-                {"x":3.5, "y":4},
-                {"x":15, "y":4},
-                {"x":2.5, "y":4.125},
-                {"x":4.5, "y":4.125},
-                {"x":14, "y":4.125},
-                {"x":16, "y":4.125},
-                {"x":5.75, "y":4.5, "w":1.5},
-                {"x":12.25, "y":4.5, "w":1.5},
-                {"x":7.25, "y":4.75},
-                {"x":11.25, "y":4.75}
+                {"label":"Esc", "x":0, "y":0.625, "w":1.5},
+                {"label":"1!", "x":1.5, "y":0.625},
+                {"label":"2@", "x":2.5, "y":0.125},
+                {"label":"3#", "x":3.5, "y":0},
+                {"label":"4$", "x":4.5, "y":0.125},
+                {"label":"5%", "x":5.5, "y":0.25},
+                {"label":"-_", "x":6.5, "y":0.25},
+                {"label":"=+", "x":12, "y":0.25},
+                {"label":"6^", "x":13, "y":0.25},
+                {"label":"7&", "x":14, "y":0.125},
+                {"label":"8*", "x":15, "y":0},
+                {"label":"9(", "x":16, "y":0.125},
+                {"label":"0)", "x":17, "y":0.625},
+                {"label":"`~", "x":18, "y":0.625, "w":1.5},
+
+                {"label":"Tab", "x":0, "y":1.625, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1.625},
+                {"label":"W", "x":2.5, "y":1.125},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1.125},
+                {"label":"T", "x":5.5, "y":1.25},
+                {"label":"[{", "x":6.5, "y":1.25},
+                {"label":"]}", "x":12, "y":1.25},
+                {"label":"Y", "x":13, "y":1.25},
+                {"label":"U", "x":14, "y":1.125},
+                {"label":"I", "x":16, "y":1.125},
+                {"label":"O", "x":15, "y":1},
+                {"label":"P", "x":17, "y":1.625},
+                {"label":"\\|", "x":18, "y":1.625, "w":1.5},
+
+                {"label":"Ctrl", "x":0, "y":2.625, "w":1.5},
+                {"label":"A", "x":1.5, "y":2.625},
+                {"label":"S", "x":2.5, "y":2.125},
+                {"label":"D", "x":3.5, "y":2},
+                {"label":"F", "x":4.5, "y":2.125},
+                {"label":"G", "x":5.5, "y":2.25},
+                {"label":"(", "x":6.5, "y":2.25},
+                {"label":")", "x":12, "y":2.25},
+                {"label":"H", "x":13, "y":2.25},
+                {"label":"J", "x":14, "y":2.125},
+                {"label":"K", "x":16, "y":2.125},
+                {"label":"L", "x":15, "y":2},
+                {"label":";:", "x":17, "y":2.625},
+                {"label":"'\"", "x":18, "y":2.625, "w":1.5},
+
+                {"label":"Shift", "x":0, "y":3.625, "w":1.5},
+                {"label":"Z", "x":1.5, "y":3.625},
+                {"label":"X", "x":2.5, "y":3.125},
+                {"label":"C", "x":3.5, "y":3},
+                {"label":"V", "x":4.5, "y":3.125},
+                {"label":"B", "x":5.5, "y":3.25},
+                {"label":"{", "x":6.5, "y":3.25},
+                {"label":"Home", "x":7.5, "y":3.75},
+                {"label":"End", "x":11, "y":3.75},
+                {"label":"}", "x":12, "y":3.25},
+                {"label":"N", "x":13, "y":3.25},
+                {"label":"M", "x":14, "y":3.125},
+                {"label":",<", "x":15, "y":3},
+                {"label":".>", "x":16, "y":3.125},
+                {"label":"/?", "x":17, "y":3.625},
+                {"label":"Shift", "x":18, "y":3.625, "w":1.5},
+
+                {"label":"GUI", "x":2.5, "y":4.125},
+                {"label":"Alt", "x":3.5, "y":4},
+                {"label":"Lower", "x":4.5, "y":4.125},
+                {"label":"Space", "x":5.75, "y":4.5, "w":1.5},
+                {"label":"Backspace", "x":7.25, "y":4.75},
+                {"label":"Enter", "x":11.25, "y":4.75},
+                {"label":"Space", "x":12.25, "y":4.5, "w":1.5},
+                {"label":"Raise", "x":14, "y":4.125},
+                {"label":"Alt", "x":15, "y":4},
+                {"label":"MEH", "x":16, "y":4.125}
             ]
         },
         "LAYOUT_ergo": {
             "layout": [
-                {"x":3.5, "y":0},
-                {"x":15, "y":0},
-                {"x":2.5, "y":0.125},
-                {"x":4.5, "y":0.125},
-                {"x":14, "y":0.125},
-                {"x":16, "y":0.125},
-                {"x":5.5, "y":0.25},
-                {"x":6.5, "y":0.25},
-                {"x":12, "y":0.25},
-                {"x":13, "y":0.25},
-                {"x":0, "y":0.625, "w":1.5},
-                {"x":1.5, "y":0.625},
-                {"x":17, "y":0.625},
-                {"x":18, "y":0.625, "w":1.5},
-                {"x":3.5, "y":1.0},
-                {"x":15, "y":1.0},
-                {"x":2.5, "y":1.125},
-                {"x":4.5, "y":1.125},
-                {"x":14, "y":1.125},
-                {"x":16, "y":1.125},
-                {"x":5.5, "y":1.25},
-                {"x":6.5, "y":1.25, "h":1.5},
-                {"x":12, "y":1.25, "h":1.5},
-                {"x":13, "y":1.25},
-                {"x":0, "y":1.625, "w":1.5},
-                {"x":1.5, "y":1.625},
-                {"x":17, "y":1.625},
-                {"x":18, "y":1.625, "w":1.5},
-                {"x":3.5, "y":2},
-                {"x":15, "y":2},
-                {"x":2.5, "y":2.125},
-                {"x":4.5, "y":2.125},
-                {"x":14, "y":2.125},
-                {"x":16, "y":2.125},
-                {"x":5.5, "y":2.25},
-                {"x":13, "y":2.25},
-                {"x":0, "y":2.625, "w":1.5},
-                {"x":1.5, "y":2.625},
-                {"x":17, "y":2.625},
-                {"x":18, "y":2.625, "w":1.5},
-                {"x":6.5, "y":2.75, "h":1.5},
-                {"x":12, "y":2.75, "h":1.5},
-                {"x":3.5, "y":3},
-                {"x":15, "y":3},
-                {"x":2.5, "y":3.125},
-                {"x":4.5, "y":3.125},
-                {"x":14, "y":3.125},
-                {"x":16, "y":3.125},
-                {"x":5.5, "y":3.25},
-                {"x":13, "y":3.25},
-                {"x":0, "y":3.625, "w":1.5},
-                {"x":1.5, "y":3.625},
-                {"x":17, "y":3.625},
-                {"x":18, "y":3.625, "w":1.5},
-                {"x":7.5, "y":3.75},
-                {"x":11, "y":3.75},
-                {"x":3.5, "y":4},
-                {"x":15, "y":4},
-                {"x":2.5, "y":4.125},
-                {"x":4.5, "y":4.125},
-                {"x":14, "y":4.125},
-                {"x":16, "y":4.125},
-                {"x":5.75, "y":4.5, "w":1.5},
-                {"x":12.25, "y":4.5, "w":1.5},
-                {"x":7.25, "y":4.75},
-                {"x":11.25, "y":4.75}
+                {"label":"Esc", "x":0, "y":0.625, "w":1.5},
+                {"label":"1!", "x":1.5, "y":0.625},
+                {"label":"2@", "x":2.5, "y":0.125},
+                {"label":"3#", "x":3.5, "y":0},
+                {"label":"4$", "x":4.5, "y":0.125},
+                {"label":"5%", "x":5.5, "y":0.25},
+                {"label":"-_", "x":6.5, "y":0.25},
+                {"label":"=+", "x":12, "y":0.25},
+                {"label":"6^", "x":13, "y":0.25},
+                {"label":"7&", "x":14, "y":0.125},
+                {"label":"8*", "x":15, "y":0},
+                {"label":"9(", "x":16, "y":0.125},
+                {"label":"0)", "x":17, "y":0.625},
+                {"label":"`~", "x":18, "y":0.625, "w":1.5},
+
+                {"label":"Tab", "x":0, "y":1.625, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1.625},
+                {"label":"W", "x":2.5, "y":1.125},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1.125},
+                {"label":"T", "x":5.5, "y":1.25},
+                {"label":"[{", "x":6.5, "y":1.25, "h":1.5},
+                {"label":"]}", "x":12, "y":1.25, "h":1.5},
+                {"label":"Y", "x":13, "y":1.25},
+                {"label":"U", "x":14, "y":1.125},
+                {"label":"I", "x":16, "y":1.125},
+                {"label":"O", "x":15, "y":1},
+                {"label":"P", "x":17, "y":1.625},
+                {"label":"\\|", "x":18, "y":1.625, "w":1.5},
+
+                {"label":"Ctrl", "x":0, "y":2.625, "w":1.5},
+                {"label":"A", "x":1.5, "y":2.625},
+                {"label":"S", "x":2.5, "y":2.125},
+                {"label":"D", "x":3.5, "y":2},
+                {"label":"F", "x":4.5, "y":2.125},
+                {"label":"G", "x":5.5, "y":2.25},
+                {"label":"H", "x":13, "y":2.25},
+                {"label":"J", "x":14, "y":2.125},
+                {"label":"K", "x":16, "y":2.125},
+                {"label":"L", "x":15, "y":2},
+                {"label":";:", "x":17, "y":2.625},
+                {"label":"'\"", "x":18, "y":2.625, "w":1.5},
+
+                {"label":"Shift", "x":0, "y":3.625, "w":1.5},
+                {"label":"Z", "x":1.5, "y":3.625},
+                {"label":"X", "x":2.5, "y":3.125},
+                {"label":"C", "x":3.5, "y":3},
+                {"label":"V", "x":4.5, "y":3.125},
+                {"label":"B", "x":5.5, "y":3.25},
+                {"label":"(", "x":6.5, "y":2.75, "h":1.5},
+                {"label":"Home", "x":7.5, "y":3.75},
+                {"label":"End", "x":11, "y":3.75},
+                {"label":")", "x":12, "y":2.75, "h":1.5},
+                {"label":"N", "x":13, "y":3.25},
+                {"label":"M", "x":14, "y":3.125},
+                {"label":",<", "x":15, "y":3},
+                {"label":".>", "x":16, "y":3.125},
+                {"label":"/?", "x":17, "y":3.625},
+                {"label":"Shift", "x":18, "y":3.625, "w":1.5},
+
+                {"label":"GUI", "x":2.5, "y":4.125},
+                {"label":"Alt", "x":3.5, "y":4},
+                {"label":"Lower", "x":4.5, "y":4.125},
+                {"label":"Space", "x":5.75, "y":4.5, "w":1.5},
+                {"label":"Backspace", "x":7.25, "y":4.75},
+                {"label":"Enter", "x":11.25, "y":4.75},
+                {"label":"Space", "x":12.25, "y":4.5, "w":1.5},
+                {"label":"Raise", "x":14, "y":4.125},
+                {"label":"Alt", "x":15, "y":4},
+                {"label":"MEH", "x":16, "y":4.125}
             ]
         }
     }