From 405d9eeea29be46f9f1d4318c70b393b7bcb3d2f Mon Sep 17 00:00:00 2001 From: Ian Sterling Date: Fri, 7 Dec 2018 20:46:18 -0800 Subject: [PATCH] Simplified keymap Removed the media layer to help simplify things. Also corrected some keymap mistakes in the Qwerty and Colemak layers. --- keyboards/kinesis/keymaps/xyverz/keymap.c | 83 +++++----------------- keyboards/kinesis/keymaps/xyverz/readme.md | 45 ++++-------- 2 files changed, 29 insertions(+), 99 deletions(-) diff --git a/keyboards/kinesis/keymaps/xyverz/keymap.c b/keyboards/kinesis/keymaps/xyverz/keymap.c index 2eab62a2bcc..944dab2614c 100644 --- a/keyboards/kinesis/keymaps/xyverz/keymap.c +++ b/keyboards/kinesis/keymaps/xyverz/keymap.c @@ -5,14 +5,12 @@ extern keymap_config_t keymap_config; #define _DVORAK 0 // Dvorak layer #define _QWERTY 1 // Qwerty layer #define _COLEMAK 2 // Colemak layer -#define _MEDIA 3 // Media Layer -#define _KEYPAD 4 // Keypad Layer +#define _KEYPAD 3 // Keypad Layer enum custom_keycodes { DVORAK = SAFE_RANGE, QWERTY, COLEMAK, - MEDIA, KEYPAD }; @@ -22,7 +20,6 @@ enum custom_keycodes { // 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) /* @@ -50,9 +47,9 @@ enum custom_keycodes { ,--------------.,--------------. | LCtl | LAlt || RGUI | RCtl | ,------|-------|------||------+-------+-------. - | | Del | Home || PgUp | Enter | | - | BkSp | / |------||------| / | Space | - | | Media | End || PgDn | KeyPd | | + | | | Home || PgUp | Enter | | + | BkSp | Del |------||------| / | Space | + | | | End || PgDn | KeyPd | | `---------------------'`----------------------' QWERTY layer: @@ -70,9 +67,9 @@ enum custom_keycodes { ,--------------.,--------------. | LCtl | LAlt || RGUI | RCtl | ,------|-------|------||------+-------+-------. - | | Del | Home || PgUp | Enter | | - | BkSp | / |------||------| / | Space | - | | Media | End || PgDn | KeyPd | | + | | | Home || PgUp | Enter | | + | BkSp | Del |------||------| / | Space | + | | | End || PgDn | KeyPd | | `---------------------'`----------------------' Colemak layer: @@ -90,31 +87,11 @@ enum custom_keycodes { ,--------------.,--------------. | LCtl | LAlt || RGUI | RCtl | ,------|-------|------||------+-------+-------. - | | Del | Home || PgUp | Enter | | - | BkSp | / |------||------| / | Space | - | | Media | End || PgDn | KeyPd | | + | | | Home || PgUp | Enter | | + | BkSp | Del |------||------| / | Space | + | | | End || PgDn | KeyPd | | `---------------------'`----------------------' - Media layer: - ,-------------------------------------------.,-------------------------------------------. - | F11 | F1 | F2 | F3 | F4 | F5 || F6 | F7 | F8 | F9 | F10 | F12 | - |--------+------+------+------+------+------||------+------+------+------+------+--------| - | | | | | | || | | | | | | - |--------+------+------+------+------+------||------+------+------+------+------+--------| - | | | Mute | Vol- | Vol+ | || | | | | | | - |--------+------+------+------+------+------||------+------+------+------+------+--------| - | | Stop | Prev | Play | Next | Sel || | | | | | | - `--------+------+------+------+------+------'`------+------+------+------+------+--------' - | | | | | | | | | | - `---------------------------' `---------------------------' - ,-------------.,-------------. - | | || | | - ,------|------|------||------+------+------. - | | | || | | | - | | |------||------| | | - | | | || | | | - `--------------------'`--------------------' - Keypad layer: ,-------------------------------------------.,-------------------------------------------. | Power | | | | | || | NmLk | KP = | KP / | KP * | | @@ -149,7 +126,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Left Thumb KC_LCTL, KC_LALT, KC_HOME, - KC_BSPC, MED_DEL, GUI_END, + KC_BSPC, KC_DEL, GUI_END, // Right Hand KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, TG(_KEYPAD), RESET, @@ -175,12 +152,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Left Thumb KC_LCTL, KC_LALT, KC_HOME, - KC_BSPC, MED_DEL, KC_END, + KC_BSPC, KC_DEL, KC_END, // Right Hand KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, TG(_KEYPAD), RESET, - KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, - KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL , + KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, + KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS , KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DOWN, KC_LBRC, KC_RBRC, @@ -201,12 +178,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Left Thumb KC_LCTL, KC_LALT, KC_HOME, - KC_BSPC, MED_DEL, KC_END, + KC_BSPC, KC_DEL, KC_END, // Right Hand KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, TG(_KEYPAD), RESET, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, - KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_DEL, + KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSLS, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DOWN, KC_LBRC, KC_RBRC, @@ -216,32 +193,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_PGDN, KPD_ENT, KC_SPC ), -[_MEDIA] = LAYOUT ( - // Left Hand - _______, _______, _______, _______, _______, _______, _______, _______, _______, - 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 - _______, _______, - _______, - _______, _______, _______, - - // Right Hand - _______, _______, _______, _______, _______, _______, _______, _______, _______, - KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12, - _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, - // Right Thumb - _______, _______, - _______, - _______, _______, _______ - ), - [_KEYPAD] = LAYOUT ( // Left Hand _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -255,7 +206,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, - // Right Hand */ + // Right Hand _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NLCK, KC_PEQL, KC_PSLS, KC_PAST, _______, _______, KC_P7, KC_P8, KC_P9, KC_PMNS, _______, diff --git a/keyboards/kinesis/keymaps/xyverz/readme.md b/keyboards/kinesis/keymaps/xyverz/readme.md index b55100d25bc..f8896934c03 100644 --- a/keyboards/kinesis/keymaps/xyverz/readme.md +++ b/keyboards/kinesis/keymaps/xyverz/readme.md @@ -10,6 +10,8 @@ I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar t Depending on the OS, most of the LEDs are now working in this keymap, but I still have yet to get the Num Pad LED working when switching to the Numpad layer. +Removed the Media layer 2018-12-07 + ## Still to do: * Figure out how to make the Numpad LED work properly. @@ -38,9 +40,9 @@ Depending on the OS, most of the LEDs are now working in this keymap, but I stil ,--------------.,--------------. | LCtl | LAlt || RGUI | RCtl | ,------|-------|------||------+-------+-------. - | | Del | Home || PgUp | Enter | | - | BkSp | / |------||------| / | Space | - | | Media | End || PgDn | KeyPd | | + | | | Home || PgUp | Enter | | + | BkSp | Del |------||------| / | Space | + | | | End || PgDn | KeyPd | | `---------------------'`----------------------' ### Layer 1: QWERTY layer @@ -59,9 +61,9 @@ Depending on the OS, most of the LEDs are now working in this keymap, but I stil ,--------------.,--------------. | LCtl | LAlt || RGUI | RCtl | ,------|-------|------||------+-------+-------. - | | Del | Home || PgUp | Enter | | - | BkSp | / |------||------| / | Space | - | | Media | End || PgDn | KeyPd | | + | | | Home || PgUp | Enter | | + | BkSp | Del |------||------| / | Space | + | | | End || PgDn | KeyPd | | `---------------------'`----------------------' ### Keymap 2: Colemak layer @@ -80,35 +82,12 @@ Depending on the OS, most of the LEDs are now working in this keymap, but I stil ,--------------.,--------------. | LCtl | LAlt || RGUI | RCtl | ,------|-------|------||------+-------+-------. - | | Del | Home || PgUp | Enter | | - | BkSp | / |------||------| / | Space | - | | Media | End || PgDn | KeyPd | | + | | | Home || PgUp | Enter | | + | BkSp | Del |------||------| / | Space | + | | | End || PgDn | KeyPd | | `---------------------'`----------------------' -### layer 3 : Media layer - - ,-------------------------------------------.,-------------------------------------------. - | F11 | F1 | F2 | F3 | F4 | F5 || F6 | F7 | F8 | F9 | F10 | F12 | - |--------+------+------+------+------+------||------+------+------+------+------+--------| - | | | | | | || | | | | | | - |--------+------+------+------+------+------||------+------+------+------+------+--------| - | | | Mute | Vol- | Vol+ | || | | | | | | - |--------+------+------+------+------+------||------+------+------+------+------+--------| - | | Stop | Prev | Play | Next | Sel || | | | | | | - `--------+------+------+------+------+------'`------+------+------+------+------+--------' - | | | | | | | | | | - `---------------------------' `---------------------------' - ,-------------.,-------------. - | | || | | - ,------|------|------||------+------+------. - | | | || | | | - | | |------||------| | | - | | | || | | | - `--------------------'`--------------------' - - - -### Keymap 4: Keypad layer +### layer 3 : Keypad layer ,-------------------------------------------.,-------------------------------------------. | Power | | | | | || | NmLk | KP = | KP / | KP * | |