mirror of
				https://github.com/mfulz/qmk_firmware.git
				synced 2025-11-04 07:12:33 +01:00 
			
		
		
		
	Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						ca1b114297
					
				@ -81,7 +81,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void encoder_update_user(uint8_t index, bool clockwise) {
 | 
					bool encoder_update_user(uint8_t index, bool clockwise) {
 | 
				
			||||||
    if (clockwise) {
 | 
					    if (clockwise) {
 | 
				
			||||||
        tap_code(KC_VOLU);
 | 
					        tap_code(KC_VOLU);
 | 
				
			||||||
#ifdef OLED_DRIVER_ENABLE
 | 
					#ifdef OLED_DRIVER_ENABLE
 | 
				
			||||||
@ -93,6 +93,7 @@ void encoder_update_user(uint8_t index, bool clockwise) {
 | 
				
			|||||||
        process_record_encoder_oled(KC_VOLD);
 | 
					        process_record_encoder_oled(KC_VOLD);
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					    return true;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void matrix_init_user(void) {
 | 
					void matrix_init_user(void) {
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user