mirror of
				https://github.com/mfulz/qmk_firmware.git
				synced 2025-10-31 05:12:33 +01:00 
			
		
		
		
	Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						028a0dcd3d
					
				| @ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||||||
| 			   KC_LCTL,KC_LALT, | 			   KC_LCTL,KC_LALT, | ||||||
|                                     KC_HOME, |                                     KC_HOME, | ||||||
|                            KC_BSPC,KC_DEL ,KC_END , |                            KC_BSPC,KC_DEL ,KC_END , | ||||||
|     KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR ,KC_SLCK  ,KC_PAUS, KC_FN0, KC_1, |     KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR ,KC_SLCK  ,KC_PAUS, KC_FN0, RESET, | ||||||
| 	KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_MINS, | 	KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_MINS, | ||||||
| 	KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,KC_BSLS, | 	KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,KC_BSLS, | ||||||
| 	KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_SCLN,KC_QUOT, | 	KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_SCLN,KC_QUOT, | ||||||
|  | |||||||
| @ -32,7 +32,7 @@ | |||||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
| 
 | 
 | ||||||
|   [QWERTY] = LAYOUT_pretty( |   [QWERTY] = LAYOUT_pretty( | ||||||
|     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,  KC_FN0,   KC_1, |     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,  KC_FN0,   RESET, | ||||||
|     KC_EQL,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,                                                                      KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS, |     KC_EQL,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,                                                                      KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS, | ||||||
|     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,                                                                      KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_BSLS, |     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,                                                                      KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_BSLS, | ||||||
|     KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,                                                                      KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT, |     KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,                                                                      KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT, | ||||||
|  | |||||||
| @ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||||||
|                                      KC_HOME, |                                      KC_HOME, | ||||||
|                    KC_BSPC, KC_DEL,  KC_END, |                    KC_BSPC, KC_DEL,  KC_END, | ||||||
|         // right hand
 |         // right hand
 | ||||||
|         KC_F9,  KC_F10,   KC_F11,   KC_F12,   KC_PSCR, KC_SLCK, KC_PAUS, KC_FN0, KC_1, |         KC_F9,  KC_F10,   KC_F11,   KC_F12,   KC_PSCR, KC_SLCK, KC_PAUS, KC_FN0, RESET, | ||||||
|         KC_6,   KC_7,     KC_8,     KC_9,     KC_0,    KC_MINS, |         KC_6,   KC_7,     KC_8,     KC_9,     KC_0,    KC_MINS, | ||||||
|         KC_F,   KC_G,     KC_C,     KC_R,     KC_L,    KC_SLSH, |         KC_F,   KC_G,     KC_C,     KC_R,     KC_L,    KC_SLSH, | ||||||
|         KC_D,   KC_H,     KC_T,     KC_N,     KC_S,    KC_BSLS, |         KC_D,   KC_H,     KC_T,     KC_N,     KC_S,    KC_BSLS, | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 QMK Bot
						QMK Bot