aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErez Zukerman <bulk@ezuk.org>2016-05-02 21:04:13 -0400
committerErez Zukerman <bulk@ezuk.org>2016-05-02 21:04:13 -0400
commit2c070163ffffffde546fb00acaa2fbb96b93da64 (patch)
tree682a322ce2c3e2004abb4fbd00fc00316277b935
parent1ce6da26055521dfa1da4032fe4e0ccd90521e6d (diff)
parent1173dbd02f5a235e6d1542e875cc1d9ed43a2e8d (diff)
downloadqmk_firmware-2c070163ffffffde546fb00acaa2fbb96b93da64.tar.gz
qmk_firmware-2c070163ffffffde546fb00acaa2fbb96b93da64.zip
Merge pull request #300 from Twey/tweymap-momentary
Swap steno/media layers to allow using media keys in the Plover layer…
Diffstat
-rw-r--r--keyboard/ergodox_ez/keymaps/twey/keymap.c108
1 files changed, 50 insertions, 58 deletions
diff --git a/keyboard/ergodox_ez/keymaps/twey/keymap.c b/keyboard/ergodox_ez/keymaps/twey/keymap.c
index 75d264bdb..dec9f92f1 100644
--- a/keyboard/ergodox_ez/keymaps/twey/keymap.c
+++ b/keyboard/ergodox_ez/keymaps/twey/keymap.c
@@ -5,8 +5,8 @@
5 5
6#define BASE 0 // default layer 6#define BASE 0 // default layer
7#define SYMB 1 // symbols 7#define SYMB 1 // symbols
8#define MDIA 2 // media keys 8#define STEN 2 // steno
9#define STEN 3 // steno 9#define MDIA 3 // media keys
10 10
11 11
12const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 12const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -17,19 +17,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
17 * |--------+------+------+------+-------+-------------| |-------+------+------+------+------+------+--------| 17 * |--------+------+------+------+-------+-------------| |-------+------+------+------+------+------+--------|
18 * | Del | ' | , | . | P | Y | Esc | | Caps | F | G | C | R | L | / | 18 * | Del | ' | , | . | P | Y | Esc | | Caps | F | G | C | R | L | / |
19 * |--------+------+------+------+-------+------| | | |------+------+------+------+------+--------| 19 * |--------+------+------+------+-------+------| | | |------+------+------+------+------+--------|
20 * | BkSp | A | O | E | U | I |------| |-------| D | H | T | N |S / L2|- / Cmd | 20 * | BkSp | A | O | E | U | I |------| |-------| D | H | T | N | S | - |
21 * |--------+------+------+------+-------+------| Tab | | Enter |------+------+------+------+------+--------| 21 * |--------+------+------+------+-------+------| Tab | | Enter |------+------+------+------+------+--------|
22 * | LShift | ; | Q | J | K | X | | | | B | M | W | V | Z | RShift | 22 * | LShift | ; | Q | J | K | X | | | | B | M | W | V | Z | RShift |
23 * `--------+------+------+------+-------+-------------' `--------------+------+------+------+------+--------' 23 * `--------+------+------+------+-------+-------------' `--------------+------+------+------+------+--------'
24 * |Grv/L1| '" |AltShf| Left | Right | | Up | Down | [ | ] | ~L1 | 24 * | L1 | NONE | Grv | Left | Right | | Up | Down | [ | ] | L1 |
25 * `-----------------------------------' `----------------------------------' 25 * `-----------------------------------' `----------------------------------'
26 * ,-------------. ,---------------. 26 * ,--------------. ,---------------.
27 * | PgUp | PgDn | | Home | End | 27 * | PgUp | PgDn | | Home | End |
28 * ,------|------|------| |-------+-------+------. 28 * ,------|-------|------| |-------+-------+------.
29 * | | | NONE | | NONE | | | 29 * | | | NONE | | AltGr | | |
30 * | Alt | NONE |------| |-------| Space | Ctrl | 30 * | Alt | Enter |------| |-------| Space | Ctrl |
31 * | | | Supr | | AltGr | | | 31 * | | | Supr | | ~MDIA | | |
32 * `--------------------' `----------------------' 32 * `---------------------' `----------------------'
33 */ 33 */
34// If it accepts an argument (i.e, is a function), it doesn't need KC_. 34// If it accepts an argument (i.e, is a function), it doesn't need KC_.
35// Otherwise, it needs KC_* 35// Otherwise, it needs KC_*
@@ -39,19 +39,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
39 KC_DELT, KC_QUOT, KC_COMM,KC_DOT, KC_P, KC_Y, KC_ESC, 39 KC_DELT, KC_QUOT, KC_COMM,KC_DOT, KC_P, KC_Y, KC_ESC,
40 KC_BSPC, KC_A, KC_O, KC_E, KC_U, KC_I, 40 KC_BSPC, KC_A, KC_O, KC_E, KC_U, KC_I,
41 KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_TAB, 41 KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_TAB,
42 LT(SYMB,KC_GRV),KC_QUOT, LALT(KC_LSFT), KC_LEFT,KC_RGHT, 42 MO(SYMB), KC_NO, KC_GRV, KC_LEFT,KC_RGHT,
43 KC_PGUP,KC_PGDN, 43 KC_PGUP,KC_PGDN,
44 KC_NO, 44 KC_NO,
45 KC_LALT,KC_ENT ,KC_LGUI, 45 KC_LALT,KC_ENT ,KC_LGUI,
46 // right hand 46 // right hand
47 KC_NO, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, 47 KC_NO, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS,
48 KC_CAPS, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, 48 KC_CAPS, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH,
49 KC_D, KC_H, KC_T, KC_N, LT(MDIA, KC_S), GUI_T(KC_MINS), 49 KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS,
50 KC_ENT, KC_B, KC_M, KC_W, KC_V, KC_Z , KC_RSFT, 50 KC_ENT, KC_B, KC_M, KC_W, KC_V, KC_Z , KC_RSFT,
51 KC_UP, KC_DOWN,KC_LBRC,KC_RBRC, KC_FN1, 51 KC_UP, KC_DOWN,KC_LBRC,KC_RBRC, MO(SYMB),
52 KC_HOME,KC_END, 52 KC_HOME,KC_END,
53 KC_NO, 53 KC_RALT,
54 KC_RALT,KC_SPC,KC_RCTL 54 KC_FN1,KC_SPC,KC_RCTL
55 ), 55 ),
56/* Keymap 1: Symbol Layer 56/* Keymap 1: Symbol Layer
57 * 57 *
@@ -95,7 +95,29 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
95 KC_TRNS, 95 KC_TRNS,
96 KC_TRNS, KC_TRNS, KC_TRNS 96 KC_TRNS, KC_TRNS, KC_TRNS
97), 97),
98/* Keymap 2: Media and mouse keys 98
99[STEN] = KEYMAP( // layout: layer 2: Steno for Plover
100 // left hand
101 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS,
102 KC_NO, PV_NUM, PV_NUM, PV_NUM, PV_NUM, PV_NUM, PV_STAR,
103 KC_NO, PV_LS, PV_LT, PV_LP, PV_LH, PV_STAR,
104 KC_NO, PV_LS, PV_LK, PV_LW, PV_LR, PV_STAR, PV_STAR,
105 KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS,
106 KC_NO, KC_NO,
107 KC_NO,
108 PV_A, PV_O, KC_NO,
109 // right hand
110 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
111 PV_STAR, PV_NUM, PV_NUM, PV_NUM, PV_NUM, PV_NUM, PV_NUM,
112 PV_STAR, PV_RF, PV_RP, PV_RL, PV_RT, PV_RD,
113 PV_STAR, PV_STAR, PV_RR, PV_RB, PV_RG, PV_RS, PV_RZ,
114 KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO,
115 KC_NO, KC_NO,
116 KC_NO,
117 KC_FN1, PV_E, PV_U
118),
119
120/* Keymap 3: Media and mouse keys
99 * 121 *
100 * ,--------------------------------------------------. ,--------------------------------------------------. 122 * ,--------------------------------------------------. ,--------------------------------------------------.
101 * | | | | | | | | | | | | | | | | 123 * | | | | | | | | | | | | | | | |
@@ -136,31 +158,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
136 KC_TRNS, 158 KC_TRNS,
137 KC_TRNS, KC_TRNS, KC_WBAK 159 KC_TRNS, KC_TRNS, KC_WBAK
138), 160),
139
140[STEN] = KEYMAP( // layout: layer 4: Steno for Plover
141 // left hand
142 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS,
143 KC_NO, PV_NUM, PV_NUM, PV_NUM, PV_NUM, PV_NUM, PV_STAR,
144 KC_NO, PV_LS, PV_LT, PV_LP, PV_LH, PV_STAR,
145 KC_NO, PV_LS, PV_LK, PV_LW, PV_LR, PV_STAR, PV_STAR,
146 KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS,
147 KC_NO, KC_NO,
148 KC_NO,
149 PV_A, PV_O, KC_NO,
150 // right hand
151 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
152 PV_STAR, PV_NUM, PV_NUM, PV_NUM, PV_NUM, PV_NUM, PV_NUM,
153 PV_STAR, PV_RF, PV_RP, PV_RL, PV_RT, PV_RD,
154 PV_STAR, PV_STAR, PV_RR, PV_RB, PV_RG, PV_RS, PV_RZ,
155 KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO,
156 KC_NO, KC_NO,
157 KC_NO,
158 KC_NO, PV_E, PV_U
159),
160}; 161};
161 162
162const uint16_t PROGMEM fn_actions[] = { 163const uint16_t PROGMEM fn_actions[] = {
163 [1] = ACTION_LAYER_TAP_TOGGLE(SYMB) // FN1 - Momentary Layer 1 (Symbols) 164 [1] = ACTION_LAYER_TAP_TOGGLE(MDIA) // FN1 - Momentary Layer 3 (Media)
164}; 165};
165 166
166void toggle_steno(int pressed) 167void toggle_steno(int pressed)
@@ -200,26 +201,17 @@ void matrix_init_user(void) {
200 201
201// Runs constantly in the background, in a loop. 202// Runs constantly in the background, in a loop.
202void matrix_scan_user(void) { 203void matrix_scan_user(void) {
203 uint8_t layer = biton32(layer_state); 204 uint32_t layer0 = layer_state & (1UL << 0),
205 layer1 = layer_state & (1UL << 1),
206 layer2 = layer_state & (1UL << 2),
207 layer3 = layer_state & (1UL << 3);
204 208
205 ergodox_board_led_off(); 209 ergodox_board_led_off();
206 ergodox_right_led_1_off(); 210 ergodox_right_led_1_off();
207 ergodox_right_led_2_off(); 211 ergodox_right_led_2_off();
208 ergodox_right_led_3_off(); 212 ergodox_right_led_3_off();
209 switch (layer) {
210 // TODO: Make this relevant to the ErgoDox EZ.
211 case 1:
212 ergodox_right_led_1_on();
213 break;
214 case 2:
215 ergodox_right_led_2_on();
216 break;
217 case 3:
218 ergodox_right_led_3_on();
219 break;
220 default:
221 // none
222 break;
223 }
224 213
214 if (layer1) ergodox_right_led_1_on();
215 if (layer2) ergodox_right_led_2_on();
216 if (layer3) ergodox_right_led_3_on();
225}; 217};
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-02 04:50:59 +0000