Ergocheap handwired Layout Macro refactor (#13348)

* physically arrange layout macro

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

* update info.json data

2 files changed, 30 insertions, 36 deletions

diff --git a/keyboards/handwired/ergocheap/keymaps/default/keymap.c b/keyboards/handwired/ergocheap/keymaps/default/keymap.c
index dc70f4f278..15753dabd7 100644
--- a/keyboards/handwired/ergocheap/keymaps/default/keymap.c
+++ b/keyboards/handwired/ergocheap/keymaps/default/keymap.c
@@ -24,19 +24,17 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT(
-        KC_ESC,  KC_1,    KC_2,                                                                     KC_MINS, KC_EQL,  KC_BSPC, KC_GRV,
-        KC_TAB,  KC_Q,    KC_3,    KC_4,    KC_5,    KC_6,      KC_7,    KC_8,    KC_9,    KC_0,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
-        KC_CAPS, KC_A,    KC_W,    KC_E,    KC_R,    KC_T,      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_SCLN, KC_QUOT, KC_ENT, KC_HOME,
-        KC_LSFT, KC_Z,    KC_S,    KC_D,    KC_F,    KC_G,      KC_H,    KC_J,    KC_K,    KC_L,    KC_SLSH, TO(_FN1), KC_UP,  KC_END,
-        KC_LCTL, KC_X,    KC_C,    KC_V,    KC_B,               KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_LGUI, KC_LEFT, KC_DOWN, KC_RGHT,
-                 KC_LALT, KC_SPC,           MO(_FN1),KC_SPC,    KC_SPC,           MO(_FN1)
+        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_GRV,
+        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_DEL,
+        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,  KC_HOME,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                 KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH, TO(_FN1),  KC_UP,   KC_END,
+        KC_LCTL,                   KC_LALT,          KC_SPC,  MO(_FN1),             KC_SPC,           KC_SPC,  MO(_FN1), KC_LGUI, KC_LEFT,   KC_DOWN, KC_RGHT
     ),
     [_FN1] = LAYOUT(
-        KC_GRV,  KC_F1,   KC_F2,                                                                    KC_F11,  KC_F12,    _______,     _______,
-        _______, _______, KC_F3,   KC_F4,   KC_F5,   KC_F6,     KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_UP,   _______,   _______,     _______,
-        KC_LCTL, _______, _______, _______, _______, _______,   _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_LEFT,   KC_RIGHT,    _______, _______,
-        KC_LSFT, KC_LEFT, KC_S,    _______, _______, _______,   _______, KC_VOLD, KC_MUTE, KC_VOLU, KC_DOWN, TO(_BASE), KC_MS_WH_UP, _______,
-        _______, KC_UP,   KC_DOWN, KC_RGHT, _______,            _______, _______, _______, _______, _______, KC_MS_WH_LEFT, KC_MS_WH_DOWN, KC_MS_WH_RIGHT,
-                 KC_LGUI, _______,          _______, _______,   _______,          _______
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,    _______, _______,
+        _______, _______, _______, _______, _______, _______,              _______, KC_MPRV, KC_MPLY, KC_MNXT, _______,  KC_UP,   _______,   _______, _______,
+        KC_LCTL, _______, KC_S,    _______, _______, _______,              _______, KC_VOLD, KC_MUTE, KC_VOLU, KC_LEFT,  KC_RGHT, _______,   _______,
+        KC_LSFT,          KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT, _______,              _______, _______, _______, _______,  KC_DOWN, TO(_BASE), KC_WH_U, _______,
+        _______,                   KC_LGUI,          _______, _______,              _______,          _______, _______,  _______, KC_WH_L,   KC_WH_D, KC_WH_R
     )
 };
