Removed dependency on side pinky keys

This commit is contained in:
Sadek Baroudi 2021-03-05 13:00:14 -08:00
parent 31e6935c10
commit 94ce303acd
4 changed files with 41 additions and 41 deletions

View File

@ -42,7 +42,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
KC_ESC, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, KC_BSLS, \
KC_TAB, LCTL_T(K11), LGUI_T(K12), LALT_T(K13), LSFT_T(K14), K15, K16, RSFT_T(K17), RALT_T(K18), RGUI_T(K19), RCTL_T(K1A), LT(_MOUSE,KC_QUOT), \
KC_DEL, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, KC_BSPC, \
_______, LT(_NAVIGATION,KC_ENT), LT(_FUNCTION,KC_DEL), LT(_FUNCTION,KC_BSPC), LT(_SYMBOLS,KC_SPACE), _______ \
KC_QUOT, LT(_NAVIGATION,KC_ENT), LT(_FUNCTION,KC_DEL), LT(_FUNCTION,KC_BSPC), LT(_SYMBOLS,KC_SPACE), LT(_MOUSE,KC_TAB) \
)
/* Re-pass though to allow templates to be used */
#define LAYOUT_crkbd_base_wrapper(...) LAYOUT_crkbd_base(__VA_ARGS__)
@ -67,14 +67,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[_NAVIGATION] = LAYOUT_wrapper(
LALT(KC_F4), ________________NAVIGATION_1_______________, _________________NUMPAD_1__________________, _______,
KC_CAPS, ________________NAVIGATION_2_______________, _________________NUMPAD_2__________________, KC_DOT,
LCTL(LALT(KC_DELETE)), ________________NAVIGATION_3_______________, _________________NUMPAD_3__________________, _______,
_______, _______, KC_DEL, KC_BSPC, MO(_MEDIA), _______
_______, ________________NAVIGATION_1_______________, _________________NUMPAD_1__________________, _______,
_______, ________________NAVIGATION_2_______________, _________________NUMPAD_2__________________, _______,
_______, ________________NAVIGATION_3_______________, _________________NUMPAD_3__________________, _______,
_______, _______, KC_DEL, KC_BSPC, MO(_MEDIA), KC_TAB
),
[_SYMBOLS] = LAYOUT_wrapper(
KC_GRV, ________________SYMBOLS_L1_________________, ________________SYMBOLS_R1_________________, _______,
_______, ________________SYMBOLS_L1_________________, ________________SYMBOLS_R1_________________, _______,
_______, ________________SYMBOLS_L2_________________, ________________SYMBOLS_R2_________________, _______,
_______, ________________SYMBOLS_L3_________________, ________________SYMBOLS_R3_________________, _______,
_______, MO(_MEDIA), KC_DEL, KC_BSPC, _______, _______
@ -88,9 +88,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[_MEDIA] = LAYOUT_wrapper(
RESET, ___________________RGB_1___________________, _________________MACROS_1__________________, TG(_QWERTY),
_______, ___________________RGB_2___________________, _________________MACROS_2__________________, TG(_COLEMAK),
_______, ___________________RGB_3___________________, _________________MACROS_3__________________, TG(_WORKMAN),
_______, ___________________RGB_1___________________, _________________MACROS_1__________________, _______,
_______, ___________________RGB_2___________________, _________________MACROS_2__________________, _______,
_______, ___________________RGB_3___________________, _________________MACROS_3__________________, _______,
_______, _______, _______, _______, _______, _______
),

View File

@ -30,11 +30,11 @@
K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A \
) \
LAYOUT_ortho_5x12_wrapper( \
_______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, \
KC_ESC, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, KC_BSLS, \
KC_TAB, LCTL_T(K11), LGUI_T(K12), LALT_T(K13), LSFT_T(K14), K15, K16, RSFT_T(K17), RALT_T(K18), RGUI_T(K19), RCTL_T(K1A), LT(_MOUSE,KC_QUOT), \
KC_DEL, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, KC_BSPC, \
_______, _______, _______, _______, LT(_NAVIGATION,KC_ENT), LT(_FUNCTION,KC_DEL), LT(_FUNCTION,KC_BSPC), LT(_SYMBOLS,KC_SPACE), _______, _______, _______, _______ \
_______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, \
_______, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, _______, \
_______, LCTL_T(K11), LGUI_T(K12), LALT_T(K13), LSFT_T(K14), K15, K16, RSFT_T(K17), RALT_T(K18), RGUI_T(K19), RCTL_T(K1A), _______, \
_______, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, _______, \
_______, _______, _______, KC_QUOT, LT(_NAVIGATION,KC_ENT), LT(_FUNCTION,KC_DEL), LT(_FUNCTION,KC_BSPC), LT(_SYMBOLS,KC_SPACE), LT(_MOUSE,KC_TAB), _______, _______, _______ \
)
/* Re-pass though to allow templates to be used */
@ -61,16 +61,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[_NAVIGATION] = LAYOUT_wrapper(
_______, ___________________BLANK___________________, ___________________BLANK___________________, _______,
LALT(KC_F4), ________________NAVIGATION_1_______________, _________________NUMPAD_1__________________, _______,
KC_CAPS, ________________NAVIGATION_2_______________, _________________NUMPAD_2__________________, KC_DOT,
LCTL(LALT(KC_DELETE)), ________________NAVIGATION_3_______________, _________________NUMPAD_3__________________, _______,
_______, _______, _______, _______, _______, KC_DEL, KC_BSPC, MO(_MEDIA), _______, _______, _______, _______
_______, ___________________BLANK___________________, ___________________BLANK___________________, _______,
_______, ________________NAVIGATION_1_______________, _________________NUMPAD_1__________________, _______,
_______, ________________NAVIGATION_2_______________, _________________NUMPAD_2__________________, _______,
_______, ________________NAVIGATION_3_______________, _________________NUMPAD_3__________________, _______,
_______, _______, _______, _______, _______, KC_DEL, KC_BSPC, MO(_MEDIA), KC_TAB, _______, _______, _______
),
[_SYMBOLS] = LAYOUT_wrapper(
_______, ___________________BLANK___________________, ___________________BLANK___________________, _______,
KC_GRV, ________________SYMBOLS_L1_________________, ________________SYMBOLS_R1_________________, _______,
_______, ________________SYMBOLS_L1_________________, ________________SYMBOLS_R1_________________, _______,
_______, ________________SYMBOLS_L2_________________, ________________SYMBOLS_R2_________________, _______,
_______, ________________SYMBOLS_L3_________________, ________________SYMBOLS_R3_________________, _______,
_______, _______, _______, _______, MO(_MEDIA), KC_DEL, KC_BSPC, _______, _______, _______, _______, _______
@ -86,9 +86,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_MEDIA] = LAYOUT_wrapper(
_______, ___________________BLANK___________________, ___________________BLANK___________________, _______,
RESET, ___________________RGB_1___________________, _________________MACROS_1__________________, TG(_QWERTY),
_______, ___________________RGB_2___________________, _________________MACROS_2__________________, TG(_COLEMAK),
_______, ___________________RGB_3___________________, _________________MACROS_3__________________, TG(_WORKMAN),
_______, ___________________RGB_1___________________, _________________MACROS_1__________________, _______,
_______, ___________________RGB_2___________________, _________________MACROS_2__________________, _______,
_______, ___________________RGB_3___________________, _________________MACROS_3__________________, _______,
_______, ___________________BLANK___________________, ___________________BLANK___________________, _______
),

