diff options
| author | zvecr <git@zvecr.com> | 2020-05-02 22:44:36 +0100 |
|---|---|---|
| committer | Drashna Jael're <drashna@live.com> | 2020-08-08 20:59:30 -0700 |
| commit | 9e607a70aed0b6245e693acb77232809df0ffea4 (patch) | |
| tree | 029e57e4cef617e4108ed4a2e569e869d6404e1d | |
| parent | c759836a16b6035a8c2ef94475d270f1683ae7dc (diff) | |
Move encoder_read to common location (qmk#9003)
| -rw-r--r-- | quantum/quantum.c | 11 | ||||
| -rw-r--r-- | quantum/split_common/matrix.c | 8 | ||||
| -rw-r--r-- | tmk_core/common/keyboard.c | 10 |
3 files changed, 11 insertions, 18 deletions
diff --git a/quantum/quantum.c b/quantum/quantum.c index 19d4fab5b7..de2ee91707 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) @@ -631,9 +627,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 @@ -668,10 +661,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 c3b43020ca..5bad9db08f 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 1d0307f2a3..cbf6048c8d 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 @@ -254,6 +257,9 @@ void keyboard_init(void) { #ifdef RGBLIGHT_ENABLE rgblight_init(); #endif +#ifdef ENCODER_ENABLE + encoder_init(); +#endif #ifdef STENO_ENABLE steno_init(); #endif @@ -354,6 +360,10 @@ MATRIX_LOOP_END: # endif #endif +#ifdef ENCODER_ENABLE + encoder_read(); +#endif + #ifdef QWIIC_ENABLE qwiic_task(); #endif |