diff --git a/keyboards/handwired/ergocheap/keymaps/via/keymap.c b/keyboards/handwired/ergocheap/keymaps/via/keymap.c
index 6f56f52f65..35d5826a14 100644
--- a/keyboards/handwired/ergocheap/keymaps/via/keymap.c
+++ b/keyboards/handwired/ergocheap/keymaps/via/keymap.c
@@ -26,35 +26,31 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT(
-        KC_ESC,  KC_1,    KC_2,                                                                     KC_MINS, KC_EQL,  KC_BSPC, KC_GRV,
-        KC_TAB,  KC_Q,    KC_3,    KC_4,    KC_5,    KC_6,      KC_7,    KC_8,    KC_9,    KC_0,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
-        KC_CAPS, KC_A,    KC_W,    KC_E,    KC_R,    KC_T,      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_SCLN, KC_QUOT, KC_ENT, KC_HOME,
-        KC_LSFT, KC_Z,    KC_S,    KC_D,    KC_F,    KC_G,      KC_H,    KC_J,    KC_K,    KC_L,    KC_SLSH, TO(_FN1), KC_UP,  KC_END,
-        KC_LCTL, KC_X,    KC_C,    KC_V,    KC_B,               KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_LGUI, KC_LEFT, KC_DOWN, KC_RGHT,
-                 KC_LALT, KC_SPC,           MO(_FN1),KC_SPC,    KC_SPC,           MO(_FN1)
+        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_GRV,
+        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_DEL,
+        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,  KC_HOME,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                 KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH, TO(_FN1),  KC_UP,   KC_END,
+        KC_LCTL,                   KC_LALT,          KC_SPC,  MO(_FN1),             KC_SPC,           KC_SPC,  MO(_FN1), KC_LGUI, KC_LEFT,   KC_DOWN, KC_RGHT
     ),
     [_FN1] = LAYOUT(
-        KC_GRV,  KC_F1,   KC_F2,                                                                    KC_F11,  KC_F12,    _______,     _______,
-        _______, _______, KC_F3,   KC_F4,   KC_F5,   KC_F6,     KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_UP,   _______,   _______,     _______,
-        KC_LCTL, _______, _______, _______, _______, _______,   _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_LEFT,   KC_RIGHT,    _______, _______,
-        KC_LSFT, KC_LEFT, KC_S,    _______, _______, _______,   _______, KC_VOLD, KC_MUTE, KC_VOLU, KC_DOWN, TO(_BASE), KC_MS_WH_UP, _______,
-        _______, KC_UP,   KC_DOWN, KC_RGHT, _______,            _______, _______, _______, _______, _______, KC_MS_WH_LEFT, KC_MS_WH_DOWN, KC_MS_WH_RIGHT,
-                 KC_LGUI, _______,          _______, _______,   _______,          _______
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,    _______, _______,
+        _______, _______, _______, _______, _______, _______,              _______, KC_MPRV, KC_MPLY, KC_MNXT, _______,  KC_UP,   _______,   _______, _______,
+        KC_LCTL, _______, KC_S,    _______, _______, _______,              _______, KC_VOLD, KC_MUTE, KC_VOLU, KC_LEFT,  KC_RGHT,            _______, _______,
+        KC_LSFT,          KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT, _______,              _______, _______, _______, _______,  KC_DOWN, TO(_BASE), KC_WH_U, _______,
+        _______,                   KC_LGUI,          _______, _______,              _______,          _______, _______,  _______, KC_WH_L,   KC_WH_D, KC_WH_R
     ),
     [_FN2] = LAYOUT(
-        _______, _______, _______,                                                                  _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______,            _______, _______, _______, _______, _______, _______, _______, _______,
-                 _______, _______,          _______, _______,   _______,          _______
+        _______, _______, _______, _______, _______, _______, _______,              _______, _______, _______, _______,  _______, _______,   _______, _______,
+        _______, _______, _______, _______, _______, _______,              _______, _______, _______, _______, _______,  _______, _______,   _______, _______,
+        _______, _______, _______, _______, _______, _______,              _______, _______, _______, _______, _______,  _______,            _______, _______,
+        _______,          _______, _______, _______, _______, _______,              _______, _______, _______, _______,  _______, _______,   _______, _______,
+        _______,                   _______,          _______, _______,              _______,          _______, _______,  _______, _______,   _______, _______
     ),
     [_FN3] = LAYOUT(
-        _______, _______, _______,                                                                  _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______,            _______, _______, _______, _______, _______, _______, _______, _______,
-                 _______, _______,          _______, _______,   _______,          _______
+        _______, _______, _______, _______, _______, _______, _______,              _______, _______, _______, _______,  _______, _______,   _______, _______,
+        _______, _______, _______, _______, _______, _______,              _______, _______, _______, _______, _______,  _______, _______,   _______, _______,
+        _______, _______, _______, _______, _______, _______,              _______, _______, _______, _______, _______,  _______,            _______, _______,
+        _______,          _______, _______, _______, _______, _______,              _______, _______, _______, _______,  _______, _______,   _______, _______,
+        _______,                   _______,          _______, _______,              _______,          _______, _______,  _______, _______,   _______, _______
     )
 };