diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2017-06-23 14:43:51 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-23 14:43:51 -0400 |
| commit | a1ce43781ab1e9709c006435f62fd25876561a5b (patch) | |
| tree | 21eda8e6bda5fc8e0be1195c187edd61765df0eb | |
| parent | 91f3a73a280fcd237bef85e3a9f7308f274d102e (diff) | |
| parent | 67944953369b3430d44bbb400220529586b947f7 (diff) | |
| download | qmk_firmware-a1ce43781ab1e9709c006435f62fd25876561a5b.tar.gz qmk_firmware-a1ce43781ab1e9709c006435f62fd25876561a5b.zip | |
Merge pull request #1421 from 333fred/update-layout
Update my layout
| -rw-r--r-- | keyboards/ergodox/keymaps/333fred/Makefile | 1 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/333fred/README.md | 38 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/333fred/config.h | 11 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/333fred/keymap.c | 117 |
4 files changed, 106 insertions, 61 deletions
diff --git a/keyboards/ergodox/keymaps/333fred/Makefile b/keyboards/ergodox/keymaps/333fred/Makefile index b977722a2..17f736458 100644 --- a/keyboards/ergodox/keymaps/333fred/Makefile +++ b/keyboards/ergodox/keymaps/333fred/Makefile | |||
| @@ -2,7 +2,6 @@ SUBPROJECT_DEFAULT = infinity | |||
| 2 | LCD_BACKLIGHT_ENABLE = yes | 2 | LCD_BACKLIGHT_ENABLE = yes |
| 3 | LCD_ENABLE = yes | 3 | LCD_ENABLE = yes |
| 4 | BACKLIGHT_ENABLE = yes | 4 | BACKLIGHT_ENABLE = yes |
| 5 | BACKLIGHT_ENABLE = yes | ||
| 6 | NKRO_ENABLE = yes | 5 | NKRO_ENABLE = yes |
| 7 | TAP_DANCE_ENABLE = yes | 6 | TAP_DANCE_ENABLE = yes |
| 8 | 7 | ||
diff --git a/keyboards/ergodox/keymaps/333fred/README.md b/keyboards/ergodox/keymaps/333fred/README.md index af8042d85..f7b4ca42f 100644 --- a/keyboards/ergodox/keymaps/333fred/README.md +++ b/keyboards/ergodox/keymaps/333fred/README.md | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | |LCTRL | F4 | F5 | LGUI | LALT | | Left | Down | Up | Right| RGUI | | 14 | |LCTRL | F4 | F5 | LGUI | LALT | | Left | Down | Up | Right| RGUI | |
| 15 | `----------------------------------' `----------------------------------' | 15 | `----------------------------------' `----------------------------------' |
| 16 | ,-------------. ,-------------. | 16 | ,-------------. ,-------------. |
| 17 | | Home | End | | Alt |Ctrl/Esc| | 17 | | Copy | Paste| | Alt |Ctrl/Esc| |
| 18 | ,------|------|------| |------+--------+------. | 18 | ,------|------|------| |------+--------+------. |
| 19 | | | | PgUp | | PgDn | | | | 19 | | | | PgUp | | PgDn | | | |
| 20 | | Bcksp|OSL(2)|------| |------| Ent |Space | | 20 | | Bcksp|OSL(2)|------| |------| Ent |Space | |
| @@ -32,23 +32,28 @@ | |||
| 32 | | | | | | | | F10 | | F11 | | | | | | | | 32 | | | | | | | | F10 | | F11 | | | | | | | |
| 33 | |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| | 33 | |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| |
| 34 | | | | | | | |------| |------| | | | | | | | 34 | | | | | | | |------| |------| | | | | | | |
| 35 | |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| | 35 | |--------+------+------+------+------+------| L2 | | |------+------+------+------+------+--------| |
| 36 | | | | | | | | | | | | | | | | | | 36 | | | | | | | | | | | | | | | | | |
| 37 | `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' | 37 | `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' |
| 38 | | | | | | | | | | | | | | 38 | | | | | | | | F12 |GoToIm| FAR | | | |
| 39 | `----------------------------------' `----------------------------------' | 39 | `----------------------------------' `----------------------------------' |
| 40 | ,-------------. ,---------------. | 40 | ,-------------. ,---------------. |
| 41 | |Format| | | Test | DTest | | 41 | |Format|Build | | Test | DTest | |
| 42 | ,------|------|------| |------+--------+------. | 42 | ,------|------|------| |------+--------+------. |
| 43 | | | |Refact| | | | | | 43 | | | |Refact| |Sort U| | | |
| 44 | | | |------| |------| | | | 44 | | | |------| |------| | | |
| 45 | | | | | | | | | | 45 | | | | | | | | | |
| 46 | `--------------------' `----------------------' | 46 | `--------------------' `----------------------' |
| 47 | ``` | 47 | ``` |
| 48 | * Build - Visualt Studio Build Solution. Sends `CTRL + SHFT + B` | ||
| 49 | * DTest - Visual Studio Debug Test. Sends `CTRL + R, CTRL + T` | ||
| 50 | * FAR - Visual Studio Find All References. Sends `CTRL + K, R` | ||
| 48 | * Format - Visual Studio Format. Sends `CTRL + K, CTRL + D` | 51 | * Format - Visual Studio Format. Sends `CTRL + K, CTRL + D` |
| 52 | * GoToIm - Visual Studio Go To Implementation. Sends `CTRL + F12` | ||
| 49 | * Refact - Visual Studio Refactor. Sends `CTRL + R, R` | 53 | * Refact - Visual Studio Refactor. Sends `CTRL + R, R` |
| 54 | * Sort U - Visual Studio Sort Usings. Sends `CTRL + R, CTRL + G` | ||
| 50 | * Test - Visual Studio Run Test. Sends `CTRL + R, T` | 55 | * Test - Visual Studio Run Test. Sends `CTRL + R, T` |
| 51 | * DTest - Visual Studio Debug Test. Sends `CTRL + R, CTRL + T` | 56 | |
| 52 | 57 | ||
| 53 | ### Keymap 2: Symbol Layer | 58 | ### Keymap 2: Symbol Layer |
| 54 | ``` | 59 | ``` |
| @@ -87,9 +92,9 @@ | |||
| 87 | | | | | Lclk | Rclk | | | | | | | | 92 | | | | | Lclk | Rclk | | | | | | | |
| 88 | `----------------------------------' `----------------------------------' | 93 | `----------------------------------' `----------------------------------' |
| 89 | ,-------------. ,-------------. | 94 | ,-------------. ,-------------. |
| 90 | | | | | Vol+ | | | 95 | | Back+| Back-| | Vol+ | | |
| 91 | ,------|------|------| |------+------+------. | 96 | ,------|------|------| |------+------+------. |
| 92 | | | | | | Vol- | | | | 97 | | | |BL_TOG| | Vol- | | | |
| 93 | | | |------| |------| PL/PS| Next | | 98 | | | |------| |------| PL/PS| Next | |
| 94 | | | | | | Back | | | | 99 | | | | | | Back | | | |
| 95 | `--------------------' `--------------------' | 100 | `--------------------' `--------------------' |
| @@ -100,23 +105,24 @@ | |||
| 100 | ,--------------------------------------------------. ,--------------------------------------------------. | 105 | ,--------------------------------------------------. ,--------------------------------------------------. |
| 101 | | | | | | | | | | | | | | | | | | 106 | | | | | | | | | | | | | | | | | |
| 102 | |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| | 107 | |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| |
| 103 | | | | | | | | | | | | | | | | | | 108 | | |KOpen |KType | | | | | | | Copy | | | | Paste| | |
| 104 | |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| | 109 | |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| |
| 105 | | |DLeft |DRight|LShift| | |------| |------| Left | Down | Up | Right| | | | 110 | | |DLeft |DRight| LCTL | | |------| |------| Left | Down | Up | Right| | | |
| 106 | |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| | 111 | |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| |
| 107 | | |KOpen |KType | | | | | | | | | | | | | | 112 | | |SFT_TB| Tab | | | | | | | | | | | | | |
| 108 | `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' | 113 | `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' |
| 109 | | | | | | | | | | | | | | 114 | | | | | | | | | | | | | |
| 110 | `----------------------------------' `----------------------------------' | 115 | `----------------------------------' `----------------------------------' |
| 111 | ,-------------. ,-------------. | 116 | ,-------------. ,-------------. |
| 112 | | | | | | | | 117 | | | | | Home | End | |
| 113 | ,------|------|------| |------+------+------. | 118 | ,------|------|------| |------+------+------. |
| 114 | | | | | | | | | | 119 | | | | | | | | | |
| 115 | | | CTRL |------| |------| | | | 120 | | | LSFT |------| |------| | | |
| 116 | | | | | | | | | | 121 | | | | | | | | | |
| 117 | `--------------------' `--------------------' | 122 | `--------------------' `--------------------' |
| 118 | ``` | 123 | ``` |
| 119 | * DLeft - Move to the left Desktop. Sends `Ctrl + Win + Left Arrow` | 124 | * DLeft - Move to the left Desktop. Sends `Ctrl + Win + Left Arrow` |
| 120 | * DRight - Move to the right Desktop. Sends `Ctrl + Win + Right Arrow` | 125 | * DRight - Move to the right Desktop. Sends `Ctrl + Win + Right Arrow` |
| 121 | * KOpen - Opens KeePass. Sends `Ctrl + Alt + k` | 126 | * KOpen - Opens KeePass. Sends `Ctrl + Alt + k` |
| 122 | * KType - Autotypes KeePass password. Sends `Ctrl + Alt + a` | 127 | * KType - Autotypes KeePass password. Sends `Ctrl + Alt + a` |
| 128 | * SFT_TB - Sends `CTRL + TAB`. | ||
diff --git a/keyboards/ergodox/keymaps/333fred/config.h b/keyboards/ergodox/keymaps/333fred/config.h new file mode 100644 index 000000000..f19a52bca --- /dev/null +++ b/keyboards/ergodox/keymaps/333fred/config.h | |||
| @@ -0,0 +1,11 @@ | |||
| 1 | #ifndef CONFIG_H_ | ||
| 2 | #define CONFIG_H_ | ||
| 3 | |||
| 4 | #include "../../config.h" | ||
| 5 | |||
| 6 | #undef TAPPING_TERM | ||
| 7 | #define TAPPING_TERM 150 | ||
| 8 | |||
| 9 | #define PERMISSIVE_HOLD | ||
| 10 | |||
| 11 | #endif | ||
diff --git a/keyboards/ergodox/keymaps/333fred/keymap.c b/keyboards/ergodox/keymaps/333fred/keymap.c index 070ad1f72..e3f95132d 100644 --- a/keyboards/ergodox/keymaps/333fred/keymap.c +++ b/keyboards/ergodox/keymaps/333fred/keymap.c | |||
| @@ -23,12 +23,17 @@ enum custom_macros { | |||
| 23 | DLEFT, | 23 | DLEFT, |
| 24 | DRIGHT, | 24 | DRIGHT, |
| 25 | PSCREEN_APP, | 25 | PSCREEN_APP, |
| 26 | LSFT_TAB, | ||
| 26 | 27 | ||
| 27 | // VS Macros | 28 | // VS Macros |
| 28 | REFACTOR, | 29 | REFACTOR, |
| 29 | TEST, | 30 | TEST, |
| 30 | DEBUG_TEST, | 31 | DEBUG_TEST, |
| 31 | FORMAT, | 32 | FORMAT, |
| 33 | BUILD, | ||
| 34 | GO_TO_IMPL, | ||
| 35 | FIND_ALL_REF, | ||
| 36 | REMOVE_SORT_USINGS, | ||
| 32 | 37 | ||
| 33 | // KeePass macros | 38 | // KeePass macros |
| 34 | KEEPASS_OPEN, | 39 | KEEPASS_OPEN, |
| @@ -61,11 +66,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 61 | * |LCTRL | F4 | F5 | LGUI | LALT | | Left | Down | Up | Right| RGUI | | 66 | * |LCTRL | F4 | F5 | LGUI | LALT | | Left | Down | Up | Right| RGUI | |
| 62 | * `----------------------------------' `----------------------------------' | 67 | * `----------------------------------' `----------------------------------' |
| 63 | * ,-------------. ,-------------. | 68 | * ,-------------. ,-------------. |
| 64 | * | Home | End | | Alt |Ctrl/Esc| | 69 | * | Copy | Paste| | Alt |Ctrl/Esc| |
| 65 | * ,------|------|------| |------+--------+------. | 70 | * ,------|------|------| |------+--------+------. |
| 66 | * | | | PgUp | | PgDn | | | | 71 | * | | | PgUp | | PgDn | | | |
| 67 | * | Bcksp|OSL(2)|------| |------| Ent |Space | | 72 | * | Bcksp|OSL(2)|------| |------| Ent |Space | |
| 68 | * | | | Del | |OSL(2)| | | | 73 | * | | | Del | | RCtrl| | | |
| 69 | * `--------------------' `----------------------' | 74 | * `--------------------' `----------------------' |
| 70 | */ | 75 | */ |
| 71 | // If it accepts an argument (i.e, is a function), it doesn't need KC_. | 76 | // If it accepts an argument (i.e, is a function), it doesn't need KC_. |
| @@ -75,20 +80,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 75 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_EQL, | 80 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_EQL, |
| 76 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(SYMB), | 81 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(SYMB), |
| 77 | KC_ESC, KC_A, KC_S, KC_D, LT(MOVE, KC_F),KC_G, | 82 | KC_ESC, KC_A, KC_S, KC_D, LT(MOVE, KC_F),KC_G, |
| 78 | KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, TG(CODE), | 83 | OSM(MOD_LSFT), CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, TG(CODE), |
| 79 | KC_LCTRL, KC_F4, KC_F5, KC_LGUI,KC_LALT, | 84 | OSM(MOD_LCTL), KC_F4, KC_F5, KC_LGUI,KC_LALT, |
| 80 | KC_HOME, KC_END, | 85 | LCTL(KC_C),LCTL(KC_V), |
| 81 | KC_PGUP, | 86 | KC_PGUP, |
| 82 | KC_BSPC,OSL(SYMB),KC_DEL, | 87 | KC_BSPC,OSL(SYMB), KC_DEL, |
| 83 | // right hand | 88 | // right hand |
| 84 | TG(CODE), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, | 89 | TG(CODE), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, |
| 85 | TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, | 90 | TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, |
| 86 | KC_H, KC_J, KC_K, KC_L, TD(TD_SEMICOLON_COLON),KC_QUOT, | 91 | KC_H, KC_J, KC_K, KC_L, TD(TD_SEMICOLON_COLON),KC_QUOT, |
| 87 | MO(MDIA), KC_N, KC_M, KC_COMM,KC_DOT, CTL_T(KC_SLSH), KC_RSFT, | 92 | MO(MDIA), KC_N, KC_M, KC_COMM,KC_DOT, CTL_T(KC_SLSH), OSM(MOD_RSFT), |
| 88 | KC_LEFT,KC_DOWN,KC_UP, KC_RIGHT, KC_RGUI, | 93 | KC_LEFT,KC_DOWN,KC_UP, KC_RIGHT, KC_RGUI, |
| 89 | KC_RALT, CTL_T(KC_ESC), | 94 | KC_RALT, CTL_T(KC_ESC), |
| 90 | KC_PGDN, | 95 | KC_PGDN, |
| 91 | OSL(SYMB),KC_ENT, KC_SPC | 96 | KC_RCTL, KC_ENT, KC_SPC |
| 92 | ), | 97 | ), |
| 93 | /* Keymap 1: Code Layer | 98 | /* Keymap 1: Code Layer |
| 94 | * | 99 | * |
| @@ -98,15 +103,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 98 | * | | | | | | | F10 | | F11 | | | | | | | | 103 | * | | | | | | | F10 | | F11 | | | | | | | |
| 99 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| | 104 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| |
| 100 | * | | | | | | |------| |------| | | | | | | | 105 | * | | | | | | |------| |------| | | | | | | |
| 101 | * |--------+------+------+------+------+------|ACCESS| | |------+------+------+------+------+--------| | 106 | * |--------+------+------+------+------+------| L2 | | |------+------+------+------+------+--------| |
| 102 | * | | | | | | | | | | | | | | | | | 107 | * | | | | | | | | | | | | | | | | |
| 103 | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' | 108 | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' |
| 104 | * | | | | | | | | | | | | | 109 | * | | | | | | | F12 |GoToIm| FAR | | | |
| 105 | * `----------------------------------' `----------------------------------' | 110 | * `----------------------------------' `----------------------------------' |
| 106 | * ,-------------. ,---------------. | 111 | * ,-------------. ,---------------. |
| 107 | * |Format| | | Test | DTest | | 112 | * |Format|Build | | Test | DTest | |
| 108 | * ,------|------|------| |------+--------+------. | 113 | * ,------|------|------| |------+--------+------. |
| 109 | * | | |Refact| | | | | | 114 | * | | |Refact| |Sort U| | | |
| 110 | * | | |------| |------| | | | 115 | * | | |------| |------| | | |
| 111 | * | | | | | | | | | 116 | * | | | | | | | | |
| 112 | * `--------------------' `----------------------' | 117 | * `--------------------' `----------------------' |
| @@ -118,20 +123,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 118 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 123 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 119 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F10, | 124 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F10, |
| 120 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 125 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 121 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 126 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TG(SYMB), |
| 122 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 127 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 123 | M(FORMAT), KC_TRNS, | 128 | M(FORMAT),M(BUILD), |
| 124 | M(REFACTOR), | 129 | M(REFACTOR), |
| 125 | KC_TRNS, KC_TRNS, KC_TRNS, | 130 | KC_TRNS, KC_TRNS, KC_TRNS, |
| 126 | // right hand | 131 | // right hand |
| 127 | 132 | ||
| 128 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 133 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 129 | KC_F11, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 134 | KC_F11, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 130 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 135 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 131 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 136 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 132 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 137 | KC_F12, M(GO_TO_IMPL),M(FIND_ALL_REF),KC_TRNS, KC_TRNS, |
| 133 | M(TEST), M(DEBUG_TEST), | 138 | M(TEST), M(DEBUG_TEST), |
| 134 | KC_TRNS, | 139 | M(REMOVE_SORT_USINGS), |
| 135 | KC_TRNS, KC_TRNS, KC_TRNS | 140 | KC_TRNS, KC_TRNS, KC_TRNS |
| 136 | ), | 141 | ), |
| 137 | /* Keymap 2: Symbol Layer | 142 | /* Keymap 2: Symbol Layer |
| @@ -142,7 +147,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 142 | * | | ! | @ | ( | ) | | |ACCESS| |ACCESS| Up | 7 | 8 | 9 | * | F12 | | 147 | * | | ! | @ | ( | ) | | |ACCESS| |ACCESS| Up | 7 | 8 | 9 | * | F12 | |
| 143 | * |---------+------+------+------+------+------| | | |------+------+------+------+------+--------| | 148 | * |---------+------+------+------+------+------| | | |------+------+------+------+------+--------| |
| 144 | * | | # | $ | { | } | ` |------| |------| Down | 4 | 5 | 6 | + | | | 149 | * | | # | $ | { | } | ` |------| |------| Down | 4 | 5 | 6 | + | | |
| 145 | * |---------+------+------+------+------+------| | | |------+------+------+------+------+--------| | 150 | * |---------+------+------+------+------+------|ACCESS| | |------+------+------+------+------+--------| |
| 146 | * | | % | ^ | [ | ] | ~ | | | | & | 1 | 2 | 3 | \ | | | 151 | * | | % | ^ | [ | ] | ~ | | | | & | 1 | 2 | 3 | \ | | |
| 147 | * `---------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' | 152 | * `---------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' |
| 148 | * | EPRM | | | | | | 0 | 0 | . | = | | | 153 | * | EPRM | | | | | | 0 | 0 | . | = | | |
| @@ -190,9 +195,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 190 | * | | | | Lclk | Rclk | | | | | | | | 195 | * | | | | Lclk | Rclk | | | | | | | |
| 191 | * `----------------------------------' `----------------------------------' | 196 | * `----------------------------------' `----------------------------------' |
| 192 | * ,-------------. ,-------------. | 197 | * ,-------------. ,-------------. |
| 193 | * | | | | Vol+ | | | 198 | * | Back+| Back-| | Vol+ | | |
| 194 | * ,------|------|------| |------+------+------. | 199 | * ,------|------|------| |------+------+------. |
| 195 | * | | | | | Vol- | | | | 200 | * | | |BackTg| | Vol- | | | |
| 196 | * | | |------| |------| PL/PS| Next | | 201 | * | | |------| |------| PL/PS| Next | |
| 197 | * | | | | | Back | | | | 202 | * | | | | | Back | | | |
| 198 | * `--------------------' `--------------------' | 203 | * `--------------------' `--------------------' |
| @@ -204,8 +209,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 204 | KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, | 209 | KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, |
| 205 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 210 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 206 | KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2, | 211 | KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2, |
| 207 | KC_TRNS, KC_TRNS, | 212 | BL_INC, BL_DEC, |
| 208 | KC_TRNS, | 213 | BL_TOGG, |
| 209 | KC_TRNS, KC_TRNS, KC_TRNS, | 214 | KC_TRNS, KC_TRNS, KC_TRNS, |
| 210 | // right hand | 215 | // right hand |
| 211 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 216 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| @@ -222,39 +227,39 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 222 | * ,--------------------------------------------------. ,--------------------------------------------------. | 227 | * ,--------------------------------------------------. ,--------------------------------------------------. |
| 223 | * | | | | | | | | | | | | | | | | | 228 | * | | | | | | | | | | | | | | | | |
| 224 | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| | 229 | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| |
| 225 | * | | | | | | | | | | | | | | | | | 230 | * | |KOpen |KType | | | | | | | Copy | | | | Paste| | |
| 226 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| | 231 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| |
| 227 | * | |DLeft |DRight|LShift|ACCESS| |------| |------| Left | Down | Up | Right| | | | 232 | * | |DLeft |DRight|LCTRL |ACCESS| |------| |------| Left | Down | Up | Right| | | |
| 228 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| | 233 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| |
| 229 | * | |KOpen |KType | | | | | | | | | | | | | | 234 | * | |SFT_TB| TAB | | | | | | | | | | | | | |
| 230 | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' | 235 | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' |
| 231 | * | | | | | | | | | | | | | 236 | * | | | | | | | | | | | | |
| 232 | * `----------------------------------' `----------------------------------' | 237 | * `----------------------------------' `----------------------------------' |
| 233 | * ,-------------. ,-------------. | 238 | * ,-------------. ,-------------. |
| 234 | * | | | | | | | 239 | * | | | | Home | End | |
| 235 | * ,------|------|------| |------+------+------. | 240 | * ,------|------|------| |------+------+------. |
| 236 | * | | | | | | | | | 241 | * | | | | | | | | |
| 237 | * | | CTRL |------| |------| | | | 242 | * | |LSHIFT|------| |------| | | |
| 238 | * | | | | | | | | | 243 | * | | | | | | | | |
| 239 | * `--------------------' `--------------------' | 244 | * `--------------------' `--------------------' |
| 240 | */ | 245 | */ |
| 241 | // MEDIA AND MOUSE | 246 | // MEDIA AND MOUSE |
| 242 | [MOVE] = KEYMAP( | 247 | [MOVE] = KEYMAP( |
| 243 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 248 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 244 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
| 245 | KC_TRNS, M(DLEFT), M(DRIGHT), KC_LSFT, KC_TRNS, KC_TRNS, | ||
| 246 | KC_TRNS, M(KEEPASS_OPEN),M(KEEPASS_TYPE),KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 249 | KC_TRNS, M(KEEPASS_OPEN),M(KEEPASS_TYPE),KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 250 | KC_TRNS, M(DLEFT), M(DRIGHT), KC_LCTL, KC_TRNS, KC_TRNS, | ||
| 251 | KC_TRNS, M(LSFT_TAB), KC_TAB, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
| 247 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 252 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 248 | KC_TRNS, KC_TRNS, | 253 | KC_TRNS, KC_TRNS, |
| 249 | KC_TRNS, | 254 | KC_TRNS, |
| 250 | KC_TRNS, KC_LCTRL,KC_TRNS, | 255 | KC_TRNS, KC_LSFT, KC_TRNS, |
| 251 | // right hand | 256 | // right hand |
| 252 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 257 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 253 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 258 | KC_TRNS, LCTL(KC_C),KC_TRNS, KC_TRNS, KC_TRNS, LCTL(KC_V),KC_TRNS, |
| 254 | KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT,KC_TRNS, KC_TRNS, | 259 | KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT,KC_TRNS, KC_TRNS, |
| 255 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 260 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 256 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 261 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 257 | KC_TRNS, KC_TRNS, | 262 | KC_HOME, KC_END, |
| 258 | KC_TRNS, | 263 | KC_TRNS, |
| 259 | KC_TRNS, KC_TRNS, KC_TRNS | 264 | KC_TRNS, KC_TRNS, KC_TRNS |
| 260 | 265 | ||
| @@ -291,9 +296,13 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | |||
| 291 | break; | 296 | break; |
| 292 | case PSCREEN_APP: | 297 | case PSCREEN_APP: |
| 293 | if (record->event.pressed) { | 298 | if (record->event.pressed) { |
| 294 | return MACRO(D(LALT), T(PSCR), U(LALT)); | 299 | return MACRO(D(LALT), T(PSCR), U(LALT), END); |
| 295 | } | 300 | } |
| 296 | break; | 301 | break; |
| 302 | case LSFT_TAB: | ||
| 303 | if (record->event.pressed) { | ||
| 304 | return MACRO(D(LSFT), T(TAB), U(LSFT), END); | ||
| 305 | } | ||
| 297 | case REFACTOR: | 306 | case REFACTOR: |
| 298 | if (record->event.pressed) { // VS Refactor CTRL+R, R | 307 | if (record->event.pressed) { // VS Refactor CTRL+R, R |
| 299 | return MACRO(D(LCTL), T(R), U(LCTL), T(R), END); | 308 | return MACRO(D(LCTL), T(R), U(LCTL), T(R), END); |
| @@ -314,6 +323,26 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | |||
| 314 | return MACRO(D(LCTL), T(K), T(D), U(LCTL), END); | 323 | return MACRO(D(LCTL), T(K), T(D), U(LCTL), END); |
| 315 | } | 324 | } |
| 316 | break; | 325 | break; |
| 326 | case BUILD: | ||
| 327 | if (record->event.pressed) { // VS Build. Sends CTRL+SHFT+B | ||
| 328 | return MACRO(D(LCTL), D(LSFT), T(B), U(LSFT), U(LCTL), END); | ||
| 329 | } | ||
| 330 | break; | ||
| 331 | case GO_TO_IMPL: | ||
| 332 | if (record->event.pressed) { // VS Go To Implementation. Sends CTRL+F12 | ||
| 333 | return MACRO(D(LCTL), T(F12), U(LCTL), END); | ||
| 334 | } | ||
| 335 | break; | ||
| 336 | case FIND_ALL_REF: | ||
| 337 | if (record->event.pressed) { // VS Find All References. Sends CTRL+K, R | ||
| 338 | return MACRO(D(LCTL), T(K), U(LCTL), T(R), END); | ||
| 339 | } | ||
| 340 | break; | ||
| 341 | case REMOVE_SORT_USINGS: | ||
| 342 | if (record->event.pressed) { | ||
| 343 | return MACRO(D(LCTL), T(R), T(G), U(LCTL), END); | ||
| 344 | } | ||
| 345 | break; | ||
| 317 | case KEEPASS_OPEN: | 346 | case KEEPASS_OPEN: |
| 318 | if (record->event.pressed) { // Keepass open application | 347 | if (record->event.pressed) { // Keepass open application |
| 319 | return MACRO(D(LCTL), D(LALT), T(K), U(LALT), U(LCTL), END); | 348 | return MACRO(D(LCTL), D(LALT), T(K), U(LALT), U(LCTL), END); |
