aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErez Zukerman <ezukerman@godaddy.com>2016-12-05 20:35:03 -0500
committerErez Zukerman <ezukerman@godaddy.com>2016-12-05 20:35:03 -0500
commit82922a4937dc9683a2364f750a67b80b63767ab5 (patch)
tree1b077db171b784655a4eb7ef98bbd9cd8d3cc684
parenta05b6a72d9da9fa6056046c9f600957f43b3c8df (diff)
downloadqmk_firmware-82922a4937dc9683a2364f750a67b80b63767ab5.tar.gz
qmk_firmware-82922a4937dc9683a2364f750a67b80b63767ab5.zip
A new default layout that supports Shine
-rw-r--r--keyboards/ergodox/keymaps/default/keymap.c84
-rw-r--r--keyboards/ergodox/keymaps/erez_experimental/keymap.c2
2 files changed, 59 insertions, 27 deletions
diff --git a/keyboards/ergodox/keymaps/default/keymap.c b/keyboards/ergodox/keymaps/default/keymap.c
index 2f399bd18..4eff28085 100644
--- a/keyboards/ergodox/keymaps/default/keymap.c
+++ b/keyboards/ergodox/keymaps/default/keymap.c
@@ -7,7 +7,12 @@
7#define SYMB 1 // symbols 7#define SYMB 1 // symbols
8#define MDIA 2 // media keys 8#define MDIA 2 // media keys
9 9
10#define EPRM M(1) // Macro 1: Reset EEPROM 10enum custom_keycodes {
11 PLACEHOLDER = SAFE_RANGE, // can always be here
12 EPRM,
13 VRSN,
14 RGB_SLD
15};
11 16
12const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 17const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
13/* Keymap 0: Basic layer 18/* Keymap 0: Basic layer
@@ -17,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
17 * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| 22 * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
18 * | Del | Q | W | E | R | T | L1 | | L1 | Y | U | I | O | P | \ | 23 * | Del | Q | W | E | R | T | L1 | | L1 | Y | U | I | O | P | \ |
19 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| 24 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
20 * | BkSp | A | S | D | F | G |------| |------| H | J | K | L |; / L2|' / Cmd | 25 * | BkSp | A | S | D | F | G |------| |------| H |J/Alt | K | L |; / L2|' / Cmd |
21 * |--------+------+------+------+------+------| Hyper| | Meh |------+------+------+------+------+--------| 26 * |--------+------+------+------+------+------| Hyper| | Meh |------+------+------+------+------+--------|
22 * | LShift |Z/Ctrl| X | C | V | B | | | | N | M | , | . |//Ctrl| RShift | 27 * | LShift |Z/Ctrl| X | C | V | B | | | | N | M | , | . |//Ctrl| RShift |
23 * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' 28 * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
@@ -44,56 +49,56 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
44 KC_HOME, 49 KC_HOME,
45 KC_SPC,KC_BSPC,KC_END, 50 KC_SPC,KC_BSPC,KC_END,
46 // right hand 51 // right hand
47 KC_RGHT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, 52 KC_RGHT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
48 TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, 53 TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
49 KC_H, KC_J, KC_K, KC_L, LT(MDIA, KC_SCLN),GUI_T(KC_QUOT), 54 KC_H, ALT_T(KC_J), KC_K, KC_L, LT(MDIA, KC_SCLN),GUI_T(KC_QUOT),
50 MEH_T(KC_NO),KC_N, KC_M, KC_COMM,KC_DOT, CTL_T(KC_SLSH), KC_RSFT, 55 MEH_T(KC_NO),KC_N, KC_M, KC_COMM,KC_DOT, CTL_T(KC_SLSH), KC_RSFT,
51 KC_UP, KC_DOWN,KC_LBRC,KC_RBRC, KC_FN1, 56 KC_UP, KC_DOWN,KC_LBRC,KC_RBRC, KC_FN1,
52 KC_LALT, CTL_T(KC_ESC), 57 KC_LALT, CTL_T(KC_ESC),
53 KC_PGUP, 58 KC_PGUP,
54 KC_PGDN,KC_TAB, KC_ENT 59 KC_PGDN,KC_TAB, KC_ENT
55 ), 60 ),
56/* Keymap 1: Symbol Layer 61/* Keymap 1: Symbol Layer
57 * 62 *
58 * ,--------------------------------------------------. ,--------------------------------------------------. 63 * ,---------------------------------------------------. ,--------------------------------------------------.
59 * |Version | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F11 | 64 * |Version | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F11 |
60 * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| 65 * |---------+------+------+------+------+------+------| |------+------+------+------+------+------+--------|
61 * | | ! | @ | { | } | | | | | | Up | 7 | 8 | 9 | * | F12 | 66 * | | ! | @ | { | } | | | | | | Up | 7 | 8 | 9 | * | F12 |
62 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| 67 * |---------+------+------+------+------+------| | | |------+------+------+------+------+--------|
63 * | | # | $ | ( | ) | ` |------| |------| Down | 4 | 5 | 6 | + | | 68 * | | # | $ | ( | ) | ` |------| |------| Down | 4 | 5 | 6 | + | |
64 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| 69 * |---------+------+------+------+------+------| | | |------+------+------+------+------+--------|
65 * | | % | ^ | [ | ] | ~ | | | | & | 1 | 2 | 3 | \ | | 70 * | | % | ^ | [ | ] | ~ | | | | & | 1 | 2 | 3 | \ | |
66 * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' 71 * `---------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
67 * | EPRM | | | | | | | . | 0 | = | | 72 * | EPRM | | | | | | | . | 0 | = | |
68 * `----------------------------------' `----------------------------------' 73 * `-----------------------------------' `----------------------------------'
69 * ,-------------. ,-------------. 74 * ,-------------. ,-------------.
70 * | | | | | | 75 * |Animat| | |Toggle|Solid |
71 * ,------|------|------| |------+------+------. 76 * ,------|------|------| |------+------+------.
72 * | | | | | | | | 77 * |Bright|Bright| | | |Hue- |Hue+ |
73 * | | |------| |------| | | 78 * |ness- |ness+ |------| |------| | |
74 * | | | | | | | | 79 * | | | | | | | |
75 * `--------------------' `--------------------' 80 * `--------------------' `--------------------'
76 */ 81 */
77// SYMBOLS 82// SYMBOLS
78[SYMB] = KEYMAP( 83[SYMB] = KEYMAP(
79 // left hand 84 // left hand
80 M(0), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, 85 VRSN, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS,
81 KC_TRNS,KC_EXLM,KC_AT, KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS, 86 KC_TRNS,KC_EXLM,KC_AT, KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
82 KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV, 87 KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV,
83 KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS, 88 KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS,
84 EPRM,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, 89 EPRM,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
85 KC_TRNS,KC_TRNS, 90 RGB_MOD,KC_TRNS,
86 KC_TRNS, 91 KC_TRNS,
87 KC_TRNS,KC_TRNS,KC_TRNS, 92 RGB_VAD,RGB_VAI,KC_TRNS,
88 // right hand 93 // right hand
89 KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, 94 KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
90 KC_TRNS, KC_UP, KC_7, KC_8, KC_9, KC_ASTR, KC_F12, 95 KC_TRNS, KC_UP, KC_7, KC_8, KC_9, KC_ASTR, KC_F12,
91 KC_DOWN, KC_4, KC_5, KC_6, KC_PLUS, KC_TRNS, 96 KC_DOWN, KC_4, KC_5, KC_6, KC_PLUS, KC_TRNS,
92 KC_TRNS, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLS, KC_TRNS, 97 KC_TRNS, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLS, KC_TRNS,
93 KC_TRNS,KC_DOT, KC_0, KC_EQL, KC_TRNS, 98 KC_TRNS,KC_DOT, KC_0, KC_EQL, KC_TRNS,
94 KC_TRNS, KC_TRNS, 99 RGB_TOG, RGB_SLD,
95 KC_TRNS, 100 KC_TRNS,
96 KC_TRNS, KC_TRNS, KC_TRNS 101 KC_TRNS, RGB_HUD, RGB_HUI
97), 102),
98/* Keymap 2: Media and mouse keys 103/* Keymap 2: Media and mouse keys
99 * 104 *
@@ -160,6 +165,33 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
160 return MACRO_NONE; 165 return MACRO_NONE;
161}; 166};
162 167
168bool process_record_user(uint16_t keycode, keyrecord_t *record) {
169 switch (keycode) {
170 // dynamically generate these.
171 case EPRM:
172 if (record->event.pressed) {
173 eeconfig_init();
174 }
175 return false;
176 break;
177 case VRSN:
178 if (record->event.pressed) {
179 SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
180 }
181 return false;
182 break;
183 case RGB_SLD:
184 if (record->event.pressed) {
185 #ifdef RGBLIGHT_ENABLE
186 rgblight_mode(1);
187 #endif
188 }
189 return false;
190 break;
191 }
192 return true;
193}
194
163// Runs just one time when the keyboard initializes. 195// Runs just one time when the keyboard initializes.
164void matrix_init_user(void) { 196void matrix_init_user(void) {
165 197
diff --git a/keyboards/ergodox/keymaps/erez_experimental/keymap.c b/keyboards/ergodox/keymaps/erez_experimental/keymap.c
index 2963c40e3..13b8240ce 100644
--- a/keyboards/ergodox/keymaps/erez_experimental/keymap.c
+++ b/keyboards/ergodox/keymaps/erez_experimental/keymap.c
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
73 * ,-------------. ,-------------. 73 * ,-------------. ,-------------.
74 * | | | |TOG | 74 * | | | |TOG |
75 * ,------|------|------| |------+------+------. 75 * ,------|------|------| |------+------+------.
76 * |VAI |VAD |HUI | |SAI |TOG |MOD | 76 * |VAI |VAD |HUI | |SAI | |MOD |
77 * | | |------| |------| | | 77 * | | |------| |------| | |
78 * | | |HUD | |SAD | | | 78 * | | |HUD | |SAD | | |
79 * `--------------------' `--------------------' 79 * `--------------------' `--------------------'