Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						121a2e0f07
					
				
					 12 changed files with 41 additions and 44 deletions
				
			
		| 
						 | 
				
			
			@ -16,6 +16,13 @@
 | 
			
		|||
#include QMK_KEYBOARD_H
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
#define LAYOUT_via( \
 | 
			
		||||
    k00, k01, k02, \
 | 
			
		||||
    k00_a, k00_b \
 | 
			
		||||
) { \
 | 
			
		||||
    { k00, k01,   k02, k00_a, k00_b } \
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
    /* Base */
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,2 +1,4 @@
 | 
			
		|||
VIA_ENABLE = yes
 | 
			
		||||
LTO_ENABLE = yes
 | 
			
		||||
 | 
			
		||||
SRC += encoder_actions.c
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -33,10 +33,3 @@
 | 
			
		|||
) { \
 | 
			
		||||
    { k00, k01,   k02 } \
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#define LAYOUT_via( \
 | 
			
		||||
    k00, k01, k02, \
 | 
			
		||||
    k00_a, k00_b \
 | 
			
		||||
) { \
 | 
			
		||||
    { k00, k01,   k02, k00_a, k00_b } \
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -20,7 +20,9 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 | 
			
		|||
RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 | 
			
		||||
AUDIO_ENABLE = no           # Audio output
 | 
			
		||||
ENCODER_ENABLE = yes
 | 
			
		||||
LTO_ENABLE = yes
 | 
			
		||||
 | 
			
		||||
RGB_MATRIX_ENABLE = yes
 | 
			
		||||
RGB_MATRIX_DRIVER = WS2812
 | 
			
		||||
 | 
			
		||||
SRC += encoder_actions.c rgb_functions.c
 | 
			
		||||
SRC += rgb_functions.c
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue