Configurator layout repair for Ergodone, Ergodox Infinity and ErgoTravel (#3173)

* Ergodone refactor

* Ergodox Infinity refactor

* Ergotravel refactor

* Ergotravel configurator layout update

* Fixing include on Ergodox Infinity narze keymap

3 files changed, 28 insertions, 28 deletions

diff --git a/keyboards/ergodox_infinity/keymaps/gordon/keymap.c b/keyboards/ergodox_infinity/keymaps/gordon/keymap.c
index 73dd3b325e..f67dd13a5b 100644
--- a/keyboards/ergodox_infinity/keymaps/gordon/keymap.c
+++ b/keyboards/ergodox_infinity/keymaps/gordon/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 
 //**************************FIRST LAYER - LAYER ZERO **************************************
-  [_QWERTY] = KEYMAP(
+  [_QWERTY] = LAYOUT_ergodox(
 
     SHF6_AF7, F1_F13  ,    F2_F14,   TD(F3D), F4_ALTF4,    F5_F15,   KC_F11,
     SPRK_TCK  , Q_ESC   ,  CTR_SH_W,     NAV_E, ALT_SH_R,      KC_T, PRINTSCR,
@@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 
   //**************************SYMBOLS LAYER**************************
-  [_SYMBOLS] = KEYMAP(
+  [_SYMBOLS] = LAYOUT_ergodox(
     ________, ________, ________, ________, ________, ________,  ________,
     ________, DEREF   ,    KC_AT,  KC_LCBR,  KC_RCBR,  KC_CIRC,  ________,
     ________,  KC_EXLM,  KC_HASH,  KC_LPRN,  KC_RPRN,  ________,
@@ -86,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                      ________,________,_XXXXXX_),
 
   //**************************MOUSE MOVEMENT LAYER**************************
-  [_MOUSE] = KEYMAP(UP_ENTER_RESET,________,________,________,________,________,MODRESET,
+  [_MOUSE] = LAYOUT_ergodox(UP_ENTER_RESET,________,________,________,________,________,MODRESET,
                     RESET,KC_SECRET_5,________,KC_MS_UP,KC_SECRET_4,KC_MS_WH_UP,________,
                     ________,________,KC_MS_LEFT,KC_MS_DOWN,KC_MS_RIGHT,KC_MS_WH_DOWN,
                     KC_SECRET_5,KC_SECRET_4,KC_SECRET_3,_XXXXXX_,KC_SECRET_2,KC_SECRET_1,_XXXXXX_,
@@ -111,7 +111,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   //**************************WINDOWS NAVIGATION LAYER**************************
 
-  [_NAV] = KEYMAP(________,________,________,________,________,________,________,
+  [_NAV] = LAYOUT_ergodox(________,________,________,________,________,________,________,
                   ________,________,SNAPLEFT,_XXXXXX_,SNAPRGHT,________,________,
                   ________,KC_WWW_BACK,PREVTAB,________,NEXTTAB,SNAPUP,
                   ________,________,WORKLEFT,________,WORKRIGHT,SNAPDOWN,________,
@@ -134,7 +134,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          ________,________,________),
 
   //****************************NUMPAD LAYER****************************
-  [_NUMPAD] = KEYMAP(________,________,________,________,________,________,________,
+  [_NUMPAD] = LAYOUT_ergodox(________,________,________,________,________,________,________,
                      ________,________,________,________,________,________,________,
                      ________,KC_DOT  ,KC_SPACE,_XXXXXX_, KC_ESC ,________,
                      ________,DBMS_OUT,________,________,________,________,________,
@@ -155,7 +155,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                        ________,________,KC_0),
 
   //****************************APP SWITCH LAYER****************************
-  [_APPSWITCH] = KEYMAP(________,________,________,________,________,________,________,
+  [_APPSWITCH] = LAYOUT_ergodox(________,________,________,________,________,________,________,
                         ________,________   ,  ________ , ________  ,________   ,________,________,
                         ________,APP_5,APP_6,APP_7,APP_8,________,
                         ________,DBMS_OUT,________,________,________,________,________,
@@ -176,7 +176,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                     ________,________,________),
 
 
-  [_ONESHOT] = KEYMAP(  UP_ENTER_RESET , ________, ________, ________, ________, ________, ________,
+  [_ONESHOT] = LAYOUT_ergodox(  UP_ENTER_RESET , ________, ________, ________, ________, ________, ________,
                         ________, ________, ________, KC_UP   , ________, ________, ________,
                         ________, ________, KC_LEFT , KC_DOWN , KC_RIGHT, ________,
                         MAGIC_TOGGLE_NKRO, ________, ________, ________, ________, ________, ________,
@@ -196,7 +196,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                         ________,
                         ________, ________, ________),
   //****************************TEXT/INTELLIJ NAVIGATION LAYER****************************
-  [_TEXTNAV] = KEYMAP(________,________,________,________,________,________,________,
+  [_TEXTNAV] = LAYOUT_ergodox(________,________,________,________,________,________,________,
                       ________,MEH(KC_Q),LSFT(KC_ESCAPE),MEH(KC_D),MEH(KC_2),LALT(LSFT(KC_UP)),________,
                       ________,________,LCTL(KC_LEFT),LCTL(KC_B),LCTL(KC_RIGHT),LALT(LSFT(KC_DOWN)),
                       ________,________,________,LCTL(LSFT(KC_COMMA)),MEH(KC_DOT),LALT(KC_MS_WH_UP),________,
@@ -208,7 +208,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                       ________,LALT(KC_Z),________,________,________,LCTL(LSFT(KC_LEFT)),LALT(LCTL(KC_S)),LCTL(LSFT(KC_RIGHT)),
                       LCTL(LSFT(KC_COMMA)),________,________,________,________,________,________,________,________,________,
                       ________,________,________,________,________,________,________,________,________,_XXXXXX_),
-  [_QWERTY_KIDS] = KEYMAP(
+  [_QWERTY_KIDS] = LAYOUT_ergodox(
 
       KC_NO ,   KC_NO  , KC_NO ,     KC_NO ,   KC_NO ,      KC_NO ,     KC_NO ,
       KC_NO ,   KC_Q   , KC_W,     KC_E, KC_R,      KC_T,   KC_NO ,
@@ -230,7 +230,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          KC_NO,
   KC_NO, KC_ENTER, KC_SPACE),
 
-  [_STREET_FIGHTER] = KEYMAP(
+  [_STREET_FIGHTER] = LAYOUT_ergodox(
 
       KC_NO ,   KC_NO  , KC_NO ,     KC_NO ,   KC_NO ,      KC_NO ,     KC_NO ,
       KC_NO ,   KC_NO   , DIE_1000X_LEFT,     KC_UP, DIE_1000X_RIGHT,      KC_NO,   KC_NO ,
@@ -254,7 +254,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 
   //************************Windows navigation to directories*************************
-  [_DIRNAV] = KEYMAP(
+  [_DIRNAV] = LAYOUT_ergodox(
          ________,________,________,________,________,________,________,
          ________,________,________,________,________,________,________,
          ________,________,KC_A,________,________,________,
@@ -278,7 +278,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          ________,________,________),
 
 
-  [_TEXT_MACROS] = KEYMAP(
+  [_TEXT_MACROS] = LAYOUT_ergodox(
          ________,________,________,________,________,________,________,
          ________,________,________,________,________,________,________,
          ________,________,KC_A,________,________,________,
@@ -305,7 +305,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* FOR FORMATTING FUTURE LAYERS
    NO KEY CODES SHOULD BE MORE THAN 8 CHARACTERS
    GOES LEFT HAND THEN RIGHT HAND
-  [_DIRNAV] = KEYMAP(
+  [_DIRNAV] = LAYOUT_ergodox(
          ________,________,________,________,________,________,________,
          ________,________,________,________,________,________,________,
          ________,________,________,________,________,________,
diff --git a/keyboards/ergodox_infinity/keymaps/halfkeyboard/keymap.c b/keyboards/ergodox_infinity/keymaps/halfkeyboard/keymap.c
index b1cfdf42fc..8b6a0fcc70 100644
--- a/keyboards/ergodox_infinity/keymaps/halfkeyboard/keymap.c
+++ b/keyboards/ergodox_infinity/keymaps/halfkeyboard/keymap.c
@@ -304,7 +304,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 
-[PLVR] = KEYMAP(  // layout: layer 7: Steno for Plover
+[PLVR] = LAYOUT_ergodox(  // layout: layer 7: Steno for Plover
         // left hand
         KC_NO, KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,
         KC_NO,  KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_TRNS,
diff --git a/keyboards/ergodox_infinity/keymaps/narze/keymap.c b/keyboards/ergodox_infinity/keymaps/narze/keymap.c
index 5871c221a2..3fd3b69714 100644
--- a/keyboards/ergodox_infinity/keymaps/narze/keymap.c
+++ b/keyboards/ergodox_infinity/keymaps/narze/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 // #include "debug.h"
 #include "action_layer.h"
 #include "version.h"
@@ -115,7 +115,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      | Space| End  |       | PgDn | Space  |      |
  *                                 `--------------------'       `----------------------'
  */
-[_QWERTY] = KEYMAP(
+[_QWERTY] = LAYOUT_ergodox(
         // left hand
         KC_GRV,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   LT(_MDIA, KC_NO),
         KC_TAB,         KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   LT(_SYMB, KC_NO),
@@ -156,7 +156,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      | Space| End  |       | PgDn | Space  |      |
  *                                 `--------------------'       `----------------------'
  */
-[_COLEMAK] = KEYMAP(
+[_COLEMAK] = LAYOUT_ergodox(
         // left hand
         KC_GRV,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   LT(_MDIA, KC_NO),
         KC_TAB,         KC_Q,         KC_W,   KC_F,   KC_P,   KC_G,   LT(_SYMB, KC_NO),
@@ -177,7 +177,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
              KC_PGDN,KC_BSPC, KC_ENT
     ),
 /* Qwerty on software Colemak : Useful for gaming with qwerty keymaps! */
-[_QWOC] = KEYMAP(
+[_QWOC] = LAYOUT_ergodox(
         // left hand
         KC_GRV,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   LT(_MDIA, KC_NO),
         KC_TAB,         CM_Q,         CM_W,   CM_E,   CM_R,   CM_T,   LT(_SYMB, KC_NO),
@@ -218,7 +218,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |      |       |      |      |      |
  *                                 `--------------------'       `--------------------'
  */
-[_LOWER] = KEYMAP(
+[_LOWER] = LAYOUT_ergodox(
        _______, _______, _______, _______, _______, _______, _______,
        _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, _______,
        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,
@@ -258,7 +258,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |      |       |      |      |      |
  *                                 `--------------------'       `--------------------'
  */
-[_RAISE] = KEYMAP(
+[_RAISE] = LAYOUT_ergodox(
        _______, _______, _______, _______, _______, _______, _______,
        _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______,
        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,
@@ -299,7 +299,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      | Space| End  |       | PgDn | Space  |      |
  *                                 `--------------------'       `----------------------'
  */
-[_PLOVER] = KEYMAP(
+[_PLOVER] = LAYOUT_ergodox(
         // left hand
         KC_1,           KC_1,         KC_1,   KC_1,   KC_1,   KC_1,   XXXXXXX,
         XXXXXXX,        KC_1,         KC_1,   KC_1,   KC_1,   KC_1,   XXXXXXX,
@@ -341,7 +341,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |      |       |      |        |      |
  *                                 `--------------------'       `----------------------'
  */
-[_SUPERDUPER] = KEYMAP(
+[_SUPERDUPER] = LAYOUT_ergodox(
         // left hand
         _______, _______,  _______,   _______,   _______,   _______,   _______,
         _______, _______,  _______,   _______,   _______,   _______,   _______,
@@ -362,7 +362,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
              _______,_______, KC_LSFT
     ),
 // Intermediate keymaps for SuperDuper (Combo keys does not work on Infinity yet)
-[_SUPER] = KEYMAP(
+[_SUPER] = LAYOUT_ergodox(
         // left hand
         _______, _______,  _______,   _______,   _______,   _______,   _______,
         _______, _______,  _______,   _______,   _______,   _______,   _______,
@@ -382,7 +382,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
              _______,
              _______,_______, _______
     ),
-[_DUPER] = KEYMAP(
+[_DUPER] = LAYOUT_ergodox(
         // left hand
         _______, _______,  _______,   _______,   _______,   _______,   _______,
         _______, _______,  _______,   _______,   _______,   _______,   _______,
@@ -424,7 +424,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 | Click|      |      |       |      |        | Click|
  *                                 `--------------------'       `----------------------'
  */
-[_MOUSE] = KEYMAP(
+[_MOUSE] = LAYOUT_ergodox(
         // left hand
         _______, _______,  _______,   _______,   _______,   _______,   _______,
         _______, _______,  KC_WH_U,   KC_MS_U,   KC_WH_D,   _______,   _______,
@@ -466,7 +466,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |      |       |      |        |      |
  *                                 `--------------------'       `----------------------'
  */
-[_ADJUST] = KEYMAP(
+[_ADJUST] = LAYOUT_ergodox(
         // left hand
         _______, _______,  _______,   _______,   _______,   _______,   _______,
         _______, RESET,    _______,   _______,   _______,   _______,   _______,
@@ -510,7 +510,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[_SYMB] = KEYMAP(
+[_SYMB] = LAYOUT_ergodox(
        // left hand
        VRSN,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
        _______,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,_______,
@@ -552,7 +552,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-[_MDIA] = KEYMAP(
+[_MDIA] = LAYOUT_ergodox(
        _______, _______, _______, _______, _______, _______, _______,
        _______, _______, _______, KC_MS_U, _______, _______, _______,
        _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______,