From 6ba0b818e9ab8830610ab2a74515227884f93abc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20=C4=90or=C4=91evi=C4=87?= Date: Sun, 27 Jan 2019 17:46:54 +0100 Subject: [PATCH] [Keymap] Update personal userspace and keymaps (#4963) * Remove duplicated or unnecessary definitions in config.h and rules.mk * Use IS_HOST_LED_ON() macro * Add mouse acceleration to kbd6x:konstantin keymap * Clear and restore mods when sending macros * Make SEND_STRING_CLEAN a config option * Add NO_ACTION_ONESHOT to userspace config --- keyboards/kbd6x/keymaps/konstantin/config.h | 1 + keyboards/kbd6x/keymaps/konstantin/keymap.c | 4 ++-- .../whitefox/keymaps/konstantin/config.h | 21 ------------------- users/konstantin/config.h | 1 + users/konstantin/konstantin.c | 5 +++-- users/konstantin/konstantin.h | 10 +++++++++ users/konstantin/rules.mk | 1 - 7 files changed, 17 insertions(+), 26 deletions(-) diff --git a/keyboards/kbd6x/keymaps/konstantin/config.h b/keyboards/kbd6x/keymaps/konstantin/config.h index 4b511eb848..16387fa2f6 100644 --- a/keyboards/kbd6x/keymaps/konstantin/config.h +++ b/keyboards/kbd6x/keymaps/konstantin/config.h @@ -1,3 +1,4 @@ #pragma once #define LAYER_FN +#define SEND_STRING_CLEAN diff --git a/keyboards/kbd6x/keymaps/konstantin/keymap.c b/keyboards/kbd6x/keymaps/konstantin/keymap.c index b400b06810..fa324be9a1 100644 --- a/keyboards/kbd6x/keymaps/konstantin/keymap.c +++ b/keyboards/kbd6x/keymaps/konstantin/keymap.c @@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ * │ │Mut│VoD│VoU│Ply│Prv│Nxt│MW←│MW→│M4 │M5 │ │ │ * └─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┘ - * │ │ │ MW↓ │ │ │ + * │ │ │ MW↓ │MAcl2│ │ * └───┴─────┴───────────────────────────┴─────┴───┘ */ [L_FN] = LAYOUT( @@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, KC_HOME, KC_UP, KC_END, KC_PGUP, _______, _______, _______, _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_BTN3, KC_DEL, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, _______, KC_WH_U, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, KC_MPRV, KC_MNXT, KC_WH_L, KC_WH_R, KC_BTN4, KC_BTN5, _______, _______, - XXXXXXX, _______, _______, KC_WH_D, _______, _______, XXXXXXX + XXXXXXX, _______, _______, KC_WH_D, KC_ACL2, _______, XXXXXXX ), /* RCtrl layer diff --git a/keyboards/whitefox/keymaps/konstantin/config.h b/keyboards/whitefox/keymaps/konstantin/config.h index 99dc6af755..1364fe8a28 100644 --- a/keyboards/whitefox/keymaps/konstantin/config.h +++ b/keyboards/whitefox/keymaps/konstantin/config.h @@ -4,24 +4,3 @@ #define LAYER_FN #define LAYER_NUMPAD - -#define MAGIC_KEY_LAYER0_ALT1 BSLS -#define MAGIC_KEY_BOOTLOADER ESC - -#define MOUSEKEY_DELAY 50 -#define MOUSEKEY_INTERVAL 15 -#define MOUSEKEY_MAX_SPEED 4 -#define MOUSEKEY_TIME_TO_MAX 50 -#define MOUSEKEY_WHEEL_MAX_SPEED 1 -#define MOUSEKEY_WHEEL_TIME_TO_MAX 50 - -#define NO_ACTION_FUNCTION -#define NO_ACTION_MACRO - -#define PERMISSIVE_HOLD -#define TAPPING_TERM 200 -#define TAPPING_TOGGLE 2 - -#define UNICODE_CYCLE_PERSIST false -#define UNICODE_SELECTED_MODES UC_WINC, UC_LNX -#define UNICODE_WINC_KEY KC_RGUI diff --git a/users/konstantin/config.h b/users/konstantin/config.h index d03333f05d..800b8e49ba 100644 --- a/users/konstantin/config.h +++ b/users/konstantin/config.h @@ -14,6 +14,7 @@ #define NO_ACTION_FUNCTION #define NO_ACTION_MACRO +#define NO_ACTION_ONESHOT #define PERMISSIVE_HOLD #define TAPPING_TERM 200 diff --git a/users/konstantin/konstantin.c b/users/konstantin/konstantin.c index 977111c1f9..47596279c3 100644 --- a/users/konstantin/konstantin.c +++ b/users/konstantin/konstantin.c @@ -3,8 +3,9 @@ #ifdef LAYER_NUMPAD static void toggle_numpad(void) { layer_invert(L_NUMPAD); - bool num_lock = host_keyboard_leds() & 1<