aboutsummaryrefslogtreecommitdiffstats
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
parent517d607fa4292a03fb8a880a07d27cb14020ed1d (diff)
parent406dc2fb2d1e657db2d7235885722dd86d07ea08 (diff)
downloadfirmware-d17572b125113928b56e19bfaefae5d13a912f5e.tar.gz
firmware-d17572b125113928b56e19bfaefae5d13a912f5e.tar.bz2
firmware-d17572b125113928b56e19bfaefae5d13a912f5e.zip
Move encoder_read to common location (#9003)
-rw-r--r--quantum/quantum.c11
-rw-r--r--quantum/split_common/matrix.c8
-rw-r--r--tmk_core/common/keyboard.c10
3 files changed, 11 insertions, 18 deletions
diff --git a/quantum/quantum.c b/quantum/quantum.c
index 346ea4e03..75df357d3 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -46,10 +46,6 @@ extern backlight_config_t backlight_config;
# include "haptic.h"
#endif
-#ifdef ENCODER_ENABLE
-# include "encoder.h"
-#endif
-
#ifdef AUDIO_ENABLE
# ifndef GOODBYE_SONG
# define GOODBYE_SONG SONG(GOODBYE_SOUND)
@@ -618,9 +614,6 @@ void matrix_init_quantum() {
#ifdef RGB_MATRIX_ENABLE
rgb_matrix_init();
#endif
-#ifdef ENCODER_ENABLE
- encoder_init();
-#endif
#if defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE)
unicode_input_mode_init();
#endif
@@ -655,10 +648,6 @@ void matrix_scan_quantum() {
rgb_matrix_task();
#endif
-#ifdef ENCODER_ENABLE
- encoder_read();
-#endif
-
#ifdef WPM_ENABLE
decay_wpm();
#endif
diff --git a/quantum/split_common/matrix.c b/quantum/split_common/matrix.c
index c3b43020c..5bad9db08 100644
--- a/quantum/split_common/matrix.c
+++ b/quantum/split_common/matrix.c
@@ -24,10 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config.h"
#include "transport.h"
-#ifdef ENCODER_ENABLE
-# include "encoder.h"
-#endif
-
#define ERROR_DISCONNECT_COUNT 5
#define ROWS_PER_HAND (MATRIX_ROWS / 2)
@@ -264,9 +260,7 @@ void matrix_post_scan(void) {
matrix_scan_quantum();
} else {
transport_slave(matrix + thisHand);
-#ifdef ENCODER_ENABLE
- encoder_read();
-#endif
+
matrix_slave_scan_user();
}
}
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/>.
#ifdef RGBLIGHT_ENABLE
# include "rgblight.h"
#endif
+#ifdef ENCODER_ENABLE
+# include "encoder.h"
+#endif
#ifdef STENO_ENABLE
# include "process_steno.h"
#endif
@@ -259,6 +262,9 @@ void keyboard_init(void) {
#ifdef RGBLIGHT_ENABLE
rgblight_init();
#endif
+#ifdef ENCODER_ENABLE
+ encoder_init();
+#endif
#ifdef STENO_ENABLE
steno_init();
#endif
@@ -359,6 +365,10 @@ MATRIX_LOOP_END:
# endif
#endif
+#ifdef ENCODER_ENABLE
+ encoder_read();
+#endif
+
#ifdef QWIIC_ENABLE
qwiic_task();
#endif