mirror of
				https://github.com/mfulz/qmk_firmware.git
				synced 2025-11-04 07:12:33 +01:00 
			
		
		
		
	Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						655015da4e
					
				@ -256,9 +256,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
),
 | 
			
		||||
/* NUMPAD
 | 
			
		||||
 * ,-----------------------------------------.                    ,-----------------------------------------.
 | 
			
		||||
 * | trans|      |      |      |      |      |                    |  F6  |  F7  |  F8  |  F9  | F10  | F11  |
 | 
			
		||||
 * | trans|      |      |      |      |      |                    |      |NumLck|      |      |      |      |
 | 
			
		||||
 * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
 | 
			
		||||
 * |  `   |      |      |      |      |      |                    |      |   7  |   8  |   9  |   *  | F12  |
 | 
			
		||||
 * |  `   |      |      |      |      |      |                    |   ^  |   7  |   8  |   9  |   *  |      |
 | 
			
		||||
 * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
 | 
			
		||||
 * | trans|      |      |      |      |      |-------.    ,-------|   -  |   4  |   5  |   6  |      |   |  |
 | 
			
		||||
 * |------+------+------+------+------+------|  MUTE |    |       |------+------+------+------+------+------|
 | 
			
		||||
@ -270,9 +270,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
 */
 | 
			
		||||
[_NUMPAD] = LAYOUT(
 | 
			
		||||
  //,------------------------------------------------.                    ,---------------------------------------------------.
 | 
			
		||||
  _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX,
 | 
			
		||||
  _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   _______, KC_NLCK, XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX,
 | 
			
		||||
  //|------+-------+--------+--------+--------+------|                   |--------+-------+--------+--------+--------+---------|
 | 
			
		||||
  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   KC_CIRC, KC_P7,  KC_P8,   KC_P9,   KC_ASTR, _______,
 | 
			
		||||
  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   KC_CIRC, KC_P7,  KC_P8,   KC_P9,   KC_ASTR, XXXXXXX,
 | 
			
		||||
  //|------+-------+--------+--------+--------+------|                   |--------+-------+--------+--------+--------+---------|
 | 
			
		||||
  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   KC_MINS, KC_P4,  KC_P5,   KC_P6,   KC_EQL,  KC_PIPE,
 | 
			
		||||
  //|------+-------+--------+--------+--------+------|  ===  |   |  ===  |--------+-------+--------+--------+--------+---------|
 | 
			
		||||
@ -284,13 +284,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
 | 
			
		||||
/* SWITCH
 | 
			
		||||
 * ,-----------------------------------------.                    ,-----------------------------------------.
 | 
			
		||||
 * | cole | qwer | low  |raise | adj  |numpd |                    |      |  F7  |  F8  |  F9  | F10  | F11  |
 | 
			
		||||
 * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
 | 
			
		||||
 * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
 | 
			
		||||
 * |  `   |      |      |      |      |      |                    |      |   7  |   8  |   9  |   *  | F12  |
 | 
			
		||||
 * | qwer | cole |col_dh| low  | raise| adj  |                    |numpad|      |      |      |      |RESET |
 | 
			
		||||
 * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
 | 
			
		||||
 * | trans|      |      |      |      |      |-------.    ,-------|   -  |   4  |   5  |   6  |      |   |  |
 | 
			
		||||
 * |      |      |      |      |      |      |-------.    ,-------|      |      |      |      |      |EEP_RST|
 | 
			
		||||
 * |------+------+------+------+------+------|  MUTE |    |       |------+------+------+------+------+------|
 | 
			
		||||
 * | trans|      |      |      |      |      |-------|    |-------|   +  |   1  |   2  |   3  |   \  | Shift|
 | 
			
		||||
 * | SLEEP|      |      |      |      |      |-------|    |-------|      |      |      |      |      |      |
 | 
			
		||||
 * `-----------------------------------------/       /     \      \-----------------------------------------'
 | 
			
		||||
 *            | Bspc | WIN  |LOWER | Enter| /Space  /       \Enter \  |SPACE | 0    |  .   | RAlt |
 | 
			
		||||
 *            |      |      |      |      |/       /         \      \ |      |      |      |      |
 | 
			
		||||
@ -301,11 +301,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
  //,------------------------------------------------.                    ,---------------------------------------------------.
 | 
			
		||||
  _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX,
 | 
			
		||||
  //|------+-------+--------+--------+--------+------|                   |--------+-------+--------+--------+--------+---------|
 | 
			
		||||
  TO(0),   TO(1),   TO(2),   TO(3),   TO(4),   TO(5), 					         KC_NO,   TO(7),   KC_NO,   KC_NO,   KC_NO,   RESET,
 | 
			
		||||
  TO(0),   TO(1),   TO(2),   TO(3),   TO(4),   TO(5),                      TO(6),   KC_NO,   KC_NO,   KC_NO,   KC_NO,   RESET,
 | 
			
		||||
  //|------+-------+--------+--------+--------+------|                   |--------+-------+--------+--------+--------+---------|
 | 
			
		||||
  KC_NO,   KC_NO, KC_BRIU,   KC_NO,   KC_NO,   KC_NO,                      KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   EEP_RST,
 | 
			
		||||
  //|------+-------+--------+--------+--------+------|  ===  |   |  ===  |--------+-------+--------+--------+--------+---------|
 | 
			
		||||
  KC_SYSTEM_SLEEP,KC_NO,KC_BRID,KC_NO,KC_NO,   KC_NO, KC_NO,	     KC_NO,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
 | 
			
		||||
  KC_SYSTEM_SLEEP,KC_NO,KC_NO,KC_NO,  KC_NO,   KC_NO, KC_NO,      KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
 | 
			
		||||
  //|------+-------+--------+--------+--------+------|  ===  |   |  ===  |--------+-------+--------+--------+--------+---------|
 | 
			
		||||
                  KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO
 | 
			
		||||
  //            \--------+--------+--------+---------+-------|   |--------+---------+--------+---------+-------/
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user