The Ordinary Layout is familiar to users of common keyboards

1 files changed, 60 insertions, 58 deletions

diff --git a/keyboard/ergodox_ez/keymaps/ordinary/keymap.c b/keyboard/ergodox_ez/keymaps/ordinary/keymap.c
index 3343c22963..bd9524bc56 100644
--- a/keyboard/ergodox_ez/keymaps/ordinary/keymap.c
+++ b/keyboard/ergodox_ez/keymaps/ordinary/keymap.c
@@ -7,7 +7,7 @@
 #define MDIA 2 // media keys
 
 /*
- * Ordinary Ergodox EZ keyboard layout, v1
+ * Ordinary Ergodox EZ keyboard layout, v2
  * modifications from default by Nicholas Keene ergodoxez@nicholaskeene.com
  * Details: http://nicholas.rinard.us/2016/03/ergodox-ez-layout.html
  */
@@ -16,13 +16,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Keymap 0: Basic layer
  *
  * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |  Grv   |   1  |   2  |   3  |   4  |   5  | ESC  |           |  =   |   6  |   7  |   8  |   9  |   0  |   -    |
+ * |  Grv   |   1  |   2  |   3  |   4  |   5  | ESC  |           |  -   |   6  |   7  |   8  |   9  |   0  |   =    |
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | Tab    |   Q  |   W  |   E  |   R  |   T  |   \  |           |   /  |   Y  |   U  |   I  |   O  |   P  |  ~L2   |
+ * | Tab    |   Q  |   W  |   E  |   R  |   T  |   [  |           |  ]   |   Y  |   U  |   I  |   O  |   P  | L2 / / |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | ~L1    |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |; / L2|  ~L1   |
- * |--------+------+------+------+------+------|  [   |           |  ]   |------+------+------+------+------+--------|
- * | LShift |Z/Ctrl|   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |'/Ctrl| RShift |
+ * |  L1    |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |  ;   | L1 / ' |
+ * |--------+------+------+------+------+------|Shift |           | Tab  |------+------+------+------+------+--------|
+ * | LShift |Z/Ctrl|   X  |   C  |   V  |   B  | -Tab |           |      |   N  |   M  |   ,  |   .  |//Ctrl| RShift |
  * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
  *   |LCtrl | Meh  |Hyper | LAlt | LGui |                                       | RGui | RAlt | Hyper|  Meh |RCtrl |
  *   `----------------------------------'                                       `----------------------------------'
