Remove full layer and add back regular keys that were removed

keyboards/framework/ansi/keymaps/tgrosinger/keymap.c

@@ -10,25 +10,37 @@
 
 enum _layers {
   _BASE,
-  _FN
+  _FN,
+  _SPACE,
 };
 
 // Changes from regular layout
+// - Added many combos
 // - Capslock      => Map as Hyper and escape
 // - FN+Escape     => Sleep
 // - Remove fn lock layers
+// - Added RESET and CLEAR_EEPROM buttons to fn layer
+// - Added _SPACE layer for additional shortcuts
 
+const uint16_t PROGMEM esc_combo[] = {KC_S, KC_W, COMBO_END};
 const uint16_t PROGMEM backspace_combo[] = {KC_S, KC_D, COMBO_END};
 const uint16_t PROGMEM tab_combo[] = {KC_D, KC_F, COMBO_END};
 const uint16_t PROGMEM enter_combo[] = {KC_C, KC_V, COMBO_END};
-const uint16_t PROGMEM underscore_combo[] = {KC_N, KC_M, COMBO_END};
+const uint16_t PROGMEM colon_combo[] = {KC_J, KC_K, COMBO_END};
-const uint16_t PROGMEM greaterthan_combo[] = {KC_J, KC_K, COMBO_END};
+const uint16_t PROGMEM quote_combo[] = {KC_N, KC_M, COMBO_END};
-const uint16_t PROGMEM lessthan_combo[] = {KC_K, KC_L, COMBO_END};
+const uint16_t PROGMEM underscore_combo[] = {KC_M, KC_COMM, COMBO_END};
+const uint16_t PROGMEM minus_combo[] = {KC_I, KC_O, COMBO_END};
+const uint16_t PROGMEM greaterthan_combo[] = {KC_K, KC_L, COMBO_END};
+const uint16_t PROGMEM lessthan_combo[] = {KC_H, KC_J, COMBO_END};
 combo_t key_combos[] = {
+    COMBO(esc_combo, KC_ESC),
     COMBO(backspace_combo, KC_BSPC),
     COMBO(tab_combo, KC_TAB),
     COMBO(enter_combo, KC_ENT),
+    COMBO(colon_combo, KC_COLON),
+    COMBO(quote_combo, KC_QUOT),
     COMBO(underscore_combo, KC_UNDS),
+    COMBO(minus_combo, KC_MINUS),
     COMBO(greaterthan_combo, KC_GT),
     COMBO(lessthan_combo, KC_LT),
 };
@@ -37,39 +49,45 @@ combo_t key_combos[] = {
 #define KC_HESC ALL_T(KC_ESC)
 
 
+// _SPACE layer when held, space bar when tapped.
+#define LT_SPC LT(_SPACE, KC_SPC)
+// Ctrl when held, A when tapped.
+#define CTL_A   CTL_T(KC_A)
+
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      /*
      *         ┌─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬────┐
-     * 14 keys │Esc  │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│ Del│
+     * 14 keys │ Esc │Mut│vDn│vUp│Prv│Ply│Nxt│bDn│bUp│Scn│Air│Prt│App│Del │
      *         ├───┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┤
      * 14 keys │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Backsp│
      *         ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤
      * 14 keys │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ \  │
      *         ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴────┤
-     * 13 keys │HyEsc │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter │
+     * 13 keys │HyEsc │^A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter │
      *         ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───────┤
      * 12 keys │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │  Shift  │
      *         ├────┬───┼───┼───┼───┴───┴───┴───┴───┼───┼───┼───┴┬───┬────┤
      *         │    │   │   │   │                   │   │   │    │↑  │    │
-     * 11 keys │Ctrl│FN │GUI│Alt│                   │Alt│Ctl│ ←  ├───┤  → │
+     * 11 keys │Ctl │FN │GUI│Alt│  Space / _SPACE   │Alt│Ctl│ ←  ├───┤  → │
      *         │    │   │   │   │                   │   │   │    │  ↓│    │
      *         └────┴───┴───┴───┴───────────────────┴───┴───┴────┴───┴────┘
      * 78 total
      */
     [_BASE] = LAYOUT(
-        KC_ESC,  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_DEL,
+        KC_ESC,  KC_MUTE, KC_VOLD, KC_VOLU, KC_MPRV, KC_MPLY, KC_MNXT, KC_BRID, KC_BRIU, KC_SCRN, KC_AIRP, KC_PSCR, KC_MSEL, KC_DEL,
         KC_GRV,  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_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_HESC, 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_HESC, CTL_A,   KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,
-        KC_LCTL, MO(_FN), KC_LGUI, KC_LALT,          KC_SPC,                    KC_RALT, KC_RCTL, KC_LEFT,   KC_UP, KC_DOWN, KC_RGHT
+        KC_LCTL, MO(_FN), KC_LGUI, KC_LALT,          LT_SPC,                    KC_RALT, KC_RCTL, KC_LEFT,   KC_UP, KC_DOWN, KC_RGHT
     ),
      /*
      * Function layer
      *         ┌─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬────┐
-     * 14 keys │Sleep│Mut│vDn│vUp│Prv│Ply│Nxt│bDn│bUp│Scn│Air│Prt│App│Ins │
+     * 14 keys │Sleep│F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│Ins │
      *         ├───┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┤
-     * 14 keys │   │   │   │   │   │   │   │   │   │   │   │   │   │      │
+     * 14 keys │PRG│CLR│   │   │   │   │   │   │   │   │   │   │   │      │
      *         ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤
      * 14 keys │     │   │   │   │   │   │   │   │   │   │   │   │   │    │
      *         ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴────┤
@@ -84,11 +102,38 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * 78 total
      */
     [_FN] = LAYOUT(
-        KC_SLEP, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPRV, KC_MPLY, KC_MNXT, KC_BRID, KC_BRIU, KC_SCRN, KC_AIRP, KC_PSCR, KC_MSEL, KC_INS,
+        KC_SLEP, 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_INS,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        QK_BOOT, EE_CLR,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______, _______,          _______,                   _______, _______, KC_HOME, KC_PGUP, KC_PGDN, KC_END
     ),
+     /*
+     * Space mod layer
+     *         ┌─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬────┐
+     * 14 keys │     │   │   │   │   │   │   │   │   │   │   │   │   │    │
+     *         ├───┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┤
+     * 14 keys │   │   │   │   │   │   │   │   │   │   │   │   │   │      │
+     *         ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤
+     * 14 keys │     │   │   │   │   │   │   │   │   │   │   │   │   │    │
+     *         ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴────┤
+     * 13 keys │      │   │   │ ( │ ) │   │ ← │ ↓ │ ↑ │ → │   │   │       │
+     *         ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───────┤
+     * 12 keys │        │   │ [ │ ] │   │   │   │   │   │   │   │         │
+     *         ├────┬───┼───┼───┼───┴───┴───┴───┴───┼───┼───┼───┴┬───┬────┤
+     *         │    │   │   │   │                   │   │   │    │   │    │
+     * 11 keys │    │   │   │   │                   │   │   │    ├───┤    │
+     *         │    │   │   │   │                   │   │   │    │   │    │
+     *         └────┴───┴───┴───┴───────────────────┴───┴───┴────┴───┴────┘
+     * 78 total
+     */
+    [_SPACE] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, KC_LPRN, KC_RPRN, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,          _______,
+        _______,          _______, KC_LBRC, KC_RBRC, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______,          _______,                   _______, _______, _______, _______, _______, _______
+    ),
 };