2 files changed, 34 insertions(+), 30 deletions(-)

M layouts/community/ergodox/qwerty_code_friendly/keymap.c
M layouts/community/ergodox/qwerty_code_friendly/readme.md

@@ 241,7 241,7 @@ static char cfq_word_lut_title_caps[
 ];
 
 #define LAYER_BASE 0 /* default layer */
-#define LAYER_SYMB 1 /* symbols */
+#define LAYER_KPAD 1 /* keypad */
 #define LAYER_MDIA 2 /* media keys */
 #define LAYER_FKEY 3 /* F-Keys & Words */
 


@@ 382,8 382,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                               |      |      |      |  |      |      |      |
  *                               '--------------------'  '--------------------'
  */
-/* SYMBOLS */
-[LAYER_SYMB] = LAYOUT_ergodox_76_or_80(
+/* KEYPAD & MACRO */
+[LAYER_KPAD] = LAYOUT_ergodox_76_or_80(
   /* left hand */
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          M_BRACKET_IN_CBR,
   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] = {
 /* Keymap 2: F-Keys, media and mouse keys
  *
  * .--------------------------------------------------.  .--------------------------------------------------.
- * |        |      |      |      |      |      |      |  |      |      |      |      |      |      |        |
+ * |        |      |      |      |      |      |      |  |Mute  |      |      |      |      |      |        |
  * |--------+------+------+------+------+------+------|  |------+------+------+------+------+------+--------|
- * |        |      |      | MsUp |      |      |MWhlUp|  |      |      |      |      |      |      |        |
+ * |        |      |      | MsUp |      |      |MWhlUp|  |VolUp |      |      |      |      |      |        |
  * |--------+------+------+------+------+------|      |  |      |------+------+------+------+------+--------|
  * |        |      |MsLeft|MsDown|MsRght|      |------|  |------| Left | Down | Up   |Right |      |        |
- * |--------+------+------+------+------+------|MWhlDn|  |      |------+------+------+------+------+--------|
+ * |--------+------+------+------+------+------|MWhlDn|  |VolDn |------+------+------+------+------+--------|
  * |        |      | Rclk | Mclk | Lclk |      |      |  |      |      |      |      |      |      |        |
  * '--------+------+------+------+------+-------------'  '-------------+------+------+------+------+--------'
  *   |      |      |      |      |      |                              |      |      |      |      |      |
  *   '----------------------------------'                              '----------------------------------'
  *                                      .-------------.  .-------------.
- *                                      | MRwd | MFwd |  | MPrv | MNxt |
+ *                                      |      |      |  | MRwd | MFwd |
  *                               .------+------+------|  |------+------+------.
- *                               |      |      |      |  |VolUp |      |      |
- *                               | Mute |      |------|  |------|      | Play |
- *                               |      |      |      |  |VolDn |      |      |
+ *                               |      |      |      |  | MPrv |      |      |
+ *                               |      |      |------|  |------|      | Play |
+ *                               |      |      |      |  | MNxt |      |      |
  *                               '--------------------'  '--------------------'
  */
-/* MEDIA AND MOUSE */
+/* MEDIA & MOUSE */
 [LAYER_MDIA] = LAYOUT_ergodox_76_or_80(
   /* left hand */
   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] = {
   KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
   KC_TRNS, KC_TRNS, KC_BTN2, KC_BTN3, KC_BTN1, KC_TRNS, KC_WH_D,
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                                      KC_MRWD,   KC_MFFD,
+                                      KC_TRNS,   KC_TRNS,
                            K80(L2K0), K80(L2K1), KC_TRNS,
-                           KC_MUTE,   KC_TRNS,   KC_TRNS,
+                           KC_TRNS,   KC_TRNS,   KC_TRNS,
   /* right hand */
-  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+  KC_MUTE, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+  KC_VOLU,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
             KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_TRNS, KC_TRNS,
-  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+  KC_VOLD,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
                      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-  KC_MPRV, KC_MNXT,
-  KC_VOLU, K80(L2K2), K80(L1K3),
-  KC_VOLD, KC_TRNS, KC_MPLY
+  KC_MRWD, KC_MFFD,
+  KC_MPRV, K80(L2K2), K80(L2K3),
+  KC_MNXT, KC_TRNS, KC_MPLY
 ),
 /* Keymap 3: Entire Words (one for each key)
  *


@@ 491,7 491,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 const uint16_t PROGMEM fn_actions[] = {
-  [1] = ACTION_LAYER_TAP_TOGGLE(LAYER_SYMB),               /* FN1 - Momentary Layer 1 (Symbols) */
+  [1] = ACTION_LAYER_TAP_TOGGLE(LAYER_KPAD),               /* FN1 - Momentary Layer 1 (KeyPad) */
   [2] = ACTION_LAYER_TAP_TOGGLE(LAYER_MDIA),               /* FN2 - Momentary Layer 2 (Media) */
   [3] = ACTION_LAYER_TAP_TOGGLE(LAYER_FKEY),               /* FN3 - Momentary Layer 3 (FKey's & Words) */
 };

@@ 20,7 20,7 @@
   if using keys from both sides is inconvenient - the symbol layer has macros
   at the same key locations to type matching pairs.
 
-- The extra space-bar on the lower-left looks like it's in an obscure location,
+- The space-bar on the lower-left looks like it's in an obscure location,
   however using the larger thumb cluster
   ended up being more of a reach while typing.
 


@@ 122,30 122,30 @@ Notes:
                               '--------------------'  '--------------------'
 ```
 
-## Keymap 2: Keymap 2: Media and mouse keys
+## Keymap 2: Keymap 2: Media and Mouse Keys
 
 ```
 .--------------------------------------------------.  .--------------------------------------------------.
-|        |      |      |      |      |      |      |  |      |      |      |      |      |      |        |
+|        |      |      |      |      |      |      |  |Mute  |      |      |      |      |      |        |
 |--------+------+------+------+------+------+------|  |------+------+------+------+------+------+--------|
-|        |      |      | MsUp |      |      |MWhlUp|  |      |      |      |      |      |      |        |
+|        |      |      | MsUp |      |      |MWhlUp|  |VolUp |      |      |      |      |      |        |
 |--------+------+------+------+------+------|      |  |      |------+------+------+------+------+--------|
 |        |      |MsLeft|MsDown|MsRght|      |------|  |------| Left | Down | Up   |Right |      |        |
-|--------+------+------+------+------+------|MWhlDn|  |      |------+------+------+------+------+--------|
+|--------+------+------+------+------+------|MWhlDn|  |VolDn |------+------+------+------+------+--------|
 |        |      | Rclk | Mclk | Lclk |      |      |  |      |      |      |      |      |      |        |
 '--------+------+------+------+------+-------------'  '-------------+------+------+------+------+--------'
   |      |      |      |      |      |                              |      |      |      |      |      |
   '----------------------------------'                              '----------------------------------'
                                      .-------------.  .-------------.
-                                     | MRwd | MFwd |  | MPrv | MNxt |
+                                     |      |      |  | MRwd | MFwd |
                               .------+------+------|  |------+------+------.
-                              |      |      |      |  |VolUp |      |      |
-                              | Mute |      |------|  |------|      | Play |
-                              |      |      |      |  |VolDn |      |      |
+                              |      |      |      |  | MPrv |      |      |
+                              |      |      |------|  |------|      | Play |
+                              |      |      |      |  | MNxt |      |      |
                               '--------------------'  '--------------------'
 ```
 
-## Keymap 3: K-Keys & User defined words
+## Keymap 3: F-Keys & User Defined Words
 
 This is for assigning whole words to single keys.
 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\"`
 
 ## Changelog
 
+- 2018/05/19
+  Move all media keys to right thumb cluster
+  (matching page up/down, home/end locations).
+
 - 2018/04/14
   Add `CFQ_USE_80_KEYS` to optionally support an 80 key layout.