Move more things into userspace.

pull/2764/head
Joe Wasson 7 years ago
parent eaa6803aff
commit 27907ab865

@ -5,9 +5,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BASE] = KM_(
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_BSLS, KC_GRV,
KC_TAB , _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_LBRC, KC_RBRC, KC_BSPC,
MS_MID , _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_QUOT, KC_ENT ,
US_CAPS, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, US_QUOT, KC_ENT ,
KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT, AD_GRV ,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC1, KC_SPC2, KC_SPC3, KC_RALT, KC_RGUI, KC_RCTL, KC_PTT ),
_________MODS_L__________, KC_SPC1, KC_SPC2, KC_SPC3, ______________MODS_R______________),
[_WORKMAN] = KM_(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _________________WORKMAN_L1________________, _________________WORKMAN_R1________________, _______, _______, _______,
@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_DVORAK] = KM_(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, _______, _______,
_______, _________________DVORAK_L1_________________, _________________DVORAK_R1_________________, KC_SLSH, KC_EQL , _______,
_______, _________________DVORAK_L2_________________, _________________DVORAK_R2_________________, KC_MINS, _______,
_______, _________________DVORAK_L2_________________, _________________DVORAK_R2_________________, US_MINS, _______,
_______, _________________DVORAK_L3_________________, _________________DVORAK_R3_________________, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
[_COLMAK] = KM_(
@ -40,10 +40,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_PTT , KC_PGDN, KC_SPC , KC_SPC , KC_SPC , KC_RALT, KC_RGUI, KC_RCTL, KC_PTT ),
[_NAV] = KM_(
KC_GRV , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, ________________NAVLAYER_L1________________, ________________NAVLAYER_R1________________, XXXXXXX, XXXXXXX, KC_DEL ,
XXXXXXX, ________________NAVLAYER_L2________________, ________________NAVLAYER_R2________________, XXXXXXX, TG_ADJ ,
KC_TAB , ________________NAVLAYER_L1________________, ________________NAVLAYER_R1________________, XXXXXXX, XXXXXXX, KC_DEL ,
US_CAPS, ________________NAVLAYER_L2________________, ________________NAVLAYER_R2________________, XXXXXXX, TG_ADJ ,
KC_LSFT, ________________NAVLAYER_L3________________, ________________NAVLAYER_R3________________, KC_RSFT, XXXXXXX,
KC_LCTL, KC_LGUI, KC_LALT, _______, _______, _______, KC_RALT, KC_RGUI, KC_RCTL, _______),
_________MODS_L__________, NV_SPC1, NV_SPC2, NV_SPC3, ______________MODS_R______________),
// Adjust layer is on the split-shift key; or NAV+Enter (for non-split keyboards)
[_ADJUST] = KM_(
MO_RST , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,

@ -5,9 +5,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BASE] = KM_(
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_BSLS, KC_GRV,
KC_TAB , _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_LBRC, KC_RBRC, KC_BSPC,
MS_MID , _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_QUOT, KC_ENT ,
US_CAPS, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, US_QUOT, KC_ENT ,
KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT, AD_GRV ,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC1, KC_RALT, KC_RGUI, KC_RCTL, KC_PTT ),
_________MODS_L__________, KC_SPC1, ______________MODS_R______________),
[_WORKMAN] = KM_(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _________________WORKMAN_L1________________, _________________WORKMAN_R1________________, _______, _______, _______,
@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_DVORAK] = KM_(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, _______, _______,
_______, _________________DVORAK_L1_________________, _________________DVORAK_R1_________________, KC_SLSH, KC_EQL , _______,
_______, _________________DVORAK_L2_________________, _________________DVORAK_R2_________________, KC_MINS, _______,
_______, _________________DVORAK_L2_________________, _________________DVORAK_R2_________________, US_MINS, _______,
_______, _________________DVORAK_L3_________________, _________________DVORAK_R3_________________, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______),
[_COLMAK] = KM_(
@ -40,10 +40,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_PTT , KC_PGDN, KC_SPC , KC_RALT, KC_RGUI, KC_RCTL, KC_PTT ),
[_NAV] = KM_(
KC_GRV , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, ________________NAVLAYER_L1________________, ________________NAVLAYER_R1________________, XXXXXXX, XXXXXXX, KC_DEL ,
XXXXXXX, ________________NAVLAYER_L2________________, ________________NAVLAYER_R2________________, XXXXXXX, TG_ADJ ,
KC_TAB , ________________NAVLAYER_L1________________, ________________NAVLAYER_R1________________, XXXXXXX, XXXXXXX, KC_DEL ,
US_CAPS, ________________NAVLAYER_L2________________, ________________NAVLAYER_R2________________, XXXXXXX, TG_ADJ ,
KC_LSFT, ________________NAVLAYER_L3________________, ________________NAVLAYER_R3________________, KC_RSFT, XXXXXXX,
KC_LCTL, KC_LGUI, KC_LALT, _______, KC_RALT, KC_RGUI, KC_RCTL, _______),
_________MODS_L__________, NV_SPC1, ______________MODS_R______________),
// Adjust layer is on the split-shift key; or NAV+Enter (for non-split keyboards)
[_ADJUST] = KM_(
MO_RST , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,

@ -20,8 +20,6 @@ enum layers {
#define _______ KC_TRNS
#define XXXXXXX KC_NO
#define NV_SPC LT(_NAV, KC_SPC)
#define NV_ENT LT(_NAV, KC_ENT)
#define AD_GRV LT(_ADJUST, KC_GRV)
#define MO_NAV MO(_NAV)
@ -38,16 +36,23 @@ enum layers {
#define KC_PTT KC_F24
#define MS_MID KC_MS_BTN3
#define US_CAPS CTL_T(KC_ESC)
#define US_QUOT MT(MOD_RCTL, KC_QUOT)
#define US_MINS MT(MOD_RCTL, KC_QUOT)
#ifndef SPACE_COUNT
#define SPACE_COUNT 1
#endif
#if (SPACE_COUNT == 1)
#define KC_SPC1 NV_SPC
#define KC_SPC1 LT(_NAV, KC_SPC)
#define NV_SPC1 _______
#elif (SPACE_COUNT == 3)
#define KC_SPC1 KC_ENT
#define KC_SPC2 TT(_NAV)
#define KC_SPC3 KC_SPC
#define KC_SPC1 LT(_NAV,KC_ENT)
#define NV_SPC1 MT(MOD_LSFT | MOD_LCTL, KC_ENT)
#define KC_SPC2 KC_SPC
#define NV_SPC2 KC_BSPC
#define KC_SPC3 LT(_NAV,KC_SPC)
#define NV_SPC3 KC_SPC
#else
#error "Unsupported space count:" SPACE_COUNT
#endif
@ -59,6 +64,9 @@ enum userspace_custom_keycodes {
#define SAFE_RANGE NEW_SAFE_RANGE
#define _________MODS_L__________ KC_LCTL, KC_LGUI, KC_LALT
#define ______________MODS_R______________ KC_RALT, KC_RGUI, KC_RCTL, KC_PTT
#define _________________QWERTY_L1_________________ KC_Q, KC_W, KC_E, KC_R, KC_T
#define _________________QWERTY_L2_________________ KC_A, KC_S, KC_D, KC_F, KC_G
#define _________________QWERTY_L3_________________ KC_Z, KC_X, KC_C, KC_V, KC_B

Loading…
Cancel
Save