me/qmk_firmware
1
0
Fork 0
forked from mirror/qmk_firmware
Code Pull Requests Activity

Changes to Sol layout

Browse Source 
Bringing my Sol layout more in line with my other Orthos.
This commit is contained in:
Ian Sterling
2019-03-20 21:26:16 -07:00
parent 56224b7bb6
commit c8712477a2
1 changed files with 68 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

151
keyboards/sol/keymaps/xyverz/keymap.c
View File

@@ -26,6 +26,8 @@ enum layer_number {
_DESTINY,
_QWERTY,
_COLEMAK,
_LOWER,
_RAISE,
_ADJ
};
@@ -34,6 +36,8 @@ enum custom_keycodes {
DESTINY,
QWERTY,
COLEMAK,
LOWER,
RAISE,
ADJ,
BACKLIT,
RGBRST
@@ -46,100 +50,60 @@ enum macro_keycodes {
#define XXXXXXX KC_NO
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Dvorak
* ,------------------------------------------------. ,------------------------------------------------.
* | | | | | | | | | | | | | | | |
* |------+------+------+------+------+------|------| |------|------+------+------+------+------+------|
* | | " | , | . | P | Y | | | | F | G | C | R | L | |
* |------+------+------+------+------+------|------| |------|------+------+------+------+------+------|
* | | A | O | E | U | I | | | | D | H | T | N | S | - |
* |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
* | | ; | Q | J | K | X | | | | B | M | W | V | Z | |
* |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
* | | | | | | | | | | | | | | | |
* `------+------+------+------+------+------+------| |------+------+------+------+------+------+------'
* | | | | | |
* `-------------' `--------=----'
*/
[_DVORAK] = LAYOUT( \
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_MINS, KC_EQL, 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_LBRC, KC_RBRC, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, \
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_HOME, KC_PGUP, 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_END, KC_PGDN, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, \
KC_RCTL, KC_A, KC_O, KC_E, KC_U, KC_I, XXXXXXX, XXXXXXX, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, \
KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, XXXXXXX, XXXXXXX, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, \
ADJ, KC_RGUI, KC_GRV, KC_LEFT, KC_RGHT, KC_LCTL, KC_LALT, KC_RALT, KC_RCTL, KC_UP, KC_DOWN, KC_SLSH, KC_RGUI, ADJ, \
KC_VOLU, KC_VOLD, KC_BSPC, KC_RGUI, KC_ENT, KC_SPC, KC_VOLU, KC_VOLD \
KC_GRV, KC_RGUI, KC_LEFT, KC_RGHT, LOWER, KC_LCTL, KC_LALT, KC_RALT, KC_RCTL, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_RCTL, \
XXXXXXX, XXXXXXX, KC_BSPC, KC_RGUI, KC_ENT, KC_SPC, XXXXXXX, XXXXXXX \
),
/* Destiny
* ,------------------------------------------------. ,------------------------------------------------.
* | | | | | | | | | | | | | | | |
* |------+------+------+------+------+------|------| |------|------+------+------+------+------+------|
* | | " | , | . | P | Y | | | | F | G | C | R | L | |
* |------+------+------+------+------+------|------| |------|------+------+------+------+------+------|
* | | A | O | E | U | I | | | | D | H | T | N | S | - |
* |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
* | | ; | Q | J | K | X | | | | B | M | W | V | Z | |
* |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
* | | | | | | | | | | | | | | | |
* `------+------+------+------+------+------+------| |------+------+------+------+------+------+------'
* | | | | | |
* `-------------' `--------=----'
*/
[_DESTINY] = LAYOUT( \
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_MINS, KC_EQL, 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_LBRC, KC_RBRC, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, \
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_HOME, KC_PGUP, 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_END, KC_PGDN, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, \
KC_RCTL, KC_A, KC_O, KC_E, KC_U, KC_I, XXXXXXX, XXXXXXX, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, \
KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, XXXXXXX, XXXXXXX, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, \
ADJ, KC_RGUI, KC_GRV, KC_LEFT, KC_RGHT, KC_LCTL, KC_LALT, KC_RALT, KC_RCTL, KC_UP, KC_DOWN, KC_SLSH, KC_RGUI, ADJ, \
KC_VOLU, KC_VOLD, KC_BSPC, KC_DEL, KC_ENT, KC_SPC, KC_VOLU, KC_VOLD \
KC_GRV, KC_RGUI, KC_LEFT, KC_RGHT, LOWER, KC_LCTL, KC_LALT, KC_RALT, KC_RCTL, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_RCTL, \
XXXXXXX, XXXXXXX, KC_BSPC, KC_DEL, KC_ENT, KC_SPC, XXXXXXX, XXXXXXX \
), /* Qwerty
* ,------------------------------------------------. ,------------------------------------------------.
* | | | | | | | | | | | | | | | |
* |------+------+------+------+------+------|------| |------|------+------+------+------+------+------|
* | | Q | W | E | R | T | | | | Y | U | I | O | P | |
* |------+------+------+------+------+------|------| |------|------+------+------+------+------+------|
* | | A | S | D | F | G | | | | H | J | K | L | ; | ' |
* |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
* | | Z | X | C | V | B | | | | N | M | , | . | / | |
* |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
* | | | | | | | | | | | | | | | |
* `------+------+------+------+------+------+------| |------+------+------+------+------+------+------'
* | | | | | |
* `-------------' `--------=----'
*/
),
[_QWERTY] = LAYOUT( \
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_MINS, KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, \
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC, KC_RBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_SLSH, \
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_HOME, KC_PGUP, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, \
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_END, KC_PGDN, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_SLSH, \
KC_RCTL, KC_A, KC_S, KC_D, KC_F, KC_G, XXXXXXX, XXXXXXX, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, XXXXXXX, XXXXXXX, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \
ADJ, KC_RGUI, KC_GRV, KC_LEFT, KC_RGHT, KC_LCTL, KC_LALT, KC_RALT, KC_RCTL, KC_UP, KC_DOWN, KC_SLSH, KC_RGUI, ADJ, \
KC_VOLU, KC_VOLD, KC_BSPC, KC_DEL, KC_ENT, KC_SPC, KC_VOLU, KC_VOLD \
),
KC_GRV, KC_RGUI, KC_LEFT, KC_RGHT, LOWER, KC_LCTL, KC_LALT, KC_RALT, KC_RCTL, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_RCTL, \
XXXXXXX, XXXXXXX, KC_BSPC, KC_DEL, KC_ENT, KC_SPC, XXXXXXX, XXXXXXX \
),
/* Colemak
* ,------------------------------------------------. ,------------------------------------------------.
* | | | | | | | | | | | | | | | |
* |------+------+------+------+------+------|------| |------|------+------+------+------+------+------|
* | | Q | W | F | P | G | | | | J | L | U | Y | ; | |
* |------+------+------+------+------+------|------| |------|------+------+------+------+------+------|
* | | A | R | S | T | D | | | | H | N | E | I | O | |
* |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
* | | Z | X | C | V | B | | | | K | M | , | . | / | |
* |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
* | | | | | | | | | | | | | | | |
* `------+------+------+------+------+------+------| |------+------+------+------+------+------+------'
* | | | | | |
* `-------------' `--------=----'
*/
[_COLEMAK] = LAYOUT( \
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_MINS, KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, \
KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_LBRC, KC_RBRC, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_SLSH, \
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_HOME, KC_PGUP, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, \
KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_END, KC_PGDN, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_SLSH, \
KC_RCTL, KC_A, KC_R, KC_S, KC_T, KC_G, XXXXXXX, XXXXXXX, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, \
KC_LSFT, KC_Z, KC_X, KC_C, KC_D, KC_V, XXXXXXX, XXXXXXX, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \
ADJ, KC_RGUI, KC_GRV, KC_LEFT, KC_RGHT, KC_LCTL, KC_LALT, KC_RALT, KC_RCTL, KC_UP, KC_DOWN, KC_SLSH, KC_RGUI, ADJ, \
KC_VOLU, KC_VOLD, KC_BSPC, KC_DEL, KC_ENT, KC_SPC, KC_VOLU, KC_VOLD \
KC_GRV, KC_RGUI, KC_LEFT, KC_RGHT, LOWER, KC_LCTL, KC_LALT, KC_RALT, KC_RCTL, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_RCTL, \
XXXXXXX, XXXXXXX, KC_BSPC, KC_DEL, KC_ENT, KC_SPC, XXXXXXX, XXXXXXX \
),
[_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_CAPS, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, XXXXXXX, XXXXXXX, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \
_______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______, _______, \
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
XXXXXXX, XXXXXXX, KC_DEL, _______, _______, KC_INS, XXXXXXX, XXXXXXX \
),
[_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_CAPS, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, XXXXXXX, XXXXXXX, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \
_______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______, _______, \
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
XXXXXXX, XXXXXXX, KC_DEL, _______, _______, KC_INS, XXXXXXX, XXXXXXX \
),
/* ADJ
@@ -159,12 +123,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[_ADJ] = LAYOUT( \
KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, RESET, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12, \
_______, _______, QWERTY, COLEMAK, DVORAK, DESTINY, _______, _______, _______, KC_PSCR, KC_SLCK, KC_NLCK, _______, _______, \
KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, XXXXXXX, XXXXXXX, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, \
_______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, XXXXXXX, XXXXXXX, _______, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, _______, \
_______, _______, _______, KC_HOME, KC_END, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______, _______, _______, \
KC_VOLU, KC_VOLD, KC_DEL, _______, _______, KC_INS, KC_VOLU, KC_VOLD \
_______, _______, _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, _______, _______, \
_______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_NLCK, _______, _______, \
KC_CAPS, _______, QWERTY, COLEMAK, DVORAK, DESTINY, XXXXXXX, XXXXXXX, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, \
_______, _______, _______, _______, _______, _______, XXXXXXX, XXXXXXX, _______, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, _______, \
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
XXXXXXX, XXXXXXX, KC_DEL, _______, _______, KC_INS, XXXXXXX, XXXXXXX \
)
};
@@ -219,6 +183,27 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
return false;
break;
case LOWER:
if (record->event.pressed) {
layer_on(_LOWER);
update_tri_layer(_LOWER, _RAISE, _ADJ);
} else {
layer_off(_LOWER);
update_tri_layer(_LOWER, _RAISE, _ADJ);
}
return false;
break;
case RAISE:
if (record->event.pressed) {
layer_on(_RAISE);
update_tri_layer(_LOWER, _RAISE, _ADJ);
} else {
layer_off(_RAISE);
update_tri_layer(_LOWER, _RAISE, _ADJ);
}
return false;
break;
/*
Commenting this out since I removed the layer, but I want this in here for reference.