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.

3 files changed, 130 insertions, 116 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}
+            ]
         }
     }
 }
diff --git a/keyboards/momoka_ergo/keymaps/default/keymap.c b/keyboards/momoka_ergo/keymaps/default/keymap.c
index ca1131ba2f..01c01ed013 100644
--- a/keyboards/momoka_ergo/keymaps/default/keymap.c
+++ b/keyboards/momoka_ergo/keymaps/default/keymap.c
@@ -25,31 +25,34 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = 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_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-        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_LSFT,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-        MO(_FN1),   KC_GRV,  KC_EQL,  KC_LEFT, KC_RGHT, KC_LALT, KC_RGUI, KC_UP,   KC_DOWN, KC_LBRC, KC_RBRC, MO(_FN1),
-                                     KC_BSPC, KC_LCTL, KC_HOME, KC_PGUP, KC_RCTL, KC_SPC,
-                                              KC_DEL,  KC_END,  KC_PGDN, KC_ENT
+        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_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                                           KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
+        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_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                                           KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+        MO(_FN1), KC_GRV,  KC_EQL,  KC_LEFT, KC_RGHT,                                                          KC_UP,   KC_DOWN, KC_LBRC, KC_RBRC, MO(_FN1),
+                                                               KC_LCTL, KC_LALT,    KC_RGUI, KC_RCTL,
+                                                                        KC_HOME,    KC_PGUP,
+                                                      KC_BSPC, KC_DEL,  KC_END,     KC_PGDN, KC_ENT,  KC_SPC
     ),
     [_FN1] = 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,
-        _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        MO(_FN2),  _______, _______, _______, _______, _______, _______, _______, RGB_RMOD,RGB_MOD, RGB_TOG, MO(_FN2),
-        _______,   _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, RGB_VAD, RGB_SAI, RGB_SAD, _______,
-                                     _______, _______, _______, RGB_HUI, _______, _______,
-                                              _______, _______, RGB_HUD, _______
+        KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                                          KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,  KC_F12,
+        _______,  _______, _______, _______, _______, _______,                                        _______, _______, _______,  _______, _______, _______,
+        _______,  _______, _______, _______, _______, _______,                                        _______, _______, _______,  _______, _______, _______,
+        MO(_FN2), _______, _______, _______, _______, _______,                                        _______, _______, RGB_RMOD, RGB_MOD, RGB_TOG, MO(_FN2),
+        _______,  _______, KC_MUTE, KC_VOLD, KC_VOLU,                                                          RGB_VAI, RGB_VAD,  RGB_SAI, RGB_SAD, _______,
+                                                               _______, _______,    _______, _______,
+                                                                        _______,    RGB_HUI,
+                                                      _______, _______, _______,    RGB_HUD, _______, _______
     ),
     [_FN2] = 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,
-        _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,   _______, _______, RESET,   _______, _______, _______, _______, RESET,   _______, _______, _______,
-        _______,   _______, _______, _______, _______, _______, _______, _______, RGB_RMOD,RGB_MOD, RGB_TOG, _______, 
-        _______,   _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, RGB_VAD, RGB_SAI, RGB_SAD, _______,
-                                     _______, _______, _______, RGB_HUI, _______, _______,
-                                              _______, _______, RGB_HUD, _______
+        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                                          KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,  KC_F12,
+        _______, _______, _______, _______, _______, _______,                                        _______, _______, _______,  _______, _______, _______,
+        _______, _______, _______, RESET,   _______, _______,                                        _______, _______, RESET,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______,                                        _______, _______, RGB_RMOD, RGB_MOD, RGB_TOG, _______,
+        _______, _______, KC_MUTE, KC_VOLD, KC_VOLU,                                                          RGB_VAI, RGB_VAD,  RGB_SAI, RGB_SAD, _______,
+                                                              _______, _______,    _______, _______,
+                                                                       _______,    RGB_HUI,
+                                                     _______, _______, _______,    RGB_HUD, _______, _______
     )
-    
+
 };
