Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						49e0d2ea03
					
				
					 2 changed files with 8 additions and 8 deletions
				
			
		| 
						 | 
					@ -24,8 +24,8 @@ enum layers {
 | 
				
			||||||
const uint16_t PROGMEM led_adjust_combo[] = {KC_LEFT, KC_RGHT, COMBO_END};
 | 
					const uint16_t PROGMEM led_adjust_combo[] = {KC_LEFT, KC_RGHT, COMBO_END};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
					const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
				
			||||||
    [DEFAULT] = {
 | 
					    [DEFAULT] = LAYOUT(
 | 
				
			||||||
        { KC_END,  KC_UP,   KC_MUTE },
 | 
					        KC_END,  KC_UP,   KC_MUTE,
 | 
				
			||||||
        { KC_LEFT, KC_DOWN, KC_RGHT }
 | 
					        KC_LEFT, KC_DOWN, KC_RGHT
 | 
				
			||||||
    }
 | 
					    )
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -24,10 +24,10 @@ enum layers {
 | 
				
			||||||
const uint16_t PROGMEM led_adjust_combo[] = {KC_F22, KC_F24, COMBO_END};
 | 
					const uint16_t PROGMEM led_adjust_combo[] = {KC_F22, KC_F24, COMBO_END};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
					const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
				
			||||||
    [DEFAULT] = {
 | 
					    [DEFAULT] = LAYOUT(
 | 
				
			||||||
        { KC_F20, KC_F21, KC_MUTE },
 | 
					        KC_F20,  KC_F21,  KC_MUTE,
 | 
				
			||||||
        { KC_F22, KC_F23, KC_F24  }
 | 
					        KC_F22,  KC_F23,  KC_F24
 | 
				
			||||||
    }
 | 
					    )
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void encoder_one_update(bool clockwise) {
 | 
					void encoder_one_update(bool clockwise) {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue