From f48e20c1eb52d7281276025fd1cbaa81e1856f83 Mon Sep 17 00:00:00 2001 From: Xyverz Date: Mon, 3 Sep 2018 16:57:06 -0700 Subject: Keymap: Updates to xyverz keymaps (#3841) * fixing ortho_4x12 configs * Using upstream/master version instead * Additions and Corrections Corrected the Kinesis/Stapelberg's .c file to allow LEDs to work Removed excess cruft from my Kinesis keymap to reflect this change Other minor tweaks and adjustments to my ortho_4x12 and 5x12 layouts * Rules for vitamins_included Added a section to disable RGB underglow for the Let's Split Vitamins Included board. * fixing ortho_4x12 configs * Using upstream/master version instead * Additions and Corrections Corrected the Kinesis/Stapelberg's .c file to allow LEDs to work Removed excess cruft from my Kinesis keymap to reflect this change Other minor tweaks and adjustments to my ortho_4x12 and 5x12 layouts * Creating my own userspace * Added Rorschach keymap * renamed userspace folder I renamed my userspace folder since I'm not ready to start using it just yet, and I want to get my keyboards programmed. This is a temporary thing and will be fixed later as I get time. * adding files in "new" folder * Disabling LEDs on Pro Micro * Modifications to Kinesis keymap * More kinesis tweaks * removed userspace from master Created a new branch for my userspace stuff. I'll work on it there. * Moved keymap to separate branch Moved the Rorschach keymap I was working on to a separate branch for development purposes. Not ready to push it up to upstream master. --- keyboards/kinesis/keymaps/xyverz/keymap.c | 43 +++++++++++++++++-------------- 1 file changed, 24 insertions(+), 19 deletions(-) (limited to 'keyboards/kinesis/keymaps/xyverz/keymap.c') diff --git a/keyboards/kinesis/keymaps/xyverz/keymap.c b/keyboards/kinesis/keymaps/xyverz/keymap.c index 1025df0769..2eab62a2bc 100644 --- a/keyboards/kinesis/keymaps/xyverz/keymap.c +++ b/keyboards/kinesis/keymaps/xyverz/keymap.c @@ -20,6 +20,11 @@ enum custom_keycodes { #define _______ KC_TRNS #define XXXXXXX KC_NO +// Aliases to make the keymap more uniform +#define GUI_END GUI_T(KC_END) +#define MED_DEL LT(_MEDIA, KC_DEL) +#define KPD_ENT LT(_KEYPAD, KC_ENT) + /* Function Keys on All Layers (Keypad toggles): @@ -96,9 +101,9 @@ enum custom_keycodes { |--------+------+------+------+------+------||------+------+------+------+------+--------| | | | | | | || | | | | | | |--------+------+------+------+------+------||------+------+------+------+------+--------| - | | | | | | || | Mute | Vol- | Vol+ | | | + | | | Mute | Vol- | Vol+ | || | | | | | | |--------+------+------+------+------+------||------+------+------+------+------+--------| - | | | | | | || Stop | Prev | Play | Next | Sel | | + | | Stop | Prev | Play | Next | Sel || | | | | | | `--------+------+------+------+------+------'`------+------+------+------+------+--------' | | | | | | | | | | `---------------------------' `---------------------------' @@ -116,12 +121,12 @@ enum custom_keycodes { |--------+------+------+------+------+------||------+------+------+------+------+--------| | Sleep | | | | | || | KP 7 | KP 8 | KP 9 | KP - | | |--------+------+------+------+------+------||------+------+------+------+------+--------| - | Wake | |QWERTY|Colemk|Dvorak| || | KP 4 | KP 5 | KP 6 | KP + | | + | Wake | | Mute | Vol- | Vol+ | || | KP 4 | KP 5 | KP 6 | KP + | | |--------+------+------+------+------+------||------+------+------+------+------+--------| - | | | | | | || | KP 1 | KP 2 | KP 3 |KP Ent| | + | | Stop | Prev | Play | Next | Sel || | KP 1 | KP 2 | KP 3 |KP Ent| | `--------+------+------+------+------+------'`------+------+------+------+------+--------' - | | | | | | | | KP . |KP Ent| | - `---------------------------' `----------------------------------' + | |QWERTY|Colemk|Dvorak| | | | KP . |KP Ent| + `---------------------------' `---------------------------' ,-------------.,-------------. | | || | | ,------|------|------||------+------+------. @@ -144,7 +149,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Left Thumb KC_LCTL, KC_LALT, KC_HOME, - KC_BSPC, LT(_MEDIA, KC_DEL), KC_END, + KC_BSPC, MED_DEL, GUI_END, // Right Hand KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, TG(_KEYPAD), RESET, @@ -156,7 +161,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Right Thumb KC_RGUI, KC_RCTL, KC_PGUP, - KC_PGDN, LT(_KEYPAD, KC_ENT), KC_SPC + KC_PGDN, KPD_ENT, KC_SPC ), [_QWERTY] = LAYOUT ( @@ -170,7 +175,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Left Thumb KC_LCTL, KC_LALT, KC_HOME, - KC_BSPC, LT(_MEDIA, KC_DEL), KC_END, + KC_BSPC, MED_DEL, KC_END, // Right Hand KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, TG(_KEYPAD), RESET, @@ -182,7 +187,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Right Thumb KC_RGUI, KC_RCTL, KC_PGUP, - KC_PGDN, LT(_KEYPAD, KC_ENT), KC_SPC + KC_PGDN, KPD_ENT, KC_SPC ), [_COLEMAK] = LAYOUT ( @@ -196,7 +201,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Left Thumb KC_LCTL, KC_LALT, KC_HOME, - KC_BSPC, LT(_MEDIA, KC_DEL), KC_END, + KC_BSPC, MED_DEL, KC_END, // Right Hand KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, TG(_KEYPAD), RESET, @@ -208,7 +213,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Right Thumb KC_RGUI, KC_RCTL, KC_PGUP, - KC_PGDN, LT(_KEYPAD, KC_ENT), KC_SPC + KC_PGDN, KPD_ENT, KC_SPC ), [_MEDIA] = LAYOUT ( @@ -216,8 +221,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, + _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, + _______, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSEL, _______, _______, _______, _______, // Left Thumb _______, _______, @@ -228,8 +233,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12, _______, _______, _______, _______, _______, _______, - _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, - KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSEL, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, // Right Thumb _______, _______, @@ -242,9 +247,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PWR, _______, _______, _______, _______, _______, KC_SLEP, _______, _______, _______, _______, _______, - KC_WAKE, _______, QWERTY, COLEMAK, DVORAK, _______, - _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, + KC_WAKE, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, + _______, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSEL, + _______, QWERTY, COLEMAK, DVORAK, // Left Thumb _______, _______, _______, -- cgit v1.2.3