From 9cf69a199715a2aa7ba2ca7ab8f5553bbeb1dcd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20=C4=90or=C4=91evi=C4=87?= Date: Sat, 16 May 2020 08:36:08 +0200 Subject: [PATCH] [Keymap] Update personal userspace and keymaps (#9082) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Replace custom RCTRL implementation with built-in LM Caveat: sends LCtrl instead of RCtrl * Enable VIA support in KBD6X keymap * Disable LTO on ChibiOS boards * Disable locking support and Magic keycodes for all keymaps * Organize and annotate rules.mk and config.h files * Enable Console for Melody96 keymap * L_RANGE_KEYMAP → LAYERS_KEYMAP * Revert "Replace custom RCTRL implementation with built-in LM" This reverts commit 17d706a82d7e31b53cd84efeb9b2ddb9922a2368. * Set DYNAMIC_KEYMAP_LAYER_COUNT to 3 in Doro67 and Wasdat keymaps * Enable Bootmagic Lite for all VIA keymaps --- .../doro67/multi/keymaps/konstantin/config.h | 2 ++ .../doro67/multi/keymaps/konstantin/rules.mk | 15 +++++++++++---- .../kbdfans/kbd6x/keymaps/konstantin/config.h | 2 ++ .../kbdfans/kbd6x/keymaps/konstantin/keymap.c | 2 +- .../kbdfans/kbd6x/keymaps/konstantin/rules.mk | 17 ++++++++++++----- .../wasdat/keymaps/konstantin/config.h | 2 ++ .../wasdat/keymaps/konstantin/rules.mk | 14 ++++++++++---- keyboards/melody96/keymaps/konstantin/rules.mk | 16 +++++++++++----- keyboards/whitefox/keymaps/konstantin/rules.mk | 12 +++++++++--- users/konstantin/config.h | 16 +++++++++++----- users/konstantin/konstantin.h | 2 +- users/konstantin/rules.mk | 4 +++- 12 files changed, 75 insertions(+), 29 deletions(-) diff --git a/keyboards/doro67/multi/keymaps/konstantin/config.h b/keyboards/doro67/multi/keymaps/konstantin/config.h index 3c2583e2d4..1d12c7db37 100644 --- a/keyboards/doro67/multi/keymaps/konstantin/config.h +++ b/keyboards/doro67/multi/keymaps/konstantin/config.h @@ -1,4 +1,6 @@ #pragma once +#define DYNAMIC_KEYMAP_LAYER_COUNT 3 + #define LAYER_FN #define LAYER_NUMPAD diff --git a/keyboards/doro67/multi/keymaps/konstantin/rules.mk b/keyboards/doro67/multi/keymaps/konstantin/rules.mk index c3a73fd845..50c3f77ddb 100644 --- a/keyboards/doro67/multi/keymaps/konstantin/rules.mk +++ b/keyboards/doro67/multi/keymaps/konstantin/rules.mk @@ -1,11 +1,18 @@ -BACKLIGHT_ENABLE = no -BOOTMAGIC_ENABLE = no +# Generic features +BOOTMAGIC_ENABLE = lite COMMAND_ENABLE = yes CONSOLE_ENABLE = yes EXTRAKEY_ENABLE = yes -GRAVE_ESC_ENABLE = no MOUSEKEY_ENABLE = yes NKRO_ENABLE = yes -SPACE_CADET_ENABLE = no TAP_DANCE_ENABLE = yes UNICODEMAP_ENABLE = yes + +# Keyboard-specific features +BACKLIGHT_ENABLE = no +VIA_ENABLE = yes + +# Firmware size reduction +GRAVE_ESC_ENABLE = no +MAGIC_ENABLE = no +SPACE_CADET_ENABLE = no diff --git a/keyboards/kbdfans/kbd6x/keymaps/konstantin/config.h b/keyboards/kbdfans/kbd6x/keymaps/konstantin/config.h index 4b511eb848..37f4e42c71 100644 --- a/keyboards/kbdfans/kbd6x/keymaps/konstantin/config.h +++ b/keyboards/kbdfans/kbd6x/keymaps/konstantin/config.h @@ -1,3 +1,5 @@ #pragma once +#define DYNAMIC_KEYMAP_LAYER_COUNT 3 + #define LAYER_FN diff --git a/keyboards/kbdfans/kbd6x/keymaps/konstantin/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/konstantin/keymap.c index 46cc0a1137..304234a3f4 100644 --- a/keyboards/kbdfans/kbd6x/keymaps/konstantin/keymap.c +++ b/keyboards/kbdfans/kbd6x/keymaps/konstantin/keymap.c @@ -6,7 +6,7 @@ enum keycodes_keymap { }; enum layers_keymap { - L_RCTRL = L_RANGE_KEYMAP, + L_RCTRL = LAYERS_KEYMAP, }; void eeconfig_init_keymap(void) { diff --git a/keyboards/kbdfans/kbd6x/keymaps/konstantin/rules.mk b/keyboards/kbdfans/kbd6x/keymaps/konstantin/rules.mk index c75488af62..e2f34468a6 100644 --- a/keyboards/kbdfans/kbd6x/keymaps/konstantin/rules.mk +++ b/keyboards/kbdfans/kbd6x/keymaps/konstantin/rules.mk @@ -1,12 +1,19 @@ -BACKLIGHT_ENABLE = no -BOOTMAGIC_ENABLE = no +# Generic features +BOOTMAGIC_ENABLE = lite COMMAND_ENABLE = yes CONSOLE_ENABLE = no EXTRAKEY_ENABLE = yes -GRAVE_ESC_ENABLE = no MOUSEKEY_ENABLE = yes NKRO_ENABLE = yes -RGBLIGHT_ENABLE = yes -SPACE_CADET_ENABLE = no TAP_DANCE_ENABLE = yes UNICODEMAP_ENABLE = no + +# Keyboard-specific features +BACKLIGHT_ENABLE = no +RGBLIGHT_ENABLE = yes +VIA_ENABLE = yes + +# Firmware size reduction +GRAVE_ESC_ENABLE = no +MAGIC_ENABLE = no +SPACE_CADET_ENABLE = no diff --git a/keyboards/maartenwut/wasdat/keymaps/konstantin/config.h b/keyboards/maartenwut/wasdat/keymaps/konstantin/config.h index 3c2583e2d4..1d12c7db37 100644 --- a/keyboards/maartenwut/wasdat/keymaps/konstantin/config.h +++ b/keyboards/maartenwut/wasdat/keymaps/konstantin/config.h @@ -1,4 +1,6 @@ #pragma once +#define DYNAMIC_KEYMAP_LAYER_COUNT 3 + #define LAYER_FN #define LAYER_NUMPAD diff --git a/keyboards/maartenwut/wasdat/keymaps/konstantin/rules.mk b/keyboards/maartenwut/wasdat/keymaps/konstantin/rules.mk index c3a73fd845..f70005d3f6 100644 --- a/keyboards/maartenwut/wasdat/keymaps/konstantin/rules.mk +++ b/keyboards/maartenwut/wasdat/keymaps/konstantin/rules.mk @@ -1,11 +1,17 @@ -BACKLIGHT_ENABLE = no -BOOTMAGIC_ENABLE = no +# Generic features +BOOTMAGIC_ENABLE = lite COMMAND_ENABLE = yes CONSOLE_ENABLE = yes EXTRAKEY_ENABLE = yes -GRAVE_ESC_ENABLE = no MOUSEKEY_ENABLE = yes NKRO_ENABLE = yes -SPACE_CADET_ENABLE = no TAP_DANCE_ENABLE = yes UNICODEMAP_ENABLE = yes + +# Keyboard-specific features +VIA_ENABLE = yes + +# Firmware size reduction +GRAVE_ESC_ENABLE = no +MAGIC_ENABLE = no +SPACE_CADET_ENABLE = no diff --git a/keyboards/melody96/keymaps/konstantin/rules.mk b/keyboards/melody96/keymaps/konstantin/rules.mk index 5b36eef2cb..3ef19428aa 100644 --- a/keyboards/melody96/keymaps/konstantin/rules.mk +++ b/keyboards/melody96/keymaps/konstantin/rules.mk @@ -1,12 +1,18 @@ -BACKLIGHT_ENABLE = no +# Generic features BOOTMAGIC_ENABLE = no COMMAND_ENABLE = yes -CONSOLE_ENABLE = no +CONSOLE_ENABLE = yes EXTRAKEY_ENABLE = yes -GRAVE_ESC_ENABLE = no MOUSEKEY_ENABLE = yes NKRO_ENABLE = yes -RGBLIGHT_ENABLE = yes -SPACE_CADET_ENABLE = no TAP_DANCE_ENABLE = yes UNICODEMAP_ENABLE = yes + +# Keyboard-specific features +BACKLIGHT_ENABLE = no +RGBLIGHT_ENABLE = yes + +# Firmware size reduction +GRAVE_ESC_ENABLE = no +MAGIC_ENABLE = no +SPACE_CADET_ENABLE = no diff --git a/keyboards/whitefox/keymaps/konstantin/rules.mk b/keyboards/whitefox/keymaps/konstantin/rules.mk index c39175c979..111c0faba6 100644 --- a/keyboards/whitefox/keymaps/konstantin/rules.mk +++ b/keyboards/whitefox/keymaps/konstantin/rules.mk @@ -1,12 +1,18 @@ -BACKLIGHT_ENABLE = no +# Generic features BOOTMAGIC_ENABLE = no COMMAND_ENABLE = yes CONSOLE_ENABLE = yes EXTRAKEY_ENABLE = yes -GRAVE_ESC_ENABLE = no MOUSEKEY_ENABLE = yes NKRO_ENABLE = yes -SPACE_CADET_ENABLE = no TAP_DANCE_ENABLE = yes UNICODEMAP_ENABLE = yes + +# Keyboard-specific features +BACKLIGHT_ENABLE = no VISUALIZER_ENABLE = no + +# Firmware size reduction +GRAVE_ESC_ENABLE = no +MAGIC_ENABLE = no +SPACE_CADET_ENABLE = no diff --git a/users/konstantin/config.h b/users/konstantin/config.h index dcea9be279..2629cdd570 100644 --- a/users/konstantin/config.h +++ b/users/konstantin/config.h @@ -1,7 +1,10 @@ #pragma once +// Keyboard reports #define FORCE_NKRO +#define USB_POLLING_INTERVAL_MS 1 +// Mouse keys #define MOUSEKEY_DELAY 0 #define MOUSEKEY_INTERVAL 10 #define MOUSEKEY_MAX_SPEED 4 @@ -11,22 +14,25 @@ #define MOUSEKEY_WHEEL_MAX_SPEED 4 #define MOUSEKEY_WHEEL_TIME_TO_MAX 50 -#define NO_ACTION_FUNCTION -#define NO_ACTION_MACRO -#define NO_ACTION_ONESHOT - +// RGB lighting #undef RGBLIGHT_ANIMATIONS #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL #define RGBLIGHT_EFFECT_SNAKE +// Tapping #define PERMISSIVE_HOLD #define TAPPING_TERM 200 #define TAPPING_TOGGLE 3 +// Unicode #define UNICODE_CYCLE_PERSIST false #define UNICODE_SELECTED_MODES UC_WINC, UC_WIN, UC_LNX #define UNICODE_KEY_WINC KC_RGUI -#define USB_POLLING_INTERVAL_MS 1 +// Firmware size reduction +#undef LOCKING_SUPPORT_ENABLE +#define NO_ACTION_FUNCTION +#define NO_ACTION_MACRO +#define NO_ACTION_ONESHOT diff --git a/users/konstantin/konstantin.h b/users/konstantin/konstantin.h index 0936e3c3ea..72a1616238 100644 --- a/users/konstantin/konstantin.h +++ b/users/konstantin/konstantin.h @@ -76,7 +76,7 @@ enum layers_user { L_NUMPAD, #endif - L_RANGE_KEYMAP, + LAYERS_KEYMAP, }; void keyboard_pre_init_keymap(void); diff --git a/users/konstantin/rules.mk b/users/konstantin/rules.mk index d989f486c5..6fe3a8ad83 100644 --- a/users/konstantin/rules.mk +++ b/users/konstantin/rules.mk @@ -13,4 +13,6 @@ ifneq (,$(filter yes,$(UNICODE_ENABLE) $(UNICODEMAP_ENABLE))) SRC += unicode.c endif -LTO_ENABLE = yes +ifneq ($(PLATFORM),CHIBIOS) + LTO_ENABLE = yes +endif