diff options
Diffstat (limited to 'quantum')
-rw-r--r-- | quantum/quantum.c | 11 | ||||
-rw-r--r-- | quantum/split_common/matrix.c | 8 |
2 files changed, 1 insertions, 18 deletions
diff --git a/quantum/quantum.c b/quantum/quantum.c index 2053a1a5f..a780ed43d 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c | |||
@@ -46,10 +46,6 @@ extern backlight_config_t backlight_config; | |||
46 | # include "haptic.h" | 46 | # include "haptic.h" |
47 | #endif | 47 | #endif |
48 | 48 | ||
49 | #ifdef ENCODER_ENABLE | ||
50 | # include "encoder.h" | ||
51 | #endif | ||
52 | |||
53 | #ifdef AUDIO_ENABLE | 49 | #ifdef AUDIO_ENABLE |
54 | # ifndef GOODBYE_SONG | 50 | # ifndef GOODBYE_SONG |
55 | # define GOODBYE_SONG SONG(GOODBYE_SOUND) | 51 | # define GOODBYE_SONG SONG(GOODBYE_SOUND) |
@@ -618,9 +614,6 @@ void matrix_init_quantum() { | |||
618 | #ifdef RGB_MATRIX_ENABLE | 614 | #ifdef RGB_MATRIX_ENABLE |
619 | rgb_matrix_init(); | 615 | rgb_matrix_init(); |
620 | #endif | 616 | #endif |
621 | #ifdef ENCODER_ENABLE | ||
622 | encoder_init(); | ||
623 | #endif | ||
624 | #if defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE) | 617 | #if defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE) |
625 | unicode_input_mode_init(); | 618 | unicode_input_mode_init(); |
626 | #endif | 619 | #endif |
@@ -658,10 +651,6 @@ void matrix_scan_quantum() { | |||
658 | rgb_matrix_task(); | 651 | rgb_matrix_task(); |
659 | #endif | 652 | #endif |
660 | 653 | ||
661 | #ifdef ENCODER_ENABLE | ||
662 | encoder_read(); | ||
663 | #endif | ||
664 | |||
665 | #ifdef WPM_ENABLE | 654 | #ifdef WPM_ENABLE |
666 | decay_wpm(); | 655 | decay_wpm(); |
667 | #endif | 656 | #endif |
diff --git a/quantum/split_common/matrix.c b/quantum/split_common/matrix.c index 8b91f8ca8..95ee2433a 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/>. | |||
24 | #include "config.h" | 24 | #include "config.h" |
25 | #include "transport.h" | 25 | #include "transport.h" |
26 | 26 | ||
27 | #ifdef ENCODER_ENABLE | ||
28 | # include "encoder.h" | ||
29 | #endif | ||
30 | |||
31 | #define ERROR_DISCONNECT_COUNT 5 | 27 | #define ERROR_DISCONNECT_COUNT 5 |
32 | 28 | ||
33 | #define ROWS_PER_HAND (MATRIX_ROWS / 2) | 29 | #define ROWS_PER_HAND (MATRIX_ROWS / 2) |
@@ -255,9 +251,7 @@ void matrix_post_scan(void) { | |||
255 | matrix_scan_quantum(); | 251 | matrix_scan_quantum(); |
256 | } else { | 252 | } else { |
257 | transport_slave(matrix + thisHand); | 253 | transport_slave(matrix + thisHand); |
258 | #ifdef ENCODER_ENABLE | 254 | |
259 | encoder_read(); | ||
260 | #endif | ||
261 | matrix_slave_scan_user(); | 255 | matrix_slave_scan_user(); |
262 | } | 256 | } |
263 | } | 257 | } |