Momoka Ergo: layout macro/Configurator fix (#13825)

* momoka_ergo.h: use modified QMK 3-character notation

Renames the matrix position arguments to use QMK's K<row><column> notation, but using L or R for the left and right halves, respectively.

* physically arrange layout macro

Arrange the layout macro and keycodes to resemble the assembled keyboard.

* info.json: rebuild LAYOUT data

Fixes mispositioned keys in QMK Configurator.

1 files changed, 78 insertions, 70 deletions

diff --git a/keyboards/momoka_ergo/info.json b/keyboards/momoka_ergo/info.json
index ecbae947b0..13df2b7dc1 100644
--- a/keyboards/momoka_ergo/info.json
+++ b/keyboards/momoka_ergo/info.json
@@ -7,76 +7,84 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-			{"label":"L02", "x":3.5, "y":0},
-			{"label":"R03", "x":15, "y":0},
-			{"label":"L03", "x":2.5, "y":0.125},
-			{"label":"L01", "x":4.5, "y":0.125},
-			{"label":"R04", "x":14, "y":0.125}, 
-			{"label":"R02", "x":16, "y":0.125}, 
-			{"label":"L00", "x":5.5, "y":0.25}, 
-			{"label":"R05", "x":13, "y":0.25}, 
-			{"label":"L05", "x":0, "y":0.375, "w":1.5}, 
-			{"label":"L04", "x":1.5, "y":0.375}, 
-			{"label":"R01", "x":17, "y":0.375}, 
-			{"label":"R00", "x":18, "y":0.375, "w":1.5}, 
-			{"label":"L12", "x":3.5, "y":1}, 
-			{"label":"R13", "x":15, "y":1}, 
-			{"label":"L13", "x":2.5, "y":1.125}, 
-			{"label":"L11", "x":4.5, "y":1.125}, 
-			{"label":"R14", "x":14, "y":1.125}, 
-			{"label":"R12", "x":16, "y":1.125}, 
-			{"label":"L10", "x":5.5, "y":1.25},
-			{"label":"R15", "x":13, "y":1.25}, 
-			{"label":"L15", "x":0, "y":1.375, "w":1.5}, 
-			{"label":"L14", "x":1.5, "y":1.375}, 
-			{"label":"R11", "x":17, "y":1.375}, 
-			{"label":"R10", "x":18, "y":1.375, "w":1.5}, 
-			{"label":"L22", "x":3.5, "y":2}, 
-			{"label":"R23", "x":15, "y":2}, 
-			{"label":"L23", "x":2.5, "y":2.125}, 
-			{"label":"L21", "x":4.5, "y":2.125}, 
-			{"label":"R24", "x":14, "y":2.125}, 
-			{"label":"R22", "x":16, "y":2.125}, 
-			{"label":"L20", "x":5.5, "y":2.25}, 
-			{"label":"R25", "x":13, "y":2.25}, 
-			{"label":"L25", "x":0, "y":2.375, "w":1.5},
-			{"label":"L24", "x":1.5, "y":2.375},
-			{"label":"R21", "x":17, "y":2.375},
-			{"label":"R20", "x":18, "y":2.375, "w":1.5},
-			{"label":"L32", "x":3.5, "y":3},
-			{"label":"R33", "x":15, "y":3},
-			{"label":"L33", "x":2.5, "y":3.125},
-			{"label":"L31", "x":4.5, "y":3.125},
-			{"label":"R34", "x":14, "y":3.125},
-			{"label":"R32", "x":16, "y":3.125},
-			{"label":"L30", "x":5.5, "y":3.25}, 
-			{"label":"R35", "x":13, "y":3.25}, 
-			{"label":"L35", "x":0, "y":3.375, "w":1.5}, 
-			{"label":"L34", "x":1.5, "y":3.375}, 
-			{"label":"R31", "x":17, "y":3.375}, 
-			{"label":"R30", "x":18, "y":3.375, "w":1.5}, 
-			{"label":"L42", "x":3.5, "y":4}, 
-			{"label":"R43", "x":15, "y":4}, 
-			{"label":"L43", "x":2.5, "y":4.125}, 
-			{"label":"L41", "x":4.5, "y":4.125}, 
-			{"label":"R44", "x":14, "y":4.125}, 
-			{"label":"R42", "x":16, "y":4.125}, 
-			{"label":"L45", "x":0.5, "y":4.375}, 
-			{"label":"L44", "x":1.5, "y":4.375},
-			{"label":"R41", "x":17, "y":4.375},
-			{"label":"R40", "x":18, "y":4.375},
-			{"label":"L51", "x":1, "y":4.375},
-			{"label":"L40", "x":2, "y":4.375}, 
-			{"label":"L52", "x":0, "y":5.375, "h":2}, 
-			{"label":"L61", "x":1, "y":5.375, "h":2}, 
-			{"label":"L50", "x":2, "y":5.375}, 
-			{"label":"L60", "x":2, "y":6.375}, 
-			{"label":"R45", "x":-3.0, "y":6.375}, 
-			{"label":"R54", "x":-2, "y":6.375}, 
-			{"label":"R55", "x":-3.0, "y":7.375}, 
-			{"label":"R64", "x":-2, "y":7.375, "h":2}, 
-			{"label":"R53", "x":-1.0, "y":7.375, "h":2}, 
-			{"label":"R65", "x":-3.0, "y":8.375}]
+                {"label":"L05", "x":0, "y":0.375, "w":1.5},
+                {"label":"L04", "x":1.5, "y":0.375},
+                {"label":"L03", "x":2.5, "y":0.125},
+                {"label":"L02", "x":3.5, "y":0},
+                {"label":"L01", "x":4.5, "y":0.125},
+                {"label":"L00", "x":5.5, "y":0.25},
+                {"label":"R70", "x":12.5, "y":0.25},
+                {"label":"R71", "x":13.5, "y":0.125},
+                {"label":"R72", "x":14.5, "y":0},
+                {"label":"R73", "x":15.5, "y":0.125},
+                {"label":"R74", "x":16.5, "y":0.375},
+                {"label":"R75", "x":17.5, "y":0.375, "w":1.5},
+
+                {"label":"L15", "x":0, "y":1.375, "w":1.5},
+                {"label":"L14", "x":1.5, "y":1.375},
+                {"label":"L13", "x":2.5, "y":1.125},
+                {"label":"L12", "x":3.5, "y":1},
+                {"label":"L11", "x":4.5, "y":1.125},
+                {"label":"L10", "x":5.5, "y":1.25},
+                {"label":"R80", "x":12.5, "y":1.25},
+                {"label":"R81", "x":13.5, "y":1.125},
+                {"label":"R82", "x":14.5, "y":1},
+                {"label":"R83", "x":15.5, "y":1.125},
+                {"label":"R84", "x":16.5, "y":1.375},
+                {"label":"R85", "x":17.5, "y":1.375, "w":1.5},
+
+                {"label":"L25", "x":0, "y":2.375, "w":1.5},
+                {"label":"L24", "x":1.5, "y":2.375},
+                {"label":"L23", "x":2.5, "y":2.125},
+                {"label":"L22", "x":3.5, "y":2},
+                {"label":"L21", "x":4.5, "y":2.125},
+                {"label":"L20", "x":5.5, "y":2.25},
+                {"label":"R90", "x":12.5, "y":2.25},
+                {"label":"R91", "x":13.5, "y":2.125},
+                {"label":"R92", "x":14.5, "y":2},
+                {"label":"R93", "x":15.5, "y":2.125},
+                {"label":"R94", "x":16.5, "y":2.375},
+                {"label":"R95", "x":17.5, "y":2.375, "w":1.5},
+
+                {"label":"L35", "x":0, "y":3.375, "w":1.5},
+                {"label":"L34", "x":1.5, "y":3.375},
+                {"label":"L33", "x":2.5, "y":3.125},
+                {"label":"L32", "x":3.5, "y":3},
+                {"label":"L31", "x":4.5, "y":3.125},
+                {"label":"L30", "x":5.5, "y":3.25},
+                {"label":"RA0", "x":12.5, "y":3.25},
+                {"label":"RA1", "x":13.5, "y":3.125},
+                {"label":"RA2", "x":14.5, "y":3},
+                {"label":"RA3", "x":15.5, "y":3.125},
+                {"label":"RA4", "x":16.5, "y":3.375},
+                {"label":"RA5", "x":17.5, "y":3.375, "w":1.5},
+
+                {"label":"L45", "x":0.5, "y":4.375},
+                {"label":"L44", "x":1.5, "y":4.375},
+                {"label":"L43", "x":2.5, "y":4.125},
+                {"label":"L42", "x":3.5, "y":4},
+                {"label":"L41", "x":4.5, "y":4.125},
+                {"label":"RB1", "x":13.5, "y":4.125},
+                {"label":"RB2", "x":14.5, "y":4},
+                {"label":"RB3", "x":15.5, "y":4.125},
+                {"label":"RB4", "x":16.5, "y":4.375},
+                {"label":"RB5", "x":17.5, "y":4.375},
+
+                {"label":"L51", "x":7, "y":4.875},
+                {"label":"L40", "x":8, "y":4.875},
+                {"label":"RB0", "x":10, "y":4.875},
+                {"label":"RC1", "x":11, "y":4.875},
+
+                {"label":"L50", "x":8, "y":5.875},
+                {"label":"RC0", "x":10, "y":5.875},
+
+                {"label":"L52", "x":6, "y":5.875, "h":2},
+                {"label":"L61", "x":7, "y":5.875, "h":2},
+                {"label":"L60", "x":8, "y":6.875},
+                {"label":"RD0", "x":10, "y":6.875},
+                {"label":"RD1", "x":11, "y":5.875, "h":2},
+                {"label":"RC2", "x":12, "y":5.875, "h":2}
+            ]
         }
     }
 }