Merge remote-tracking branch 'upstream/master' into develop
This commit is contained in:
		
						commit
						d65db68f9f
					
				
					 7 changed files with 30 additions and 2 deletions
				
			
		| 
						 | 
				
			
			@ -24,6 +24,8 @@ QUANTUM_SRC += \
 | 
			
		|||
ifeq ($(strip $(DEBUG_MATRIX_SCAN_RATE_ENABLE)), yes)
 | 
			
		||||
    OPT_DEFS += -DDEBUG_MATRIX_SCAN_RATE
 | 
			
		||||
    CONSOLE_ENABLE = yes
 | 
			
		||||
else ifeq ($(strip $(DEBUG_MATRIX_SCAN_RATE_ENABLE)), api)
 | 
			
		||||
    OPT_DEFS += -DDEBUG_MATRIX_SCAN_RATE
 | 
			
		||||
endif
 | 
			
		||||
 | 
			
		||||
ifeq ($(strip $(API_SYSEX_ENABLE)), yes)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue