Merge remote-tracking branch 'qmk/master'

diff --cc keyboards/ergodox/keymaps/josh/keymap.c
index 0000000000000000000000000000000000000000,b5463873a90d2dc785bdb581ee1b5e33df86a192..da887fc64f3bd6b22c6dd9f79e5097a9d92f55f6
mode 000000,100644..100644
--- /dev/null
--- 2/keyboards/ergodox/keymaps/josh/keymap.c
+++ b/keyboards/ergodox/keymaps/josh/keymap.c
@@@ -1,0 -1,206 +1,214 @@@
 -#define CTL_SFT_T 100
 -#define CTL_SFT_G 101
 -#define CTL_ALT_H 102
+ #include "ergodox.h"
+ #include "debug.h"
+ #include "action_layer.h"
+ #include "version.h"
+ 
+ #define BASE 0 // default layer
+ #define SYMB 1 // symbols
+ #define MDIA 2 // media keys
+ 
+ //macros
 - * |   =    |   1  |   2  |   3  |   4  |   5  | ESC  |           | M 100|   6  |   7  |   8  |   9  |   0  |   -    |
++#define CTL_SFT_T 100 // open type
++#define CTL_SFT_G 101 // find references
++#define CTL_ALT_H 102 // open call hierarchy
++#define CTL_SFT_R 103 // open resource
+ 
+ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /* Keymap 0: Basic layer
+  *
+  * ,--------------------------------------------------.           ,--------------------------------------------------.
 -        KC_EQL,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_ESC,
++ * |   =    |   1  |   2  |   3  |   4  |   5  | ESC  |           |M100/3|   6  |   7  |   8  |   9  |   0  |   -    |
+  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
+  * |TAB /Alt|   Q  |   W  |   E  |   R  |   T  | Meh  |           | Meh  |   Y  |   U  |   I  |   O  |   P  |\ / ALT |
+  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+  * | LCTL   |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |; / L2|' / CTL |
+  * |--------+------+------+------+------+------| ~L1  |           | ~L1  |------+------+------+------+------+--------|
+  * | LShift |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |   /  | RShift |
+  * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
+  *   | WIN  |  `   | M 102| M 101|AltShf|                                       |AltShf| Left | Down |  Up  | Right  |
+  *   `----------------------------------'                                       `----------------------------------'
+  *                                        ,-------------.       ,-------------.
+  *                                        | App  | LALT |       | Alt  |  CAPS  |
+  *                                 ,------|------|------|       |------+--------+------.
+  *                                 |      |      | Home |       | PgUp |        |      |
+  *                                 | Space|Backsp|------|       |------| Delete |Enter |
+  *                                 |      |ace   | End  |       | PgDn |        |      |
+  *                                 `--------------------'       `----------------------'
+  */
+ // 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
 -             M(CTL_SFT_T),KC_6,   KC_7,   KC_8,   KC_9,   KC_0,             KC_MINS,
 -             MEH_T(KC_NO),KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,             KC_BSLS,
 -                          KC_H,   KC_J,   KC_K,   KC_L,   LT(MDIA, KC_SCLN),CTL_T(KC_QUOT),
 -             MO(SYMB),      KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,          KC_RSFT,
 -                            LALT(KC_LSFT),KC_LEFT,KC_DOWN,KC_UP,            KC_RIGHT,
++        LT(MDIA, KC_EQL),KC_1,        KC_2,   KC_3,   KC_4,   KC_5,   KC_ESC,
+         ALT_T(KC_TAB),  KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   ALL_T(KC_NO),
+         KC_LCTL,        KC_A,         KC_S,   KC_D,   KC_F,   KC_G,
+         KC_LSFT,        KC_Z,         KC_X,   KC_C,   KC_V,   KC_B,   MO(SYMB),
+         KC_LGUI,        KC_GRV, M(CTL_ALT_H),M(CTL_SFT_G),LALT(KC_LSFT),
+                                               CTL_T(KC_APP),  KC_LALT,
+                                                               KC_HOME,
+                                                KC_SPC,KC_BSPC,KC_END,
+         // right hand
 - * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