diff --git a/keyboards/momoka_ergo/momoka_ergo.h b/keyboards/momoka_ergo/momoka_ergo.h
index 93faad4490..1bbc1b242a 100644
--- a/keyboards/momoka_ergo/momoka_ergo.h
+++ b/keyboards/momoka_ergo/momoka_ergo.h
@@ -18,6 +18,8 @@
 
 #include "quantum.h"
 
+#define XXX KC_NO
+
 /* This is a shortcut to help you visually see your layout.
  *
  * The first section contains all of the arguments representing the physical
@@ -27,27 +29,28 @@
  * represents the switch matrix.
  */
 #define LAYOUT( \
-	L05, L04, L03, L02, L01, L00, R05, R04, R03, R02, R01, R00, \
-	L15, L14, L13, L12, L11, L10, R15, R14, R13, R12, R11, R10, \
-	L25, L24, L23, L22, L21, L20, R25, R24, R23, R22, R21, R20, \
-	L35, L34, L33, L32, L31, L30, R35, R34, R33, R32, R31, R30, \
-	L45, L44, L43, L42, L41, L40, R45, R44, R43, R42, R41, R40, \
-	L52, L51, L50, R55, R54, R53, \
-	L61, L60, R65, R64 \
-	) \
-	{ \
-		{ L00, L01, L02, L03, L04, L05 }, \
-		{ L10, L11, L12, L13, L14, L15 }, \
-		{ L20, L21, L22, L23, L24, L25 }, \
-		{ L30, L31, L32, L33, L34, L35 }, \
-		{ L40, L41, L42, L43, L44, L45 },\
-		{ L50, L51, L52, KC_NO,KC_NO,KC_NO },\
-		{ L60, L61,KC_NO,KC_NO,KC_NO,KC_NO },\
-		{ R05, R04, R03, R02, R01, R00 }, \
-		{ R15, R14, R13, R12, R11, R10 }, \
-		{ R25, R24, R23, R22, R21, R20 }, \
-		{ R35, R34, R33, R32, R31, R30 }, \
-		{ R45, R44, R43, R42, R41, R40 },\
-		{ R55, R54, R53, KC_NO, KC_NO, KC_NO }, \
-		{ R65, R64, KC_NO, KC_NO, KC_NO, KC_NO } \
-	}
+    L05, L04, L03, L02, L01, L00,                       R70, R71, R72, R73, R74, R75, \
+    L15, L14, L13, L12, L11, L10,                       R80, R81, R82, R83, R84, R85, \
+    L25, L24, L23, L22, L21, L20,                       R90, R91, R92, R93, R94, R95, \
+    L35, L34, L33, L32, L31, L30,                       RA0, RA1, RA2, RA3, RA4, RA5, \
+    L45, L44, L43, L42, L41,                                 RB1, RB2, RB3, RB4, RB5, \
+                                  L51, L40,   RB0, RC1,                               \
+                                       L50,   RC0,                                    \
+                             L52, L61, L60,   RD0, RD1, RC2                           \
+    ) \
+    { \
+        { L00, L01, L02, L03, L04, L05 }, \
+        { L10, L11, L12, L13, L14, L15 }, \
+        { L20, L21, L22, L23, L24, L25 }, \
+        { L30, L31, L32, L33, L34, L35 }, \
+        { L40, L41, L42, L43, L44, L45 }, \
+        { L50, L51, L52, XXX, XXX, XXX }, \
+        { L60, L61, XXX, XXX, XXX, XXX }, \
+        { R70, R71, R72, R73, R74, R75 }, \
+        { R80, R81, R82, R83, R84, R85 }, \
+        { R90, R91, R92, R93, R94, R95 }, \
+        { RA0, RA1, RA2, RA3, RA4, RA5 }, \
+        { RB0, RB1, RB2, RB3, RB4, RB5 }, \
+        { RC0, RC1, RC2, XXX, XXX, XXX }, \
+        { RD0, RD1, XXX, XXX, XXX, XXX }  \
+    }