Compare commits

..

No commits in common. "f636c0b20863d78d7ba9c6e0fd583ae9da80c11a" and "de3242089ead3bfe4582274a18a79106c573bb21" have entirely different histories.

View File

@ -11,28 +11,23 @@
enum _layers { enum _layers {
_BASE, _BASE,
_FN, _FN,
_SPACE,
_FULL, _FULL,
}; };
// Changes from regular layout // Changes from regular layout
// - Added many combos
// - Capslock => Map as Hyper and escape // - Capslock => Map as Hyper and escape
// - FN+Escape => Sleep // - FN+Escape => Sleep
// - Remove fn lock layers // - Remove fn lock layers
// - Removed esc, backspace, and enter to encourage use of combos // - Removed esc, backspace, and enter to encourage use of combos
// - Added full keyboard layer for guest use // - Added full keyboard layer for guest use
// - Added RESET and CLEAR_EEPROM buttons to fn layer // - 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 esc_combo[] = {KC_S, KC_W, COMBO_END};
const uint16_t PROGMEM backspace_combo[] = {KC_S, KC_D, 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 tab_combo[] = {KC_D, KC_F, COMBO_END};
const uint16_t PROGMEM enter_combo[] = {KC_C, KC_V, COMBO_END}; const uint16_t PROGMEM enter_combo[] = {KC_C, KC_V, COMBO_END};
const uint16_t PROGMEM colon_combo[] = {KC_J, KC_K, COMBO_END}; const uint16_t PROGMEM colon_combo[] = {KC_J, KC_K, COMBO_END};
const uint16_t PROGMEM quote_combo[] = {KC_N, KC_M, COMBO_END};
const uint16_t PROGMEM underscore_combo[] = {KC_M, KC_COMM, 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 greaterthan_combo[] = {KC_K, KC_L, COMBO_END};
const uint16_t PROGMEM lessthan_combo[] = {KC_H, KC_J, COMBO_END}; const uint16_t PROGMEM lessthan_combo[] = {KC_H, KC_J, COMBO_END};
combo_t key_combos[] = { combo_t key_combos[] = {
@ -41,9 +36,7 @@ combo_t key_combos[] = {
COMBO(tab_combo, KC_TAB), COMBO(tab_combo, KC_TAB),
COMBO(enter_combo, KC_ENT), COMBO(enter_combo, KC_ENT),
COMBO(colon_combo, KC_COLON), COMBO(colon_combo, KC_COLON),
COMBO(quote_combo, KC_QUOT),
COMBO(underscore_combo, KC_UNDS), COMBO(underscore_combo, KC_UNDS),
COMBO(minus_combo, KC_MINUS),
COMBO(greaterthan_combo, KC_GT), COMBO(greaterthan_combo, KC_GT),
COMBO(lessthan_combo, KC_LT), COMBO(lessthan_combo, KC_LT),
}; };
@ -52,10 +45,6 @@ combo_t key_combos[] = {
#define KC_HESC ALL_T(KC_ESC) #define KC_HESC ALL_T(KC_ESC)
// _SPACE layer when held, space bar when tapped.
#define LT_SPC LT(_SPACE, KC_SPC)
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* /*
* *
@ -70,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* 12 keys Shift Z X C V B N M , . / Shift * 12 keys Shift Z X C V B N M , . / Shift
* *
* *
* 11 keys CtrlFN GUIAlt Space / _SPACE AltCtl * 11 keys CtrlFN GUIAlt AltCtl
* *
* *
* 78 total * 78 total
@ -81,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
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_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_NO, 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_NO,
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_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, LT_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT KC_LCTL, MO(_FN), KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT
), ),
/* /*
* Function layer * Function layer
@ -109,33 +98,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_PGDN, KC_END _______, _______, _______, _______, _______, _______, _______, 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_LBRC, KC_RBRC, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
), ),
/* /*
* *