diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-05-20 19:05:01 +0200 |
---|---|---|
committer | Drashna Jaelre <drashna@live.com> | 2018-05-20 10:05:01 -0700 |
commit | c1d30e4a57019ee1cad2d4c2c71ea274ef7b2f37 (patch) | |
tree | 8256283d7a18010027ea21712d9ae2c5d105041b | |
parent | 0b591fd84394e2c07d3047fb29e734b612bfc248 (diff) | |
download | qmk_firmware-c1d30e4a57019ee1cad2d4c2c71ea274ef7b2f37.tar.gz qmk_firmware-c1d30e4a57019ee1cad2d4c2c71ea274ef7b2f37.zip |
qwerty_code_friendly: correct typos (#3002)
* qwerty_code_friendly: correct typos
* qwerty_code_friendly: right thumb for media keys
Allows for single handed media control.
-rw-r--r-- | layouts/community/ergodox/qwerty_code_friendly/keymap.c | 40 | ||||
-rw-r--r-- | layouts/community/ergodox/qwerty_code_friendly/readme.md | 24 |
2 files changed, 34 insertions, 30 deletions
diff --git a/layouts/community/ergodox/qwerty_code_friendly/keymap.c b/layouts/community/ergodox/qwerty_code_friendly/keymap.c index a3b23979a..19f73f432 100644 --- a/layouts/community/ergodox/qwerty_code_friendly/keymap.c +++ b/layouts/community/ergodox/qwerty_code_friendly/keymap.c | |||
@@ -241,7 +241,7 @@ static char cfq_word_lut_title_caps[ | |||
241 | ]; | 241 | ]; |
242 | 242 | ||
243 | #define LAYER_BASE 0 /* default layer */ | 243 | #define LAYER_BASE 0 /* default layer */ |
244 | #define LAYER_SYMB 1 /* symbols */ | 244 | #define LAYER_KPAD 1 /* keypad */ |
245 | #define LAYER_MDIA 2 /* media keys */ | 245 | #define LAYER_MDIA 2 /* media keys */ |
246 | #define LAYER_FKEY 3 /* F-Keys & Words */ | 246 | #define LAYER_FKEY 3 /* F-Keys & Words */ |
247 | 247 | ||
@@ -382,8 +382,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
382 | * | | | | | | | | | 382 | * | | | | | | | | |
383 | * '--------------------' '--------------------' | 383 | * '--------------------' '--------------------' |
384 | */ | 384 | */ |
385 | /* SYMBOLS */ | 385 | /* KEYPAD & MACRO */ |
386 | [LAYER_SYMB] = LAYOUT_ergodox_76_or_80( | 386 | [LAYER_KPAD] = LAYOUT_ergodox_76_or_80( |
387 | /* left hand */ | 387 | /* left hand */ |
388 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, M_BRACKET_IN_CBR, | 388 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, M_BRACKET_IN_CBR, |
389 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, M_ARROW_REQL, M_BRACKET_IN_PRN, | 389 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, M_ARROW_REQL, M_BRACKET_IN_PRN, |
@@ -406,25 +406,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
406 | /* Keymap 2: F-Keys, media and mouse keys | 406 | /* Keymap 2: F-Keys, media and mouse keys |
407 | * | 407 | * |
408 | * .--------------------------------------------------. .--------------------------------------------------. | 408 | * .--------------------------------------------------. .--------------------------------------------------. |
409 | * | | | | | | | | | | | | | | | | | 409 | * | | | | | | | | |Mute | | | | | | | |
410 | * |--------+------+------+------+------+------+------| |------+------+------+------+------+------+--------| | 410 | * |--------+------+------+------+------+------+------| |------+------+------+------+------+------+--------| |
411 | * | | | | MsUp | | |MWhlUp| | | | | | | | | | 411 | * | | | | MsUp | | |MWhlUp| |VolUp | | | | | | | |
412 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| | 412 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| |
413 | * | | |MsLeft|MsDown|MsRght| |------| |------| Left | Down | Up |Right | | | | 413 | * | | |MsLeft|MsDown|MsRght| |------| |------| Left | Down | Up |Right | | | |
414 | * |--------+------+------+------+------+------|MWhlDn| | |------+------+------+------+------+--------| | 414 | * |--------+------+------+------+------+------|MWhlDn| |VolDn |------+------+------+------+------+--------| |
415 | * | | | Rclk | Mclk | Lclk | | | | | | | | | | | | 415 | * | | | Rclk | Mclk | Lclk | | | | | | | | | | | |
416 | * '--------+------+------+------+------+-------------' '-------------+------+------+------+------+--------' | 416 | * '--------+------+------+------+------+-------------' '-------------+------+------+------+------+--------' |
417 | * | | | | | | | | | | | | | 417 | * | | | | | | | | | | | | |
418 | * '----------------------------------' '----------------------------------' | 418 | * '----------------------------------' '----------------------------------' |
419 | * .-------------. .-------------. | 419 | * .-------------. .-------------. |
420 | * | MRwd | MFwd | | MPrv | MNxt | | 420 | * | | | | MRwd | MFwd | |
421 | * .------+------+------| |------+------+------. | 421 | * .------+------+------| |------+------+------. |
422 | * | | | | |VolUp | | | | 422 | * | | | | | MPrv | | | |
423 | * | Mute | |------| |------| | Play | | 423 | * | | |------| |------| | Play | |
424 | * | | | | |VolDn | | | | 424 | * | | | | | MNxt | | | |
425 | * '--------------------' '--------------------' | 425 | * '--------------------' '--------------------' |
426 | */ | 426 | */ |
427 | /* MEDIA AND MOUSE */ | 427 | /* MEDIA & MOUSE */ |
428 | [LAYER_MDIA] = LAYOUT_ergodox_76_or_80( | 428 | [LAYER_MDIA] = LAYOUT_ergodox_76_or_80( |
429 | /* left hand */ | 429 | /* left hand */ |
430 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 430 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
@@ -432,18 +432,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
432 | KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, | 432 | KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, |
433 | KC_TRNS, KC_TRNS, KC_BTN2, KC_BTN3, KC_BTN1, KC_TRNS, KC_WH_D, | 433 | KC_TRNS, KC_TRNS, KC_BTN2, KC_BTN3, KC_BTN1, KC_TRNS, KC_WH_D, |
434 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 434 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
435 | KC_MRWD, KC_MFFD, | 435 | KC_TRNS, KC_TRNS, |
436 | K80(L2K0), K80(L2K1), KC_TRNS, | 436 | K80(L2K0), K80(L2K1), KC_TRNS, |
437 | KC_MUTE, KC_TRNS, KC_TRNS, | 437 | KC_TRNS, KC_TRNS, KC_TRNS, |
438 | /* right hand */ | 438 | /* right hand */ |
439 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 439 | KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
440 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 440 | KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
441 | KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_TRNS, KC_TRNS, | 441 | KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_TRNS, KC_TRNS, |
442 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 442 | KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
443 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 443 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
444 | KC_MPRV, KC_MNXT, | 444 | KC_MRWD, KC_MFFD, |
445 | KC_VOLU, K80(L2K2), K80(L1K3), | 445 | KC_MPRV, K80(L2K2), K80(L2K3), |
446 | KC_VOLD, KC_TRNS, KC_MPLY | 446 | KC_MNXT, KC_TRNS, KC_MPLY |
447 | ), | 447 | ), |
448 | /* Keymap 3: Entire Words (one for each key) | 448 | /* Keymap 3: Entire Words (one for each key) |
449 | * | 449 | * |
@@ -491,7 +491,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
491 | }; | 491 | }; |
492 | 492 | ||
493 | const uint16_t PROGMEM fn_actions[] = { | 493 | const uint16_t PROGMEM fn_actions[] = { |
494 | [1] = ACTION_LAYER_TAP_TOGGLE(LAYER_SYMB), /* FN1 - Momentary Layer 1 (Symbols) */ | 494 | [1] = ACTION_LAYER_TAP_TOGGLE(LAYER_KPAD), /* FN1 - Momentary Layer 1 (KeyPad) */ |
495 | [2] = ACTION_LAYER_TAP_TOGGLE(LAYER_MDIA), /* FN2 - Momentary Layer 2 (Media) */ | 495 | [2] = ACTION_LAYER_TAP_TOGGLE(LAYER_MDIA), /* FN2 - Momentary Layer 2 (Media) */ |
496 | [3] = ACTION_LAYER_TAP_TOGGLE(LAYER_FKEY), /* FN3 - Momentary Layer 3 (FKey's & Words) */ | 496 | [3] = ACTION_LAYER_TAP_TOGGLE(LAYER_FKEY), /* FN3 - Momentary Layer 3 (FKey's & Words) */ |
497 | }; | 497 | }; |
diff --git a/layouts/community/ergodox/qwerty_code_friendly/readme.md b/layouts/community/ergodox/qwerty_code_friendly/readme.md index d800a0a02..b93e59cf7 100644 --- a/layouts/community/ergodox/qwerty_code_friendly/readme.md +++ b/layouts/community/ergodox/qwerty_code_friendly/readme.md | |||
@@ -20,7 +20,7 @@ | |||
20 | if using keys from both sides is inconvenient - the symbol layer has macros | 20 | if using keys from both sides is inconvenient - the symbol layer has macros |
21 | at the same key locations to type matching pairs. | 21 | at the same key locations to type matching pairs. |
22 | 22 | ||
23 | - The extra space-bar on the lower-left looks like it's in an obscure location, | 23 | - The space-bar on the lower-left looks like it's in an obscure location, |
24 | however using the larger thumb cluster | 24 | however using the larger thumb cluster |
25 | ended up being more of a reach while typing. | 25 | ended up being more of a reach while typing. |
26 | 26 | ||
@@ -122,30 +122,30 @@ Notes: | |||
122 | '--------------------' '--------------------' | 122 | '--------------------' '--------------------' |
123 | ``` | 123 | ``` |
124 | 124 | ||
125 | ## Keymap 2: Keymap 2: Media and mouse keys | 125 | ## Keymap 2: Keymap 2: Media and Mouse Keys |
126 | 126 | ||
127 | ``` | 127 | ``` |
128 | .--------------------------------------------------. .--------------------------------------------------. | 128 | .--------------------------------------------------. .--------------------------------------------------. |
129 | | | | | | | | | | | | | | | | | | 129 | | | | | | | | | |Mute | | | | | | | |
130 | |--------+------+------+------+------+------+------| |------+------+------+------+------+------+--------| | 130 | |--------+------+------+------+------+------+------| |------+------+------+------+------+------+--------| |
131 | | | | | MsUp | | |MWhlUp| | | | | | | | | | 131 | | | | | MsUp | | |MWhlUp| |VolUp | | | | | | | |
132 | |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| | 132 | |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| |
133 | | | |MsLeft|MsDown|MsRght| |------| |------| Left | Down | Up |Right | | | | 133 | | | |MsLeft|MsDown|MsRght| |------| |------| Left | Down | Up |Right | | | |
134 | |--------+------+------+------+------+------|MWhlDn| | |------+------+------+------+------+--------| | 134 | |--------+------+------+------+------+------|MWhlDn| |VolDn |------+------+------+------+------+--------| |
135 | | | | Rclk | Mclk | Lclk | | | | | | | | | | | | 135 | | | | Rclk | Mclk | Lclk | | | | | | | | | | | |
136 | '--------+------+------+------+------+-------------' '-------------+------+------+------+------+--------' | 136 | '--------+------+------+------+------+-------------' '-------------+------+------+------+------+--------' |
137 | | | | | | | | | | | | | | 137 | | | | | | | | | | | | | |
138 | '----------------------------------' '----------------------------------' | 138 | '----------------------------------' '----------------------------------' |
139 | .-------------. .-------------. | 139 | .-------------. .-------------. |
140 | | MRwd | MFwd | | MPrv | MNxt | | 140 | | | | | MRwd | MFwd | |
141 | .------+------+------| |------+------+------. | 141 | .------+------+------| |------+------+------. |
142 | | | | | |VolUp | | | | 142 | | | | | | MPrv | | | |
143 | | Mute | |------| |------| | Play | | 143 | | | |------| |------| | Play | |
144 | | | | | |VolDn | | | | 144 | | | | | | MNxt | | | |
145 | '--------------------' '--------------------' | 145 | '--------------------' '--------------------' |
146 | ``` | 146 | ``` |
147 | 147 | ||
148 | ## Keymap 3: K-Keys & User defined words | 148 | ## Keymap 3: F-Keys & User Defined Words |
149 | 149 | ||
150 | This is for assigning whole words to single keys. | 150 | This is for assigning whole words to single keys. |
151 | You can define the arguments (which must be quoted) using: `CFQ_WORD_[A-Z]` | 151 | You can define the arguments (which must be quoted) using: `CFQ_WORD_[A-Z]` |
@@ -174,6 +174,10 @@ eg: `-DCFQ_WORD_E=\"my@email.com\"` | |||
174 | 174 | ||
175 | ## Changelog | 175 | ## Changelog |
176 | 176 | ||
177 | - 2018/05/19 | ||
178 | Move all media keys to right thumb cluster | ||
179 | (matching page up/down, home/end locations). | ||
180 | |||
177 | - 2018/04/14 | 181 | - 2018/04/14 |
178 | Add `CFQ_USE_80_KEYS` to optionally support an 80 key layout. | 182 | Add `CFQ_USE_80_KEYS` to optionally support an 80 key layout. |
179 | 183 | ||