From 3a3e5abac992712a8bb4e9b61430f5fc62dc6043 Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Wed, 31 May 2023 11:44:06 -0700 Subject: [Keymap] Drashna Keymap updates for 0.21.0 (#21073) --- .../work_board/keymaps/drashna/keymap.c | 23 ++-------------------- .../work_board/keymaps/drashna/rules.mk | 8 ++++---- 2 files changed, 6 insertions(+), 25 deletions(-) (limited to 'keyboards/work_louder') diff --git a/keyboards/work_louder/work_board/keymaps/drashna/keymap.c b/keyboards/work_louder/work_board/keymaps/drashna/keymap.c index 99bbedfdcb..1747ab638e 100644 --- a/keyboards/work_louder/work_board/keymaps/drashna/keymap.c +++ b/keyboards/work_louder/work_board/keymaps/drashna/keymap.c @@ -91,8 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; -#ifdef ENCODER_ENABLE -# ifdef ENCODER_MAP_ENABLE +#ifdef ENCODER_MAP_ENABLE const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_DEFAULT_LAYER_1] = { { KC_DOWN, KC_UP } }, [_DEFAULT_LAYER_2] = { { _______, _______ } }, @@ -107,23 +106,6 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_ADJUST] = { { CK_DOWN, CK_UP } }, }; // clang-format on -# else -bool encoder_update_user(uint8_t index, bool clockwise) { - switch (get_highest_layer(layer_state)) { - case _RAISE: - clockwise ? rgblight_step() : rgblight_step_reverse(); - break; - case _LOWER: - clockwise ? rgb_matrix_step() : rgb_matrix_step_reverse(); - break; - default: - clockwise ? tap_code(KC_VOLU) : tap_code(KC_VOLD); - break; - } - return false; -} -# endif // ENCODER_ENABLE - #endif bool rgb_matrix_indicators_advanced_keymap(uint8_t led_min, uint8_t led_max) { @@ -133,8 +115,7 @@ bool rgb_matrix_indicators_advanced_keymap(uint8_t led_min, uint8_t led_max) { #define THUMB_LED 6 #define RGB_MATRIX_INDICATOR_SET_COLOR_wrapper(...) RGB_MATRIX_INDICATOR_SET_COLOR(__VA_ARGS__) - extern bool host_driver_disabled; - if (host_driver_disabled) { + if (get_keyboard_lock()) { RGB_MATRIX_INDICATOR_SET_COLOR_wrapper(THUMB_LED, RGB_OFF); } else { switch (get_highest_layer(default_layer_state)) { diff --git a/keyboards/work_louder/work_board/keymaps/drashna/rules.mk b/keyboards/work_louder/work_board/keymaps/drashna/rules.mk index 6a98d14daf..8bdc486929 100644 --- a/keyboards/work_louder/work_board/keymaps/drashna/rules.mk +++ b/keyboards/work_louder/work_board/keymaps/drashna/rules.mk @@ -1,10 +1,10 @@ -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +BOOTMAGIC_ENABLE = yes EXTRAKEY_ENABLE = yes MOUSEKEY_ENABLE = yes TAP_DANCE_ENABLE = no NKRO_ENABLE = yes -RGBLIGHT_STARTUP_ANIMATION = yes +RGBLIGHT_STARTUP_ANIMATION = no ENCODER_MAP_ENABLE = yes -AUTOCORRECT_ENABLE = no -CUSTOM_UNICODE_ENABLE = no +AUTOCORRECT_ENABLE = no +CUSTOM_UNICODE_ENABLE = no -- cgit v1.2.3