View File

@ -37,9 +37,9 @@
K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A \
) \
LAYOUT_wrapper( \
KC_ESC, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, KC_BSLS, \
KC_TAB, LCTL_T(K11), LGUI_T(K12), LALT_T(K13), LSFT_T(K14), K15, K16, RSFT_T(K17), RALT_T(K18), RGUI_T(K19), RCTL_T(K1A), LT(_MOUSE,KC_QUOT), \
KC_DEL, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, KC_BSPC, \
_______, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, _______, \
_______, LCTL_T(K11), LGUI_T(K12), LALT_T(K13), LSFT_T(K14), K15, K16, RSFT_T(K17), RALT_T(K18), RGUI_T(K19), RCTL_T(K1A), _______, \
_______, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, _______, \
LT(_NAVIGATION,KC_ENT), LT(_FUNCTION,KC_BSPC), LT(_SYMBOLS,KC_SPACE) \
)
/* Re-pass though to allow templates to be used */
@ -66,14 +66,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[_NAVIGATION] = LAYOUT_wrapper(
LALT(KC_F4), ________________NAVIGATION_1_______________, _________________NUMPAD_1__________________, _______,
KC_CAPS, ________________NAVIGATION_2_______________, _________________NUMPAD_2__________________, KC_DOT,
LCTL(LALT(KC_DELETE)), ________________NAVIGATION_3_______________, _________________NUMPAD_3__________________, _______,
_______, KC_BSPC, MO(_MEDIA)
_______, ________________NAVIGATION_1_______________, _________________NUMPAD_1__________________, _______,
_______, ________________NAVIGATION_2_______________, _________________NUMPAD_2__________________, _______,
_______, ________________NAVIGATION_3_______________, _________________NUMPAD_3__________________, _______,
_______, KC_BSPC, MO(_MEDIA)
),
[_SYMBOLS] = LAYOUT_wrapper(
KC_GRV, ________________SYMBOLS_L1_________________, ________________SYMBOLS_R1_________________, _______,
_______, ________________SYMBOLS_L1_________________, ________________SYMBOLS_R1_________________, _______,
_______, ________________SYMBOLS_L2_________________, ________________SYMBOLS_R2_________________, _______,
_______, ________________SYMBOLS_L3_________________, ________________SYMBOLS_R3_________________, _______,
MO(_MEDIA), KC_BSPC, _______
@ -87,9 +87,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[_MEDIA] = LAYOUT_wrapper(
RESET, ___________________RGB_1___________________, _________________MACROS_1__________________, TG(_QWERTY),
_______, ___________________RGB_2___________________, _________________MACROS_2__________________, TG(_COLEMAK),
_______, ___________________RGB_3___________________, _________________MACROS_3__________________, TG(_WORKMAN),
_______, ___________________RGB_1___________________, _________________MACROS_1__________________, _______,
_______, ___________________RGB_2___________________, _________________MACROS_2__________________, _______,
_______, ___________________RGB_3___________________, _________________MACROS_3__________________, _______,
_______, _______, _______
),

View File

@ -43,11 +43,11 @@ NOTE: These are all the same length. If you do a search/replace
lengths consistent.
*/
#define _________________META_NAV_1________________ _______, KC_PGUP, KC_UP, KC_PGDN, _______
#define _________________META_NAV_1________________ KC_ESC, KC_PGUP, KC_UP, KC_PGDN, _______
#define _________________META_NAV_2________________ KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END
#define _________________META_NAV_L1_______________ _______, _______, LCTL(LSFT(KC_TAB)), LCTL(LGUI(KC_LEFT)), _______
#define _________________META_NAV_R1_______________ _______, LCTL(LGUI(KC_RIGHT)), LCTL(KC_TAB), _______, _______
#define _________________META_NAV_L1_______________ KC_CAPS, KC_GRV, LCTL(LSFT(KC_TAB)), LCTL(LGUI(KC_LEFT)), _______
#define _________________META_NAV_R1_______________ _______, LCTL(LGUI(KC_RIGHT)), LCTL(KC_TAB), _______, KC_BSLS
#define _________________QWERTY_L1_________________ KC_Q, KC_W, KC_E, KC_R, KC_T
@ -108,11 +108,11 @@ NOTE: These are all the same length. If you do a search/replace
#define ________________FUNCTION_2_________________ KC_VOLU, KC_F4, KC_F5, KC_F6, KC_F11
#define ________________FUNCTION_3_________________ KC_VOLD, KC_F1, KC_F2, KC_F3, KC_F12
#define ___________________RGB_1___________________ RGB_TOG, RGB_MODE_REVERSE, RGB_MODE_FORWARD, _______, _______
#define ___________________RGB_2___________________ KC_RGB_BLT, RGB_HUI, RGB_SAI, RGB_VAI, _______
#define ___________________RGB_3___________________ KC_RGB_T, RGB_HUD, RGB_SAD, RGB_VAD, _______
#define ___________________RGB_1___________________ RGB_TOG, RGB_MODE_REVERSE, RGB_MODE_FORWARD, _______, TG(_QWERTY)
#define ___________________RGB_2___________________ KC_RGB_BLT, RGB_HUI, RGB_SAI, RGB_VAI, TG(_COLEMAK)
#define ___________________RGB_3___________________ KC_RGB_T, RGB_HUD, RGB_SAD, RGB_VAD, TG(_WORKMAN)
#define __________________MOUSE_1__________________ _______, KC_MS_WH_UP, KC_MS_UP, KC_MS_WH_DOWN, _______
#define __________________MOUSE_1__________________ RESET, KC_MS_WH_UP, KC_MS_UP, KC_MS_WH_DOWN, _______
#define __________________MOUSE_2__________________ KC_MS_WH_LEFT, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_MS_WH_RIGHT
#define __________________MOUSE_3__________________ KC_MS_ACCEL0, KC_MS_ACCEL1, KC_MS_ACCEL2, _______, _______