aboutsummaryrefslogtreecommitdiff
path: root/tmk_core/common/keyboard.c
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2020-06-03 00:54:53 +0100
committerGitHub <noreply@github.com>2020-06-03 00:54:53 +0100
commitd17572b125113928b56e19bfaefae5d13a912f5e (patch)
tree76bfa45b253f28361da86f5d902103022fc57f85 /tmk_core/common/keyboard.c
parent517d607fa4292a03fb8a880a07d27cb14020ed1d (diff)
parent406dc2fb2d1e657db2d7235885722dd86d07ea08 (diff)
downloadqmk_firmware-d17572b125113928b56e19bfaefae5d13a912f5e.tar.gz
qmk_firmware-d17572b125113928b56e19bfaefae5d13a912f5e.zip
Move encoder_read to common location (#9003)
Diffstat (limited to 'tmk_core/common/keyboard.c')
-rw-r--r--tmk_core/common/keyboard.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c
index e2110363a..714c3d048 100644
--- a/tmk_core/common/keyboard.c
+++ b/tmk_core/common/keyboard.c
@@ -53,6 +53,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
53#ifdef RGBLIGHT_ENABLE 53#ifdef RGBLIGHT_ENABLE
54# include "rgblight.h" 54# include "rgblight.h"
55#endif 55#endif
56#ifdef ENCODER_ENABLE
57# include "encoder.h"
58#endif
56#ifdef STENO_ENABLE 59#ifdef STENO_ENABLE
57# include "process_steno.h" 60# include "process_steno.h"
58#endif 61#endif
@@ -259,6 +262,9 @@ void keyboard_init(void) {
259#ifdef RGBLIGHT_ENABLE 262#ifdef RGBLIGHT_ENABLE
260 rgblight_init(); 263 rgblight_init();
261#endif 264#endif
265#ifdef ENCODER_ENABLE
266 encoder_init();
267#endif
262#ifdef STENO_ENABLE 268#ifdef STENO_ENABLE
263 steno_init(); 269 steno_init();
264#endif 270#endif
@@ -359,6 +365,10 @@ MATRIX_LOOP_END:
359# endif 365# endif
360#endif 366#endif
361 367
368#ifdef ENCODER_ENABLE
369 encoder_read();
370#endif
371
362#ifdef QWIIC_ENABLE 372#ifdef QWIIC_ENABLE
363 qwiic_task(); 373 qwiic_task();
364#endif 374#endif