diff options
| author | Erez Zukerman <ezuk@madmimi.com> | 2015-10-29 00:16:53 +0200 |
|---|---|---|
| committer | Erez Zukerman <ezuk@madmimi.com> | 2015-10-29 00:16:53 +0200 |
| commit | 4b0c54324ab467daf1567a285fd5f79dc7f9d3e4 (patch) | |
| tree | d28fba80bc40963e167092a7128c56d731bf5111 | |
| parent | ea0e1169e675a3f11486acaa56dd28e0ade8a9d8 (diff) | |
| download | qmk_firmware-4b0c54324ab467daf1567a285fd5f79dc7f9d3e4.tar.gz qmk_firmware-4b0c54324ab467daf1567a285fd5f79dc7f9d3e4.zip | |
Adds Hyper key, tweaks ErgoDox EZ default keymap
| -rw-r--r-- | keyboard/ergodox_ez/keymaps/keymap_default.c | 42 | ||||
| -rw-r--r-- | keyboard/ergodox_ez/keymaps/keymap_ergodox_ez.c | 211 | ||||
| -rw-r--r-- | keyboard/ergodox_ez/reference_compiled_default_firmware.hex | 24 | ||||
| -rw-r--r-- | quantum/keymap_common.h | 1 |
4 files changed, 34 insertions, 244 deletions
diff --git a/keyboard/ergodox_ez/keymaps/keymap_default.c b/keyboard/ergodox_ez/keymaps/keymap_default.c index 870f804ec..aba7783f4 100644 --- a/keyboard/ergodox_ez/keymaps/keymap_default.c +++ b/keyboard/ergodox_ez/keymaps/keymap_default.c | |||
| @@ -13,16 +13,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 13 | * ,--------------------------------------------------. ,--------------------------------------------------. | 13 | * ,--------------------------------------------------. ,--------------------------------------------------. |
| 14 | * | = | 1 | 2 | 3 | 4 | 5 | LEFT | | RIGHT| 6 | 7 | 8 | 9 | 0 | - | | 14 | * | = | 1 | 2 | 3 | 4 | 5 | LEFT | | RIGHT| 6 | 7 | 8 | 9 | 0 | - | |
| 15 | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| | 15 | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| |
| 16 | * | Del | Q | W | E | R | T | Tab | | : | Y | U | I | O | P | \ | | 16 | * | Del | Q | W | E | R | T | L1 | | L1 | Y | U | I | O | P | \ | |
| 17 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| | 17 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| |
| 18 | * | BkSp | A | S | D | F | G |------| |------| H | J | K | L |; / L2| ' | | 18 | * | BkSp | A | S | D | F | G |------| |------| H | J | K | L |; / L2| ' | |
| 19 | * |--------+------+------+------+------+------| : | | L1 |------+------+------+------+------+--------| | 19 | * |--------+------+------+------+------+------| Hypr | | Hypr |------+------+------+------+------+--------| |
| 20 | * | LShift |Z/Ctrl| X | C | V | B | | | | N | M | , | . |//Ctrl| RShift | | 20 | * | LShift |Z/Ctrl| X | C | V | B | | | | N | M | , | . |//Ctrl| RShift | |
| 21 | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' | 21 | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' |
| 22 | * |Grv/L1|AltSft| TAB | Left | Right| | Up | Down | [ | ] | ~L1 | | 22 | * |Grv/L1|AltSft| TAB | Left | Right| | Up | Down | [ | ] | ~L1 | |
| 23 | * `----------------------------------' `----------------------------------' | 23 | * `----------------------------------' `----------------------------------' |
| 24 | * ,-------------. ,-------------. | 24 | * ,-------------. ,-------------. |
| 25 | * | Rclk | LGui | | Alt |Ctrl/Esc| | 25 | * | App | LGui | | Alt |Ctrl/Esc| |
| 26 | * ,------|------|------| |------+--------+------. | 26 | * ,------|------|------| |------+--------+------. |
| 27 | * | | | Home | | PgUp | | | | 27 | * | | | Home | | PgUp | | | |
| 28 | * | Space|Backsp|------| |------| Tab |Enter | | 28 | * | Space|Backsp|------| |------| Tab |Enter | |
| @@ -34,19 +34,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 34 | [BASE] = KEYMAP( // layer 0 : default | 34 | [BASE] = KEYMAP( // layer 0 : default |
| 35 | // left hand | 35 | // left hand |
| 36 | KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LEFT, | 36 | KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LEFT, |
| 37 | KC_DELT, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_TAB, | 37 | KC_DELT, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(1), |
| 38 | KC_BSPC, KC_A, KC_S, KC_D, KC_F, KC_G, | 38 | KC_BSPC, KC_A, KC_S, KC_D, KC_F, KC_G, |
| 39 | KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_COLN, | 39 | KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, ALL_T(KC_NO), |
| 40 | LT(SYMB,KC_GRV),LALT(KC_LSFT),KC_TAB, KC_LEFT,KC_RGHT, | 40 | LT(SYMB,KC_GRV),LALT(KC_LSFT),KC_TAB, KC_LEFT,KC_RGHT, |
| 41 | KC_MENU,KC_LGUI, | 41 | KC_APP, KC_LGUI, |
| 42 | KC_HOME, | 42 | KC_HOME, |
| 43 | KC_SPC,KC_BSPC,KC_END, | 43 | KC_SPC,KC_BSPC,KC_END, |
| 44 | // right hand | 44 | // right hand |
| 45 | KC_RGHT,KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, | 45 | KC_RGHT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, |
| 46 | KC_COLN,KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, | 46 | TG(1), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, |
| 47 | KC_H, KC_J, KC_K, KC_L, LT(MDIA, KC_SCLN),KC_QUOT, | 47 | KC_H, KC_J, KC_K, KC_L, LT(MDIA, KC_SCLN),KC_QUOT, |
| 48 | TG(1), KC_N, KC_M, KC_COMM,KC_DOT, CTL_T(KC_SLSH), KC_RSFT, | 48 | ALL_T(KC_NO),KC_N, KC_M, KC_COMM,KC_DOT, CTL_T(KC_SLSH), KC_RSFT, |
| 49 | KC_UP, KC_DOWN,KC_LBRC,KC_RBRC, KC_FN1, | 49 | KC_UP, KC_DOWN,KC_LBRC,KC_RBRC, KC_FN1, |
| 50 | KC_LALT, CTL_T(KC_ESC), | 50 | KC_LALT, CTL_T(KC_ESC), |
| 51 | KC_PGUP, | 51 | KC_PGUP, |
| 52 | KC_PGDN,KC_TAB, KC_ENT | 52 | KC_PGDN,KC_TAB, KC_ENT |
| @@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 58 | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| | 58 | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| |
| 59 | * | | ! | @ | { | } | | | | | | Up | 7 | 8 | 9 | * | F12 | | 59 | * | | ! | @ | { | } | | | | | | Up | 7 | 8 | 9 | * | F12 | |
| 60 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| | 60 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| |
| 61 | * | : | # | $ | ( | ) | ` |------| |------| Down | 4 | 5 | 6 | + | | | 61 | * | | # | $ | ( | ) | ` |------| |------| Down | 4 | 5 | 6 | + | | |
| 62 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| | 62 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| |
| 63 | * | | % | ^ | [ | ] | ~ | | | | & | 1 | 2 | 3 | \ | | | 63 | * | | % | ^ | [ | ] | ~ | | | | & | 1 | 2 | 3 | \ | | |
| 64 | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' | 64 | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' |
| @@ -77,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 77 | // left hand | 77 | // left hand |
| 78 | KC_TRNS,KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, | 78 | KC_TRNS,KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, |
| 79 | KC_TRNS,KC_EXLM,KC_AT, KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS, | 79 | KC_TRNS,KC_EXLM,KC_AT, KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS, |
| 80 | KC_COLN,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV, | 80 | KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV, |
| 81 | KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS, | 81 | KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS, |
| 82 | KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, | 82 | KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, |
| 83 | KC_TRNS,KC_TRNS, | 83 | KC_TRNS,KC_TRNS, |
| @@ -98,13 +98,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 98 | * ,--------------------------------------------------. ,--------------------------------------------------. | 98 | * ,--------------------------------------------------. ,--------------------------------------------------. |
| 99 | * | | | | | | | | | | | | | | | | | 99 | * | | | | | | | | | | | | | | | | |
| 100 | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| | 100 | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| |
| 101 | * | | | MsUp | | | | | | | | | | | | | | 101 | * | | | | MsUp | | | | | | | | | | | | |
| 102 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| | 102 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| |
| 103 | * | |MsLeft|MsDown|MsRght| | |------| |------| | | | Play | | Mute | | 103 | * | | |MsLeft|MsDown|MsRght| |------| |------| | | | | | Play | |
| 104 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| | 104 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| |
| 105 | * | | | | | | | | | | | | Prev | Next | | | | 105 | * | | | | | | | | | | | | Prev | Next | | | |
| 106 | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' | 106 | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' |
| 107 | * | | | | Lclk | Rclk | |VolUp |VolDn | | | | | 107 | * | | | | Lclk | Rclk | |VolUp |VolDn | Mute | | | |
| 108 | * `----------------------------------' `----------------------------------' | 108 | * `----------------------------------' `----------------------------------' |
| 109 | * ,-------------. ,-------------. | 109 | * ,-------------. ,-------------. |
| 110 | * | | | | | | | 110 | * | | | | | | |
| @@ -117,8 +117,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 117 | // MEDIA AND MOUSE | 117 | // MEDIA AND MOUSE |
| 118 | KEYMAP( | 118 | KEYMAP( |
| 119 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 119 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 120 | KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 120 | KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS, |
| 121 | KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, | 121 | KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, |
| 122 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 122 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 123 | KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN3, KC_BTN2, | 123 | KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN3, KC_BTN2, |
| 124 | KC_TRNS, KC_TRNS, | 124 | KC_TRNS, KC_TRNS, |
| @@ -127,9 +127,9 @@ KEYMAP( | |||
| 127 | // right hand | 127 | // right hand |
| 128 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 128 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 129 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 129 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 130 | KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_TRNS, KC_MUTE, | 130 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, |
| 131 | KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, | 131 | KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, |
| 132 | KC_VOLU, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, | 132 | KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, |
| 133 | KC_TRNS, KC_TRNS, | 133 | KC_TRNS, KC_TRNS, |
| 134 | KC_TRNS, | 134 | KC_TRNS, |
| 135 | KC_TRNS, KC_TRNS, KC_WBAK | 135 | KC_TRNS, KC_TRNS, KC_WBAK |
diff --git a/keyboard/ergodox_ez/keymaps/keymap_ergodox_ez.c b/keyboard/ergodox_ez/keymaps/keymap_ergodox_ez.c deleted file mode 100644 index 84c61320a..000000000 --- a/keyboard/ergodox_ez/keymaps/keymap_ergodox_ez.c +++ /dev/null | |||
| @@ -1,211 +0,0 @@ | |||
| 1 | // TODO: Move all of this stuff into the default keymap, and then get rid of this file. | ||
| 2 | #include "action_util.h" | ||
| 3 | #include "action_layer.h" | ||
| 4 | #define KC_SW0 KC_FN0 | ||
| 5 | #define DEBUG_ACTION | ||
| 6 | |||
| 7 | static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
| 8 | |||
| 9 | /* Keymap 0: Basic layer | ||
| 10 | * | ||
| 11 | * ,--------------------------------------------------. ,--------------------------------------------------. | ||
| 12 | * | = | 1 | 2 | 3 | 4 | 5 | LEFT | | RIGHT| 6 | 7 | 8 | 9 | 0 | - | | ||
| 13 | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| | ||
| 14 | * | Del | Q | W | E | R | T | Up | | Up | Y | U | I | O | P | \ | | ||
| 15 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| | ||
| 16 | * | BkSp | A | S | D | F | G |------| |------| H | J | K | L |; / L2| ' | | ||
| 17 | * |--------+------+------+------+------+------| L1 | | L1 |------+------+------+------+------+--------| | ||
| 18 | * | LShift |Z/Ctrl| X | C | V | B | | | | N | M | , | . |//Ctrl| RShift | | ||
| 19 | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' | ||
| 20 | * |Grv/L1| ~L1 | TAB | Left | Right| | Up | Down | [ | ] | ~L1 | | ||
| 21 | * `----------------------------------' `----------------------------------' | ||
| 22 | * ,-------------. ,-------------. | ||
| 23 | * | Rclk | LGui | | Alt |Ctrl/Esc| | ||
| 24 | * ,------|------|------| |------+--------+------. | ||
| 25 | * | | | Home | | PgUp | | | | ||
| 26 | * | Space| Enter|------| |------| Tab |Enter | | ||
| 27 | * | | | End | | PgDn | | | | ||
| 28 | * `--------------------' `----------------------' | ||
| 29 | */ | ||
| 30 | |||
| 31 | |||
| 32 | // Basic layer | ||
| 33 | |||
| 34 | KEYMAP( | ||
| 35 | EQL, 1, 2, 3, 4, 5, LEFT, | ||
| 36 | DEL, Q, W, E, R, T, UP, | ||
| 37 | BSPC, A, S, D, F, G, | ||
| 38 | LSFT, FN29, X, C, V, B, FN1, | ||
| 39 | FN30, FN4, TAB, LEFT, RIGHT, | ||
| 40 | |||
| 41 | BTN2,LGUI, | ||
| 42 | HOME, | ||
| 43 | SPC, ENT, END, | ||
| 44 | //RIGHT | ||
| 45 | RIGHT,6, 7, 8, 9, 0, MINS, | ||
| 46 | UP, Y, U, I, O, P, BSLS, | ||
| 47 | H, J, K, L, FN31, QUOT, | ||
| 48 | FN1, N, M, COMM, DOT, FN28, RSFT, | ||
| 49 | UP, DOWN, LBRC, RBRC, FN4, | ||
| 50 | LALT, FN27, | ||
| 51 | PGUP, | ||
| 52 | PGDN, TAB, ENT | ||
| 53 | ), | ||
| 54 | |||
| 55 | /* Keymap 1: Symbol Layer | ||
| 56 | * | ||
| 57 | * ,--------------------------------------------------. ,--------------------------------------------------. | ||
| 58 | * | Flash | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F11 | | ||
| 59 | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| | ||
| 60 | * | | ! | @ | { | } | | | | | | Up | 7 | 8 | 9 | * | F12 | | ||
| 61 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| | ||
| 62 | * | : | # | $ | ( | ) | ` |------| |------| Down | 4 | 5 | 6 | + | | | ||
| 63 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| | ||
| 64 | * | | % | ^ | [ | ] | ~ | | | | & | 1 | 2 | 3 | \ | | | ||
| 65 | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' | ||
| 66 | * | | | | | | | | . | 0 | = | | | ||
| 67 | * `----------------------------------' `----------------------------------' | ||
| 68 | * ,-------------. ,-------------. | ||
| 69 | * | | | | | | | ||
| 70 | * ,------|------|------| |------+------+------. | ||
| 71 | * | | | | | | | | | ||
| 72 | * | | |------| |------| | | | ||
| 73 | * | | | | | | | | | ||
| 74 | * `--------------------' `--------------------' | ||
| 75 | */ | ||
| 76 | // SYMBOLS | ||
| 77 | KEYMAP( | ||
| 78 | FN0, F1, F2, F3, F4, F5, TRNS, | ||
| 79 | TRNS, FN7, FN8, FN23, FN24, FN18, TRNS, | ||
| 80 | FN22, FN9, FN10, FN15, FN16, GRV, | ||
| 81 | TRNS, FN11, FN12, LBRC, RBRC, FN17, TRNS, | ||
| 82 | TRNS, TRNS, TRNS, TRNS, TRNS, | ||
| 83 | |||
| 84 | TRNS, TRNS, | ||
| 85 | TRNS, | ||
| 86 | TRNS, TRNS, TRNS, | ||
| 87 | // right hand | ||
| 88 | TRNS, F6, F7, F8, F9, F10, F11, | ||
| 89 | TRNS, UP, 7, 8, 9, FN14, F12, | ||
| 90 | DOWN, 4, 5, 6, FN26, TRNS, | ||
| 91 | TRNS, FN13, 1, 2, 3, BSLS, TRNS, | ||
| 92 | TRNS,DOT, 0, EQL, TRNS, | ||
| 93 | TRNS, TRNS, | ||
| 94 | TRNS, | ||
| 95 | TRNS, TRNS, TRNS | ||
| 96 | ), | ||
| 97 | /* Keymap 2: Media and mouse keys | ||
| 98 | * | ||
| 99 | * ,--------------------------------------------------. ,--------------------------------------------------. | ||
| 100 | * | | | | | | | | | | | | | | | | | ||
| 101 | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| | ||
| 102 | * | | | MsUp | | | | | | | | | | | | | | ||
| 103 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| | ||
| 104 | * | |MsLeft|MsDown|MsRght| | |------| |------| | | | Play | | Mute | | ||
| 105 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| | ||
| 106 | * | | | | | | | | | | | | Prev | Next | | | | ||
| 107 | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' | ||
| 108 | * | | | | Lclk | Rclk | |VolUp |VolDn | | | | | ||
| 109 | * `----------------------------------' `----------------------------------' | ||
| 110 | * ,-------------. ,-------------. | ||
| 111 | * | | | | | | | ||
| 112 | * ,------|------|------| |------+------+------. | ||
| 113 | * | | | | | | | | | ||
| 114 | * | | |------| |------| | | | ||
| 115 | * | | | | | | | | | ||
| 116 | * `--------------------' `--------------------' | ||
| 117 | */ | ||
| 118 | // MEDIA AND MOUSE | ||
| 119 | KEYMAP( | ||
| 120 | TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, | ||
| 121 | TRNS, TRNS, MS_U, TRNS, TRNS, TRNS, TRNS, | ||
| 122 | TRNS, MS_L, MS_D, MS_R, TRNS, TRNS, | ||
| 123 | TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, | ||
| 124 | TRNS, TRNS, TRNS, BTN3, BTN2, | ||
| 125 | |||
| 126 | TRNS, TRNS, | ||
| 127 | TRNS, | ||
| 128 | TRNS, TRNS, TRNS, | ||
| 129 | // right hand | ||
| 130 | TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, | ||
| 131 | TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, | ||
| 132 | TRNS, TRNS, TRNS, MPLY, TRNS, TRNS, | ||
| 133 | TRNS, TRNS, TRNS, MPRV, MNXT, TRNS, TRNS, | ||
| 134 | VOLU, VOLD, TRNS, TRNS, TRNS, | ||
| 135 | TRNS, TRNS, | ||
| 136 | TRNS, | ||
| 137 | TRNS, TRNS, WBAK | ||
| 138 | ), | ||
| 139 | }; | ||
| 140 | |||
| 141 | /* id for user defined functions */ | ||
| 142 | enum function_id { | ||
| 143 | TEENSY_KEY, | ||
| 144 | }; | ||
| 145 | |||
| 146 | /* | ||
| 147 | * Fn action definition | ||
| 148 | */ | ||
| 149 | static const uint16_t PROGMEM fn_actions[] = { | ||
| 150 | [0] = ACTION_FUNCTION(TEENSY_KEY), // FN0 - Teensy key | ||
| 151 | [1] = ACTION_LAYER_INVERT(1, ON_RELEASE), // FN1 - Toggle 1 | ||
| 152 | [2] = ACTION_LAYER_TOGGLE(2), // FN2 - Toggle 2 | ||
| 153 | [3] = ACTION_LAYER_TOGGLE(3), // FN3 - Toggle 3 | ||
| 154 | [4] = ACTION_LAYER_TAP_TOGGLE(1), // FN4 - Momentary Layer 1 | ||
| 155 | [5] = ACTION_LAYER_MOMENTARY(2), // FN5 - Momentary L2 | ||
| 156 | |||
| 157 | // SYMBOLS | ||
| 158 | ACTION_MODS_KEY(MOD_LSFT, KC_QUOT), // FN6 - " | ||
| 159 | ACTION_MODS_KEY(MOD_LSFT, KC_1), // FN7 - ! | ||
| 160 | ACTION_MODS_KEY(MOD_LSFT, KC_2), // FN8 - @ | ||
| 161 | ACTION_MODS_KEY(MOD_LSFT, KC_3), // FN9 - # | ||
| 162 | ACTION_MODS_KEY(MOD_LSFT, KC_4), // FN10 - $ | ||
| 163 | ACTION_MODS_KEY(MOD_LSFT, KC_5), // FN11 - % | ||
| 164 | ACTION_MODS_KEY(MOD_LSFT, KC_6), // FN12 - ^ | ||
| 165 | ACTION_MODS_KEY(MOD_LSFT, KC_7), // FN13 - & | ||
| 166 | ACTION_MODS_KEY(MOD_LSFT, KC_8), // FN14 - * | ||
| 167 | ACTION_MODS_KEY(MOD_LSFT, KC_9), // FN15 - ( | ||
| 168 | ACTION_MODS_KEY(MOD_LSFT, KC_0), // FN16 - ) | ||
| 169 | ACTION_MODS_KEY(MOD_LSFT, KC_GRV), // FN17 - ~ | ||
| 170 | ACTION_MODS_KEY(MOD_LSFT, KC_BSLS), // FN18 - | | ||
| 171 | ACTION_MODS_KEY(MOD_LSFT, KC_MINS), // FN19 - _ | ||
| 172 | ACTION_MODS_KEY(MOD_LSFT, KC_COMM), // FN20 - < | ||
| 173 | ACTION_MODS_KEY(MOD_LSFT, KC_DOT), // FN21 - > | ||
| 174 | ACTION_MODS_KEY(MOD_LSFT, KC_SCLN), // FN22 - : | ||
| 175 | ACTION_MODS_KEY(MOD_LSFT, KC_LBRC), // FN23 - { | ||
| 176 | ACTION_MODS_KEY(MOD_LSFT, KC_RBRC), // FN24 - } | ||
| 177 | ACTION_MODS_KEY(MOD_LSFT, KC_SLSH), // FN25 - ? | ||
| 178 | ACTION_MODS_KEY(MOD_LSFT, KC_EQL), // FN26 - + | ||
| 179 | |||
| 180 | ACTION_MODS_TAP_KEY(MOD_LCTL, KC_ESC), // FN27 - Control/esc on tap | ||
| 181 | ACTION_MODS_TAP_KEY(MOD_LCTL, KC_SLSH), // FN28 - slash becomes Ctrl when held (right pinky) | ||
| 182 | ACTION_MODS_TAP_KEY(MOD_LCTL, KC_Z), // FN29 - z becomes Ctrl when held (left pinky) | ||
| 183 | |||
| 184 | // Fancy tapping/toggling | ||
| 185 | ACTION_LAYER_TAP_KEY(1, KC_GRV), // FN30 - Layer 1 when holding backtick key | ||
| 186 | ACTION_LAYER_TAP_KEY(2, KC_SCLN), // FN31 - Layer 2 when holding semicolon key | ||
| 187 | |||
| 188 | |||
| 189 | }; | ||
| 190 | |||
| 191 | void action_function(keyrecord_t *event, uint8_t id, uint8_t opt) | ||
| 192 | { | ||
| 193 | print("action_function called\n"); | ||
| 194 | print("id = "); phex(id); print("\n"); | ||
| 195 | print("opt = "); phex(opt); print("\n"); | ||
| 196 | if (id == TEENSY_KEY) { | ||
| 197 | clear_keyboard(); | ||
| 198 | print("\n\nJump to bootloader... "); | ||
| 199 | _delay_ms(250); | ||
| 200 | bootloader_jump(); // should not return | ||
| 201 | print("not supported.\n"); | ||
| 202 | } | ||
| 203 | } | ||
| 204 | |||
| 205 | void * matrix_init_user(void) { | ||
| 206 | |||
| 207 | }; | ||
| 208 | |||
| 209 | void * matrix_scan_user(void) { | ||
| 210 | |||
| 211 | }; | ||
diff --git a/keyboard/ergodox_ez/reference_compiled_default_firmware.hex b/keyboard/ergodox_ez/reference_compiled_default_firmware.hex index 322a56ec3..69577c549 100644 --- a/keyboard/ergodox_ez/reference_compiled_default_firmware.hex +++ b/keyboard/ergodox_ez/reference_compiled_default_firmware.hex | |||
| @@ -16,14 +16,14 @@ | |||
| 16 | :1000F0001E00140004001D71E1044D001F001A00D1 | 16 | :1000F0001E00140004001D71E1044D001F001A00D1 |
| 17 | :1001000016001B002B002A00200008000700060034 | 17 | :1001000016001B002B002A00200008000700060034 |
| 18 | :1001100050002C0021001500090019004F004A0072 | 18 | :1001100050002C0021001500090019004F004A0072 |
| 19 | :10012000220017000A0005000000760050002B0096 | 19 | :10012000220017000A00050000006500500001547D |
| 20 | :10013000000033020000E3004F00330200000154CE | 20 | :100130000000007F0000E3004F0001540000007F3A |
| 21 | :100140000000E20023001C000B00110000002971D8 | 21 | :100140000000E20023001C000B00110000002971D8 |
| 22 | :10015000240018000D00100052004B0025000C0078 | 22 | :10015000240018000D00100052004B0025000C0078 |
| 23 | :100160000E00360051002800260012000F00370054 | 23 | :100160000E00360051002800260012000F00370054 |
| 24 | :100170002F002B00270013003382387130004E000F | 24 | :100170002F002B00270013003382387130004E000F |
| 25 | :100180002D0031003400E500C10000000100010035 | 25 | :100180002D0031003400E500C10000000100010035 |
| 26 | :1001900033020100010000003A001E022002220288 | 26 | :1001900001000100010000003A001E0220022202BC |
| 27 | :1001A000010001003B001F022102230201000100A7 | 27 | :1001A000010001003B001F022102230201000100A7 |
| 28 | :1001B0003C002F0226022F00010001003D0030020A | 28 | :1001B0003C002F0226022F00010001003D0030020A |
| 29 | :1001C00027023000010001003E00380235003502F0 | 29 | :1001C00027023000010001003E00380235003502F0 |
| @@ -34,16 +34,16 @@ | |||
| 34 | :1002100042002600230020002700010043002502A1 | 34 | :1002100042002600230020002700010043002502A1 |
| 35 | :100220002E0231002E0001004400450001000100B3 | 35 | :100220002E0231002E0001004400450001000100B3 |
| 36 | :1002300001000000010001000100010001000000B8 | 36 | :1002300001000000010001000100010001000000B8 |
| 37 | :1002400001000100F2000100010001000100F000C6 | 37 | :1002400001000100010001000100010001000100A6 |
| 38 | :10025000F10001000100010001000100F3000100B4 | 38 | :10025000F2000100010001000100F000F1000100C6 |
| 39 | :10026000F60001000100010001000100F50001009D | 39 | :10026000F600010001000100F3000100F5000100AB |
| 40 | :100270000100010001000100000001000100010077 | 40 | :100270000100010001000100000001000100010077 |
| 41 | :100280000000010000000100010001000000010069 | 41 | :100280000000010000000100010001000000010069 |
| 42 | :100290000000010001000100010001000000010058 | 42 | :100290000000010001000100010001000000010058 |
| 43 | :1002A0000100010001000100A9000100010001009E | 43 | :1002A0000100010001000100A9000100010001009E |
| 44 | :1002B0000100AC00AA00B60001000100AE00AB00D6 | 44 | :1002B0000100AC00AA00B600010001000100AB0083 |
| 45 | :1002C0000100010001000100010001000100010026 | 45 | :1002C000A80001000100010001000100010001007F |
| 46 | :1002D00001000100A8000100010000000A00253013 | 46 | :1002D00001000100AE000100010000000A0025300D |
| 47 | :1002E000313662003A200025303258000A722F63FE | 47 | :1002E000313662003A200025303258000A722F63FE |
| 48 | :1002F0002030313233343536373839414243444582 | 48 | :1002F0002030313233343536373839414243444582 |
| 49 | :10030000460A000A002530325800626F756E636538 | 49 | :10030000460A000A002530325800626F756E636538 |
| @@ -185,9 +185,9 @@ | |||
| 185 | :100B80004F4F544D41474943204D4F5553454B45D9 | 185 | :100B80004F4F544D41474943204D4F5553454B45D9 |
| 186 | :100B9000592045585452414B455920434F4E534FCD | 186 | :100B9000592045585452414B455920434F4E534FCD |
| 187 | :100BA0004C4520434F4D4D414E44203531320A00D3 | 187 | :100BA0004C4520434F4D4D414E44203531320A00D3 |
| 188 | :100BB0004255494C443A20643364623864362D64AB | 188 | :100BB0004255494C443A20656130653131362D64E7 |
| 189 | :100BC00069727479202830343A31363A3137204FFF | 189 | :100BC00069727479202830303A31343A3339204F01 |
| 190 | :100BD00063742032382032303135290A00564944B6 | 190 | :100BD00063742032392032303135290A00564944B5 |
| 191 | :100BE0003A20307846454544284572676F446F780F | 191 | :100BE0003A20307846454544284572676F446F780F |
| 192 | :100BF00020455A29205049443A2030783133303743 | 192 | :100BF00020455A29205049443A2030783133303743 |
| 193 | :100C0000284572676F446F7820455A29205645520F | 193 | :100C0000284572676F446F7820455A29205645520F |
diff --git a/quantum/keymap_common.h b/quantum/keymap_common.h index fbb2ac8c2..550b1528b 100644 --- a/quantum/keymap_common.h +++ b/quantum/keymap_common.h | |||
| @@ -188,6 +188,7 @@ extern const uint16_t fn_actions[]; | |||
| 188 | #define SFT_T(kc) MT(0x2, kc) | 188 | #define SFT_T(kc) MT(0x2, kc) |
| 189 | #define ALT_T(kc) MT(0x4, kc) | 189 | #define ALT_T(kc) MT(0x4, kc) |
| 190 | #define GUI_T(kc) MT(0x8, kc) | 190 | #define GUI_T(kc) MT(0x8, kc) |
| 191 | #define ALL_T(kc) MT(0xF, kc) // see http://brettterpstra.com/2012/12/08/a-useful-caps-lock-key/ | ||
| 191 | 192 | ||
| 192 | // L-ayer, T-ap - 256 keycode max, 16 layer max | 193 | // L-ayer, T-ap - 256 keycode max, 16 layer max |
| 193 | #define LT(layer, kc) (kc | 0x8000 | ((layer & 0xF) << 8)) | 194 | #define LT(layer, kc) (kc | 0x8000 | ((layer & 0xF) << 8)) |
