aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFredric Silberberg <frsilb@microsoft.com>2017-06-15 13:49:16 -0700
committerFredric Silberberg <frsilb@microsoft.com>2017-06-23 11:07:28 -0700
commita2fbd671ad6edde77fe8f3c1a05c73c6b7056f00 (patch)
treef8ba07ed5baf4a91156228e9338557c8686b0084
parent7389beb18c557403939e60ae36b0a51b481d80a9 (diff)
downloadqmk_firmware-a2fbd671ad6edde77fe8f3c1a05c73c6b7056f00.tar.gz
qmk_firmware-a2fbd671ad6edde77fe8f3c1a05c73c6b7056f00.zip
Added a few more VS macros and another ctrl
-rw-r--r--keyboards/ergodox/keymaps/333fred/keymap.c41
1 files changed, 30 insertions, 11 deletions
diff --git a/keyboards/ergodox/keymaps/333fred/keymap.c b/keyboards/ergodox/keymaps/333fred/keymap.c
index 893ba12ea..c4f28feb0 100644
--- a/keyboards/ergodox/keymaps/333fred/keymap.c
+++ b/keyboards/ergodox/keymaps/333fred/keymap.c
@@ -31,6 +31,9 @@ enum custom_macros {
31 DEBUG_TEST, 31 DEBUG_TEST,
32 FORMAT, 32 FORMAT,
33 BUILD, 33 BUILD,
34 GO_TO_IMPL,
35 FIND_ALL_REF,
36 REMOVE_SORT_USINGS,
34 37
35 // KeePass macros 38 // KeePass macros
36 KEEPASS_OPEN, 39 KEEPASS_OPEN,
@@ -67,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
67 * ,------|------|------| |------+--------+------. 70 * ,------|------|------| |------+--------+------.
68 * | | | PgUp | | PgDn | | | 71 * | | | PgUp | | PgDn | | |
69 * | Bcksp|OSL(2)|------| |------| Ent |Space | 72 * | Bcksp|OSL(2)|------| |------| Ent |Space |
70 * | | | Del | |OSL(2)| | | 73 * | | | Del | | RCtrl| | |
71 * `--------------------' `----------------------' 74 * `--------------------' `----------------------'
72 */ 75 */
73// 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_.
@@ -88,9 +91,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
88 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,
89 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), KC_RSFT,
90 KC_LEFT,KC_DOWN,KC_UP, KC_RIGHT, KC_RGUI, 93 KC_LEFT,KC_DOWN,KC_UP, KC_RIGHT, KC_RGUI,
91 KC_RALT, CTL_T(KC_ESC), 94 KC_RALT, CTL_T(KC_ESC),
92 KC_PGDN, 95 KC_PGDN,
93 OSL(SYMB),KC_ENT, KC_SPC 96 KC_RCTL, KC_ENT, KC_SPC
94 ), 97 ),
95/* Keymap 1: Code Layer 98/* Keymap 1: Code Layer
96 * 99 *
@@ -103,12 +106,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
103 * |--------+------+------+------+------+------|ACCESS| | |------+------+------+------+------+--------| 106 * |--------+------+------+------+------+------|ACCESS| | |------+------+------+------+------+--------|
104 * | | | | | | | | | | | | | | | | 107 * | | | | | | | | | | | | | | | |
105 * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' 108 * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
106 * | | | | | | | | | | | | 109 * | | | | | | | F12 |GoToIm| FAR | | |
107 * `----------------------------------' `----------------------------------' 110 * `----------------------------------' `----------------------------------'
108 * ,-------------. ,---------------. 111 * ,-------------. ,---------------.
109 * |Format|Build | | Test | DTest | 112 * |Format|Build | | Test | DTest |
110 * ,------|------|------| |------+--------+------. 113 * ,------|------|------| |------+--------+------.
111 * | | |Refact| | | | | 114 * | | |Refact| |Sort U| | |
112 * | | |------| |------| | | 115 * | | |------| |------| | |
113 * | | | | | | | | 116 * | | | | | | | |
114 * `--------------------' `----------------------' 117 * `--------------------' `----------------------'
@@ -127,13 +130,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
127 KC_TRNS, KC_TRNS, KC_TRNS, 130 KC_TRNS, KC_TRNS, KC_TRNS,
128 // right hand 131 // right hand
129 132
130 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,
131 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,
132 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,
133 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,
134 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,
135 M(TEST), M(DEBUG_TEST), 138 M(TEST), M(DEBUG_TEST),
136 KC_TRNS, 139 M(REMOVE_SORT_USINGS),
137 KC_TRNS, KC_TRNS, KC_TRNS 140 KC_TRNS, KC_TRNS, KC_TRNS
138 ), 141 ),
139/* Keymap 2: Symbol Layer 142/* Keymap 2: Symbol Layer
@@ -324,6 +327,22 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
324 if (record->event.pressed) { 327 if (record->event.pressed) {
325 return MACRO(D(LCTL), D(LSFT), T(B), U(LSFT), U(LCTL), END); 328 return MACRO(D(LCTL), D(LSFT), T(B), U(LSFT), U(LCTL), END);
326 } 329 }
330 break;
331 case GO_TO_IMPL:
332 if (record->event.pressed) {
333 return MACRO(D(LCTL), T(F12), U(LCTL), END);
334 }
335 break;
336 case FIND_ALL_REF:
337 if (record->event.pressed) {
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;
327 case KEEPASS_OPEN: 346 case KEEPASS_OPEN:
328 if (record->event.pressed) { // Keepass open application 347 if (record->event.pressed) { // Keepass open application
329 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);