mirror of
				https://github.com/mfulz/qmk_firmware.git
				synced 2025-11-03 23:02:34 +01:00 
			
		
		
		
	Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						3718f5149a
					
				@ -10,8 +10,6 @@ enum ctrl_keycodes {
 | 
			
		||||
    MD_BOOT,               //Restart into bootloader after hold timeout
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
keymap_config_t keymap_config;
 | 
			
		||||
 | 
			
		||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
    [0] = LAYOUT(
 | 
			
		||||
        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS, \
 | 
			
		||||
 | 
			
		||||
@ -21,8 +21,6 @@ enum ctrl_keycodes {
 | 
			
		||||
    MD_BOOT             //Restart into bootloader after hold timeout                //Working
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
keymap_config_t keymap_config;
 | 
			
		||||
 | 
			
		||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
    [0] = LAYOUT(
 | 
			
		||||
        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS, \
 | 
			
		||||
 | 
			
		||||
@ -10,8 +10,6 @@ enum ctrl_keycodes {
 | 
			
		||||
    MD_BOOT,               //Restart into bootloader after hold timeout
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
keymap_config_t keymap_config;
 | 
			
		||||
 | 
			
		||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
    [0] = LAYOUT(
 | 
			
		||||
        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS, \
 | 
			
		||||
 | 
			
		||||
@ -21,8 +21,6 @@ enum ctrl_keycodes {
 | 
			
		||||
    MD_BOOT             //Restart into bootloader after hold timeout                //Working
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
keymap_config_t keymap_config;
 | 
			
		||||
 | 
			
		||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
    [0] = LAYOUT(
 | 
			
		||||
        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS, \
 | 
			
		||||
 | 
			
		||||
@ -44,8 +44,6 @@ enum ctrl_keycodes {
 | 
			
		||||
    S_RESET            // reset all parameters
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
keymap_config_t keymap_config;
 | 
			
		||||
 | 
			
		||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
    [0] = LAYOUT(
 | 
			
		||||
        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS, \
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user