@@ -37,20 +37,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
 [BASE] = KEYMAP(  // layer 0 : default
-        // left hand
-        KC_GRV, KC_1,        KC_2,  KC_3, KC_4, KC_5, KC_ESC,
-        KC_TAB, KC_Q,        KC_W,  KC_E, KC_R, KC_T, KC_BSLS,
-        KC_FN1, KC_A,        KC_S,  KC_D, KC_F, KC_G,
-        KC_LSFT,CTL_T(KC_Z), KC_X,  KC_C, KC_V, KC_B, KC_LBRC,
-        KC_LCTL,MEH_T(KC_NO),ALL_T(KC_NO),KC_LALT,KC_LGUI,
-                                             KC_HOME, KC_END,
-                                                      KC_PGUP,
-                                    KC_BSPC, KC_DEL,  KC_PGDN,
+   // left hand
+   KC_GRV,   KC_1,        KC_2,  KC_3, KC_4,   KC_5, KC_ESC,
+   KC_TAB,   KC_Q,        KC_W,  KC_E, KC_R,   KC_T, KC_LBRC,
+   MO(SYMB), KC_A,        KC_S,  KC_D, KC_F,   KC_G,
+   KC_LSFT,  CTL_T(KC_Z), KC_X,  KC_C, KC_V,   KC_B, LSFT(KC_TAB),
+   KC_LCTL,  MEH_T(KC_NO),ALL_T(KC_NO),KC_LALT,KC_LGUI,
+                                          KC_HOME, KC_END,
+                                                   KC_PGUP,
+                                 KC_BSPC, KC_DEL,  KC_PGDN,
+
                                                                 // right hand
-                                                                KC_EQL,  KC_6, KC_7,    KC_8,    KC_9,        KC_0,          KC_MINS,
-                                                                KC_SLSH, KC_Y, KC_U,    KC_I,    KC_O,        KC_P,          LT(MDIA, KC_SLSH),
-                                                                         KC_H, KC_J,    KC_K,    KC_L,        KC_SCLN,       KC_FN1,
-                                                                KC_RBRC, KC_N, KC_M,    KC_COMM, KC_DOT,      CTL_T(KC_QUOT),KC_RSFT,
+                                                                KC_MINS, KC_6, KC_7,    KC_8,    KC_9,        KC_0,          KC_EQL,
+                                                                KC_RBRC, KC_Y, KC_U,    KC_I,    KC_O,        KC_P,          LT(MDIA, KC_BSLS),
+                                                                         KC_H, KC_J,    KC_K,    KC_L,        KC_SCLN,       LT(SYMB, KC_QUOT),
+                                                                KC_TAB,  KC_N, KC_M,    KC_COMM, KC_DOT,      CTL_T(KC_SLSH),KC_RSFT,
                                                                                KC_RGUI, KC_RALT, ALL_T(KC_NO),MEH_T(KC_NO),  KC_RCTL,
                                                                 KC_LEFT, KC_RGHT,
                                                                 KC_UP,
@@ -59,69 +60,69 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Keymap 1: Symbol Layer
  *
  * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
+ * |  Esc   |  F1  |  F2  |  F3  |  F4  |  F5  |      |           | ~L1  |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |   !  |   @  |   {  |   }  |   |  |      |           |      |   Up |   7  |   8  |   9  |   *  |   F12  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   #  |   $  |   (  |   )  |   `  |------|           |------| Down |   4  |   5  |   6  |   +  |        |
+ * |        |   !  |   @  |   {  |   }  |   |  |  <   |           |  >   |   \  |   7  |   8  |   9  |   *  |   F12  |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | CAPS   |   %  |   ^  |   [  |   ]  |   ~  |      |           |      |   &  |   1  |   2  |   3  |   \  |  CAPS  |
+ * |        |   #  |   $  |   (  |   )  |   `  |------|           |------|   /  |   4  |   5  |   6  |   +  |        |
+ * |--------+------+------+------+------+------| Tab  |           | Shift|------+------+------+------+------+--------|
+ * |   L2   |   %  |   ^  |   [  |   ]  |   ~  |      |           |  -Tab|   &  |   1  |   2  |   3  |   /  |  CAPS  |
  * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |    . |   0  |   =  |      |
+ *   |      |      |      |      |      |                                       |   0  |    . |   =  |   -  |      |
  *   `----------------------------------'                                       `----------------------------------'
  *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
+ *                                        | Left | Right|       | Home | End  |
  *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
+ *                                 |      |      |  Up  |       | PgUp |      |      |
+ *                                 |Space |Enter |------|       |------|BackSp| Del  |
+ *                                 |      |      | Down |       | PgDn |      |      |
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
 [SYMB] = KEYMAP(
        // left hand
-       KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
-       KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
-       KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV,
-       KC_CAPS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,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_ESC,           KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
+       KC_TRNS,          KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,LSFT(KC_COMM),
+       KC_TRNS,          KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV,
+       LT(MDIA, KC_TRNS),KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TAB,
+       KC_TRNS,          KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+                                                         KC_LEFT,KC_RGHT,
+                                                                 KC_UP,
+                                                   KC_SPC,KC_ENT,KC_DOWN,
                                                                      // right hand
-                                                                     KC_TRNS, KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,
-                                                                     KC_TRNS, KC_UP,   KC_7,   KC_8,    KC_9,    KC_ASTR, KC_F12,
-                                                                              KC_DOWN, KC_4,   KC_5,    KC_6,    KC_PLUS, KC_TRNS,
-                                                                     KC_TRNS, KC_AMPR, KC_1,   KC_2,    KC_3,    KC_BSLS, KC_CAPS,
-                                                                                       KC_TRNS,KC_DOT,  KC_0,    KC_EQL,  KC_TRNS,
-                                                                     KC_TRNS, KC_TRNS,
-                                                                     KC_TRNS,
-                                                                     KC_TRNS, KC_TRNS, KC_TRNS
+                                                                     TG(SYMB),     KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,
+                                                                     LSFT(KC_DOT), KC_BSLS, KC_P7,  KC_P8,   KC_P9,   KC_PSLS, KC_F12,
+                                                                                   KC_SLSH, KC_P4,  KC_P5,   KC_P6,   KC_PAST, KC_TRNS,
+                                                                     LSFT(KC_TAB), KC_AMPR, KC_P1,  KC_P2,   KC_P3,   KC_PMNS, KC_CAPS,
+                                                                                            KC_P0,  KC_DOT,  KC_PEQL, KC_PPLS, KC_PENT,
+                                                                     KC_HOME,      KC_END,
+                                                                     KC_PGUP,
+                                                                     KC_PGDN,      KC_BSPC, KC_DEL
 ),
 /* Keymap 2: Media and mouse keys
  *
  * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      | Sleep|           |      |      |      |      |MyComp| Mail |        |
+ * |  Esc   |ShutDn| Sleep| Mute |Vol Dn|Vol Up|      |           | ~L2  | Help |PrtSc | Find |MyComp| Mail |        |
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      | MsUp |ScrlUp|      |ScrlUp|           |ScrlUp|      |      |      |      | Mute |        |
+ * |        |      |      | MsUp |ScrlUp|      |ScrlUp|           |ScrlUp|      |ScrlUp|  Up  |      |      |        |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |MsLeft|MsDown|MsRght|      |------|           |------|      |      |      |      |      |        |
+ * |        |      |MsLeft|MsDown|MsRght|      |------|           |------|      | Left | Down | Right|Sleep |        |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |MsDown|ScrlDn|      |ScrlDn|           |ScrlDn|      |      |      |      |      |        |
+ * |        |      |      |MsDown|ScrlDn|      |ScrlDn|           |ScrlDn|      |ScrlDn| Down |      |      |        |
  * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      | Lclk | Rclk |                                       |      |      |      |      |      |
+ *   |      |      |      | Lclk | Rclk |                                       | Cut  | Copy | Paste| Undo | Redo |
  *   `----------------------------------'                                       `----------------------------------'
  *                                        ,-------------.       ,-------------.
  *                                        | Stop |Refrsh|       | Prev | Next |
  *                                 ,------|------|------|       |------+------+------.
  *                                 |Brwser|Brwser| Home |       |VolUp |      |      |
- *                                 |Back  | Fwd  |------|       |------| Stop | Play |
- *                                 |      |      |Search|       |VolDn |      |      |
+ *                                 |Back  | Fwd  |------|       |------| Stop | Play-|
+ *                                 |      |      |Search|       |VolDn |      | Pause|
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
 [MDIA] = KEYMAP(
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SLEP,
+       KC_ESC,  KC_PWR,  KC_SLEP, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_WH_U, KC_TRNS, KC_WH_U,
        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_D, KC_TRNS, KC_TRNS, KC_WH_D,
@@ -130,11 +131,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                              KC_WHOM,
                                            KC_WBAK, KC_TRNS, KC_WSCH,
                                                                      // right hand
-                                                                     KC_WSCH,  KC_TRNS, KC_TRNS, KC_TRNS, KC_MYCM, KC_MAIL, KC_TRNS,
-                                                                     KC_WH_U,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_TRNS,
-                                                                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                                                                     KC_WH_D,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                                                                                        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                                                                     TG(MDIA), KC_HELP, KC_PSCR, KC_FIND, KC_MYCM, KC_MAIL, KC_TRNS,
+                                                                     KC_WH_U,  KC_TRNS, KC_WH_U, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS,
+                                                                               KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT,KC_TRNS, KC_TRNS,
+                                                                     KC_WH_D,  KC_TRNS, KC_WH_D, KC_DOWN, KC_TRNS, KC_TRNS, KC_TRNS,
+                                                                                        KC_CUT,  KC_COPY, KC_PASTE,KC_UNDO, KC_AGAIN,
                                                                      KC_MPRV, KC_MNXT,
                                                                      KC_VOLU,
                                                                      KC_VOLD, KC_MSTP, KC_MPLY
@@ -188,3 +189,4 @@ void matrix_scan_user(void) {
     }
 
 };
+