diff options
| author | Fredric Silberberg <frsilb@microsoft.com> | 2017-06-09 15:01:01 -0700 |
|---|---|---|
| committer | Fredric Silberberg <frsilb@microsoft.com> | 2017-06-23 11:07:28 -0700 |
| commit | 7389beb18c557403939e60ae36b0a51b481d80a9 (patch) | |
| tree | 7aaa55ff798ab6a2f639686d648c05622cb7bc99 | |
| parent | 2b98ec67f3c2e0e408275ea6b2c90be2dbeada23 (diff) | |
| download | qmk_firmware-7389beb18c557403939e60ae36b0a51b481d80a9.tar.gz qmk_firmware-7389beb18c557403939e60ae36b0a51b481d80a9.zip | |
Small keymap layout updates
| -rw-r--r-- | keyboards/ergodox/keymaps/333fred/README.md | 14 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/333fred/config.h | 9 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/333fred/keymap.c | 34 |
3 files changed, 39 insertions, 18 deletions
diff --git a/keyboards/ergodox/keymaps/333fred/README.md b/keyboards/ergodox/keymaps/333fred/README.md index af8042d85..d3f591361 100644 --- a/keyboards/ergodox/keymaps/333fred/README.md +++ b/keyboards/ergodox/keymaps/333fred/README.md | |||
| @@ -38,7 +38,7 @@ | |||
| 38 | | | | | | | | | | | | | | 38 | | | | | | | | | | | | | |
| 39 | `----------------------------------' `----------------------------------' | 39 | `----------------------------------' `----------------------------------' |
| 40 | ,-------------. ,---------------. | 40 | ,-------------. ,---------------. |
| 41 | |Format| | | Test | DTest | | 41 | |Format|Build | | Test | DTest | |
| 42 | ,------|------|------| |------+--------+------. | 42 | ,------|------|------| |------+--------+------. |
| 43 | | | |Refact| | | | | | 43 | | | |Refact| | | | | |
| 44 | | | |------| |------| | | | 44 | | | |------| |------| | | |
| @@ -49,6 +49,7 @@ | |||
| 49 | * Refact - Visual Studio Refactor. Sends `CTRL + R, R` | 49 | * Refact - Visual Studio Refactor. Sends `CTRL + R, R` |
| 50 | * Test - Visual Studio Run Test. Sends `CTRL + R, T` | 50 | * Test - Visual Studio Run Test. Sends `CTRL + R, T` |
| 51 | * DTest - Visual Studio Debug Test. Sends `CTRL + R, CTRL + T` | 51 | * DTest - Visual Studio Debug Test. Sends `CTRL + R, CTRL + T` |
| 52 | * Build - Visualt Studio Build Solution. Sends `CTRL + SHFT + B` | ||
| 52 | 53 | ||
| 53 | ### Keymap 2: Symbol Layer | 54 | ### Keymap 2: Symbol Layer |
| 54 | ``` | 55 | ``` |
| @@ -100,11 +101,11 @@ | |||
| 100 | ,--------------------------------------------------. ,--------------------------------------------------. | 101 | ,--------------------------------------------------. ,--------------------------------------------------. |
| 101 | | | | | | | | | | | | | | | | | | 102 | | | | | | | | | | | | | | | | | |
| 102 | |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| | 103 | |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| |
| 103 | | | | | | | | | | | | | | | | | | 104 | | |KOpen |KType | | | | | | | | | | | | | |
| 104 | |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| | 105 | |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| |
| 105 | | |DLeft |DRight|LShift| | |------| |------| Left | Down | Up | Right| | | | 106 | | |DLeft |DRight|LShift| | |------| |------| Left | Down | Up | Right| | | |
| 106 | |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| | 107 | |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| |
| 107 | | |KOpen |KType | | | | | | | | | | | | | | 108 | | |SFT_TB| Tab | | | | | | | | | | | | | |
| 108 | `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' | 109 | `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' |
| 109 | | | | | | | | | | | | | | 110 | | | | | | | | | | | | | |
| 110 | `----------------------------------' `----------------------------------' | 111 | `----------------------------------' `----------------------------------' |
| @@ -116,7 +117,8 @@ | |||
| 116 | | | | | | | | | | 117 | | | | | | | | | |
| 117 | `--------------------' `--------------------' | 118 | `--------------------' `--------------------' |
| 118 | ``` | 119 | ``` |
| 119 | * DLeft - Move to the left Desktop. Sends `Ctrl + Win + Left Arrow` | 120 | * DLeft - Move to the left Desktop. Sends `Ctrl + Win + Left Arrow` |
| 120 | * DRight - Move to the right Desktop. Sends `Ctrl + Win + Right Arrow` | 121 | * DRight - Move to the right Desktop. Sends `Ctrl + Win + Right Arrow` |
| 121 | * KOpen - Opens KeePass. Sends `Ctrl + Alt + k` | 122 | * KOpen - Opens KeePass. Sends `Ctrl + Alt + k` |
| 122 | * KType - Autotypes KeePass password. Sends `Ctrl + Alt + a` | 123 | * KType - Autotypes KeePass password. Sends `Ctrl + Alt + a` |
| 124 | * 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..32d190de7 --- /dev/null +++ b/keyboards/ergodox/keymaps/333fred/config.h | |||
| @@ -0,0 +1,9 @@ | |||
| 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 | #endif | ||
diff --git a/keyboards/ergodox/keymaps/333fred/keymap.c b/keyboards/ergodox/keymaps/333fred/keymap.c index 070ad1f72..893ba12ea 100644 --- a/keyboards/ergodox/keymaps/333fred/keymap.c +++ b/keyboards/ergodox/keymaps/333fred/keymap.c | |||
| @@ -23,12 +23,14 @@ 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, | ||
| 32 | 34 | ||
| 33 | // KeePass macros | 35 | // KeePass macros |
| 34 | KEEPASS_OPEN, | 36 | KEEPASS_OPEN, |
| @@ -104,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 104 | * | | | | | | | | | | | | | 106 | * | | | | | | | | | | | | |
| 105 | * `----------------------------------' `----------------------------------' | 107 | * `----------------------------------' `----------------------------------' |
| 106 | * ,-------------. ,---------------. | 108 | * ,-------------. ,---------------. |
| 107 | * |Format| | | Test | DTest | | 109 | * |Format|Build | | Test | DTest | |
| 108 | * ,------|------|------| |------+--------+------. | 110 | * ,------|------|------| |------+--------+------. |
| 109 | * | | |Refact| | | | | | 111 | * | | |Refact| | | | | |
| 110 | * | | |------| |------| | | | 112 | * | | |------| |------| | | |
| @@ -120,9 +122,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 120 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 122 | 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, | 123 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 122 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 124 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 123 | M(FORMAT), KC_TRNS, | 125 | M(FORMAT),M(BUILD), |
| 124 | M(REFACTOR), | 126 | M(REFACTOR), |
| 125 | KC_TRNS, KC_TRNS, KC_TRNS, | 127 | KC_TRNS, KC_TRNS, KC_TRNS, |
| 126 | // right hand | 128 | // right hand |
| 127 | 129 | ||
| 128 | KC_TRNS, 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, KC_TRNS, |
| @@ -222,11 +224,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 222 | * ,--------------------------------------------------. ,--------------------------------------------------. | 224 | * ,--------------------------------------------------. ,--------------------------------------------------. |
| 223 | * | | | | | | | | | | | | | | | | | 225 | * | | | | | | | | | | | | | | | | |
| 224 | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| | 226 | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| |
| 225 | * | | | | | | | | | | | | | | | | | 227 | * | |KOpen |KType | | | | | | | | | | | | | |
| 226 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| | 228 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| |
| 227 | * | |DLeft |DRight|LShift|ACCESS| |------| |------| Left | Down | Up | Right| | | | 229 | * | |DLeft |DRight|LCTRL |ACCESS| |------| |------| Left | Down | Up | Right| | | |
| 228 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| | 230 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| |
| 229 | * | |KOpen |KType | | | | | | | | | | | | | | 231 | * | |SFT_TB| TAB | | | | | | | | | | | | | |
| 230 | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' | 232 | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' |
| 231 | * | | | | | | | | | | | | | 233 | * | | | | | | | | | | | | |
| 232 | * `----------------------------------' `----------------------------------' | 234 | * `----------------------------------' `----------------------------------' |
| @@ -234,20 +236,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 234 | * | | | | | | | 236 | * | | | | | | |
| 235 | * ,------|------|------| |------+------+------. | 237 | * ,------|------|------| |------+------+------. |
| 236 | * | | | | | | | | | 238 | * | | | | | | | | |
| 237 | * | | CTRL |------| |------| | | | 239 | * | |LSHIFT|------| |------| | | |
| 238 | * | | | | | | | | | 240 | * | | | | | | | | |
| 239 | * `--------------------' `--------------------' | 241 | * `--------------------' `--------------------' |
| 240 | */ | 242 | */ |
| 241 | // MEDIA AND MOUSE | 243 | // MEDIA AND MOUSE |
| 242 | [MOVE] = KEYMAP( | 244 | [MOVE] = KEYMAP( |
| 243 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 245 | 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, | 246 | KC_TRNS, M(KEEPASS_OPEN),M(KEEPASS_TYPE),KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 247 | KC_TRNS, M(DLEFT), M(DRIGHT), KC_LCTL, KC_TRNS, KC_TRNS, | ||
| 248 | 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, | 249 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 248 | KC_TRNS, KC_TRNS, | 250 | KC_TRNS, KC_TRNS, |
| 249 | KC_TRNS, | 251 | KC_TRNS, |
| 250 | KC_TRNS, KC_LCTRL,KC_TRNS, | 252 | KC_TRNS, KC_LSFT, KC_TRNS, |
| 251 | // right hand | 253 | // right hand |
| 252 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 254 | 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, | 255 | 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) | |||
| 291 | break; | 293 | break; |
| 292 | case PSCREEN_APP: | 294 | case PSCREEN_APP: |
| 293 | if (record->event.pressed) { | 295 | if (record->event.pressed) { |
| 294 | return MACRO(D(LALT), T(PSCR), U(LALT)); | 296 | return MACRO(D(LALT), T(PSCR), U(LALT), END); |
| 295 | } | 297 | } |
| 296 | break; | 298 | break; |
| 299 | case LSFT_TAB: | ||
| 300 | if (record->event.pressed) { | ||
| 301 | return MACRO(D(LSFT), T(TAB), U(LSFT), END); | ||
| 302 | } | ||
| 297 | case REFACTOR: | 303 | case REFACTOR: |
| 298 | if (record->event.pressed) { // VS Refactor CTRL+R, R | 304 | if (record->event.pressed) { // VS Refactor CTRL+R, R |
| 299 | return MACRO(D(LCTL), T(R), U(LCTL), T(R), END); | 305 | 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) | |||
| 314 | return MACRO(D(LCTL), T(K), T(D), U(LCTL), END); | 320 | return MACRO(D(LCTL), T(K), T(D), U(LCTL), END); |
| 315 | } | 321 | } |
| 316 | break; | 322 | break; |
| 323 | case BUILD: | ||
| 324 | if (record->event.pressed) { | ||
| 325 | return MACRO(D(LCTL), D(LSFT), T(B), U(LSFT), U(LCTL), END); | ||
| 326 | } | ||
| 317 | case KEEPASS_OPEN: | 327 | case KEEPASS_OPEN: |
| 318 | if (record->event.pressed) { // Keepass open application | 328 | if (record->event.pressed) { // Keepass open application |
| 319 | return MACRO(D(LCTL), D(LALT), T(K), U(LALT), U(LCTL), END); | 329 | return MACRO(D(LCTL), D(LALT), T(K), U(LALT), U(LCTL), END); |
