Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Atreus62update #17179

Merged
merged 11 commits into from
May 23, 2022
Merged

Atreus62update #17179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f7f46a5
Minor Fixes
Dec 9, 2020
7a56c23
Minor Fixes
Dec 9, 2020
1be5f97
Minor Tweaks
Dec 9, 2020
9cd89ab
Added DEL_GUI to mac keymap.
iansterlingaaa Jun 24, 2021
d807332
Merge branch 'atreus62update' of https://github.com/Xyverz/qmk_firmwa…
Jul 2, 2021
8baec06
Merge remote-tracking branch 'origin/master' into atreus62update
Jul 2, 2021
b17f15f
Merge remote-tracking branch 'origin/master' into atreus62update
Xyverz Jul 4, 2021
9537035
Merge branch 'atreus62update' of https://github.com/Xyverz/qmk_firmwa…
Xyverz Jul 4, 2021
a3b0f88
Merge remote-tracking branch 'upstream/master' into atreus62update
iansterlingaaa Aug 12, 2021
44ac64b
Merge remote-tracking branch 'upstream/master' into atreus62update
iansterlingaaa Sep 8, 2021
4f15a20
Minor updates.
Xyverz May 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 15 additions & 17 deletions keyboards/atreus62/keymaps/xyverz/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@
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:

Expand All @@ -44,12 +49,13 @@
// 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)
Expand All @@ -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 */
Expand All @@ -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,
Expand All @@ -99,22 +97,22 @@ 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, _______, _______
),
[_ADJUST] = LAYOUT (
_______, _______, _______, KC_F13, KC_F14, KC_F15, _______, _______, _______, _______, _______, _______,
_______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, QWERTY, COLEMAK, DVORAK, DESTINY, WOW,
_______, _______, _______, _______, _______, _______, _______, QWERTY, COLEMAK, DVORAK, DESTINY, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
Expand Down Expand Up @@ -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;
Expand Down
44 changes: 17 additions & 27 deletions keyboards/atreus62/keymaps/xyverz/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 |
`-----------------------------------------' `-----------------------------------------'

Expand All @@ -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 | - |
Expand All @@ -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 | \ |
Expand All @@ -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+ | | | | | + | { | } | |
|------+------+------+------+------+------|------.,------|------+------+------+------+------+------|
Expand All @@ -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+ | | | | | = | [ | ] | |
|------+------+------+------+------+------|------.,------|------+------+------+------+------+------|
Expand All @@ -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| |
|------+------+------+------+------+------|------.,------|------+------+------+------+------+------|
| | | | | | | || | | | | | | |
|------+------+------+------+------+------| || |------+------+------+------+------+------|
Expand Down