forked from mfulz_github/qmk_firmware
		
	Move encoder_read to common location
This commit is contained in:
		
							parent
							
								
									e182a38e7c
								
							
						
					
					
						commit
						406dc2fb2d
					
				| @ -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 | ||||||
| @ -658,10 +651,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 | ||||||
|  | |||||||
| @ -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) | ||||||
| @ -255,9 +251,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(); | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -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 | ||||||
| @ -249,6 +252,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 | ||||||
| @ -345,6 +351,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 | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 zvecr
						zvecr