From a0fed0ea176d1c986e40fc4981b900509c90d66e Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Fri, 21 May 2021 23:17:32 -0700 Subject: Convert Encoder callbacks to be boolean functions (#12805) Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/cannonkeys/ortho75/ortho75.c | 4 +++- keyboards/cannonkeys/satisfaction75/satisfaction75.c | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'keyboards/cannonkeys') diff --git a/keyboards/cannonkeys/ortho75/ortho75.c b/keyboards/cannonkeys/ortho75/ortho75.c index c3ceee28c0..7c722d7156 100644 --- a/keyboards/cannonkeys/ortho75/ortho75.c +++ b/keyboards/cannonkeys/ortho75/ortho75.c @@ -11,7 +11,8 @@ uint32_t layer_state_set_kb(uint32_t state) { return state; } -void encoder_update_kb(uint8_t index, bool clockwise) { +bool encoder_update_kb(uint8_t index, bool clockwise) { + if (!encoder_update_user(index, clockwise)) return false; uint16_t mapped_code = 0; if (index == 0) { if (clockwise) { @@ -46,4 +47,5 @@ void encoder_update_kb(uint8_t index, bool clockwise) { while (timer_elapsed(held_keycode_timer) < MEDIA_KEY_DELAY){ /* no-op */ } unregister_code(mapped_code); } + return true; } diff --git a/keyboards/cannonkeys/satisfaction75/satisfaction75.c b/keyboards/cannonkeys/satisfaction75/satisfaction75.c index 47c9a9d503..d3853c2292 100644 --- a/keyboards/cannonkeys/satisfaction75/satisfaction75.c +++ b/keyboards/cannonkeys/satisfaction75/satisfaction75.c @@ -300,7 +300,8 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { } -void encoder_update_kb(uint8_t index, bool clockwise) { +bool encoder_update_kb(uint8_t index, bool clockwise) { + if (!encoder_update_user(index, clockwise)) return false; encoder_value = (encoder_value + (clockwise ? 1 : -1)) % 64; queue_for_send = true; if (index == 0) { @@ -325,6 +326,7 @@ void encoder_update_kb(uint8_t index, bool clockwise) { } } } + return true; } void custom_config_reset(void){ @@ -451,4 +453,4 @@ void via_eeprom_reset(void) eeconfig_disable(); } -#endif // VIA_ENABLE \ No newline at end of file +#endif // VIA_ENABLE -- cgit v1.2.3