Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						fb65f07832
					
				
					 6 changed files with 11 additions and 2 deletions
				
			
		| 
						 | 
				
			
			@ -15,6 +15,7 @@ COMMAND_ENABLE = no         # Commands for debug and configuration
 | 
			
		|||
NKRO_ENABLE = yes           # Enable N-Key Rollover
 | 
			
		||||
BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 | 
			
		||||
RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 | 
			
		||||
UNICODE_ENABLE = yes        # Unicode
 | 
			
		||||
AUDIO_ENABLE = no           # Audio output
 | 
			
		||||
UNICODE_ENABLE = yes
 | 
			
		||||
SPLIT_KEYBOARD = yes
 | 
			
		||||
SPLIT_KEYBOARD = yes        # Use shared split_common code
 | 
			
		||||
LAYOUTS = split_3x5_2
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -48,3 +48,5 @@
 | 
			
		|||
        { R16, R17, ___, ___, ___ }  \
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
#define LAYOUT LAYOUT_split_3x5_2
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -18,3 +18,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 | 
			
		|||
UNICODE_ENABLE = yes        # Unicode
 | 
			
		||||
AUDIO_ENABLE = no           # Audio output
 | 
			
		||||
SPLIT_KEYBOARD = yes        # Use shared split_common code
 | 
			
		||||
LAYOUTS = split_3x5_2
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -23,3 +23,5 @@ LTO_ENABLE = yes
 | 
			
		|||
 | 
			
		||||
SRC += matrix.c
 | 
			
		||||
QUANTUM_LIB_SRC += i2c_master.c
 | 
			
		||||
 | 
			
		||||
LAYOUTS = split_3x5_2
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -23,3 +23,5 @@ LTO_ENABLE = no
 | 
			
		|||
 | 
			
		||||
SRC += matrix.c
 | 
			
		||||
QUANTUM_LIB_SRC += i2c_master.c
 | 
			
		||||
 | 
			
		||||
LAYOUTS = split_3x5_2
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -18,3 +18,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 | 
			
		|||
UNICODE_ENABLE = yes        # Unicode
 | 
			
		||||
AUDIO_ENABLE = no           # Audio output
 | 
			
		||||
SPLIT_KEYBOARD = yes        # Use shared split_common code
 | 
			
		||||
LAYOUTS = split_3x5_2
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue