aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--layouts/community/ergodox/qwerty_code_friendly/keymap.c26
-rw-r--r--layouts/community/ergodox/qwerty_code_friendly/readme.md13
m---------lib/chibios-contrib0
3 files changed, 21 insertions, 18 deletions
diff --git a/layouts/community/ergodox/qwerty_code_friendly/keymap.c b/layouts/community/ergodox/qwerty_code_friendly/keymap.c
index f882d0e00..2a441be0e 100644
--- a/layouts/community/ergodox/qwerty_code_friendly/keymap.c
+++ b/layouts/community/ergodox/qwerty_code_friendly/keymap.c
@@ -403,16 +403,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
403 KC_TRNS, K80(L1K2), K80(L1K3), 403 KC_TRNS, K80(L1K2), K80(L1K3),
404 KC_TRNS, KC_TRNS, KC_TRNS 404 KC_TRNS, KC_TRNS, KC_TRNS
405), 405),
406/* Keymap 2: Numbers, media and mouse keys 406/* Keymap 2: FKeys, media & mouse keys
407 * 407 *
408 * .--------------------------------------------------. .--------------------------------------------------. 408 * .--------------------------------------------------. .--------------------------------------------------.
409 * | | 1 | 2 | 3 | 4 | 5 | | | Mute | 6 | 7 | 8 | 9 | 0 | | 409 * | | | | | | | | | Mute | | F10 | F11 | F12 | | |
410 * |--------+------+------+------+------+------+------| |------+------+------+------+------+------+--------| 410 * |--------+------+------+------+------+------+------| |------+------+------+------+------+------+--------|
411 * | | | | MsUp | | |MWhlUp| |VolUp | | | | | | | 411 * | | | | MsUp | | |MWhlUp| |VolUp | | F7 | F8 | F9 | | |
412 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| 412 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
413 * | | |MsLeft|MsDown|MsRght| |------| |------| Left | Down | Up |Right | | | 413 * | | |MsLeft|MsDown|MsRght| |------| |------| | F4 | F5 | F6 | | |
414 * |--------+------+------+------+------+------|MWhlDn| |VolDn |------+------+------+------+------+--------| 414 * |--------+------+------+------+------+------|MWhlDn| |VolDn |------+------+------+------+------+--------|
415 * | | | Rclk | Mclk | Lclk | | | | | | | | | | | 415 * | | | Rclk | Mclk | Lclk | | | | | | F1 | F2 | F3 | | |
416 * '--------+------+------+------+------+-------------' '-------------+------+------+------+------+--------' 416 * '--------+------+------+------+------+-------------' '-------------+------+------+------+------+--------'
417 * | | | | | | | | | | | | 417 * | | | | | | | | | | | |
418 * '----------------------------------' '----------------------------------' 418 * '----------------------------------' '----------------------------------'
@@ -427,7 +427,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
427/* MEDIA, MOUSE & NUMBERS */ 427/* MEDIA, MOUSE & NUMBERS */
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_1, KC_2, KC_3, KC_4, KC_5, KC_TRNS, 430 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
431 KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_WH_U, 431 KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_WH_U,
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,
@@ -436,10 +436,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
436 K80(L2K0), K80(L2K1), KC_TRNS, 436 K80(L2K0), K80(L2K1), KC_TRNS,
437 KC_TRNS, KC_TRNS, KC_TRNS, 437 KC_TRNS, KC_TRNS, KC_TRNS,
438 /* right hand */ 438 /* right hand */
439 KC_MUTE, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS, 439 KC_MUTE, KC_TRNS, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS,
440 KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 440 KC_VOLU, KC_TRNS, KC_F7, KC_F8, KC_F9, KC_TRNS, KC_TRNS,
441 KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_TRNS, KC_TRNS, 441 KC_TRNS, KC_F4, KC_F5, KC_F6, KC_TRNS, KC_TRNS,
442 KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 442 KC_VOLD, KC_TRNS, KC_F1, KC_F2, KC_F3, 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_MRWD, KC_MFFD, 444 KC_MRWD, KC_MFFD,
445 KC_MPRV, K80(L2K2), K80(L2K3), 445 KC_MPRV, K80(L2K2), K80(L2K3),
@@ -448,7 +448,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
448/* Keymap 3: Entire Words (one for each key) 448/* Keymap 3: Entire Words (one for each key)
449 * 449 *
450 * .--------------------------------------------------. .--------------------------------------------------. 450 * .--------------------------------------------------. .--------------------------------------------------.
451 * | | F1 | F2 | F3 | F4 | F5 | F11 | | F12 | F6 | F7 | F8 | F9 | F10 | | 451 * | | 1 | 2 | 3 | 4 | 5 | | | | 6 | 7 | 8 | 9 | 0 | |
452 * |--------+------+------+------+------+------+------| |------+------+------+------+------+------+--------| 452 * |--------+------+------+------+------+------+------| |------+------+------+------+------+------+--------|
453 * | | Q | W | E | R | T | | | | Y | U | I | O | P | | 453 * | | Q | W | E | R | T | | | | Y | U | I | O | P | |
454 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| 454 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
@@ -470,7 +470,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
470/* FKEY & WORDS */ 470/* FKEY & WORDS */
471[LAYER_FKEY] = LAYOUT_ergodox_76_or_80( 471[LAYER_FKEY] = LAYOUT_ergodox_76_or_80(
472 /* left hand */ 472 /* left hand */
473 KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11, 473 KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TRNS,
474 KC_TRNS, M_WORD_Q, M_WORD_W, M_WORD_E, M_WORD_R, M_WORD_T, KC_TRNS, 474 KC_TRNS, M_WORD_Q, M_WORD_W, M_WORD_E, M_WORD_R, M_WORD_T, KC_TRNS,
475 KC_TRNS, M_WORD_A, M_WORD_S, M_WORD_D, M_WORD_F, M_WORD_G, 475 KC_TRNS, M_WORD_A, M_WORD_S, M_WORD_D, M_WORD_F, M_WORD_G,
476 KC_TRNS, M_WORD_Z, M_WORD_X, M_WORD_C, M_WORD_V, M_WORD_B, KC_TRNS, 476 KC_TRNS, M_WORD_Z, M_WORD_X, M_WORD_C, M_WORD_V, M_WORD_B, KC_TRNS,
@@ -479,7 +479,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
479 K80(L3K0), K80(L3K1), KC_TRNS, 479 K80(L3K0), K80(L3K1), KC_TRNS,
480 KC_TRNS, KC_TRNS, KC_TRNS, 480 KC_TRNS, KC_TRNS, KC_TRNS,
481 /* right hand */ 481 /* right hand */
482 KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS, 482 KC_TRNS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
483 KC_TRNS, M_WORD_Y, M_WORD_U, M_WORD_I, M_WORD_O, M_WORD_P, KC_TRNS, 483 KC_TRNS, M_WORD_Y, M_WORD_U, M_WORD_I, M_WORD_O, M_WORD_P, KC_TRNS,
484 M_WORD_H, M_WORD_J, M_WORD_K, M_WORD_L, KC_TRNS, KC_TRNS, 484 M_WORD_H, M_WORD_J, M_WORD_K, M_WORD_L, KC_TRNS, KC_TRNS,
485 KC_TRNS, M_WORD_N, M_WORD_M, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 485 KC_TRNS, M_WORD_N, M_WORD_M, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/layouts/community/ergodox/qwerty_code_friendly/readme.md b/layouts/community/ergodox/qwerty_code_friendly/readme.md
index 8bc15dd31..23afa656f 100644
--- a/layouts/community/ergodox/qwerty_code_friendly/readme.md
+++ b/layouts/community/ergodox/qwerty_code_friendly/readme.md
@@ -131,13 +131,13 @@ Notes:
131 131
132``` 132```
133.--------------------------------------------------. .--------------------------------------------------. 133.--------------------------------------------------. .--------------------------------------------------.
134| | 1 | 2 | 3 | 4 | 5 | | | Mute | 6 | 7 | 8 | 9 | 0 | | 134| | | | | | | | | Mute | | F10 | F11 | F12 | | |
135|--------+------+------+------+------+------+------| |------+------+------+------+------+------+--------| 135|--------+------+------+------+------+------+------| |------+------+------+------+------+------+--------|
136| | | | MsUp | | |MWhlUp| |VolUp | | | | | | | 136| | | | MsUp | | |MWhlUp| |VolUp | | F7 | F8 | F9 | | |
137|--------+------+------+------+------+------| | | |------+------+------+------+------+--------| 137|--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
138| | |MsLeft|MsDown|MsRght| |------| |------| Left | Down | Up |Right | | | 138| | |MsLeft|MsDown|MsRght| |------| |------| | F4 | F5 | F6 | | |
139|--------+------+------+------+------+------|MWhlDn| |VolDn |------+------+------+------+------+--------| 139|--------+------+------+------+------+------|MWhlDn| |VolDn |------+------+------+------+------+--------|
140| | | Rclk | Mclk | Lclk | | | | | | | | | | | 140| | | Rclk | Mclk | Lclk | | | | | | F1 | F2 | F3 | | |
141'--------+------+------+------+------+-------------' '-------------+------+------+------+------+--------' 141'--------+------+------+------+------+-------------' '-------------+------+------+------+------+--------'
142 | | | | | | | | | | | | 142 | | | | | | | | | | | |
143 '----------------------------------' '----------------------------------' 143 '----------------------------------' '----------------------------------'
@@ -158,7 +158,7 @@ eg: `-DCFQ_WORD_E=\"my@email.com\"`
158 158
159``` 159```
160.--------------------------------------------------. .--------------------------------------------------. 160.--------------------------------------------------. .--------------------------------------------------.
161| | F1 | F2 | F3 | F4 | F5 | F11 | | F12 | F6 | F7 | F8 | F9 | F10 | | 161| | 1 | 2 | 3 | 4 | 5 | | | | 6 | 7 | 8 | 9 | 0 | |
162|--------+------+------+------+------+------+------| |------+------+------+------+------+------+--------| 162|--------+------+------+------+------+------+------| |------+------+------+------+------+------+--------|
163| | Q | W | E | R | T | | | | Y | U | I | O | P | | 163| | Q | W | E | R | T | | | | Y | U | I | O | P | |
164|--------+------+------+------+------+------| | | |------+------+------+------+------+--------| 164|--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
@@ -179,6 +179,9 @@ eg: `-DCFQ_WORD_E=\"my@email.com\"`
179 179
180## Changelog 180## Changelog
181 181
182- 2018/10/19
183 Move F-Keys to numpad like layout.
184
182- 2018/05/29 185- 2018/05/29
183 Add number keys for cases when keypad numbers are handled differently. 186 Add number keys for cases when keypad numbers are handled differently.
184 187
diff --git a/lib/chibios-contrib b/lib/chibios-contrib
Subproject ede48346eee4b8d6847c19bc01420bee76a5e48 Subproject 2de67e2f4a268eae072c5fd76a1b160124cee4f