summaryrefslogtreecommitdiff
path: root/keyboards/kinesis
diff options
context:
space:
mode:
authorAlex Ong <the.onga@gmail.com>2019-01-04 19:43:45 +1100
committerAlex Ong <the.onga@gmail.com>2019-01-04 19:43:45 +1100
commit2bb2977c133646c4e056960e72029270d77cc1eb (patch)
tree235d491f992121ac1716c5bf2fafb80983748576 /keyboards/kinesis
parenta55c838961c89097ab849ed6cb1f261791e6b9b4 (diff)
parent47c91fc7f75ae0a477e55b687aa0fc30da0a283c (diff)
downloadqmk_firmware-2bb2977c133646c4e056960e72029270d77cc1eb.tar.gz
qmk_firmware-2bb2977c133646c4e056960e72029270d77cc1eb.zip
Merge branch 'master' into debounce_refactor
# Conflicts: # tmk_core/common/keyboard.c
Diffstat (limited to 'keyboards/kinesis')
-rw-r--r--keyboards/kinesis/keymaps/carpalx/rules.mk2
-rw-r--r--keyboards/kinesis/keymaps/default/rules.mk2
-rw-r--r--keyboards/kinesis/keymaps/default_pretty/rules.mk2
-rw-r--r--keyboards/kinesis/keymaps/dvorak/rules.mk2
-rw-r--r--keyboards/kinesis/keymaps/insertsnideremarks/config.h1
-rw-r--r--keyboards/kinesis/keymaps/insertsnideremarks/keymap.c697
-rw-r--r--keyboards/kinesis/keymaps/insertsnideremarks/readme.md18
-rw-r--r--keyboards/kinesis/keymaps/insertsnideremarks/rules.mk4
-rw-r--r--keyboards/kinesis/keymaps/milestogo/rules.mk2
-rw-r--r--keyboards/kinesis/keymaps/xyverz/keymap.c43
-rw-r--r--keyboards/kinesis/keymaps/xyverz/readme.md20
-rw-r--r--keyboards/kinesis/keymaps/xyverz/rules.mk8
12 files changed, 338 insertions, 463 deletions
diff --git a/keyboards/kinesis/keymaps/carpalx/rules.mk b/keyboards/kinesis/keymaps/carpalx/rules.mk
index 1854d35df2..c7753fae05 100644
--- a/keyboards/kinesis/keymaps/carpalx/rules.mk
+++ b/keyboards/kinesis/keymaps/carpalx/rules.mk
@@ -13,7 +13,7 @@ MIDI_ENABLE = no # MIDI controls
AUDIO_ENABLE = no # Audio output on port C6
UNICODE_ENABLE = no # Unicode
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
+RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
ifndef QUANTUM_DIR
diff --git a/keyboards/kinesis/keymaps/default/rules.mk b/keyboards/kinesis/keymaps/default/rules.mk
index 9d3df5964f..93f927c7d0 100644
--- a/keyboards/kinesis/keymaps/default/rules.mk
+++ b/keyboards/kinesis/keymaps/default/rules.mk
@@ -13,7 +13,7 @@ MIDI_ENABLE = no # MIDI controls
AUDIO_ENABLE = no # Audio output on port C6
UNICODE_ENABLE = no # Unicode
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
+RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
ifndef QUANTUM_DIR
diff --git a/keyboards/kinesis/keymaps/default_pretty/rules.mk b/keyboards/kinesis/keymaps/default_pretty/rules.mk
index 9d3df5964f..93f927c7d0 100644
--- a/keyboards/kinesis/keymaps/default_pretty/rules.mk
+++ b/keyboards/kinesis/keymaps/default_pretty/rules.mk
@@ -13,7 +13,7 @@ MIDI_ENABLE = no # MIDI controls
AUDIO_ENABLE = no # Audio output on port C6
UNICODE_ENABLE = no # Unicode
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
+RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
ifndef QUANTUM_DIR
diff --git a/keyboards/kinesis/keymaps/dvorak/rules.mk b/keyboards/kinesis/keymaps/dvorak/rules.mk
index 9d3df5964f..93f927c7d0 100644
--- a/keyboards/kinesis/keymaps/dvorak/rules.mk
+++ b/keyboards/kinesis/keymaps/dvorak/rules.mk
@@ -13,7 +13,7 @@ MIDI_ENABLE = no # MIDI controls
AUDIO_ENABLE = no # Audio output on port C6
UNICODE_ENABLE = no # Unicode
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
+RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
ifndef QUANTUM_DIR
diff --git a/keyboards/kinesis/keymaps/insertsnideremarks/config.h b/keyboards/kinesis/keymaps/insertsnideremarks/config.h
index 3548fa3486..9ce094be51 100644
--- a/keyboards/kinesis/keymaps/insertsnideremarks/config.h
+++ b/keyboards/kinesis/keymaps/insertsnideremarks/config.h
@@ -5,7 +5,6 @@
#include "../../config.h"
// place overrides here
-#define PREVENT_STUCK_MODIFIERS
#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_TERM 175
#define TAPPING_TOGGLE 2
diff --git a/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c b/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c
index bf75327f1b..78defea237 100644
--- a/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c
+++ b/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c
@@ -78,454 +78,327 @@ qk_tap_dance_action_t tap_dance_actions[] = {
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Fundtion Row Keys
-/ (Identical across layers, unless otherwise noted; Numpad is a toggle; Adjust is mometary)
-* ,-----------------------------------------------------------------------------------------------------------.
-* | ESC | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | PScr| SLck| Paus|Numpd|Adjst|
-* `-----------------------------------------------------------------------------------------------------------'
-*/
-
/* Colemak
-* (Defauit layer; keys separated by /: tap for first, hold for second; uses Space Cadet Shifts)
-* ,-------------------------------------------. ,-------------------------------------------.
-* | = | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | - |
-* |--------+------+------+------+------+------| |------+------+------+------+------+--------|
-* | Tab | Q | W | F | P | G | | J | L | U | Y | ; | \ |
-* |--------+------+------+------+------+------| |------+------+------+------+------+--------|
-* |Esc/Ctrl| A | R | S | T | D | | H | N | E | I | O | ' |
-* |--------+------+------+------+------+------| |------+------+------+------+------+--------|
-* |SC Shift| Z | X | C | V | B | | K | M | , | . | / |SC Shift|
-* `--------+------+------+------+------+------' `------+------+------+------+------+--------'
-* | Ins | ` | [ | ] | | Left | Down | Up | Right|
-* `---------------------------' `---------------------------'
-* ,---------------. ,---------------.
-* |Esc/Ctl| Hyper | | RAlt | RCtl |
-* ,-------|-------|-------| |-------+-------+-------.
-* | Space | Enter |App/Alt| | RGUI | Delete| Bspc |
-* | / | / |-------| |-------| / | / |
-* | Fn | Number| Bspc | | Enter |Number2| Fn2 |
-* `-----------------------' `-----------------------'
+ (Defauit layer; keys separated by /: tap for first, hold for second; uses Space Cadet Shifts)
+ ,-----------------------------------------------------------------------------------------------------------.
+ | ESC | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | PScr| SLck| Paus|Numpd|Adjst|
+ `-----------------------------------------------------------------------------------------------------------'
+ ,-------------------------------------------. ,-------------------------------------------.
+ | = | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | - |
+ |--------+------+------+------+------+------| |------+------+------+------+------+--------|
+ | Tab | Q | W | F | P | G | | J | L | U | Y | ; | \ |
+ |--------+------+------+------+------+------| |------+------+------+------+------+--------|
+ |Esc/Ctrl| A | R | S | T | D | | H | N | E | I | O | ' |
+ |--------+------+------+------+------+------| |------+------+------+------+------+--------|
+ |SC Shift| Z | X | C | V | B | | K | M | , | . | / |SC Shift|
+ `--------+------+------+------+------+------' `------+------+------+------+------+--------'
+ | Ins | ` | [ | ] | | Left | Down | Up | Right|
+ `---------------------------' `---------------------------'
+ ,---------------. ,---------------.
+ |Esc/Ctl| Hyper | | RAlt | RCtl |
+ ,-------|-------|-------| |-------+-------+-------.
+ | Space | Enter |App/Alt| | RGUI | Delete| Bspc |
+ | / | / |-------| |-------| / | / |
+ | Fn | Number| Bspc | | Enter |Number2| Fn2 |
+ `-----------------------' `-----------------------'
*/
-[_COLEMAK] = LAYOUT(
- // Left Hand
- KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8,
- KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5,
- KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G,
- CTLESC, KC_A, KC_R, KC_S, KC_T, KC_D,
- KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B,
- KC_INS, KC_GRV, KC_LBRC, KC_RBRC,
- //Left Thumb
- CTLESC, ALL_T(KC_NO),
- ALTAPP,
- SPCFN, ENTNS, KC_BSPC,
- //Right Hand
- KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, NUMPAD, ADJUST,
- KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
- 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_RSPC,
- KC_LEFT, KC_DOWN, KC_UP, KC_RGHT,
- //Right Thumb
- KC_RALT, KC_RCTL,
- KC_RGUI,
- KC_ENT, DELNS, BSPCFN
+[_COLEMAK] = LAYOUT_pretty(
+ 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_PSCR, KC_SLCK, KC_PAUS, NUMPAD, ADJUST,
+ KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
+ KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSLS,
+ CTLESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT,
+ KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC,
+ KC_INS, KC_GRV, KC_LBRC, KC_RBRC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT,
+ CTLESC, ALL_T(KC_NO), KC_RALT, KC_RCTL,
+ ALTAPP, KC_RGUI,
+ SPCFN, ENTNS, KC_BSPC, KC_ENT, DELNS, BSPCFN
),
/* QWERTY
-* (Keys separated by /: tap for first, hold for second; uses Space Cadet Shifts)
-* ,-------------------------------------------. ,-------------------------------------------.
-* | = | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | - |
-* |--------+------+------+------+------+------| |------+------+------+------+------+--------|
-* | Tab | Q | W | E | R | T | | Y | U | I | O | P | \ |
-* |--------+------+------+------+------+------| |------+------+------+------+------+--------|
-* |Esc/Ctrl| A | S | D | F | G | | H | J | K | L | ; | ' |
-* |--------+------+------+------+------+------| |------+------+------+------+------+--------|
-* |SC Shift| Z | X | C | V | B | | N | M | , | . | / |SC Shift|
-* `--------+------+------+------+------+------' `------+------+------+------+------+--------'
-* | Ins | ` | [ | ] | | Left | Down | Up | Right|
-* `---------------------------' `---------------------------'
-* ,---------------. ,---------------.
-* |Esc/Ctl| Hyper | | RAlt | RCtl |
-* ,-------|-------|-------| |-------+-------+-------.
-* | Space | Enter |App/Alt| | RGUI | Delete| Bspc |
-* | / | / |-------| |-------| / | / |
-* | Fn | Number| Bspc | | Enter |Number2| Fn2 |
-* `-----------------------' `-----------------------'
+ (Keys separated by /: tap for first, hold for second; uses Space Cadet Shifts)
+ ,-----------------------------------------------------------------------------------------------------------.
+ | ESC | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | PScr| SLck| Paus|Numpd|Adjst|
+ `-----------------------------------------------------------------------------------------------------------'
+ ,-------------------------------------------. ,-------------------------------------------.
+ | = | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | - |
+ |--------+------+------+------+------+------| |------+------+------+------+------+--------|
+ | Tab | Q | W | E | R | T | | Y | U | I | O | P | \ |
+ |--------+------+------+------+------+------| |------+------+------+------+------+--------|
+ |Esc/Ctrl| A | S | D | F | G | | H | J | K | L | ; | ' |
+ |--------+------+------+------+------+------| |------+------+------+------+------+--------|
+ |SC Shift| Z | X | C | V | B | | N | M | , | . | / |SC Shift|
+ `--------+------+------+------+------+------' `------+------+------+------+------+--------'
+ | Ins | ` | [ | ] | | Left | Down | Up | Right|
+ `---------------------------' `---------------------------'
+ ,---------------. ,---------------.
+ |Esc/Ctl| Hyper | | RAlt | RCtl |
+ ,-------|-------|-------| |-------+-------+-------.
+ | Space | Enter |App/Alt| | RGUI | Delete| Bspc |
+ | / | / |-------| |-------| / | / |
+ | Fn | Number| Bspc | | Enter |Number2| Fn2 |
+ `-----------------------' `-----------------------'
*/
-[_QWERTY] = LAYOUT(
- // Left Hand
- KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8,
- KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5,
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T,
- CTLESC, KC_A, KC_S, KC_D, KC_F, KC_G,
- KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B,
- KC_INS, KC_GRV, KC_LBRC, KC_RBRC,
- //Left Thumb
- CTLESC, ALL_T(KC_NO),
- ALTAPP,
- SPCFN, ENTNS, KC_BSPC,
-
- //Right Hand
- KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, NUMPAD, ADJUST,
- 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_RSPC,
- KC_LEFT, KC_DOWN, KC_UP, KC_RGHT,
- //Right Thumb
- KC_RALT, KC_RCTL,
- KC_RGUI,
- KC_ENT, DELNS, BSPCFN
+[_QWERTY] = LAYOUT_pretty(
+ 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_PSCR, KC_SLCK, KC_PAUS, NUMPAD, ADJUST,
+ KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
+ CTLESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
+ KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC,
+ KC_INS, KC_GRV, KC_LBRC, KC_RBRC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT,
+ CTLESC, ALL_T(KC_NO), KC_RALT, KC_RCTL,
+ ALTAPP, KC_RGUI,
+ SPCFN, ENTNS, KC_BSPC, KC_ENT, DELNS, BSPCFN
),
/* Number/symbol layer
-* (Multiple characters: single-tap for first, double-tap for second)
-* ,-------------------------------------------. ,-------------------------------------------.
-* | F12 | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 |
-* |--------+------+------+------+------+------| |------+------+------+------+------+--------|
-* | | 6 | 7 | 8 | 9 | 0 | | ^ | & | * | ( | ) | |
-* |--------+------+------+------+------+------| |------+------+------+------+------+--------|
-* | | 1 | 2 | 3 | 4 | 5 | | ! | @ | # | $ | % | |
-* |--------+------+------+------+------+------| |------+------+------+------+------+--------|
-* | | | . | / * | - _ | + = | | ` ~ | [ { | ] } | | | |
-* `--------+------+------+------+------+------' `------+------+------+------+------+--------'
-* | ( | ) | [ { | ] } | | | | | |
-* `---------------------------' `---------------------------'
-* ,---------------. ,---------------.
-* | | | | | |
-* ,-------|-------|-------| |-------+-------+-------.
-* | | | | | | | |
-* | | |-------| |-------| | |
-* | | | | | | | |
-* `-----------------------' `-----------------------'
+ (Multiple characters: single-tap for first, double-tap for second)
+ ,-----------------------------------------------------------------------------------------------------------.
+ | | | | | | | | | | | | | | | | | | |
+ `-----------------------------------------------------------------------------------------------------------'
+ ,-------------------------------------------. ,-------------------------------------------.
+ | F12 | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 |
+ |--------+------+------+------+------+------| |------+------+------+------+------+--------|
+ | | 6 | 7 | 8 | 9 | 0 | | ^ | & | * | ( | ) | |
+ |--------+------+------+------+------+------| |------+------+------+------+------+--------|
+ | | 1 | 2 | 3 | 4 | 5 | | ! | @ | # | $ | % | |
+ |--------+------+------+------+------+------| |------+------+------+------+------+--------|
+ | | | . | / * | - _ | + = | | ` ~ | [ { | ] } | | | |
+ `--------+------+------+------+------+------' `------+------+------+------+------+--------'
+ | ( | ) | [ { | ] } | | | | | |
+ `---------------------------' `---------------------------'
+ ,---------------. ,---------------.
+ | | | | | |
+ ,-------|-------|-------| |-------+-------+-------.
+ | | | | | | | |
+ | | |-------| |-------| | |
+ | | | | | | | |
+ `-----------------------' `-----------------------'
*/
-[_NUMBERS] = LAYOUT(
- // Left Hand
- _______, _______, _______, _______, _______, _______, _______, _______, _______,
- KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5,
- _______, KC_6, KC_7, KC_8, KC_9, KC_0,
- _______, KC_1, KC_2, KC_3, KC_4, KC_5,
- _______, _______, KC_DOT, TD(SLAS), TD(MNUN), TD(PLEQ),
- KC_LPRN, KC_RPRN, TD(LBCB), TD(RBCB),
- // Left Thumb
- _______, _______,
- _______,
- _______, _______, _______,
- // Right Hand
- _______, _______, _______, _______, _______, _______, _______, _______, _______,
- KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
- KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
- KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, _______,
- TD(GVTL), TD(LBCB), TD(RBCB), _______, _______, _______,
- _______, _______, _______, _______,
- // Right Thumb
- _______, _______,
- _______,
- _______, _______, _______
+[_NUMBERS] = LAYOUT_pretty(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
+ _______, KC_6, KC_7, KC_8, KC_9, KC_0, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
+ _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, _______,
+ _______, _______, KC_DOT, TD(SLAS), TD(MNUN), TD(PLEQ), TD(GVTL), TD(LBCB), TD(RBCB), _______, _______, _______,
+ KC_LPRN, KC_RPRN, TD(LBCB), TD(RBCB), _______, _______, _______, _______,
+ _______, _______, _______, _______,
+ _______, _______,
+ _______, _______, _______, _______, _______, _______
),
-[_NUMBERS2] = LAYOUT(
- // Left Hand
- _______, _______, _______, _______, _______, _______, _______, _______, _______,
- KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5,
- _______, KC_6, KC_7, KC_8, KC_9, KC_0,
- _______, KC_1, KC_2, KC_3, KC_4, KC_5,
- _______, _______, KC_DOT, TD(SLAS), TD(MNUN), TD(PLEQ),
- KC_LPRN, KC_RPRN, TD(LBCB), TD(RBCB),
- // Left Thumb
- _______, _______,
- _______,
- _______, _______, _______,
- // Right Hand
- _______, _______, _______, _______, _______, _______, _______, _______, _______,
- KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
- KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
- KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, _______,
- TD(GVTL), TD(LBCB), TD(RBCB), _______, _______, _______,
- _______, _______, _______, _______,
- // Right Thumb
- _______, _______,
- _______,
- _______, _______, _______
+[_NUMBERS2] = LAYOUT_pretty(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
+ _______, KC_6, KC_7, KC_8, KC_9, KC_0, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
+ _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, _______,
+ _______, _______, KC_DOT, TD(SLAS), TD(MNUN), TD(PLEQ), TD(GVTL), TD(LBCB), TD(RBCB), _______, _______, _______,
+ KC_LPRN, KC_RPRN, TD(LBCB), TD(RBCB), _______, _______, _______, _______,
+ _______, _______, _______, _______,
+ _______, _______,
+ _______, _______, _______, _______, _______, _______
),
/* Function layer
-* ,-------------------------------------------. ,-------------------------------------------.
-* | F12 | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 |
-* |--------+------+------+------+------+------| |------+------+------+------+------+--------|
-* | | | | Up | | | | | | Up |Ctrl+Y| | |
-* |--------+------+------+------+------+------| |------+------+------+------+------+--------|
-* | |Ctrl+A| Left | Down | Right|C+A+Tb| | PgUp | Right| Down | Left | Home | |
-* |--------+------+------+------+------+------| |------+------+------+------+------+--------|
-* | |Ctrl+Z|Ctrl+X|Ctrl+C|Ctrl+V| Bspc | | PgDn | Mute | Vol- | Vol+ | End | |
-* `--------+------+------+------+------+------' `------+------+------+------+------+--------'
-* | | | | | | Prev | Play | Next | Stop |
-* `---------------------------' `---------------------------'
-* ,---------------. ,---------------.
-* | | | | | |
-* ,-------|-------|-------| |-------+-------+-------.
-* | | | | | | | |
-* | | |-------| |-------| | |
-* | | | | | | | |
-* `-----------------------' `-----------------------'
+ ,-----------------------------------------------------------------------------------------------------------.
+ | | | | | | | | | | | | | | | | | | |
+ `-----------------------------------------------------------------------------------------------------------'
+ ,-------------------------------------------. ,-------------------------------------------.
+ | F12 | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 |
+ |--------+------+------+------+------+------| |------+------+------+------+------+--------|
+ | | | | Up | | | | | | Up |Ctrl+Y| | |
+ |--------+------+------+------+------+------| |------+------+------+------+------+--------|
+ | |Ctrl+A| Left | Down | Right|C+A+Tb| | PgUp | Right| Down | Left | Home | |
+ |--------+------+------+------+------+------| |------+------+------+------+------+--------|
+ | |Ctrl+Z|Ctrl+X|Ctrl+C|Ctrl+V| Bspc | | PgDn | Mute | Vol- | Vol+ | End | |
+ `--------+------+------+------+------+------' `------+------+------+------+------+--------'
+ | | | | | | Prev | Play | Next | Stop |
+ `---------------------------' `---------------------------'
+ ,---------------. ,---------------.
+ | | | | | |
+ ,-------|-------|-------| |-------+-------+-------.
+ | | | | | | | |
+ | | |-------| |-------| | |
+ | | | | | | | |
+ `-----------------------' `-----------------------'
*/
-[_FUNCTION] = LAYOUT(
- // Left Hand
- _______, _______, _______, _______, _______, _______, _______, _______, _______,
- KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5,
- _______, _______, _______, KC_UP, _______, _______,
- _______, LCTL(KC_A), KC_LEFT, KC_DOWN, KC_RGHT, LCA(KC_TAB),
- _______, LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), KC_BSPC,
- _______, _______, _______, _______,
- // Left Thumb
- _______, _______,
- _______,
- _______, _______, _______,
- // Right Hand
- _______, _______, _______, _______, _______, _______, _______, _______, _______,
- KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
- _______, _______, KC_UP, LCTL(KC_Y), _______, _______,
- KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT, KC_HOME, _______,
- KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, KC_END, _______,
- KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP,
- // Right Thumb
- _______, _______,
- _______,
- _______, _______, _______
+[_FUNCTION] = LAYOUT_pretty(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
+ _______, _______, _______, KC_UP, _______, _______, _______, _______, KC_UP, LCTL(KC_Y), _______, _______,
+ _______, LCTL(KC_A), KC_LEFT, KC_DOWN, KC_RGHT, LCA(KC_TAB), KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT, KC_HOME, _______,
+ _______, LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), KC_BSPC, KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, KC_END, _______,
+ _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP,
+ _______, _______, _______, _______,
+ _______, _______,
+ _______, _______, _______, _______, _______, _______
),
-[_FUNCTION2] = LAYOUT(
- // Left Hand
- _______, _______, _______, _______, _______, _______, _______, _______, _______,
- KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5,
- _______, _______, _______, KC_UP, _______, _______,
- _______, LCTL(KC_A), KC_LEFT, KC_DOWN, KC_RGHT, LCA(KC_TAB),
- _______, LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), KC_BSPC,
- _______, _______, _______, _______,
- // Left Thumb
- _______, _______,
- _______,
- _______, _______, _______,
- // Right Hand
- _______, _______, _______, _______, _______, _______, _______, _______, _______,
- KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
- _______, _______, KC_UP, LCTL(KC_Y), _______, _______,
- KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT, KC_HOME, _______,
- KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, KC_END, _______,
- KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP,
- // Right Thumb
- _______, _______,
- _______,
- _______, _______, _______
+[_FUNCTION2] = LAYOUT_pretty(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
+ _______, _______, _______, KC_UP, _______, _______, _______, _______, KC_UP, LCTL(KC_Y), _______, _______,
+ _______, LCTL(KC_A), KC_LEFT, KC_DOWN, KC_RGHT, LCA(KC_TAB), KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT, KC_HOME, _______,
+ _______, LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), KC_BSPC, KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, KC_END, _______,
+ _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP,
+ _______, _______, _______, _______,
+ _______, _______,
+ _______, _______, _______, _______, _______, _______
),
/* Numpad layer
-* (Left side duplicates layout from the Numbers layer, just with numpad output; right side layout close to PC numpad layout)
-* ,-------------------------------------------. ,-------------------------------------------.
-* | | NumLk| | | | | | Tab | NumLk| KP / | KP * | KP - | |
-* |--------+------+------+------+------+------| |------+------+------+------+------+--------|
-* | | KP 6 | KP 7 | KP 8 | KP 9 | KP 0 | | | KP 7 | KP 8 | KP 9 | KP + | |
-* |--------+------+------+------+------+------| |------+------+------+------+------+--------|
-* | | KP 1 | KP 2 | KP 3 | KP 4 | KP 5 | | | KP 4 | KP 5 | KP 6 | = | |
-* |--------+------+------+------+------+------| |------+------+------+------+------+--------|
-* | | | KP . |KP/KP*| KP- _| KP+ =| | | KP 1 | KP 2 | KP 3 |KP Ent| |
-* `--------+------+------+------+------+------' `------+------+------+------+------+--------'
-* | ( | ) | [ { | ] } | | KP 0 | , | KP . |KP Ent|
-* `---------------------------' `---------------------------'
-* ,---------------. ,---------------.
-* | | | | | |
-* ,-------|-------|-------| |-------+-------+-------.
-* | | | | | | | |
-* | | |-------| |-------| | |
-* | | | | | KP Ent| | |
-* `-----------------------' `-----------------------'
+ (Left side duplicates layout from the Numbers layer, just with numpad output; right side layout close to PC numpad layout)
+ ,-----------------------------------------------------------------------------------------------------------.
+ | | | | | | | | | | | | | | | | | | |
+ `-----------------------------------------------------------------------------------------------------------'
+ ,-------------------------------------------. ,-------------------------------------------.
+ | | NumLk| | | | | | Tab | NumLk| KP / | KP * | KP - | |
+ |--------+------+------+------+------+------| |------+------+------+------+------+--------|
+ | | KP 6 | KP 7 | KP 8 | KP 9 | KP 0 | | | KP 7 | KP 8 | KP 9 | KP + | |
+ |--------+------+------+------+------+------| |------+------+------+------+------+--------|
+ | | KP 1 | KP 2 | KP 3 | KP 4 | KP 5 | | | KP 4 | KP 5 | KP 6 | = | |
+ |--------+------+------+------+------+------| |------+------+------+------+------+--------|
+ | | | KP . |KP/KP*| KP- _| KP+ =| | | KP 1 | KP 2 | KP 3 |KP Ent| |
+ `--------+------+------+------+------+------' `------+------+------+------+------+--------'
+ | ( | ) | [ { | ] } | | KP 0 | , | KP . |KP Ent|
+ `---------------------------' `---------------------------'
+ ,---------------. ,---------------.
+ | | | | | |
+ ,-------|-------|-------| |-------+-------+-------.
+ | | | | | | | |
+ | | |-------| |-------| | |
+ | | | | | | | |
+ `-----------------------' `-----------------------'
*/
-[_NUMPAD] = LAYOUT(
- // Left Hand
- _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, KC_NLCK, _______, _______, _______, _______,
- _______, KC_P6, KC_P7, KC_P8, KC_P9, KC_P0,
- _______, KC_P1, KC_P2, KC_P3, KC_P4, KC_P5,
- _______, _______, KC_PDOT, TD(PSLPAS), TD(PMNUN), TD(PPLEQ),
- KC_LPRN, KC_RPRN, TD(LBCB), TD(RBCB),
- // Left Thumb
- _______, _______,
- _______,
- _______, _______, _______,
- // Right Hand
- _______, _______, _______, _______, _______, _______, _______, _______, _______,
- KC_TAB, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, _______,
- _______, KC_P7, KC_P8, KC_P9, KC_PPLS, _______,
- _______, KC_P4, KC_P5, KC_P6, KC_EQL, _______,
- _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______,
- KC_P0, KC_COMM, KC_PDOT, KC_PENT,
- // Right Thumb
- _______, _______,
- _______,
- _______, _______, _______
+[_NUMPAD] = LAYOUT_pretty(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, KC_NLCK, _______, _______, _______, _______, KC_TAB, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, _______,
+ _______, KC_P6, KC_P7, KC_P8, KC_P9, KC_P0, _______, KC_P7, KC_P8, KC_P9, KC_PPLS, _______,
+ _______, KC_P1, KC_P2, KC_P3, KC_P4, KC_P5, _______, KC_P4, KC_P5, KC_P6, KC_EQL, _______,
+ _______, _______, KC_PDOT, TD(PSLPAS), TD(PMNUN), TD(PPLEQ), _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______,
+ KC_LPRN, KC_RPRN, TD(LBCB), TD(RBCB), KC_P0, KC_COMM, KC_PDOT, KC_PENT,
+ _______, _______, _______, _______,
+ _______, _______,
+ _______, _______, _______, _______, _______, _______
),
/* Colemak gaming/vanilla
-* (Limited access to Function or Numbers layers; mainly used for gaming; double-tap and hold TD(ADJ) above LAlt to access Adjust layer)
-* ,-------------------------------------------. ,-------------------------------------------.
-* | = | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | - |
-* |--------+------+------+------+------+------| |------+------+------+------+------+--------|
-* | Tab | Q | W | F | P | G | | J | L | U | Y | ; | \ |
-* |--------+------+------+------+------+------| |------+------+------+------+------+--------|
-* | Ctrl | A | R | S | T | D | | H | N | E | I | O | ' |
-* |--------+------+------+------+------+------| |------+------+------+------+------+--------|
-* | Shift | Z | X | C | V | B | | K | M | , | . | / | Shift |
-* `--------+------+------+------+------+------' `------+------+------+------+------+--------'
-* | Ins | ` | [ | ] | | Left | Down | Up | Right|
-* `---------------------------' `---------------------------'
-* ,---------------. ,---------------.
-* |Esc/Ctl|TD(ADJ)| | RAlt | RCtl |
-* ,-------|-------|-------| |-------+-------+-------.
-* | | | LAlt | | RGUI | | |
-* | Space | Enter |-------| |-------| Delete| Bspc |
-* | | |Bspc/FN| | Ent/NS| | |
-* `-----------------------' `-----------------------'
+ (Limited access to Function or Numbers layers; mainly used for gaming; double-tap and hold TD(ADJ) above LAlt to access Adjust layer)
+ ,-----------------------------------------------------------------------------------------------------------.
+ | ESC | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | PScr| SLck| Paus|Numpd|Adjst|
+ `-----------------------------------------------------------------------------------------------------------'
+ ,-------------------------------------------. ,-------------------------------------------.
+ | = | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | - |
+ |--------+------+------+------+------+------| |------+------+------+------+------+--------|
+ | Tab | Q | W | F | P | G | | J | L | U | Y | ; | \ |
+ |--------+------+------+------+------+------| |------+------+------+------+------+--------|
+ | Ctrl | A | R | S | T | D | | H | N | E | I | O | ' |
+ |--------+------+------+------+------+------| |------+------+------+------+------+--------|
+ | Shift | Z | X | C | V | B | | K | M | , | . | / | Shift |
+ `--------+------+------+------+------+------' `------+------+------+------+------+--------'
+ | Ins | ` | [ | ] | | Left | Down | Up | Right|
+ `---------------------------' `---------------------------'
+ ,---------------. ,---------------.
+ |Esc/Ctl|TD(ADJ)| | RAlt | RCtl |
+ ,-------|-------|-------| |-------+-------+-------.
+ | | | LAlt | | RGUI | | |
+ | Space | Enter |-------| |-------| Delete| Bspc |
+ | | |Bspc/FN| | Ent/NS| | |
+ `-----------------------' `-----------------------'
*/
-[_COLEMAKGM] = LAYOUT(
- // Left Hand
- KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8,
- KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5,
- KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G,
- KC_LCTL, KC_A, KC_R, KC_S, KC_T, KC_D,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B,
- KC_INS, KC_GRV, KC_LBRC, KC_RBRC,
- //Left Thumb
- CTLESC, TD(ADJ),
- KC_LALT,
- KC_SPC, KC_ENT, BSPCFN,
- //Right Hand
- KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, NUMPAD, ADJUST,
- KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
- 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_LEFT, KC_DOWN, KC_UP, KC_RGHT,
- //Right Thumb
- KC_RALT, KC_RCTL,
- KC_RGUI,
- ENTNS, KC_DEL, KC_BSPC
+[_COLEMAKGM] = LAYOUT_pretty(
+ 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_PSCR, KC_SLCK, KC_PAUS, NUMPAD, ADJUST,
+ KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
+ KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSLS,
+ KC_LCTL, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
+ KC_INS, KC_GRV, KC_LBRC, KC_RBRC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT,
+ CTLESC, TD(ADJ), KC_RALT, KC_RCTL,
+ KC_LALT, KC_RGUI,
+ KC_SPC, KC_ENT, BSPCFN, ENTNS, KC_DEL, KC_BSPC
),
/* QWERTY gaming/vanilla
-* (Limited access to Function or Numbers layers; mainly used for gaming; double-tap and hold TD(ADJ) above LAlt to access Adjust layer)
-* ,-------------------------------------------. ,-------------------------------------------.
-* | = | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | - |
-* |--------+------+------+------+------+------| |------+------+------+------+------+--------|
-* | Tab | Q | W | E | R | T | | Y | U | I | O | P | \ |
-* |--------+------+------+------+------+------| |------+------+------+------+------+--------|
-* | Ctrl | A | S | D | F | G | | H | J | K | L | ; | ' |
-* |--------+------+------+------+------+------| |------+------+------+------+------+--------|
-* | Shift | Z | X | C | V | B | | N | M | , | . | / | Shift |
-* `--------+------+------+------+------+------' `------+------+------+------+------+--------'
-* | Ins | ` | [ | ] | | Left | Down | Up | Right|
-* `---------------------------' `---------------------------'
-* ,---------------. ,---------------.
-* |Esc/Ctl|TD(ADJ)| | RAlt | RCtl |
-* ,-------|-------|-------| |-------+-------+-------.
-* | | | LAlt | | RGUI | | |
-* | Space | Enter |-------| |-------| Delete| Bspc |
-* | | |Bspc/FN| | Ent/NS| | |
-* `-----------------------' `-----------------------'
+ (Limited access to Function or Numbers layers; mainly used for gaming; double-tap and hold TD(ADJ) above LAlt to access Adjust layer)
+ ,-----------------------------------------------------------------------------------------------------------.
+ | ESC | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | PScr| SLck| Paus|Numpd|Adjst|
+ `-----------------------------------------------------------------------------------------------------------'
+ ,-------------------------------------------. ,-------------------------------------------.
+ | = | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | - |
+ |--------+------+------+------+------+------| |------+------+------+------+------+--------|
+ | Tab | Q | W | E | R | T | | Y | U | I | O | P | \ |
+ |--------+------+------+------+------+------| |------+------+------+------+------+--------|
+ | Ctrl | A | S | D | F | G | | H | J | K | L | ; | ' |
+ |--------+------+------+------+------+------| |------+------+------+------+------+--------|
+ | Shift | Z | X | C | V | B | | N | M | , | . | / | Shift |
+ `--------+------+------+------+------+------' `------+------+------+------+------+--------'
+ | Ins | ` | [ | ] | | Left | Down | Up | Right|
+ `---------------------------' `---------------------------'
+ ,---------------. ,---------------.
+ |Esc/Ctl|TD(ADJ)| | RAlt | RCtl |
+ ,-------|-------|-------| |-------+-------+-------.
+ | | | LAlt | | RGUI | | |
+ | Space | Enter |-------| |-------| Delete| Bspc |
+ | | |Bspc/FN| | Ent/NS| | |
+ `-----------------------' `-----------------------'
*/
-[_QWERTYGM] = LAYOUT(
- // Left Hand
- KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8,
- KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5,
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T,
- KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B,
- KC_INS, KC_GRV, KC_LBRC, KC_RBRC,
- //Left Thumb
- CTLESC, TD(ADJ),
- KC_LALT,
- KC_SPC, KC_ENT, BSPCFN,
- //Right Hand
- KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, NUMPAD, ADJUST,
- 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_LEFT, KC_DOWN, KC_UP, KC_RGHT,
- //Right Thumb
- KC_RALT, KC_RCTL,
- KC_RGUI,
- ENTNS, KC_DEL, KC_BSPC
+[_QWERTYGM] = LAYOUT_pretty(
+ 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_PSCR, KC_SLCK, KC_PAUS, NUMPAD, ADJUST,
+ KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
+ KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
+ 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_INS, KC_GRV, KC_LBRC, KC_RBRC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT,
+ CTLESC, TD(ADJ), KC_RALT, KC_RCTL,
+ KC_LALT, KC_RGUI,
+ KC_SPC, KC_ENT, BSPCFN, ENTNS, KC_DEL, KC_BSPC
),
/* Adjust layer
-* (Enter/Number + Delete/Number2 under non-gaming/vanilla layers; Numpad is a toggle)
-* ,-------------------------------------------. ,-------------------------------------------.
-* | |Colmak|Qwerty| |ClmkGM| QWGM | |Numpad| | | | | RESET |
-* |--------+------+------+------+------+------| |------+------+------+------+------+--------|
-* | | | | | | | | | | | | | |
-* |--------+------+------+------+------+------| |------+------+------+------+------+--------|
-* | | | | | | | | |NKROTG| | | | |
-* |--------+------+------+------+------+------| |------+------+------+------+------+--------|
-* | | | | | | | | | | | | | |
-* `--------+------+------+------+------+------' `------+------+------+------+------+--------'
-* | | | | | | | | | |
-* `---------------------------' `---------------------------'
-* ,---------------. ,---------------.
-* | | | | | |
-* ,-------|-------|-------| |-------+-------+-------.
-* | | | | | | | |
-* | | |-------| |-------| | |
-* | | | | | | | |
-* `-----------------------' `-----------------------'
+ (Enter/Number + Delete/Number2 under non-gaming/vanilla layers or press & hold Adjust key on function row; Numpad is a toggle)
+ ,-----------------------------------------------------------------------------------------------------------.
+ | | | | | | | | | | | | | | | | | | |
+ `-----------------------------------------------------------------------------------------------------------'
+ ,-------------------------------------------. ,-------------------------------------------.
+ | |Colmak|Qwerty| |ClmkGM| QWGM | |Numpad| | | | | RESET |
+ |--------+------+------+------+------+------| |------+------+------+------+------+--------|
+ | | | | | | | | | | | | | |
+ |--------+------+------+------+------+------| |------+------+------+------+------+--------|
+ | | | | | | | | | NKRO | | | | |
+ |--------+------+------+------+------+------| |------+------+------+------+------+--------|
+ | | | | | | | | | | | | | |
+ `--------+------+------+------+------+------' `------+------+------+------+------+--------'
+ | | | | | | | | | |
+ `---------------------------' `---------------------------'
+ ,---------------. ,---------------.
+ | | | | | |
+ ,-------|-------|-------| |-------+-------+-------.
+ | | | | | | | |
+ | | |-------| |-------| | |
+ | | | | | | | |
+ `-----------------------' `-----------------------'
*/
-[_ADJUST] = LAYOUT(
- // Left Hand
- _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, COLEMAK, QWERTY, _______, COLEMAKGM, QWERTYGM,
- _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______,
- // Left Thumb
- _______, _______,
- _______,
- _______, _______, _______,
- // Right Hand
- _______, _______, _______, _______, _______, _______, _______, _______, _______,
- NUMPAD, _______, _______, _______, _______, RESET,
- _______, _______, _______, _______, _______, _______,
- _______, NKROTG, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______,
- // Right Thumb
- _______, _______,
- _______,
- _______, _______, _______
+[_ADJUST] = LAYOUT_pretty(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, COLEMAK, QWERTY, _______, COLEMAKGM, QWERTYGM, NUMPAD, _______, _______, _______, _______, RESET,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, NKROTG, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______,
+ _______, _______,
+ _______, _______, _______, _______, _______, _______
),
-[_ADJUST2] = LAYOUT(
- // Left Hand
- _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, COLEMAK, QWERTY, _______, COLEMAKGM, QWERTYGM,
- _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______,
- // Left Thumb
- _______, _______,
- _______,
- _______, _______, _______,
- // Right Hand
- _______, _______, _______, _______, _______, _______, _______, _______, _______,
- NUMPAD, _______, _______, _______, _______, RESET,
- _______, _______, _______, _______, _______, _______,
- _______, NKROTG, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______,
- // Right Thumb
- _______, _______,
- _______,
- _______, _______, _______
+[_ADJUST2] = LAYOUT_pretty(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, COLEMAK, QWERTY, _______, COLEMAKGM, QWERTYGM, NUMPAD, _______, _______, _______, _______, RESET,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, NKROTG, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______,
+ _______, _______,
+ _______, _______, _______, _______, _______, _______
)
};
diff --git a/keyboards/kinesis/keymaps/insertsnideremarks/readme.md b/keyboards/kinesis/keymaps/insertsnideremarks/readme.md
index f774ef444a..7a146c7a29 100644
--- a/keyboards/kinesis/keymaps/insertsnideremarks/readme.md
+++ b/keyboards/kinesis/keymaps/insertsnideremarks/readme.md
@@ -14,7 +14,7 @@ I've largely left the function keys untouched, with the intension of not using t
I use Colemak as my default layout. I've included QWERTY here as well.
-Additionally, I've added gaming/vanilla version of Colemak and QWERTY layouts. These layouts have no access to the Function or Numbers layers, thus no dual-role keys with layer access, and are mainly used for gaming.
+Additionally, I've added gaming/vanilla version of Colemak and QWERTY layouts. These layouts have limited access to the Function or Numbers layers, and are mainly used for gaming.
Persistent default layer has been enabled for Colemak and QWERTY. The gaming/vanilla Colemak and QWERTY can be set as default layer, but will not be persistent.
@@ -46,7 +46,7 @@ Persistent default layer has been enabled for Colemak and QWERTY. The gaming/va
,-------|-------|-------| |-------+-------+-------.
| Space | Enter |App/Alt| | RGUI | Delete| Bspc |
| / | / |-------| |-------| / | / |
- | Fn | Number| Bspc | | Tab |Number2| Fn2 |
+ | Fn | Number| Bspc | | Enter |Number2| Fn2 |
`-----------------------' `-----------------------'
@@ -71,7 +71,7 @@ Persistent default layer has been enabled for Colemak and QWERTY. The gaming/va
,-------|-------|-------| |-------+-------+-------.
| Space | Enter |App/Alt| | RGUI | Delete| Bspc |
| / | / |-------| |-------| / | / |
- | Fn | Number| Bspc | | Tab |Number2| Fn2 |
+ | Fn | Number| Bspc | | Enter |Number2| Fn2 |
`-----------------------' `-----------------------'
@@ -109,9 +109,9 @@ Persistent default layer has been enabled for Colemak and QWERTY. The gaming/va
|--------+------+------+------+------+------| |------+------+------+------+------+--------|
| | | | Up | | | | | | Up |Ctrl+Y| | |
|--------+------+------+------+------+------| |------+------+------+------+------+--------|
- | |Ctrl+A| Left | Down | Right| | | PgUp | Right| Down | Left | Home | |
+ | |Ctrl+A| Left | Down | Right|C+A+Tb| | PgUp | Right| Down | Left | Home | |
|--------+------+------+------+------+------| |------+------+------+------+------+--------|
- | |Ctrl+Z|Ctrl+X|Ctrl+C|Ctrl+V| | | PgDn | Mute | Vol- | Vol+ | End | |
+ | |Ctrl+Z|Ctrl+X|Ctrl+C|Ctrl+V| Bspc | | PgDn | Mute | Vol- | Vol+ | End | |
`--------+------+------+------+------+------' `------+------+------+------+------+--------'
| | | | | | Prev | Play | Next | Stop |
`---------------------------' `---------------------------'
@@ -120,7 +120,7 @@ Persistent default layer has been enabled for Colemak and QWERTY. The gaming/va
,-------|-------|-------| |-------+-------+-------.
| | | | | | | |
| | |-------| |-------| | |
- | | | | |C+A+Tab| | |
+ | | | | | | | |
`-----------------------' `-----------------------'
@@ -150,7 +150,7 @@ Persistent default layer has been enabled for Colemak and QWERTY. The gaming/va
### Colemak gaming/vanilla
- (Limited access to Function or Numbers layers; mainly used for gaming; double-tap TD(ADJ) for one shot access to Adjust layer)
+ (Limited access to Function or Numbers layers; mainly used for gaming; double-tap and hold TD(ADJ) above LAlt to access Adjust layer)
,-----------------------------------------------------------------------------------------------------------.
| ESC | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | PScr| SLck| Paus|Numpd|Adjst|
`-----------------------------------------------------------------------------------------------------------'
@@ -175,7 +175,7 @@ Persistent default layer has been enabled for Colemak and QWERTY. The gaming/va
### QWERTY gaming/vanilla
- (Limited access to Function or Numbers layers; mainly used for gaming; double-tap TD(ADJ) for one shot access to Adjust layer)
+ (Limited access to Function or Numbers layers; mainly used for gaming; double-tap and hold TD(ADJ) above LAlt to access Adjust layer)
,-----------------------------------------------------------------------------------------------------------.
| ESC | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | PScr| SLck| Paus|Numpd|Adjst|
`-----------------------------------------------------------------------------------------------------------'
@@ -199,7 +199,7 @@ Persistent default layer has been enabled for Colemak and QWERTY. The gaming/va
`-----------------------' `-----------------------'
### Adjust layer
- (Press Enter/Number + Delete/Number2 together under non-gaming/vanilla layers; Numpad is a toggle)
+ (Press Enter/Number + Delete/Number2 under non-gaming/vanilla layers or press & hold Adjust key on function row; Numpad is a toggle)
,-----------------------------------------------------------------------------------------------------------.
| | | | | | | | | | | | | | | | | | |
`-----------------------------------------------------------------------------------------------------------'
diff --git a/keyboards/kinesis/keymaps/insertsnideremarks/rules.mk b/keyboards/kinesis/keymaps/insertsnideremarks/rules.mk
index e1af05cb44..24b16ba9b7 100644
--- a/keyboards/kinesis/keymaps/insertsnideremarks/rules.mk
+++ b/keyboards/kinesis/keymaps/insertsnideremarks/rules.mk
@@ -5,7 +5,7 @@
DEFAULT_FOLDER = kinesis/stapelberg
BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE = no # Mouse keys(+4700)
+MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
CONSOLE_ENABLE = yes # Console for debug(+400)
COMMAND_ENABLE = no # Commands for debug and configuration
@@ -15,7 +15,7 @@ MIDI_ENABLE = no # MIDI controls
AUDIO_ENABLE = no # Audio output on port C6
UNICODE_ENABLE = yes # Unicode
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
+RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
TAP_DANCE_ENABLE = yes # Enable Tap Dancing function
diff --git a/keyboards/kinesis/keymaps/milestogo/rules.mk b/keyboards/kinesis/keymaps/milestogo/rules.mk
index 9d3df5964f..93f927c7d0 100644
--- a/keyboards/kinesis/keymaps/milestogo/rules.mk
+++ b/keyboards/kinesis/keymaps/milestogo/rules.mk
@@ -13,7 +13,7 @@ MIDI_ENABLE = no # MIDI controls
AUDIO_ENABLE = no # Audio output on port C6
UNICODE_ENABLE = no # Unicode
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
+RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
ifndef QUANTUM_DIR
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
_______, _______,
_______,
diff --git a/keyboards/kinesis/keymaps/xyverz/readme.md b/keyboards/kinesis/keymaps/xyverz/readme.md
index 4f270445d8..b55100d25b 100644
--- a/keyboards/kinesis/keymaps/xyverz/readme.md
+++ b/keyboards/kinesis/keymaps/xyverz/readme.md
@@ -4,19 +4,17 @@
The Dvorak layout shown here stems from my early Kinesis years, using the Contour PS/2 with a Dvorak software layout. Because of this, the RBRC and LBRC were on opposite sides of the board in the corner keys. I've decided to continue using this layout with my QMK Kinesis.
-~~After a year of using a planck, I've become accustomed to my / and ? being above the - key, so I've decided to move my [, ], and = to the normal Advantage location and set the two keys above the - to new locations. I'll play with it for a while and see how I like it.~~ I didn't like it, so I've switched back.
-
The QWERTY layout shown here is based entirely on the Kinesis Advantage layout. The Colemak layout is merely an adaptation of that.
I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar to the default Planck layouts.
-As of August 4 2018, I've got the LEDs working ... mostly. Caps Lock and Num Lock LEDs work for me. The Scroll Lock LED does work on my keyboard, but I can't get it to work when I use the Scroll Lock key on my keyboard. I also have no idea how to get the Num Pad LED working when I switch to the Numpad layer.
+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.
## Still to do:
- * Figure out how to make the Numpad and ScrLck LEDs work properly.
+ * Figure out how to make the Numpad LED work properly.
-### Function Keys on All Layers (keypad toggles):
+### Function Keys on All Layers (`keypad` toggles to the keypad layer):
,-----------------------------------------------------------------.
| Esc | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 |
`-----------------------------------------------------------------'
@@ -94,9 +92,9 @@ As of August 4 2018, I've got the LEDs working ... mostly. Caps Lock and Num Loc
|--------+------+------+------+------+------||------+------+------+------+------+--------|
| | | | | | || | | | | | |
|--------+------+------+------+------+------||------+------+------+------+------+--------|
- | | | | | | || | Mute | Vol- | Vol+ | | |
+ | | | Mute | Vol- | Vol+ | || | | | | | |
|--------+------+------+------+------+------||------+------+------+------+------+--------|
- | | | | | | || Stop | Prev | Play | Next | Sel | |
+ | | Stop | Prev | Play | Next | Sel || | | | | | |
`--------+------+------+------+------+------'`------+------+------+------+------+--------'
| | | | | | | | | |
`---------------------------' `---------------------------'
@@ -117,12 +115,12 @@ As of August 4 2018, I've got the LEDs working ... mostly. Caps Lock and Num Loc
|--------+------+------+------+------+------||------+------+------+------+------+--------|
| 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|
+ `---------------------------' `---------------------------'
,-------------.,-------------.
| | || | |
,------|------|------||------+------+------.
diff --git a/keyboards/kinesis/keymaps/xyverz/rules.mk b/keyboards/kinesis/keymaps/xyverz/rules.mk
index 1da780b841..94dc4cdfea 100644
--- a/keyboards/kinesis/keymaps/xyverz/rules.mk
+++ b/keyboards/kinesis/keymaps/xyverz/rules.mk
@@ -2,18 +2,18 @@
# change to "no" to disable the options, or define them in the Makefile in
# the appropriate keymap folder that will get included automatically
#
-BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
+BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE = no # Mouse keys(+4700)
EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
CONSOLE_ENABLE = no # Console for debug(+400)
-COMMAND_ENABLE = yes # Commands for debug and configuration
+COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
MIDI_ENABLE = no # MIDI controls
AUDIO_ENABLE = no # Audio output on port C6
UNICODE_ENABLE = no # Unicode
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
+RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
ifndef QUANTUM_DIR