diff options
| author | Callum Oakley <c.oakley108@gmail.com> | 2017-11-26 07:09:28 +0000 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2017-11-26 02:09:28 -0500 |
| commit | 2fc727c1541a2791436b9b200dab5c6459061cdf (patch) | |
| tree | 34daad1cf5311424eac0309ff0c8f4d7f03f6313 | |
| parent | d76cc09ed64daea28edb231c3e440e871f0d57af (diff) | |
| download | qmk_firmware-2fc727c1541a2791436b9b200dab5c6459061cdf.tar.gz qmk_firmware-2fc727c1541a2791436b9b200dab5c6459061cdf.zip | |
Keymap update (#2045)
* linux shake-around
* move terminal and browser spawning keys
* add a shift to window resizing keys to free combo up for window management
* "jump to tab" shortcuts for firefox
* change window resize modifiers
* change wm keys
* change wm keys again, and reformat keymap to 80chars
* typos
* language key
* qwerty layer for SO, general cleanup
| -rw-r--r-- | keyboards/planck/keymaps/callum/keymap.c | 298 | ||||
| -rw-r--r-- | keyboards/planck/keymaps/callum/readme.md | 110 | ||||
| -rw-r--r-- | keyboards/planck/keymaps/callum/rules.mk | 6 |
3 files changed, 254 insertions, 160 deletions
diff --git a/keyboards/planck/keymaps/callum/keymap.c b/keyboards/planck/keymaps/callum/keymap.c index 98417a1c8..4758ffacf 100644 --- a/keyboards/planck/keymaps/callum/keymap.c +++ b/keyboards/planck/keymaps/callum/keymap.c | |||
| @@ -1,148 +1,246 @@ | |||
| 1 | #include "planck.h" | 1 | #include "planck.h" |
| 2 | #include "action_layer.h" | 2 | #include "action_layer.h" |
| 3 | #ifdef AUDIO_ENABLE | ||
| 4 | #include "audio.h" | ||
| 5 | #endif | ||
| 6 | #include "eeconfig.h" | ||
| 7 | 3 | ||
| 8 | extern keymap_config_t keymap_config; | 4 | extern keymap_config_t keymap_config; |
| 9 | 5 | ||
| 10 | #define _BASE 0 | 6 | #define G(X) LGUI(X) |
| 11 | #define _MOVE 1 | 7 | #define A(X) LALT(X) |
| 12 | #define _SYMB 2 | 8 | #define C(X) LCTL(X) |
| 13 | #define _MORE 3 | 9 | #define GC(X) G(C(X)) |
| 14 | #define _FUNC 4 | 10 | #define GAC(X) G(A(C(X))) |
| 15 | #define ENDASH LALT(KC_MINS) | 11 | #define _______ KC_TRNS |
| 16 | #define POUND LALT(KC_3) | 12 | #define XXXXXXX KC_NO |
| 17 | #define LDQUOT LALT(KC_LBRC) | 13 | |
| 18 | #define RDQUOT LALT(S(KC_LBRC)) | 14 | enum planck_layers { |
| 19 | #define LSQUOT LALT(KC_RBRC) | 15 | _COLEMAK, |
| 20 | #define RSQUOT LALT(S(KC_RBRC)) | 16 | _QWERTY, |
| 21 | #define H(X) LALT(LCTL(X)) | 17 | _SYMB, |
| 18 | _MOVE, | ||
| 19 | _FUNC | ||
| 20 | }; | ||
| 22 | 21 | ||
| 23 | enum planck_keycodes { | 22 | enum planck_keycodes { |
| 24 | MOVE = SAFE_RANGE, | 23 | COLEMAK = SAFE_RANGE, |
| 24 | QWERTY, | ||
| 25 | SYMB, | 25 | SYMB, |
| 26 | MOVE, | ||
| 26 | FUNC | 27 | FUNC |
| 27 | }; | 28 | }; |
| 28 | 29 | ||
| 29 | // Fillers to make layering more clear | ||
| 30 | #define _______ KC_TRNS | ||
| 31 | #define XXXXXXX KC_NO | ||
| 32 | |||
| 33 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 30 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 34 | 31 | ||
| 35 | /* BASE | 32 | /* COLEMAK |
| 36 | * ,-----------------------------------------------------------------------------------. | 33 | * ,-----------------------------------------------------------------------. |
| 37 | * | Tab | Q | W | F | P | G | J | L | U | Y | ; | - | | 34 | * |Tab | Q | W | F | P | G | J | L | U | Y | ; | - | |
| 38 | * |------+------+------+------+------+------+------+------+------+------+------+------| | 35 | * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| |
| 39 | * | Bksp | A | R | S | T | D | H | N | E | I | O | ' | | 36 | * |Bksp | A | R | S | T | D | H | N | E | I | O | ' | |
| 40 | * |------+------+------+------+------+------+------+------+------+------+------+------| | 37 | * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| |
| 41 | * | Shift| Z | X | C | V | B | K | M | , | . | / | Shift| | 38 | * |Shift| Z | X | C | V | B | K | M | , | . | / |Shift| |
| 42 | * |------+------+------+------+------+------+------+------+------+------+------+------| | 39 | * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| |
| 43 | * | Func | Ctrl | Alt | Cmd | Symb | Enter| Space| Move | Cmd | Alt | Ctrl | Func | | 40 | * |Func |Super| Alt |Ctrl |Symb |Enter|Space|Move |Ctrl | Alt |Super|Func | |
| 44 | * `-----------------------------------------------------------------------------------' | 41 | * `-----------------------------------------------------------------------' |
| 45 | */ | 42 | */ |
| 46 | [_BASE] = { | 43 | [_COLEMAK] = { |
| 47 | {KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_MINS}, | 44 | { |
| 48 | {KC_BSPC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT}, | 45 | KC_TAB, KC_Q, KC_W, KC_F, |
| 49 | {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT}, | 46 | KC_P, KC_G, KC_J, KC_L, |
| 50 | {FUNC, KC_LCTL, KC_LALT, KC_LGUI, SYMB, KC_ENT, KC_SPC, MOVE, KC_RGUI, KC_RALT, KC_RCTL, FUNC } | 47 | KC_U, KC_Y, KC_SCLN, KC_MINS |
| 48 | }, | ||
| 49 | { | ||
| 50 | KC_BSPC, KC_A, KC_R, KC_S, | ||
| 51 | KC_T, KC_D, KC_H, KC_N, | ||
| 52 | KC_E, KC_I, KC_O, KC_QUOT | ||
| 53 | }, | ||
| 54 | { | ||
| 55 | KC_LSFT, KC_Z, KC_X, KC_C, | ||
| 56 | KC_V, KC_B, KC_K, KC_M, | ||
| 57 | KC_COMM, KC_DOT, KC_SLSH, KC_RSFT | ||
| 58 | }, | ||
| 59 | { | ||
| 60 | FUNC, KC_LGUI, KC_LALT, KC_LCTL, | ||
| 61 | SYMB, KC_ENT, KC_SPC, MOVE, | ||
| 62 | KC_RCTL, KC_RALT, KC_RGUI, FUNC | ||
| 63 | } | ||
| 51 | }, | 64 | }, |
| 52 | 65 | ||
| 53 | /* MOVE | 66 | /* QWERTY |
| 54 | * ,-----------------------------------------------------------------------------------. | 67 | * ,-----------------------------------------------------------------------. |
| 55 | * | H(F7)| H(F8)| H(6) | H(5) | H(4) | H(F9)|H(F10)| Home | Up | End | H(A) | Esc | | 68 | * |Tab | Q | W | E | R | T | Y | U | I | O | P | - | |
| 56 | * |------+------+------+------+------+------+------+------+------+------+------+------| | 69 | * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| |
| 57 | * | H(F3)| H(F4)| H(3) | H(2) | H(1) | H(F5)| H(F6)| Left | Down | Right| Caps | Del | | 70 | * |Bksp | A | S | D | F | G | H | J | K | L | ; | ' | |
| 58 | * |------+------+------+------+------+------+------+------+------+------+------+------| | 71 | * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| |
| 59 | * | | H(0) | H(9) | H(8) | H(7) | H(F1)| H(F2)| Pg Dn| Pg Up|H(F11)|H(F12)| | | 72 | * |Shift| Z | X | C | V | B | N | M | , | . | / |Shift| |
| 60 | * |------+------+------+------+------+------+------+------+------+------+------+------| | 73 | * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| |
| 61 | * | | | | | | | | | | | | | | 74 | * |Func |Super| Alt |Ctrl |Symb |Enter|Space|Move |Ctrl | Alt |Super|Func | |
| 62 | * `-----------------------------------------------------------------------------------' | 75 | * `-----------------------------------------------------------------------' |
| 63 | */ | 76 | */ |
| 64 | [_MOVE] = { | 77 | [_QWERTY] = { |
| 65 | {H(KC_F7),H(KC_F8),H(KC_6), H(KC_5), H(KC_4), H(KC_F9),H(KC_F10),KC_HOME,KC_UP, KC_END, H(KC_A), KC_ESC }, | 78 | { |
| 66 | {H(KC_F3),H(KC_F4),H(KC_3), H(KC_2), H(KC_1), H(KC_F5),H(KC_F6),KC_LEFT, KC_DOWN, KC_RGHT, KC_CAPS, KC_DEL }, | 79 | KC_TAB, KC_Q, KC_W, KC_E, |
| 67 | {_______, H(KC_0), H(KC_9), H(KC_8), H(KC_7), H(KC_F1),H(KC_F2),KC_PGDN,KC_PGUP,H(KC_F11),H(KC_F12),_______}, | 80 | KC_R, KC_T, KC_Y, KC_U, |
| 68 | {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} | 81 | KC_I, KC_O, KC_P, KC_MINS |
| 82 | }, | ||
| 83 | { | ||
| 84 | KC_BSPC, KC_A, KC_S, KC_D, | ||
| 85 | KC_F, KC_G, KC_H, KC_J, | ||
| 86 | KC_K, KC_L, KC_SCLN, KC_QUOT | ||
| 87 | }, | ||
| 88 | { | ||
| 89 | KC_LSFT, KC_Z, KC_X, KC_C, | ||
| 90 | KC_V, KC_B, KC_N, KC_M, | ||
| 91 | KC_COMM, KC_DOT, KC_SLSH, KC_RSFT | ||
| 92 | }, | ||
| 93 | { | ||
| 94 | FUNC, KC_LGUI, KC_LALT, KC_LCTL, | ||
| 95 | SYMB, KC_ENT, KC_SPC, MOVE, | ||
| 96 | KC_RCTL, KC_RALT, KC_RGUI, FUNC | ||
| 97 | } | ||
| 69 | }, | 98 | }, |
| 70 | 99 | ||
| 71 | /* SYMB | 100 | /* SYMB |
| 72 | * ,-----------------------------------------------------------------------------------. | 101 | * ,-----------------------------------------------------------------------. |
| 73 | * | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | – | | 102 | * | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | | |
| 74 | * |------+------+------+------+------+------+------+------+------+------+------+------| | 103 | * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| |
| 75 | * | Del | ! | @ | # | $ | % | ^ | & | * | ( | ) | ’ | | 104 | * | Del | ! | @ | # | $ | % | ^ | & | * | ( | ) | | |
| 76 | * |------+------+------+------+------+------+------+------+------+------+------+------| | 105 | * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| |
| 77 | * | | ~ | ` | + | = | | | \ | [ | ] | { | } | | | 106 | * | | ~ | ` | + | = | | | \ | [ | ] | { | } | | |
| 78 | * |------+------+------+------+------+------+------+------+------+------+------+------| | 107 | * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| |
| 79 | * | | | | | | | | | | | | | | 108 | * | | | | | | | | | | | | | |
| 80 | * `-----------------------------------------------------------------------------------' | 109 | * `-----------------------------------------------------------------------' |
| 81 | */ | 110 | */ |
| 82 | [_SYMB] = { | 111 | [_SYMB] = { |
| 83 | {KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, ENDASH }, | 112 | { |
| 84 | {KC_DEL, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, RSQUOT }, | 113 | KC_ESC, KC_1, KC_2, KC_3, |
| 85 | {_______, KC_TILD, KC_GRV, KC_PLUS, KC_EQL, KC_PIPE, KC_BSLS, KC_LBRC, KC_RBRC, KC_LCBR, KC_RCBR, _______}, | 114 | KC_4, KC_5, KC_6, KC_7, |
| 86 | {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} | 115 | KC_8, KC_9, KC_0, _______ |
| 116 | }, | ||
| 117 | { | ||
| 118 | KC_DEL, KC_EXLM, KC_AT, KC_HASH, | ||
| 119 | KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, | ||
| 120 | KC_ASTR, KC_LPRN, KC_RPRN, _______ | ||
| 121 | }, | ||
| 122 | { | ||
| 123 | _______, KC_TILD, KC_GRV, KC_PLUS, | ||
| 124 | KC_EQL, KC_PIPE, KC_BSLS, KC_LBRC, | ||
| 125 | KC_RBRC, KC_LCBR, KC_RCBR, _______ | ||
| 126 | }, | ||
| 127 | { | ||
| 128 | _______, _______, _______, _______, | ||
| 129 | _______, _______, _______, _______, | ||
| 130 | _______, _______, _______, _______ | ||
| 131 | } | ||
| 87 | }, | 132 | }, |
| 88 | 133 | ||
| 89 | /* MORE | 134 | /* MOVE |
| 90 | * ,-----------------------------------------------------------------------------------. | 135 | * ,-----------------------------------------------------------------------. |
| 91 | * | | | | | | | | | | | | | | 136 | * | | | | | | | |Home | Up | End | | Esc | |
| 92 | * |------+------+------+------+------+------+------+------+------+------+------+------| | 137 | * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| |
| 93 | * | | | | | £ | | | | | | | | | 138 | * | | | | | | | |Left |Down |Right|Caps | Del | |
| 94 | * |------+------+------+------+------+------+------+------+------+------+------+------| | 139 | * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| |
| 95 | * | | | | | | | | “ | ” | ‘ | ’ | | | 140 | * | | | | | | | |PgDn |PgUp | | | | |
| 96 | * |------+------+------+------+------+------+------+------+------+------+------+------| | 141 | * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| |
| 97 | * | | | | | | | | | | | | | | 142 | * | | | | | | | | | | | | | |
| 98 | * `-----------------------------------------------------------------------------------' | 143 | * `-----------------------------------------------------------------------' |
| 99 | */ | 144 | */ |
| 100 | [_MORE] = { | 145 | [_MOVE] = { |
| 101 | {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX}, | 146 | { |
| 102 | {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, POUND, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX}, | 147 | GC(KC_UP), GAC(KC_1), G(KC_6), G(KC_5), |
| 103 | {_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, LDQUOT, RDQUOT, LSQUOT, RSQUOT, _______}, | 148 | G(KC_4), GAC(KC_UP), GAC(KC_RGHT), KC_HOME, |
| 104 | {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} | 149 | KC_UP, KC_END, C(KC_SPC), KC_ESC |
| 150 | }, | ||
| 151 | { | ||
| 152 | GC(KC_DOWN), GAC(KC_2), G(KC_3), G(KC_2), | ||
| 153 | G(KC_1), G(KC_F), G(KC_C), KC_LEFT, | ||
| 154 | KC_DOWN, KC_RGHT, KC_CAPS, KC_DEL | ||
| 155 | }, | ||
| 156 | { | ||
| 157 | _______, GAC(KC_3), G(KC_9), G(KC_8), | ||
| 158 | G(KC_7), GAC(KC_LEFT), GAC(KC_DOWN), KC_PGDN, | ||
| 159 | KC_PGUP, GC(KC_LEFT), GC(KC_RGHT), _______ | ||
| 160 | }, | ||
| 161 | { | ||
| 162 | _______, _______, _______, _______, | ||
| 163 | _______, _______, _______, _______, | ||
| 164 | _______, _______, _______, _______ | ||
| 165 | } | ||
| 105 | }, | 166 | }, |
| 106 | 167 | ||
| 107 | /* FUNC | 168 | /* FUNC |
| 108 | * ,-----------------------------------------------------------------------------------. | 169 | * ,-----------------------------------------------------------------------. |
| 109 | * | Reset| F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | Vol+ | | 170 | * |Reset| F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 |VolUp| |
| 110 | * |------+------+------+------+------+------+------+------+------+------+------+------| | 171 | * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| |
| 111 | * | Power| F11 | F12 | F13 | F14 | F15 | F16 | F17 | F18 | F19 | F20 | Vol- | | 172 | * |Power| F11 | F12 | F13 | F14 | F15 | F16 | F17 | F18 | F19 | F20 |VolDn| |
| 112 | * |------+------+------+------+------+------+------+------+------+------+------+------| | 173 | * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| |
| 113 | * | | F21 | F22 | F23 | F24 | | | | | | | | | 174 | * | | F21 | F22 | F23 | F24 | | | | |Clmak|Qwrty| | |
| 114 | * |------+------+------+------+------+------+------+------+------+------+------+------| | 175 | * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| |
| 115 | * | | | | | Prev | Mute | Play | Next | | | | | | 176 | * | | | | |Prev |Mute |Play |Next | | | | | |
| 116 | * `-----------------------------------------------------------------------------------' | 177 | * `-----------------------------------------------------------------------' |
| 117 | */ | 178 | */ |
| 118 | [_FUNC] = { | 179 | [_FUNC] = { |
| 119 | {RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_VOLU}, | 180 | { |
| 120 | {KC_POWER,KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_VOLD}, | 181 | RESET, KC_F1, KC_F2, KC_F3, |
| 121 | {_______, KC_F21, KC_F22, KC_F23, KC_F24, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______}, | 182 | KC_F4, KC_F5, KC_F6, KC_F7, |
| 122 | {_______, _______, _______, _______, KC_MPRV, KC_MUTE, KC_MPLY, KC_MNXT, _______, _______, _______, _______} | 183 | KC_F8, KC_F9, KC_F10, KC_VOLU |
| 184 | }, | ||
| 185 | { | ||
| 186 | KC_POWER, KC_F11, KC_F12, KC_F13, | ||
| 187 | KC_F14, KC_F15, KC_F16, KC_F17, | ||
| 188 | KC_F18, KC_F19, KC_F20, KC_VOLD | ||
| 189 | }, | ||
| 190 | { | ||
| 191 | _______, KC_F21, KC_F22, KC_F23, | ||
| 192 | KC_F24, XXXXXXX, XXXXXXX, XXXXXXX, | ||
| 193 | XXXXXXX, COLEMAK, QWERTY, _______ | ||
| 194 | }, | ||
| 195 | { | ||
| 196 | _______, _______, _______, _______, | ||
| 197 | KC_MPRV, KC_MUTE, KC_MPLY, KC_MNXT, | ||
| 198 | _______, _______, _______, _______ | ||
| 199 | } | ||
| 123 | } | 200 | } |
| 124 | 201 | ||
| 125 | }; | 202 | }; |
| 126 | 203 | ||
| 204 | #ifdef AUDIO_ENABLE | ||
| 205 | float colemak_song[][2] = SONG(COLEMAK_SOUND); | ||
| 206 | float qwerty_song[][2] = SONG(QWERTY_SOUND); | ||
| 207 | #endif | ||
| 208 | |||
| 127 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | 209 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { |
| 128 | switch (keycode) { | 210 | switch (keycode) { |
| 129 | case MOVE: | 211 | case COLEMAK: |
| 130 | if (record->event.pressed) { | 212 | if (record->event.pressed) { |
| 131 | layer_on(_MOVE); | 213 | #ifdef AUDIO_ENABLE |
| 132 | update_tri_layer(_MOVE, _SYMB, _MORE); | 214 | stop_all_notes(); |
| 133 | } else { | 215 | PLAY_SONG(colemak_song); |
| 134 | layer_off(_MOVE); | 216 | #endif |
| 135 | update_tri_layer(_MOVE, _SYMB, _MORE); | 217 | set_single_persistent_default_layer(_COLEMAK); |
| 218 | } | ||
| 219 | return false; | ||
| 220 | break; | ||
| 221 | case QWERTY: | ||
| 222 | if (record->event.pressed) { | ||
| 223 | #ifdef AUDIO_ENABLE | ||
| 224 | stop_all_notes(); | ||
| 225 | PLAY_SONG(qwerty_song); | ||
| 226 | #endif | ||
| 227 | set_single_persistent_default_layer(_QWERTY); | ||
| 136 | } | 228 | } |
| 137 | return false; | 229 | return false; |
| 138 | break; | 230 | break; |
| 139 | case SYMB: | 231 | case SYMB: |
| 140 | if (record->event.pressed) { | 232 | if (record->event.pressed) { |
| 141 | layer_on(_SYMB); | 233 | layer_on(_SYMB); |
| 142 | update_tri_layer(_MOVE, _SYMB, _MORE); | ||
| 143 | } else { | 234 | } else { |
| 144 | layer_off(_SYMB); | 235 | layer_off(_SYMB); |
| 145 | update_tri_layer(_MOVE, _SYMB, _MORE); | 236 | } |
| 237 | return false; | ||
| 238 | break; | ||
| 239 | case MOVE: | ||
| 240 | if (record->event.pressed) { | ||
| 241 | layer_on(_MOVE); | ||
| 242 | } else { | ||
| 243 | layer_off(_MOVE); | ||
| 146 | } | 244 | } |
| 147 | return false; | 245 | return false; |
| 148 | break; | 246 | break; |
diff --git a/keyboards/planck/keymaps/callum/readme.md b/keyboards/planck/keymaps/callum/readme.md index d5a689b8f..176211cd4 100644 --- a/keyboards/planck/keymaps/callum/readme.md +++ b/keyboards/planck/keymaps/callum/readme.md | |||
| @@ -4,8 +4,8 @@ This is a layout for the grid planck, built with a few ideals in mind: | |||
| 4 | 4 | ||
| 5 | - Consistent and minimal response times should be maintained. Keys that react | 5 | - Consistent and minimal response times should be maintained. Keys that react |
| 6 | differently depending on whether they are tapped or held, keys that react | 6 | differently depending on whether they are tapped or held, keys that react |
| 7 | differently if they are double tapped, etc. should be avoided – they | 7 | differently if they are double tapped, etc. should be avoided -- they |
| 8 | inevitably send their keycode later than a normal key – interrupting the | 8 | inevitably send their keycode later than a normal key -- interrupting the |
| 9 | immediate feedback from the screen. Therefore we restrict ourselves to | 9 | immediate feedback from the screen. Therefore we restrict ourselves to |
| 10 | chording as our only means of getting more than one symbol out of a single | 10 | chording as our only means of getting more than one symbol out of a single |
| 11 | physical key. | 11 | physical key. |
| @@ -17,70 +17,68 @@ This is a layout for the grid planck, built with a few ideals in mind: | |||
| 17 | - There should be two of every modifier (one on each side), otherwise certain | 17 | - There should be two of every modifier (one on each side), otherwise certain |
| 18 | long key combinations become hard to make. | 18 | long key combinations become hard to make. |
| 19 | 19 | ||
| 20 | We have five layers. A `BASE` layer, in colemak; a `MOVE` layer, with an arrow | 20 | Keys are arranged as follows. Blank keys below may actually contain |
| 21 | cluster, other movement keys, and hotkeys; a `SYMB` layer, with numbers and | 21 | undocumented shortcuts specific to my workflow. The base layer can be set to |
| 22 | symbols; a `FUNC` layer, with function keys and media keys; and a `MORE` layer, | 22 | colemak or qwerty (from the function layer). |
| 23 | with stuff that doesn’t fit anywhere else. The `MORE` layer is activated by | ||
| 24 | holding the Move and Symb keys simultaniously. | ||
| 25 | 23 | ||
| 26 | ``` | 24 | ``` |
| 27 | /* BASE | 25 | /* COLEMAK |
| 28 | * ,-----------------------------------------------------------------------------------. | 26 | * ,-----------------------------------------------------------------------. |
| 29 | * | Tab | Q | W | F | P | G | J | L | U | Y | ; | - | | 27 | * |Tab | Q | W | F | P | G | J | L | U | Y | ; | - | |
| 30 | * |------+------+------+------+------+------+------+------+------+------+------+------| | 28 | * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| |
| 31 | * | Bksp | A | R | S | T | D | H | N | E | I | O | ' | | 29 | * |Bksp | A | R | S | T | D | H | N | E | I | O | ' | |
| 32 | * |------+------+------+------+------+------+------+------+------+------+------+------| | 30 | * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| |
| 33 | * | Shift| Z | X | C | V | B | K | M | , | . | / | Shift| | 31 | * |Shift| Z | X | C | V | B | K | M | , | . | / |Shift| |
| 34 | * |------+------+------+------+------+------+------+------+------+------+------+------| | 32 | * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| |
| 35 | * | Func | Ctrl | Alt | Cmd | Symb | Enter| Space| Move | Cmd | Alt | Ctrl | Func | | 33 | * |FUNC |Super| Alt |Ctrl |SYMB |Enter|Space|MOVE |Ctrl | Alt |Super|FUNC | |
| 36 | * `-----------------------------------------------------------------------------------' | 34 | * `-----------------------------------------------------------------------' |
| 37 | */ | 35 | */ |
| 38 | 36 | ||
| 39 | /* MOVE | 37 | /* QWERTY |
| 40 | * ,-----------------------------------------------------------------------------------. | 38 | * ,-----------------------------------------------------------------------. |
| 41 | * | H(F7)| H(F8)| H(6) | H(5) | H(4) | H(F9)|H(F10)| Home | Up | End | H(A) | Esc | | 39 | * |Tab | Q | W | E | R | T | Y | U | I | O | P | - | |
| 42 | * |------+------+------+------+------+------+------+------+------+------+------+------| | 40 | * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| |
| 43 | * | H(F3)| H(F4)| H(3) | H(2) | H(1) | H(F5)| H(F6)| Left | Down | Right| Caps | Del | | 41 | * |Bksp | A | S | D | F | G | H | J | K | L | ; | ' | |
| 44 | * |------+------+------+------+------+------+------+------+------+------+------+------| | 42 | * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| |
| 45 | * | | H(0) | H(9) | H(8) | H(7) | H(F1)| H(F2)| Pg Dn| Pg Up|H(F11)|H(F12)| | | 43 | * |Shift| Z | X | C | V | B | N | M | , | . | / |Shift| |
| 46 | * |------+------+------+------+------+------+------+------+------+------+------+------| | 44 | * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| |
| 47 | * | | | | | | | | | | | | | | 45 | * |FUNC |Super| Alt |Ctrl |SYMB |Enter|Space|MOVE |Ctrl | Alt |Super|FUNC | |
| 48 | * `-----------------------------------------------------------------------------------' | 46 | * `-----------------------------------------------------------------------' |
| 49 | */ | 47 | */ |
| 50 | 48 | ||
| 51 | /* SYMB | 49 | /* SYMB |
| 52 | * ,-----------------------------------------------------------------------------------. | 50 | * ,-----------------------------------------------------------------------. |
| 53 | * | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | – | | 51 | * | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | | |
| 54 | * |------+------+------+------+------+------+------+------+------+------+------+------| | 52 | * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| |
| 55 | * | Del | ! | @ | # | $ | % | ^ | & | * | ( | ) | ’ | | 53 | * | Del | ! | @ | # | $ | % | ^ | & | * | ( | ) | | |
| 56 | * |------+------+------+------+------+------+------+------+------+------+------+------| | 54 | * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| |
| 57 | * | | ~ | ` | + | = | | | \ | [ | ] | { | } | | | 55 | * | | ~ | ` | + | = | | | \ | [ | ] | { | } | | |
| 58 | * |------+------+------+------+------+------+------+------+------+------+------+------| | 56 | * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| |
| 59 | * | | | | | | | | | | | | | | 57 | * | | | | | | | | | | | | | |
| 60 | * `-----------------------------------------------------------------------------------' | 58 | * `-----------------------------------------------------------------------' |
| 61 | */ | 59 | */ |
| 62 | 60 | ||
| 63 | /* MORE | 61 | /* MOVE |
| 64 | * ,-----------------------------------------------------------------------------------. | 62 | * ,-----------------------------------------------------------------------. |
| 65 | * | | | | | | | | | | | | | | 63 | * | | | | | | | |Home | Up | End | | Esc | |
| 66 | * |------+------+------+------+------+------+------+------+------+------+------+------| | 64 | * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| |
| 67 | * | | | | | £ | | | | | | | | | 65 | * | | | | | | | |Left |Down |Right|Caps | Del | |
| 68 | * |------+------+------+------+------+------+------+------+------+------+------+------| | 66 | * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| |
| 69 | * | | | | | | | | “ | ” | ‘ | ’ | | | 67 | * | | | | | | | |PgDn |PgUp | | | | |
| 70 | * |------+------+------+------+------+------+------+------+------+------+------+------| | 68 | * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| |
| 71 | * | | | | | | | | | | | | | | 69 | * | | | | | | | | | | | | | |
| 72 | * `-----------------------------------------------------------------------------------' | 70 | * `-----------------------------------------------------------------------' |
| 73 | */ | 71 | */ |
| 74 | 72 | ||
| 75 | /* FUNC | 73 | /* FUNC |
| 76 | * ,-----------------------------------------------------------------------------------. | 74 | * ,-----------------------------------------------------------------------. |
| 77 | * | Reset| F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | Vol+ | | 75 | * |Reset| F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 |VolUp| |
| 78 | * |------+------+------+------+------+------+------+------+------+------+------+------| | 76 | * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| |
| 79 | * | Power| F11 | F12 | F13 | F14 | F15 | F16 | F17 | F18 | F19 | F20 | Vol- | | 77 | * |Power| F11 | F12 | F13 | F14 | F15 | F16 | F17 | F18 | F19 | F20 |VolDn| |
| 80 | * |------+------+------+------+------+------+------+------+------+------+------+------| | 78 | * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| |
| 81 | * | | F21 | F22 | F23 | F24 | | | | | | | | | 79 | * | | F21 | F22 | F23 | F24 | | | | |COLMK|QWRTY| | |
| 82 | * |------+------+------+------+------+------+------+------+------+------+------+------| | 80 | * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| |
| 83 | * | | | | | Prev | Mute | Play | Next | | | | | | 81 | * | | | | |Prev |Mute |Play |Next | | | | | |
| 84 | * `-----------------------------------------------------------------------------------' | 82 | * `-----------------------------------------------------------------------' |
| 85 | */ | 83 | */ |
| 86 | ``` | 84 | ``` |
diff --git a/keyboards/planck/keymaps/callum/rules.mk b/keyboards/planck/keymaps/callum/rules.mk index 1d76966a6..8ee9a45ab 100644 --- a/keyboards/planck/keymaps/callum/rules.mk +++ b/keyboards/planck/keymaps/callum/rules.mk | |||
| @@ -1,18 +1,16 @@ | |||
| 1 | |||
| 2 | |||
| 3 | # Build Options | 1 | # Build Options |
| 4 | # change to "no" to disable the options, or define them in the Makefile in | 2 | # change to "no" to disable the options, or define them in the Makefile in |
| 5 | # the appropriate keymap folder that will get included automatically | 3 | # the appropriate keymap folder that will get included automatically |
| 6 | # | 4 | # |
| 7 | BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) | 5 | BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) |
| 8 | MOUSEKEY_ENABLE = yes # Mouse keys(+4700) | 6 | MOUSEKEY_ENABLE = no # Mouse keys(+4700) |
| 9 | EXTRAKEY_ENABLE = yes # Audio control and System control(+450) | 7 | EXTRAKEY_ENABLE = yes # Audio control and System control(+450) |
| 10 | CONSOLE_ENABLE = no # Console for debug(+400) | 8 | CONSOLE_ENABLE = no # Console for debug(+400) |
| 11 | COMMAND_ENABLE = yes # Commands for debug and configuration | 9 | COMMAND_ENABLE = yes # Commands for debug and configuration |
| 12 | NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work | 10 | NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work |
| 13 | BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality | 11 | BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality |
| 14 | MIDI_ENABLE = no # MIDI controls | 12 | MIDI_ENABLE = no # MIDI controls |
| 15 | AUDIO_ENABLE = no # Audio output on port C6 | 13 | AUDIO_ENABLE = yes # Audio output on port C6 |
| 16 | UNICODE_ENABLE = no # Unicode | 14 | UNICODE_ENABLE = no # Unicode |
| 17 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | 15 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID |
| 18 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. | 16 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. |
