Merge branch 'master' into hid_joystick
This commit is contained in:
		
						commit
						a80ea8b7cc
					
				
					 284 changed files with 9404 additions and 2408 deletions
				
			
		| 
						 | 
				
			
			@ -322,6 +322,11 @@ ifeq ($(strip $(USB_HID_ENABLE)), yes)
 | 
			
		|||
    include $(TMK_DIR)/protocol/usb_hid.mk
 | 
			
		||||
endif
 | 
			
		||||
 | 
			
		||||
ifeq ($(strip $(WPM_ENABLE)), yes)
 | 
			
		||||
    SRC += $(QUANTUM_DIR)/wpm.c
 | 
			
		||||
    OPT_DEFS += -DWPM_ENABLE
 | 
			
		||||
endif
 | 
			
		||||
 | 
			
		||||
ifeq ($(strip $(ENCODER_ENABLE)), yes)
 | 
			
		||||
    SRC += $(QUANTUM_DIR)/encoder.c
 | 
			
		||||
    OPT_DEFS += -DENCODER_ENABLE
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue