Small keymap layout updates

This commit is contained in:
Fredric Silberberg 2017-06-09 15:01:01 -07:00
parent 2b98ec67f3
commit 7389beb18c
No known key found for this signature in database
GPG Key ID: D2DE2F12CBC24B30
3 changed files with 40 additions and 19 deletions

View File

@ -38,7 +38,7 @@
| | | | | | | | | | | | | | | | | | | | | | | |
`----------------------------------' `----------------------------------' `----------------------------------' `----------------------------------'
,-------------. ,---------------. ,-------------. ,---------------.
|Format| | | Test | DTest | |Format|Build | | Test | DTest |
,------|------|------| |------+--------+------. ,------|------|------| |------+--------+------.
| | |Refact| | | | | | | |Refact| | | | |
| | |------| |------| | | | | |------| |------| | |
@ -49,6 +49,7 @@
* Refact - Visual Studio Refactor. Sends `CTRL + R, R` * Refact - Visual Studio Refactor. Sends `CTRL + R, R`
* Test - Visual Studio Run Test. Sends `CTRL + R, T` * Test - Visual Studio Run Test. Sends `CTRL + R, T`
* DTest - Visual Studio Debug Test. Sends `CTRL + R, CTRL + T` * DTest - Visual Studio Debug Test. Sends `CTRL + R, CTRL + T`
* Build - Visualt Studio Build Solution. Sends `CTRL + SHFT + B`
### Keymap 2: Symbol Layer ### Keymap 2: Symbol Layer
``` ```
@ -100,11 +101,11 @@
,--------------------------------------------------. ,--------------------------------------------------. ,--------------------------------------------------. ,--------------------------------------------------.
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
| | | | | | | | | | | | | | | | | |KOpen |KType | | | | | | | | | | | | |
|--------+------+------+------+------+------| | | |------+------+------+------+------+--------| |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
| |DLeft |DRight|LShift| | |------| |------| Left | Down | Up | Right| | | | |DLeft |DRight|LShift| | |------| |------| Left | Down | Up | Right| | |
|--------+------+------+------+------+------| | | |------+------+------+------+------+--------| |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
| |KOpen |KType | | | | | | | | | | | | | | |SFT_TB| Tab | | | | | | | | | | | | |
`--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
| | | | | | | | | | | | | | | | | | | | | | | |
`----------------------------------' `----------------------------------' `----------------------------------' `----------------------------------'
@ -116,7 +117,8 @@
| | | | | | | | | | | | | | | |
`--------------------' `--------------------' `--------------------' `--------------------'
``` ```
* DLeft - Move to the left Desktop. Sends `Ctrl + Win + Left Arrow` * DLeft - Move to the left Desktop. Sends `Ctrl + Win + Left Arrow`
* DRight - Move to the right Desktop. Sends `Ctrl + Win + Right Arrow` * DRight - Move to the right Desktop. Sends `Ctrl + Win + Right Arrow`
* KOpen - Opens KeePass. Sends `Ctrl + Alt + k` * KOpen - Opens KeePass. Sends `Ctrl + Alt + k`
* KType - Autotypes KeePass password. Sends `Ctrl + Alt + a` * KType - Autotypes KeePass password. Sends `Ctrl + Alt + a`
* SFT_TB - Sends `CTRL + TAB`.

View File

@ -0,0 +1,9 @@
#ifndef CONFIG_H_
#define CONFIG_H_
#include "../../config.h"
#undef TAPPING_TERM
#define TAPPING_TERM 150
#endif

View File

