summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoffer Holmberg <mr.skug@gmail.com>2018-10-15 20:43:11 +0300
committerDrashna Jaelre <drashna@live.com>2018-10-15 10:43:11 -0700
commitbf0bb1a4db98864fe04d40ca68fe6bc5a0184395 (patch)
tree9c6f616e8cfac992717a80b4fe6f134ef7f24e1a
parent64459fedbff54d8e8c3943e75624377a6b70464c (diff)
Keymap: Update to ergodox layout (#4134)
* Disable KB mouse & cleanup * fix ascii-layout * _______ is now defined by qmk and apparently has been for a year already ;)
-rw-r--r--keyboards/ergodox_ez/keymaps/skug/config.h2
-rw-r--r--keyboards/ergodox_ez/keymaps/skug/keymap.c30
2 files changed, 16 insertions, 16 deletions
diff --git a/keyboards/ergodox_ez/keymaps/skug/config.h b/keyboards/ergodox_ez/keymaps/skug/config.h
index d972813920..abf1c635f1 100644
--- a/keyboards/ergodox_ez/keymaps/skug/config.h
+++ b/keyboards/ergodox_ez/keymaps/skug/config.h
@@ -1,5 +1,7 @@
#pragma once
+#define FORCE_NKRO
+
#undef LSPO_KEY
#undef RSPC_KEY
#define LSPO_KEY KC_8 // Nordic Left SpaceCadet
diff --git a/keyboards/ergodox_ez/keymaps/skug/keymap.c b/keyboards/ergodox_ez/keymaps/skug/keymap.c
index 0d2ec1dd9f..d17990481e 100644
--- a/keyboards/ergodox_ez/keymaps/skug/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/skug/keymap.c
@@ -22,8 +22,6 @@
#include "version.h"
#include "keymap_swedish.h"
-#define _______ KC_TRNS
-
#define BASE 0 // default layer
#define SYMB 1 // symbols
#define MDIA 2 // media keys
@@ -47,8 +45,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | | | | | | | | | |
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
* | L4 | A | S | D | F | G |------| |------| H | J | K | L |Ö / L3| Ä/L2 |
- * | | | | | | | Hypr/| | Meh/ | | | | | | |
- * |--------+------+------+------+------+------| Esc | | Ent |------+------+------+------+------+--------|
+ * | | | | | | | | | | | | | | | |
+ * |--------+------+------+------+------+------| Back | |Forwd |------+------+------+------+------+--------|
* | LShift/| Z | X | C | V | B | | | | N | M | ; | : | _ | RShift/|
* | ( | | | | | | | | | | | , | . | - | ) |
* `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
@@ -71,8 +69,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
NO_HALF, KC_1, KC_2, KC_3, KC_4, KC_5, KC_INS,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(SYMB),
MO(ARRW), KC_A, KC_S, KC_D, KC_F, KC_G,
- KC_LSPO, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, ALL_T(KC_ESC),
- CTL_T(NO_APOS), NO_ACUT, KC_LALT, KC_BSPC, KC_SPC,
+ KC_LSPO, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_WBAK,
+ CTL_T(NO_APOS), NO_ACUT, KC_LALT, KC_BSPC, KC_SPC,
NO_LESS, KC_END,
KC_LEFT, KC_RIGHT, KC_PGDN,
CTL_T(KC_ENT), ALT_T(KC_ESC), KC_LGUI,
@@ -81,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
TO(ARRW), KC_6, KC_7, KC_8, KC_9, KC_0, NO_PLUS,
TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, NO_AA,
KC_H, KC_J, KC_K, KC_L, LT(MDIA, NO_OSLH), LT(SYMB, NO_AE),
- MEH_T(KC_ENT), KC_N, KC_M, KC_COMM, KC_DOT, NO_MINS, KC_RSPC,
+ KC_WFWD, KC_N, KC_M, KC_COMM, KC_DOT, NO_MINS, KC_RSPC,
KC_SPC, KC_BSPC, NO_ALGR, NO_ASTR, CTL_T(NO_TILD),
KC_HOME, NO_CIRC,
KC_PGUP, KC_UP, KC_DOWN,
@@ -101,11 +99,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | | . | 0 | = | |
* `----------------------------------' `----------------------------------'
* ,-------------. ,-------------.
- * |Animat| | |Toggle|Solid |
+ * | | | | | |
* ,------|------|------| |------+------+------.
* | | | | | | | |
* |------|------|------| |------|------|------|
- * |BNess-|Bness+| | | |Hue- |Hue+ |
+ * | | | | | | | |
* `--------------------' `--------------------'
*/
// SYMBOLS
@@ -116,18 +114,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______,KC_HASH,NO_DLR, NO_LPRN,NO_RPRN,NO_GRV,
_______,KC_PERC,NO_CIRC,NO_LBRC,NO_RBRC,NO_TILD,_______,
EPRM,_______,_______,_______,_______,
- RGB_MOD,_______,
+ _______,_______,
+ _______,_______,_______,
_______,_______,_______,
- RGB_VAD,RGB_VAI,_______,
// right hand
_______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
_______, KC_UP, KC_7, KC_8, KC_9, NO_ASTR, KC_F12,
KC_DOWN, KC_4, KC_5, KC_6, NO_PLUS, _______,
_______, NO_AMPR, KC_1, KC_2, KC_3, NO_MINS, _______,
_______,KC_DOT, KC_0, NO_EQL, _______,
- RGB_TOG, RGB_SLD,
+ _______, _______,
_______, _______, _______,
- _______, RGB_HUD, RGB_HUI
+ _______, _______, _______
),
/* Keymap: Media and mouse keys
@@ -183,10 +181,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______,
// right hand
TO(BASE), _______, _______, _______, _______, _______, _______,
- _______, _______, KC_BTN4, KC_MS_U, KC_BTN5, _______, _______,
- _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______,
_______, _______, _______, _______, _______, _______, _______,
- KC_BTN1, KC_BTN3, KC_BTN2, _______, _______,
+ _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______,
_______, _______,
_______, _______, _______,
_______, _______, _______