Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
QMK Bot
commit
1182f5b4be
|
|
@ -31,6 +31,11 @@ CHANGELOG:
|
|||
0.7 - Brought code up to current standards.
|
||||
0.8 - Added MACLOCK macro.
|
||||
0.9 - Updated code to correspond to new setPinInput behaviour
|
||||
0.10 - Re-ordered the layers (swapped Destiny & WoW layers in the
|
||||
list). Removed duplicated keys from RAISE and LOWER layers.
|
||||
Updated readme.md and fixed an aesthetic typo in keymap.c.
|
||||
0.11 - Added DEL_GUI macro. Removed WOW layer since I'm no longer
|
||||
supporting Blizzard in any way.
|
||||
|
||||
TODO:
|
||||
|
||||
|
|
@ -44,12 +49,13 @@ TODO:
|
|||
// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
|
||||
#include QMK_KEYBOARD_H
|
||||
|
||||
enum layer_names { _DVORAK, _QWERTY, _COLEMAK, _WOW, _DESTINY, _LOWER, _RAISE, _ADJUST };
|
||||
enum layer_names { _DVORAK, _QWERTY, _COLEMAK, _DESTINY, _LOWER, _RAISE, _ADJUST };
|
||||
|
||||
enum atreus52_keycodes { DVORAK = SAFE_RANGE, QWERTY, COLEMAK, WOW, DESTINY, LOWER, RAISE, ADJUST };
|
||||
enum atreus62_keycodes { DVORAK = SAFE_RANGE, QWERTY, COLEMAK, DESTINY, LOWER, RAISE, ADJUST };
|
||||
|
||||
// Aliases to make the keymap clearer.
|
||||
#define CTL_ENT CTL_T(KC_ENT)
|
||||
#define DEL_GUI GUI_T(KC_DEL)
|
||||
#define LOWER MO(_LOWER)
|
||||
#define RAISE MO(_RAISE)
|
||||
#define ADJUST MO(_ADJUST)
|
||||
|
|
@ -62,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH,
|
||||
KC_GRV, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS,
|
||||
KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT,
|
||||
KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, KC_BSPC, KC_LGUI, KC_ENT, KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_RCTL
|
||||
KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, KC_BSPC, DEL_GUI, KC_ENT, KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_RCTL
|
||||
),
|
||||
|
||||
[_QWERTY] = LAYOUT ( /* qwerty */
|
||||
|
|
@ -81,14 +87,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, KC_BSPC, KC_LGUI, KC_ENT, KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_RCTL
|
||||
),
|
||||
|
||||
[_WOW] = LAYOUT ( /* Dvorak with minor modifications for playing World of Warcraft */
|
||||
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS,
|
||||
KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH,
|
||||
KC_GRV, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS,
|
||||
KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT,
|
||||
KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, KC_BSPC, KC_LALT, CTL_ENT, KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_RCTL
|
||||
),
|
||||
|
||||
[_DESTINY] = LAYOUT ( /* Dvorak with minor modifications for playing Destiny 2 and other FPS Looters */
|
||||
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS,
|
||||
KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH,
|
||||
|
|
@ -99,14 +97,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
|
||||
[_LOWER] = LAYOUT (
|
||||
KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12,
|
||||
KC_TILD, KC_GRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PIPE,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, KC_PLUS, KC_LCBR, KC_RCBR, _______,
|
||||
_______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
|
||||
_______, _______, KC_HOME, KC_END, _______, KC_DEL, MACLOCK, _______, KC_INS, _______, KC_PGUP, KC_PGDN, _______, _______
|
||||
),
|
||||
[_RAISE] = LAYOUT (
|
||||
KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12,
|
||||
KC_TILD, KC_GRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BSLS,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, KC_EQL, KC_LBRC, KC_RBRC, _______,
|
||||
_______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
|
||||
_______, _______, KC_HOME, KC_END, _______, KC_DEL, MACLOCK, _______, KC_INS, _______, KC_PGUP, KC_PGDN, _______, _______
|
||||
|
|
@ -114,7 +112,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
[_ADJUST] = LAYOUT (
|
||||
_______, _______, _______, KC_F13, KC_F14, KC_F15, _______, _______, _______, _______, _______, _______,
|
||||
_______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, QWERTY, COLEMAK, DVORAK, DESTINY, WOW,
|
||||
_______, _______, _______, _______, _______, _______, _______, QWERTY, COLEMAK, DVORAK, DESTINY, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
|
||||
),
|
||||
|
|
@ -145,12 +143,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
|||
case COLEMAK:
|
||||
set_single_persistent_default_layer(_COLEMAK);
|
||||
return false;
|
||||
case WOW:
|
||||
set_single_persistent_default_layer(_WOW);
|
||||
return false;
|
||||
case DESTINY:
|
||||
set_single_persistent_default_layer(_DESTINY);
|
||||
return false;
|
||||
case WOW:
|
||||
set_single_persistent_default_layer(_WOW);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
|
|
|
|||
|
|
@ -34,12 +34,16 @@ The bottom row is fairly Kinesis-ish since the Contour and Advantage keyboards h
|
|||
* Added MACLOCK macro.
|
||||
### 0.9
|
||||
* Updated code to correspond to new setPinInput behaviour.
|
||||
### 0.10
|
||||
* Re-ordered the layers (swapped Destiny & WoW layers in the list).
|
||||
* Removed duplicated keys from RAISE and LOWER layers.
|
||||
* Updated readme.md and fixed an aesthetic typo in keymap.c.
|
||||
### 0.11
|
||||
* Added DEL_GUI macro.
|
||||
* Removed WOW layer since I'm no longer supporting Blizzard in any way.
|
||||
|
||||
### TODO:
|
||||
|
||||
* Make the layout more efficient, even if it means changing the RAISE
|
||||
and LOWER functionality.
|
||||
* Add legends in comments for each layer. Maybe.
|
||||
* Enjoy this revision; figure out new things later.
|
||||
|
||||
### Layer 0: Dvorak layer
|
||||
|
|
@ -51,8 +55,8 @@ The bottom row is fairly Kinesis-ish since the Contour and Advantage keyboards h
|
|||
|------+------+------+------+------+------| |------+------+------+------+------+------|
|
||||
| Grv | A | O | E | U | I | | D | H | T | N | S | - |
|
||||
|------+------+------+------+------+------|------.,------|------+------+------+------+------+------|
|
||||
| Shft | ; | Q | J | K | X | Gui ||Enter | B | M | W | V | Z | Shft |
|
||||
|------+------+------+------+------+------| || |------+------+------+------+------+------|
|
||||
| Shft | ; | Q | J | K | X | Del/ ||Enter | B | M | W | V | Z | Shft |
|
||||
|------+------+------+------+------+------| Gui || |------+------+------+------+------+------|
|
||||
| Ctrl | Alt | Left | Rght | LOWER| BkSp |------'`------| Spc | RAISE| Up | Down | Gui | Ctrl |
|
||||
`-----------------------------------------' `-----------------------------------------'
|
||||
|
||||
|
|
@ -70,7 +74,7 @@ The bottom row is fairly Kinesis-ish since the Contour and Advantage keyboards h
|
|||
| Ctrl | Alt | Left | Rght | LOWER| BkSp |------'`------| Spc | RAISE| Up | Down | Gui | Ctrl |
|
||||
`-----------------------------------------' `-----------------------------------------'
|
||||
|
||||
### Keymap 2: Colemak layer
|
||||
### Layer 2: Colemak layer
|
||||
|
||||
,-----------------------------------------. ,-----------------------------------------.
|
||||
| Esc | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | - |
|
||||
|
|
@ -84,21 +88,7 @@ The bottom row is fairly Kinesis-ish since the Contour and Advantage keyboards h
|
|||
| Ctrl | Alt | Left | Rght | LOWER| BkSp |------'`------| Spc | RAISE| Up | Down | Gui | Ctrl |
|
||||
`-----------------------------------------' `-----------------------------------------'
|
||||
|
||||
### Keymap 3: WoW gaming layer
|
||||
|
||||
,-----------------------------------------. ,-----------------------------------------.
|
||||
| Esc | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | \ |
|
||||
|------+------+------+------+------+------| |------+------+------+------+------+------|
|
||||
| Tab | ' | , | . | P | Y | | F | G | C | R | L | / |
|
||||
|------+------+------+------+------+------| |------+------+------+------+------+------|
|
||||
| Grv | A | O | E | U | I | | D | H | T | N | S | - |
|
||||
|------+------+------+------+------+------|------.,------|------+------+------+------+------+------|
|
||||
| Shft | ; | Q | J | K | X | Alt ||Ctrl/ | B | M | W | V | Z | Shft |
|
||||
|------+------+------+------+------+------| ||Enter |------+------+------+------+------+------|
|
||||
| Ctrl | Alt | Left | Rght | LOWER| BkSp |------'`------| Spc | RAISE| Up | Down | Gui | Ctrl |
|
||||
`-----------------------------------------' `-----------------------------------------'
|
||||
|
||||
### Layer 4: Destiny layer
|
||||
### Layer 3: Destiny layer
|
||||
|
||||
,-----------------------------------------. ,-----------------------------------------.
|
||||
| Esc | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | \ |
|
||||
|
|
@ -112,12 +102,12 @@ The bottom row is fairly Kinesis-ish since the Contour and Advantage keyboards h
|
|||
| Ctrl | Alt | Left | Rght | LOWER| BkSp |------'`------| Spc | RAISE| Up | Down | Gui | Ctrl |
|
||||
`-----------------------------------------' `-----------------------------------------'
|
||||
|
||||
### Keymap 5: LOWER layer
|
||||
### Layer 4: LOWER layer
|
||||
|
||||
,-----------------------------------------. ,-----------------------------------------.
|
||||
| F11 | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F12 |
|
||||
|------+------+------+------+------+------| |------+------+------+------+------+------|
|
||||
| ~ | ` | | | | | | | | | | | | |
|
||||
| | | | | | | | | | | | | |
|
||||
|------+------+------+------+------+------| |------+------+------+------+------+------|
|
||||
| Caps | | Mute | Vol- | Vol+ | | | | | + | { | } | |
|
||||
|------+------+------+------+------+------|------.,------|------+------+------+------+------+------|
|
||||
|
|
@ -127,12 +117,12 @@ The bottom row is fairly Kinesis-ish since the Contour and Advantage keyboards h
|
|||
`-----------------------------------------' `-----------------------------------------'
|
||||
|
||||
|
||||
### Keymap 6: RAISE layer
|
||||
### Layer 5: RAISE layer
|
||||
|
||||
,-----------------------------------------. ,-----------------------------------------.
|
||||
| F11 | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F12 |
|
||||
|------+------+------+------+------+------| |------+------+------+------+------+------|
|
||||
| ~ | ` | | | | | | | | | | | \ |
|
||||
| | | | | | | | | | | | | |
|
||||
|------+------+------+------+------+------| |------+------+------+------+------+------|
|
||||
| Caps | | Mute | Vol- | Vol+ | | | | | = | [ | ] | |
|
||||
|------+------+------+------+------+------|------.,------|------+------+------+------+------+------|
|
||||
|
|
@ -141,14 +131,14 @@ The bottom row is fairly Kinesis-ish since the Contour and Advantage keyboards h
|
|||
| | | Home | End | | Del |------'`------| Ins | | PgUp | PgDn | | |
|
||||
`-----------------------------------------' `-----------------------------------------'
|
||||
|
||||
### Keymap 7: ADJUST layer
|
||||
### Layer 6: ADJUST layer
|
||||
|
||||
,-----------------------------------------. ,-----------------------------------------.
|
||||
| | | | | | | | | | | | | |
|
||||
|------+------+------+------+------+------| |------+------+------+------+------+------|
|
||||
| |RESET | | | | | | | | | | | |
|
||||
|------+------+------+------+------+------| |------+------+------+------+------+------|
|
||||
| | | | | | | | |Qwerty|Colemk|Dvorak| | WoW |
|
||||
| | | | | | | | |Qwerty|Colemk|Dvorak|Destny| |
|
||||
|------+------+------+------+------+------|------.,------|------+------+------+------+------+------|
|
||||
| | | | | | | || | | | | | | |
|
||||
|------+------+------+------+------+------| || |------+------+------+------+------+------|
|
||||
|
|
|
|||
Loading…
Reference in New Issue