Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						b3b66868f8
					
				
					 2 changed files with 7 additions and 27 deletions
				
			
		| 
						 | 
				
			
			@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
 * `-----------------------------------------------------------------------------------'
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
[0] = LAYOUT_all(
 | 
			
		||||
[0] = LAYOUT(
 | 
			
		||||
  KC_TAB,        KC_Q,    KC_W,    KC_F,         KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
 | 
			
		||||
  CTL_T(KC_ESC), KC_A,    KC_R,    KC_S,         KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
 | 
			
		||||
  KC_LSFT,       KC_Z,    KC_X,    KC_C,         KC_V,    KC_B,    KC_K,    KC_M,     KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
 | 
			
		||||
| 
						 | 
				
			
			@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
 * `-----------------------------------------------------------------------------------'
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
[1] = LAYOUT_all(
 | 
			
		||||
[1] = LAYOUT(
 | 
			
		||||
  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
 | 
			
		||||
  KC_SLSH, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
 | 
			
		||||
  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_EQL, _______, _______, _______,
 | 
			
		||||
| 
						 | 
				
			
			@ -78,7 +78,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
 * `-----------------------------------------------------------------------------------'
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
[2] = LAYOUT_all(
 | 
			
		||||
[2] = LAYOUT(
 | 
			
		||||
  RGB_HUI,  RGB_SAI,  _______,   KC_UP,   _______,  _______,  _______,  KC_UNDS, _______, KC_LBRC, KC_RBRC, RGB_VAI,
 | 
			
		||||
  RGB_HUD,  RGB_SAD,   KC_LEFT, KC_DOWN, KC_RGHT,   _______,  _______,  KC_MINS, _______, KC_LCBR, KC_RCBR, RGB_VAD,
 | 
			
		||||
  KC_F1,    KC_F2,     KC_F3,   KC_F4,   KC_F5,     KC_F6,    KC_F7,    KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,
 | 
			
		||||
| 
						 | 
				
			
			@ -99,7 +99,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
 * `-----------------------------------------------------------------------------------'
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
[3] = LAYOUT_all(
 | 
			
		||||
[3] = LAYOUT(
 | 
			
		||||
  RGB_HUI,  RGB_SAI,  _______,   KC_UP,   _______,  _______,  _______,  KC_UNDS, _______, KC_LBRC, KC_RBRC, RGB_VAI,
 | 
			
		||||
  RGB_HUD,  RGB_SAD,   KC_LEFT, KC_DOWN, KC_RGHT,   _______,  _______,  KC_MINS, _______, KC_LCBR, KC_RCBR, RGB_VAD,
 | 
			
		||||
  KC_F1,    KC_F2,     KC_F3,   KC_F4,   KC_F5,     KC_F6,    KC_F7,    KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
     * | PRINT   |  OS   |  Alt  |  Layer  |    Space & Layer     |   [     |   ]    |    CAPS   |
 | 
			
		||||
     * `-----------------------------------------------------------------------------------------'
 | 
			
		||||
     */
 | 
			
		||||
    [0] = LAYOUT_all(
 | 
			
		||||
    [0] = LAYOUT(
 | 
			
		||||
        KC_TAB,        KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,          KC_I,    KC_O,    KC_P,    KC_DEL,
 | 
			
		||||
        CTL_T(KC_ESC), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,          KC_K,    KC_L,    KC_SCLN, KC_QUOT,
 | 
			
		||||
        KC_LSFT,       KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,          KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
 | 
			
		||||
| 
						 | 
				
			
			@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
     * |   ESC  |  CTRL-ALT-DEL   |   TASK   |         |        |    '|'    |    `    |        |
 | 
			
		||||
     * `---------------------------------------------------------------------------------------'
 | 
			
		||||
     */
 | 
			
		||||
    [1] = LAYOUT_all(
 | 
			
		||||
    [1] = LAYOUT(
 | 
			
		||||
        KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
 | 
			
		||||
        KC_SLSH, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
 | 
			
		||||
        _______, _______, _______, _______, _______, _______, _______, KC_PPLS, KC_EQL,  _______, _______, _______,
 | 
			
		||||
| 
						 | 
				
			
			@ -71,30 +71,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
     * |     QK_BOOT    |           |          |         |         |         |        |         |
 | 
			
		||||
     * `---------------------------------------------------------------------------------------'
 | 
			
		||||
     */
 | 
			
		||||
    [2] = LAYOUT_all(
 | 
			
		||||
    [2] = LAYOUT(
 | 
			
		||||
        _______, _______, _______, KC_UP,   _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, _______,
 | 
			
		||||
        _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, _______,
 | 
			
		||||
        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
 | 
			
		||||
        QK_BOOT, _______, _______,          _______,                   _______,          _______, _______, _______
 | 
			
		||||
    ),
 | 
			
		||||
 | 
			
		||||
 /* [3]
 | 
			
		||||
     * ,---------------------------------------------------------------------------------------.
 | 
			
		||||
     * |------------+------+------+------+------+------+------+------+------+------+------+----|
 | 
			
		||||
     * |      |     |      |      |      |      |      |     |     |      |      |      |      |
 | 
			
		||||
     * |------------+------+------+------+------+-------------+------+------+------+------+----|
 | 
			
		||||
     * |      |     |      |      |      |      |      |     |     |      |      |      |      |
 | 
			
		||||
     * |------------+------+------+------+------+------|------+------+------+------+------+----|
 | 
			
		||||
     * |      |     |      |      |      |      |      |     |     |      |      |      |      |
 | 
			
		||||
     * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+----|
 | 
			
		||||
     * |      |     |      |      |      |      |      |     |     |      |      |      |      |
 | 
			
		||||
     * `---------------------------------------------------------------------------------------'
 | 
			
		||||
     */
 | 
			
		||||
    [3] = LAYOUT_all(
 | 
			
		||||
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 | 
			
		||||
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 | 
			
		||||
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 | 
			
		||||
        _______, _______, _______, _______, _______, _______, _______, _______
 | 
			
		||||
    ),
 | 
			
		||||
    
 | 
			
		||||
 };
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue