Compare commits

..

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

View File

@ -10,32 +10,24 @@
enum _layers {
_BASE,
_FN,
_FULL,
_FN
};
// Changes from regular layout
// - Capslock => Map as Hyper and escape
// - FN+Escape => Sleep
// - Remove fn lock layers
// - Removed esc, backspace, and enter to encourage use of combos
// - Added full keyboard layer for guest use
// - Added RESET and CLEAR_EEPROM buttons to fn layer
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 colon_combo[] = {KC_J, KC_K, COMBO_END};
const uint16_t PROGMEM underscore_combo[] = {KC_M, KC_COMM, 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 underscore_combo[] = {KC_N, KC_M, COMBO_END};
const uint16_t PROGMEM greaterthan_combo[] = {KC_J, KC_K, COMBO_END};
const uint16_t PROGMEM lessthan_combo[] = {KC_K, KC_L, 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(underscore_combo, KC_UNDS),
COMBO(greaterthan_combo, KC_GT),
COMBO(lessthan_combo, KC_LT),
@ -46,59 +38,6 @@ combo_t key_combos[] = {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/*
*
* 14 keys F1 F2 F3 F4 F5 F6 F7 F8 F9 F10F11F12 Del
*
* 14 keys ` 1 2 3 4 5 6 7 8 9 0 - =
*
* 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 ; '
*
* 12 keys Shift Z X C V B N M , . / Shift
*
*
* 11 keys CtrlFN GUIAlt AltCtl
*
*
* 78 total
*/
[_BASE] = LAYOUT(
KC_NO, 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_NO,
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_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
),
/*
* Function layer
*
* 14 keys SleepMutvDnvUpPrvPlyNxtbDnbUpScnAirPrtAppIns
*
* 14 keys PRGCLR FULL
*
* 14 keys
*
* 13 keys
*
* 12 keys
*
* PgU
* 11 keys HomeEnd
* PgD
*
* 78 total
*/
[_FN] = LAYOUT(
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, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG(_FULL),
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_PGDN, KC_END
),
/*
*
* 14 keys Esc F1 F2 F3 F4 F5 F6 F7 F8 F9 F10F11F12 Del
@ -117,12 +56,39 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*
* 78 total
*/
[_FULL] = LAYOUT(
[_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_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_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, TG(_FULL), 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, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT
),
/*
* Function layer
*
* 14 keys SleepMutvDnvUpPrvPlyNxtbDnbUpScnAirPrtAppIns
*
* 14 keys
*
* 14 keys
*
* 13 keys
*
* 12 keys
*
* PgU
* 11 keys HomeEnd
* PgD
*
* 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_HOME, KC_PGUP, KC_PGDN, KC_END
),
};