[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.
This commit is contained in:
Pentti Laitinen 2019-10-23 10:54:14 +03:00 committed by noroadsleft
parent 51bf3ba3e6
commit 6799937a3c

View File

@ -1,22 +1,18 @@
// Nordic layout for Ergodox infinity // Nordic layout for Ergodox infinity
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
#include "debug.h"
#include "action_layer.h"
#include "version.h" #include "version.h"
#include "keymap_nordic.h" #include "keymap_nordic.h"
#include "keymap_german.h" #include "keymap_german.h"
// Layer names enum layer_names {
#define BASE 0 // default layer BASE,
#define FUNCL 1 // function layer FUNCL,
#define SYMB 2 // symbol layer SYMB,
#define MDIA 3 // media keys MDIA
};
enum custom_keycodes { enum custom_keycodes {
PLACEHOLDER = SAFE_RANGE, // can always be here VRSN = SAFE_RANGE,
EPRM,
VRSN,
RGB_SLD RGB_SLD
}; };
@ -34,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |--------+------+------+------+------+------| L2 | | L2 |------+------+------+------+------+--------| * |--------+------+------+------+------+------| L2 | | L2 |------+------+------+------+------+--------|
* | LShift | Z | X | C | V | B | | | | N | M | , | . | - | RShift | * | LShift | Z | X | C | V | B | | | | N | M | , | . | - | RShift |
* `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
* | Ctrl | ¨^ | <|> | Alt | LGui| | Ctrl | Alt | ´` | + | RGui | * | Ctrl | ¨^ | <|> | LGui | Alt | | Ctrl | Alt | ´` | + | RGui |
* `----------------------------------' `----------------------------------' * `----------------------------------' `----------------------------------'
* ,-------------. ,-------------. * ,-------------. ,-------------.
* | LEFT |RIGHT | | DOWN | UP | * | LEFT |RIGHT | | DOWN | UP |
@ -46,69 +42,69 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/ */
[BASE] = LAYOUT_ergodox( // layer 0 : default [BASE] = LAYOUT_ergodox( // layer 0 : default
// left hand // left hand
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_GRV, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_GRV,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(1), KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(1),
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, MO(2), KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, MO(2),
KC_LCTRL, KC_RBRC, KC_NONUS_BSLASH, KC_LALT, KC_LGUI, KC_LCTRL, MO(3), KC_EQL, KC_LGUI, KC_LALT,
KC_LEFT, KC_RIGHT, KC_NLCK, KC_SLCK,
KC_HOME, KC_HOME,
KC_SPC,KC_DEL, KC_END, KC_SPC, KC_DEL, KC_END,
// right hand
KC_PSCREEN, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
TG(1), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,
KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
MO(2), KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
KC_RCTRL, KC_RALT, KC_BSLS, KC_EQL, KC_RGUI,
KC_DOWN, KC_UP,
KC_PGUP,
KC_PGDN, KC_ENT, KC_BSPC
),
// right hand
KC_BSLS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
TG(1), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,
KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT,
MO(2), KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH,KC_NONUS_BSLASH,
KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_RBRC,
KC_RGUI, KC_RALT,
KC_PGUP,
KC_PGDN, KC_ENT, KC_BSPC
),
/* Keymap 1: Basic layer with functions /* Keymap 1: Basic layer with functions
* *
* *
* *
* ,--------------------------------------------------. ,--------------------------------------------------. * ,--------------------------------------------------. ,--------------------------------------------------.
* | Esc | F1 | F2 | F3 | F4 | F5 | F11 | | F12 | F6 | F7 | F8 | F9 | 0 | - | * | | F1 | F2 | F3 | F4 | F5 | F11 | | F12 | F6 | F7 | F8 | F9 | 0 | |
* |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
* | Tab | Q | W | E | R | T | L1 | | L1 | Y | U | I | O | P | Å | * | | | | | | | | | | | | | | | |
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
* | Caps | A | S | D | F | G |------| |------| H | J | K | L | Ö | Ä | * | | | | | | |------| |------| | | | | | |
* |--------+------+------+------+------+------| L2 | | L2 |------+------+------+------+------+--------| * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
* | LShift | Z | X | C | V | B | | | | N | M | , | . | - | RShift | * | | | | | | | | | | | | | | | |
* `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
* | Ctrl | ¨^ | <|> | Alt | LGui| | Ctrl | Alt | ´` | + | RGui | * | | ¨ | | | | | | | | | |
* `----------------------------------' `----------------------------------' * `----------------------------------' `----------------------------------'
* ,-------------. ,-------------. * ,-------------. ,-------------.
* | LEFT |RIGHT | | DOWN | UP | * | | | | | |
* ,------+------+------| |------+--------+------. * ,------+------+------| |------+--------+------.
* | | | Home | | PgUp | | | * | | | | | | | |
* | Space|Del |------| |------| Enter | Bkspc| * | | |------| |------| | |
* | | | End | | PgDn | | | * | | | | | | | |
* `--------------------' `----------------------' * `--------------------' `----------------------'
*/ */
[FUNCL] = LAYOUT_ergodox( // layer 1 : functions [FUNCL] = LAYOUT_ergodox( // layer 1 : functions
// left hand // left hand
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______,
_______, _______,
_______,_______,_______, _______, _______, _______,
// right hand // right hand
KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______,
_______, _______,
_______, _______, _______ _______, _______, _______
), ),
/* Keymap 2: Symbol Layer /* Keymap 2: Symbol Layer
@ -134,24 +130,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/ */
// SYMBOLS // SYMBOLS
[SYMB] = LAYOUT_ergodox( [SYMB] = LAYOUT_ergodox(
// left hand // left hand
KC_TRNS,KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11,
KC_TRNS,DE_EXLM,DE_AT, DE_LCBR,DE_RCBR,DE_PIPE,KC_TRNS, _______, DE_EXLM, DE_AT, DE_LCBR, DE_RCBR, DE_PIPE, _______,
KC_TRNS,DE_HASH,DE_DLR, DE_LPRN,DE_RPRN,DE_GRV, _______, DE_HASH, DE_DLR, DE_LPRN, DE_RPRN, DE_GRV,
KC_TRNS,DE_PERC,DE_CIRC,DE_LBRC,DE_RBRC,DE_TILD,KC_TRNS, _______, DE_PERC, DE_CIRC, DE_LBRC, DE_RBRC, DE_TILD, _______,
KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, _______, _______, _______, _______, _______,
RGB_MOD,BL_TOGG, RGB_MOD, BL_TOGG,
BL_INC, BL_INC,
RGB_VAD,RGB_VAI,BL_DEC, RGB_VAD, RGB_VAI, BL_DEC,
// right hand // right hand
KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
KC_TRNS, KC_UP, KC_7, KC_8, KC_9, DE_ASTR, KC_F12, _______, KC_UP, KC_7, KC_8, KC_9, DE_ASTR, _______,
KC_DOWN, KC_4, KC_5, KC_6, DE_PLUS, KC_TRNS, KC_DOWN, KC_4, KC_5, KC_6, DE_PLUS, _______,
KC_TRNS, DE_AMPR, KC_1, KC_2, KC_3, DE_BSLS, KC_TRNS, _______, DE_AMPR, KC_1, KC_2, KC_3, DE_BSLS, _______,
KC_TRNS,KC_DOT, KC_0, DE_EQL, KC_TRNS, _______, KC_DOT, KC_0, DE_EQL, _______,
RGB_TOG, RGB_SLD, RGB_TOG, RGB_SLD,
KC_TRNS, _______,
KC_TRNS, RGB_HUD, RGB_HUI _______, RGB_HUD, RGB_HUI
), ),
/* Keymap 3: Media and mouse keys /* Keymap 3: Media and mouse keys
@ -175,82 +171,75 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | | * | | | | | | | |
* `--------------------' `--------------------' * `--------------------' `--------------------'
*/ */
// MEDIA AND MOUSE // MEDIA AND MOUSE
[MDIA] = LAYOUT_ergodox( [MDIA] = LAYOUT_ergodox(
RESET, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_TRNS, RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11,
KC_TRNS, KC_TRNS, KC_BTN1, KC_MS_U, KC_BTN2, KC_TRNS, KC_TRNS, _______, _______, KC_BTN1, KC_MS_U, KC_BTN2, _______, _______,
KC_TRNS, KC_BTN4, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN5, _______, KC_BTN4, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN5,
KC_TRNS, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, KC_BTN3, KC_TRNS, _______, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, KC_BTN3, _______,
KC_TRNS, KC_TRNS, KC_ACL0, KC_ACL1, KC_ACL2, _______, _______, KC_ACL0, KC_ACL1, KC_ACL2,
KC_TRNS, KC_TRNS, _______, _______,
KC_TRNS, _______,
KC_BTN1, KC_BTN2, KC_TRNS, KC_BTN1, KC_BTN2, _______,
// right hand // right hand
KC_TRNS, KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11, KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______,
KC_TRNS, KC_TRNS, KC_VOLD, KC_MUTE, KC_VOLU, KC_TRNS, KC_F12, _______, _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, _______,
KC_TRNS, KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT, KC_TRNS, _______, KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT, _______,
KC_TRNS, KC_WSCH, KC_WBAK, KC_WHOM, KC_WREF, KC_WFWD, KC_TRNS, _______, KC_WSCH, KC_WBAK, KC_WHOM, KC_WREF, KC_WFWD, _______,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, _______, _______, _______, _______, _______,
KC_TRNS, KC_TRNS, _______, _______,
KC_TRNS, _______,
KC_TRNS, KC_WBAK, KC_WFWD _______, KC_WBAK, KC_WFWD
), ),
}; };
const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
{ // MACRODOWN only works in this function
// MACRODOWN only works in this function switch (id) {
switch(id) {
case 0: case 0:
if (record->event.pressed) { if (record->event.pressed) {
SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION); SEND_STRING(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
} }
break; break;
case 1: case 1:
if (record->event.pressed) { // For resetting EEPROM if (record->event.pressed) { // For resetting EEPROM
eeconfig_init(); eeconfig_init();
} }
break; break;
} }
return MACRO_NONE; return MACRO_NONE;
}; };
bool process_record_user(uint16_t keycode, keyrecord_t *record) { bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) { switch (keycode) {
// dynamically generate these. case VRSN:
case EPRM: if (record->event.pressed) {
if (record->event.pressed) { SEND_STRING(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
eeconfig_init(); }
} return false;
return false; break;
break; case RGB_SLD:
case VRSN: if (record->event.pressed) {
if (record->event.pressed) { #ifdef RGBLIGHT_ENABLE
SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION); rgblight_mode(1);
} #endif
return false; }
break; return false;
case RGB_SLD: break;
if (record->event.pressed) { }
#ifdef RGBLIGHT_ENABLE return true;
rgblight_mode(1);
#endif
}
return false;
break;
}
return true;
} }
// Runs just one time when the keyboard initializes. // Runs just one time when the keyboard initializes.
void matrix_init_user(void) { void matrix_init_user(void){
}; };
// Runs constantly in the background, in a loop. // Runs constantly in the background, in a loop.
void matrix_scan_user(void) { void matrix_scan_user(void) {
uint8_t layer = biton32(layer_state); uint8_t layer = biton32(layer_state);
ergodox_board_led_off(); ergodox_board_led_off();
ergodox_right_led_1_off(); ergodox_right_led_1_off();
ergodox_right_led_2_off(); ergodox_right_led_2_off();
@ -262,8 +251,10 @@ void matrix_scan_user(void) {
case 2: case 2:
ergodox_right_led_2_on(); ergodox_right_led_2_on();
break; break;
case 3:
ergodox_right_led_3_on();
break;
default: default:
// none
break; break;
} }
}; };