From ff6c70415c536e6435023627197550889ffa1501 Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Sun, 6 Mar 2022 22:12:17 -0800 Subject: [Keymap] Drashna Mouse keys and oled updates (#16556) --- layouts/community/ortho_4x12/drashna/rules.mk | 24 +++++++++++------------- layouts/community/ortho_5x12/drashna/rules.mk | 10 +++++----- layouts/community/split_3x6_3/drashna/keymap.c | 4 ++-- 3 files changed, 18 insertions(+), 20 deletions(-) (limited to 'layouts') diff --git a/layouts/community/ortho_4x12/drashna/rules.mk b/layouts/community/ortho_4x12/drashna/rules.mk index 2905fb0fd4..e5c25d6fd5 100644 --- a/layouts/community/ortho_4x12/drashna/rules.mk +++ b/layouts/community/ortho_4x12/drashna/rules.mk @@ -1,24 +1,22 @@ -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control +EXTRAKEY_ENABLE = yes # Audio control and System control TAP_DANCE_ENABLE = no -SPACE_CADET_ENABLE = no NKRO_ENABLE = yes CAPS_WORD_ENABLE = no +CONSOLE_ENABLE = no +COMMAND_ENABLE = no +BACKLIGHT_ENABLE = no -ifneq ($(strip $(KEYBOARD)), planck/rev6) - CONSOLE_ENABLE = no - COMMAND_ENABLE = no - ifeq ($(strip $(LAYOUT_HAS_RGB)), yes) - RGBLIGHT_ENABLE = yes - INDICATOR_LIGHTS = yes - RGBLIGHT_STARTUP_ANIMATION = yes - endif -else +ifeq ($(strip $(LAYOUT_HAS_RGB)), yes) + RGBLIGHT_ENABLE = yes +endif + +ifeq ($(strip $(KEYBOARD)), planck/rev6) CONSOLE_ENABLE = yes RGBLIGHT_ENABLE = yes - RGBLIGHT_STARTUP_ANIMATION = yes RGB_MATRIX_ENABLE = no + RGBLIGHT_STARTUP_ANIMATION = yes AUDIO_ENABLE = yes EEPROM_DRIVER = i2c ENCODER_MAP_ENABLE = yes diff --git a/layouts/community/ortho_5x12/drashna/rules.mk b/layouts/community/ortho_5x12/drashna/rules.mk index 98ac829092..57cc3ce0be 100644 --- a/layouts/community/ortho_5x12/drashna/rules.mk +++ b/layouts/community/ortho_5x12/drashna/rules.mk @@ -1,7 +1,7 @@ -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys(+4700) -EXTRAKEY_ENABLE = yes # Audio control and System control(+450) -CONSOLE_ENABLE = no # Console for debug(+400) +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration TAP_DANCE_ENABLE = no NKRO_ENABLE = yes @@ -12,7 +12,7 @@ ifeq ($(strip $(KEYBOARD)), fractal) AUDIO_SUPPORTED = yes RGBLIGHT_SUPPORTED = yes RGBLIGHT_ENABLE = yes - RGBLIGHT_STARTUP_ANIMATION = yes + RGBLIGHT_STARTUP_ANIMATION = no BOOTLOADER = qmk-dfu CUSTOM_UNICODE_ENABLE = no endif diff --git a/layouts/community/split_3x6_3/drashna/keymap.c b/layouts/community/split_3x6_3/drashna/keymap.c index 4bd4618d0c..1bc758fce9 100644 --- a/layouts/community/split_3x6_3/drashna/keymap.c +++ b/layouts/community/split_3x6_3/drashna/keymap.c @@ -123,7 +123,7 @@ uint8_t current_kaki_frame = 0; uint8_t current_rtogi_frame = 0; // uint8_t current_ltogi_frame = 0; // clang-format off -void render_kitty(void) { +void render_small_kitty(void) { // Images credit j-inc(/James Incandenza) and pixelbenny. Credit to obosob for initial animation approach. static const char PROGMEM sleep[SLEEP_FRAMES][ANIM_SIZE] = {{ // 'sleep1', 32x32px @@ -228,7 +228,7 @@ void render_kitty(void) { } void oled_driver_render_logo_right(void) { - render_kitty(); + render_small_kitty(); oled_set_cursor(0, 4); render_default_layer_state(); -- cgit v1.2.1