++             LT(M(CTL_SFT_T),
++                M(CTL_SFT_R)),KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   LT(MDIA, KC_MINS),
++             MEH_T(KC_NO),    KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,                 KC_BSLS,
++                              KC_H,   KC_J,   KC_K,   KC_L,   LT(MDIA, KC_SCLN), CTL_T(KC_QUOT),
++             MO(SYMB),        KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,          KC_RSFT,
++                        LALT(KC_LSFT),KC_LEFT,KC_DOWN,KC_UP,            KC_RIGHT,
+              KC_LALT,        KC_CAPS,
+              KC_PGUP,
+              KC_PGDN,KC_DEL, KC_ENT
+     ),
+ /* Keymap 1: Symbol Layer
+  *
+  * ,--------------------------------------------------.           ,--------------------------------------------------.
+  * |Version |  F1  |  F2  |  F3  |  F4  |  F5  | F11  |           | F12  |  F6  |  F7  |  F8  |  F9  |  F10 |  CALC  |
+  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
+  * |        |   !  |   @  |   {  |   }  |   |  |      |           |      |      |      |      |      |      |        |
+  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+  * |        |   #  |   $  |   (  |   )  |   `  |------|           |------| Left | Down |  Up  | Right|      |        |
+  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+  * |        |   %  |   ^  |   [  |   ]  |   ~  |      |           |      |      |      |      |      |      |        |
+  * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
+  *   |      |      |      |      |      |                                       |      |      |      |      |      |
+  *   `----------------------------------'                                       `----------------------------------'
+  *                                        ,-------------.       ,-------------.
+  *                                        |      |      |       |      |      |
+  *                                 ,------|------|------|       |------+------+------.
+  *                                 |      |      |      |       |      |      |      |
+  *                                 |      |      |------|       |------|      |      |
+  *                                 |      |      |      |       |      |      |      |
+  *                                 `--------------------'       `--------------------'
+  */
+ // SYMBOLS
+ [SYMB] = KEYMAP(
+        // left hand
+        M(0),   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F11,
+        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_TRNS,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,
+        // right hand
+        KC_F12,  KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_CALC,
+        KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                 KC_LEFT, KC_DOWN,KC_UP,   KC_RIGHT,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_TRNS, KC_TRNS,
+        KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS
+ ),
+ /* Keymap 2: Media and mouse keys
+  *
+  * ,--------------------------------------------------.           ,--------------------------------------------------.
 -       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
++ * |        |      |      |      |      |      |RESET |           |RESET |      |      |      |      |      |        |
+  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
+  * |        |      |      | MsUp |      |      |      |           |      |      |      |      |      |      |        |
+  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+  * |        |      |MsLeft|MsDown|MsRght|      |------|           |------|      |      |      |      |      |  Play  |
+  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+  * |        |      |      |      |      |      |      |           |      |      |      | Prev | Next |      |        |
+  * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
+  *   |      |      |      | Lclk | Rclk |                                       |VolUp |VolDn | Mute |      |      |
+  *   `----------------------------------'                                       `----------------------------------'
+  *                                        ,-------------.       ,-------------.
+  *                                        |      |      |       |      |      |
+  *                                 ,------|------|------|       |------+------+------.
+  *                                 |      |      |      |       |      |      |Brwser|
+  *                                 |      |      |------|       |------|      |Back  |
+  *                                 |      |      |      |       |      |      |      |
+  *                                 `--------------------'       `--------------------'
+  */
+ // MEDIA AND MOUSE
+ [MDIA] = KEYMAP(
 -       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, RESET,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2,
+                                            KC_TRNS, KC_TRNS,
+                                                     KC_TRNS,
+                                   KC_TRNS, KC_TRNS, KC_TRNS,
+     // right hand
++       RESET,    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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
+        KC_TRNS,  KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS,
+                           KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS,
+        KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_WBAK
+ ),
+ };
+ 
+ const uint16_t PROGMEM fn_actions[] = {
+     [1] = ACTION_LAYER_TAP_TOGGLE(SYMB)                // FN1 - Momentary Layer 1 (Symbols)
+ };
+ 
+ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
+ {
+   // MACRODOWN only works in this function
+     switch(id) {
+         case 0:
+             if (record->event.pressed) {
+                 SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
+             }
+             break;
+         case CTL_SFT_T:
+             if (record->event.pressed) {
+                 return MACRO(D(LCTL), D(LSFT), T(T), END);
+             }
+             return MACRO(U(LCTL), U(LSFT), END);
+             break;
+         case CTL_SFT_G:
+             if (record->event.pressed) {
+                 return MACRO(D(LCTL), D(LSFT), T(G), END);
+             }
+             return MACRO(U(LCTL), U(LSFT), END);
+             break;
+         case CTL_ALT_H:
+             if (record->event.pressed) {
+                 return MACRO(D(LCTL), D(LALT), T(H), END);
+             }
+             return MACRO(U(LCTL), U(LALT), END);
+             break;
++        case CTL_SFT_R:
++            if (record->event.pressed) {
++                return MACRO(D(LCTL), D(LSFT), T(R), END);
++            }
++            return MACRO(U(LCTL), U(LSFT), END);
++            break;
+     }
+     return MACRO_NONE;
+ };
+ 
+ // Runs just one time when the keyboard initializes.
+ void matrix_init_user(void) {
+ 
+ };
+ 
+ // Runs constantly in the background, in a loop.
+ void matrix_scan_user(void) {
+ 
+     uint8_t layer = biton32(layer_state);
+ 
+     ergodox_board_led_off();
+     ergodox_right_led_1_off();
+     ergodox_right_led_2_off();
+     ergodox_right_led_3_off();
+     switch (layer) {
+       // TODO: Make this relevant to the ErgoDox EZ.
+         case 1:
+             ergodox_right_led_1_on();
+             break;
+         case 2:
+             ergodox_right_led_2_on();
+             break;
+         default:
+             // none
+             break;
+     }
+ 
+ };