diff options
| author | Drashna Jaelre <drashna@live.com> | 2021-05-21 23:17:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-21 23:17:32 -0700 |
| commit | a0fed0ea176d1c986e40fc4981b900509c90d66e (patch) | |
| tree | ee12f5943046015ea0dce8e2a30a68bc8eb99dbe /keyboards/splitkb | |
| parent | 76c23b15abc824f867b48d8d5100dced2417d336 (diff) | |
| download | qmk_firmware-a0fed0ea176d1c986e40fc4981b900509c90d66e.tar.gz qmk_firmware-a0fed0ea176d1c986e40fc4981b900509c90d66e.zip | |
Convert Encoder callbacks to be boolean functions (#12805)
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Diffstat (limited to 'keyboards/splitkb')
| -rw-r--r-- | keyboards/splitkb/zima/keymaps/drashna/keymap.c | 12 | ||||
| -rw-r--r-- | keyboards/splitkb/zima/zima.c | 14 |
2 files changed, 10 insertions, 16 deletions
diff --git a/keyboards/splitkb/zima/keymaps/drashna/keymap.c b/keyboards/splitkb/zima/keymaps/drashna/keymap.c index 9d3919ee28..d9e1f44e29 100644 --- a/keyboards/splitkb/zima/keymaps/drashna/keymap.c +++ b/keyboards/splitkb/zima/keymaps/drashna/keymap.c @@ -122,19 +122,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t* record) { } - void encoder_update_user(uint8_t index, bool clockwise) { +bool encoder_update_user(uint8_t index, bool clockwise) { if (clockwise) { tap_code16(KC_VOLU); } else { tap_code16(KC_VOLD); } -# ifdef OLED_DRIVER_ENABLE - oled_timer = timer_read32(); -# endif -# if defined(AUDIO_ENABLE) && defined(AUDIO_CLICKY) - if (is_audio_on() && is_clicky_on()) clicky_play(); -# endif -# ifdef HAPTIC_ENABLE - if (haptic_config.enable) haptic_play(); -# endif + return true; } diff --git a/keyboards/splitkb/zima/zima.c b/keyboards/splitkb/zima/zima.c index 3989ebeb29..74f9c84a79 100644 --- a/keyboards/splitkb/zima/zima.c +++ b/keyboards/splitkb/zima/zima.c @@ -93,12 +93,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record) { #endif #ifdef ENCODER_ENABLE -__attribute__((weak)) void encoder_update_user(uint8_t index, bool clockwise) { - if (clockwise) { - tap_code16(KC_VOLU); - } else { - tap_code16(KC_VOLD); - } +bool encoder_update_kb(uint8_t index, bool clockwise) { # ifdef OLED_DRIVER_ENABLE oled_timer = timer_read32(); # endif @@ -108,5 +103,12 @@ __attribute__((weak)) void encoder_update_user(uint8_t index, bool clockwise) { # ifdef HAPTIC_ENABLE if (haptic_config.enable) haptic_play(); # endif + if (!encoder_update_user(index, clockwise)) return false; + if (clockwise) { + tap_code16(KC_VOLU); + } else { + tap_code16(KC_VOLD); + } + return true; } #endif |