1
0
Fork 0

Move encoder_read to common location (#9003)

This commit is contained in:
Joel Challis 2020-06-03 00:54:53 +01:00 committed by GitHub
commit d17572b125
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 18 deletions

View file

@ -46,10 +46,6 @@ extern backlight_config_t backlight_config;
# include "haptic.h" # include "haptic.h"
#endif #endif
#ifdef ENCODER_ENABLE
# include "encoder.h"
#endif
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
# ifndef GOODBYE_SONG # ifndef GOODBYE_SONG
# define GOODBYE_SONG SONG(GOODBYE_SOUND) # define GOODBYE_SONG SONG(GOODBYE_SOUND)
@ -618,9 +614,6 @@ void matrix_init_quantum() {
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
rgb_matrix_init(); rgb_matrix_init();
#endif #endif
#ifdef ENCODER_ENABLE
encoder_init();
#endif
#if defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE) #if defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE)
unicode_input_mode_init(); unicode_input_mode_init();
#endif #endif
@ -655,10 +648,6 @@ void matrix_scan_quantum() {
rgb_matrix_task(); rgb_matrix_task();
#endif #endif
#ifdef ENCODER_ENABLE
encoder_read();
#endif
#ifdef WPM_ENABLE #ifdef WPM_ENABLE
decay_wpm(); decay_wpm();
#endif #endif

View file

@ -24,10 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config.h" #include "config.h"
#include "transport.h" #include "transport.h"
#ifdef ENCODER_ENABLE
# include "encoder.h"
#endif
#define ERROR_DISCONNECT_COUNT 5 #define ERROR_DISCONNECT_COUNT 5
#define ROWS_PER_HAND (MATRIX_ROWS / 2) #define ROWS_PER_HAND (MATRIX_ROWS / 2)
@ -264,9 +260,7 @@ void matrix_post_scan(void) {
matrix_scan_quantum(); matrix_scan_quantum();
} else { } else {
transport_slave(matrix + thisHand); transport_slave(matrix + thisHand);
#ifdef ENCODER_ENABLE
encoder_read();
#endif
matrix_slave_scan_user(); matrix_slave_scan_user();
} }
} }

View file

@ -53,6 +53,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef RGBLIGHT_ENABLE #ifdef RGBLIGHT_ENABLE
# include "rgblight.h" # include "rgblight.h"
#endif #endif
#ifdef ENCODER_ENABLE
# include "encoder.h"
#endif
#ifdef STENO_ENABLE #ifdef STENO_ENABLE
# include "process_steno.h" # include "process_steno.h"
#endif #endif
@ -259,6 +262,9 @@ void keyboard_init(void) {
#ifdef RGBLIGHT_ENABLE #ifdef RGBLIGHT_ENABLE
rgblight_init(); rgblight_init();
#endif #endif
#ifdef ENCODER_ENABLE
encoder_init();
#endif
#ifdef STENO_ENABLE #ifdef STENO_ENABLE
steno_init(); steno_init();
#endif #endif
@ -359,6 +365,10 @@ MATRIX_LOOP_END:
# endif # endif
#endif #endif
#ifdef ENCODER_ENABLE
encoder_read();
#endif
#ifdef QWIIC_ENABLE #ifdef QWIIC_ENABLE
qwiic_task(); qwiic_task();
#endif #endif