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/planck/keymaps/tk/keymap.c | 63 ++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 31 deletions(-) (limited to 'keyboards/planck/keymaps/tk') diff --git a/keyboards/planck/keymaps/tk/keymap.c b/keyboards/planck/keymaps/tk/keymap.c index b3273aec5d..1ceb6cc5bb 100644 --- a/keyboards/planck/keymaps/tk/keymap.c +++ b/keyboards/planck/keymaps/tk/keymap.c @@ -1,18 +1,18 @@ /* Copyright 2020 Tushar Khan - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ #include QMK_KEYBOARD_H #include "muse.h" @@ -77,8 +77,8 @@ enum keycodes { EMAIL, // [email address] PHONE, // [phone number] GT_CMT, // git commit -m '' - SHEBANG, // #!/usr/bin/env - CHMOD, // chmod 744 *sh + SHEBANG, // #!/usr/bin/env + CHMOD, // chmod 744 *sh PY_VENV, // source *env*/bin/activate }; @@ -355,7 +355,7 @@ layer_state_t layer_state_set_user(layer_state_t state) { // enabling base layer song breaks a lot of other songs including // - macro recording start song // - rotary feedback songs - + // PLAY_SONG(base_song); break; case _HYPER: @@ -393,10 +393,10 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { /* - ██  ██ ███████ ██  ██  ██████  ██████  ██████  ███████ ███████  - ██  ██  ██       ██  ██  ██      ██    ██ ██   ██ ██      ██       - █████   █████   ████   ██  ██  ██ ██  ██ █████  ███████  - ██  ██  ██      ██   ██  ██  ██ ██  ██ ██          ██  + ██  ██ ███████ ██  ██  ██████  ██████  ██████  ███████ ███████ + ██  ██  ██       ██  ██  ██      ██    ██ ██   ██ ██      ██ + █████   █████   ████   ██  ██  ██ ██  ██ █████  ███████ + ██  ██  ██      ██   ██  ██  ██ ██  ██ ██          ██ ██  ██ ███████  ██   ██████  ██████  ██████  ███████ ███████ */ @@ -480,10 +480,10 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { return false; /* - ███  ███  █████  ██████ ██████  ██████  ███████  - ████  ████ ██   ██ ██      ██   ██ ██    ██ ██       - ██ ████ ██ ███████ ██  ██████  ██  ██ ███████  - ██  ██  ██ ██   ██ ██  ██   ██ ██  ██      ██  + ███  ███  █████  ██████ ██████  ██████  ███████ + ████  ████ ██   ██ ██      ██   ██ ██    ██ ██ + ██ ████ ██ ███████ ██  ██████  ██  ██ ███████ + ██  ██  ██ ██   ██ ██  ██   ██ ██  ██      ██ ██      ██ ██  ██  ██████ ██  ██  ██████  ███████ */ @@ -527,10 +527,10 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { }; /* - █████  ██  ██ ██████  ██  ██████  - ██   ██ ██  ██ ██   ██ ██ ██    ██  - ███████ ██  ██ ██  ██ ██ ██  ██  - ██   ██ ██  ██ ██  ██ ██ ██  ██  + █████  ██  ██ ██████  ██  ██████ + ██   ██ ██  ██ ██   ██ ██ ██    ██ + ███████ ██  ██ ██  ██ ██ ██  ██ + ██   ██ ██  ██ ██  ██ ██ ██  ██ ██  ██  ██████  ██████  ██  ██████ */ @@ -600,7 +600,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } void post_process_record_user(uint16_t keycode, keyrecord_t *record) { - + } @@ -615,7 +615,7 @@ void post_process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef ENCODER_ENABLE -void encoder_update_user(uint8_t index, bool clockwise) { +bool encoder_update_user(uint8_t index, bool clockwise) { static int scroll_interval = 5; switch (rotary_state) { @@ -686,5 +686,6 @@ void encoder_update_user(uint8_t index, bool clockwise) { } break; } + return true; } #endif -- cgit v1.2.3