aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPentti Laitinen <2406748+cyky@users.noreply.github.com>2019-10-23 10:54:14 +0300
committernoroadsleft <18669334+noroadsleft@users.noreply.github.com>2019-10-23 00:54:14 -0700
commit6799937a3c2a13d3973e635656b22da9699cf462 (patch)
tree8ad032398df502a533b1bb6ee14b177f55426306
parent51bf3ba3e623d69cf4ad9e9045cf10526e70be15 (diff)
downloadqmk_firmware-6799937a3c2a13d3973e635656b22da9699cf462.tar.gz
qmk_firmware-6799937a3c2a13d3973e635656b22da9699cf462.zip
[Keymap] Updating Nordic ergo keymap (#7107)
* Update ergodox infinity nordic_ergo keymap - Add missing important keys to base layer. - Move arrow keys around as the original position was not optimal. - Fix some code styling issues. * Fix indentation to 4 spaces * More code style fixes - Formated the methods in the nordic ergo keymap. * Fix QMK code style issues - Change layer defines to enums. - Split enums to multi-line. - Remove non required switch case.
-rw-r--r--keyboards/ergodox_infinity/keymaps/nordic_ergo/keymap.c259
1 files changed, 125 insertions, 134 deletions
diff --git a/keyboards/ergodox_infinity/keymaps/nordic_ergo/keymap.c b/keyboards/ergodox_infinity/keymaps/nordic_ergo/keymap.c
index 6a66b1d3f..be96f0db0 100644
--- a/keyboards/ergodox_infinity/keymaps/nordic_ergo/keymap.c
+++ b/keyboards/ergodox_infinity/keymaps/nordic_ergo/keymap.c
@@ -1,22 +1,18 @@
1// Nordic layout for Ergodox infinity 1// Nordic layout for Ergodox infinity
2
3#include QMK_KEYBOARD_H 2#include QMK_KEYBOARD_H
4#include "debug.h"
5#include "action_layer.h"
6#include "version.h" 3#include "version.h"
7#include "keymap_nordic.h" 4#include "keymap_nordic.h"
8#include "keymap_german.h" 5#include "keymap_german.h"
9 6
10// Layer names 7enum layer_names {
11#define BASE 0 // default layer 8 BASE,
12#define FUNCL 1 // function layer 9 FUNCL,
13#define SYMB 2 // symbol layer 10 SYMB,
14#define MDIA 3 // media keys 11 MDIA
12};
15 13
16enum custom_keycodes { 14enum custom_keycodes {
17 PLACEHOLDER = SAFE_RANGE, // can always be here 15 VRSN = SAFE_RANGE,
18 EPRM,
19 VRSN,
20 RGB_SLD 16 RGB_SLD
21}; 17};
22 18
@@ -34,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
34 * |--------+------+------+------+------+------| L2 | | L2 |------+------+------+------+------+--------| 30 * |--------+------+------+------+------+------| L2 | | L2 |------+------+------+------+------+--------|
35 * | LShift | Z | X | C | V | B | | | | N | M | , | . | - | RShift | 31 * | LShift | Z | X | C | V | B | | | | N | M | , | . | - | RShift |
36 * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' 32 * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
37 * | Ctrl | ¨^ | <|> | Alt | LGui| | Ctrl | Alt | ´` | + | RGui | 33 * | Ctrl | ¨^ | <|> | LGui | Alt | | Ctrl | Alt | ´` | + | RGui |
38 * `----------------------------------' `----------------------------------' 34 * `----------------------------------' `----------------------------------'
39 * ,-------------. ,-------------. 35 * ,-------------. ,-------------.
40 * | LEFT |RIGHT | | DOWN | UP | 36 * | LEFT |RIGHT | | DOWN | UP |
@@ -46,69 +42,69 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
46 */ 42 */
47 43
48[BASE] = LAYOUT_ergodox( // layer 0 : default 44[BASE] = LAYOUT_ergodox( // layer 0 : default
49 // left hand 45 // left hand
50 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_GRV, 46 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_GRV,
51 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(1), 47 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(1),
52 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, 48 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G,
53 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, MO(2), 49 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, MO(2),
54 KC_LCTRL, KC_RBRC, KC_NONUS_BSLASH, KC_LALT, KC_LGUI, 50 KC_LCTRL, MO(3), KC_EQL, KC_LGUI, KC_LALT,
55 KC_LEFT, KC_RIGHT, 51 KC_NLCK, KC_SLCK,
56 KC_HOME, 52 KC_HOME,
57 KC_SPC,KC_DEL, KC_END, 53 KC_SPC, KC_DEL, KC_END,
58 // right hand
59 KC_PSCREEN, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
60 TG(1), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,
61 KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
62 MO(2), KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
63 KC_RCTRL, KC_RALT, KC_BSLS, KC_EQL, KC_RGUI,
64 KC_DOWN, KC_UP,
65 KC_PGUP,
66 KC_PGDN, KC_ENT, KC_BSPC
67 ),
68 54
55 // right hand
56 KC_BSLS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
57 TG(1), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,
58 KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT,
59 MO(2), KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH,KC_NONUS_BSLASH,
60 KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_RBRC,
61 KC_RGUI, KC_RALT,
62 KC_PGUP,
63 KC_PGDN, KC_ENT, KC_BSPC
64),
69/* Keymap 1: Basic layer with functions 65/* Keymap 1: Basic layer with functions
70 * 66 *
71 * 67 *
72 * 68 *
73 * ,--------------------------------------------------. ,--------------------------------------------------. 69 * ,--------------------------------------------------. ,--------------------------------------------------.
74 * | Esc | F1 | F2 | F3 | F4 | F5 | F11 | | F12 | F6 | F7 | F8 | F9 | 0 | - | 70 * | | F1 | F2 | F3 | F4 | F5 | F11 | | F12 | F6 | F7 | F8 | F9 | 0 | |
75 * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| 71 * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
76 * | Tab | Q | W | E | R | T | L1 | | L1 | Y | U | I | O | P | Å | 72 * | | | | | | | | | | | | | | | |
77 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| 73 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
78 * | Caps | A | S | D | F | G |------| |------| H | J | K | L | Ö | Ä | 74 * | | | | | | |------| |------| | | | | | |
79 * |--------+------+------+------+------+------| L2 | | L2 |------+------+------+------+------+--------| 75 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
80 * | LShift | Z | X | C | V | B | | | | N | M | , | . | - | RShift | 76 * | | | | | | | | | | | | | | | |
81 * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' 77 * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
82 * | Ctrl | ¨^ | <|> | Alt | LGui| | Ctrl | Alt | ´` | + | RGui | 78 * | | ¨ | | | | | | | | | |
83 * `----------------------------------' `----------------------------------' 79 * `----------------------------------' `----------------------------------'
84 * ,-------------. ,-------------. 80 * ,-------------. ,-------------.
85 * | LEFT |RIGHT | | DOWN | UP | 81 * | | | | | |
86 * ,------+------+------| |------+--------+------. 82 * ,------+------+------| |------+--------+------.
87 * | | | Home | | PgUp | | | 83 * | | | | | | | |
88 * | Space|Del |------| |------| Enter | Bkspc| 84 * | | |------| |------| | |
89 * | | | End | | PgDn | | | 85 * | | | | | | | |
90 * `--------------------' `----------------------' 86 * `--------------------' `----------------------'
91 */ 87 */
92 88
93[FUNCL] = LAYOUT_ergodox( // layer 1 : functions 89[FUNCL] = LAYOUT_ergodox( // layer 1 : functions
94 // left hand 90 // left hand
95 _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11, 91 _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11,
96 _______, _______, _______, _______, _______, _______, _______, 92 _______, _______, _______, _______, _______, _______, _______,
97 _______, _______, _______, _______, _______, _______, 93 _______, _______, _______, _______, _______, _______,
98 _______, _______, _______, _______, _______, _______, _______, 94 _______, _______, _______, _______, _______, _______, _______,
99 _______, _______, _______, _______, _______, 95 _______, _______, _______, _______, _______,
100 _______, _______, 96 _______, _______,
101 _______, 97 _______,
102 _______,_______,_______, 98 _______, _______, _______,
103 // right hand 99 // right hand
104 KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, 100 KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______,
105 _______, _______, _______, _______, _______, _______, _______, 101 _______, _______, _______, _______, _______, _______, _______,
106 _______, _______, _______, _______, _______, _______, 102 _______, _______, _______, _______, _______, _______,
107 _______, _______, _______, _______, _______, _______, _______, 103 _______, _______, _______, _______, _______, _______, _______,
108 _______, _______, _______, _______, _______, 104 _______, _______, _______, _______, _______,
109 _______, _______, 105 _______, _______,
110 _______, 106 _______,
111 _______, _______, _______ 107 _______, _______, _______
112), 108),
113 109
114/* Keymap 2: Symbol Layer 110/* Keymap 2: Symbol Layer
@@ -134,24 +130,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
134 */ 130 */
135// SYMBOLS 131// SYMBOLS
136[SYMB] = LAYOUT_ergodox( 132[SYMB] = LAYOUT_ergodox(
137 // left hand 133 // left hand
138 KC_TRNS,KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, 134 _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11,
139 KC_TRNS,DE_EXLM,DE_AT, DE_LCBR,DE_RCBR,DE_PIPE,KC_TRNS, 135 _______, DE_EXLM, DE_AT, DE_LCBR, DE_RCBR, DE_PIPE, _______,
140 KC_TRNS,DE_HASH,DE_DLR, DE_LPRN,DE_RPRN,DE_GRV, 136 _______, DE_HASH, DE_DLR, DE_LPRN, DE_RPRN, DE_GRV,
141 KC_TRNS,DE_PERC,DE_CIRC,DE_LBRC,DE_RBRC,DE_TILD,KC_TRNS, 137 _______, DE_PERC, DE_CIRC, DE_LBRC, DE_RBRC, DE_TILD, _______,
142 KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, 138 _______, _______, _______, _______, _______,
143 RGB_MOD,BL_TOGG, 139 RGB_MOD, BL_TOGG,
144 BL_INC, 140 BL_INC,
145 RGB_VAD,RGB_VAI,BL_DEC, 141 RGB_VAD, RGB_VAI, BL_DEC,
146 // right hand 142 // right hand
147 KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, 143 KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
148 KC_TRNS, KC_UP, KC_7, KC_8, KC_9, DE_ASTR, KC_F12, 144 _______, KC_UP, KC_7, KC_8, KC_9, DE_ASTR, _______,
149 KC_DOWN, KC_4, KC_5, KC_6, DE_PLUS, KC_TRNS, 145 KC_DOWN, KC_4, KC_5, KC_6, DE_PLUS, _______,
150 KC_TRNS, DE_AMPR, KC_1, KC_2, KC_3, DE_BSLS, KC_TRNS, 146 _______, DE_AMPR, KC_1, KC_2, KC_3, DE_BSLS, _______,
151 KC_TRNS,KC_DOT, KC_0, DE_EQL, KC_TRNS, 147 _______, KC_DOT, KC_0, DE_EQL, _______,
152 RGB_TOG, RGB_SLD, 148 RGB_TOG, RGB_SLD,
153 KC_TRNS, 149 _______,
154 KC_TRNS, RGB_HUD, RGB_HUI 150 _______, RGB_HUD, RGB_HUI
155), 151),
156 152
157/* Keymap 3: Media and mouse keys 153/* Keymap 3: Media and mouse keys
@@ -175,82 +171,75 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
175 * | | | | | | | | 171 * | | | | | | | |
176 * `--------------------' `--------------------' 172 * `--------------------' `--------------------'
177 */ 173 */
174
178// MEDIA AND MOUSE 175// MEDIA AND MOUSE
179[MDIA] = LAYOUT_ergodox( 176[MDIA] = LAYOUT_ergodox(
180 RESET, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_TRNS, 177 RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11,
181 KC_TRNS, KC_TRNS, KC_BTN1, KC_MS_U, KC_BTN2, KC_TRNS, KC_TRNS, 178 _______, _______, KC_BTN1, KC_MS_U, KC_BTN2, _______, _______,
182 KC_TRNS, KC_BTN4, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN5, 179 _______, KC_BTN4, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN5,
183 KC_TRNS, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, KC_BTN3, KC_TRNS, 180 _______, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, KC_BTN3, _______,
184 KC_TRNS, KC_TRNS, KC_ACL0, KC_ACL1, KC_ACL2, 181 _______, _______, KC_ACL0, KC_ACL1, KC_ACL2,
185 KC_TRNS, KC_TRNS, 182 _______, _______,
186 KC_TRNS, 183 _______,
187 KC_BTN1, KC_BTN2, KC_TRNS, 184 KC_BTN1, KC_BTN2, _______,
188 // right hand 185 // right hand
189 KC_TRNS, KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11, 186 KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______,
190 KC_TRNS, KC_TRNS, KC_VOLD, KC_MUTE, KC_VOLU, KC_TRNS, KC_F12, 187 _______, _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, _______,
191 KC_TRNS, KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT, KC_TRNS, 188 _______, KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT, _______,
192 KC_TRNS, KC_WSCH, KC_WBAK, KC_WHOM, KC_WREF, KC_WFWD, KC_TRNS, 189 _______, KC_WSCH, KC_WBAK, KC_WHOM, KC_WREF, KC_WFWD, _______,
193 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 190 _______, _______, _______, _______, _______,
194 KC_TRNS, KC_TRNS, 191 _______, _______,
195 KC_TRNS, 192 _______,
196 KC_TRNS, KC_WBAK, KC_WFWD 193 _______, KC_WBAK, KC_WFWD
197), 194),
198}; 195};
199 196
200const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) 197const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
201{ 198 // MACRODOWN only works in this function
202 // MACRODOWN only works in this function 199 switch (id) {
203 switch(id) {
204 case 0: 200 case 0:
205 if (record->event.pressed) { 201 if (record->event.pressed) {
206 SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION); 202 SEND_STRING(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
207 } 203 }
208 break; 204 break;
209 case 1: 205 case 1:
210 if (record->event.pressed) { // For resetting EEPROM 206 if (record->event.pressed) { // For resetting EEPROM
211 eeconfig_init(); 207 eeconfig_init();
212 } 208 }
213 break; 209 break;
214 } 210 }
215 return MACRO_NONE; 211 return MACRO_NONE;
216}; 212};
217 213
218bool process_record_user(uint16_t keycode, keyrecord_t *record) { 214bool process_record_user(uint16_t keycode, keyrecord_t *record) {
219 switch (keycode) { 215 switch (keycode) {
220 // dynamically generate these. 216 case VRSN:
221 case EPRM: 217 if (record->event.pressed) {
222 if (record->event.pressed) { 218 SEND_STRING(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
223 eeconfig_init(); 219 }
224 } 220 return false;
225 return false; 221 break;
226 break; 222 case RGB_SLD:
227 case VRSN: 223 if (record->event.pressed) {
228 if (record->event.pressed) { 224#ifdef RGBLIGHT_ENABLE
229 SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION); 225 rgblight_mode(1);
230 } 226#endif
231 return false; 227 }
232 break; 228 return false;
233 case RGB_SLD: 229 break;
234 if (record->event.pressed) { 230 }
235 #ifdef RGBLIGHT_ENABLE 231 return true;
236 rgblight_mode(1);
237 #endif
238 }
239 return false;
240 break;
241 }
242 return true;
243} 232}
244 233
245// Runs just one time when the keyboard initializes. 234// Runs just one time when the keyboard initializes.
246void matrix_init_user(void) { 235void matrix_init_user(void){
247 236
248}; 237};
249 238
250// Runs constantly in the background, in a loop. 239// Runs constantly in the background, in a loop.
251void matrix_scan_user(void) { 240void matrix_scan_user(void) {
252
253 uint8_t layer = biton32(layer_state); 241 uint8_t layer = biton32(layer_state);
242
254 ergodox_board_led_off(); 243 ergodox_board_led_off();
255 ergodox_right_led_1_off(); 244 ergodox_right_led_1_off();
256 ergodox_right_led_2_off(); 245 ergodox_right_led_2_off();
@@ -262,8 +251,10 @@ void matrix_scan_user(void) {
262 case 2: 251 case 2:
263 ergodox_right_led_2_on(); 252 ergodox_right_led_2_on();
264 break; 253 break;
254 case 3:
255 ergodox_right_led_3_on();
256 break;
265 default: 257 default:
266 // none
267 break; 258 break;
268 } 259 }
269}; 260};