diff options
| author | Joel Challis <git@zvecr.com> | 2020-06-03 00:54:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-03 00:54:53 +0100 |
| commit | d17572b125113928b56e19bfaefae5d13a912f5e (patch) | |
| tree | 76bfa45b253f28361da86f5d902103022fc57f85 /quantum | |
| parent | 517d607fa4292a03fb8a880a07d27cb14020ed1d (diff) | |
| parent | 406dc2fb2d1e657db2d7235885722dd86d07ea08 (diff) | |
| download | qmk_firmware-d17572b125113928b56e19bfaefae5d13a912f5e.tar.gz qmk_firmware-d17572b125113928b56e19bfaefae5d13a912f5e.zip | |
Move encoder_read to common location (#9003)
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 346ea4e03..75df357d3 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 |
| @@ -655,10 +648,6 @@ void matrix_scan_quantum() { | |||
| 655 | rgb_matrix_task(); | 648 | rgb_matrix_task(); |
| 656 | #endif | 649 | #endif |
| 657 | 650 | ||
| 658 | #ifdef ENCODER_ENABLE | ||
| 659 | encoder_read(); | ||
| 660 | #endif | ||
| 661 | |||
| 662 | #ifdef WPM_ENABLE | 651 | #ifdef WPM_ENABLE |
| 663 | decay_wpm(); | 652 | decay_wpm(); |
| 664 | #endif | 653 | #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/>. | |||
| 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) |
| @@ -264,9 +260,7 @@ void matrix_post_scan(void) { | |||
| 264 | matrix_scan_quantum(); | 260 | matrix_scan_quantum(); |
| 265 | } else { | 261 | } else { |
| 266 | transport_slave(matrix + thisHand); | 262 | transport_slave(matrix + thisHand); |
| 267 | #ifdef ENCODER_ENABLE | 263 | |
| 268 | encoder_read(); | ||
| 269 | #endif | ||
| 270 | matrix_slave_scan_user(); | 264 | matrix_slave_scan_user(); |
| 271 | } | 265 | } |
| 272 | } | 266 | } |