@ -23,12 +23,14 @@ enum custom_macros {
DLEFT, DLEFT,
DRIGHT, DRIGHT,
PSCREEN_APP, PSCREEN_APP,
LSFT_TAB,
// VS Macros // VS Macros
REFACTOR, REFACTOR,
TEST, TEST,
DEBUG_TEST, DEBUG_TEST,
FORMAT, FORMAT,
BUILD,
// KeePass macros // KeePass macros
KEEPASS_OPEN, KEEPASS_OPEN,
@ -104,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | | | | | | * | | | | | | | | | | | |
* `----------------------------------' `----------------------------------' * `----------------------------------' `----------------------------------'
* ,-------------. ,---------------. * ,-------------. ,---------------.
* |Format| | | Test | DTest | * |Format|Build | | Test | DTest |
* ,------|------|------| |------+--------+------. * ,------|------|------| |------+--------+------.
* | | |Refact| | | | | * | | |Refact| | | | |
* | | |------| |------| | | * | | |------| |------| | |
@ -120,9 +122,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
M(FORMAT), KC_TRNS, M(FORMAT),M(BUILD),
M(REFACTOR), M(REFACTOR),
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
// right hand // right hand
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
@ -222,11 +224,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* ,--------------------------------------------------. ,--------------------------------------------------. * ,--------------------------------------------------. ,--------------------------------------------------.
* | | | | | | | | | | | | | | | | * | | | | | | | | | | | | | | | |
* |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
* | | | | | | | | | | | | | | | |
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
* | |DLeft |DRight|LShift|ACCESS| |------| |------| Left | Down | Up | Right| | |
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
* | |KOpen |KType | | | | | | | | | | | | | * | |KOpen |KType | | | | | | | | | | | | |
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
* | |DLeft |DRight|LCTRL |ACCESS| |------| |------| Left | Down | Up | Right| | |
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
* | |SFT_TB| TAB | | | | | | | | | | | | |
* `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
* | | | | | | | | | | | | * | | | | | | | | | | | |
* `----------------------------------' `----------------------------------' * `----------------------------------' `----------------------------------'
@ -234,20 +236,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | * | | | | | |
* ,------|------|------| |------+------+------. * ,------|------|------| |------+------+------.
* | | | | | | | | * | | | | | | | |
* | | CTRL |------| |------| | | * | |LSHIFT|------| |------| | |
* | | | | | | | | * | | | | | | | |
* `--------------------' `--------------------' * `--------------------' `--------------------'
*/ */
// MEDIA AND MOUSE // MEDIA AND MOUSE
[MOVE] = KEYMAP( [MOVE] = KEYMAP(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, M(DLEFT), M(DRIGHT), KC_LSFT, KC_TRNS, KC_TRNS,
KC_TRNS, M(KEEPASS_OPEN),M(KEEPASS_TYPE),KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, M(KEEPASS_OPEN),M(KEEPASS_TYPE),KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, M(DLEFT), M(DRIGHT), KC_LCTL, KC_TRNS, KC_TRNS,
KC_TRNS, M(LSFT_TAB), KC_TAB, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS,
KC_TRNS, KC_LCTRL,KC_TRNS, KC_TRNS, KC_LSFT, KC_TRNS,
// right hand // right hand
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
@ -291,9 +293,13 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
break; break;
case PSCREEN_APP: case PSCREEN_APP:
if (record->event.pressed) { if (record->event.pressed) {
return MACRO(D(LALT), T(PSCR), U(LALT)); return MACRO(D(LALT), T(PSCR), U(LALT), END);
} }
break; break;
case LSFT_TAB:
if (record->event.pressed) {
return MACRO(D(LSFT), T(TAB), U(LSFT), END);
}
case REFACTOR: case REFACTOR:
if (record->event.pressed) { // VS Refactor CTRL+R, R if (record->event.pressed) { // VS Refactor CTRL+R, R
return MACRO(D(LCTL), T(R), U(LCTL), T(R), END); return MACRO(D(LCTL), T(R), U(LCTL), T(R), END);
@ -314,6 +320,10 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
return MACRO(D(LCTL), T(K), T(D), U(LCTL), END); return MACRO(D(LCTL), T(K), T(D), U(LCTL), END);
} }
break; break;
case BUILD:
if (record->event.pressed) {
return MACRO(D(LCTL), D(LSFT), T(B), U(LSFT), U(LCTL), END);
}
case KEEPASS_OPEN: case KEEPASS_OPEN:
if (record->event.pressed) { // Keepass open application if (record->event.pressed) { // Keepass open application
return MACRO(D(LCTL), D(LALT), T(K), U(LALT), U(LCTL), END); return MACRO(D(LCTL), D(LALT), T(K), U(LALT), U(LCTL), END);