Fix layouts containing keys with multiple matrix positions (#20191)
This commit is contained in:
		
							parent
							
								
									dc2a625a34
								
							
						
					
					
						commit
						06664e8a94
					
				
					 43 changed files with 2144 additions and 1818 deletions
				
			
		| 
						 | 
				
			
			@ -26,46 +26,46 @@ enum jian_layers {
 | 
			
		|||
};
 | 
			
		||||
 | 
			
		||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
[_DFLT_L] = LAYOUT_symmetric_left(
 | 
			
		||||
  KC_LSFT, LGUI_T(KC_GRV), KC_Q, KC_W, KC_E,                 KC_R,                KC_T,
 | 
			
		||||
           KC_LCTL,        KC_A, KC_S, KC_D,                 KC_F,                KC_G,
 | 
			
		||||
           KC_LALT,        KC_Z, KC_X, KC_C,                 KC_V,                KC_B,
 | 
			
		||||
                                       LT(_RAIS_L, KC_BSPC), LT(_DFLT_R, KC_SPC), LT(_LOWR_L, KC_ENT)
 | 
			
		||||
[_DFLT_L] = LAYOUT(
 | 
			
		||||
  KC_LSFT, LGUI_T(KC_GRV), KC_Q, KC_W, KC_E,                 KC_R,                KC_T,                     KC_T,                KC_R,                KC_E,                 KC_W,    KC_Q,    LGUI_T(KC_GRV), KC_LSFT,
 | 
			
		||||
           KC_LCTL,        KC_A, KC_S, KC_D,                 KC_F,                KC_G,                     KC_G,                KC_F,                KC_D,                 KC_S,    KC_A,    KC_LCTL,
 | 
			
		||||
           KC_LALT,        KC_Z, KC_X, KC_C,                 KC_V,                KC_B,                     KC_B,                KC_V,                KC_C,                 KC_X,    KC_Z,    KC_LALT,
 | 
			
		||||
                                       LT(_RAIS_L, KC_BSPC), LT(_DFLT_R, KC_SPC), LT(_LOWR_L, KC_ENT),      LT(_LOWR_L, KC_ENT), LT(_DFLT_R, KC_SPC), LT(_RAIS_L, KC_BSPC),
 | 
			
		||||
),
 | 
			
		||||
[_DFLT_R] = LAYOUT_symmetric_right(
 | 
			
		||||
  KC_Y,                KC_U,    KC_I,               KC_O,    KC_P,    KC_LBRC, KC_RBRC,
 | 
			
		||||
  KC_H,                KC_J,    KC_K,               KC_L,    KC_SCLN, KC_QUOT,
 | 
			
		||||
  KC_N,                KC_M,    KC_COMM,            KC_DOT,  KC_SLSH, KC_BSLS,
 | 
			
		||||
  LT(_LOWR_R, KC_ESC), _______, LT(_RAIS_R, KC_DEL)
 | 
			
		||||
[_DFLT_R] = LAYOUT(
 | 
			
		||||
  KC_RBRC, KC_LBRC, KC_P,    KC_O,    KC_I,                KC_U,    KC_Y,                     KC_Y,                KC_U,    KC_I,               KC_O,    KC_P,    KC_LBRC, KC_RBRC,
 | 
			
		||||
           KC_QUOT, KC_SCLN, KC_L,    KC_K,                KC_J,    KC_H,                     KC_H,                KC_J,    KC_K,               KC_L,    KC_SCLN, KC_QUOT,
 | 
			
		||||
           KC_BSLS, KC_SLSH, KC_DOT,  KC_COMM,             KC_M,    KC_N,                     KC_N,                KC_M,    KC_COMM,            KC_DOT,  KC_SLSH, KC_BSLS,
 | 
			
		||||
                                      LT(_RAIS_R, KC_DEL), _______, LT(_LOWR_R, KC_ESC),      LT(_LOWR_R, KC_ESC), _______, LT(_RAIS_R, KC_DEL)
 | 
			
		||||
),
 | 
			
		||||
[_RAIS_L] = LAYOUT_symmetric_left(
 | 
			
		||||
  _______, LGUI_T(KC_CAPS), KC_SCRL, KC_HOME, KC_PSCR, KC_PGUP,              KC_VOLU,
 | 
			
		||||
           LCTL_T(KC_APP),  KC_INS,  KC_LEFT, KC_UP,   KC_RGHT,              KC_MUTE,
 | 
			
		||||
           _______,         KC_PAUS, KC_END,  KC_DOWN, KC_PGDN,              KC_VOLD,
 | 
			
		||||
                                              _______, LT(_RAIS_R, KC_TAB) , LT(_ADJUST, KC_ESC)
 | 
			
		||||
[_RAIS_L] = LAYOUT(
 | 
			
		||||
  _______, LGUI_T(KC_CAPS), KC_SCRL, KC_HOME, KC_PSCR, KC_PGUP,              KC_VOLU,                  KC_VOLU,             KC_PGUP,             KC_PSCR, KC_HOME, KC_SCRL, LGUI_T(KC_CAPS), _______,
 | 
			
		||||
           LCTL_T(KC_APP),  KC_INS,  KC_LEFT, KC_UP,   KC_RGHT,              KC_MUTE,                  KC_MUTE,             KC_RGHT,             KC_UP,   KC_LEFT, KC_INS,  LGUI_T(KC_APP),
 | 
			
		||||
           _______,         KC_PAUS, KC_END,  KC_DOWN, KC_PGDN,              KC_VOLD,                  KC_VOLD,             KC_PGDN,             KC_DOWN, KC_END,  KC_PAUS, _______,
 | 
			
		||||
                                              _______, LT(_RAIS_R, KC_TAB) , LT(_ADJUST, KC_ESC),      LT(_ADJUST, KC_ESC), LT(_RAIS_R, KC_TAB), _______
 | 
			
		||||
),
 | 
			
		||||
[_RAIS_R] = LAYOUT_symmetric_left(
 | 
			
		||||
  KC_RSFT, KC_RGUI, XXXXXXX, KC_F7, KC_F8,               KC_F9,   KC_F10,
 | 
			
		||||
           KC_RCTL, XXXXXXX, KC_F4, KC_F5,               KC_F6,   KC_F11,
 | 
			
		||||
           KC_LALT, XXXXXXX, KC_F1, KC_F2,               KC_F3,   KC_F12,
 | 
			
		||||
                                    LT(_ADJUST, KC_DEL), _______, _______
 | 
			
		||||
[_RAIS_R] = LAYOUT(
 | 
			
		||||
  KC_RSFT, KC_RGUI, XXXXXXX, KC_F7, KC_F8,               KC_F9,   KC_F10,       KC_F10,  KC_F9,   KC_F8,               KC_F7,   XXXXXXX, KC_RGUI, KC_RSFT,
 | 
			
		||||
           KC_RCTL, XXXXXXX, KC_F4, KC_F5,               KC_F6,   KC_F11,       KC_F11,  KC_F6,   KC_F5,               KC_F4,   XXXXXXX, KC_RCTL,
 | 
			
		||||
           KC_LALT, XXXXXXX, KC_F1, KC_F2,               KC_F3,   KC_F12,       KC_F12,  KC_F3,   KC_F2,               KC_F1,   XXXXXXX, KC_LALT,
 | 
			
		||||
                                    LT(_ADJUST, KC_DEL), _______, _______,      _______, _______, LT(_ADJUST, KC_DEL)
 | 
			
		||||
),
 | 
			
		||||
[_LOWR_L] = LAYOUT_symmetric_left(
 | 
			
		||||
  _______, _______, XXXXXXX, KC_7, KC_8,                KC_9,                KC_0,
 | 
			
		||||
           _______, KC_GRV,  KC_4, KC_5,                KC_6,                KC_MINS,
 | 
			
		||||
           _______, KC_0,    KC_1, KC_2,                KC_3,                KC_EQL,
 | 
			
		||||
                                   LT(_ADJUST, KC_DEL), LT(_LOWR_R, KC_TAB), _______
 | 
			
		||||
[_LOWR_L] = LAYOUT(
 | 
			
		||||
  _______, _______, XXXXXXX, KC_7, KC_8,                KC_9,                KC_0,         KC_0,    KC_9,                KC_8,                KC_7,    XXXXXXX, _______, _______,
 | 
			
		||||
           _______, KC_GRV,  KC_4, KC_5,                KC_6,                KC_MINS,      KC_MINS, KC_6,                KC_5,                KC_4,    KC_GRV,  _______,
 | 
			
		||||
           _______, KC_0,    KC_1, KC_2,                KC_3,                KC_EQL,       KC_EQL,  KC_3,                KC_2,                KC_1,    KC_0,    _______,
 | 
			
		||||
                                   LT(_ADJUST, KC_DEL), LT(_LOWR_R, KC_TAB), _______,      _______, LT(_LOWR_R, KC_TAB), LT(_ADJUST, KC_DEL)
 | 
			
		||||
),
 | 
			
		||||
[_LOWR_R] = LAYOUT_symmetric_left(
 | 
			
		||||
 _______, _______, XXXXXXX, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
 | 
			
		||||
          _______, KC_TILD, KC_DLR,  KC_PERC, KC_CIRC, KC_UNDS,
 | 
			
		||||
          _______, KC_LPRN, KC_EXLM, KC_AT,   KC_HASH, KC_PLUS,
 | 
			
		||||
                                     _______, _______, LT(_ADJUST, KC_ESC)
 | 
			
		||||
[_LOWR_R] = LAYOUT(
 | 
			
		||||
 _______, _______, XXXXXXX, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,                  KC_RPRN,             KC_LPRN, KC_ASTR, KC_AMPR, XXXXXXX, _______, _______,
 | 
			
		||||
          _______, KC_TILD, KC_DLR,  KC_PERC, KC_CIRC, KC_UNDS,                  KC_UNDS,             KC_CIRC, KC_PERC, KC_DLR,  KC_TILD, _______,
 | 
			
		||||
          _______, KC_LPRN, KC_EXLM, KC_AT,   KC_HASH, KC_PLUS,                  KC_PLUS,             KC_HASH, KC_AT,   KC_EXLM, KC_LPRN, _______,
 | 
			
		||||
                                     _______, _______, LT(_ADJUST, KC_ESC),      LT(_ADJUST, KC_ESC), _______, _______
 | 
			
		||||
),
 | 
			
		||||
[_ADJUST] = LAYOUT_symmetric_left(
 | 
			
		||||
  QK_BOOT, DB_TOGG, XXXXXXX, BL_UP,   RGB_VAI, RGB_HUD, RGB_HUI,
 | 
			
		||||
           XXXXXXX, XXXXXXX, BL_DOWN, RGB_VAD, RGB_SAD, RGB_SAI,
 | 
			
		||||
           XXXXXXX, BL_BRTG, BL_TOGG, RGB_TOG, RGB_RMOD,RGB_MOD,
 | 
			
		||||
                                      _______, _______, _______
 | 
			
		||||
[_ADJUST] = LAYOUT(
 | 
			
		||||
  QK_BOOT, DB_TOGG, XXXXXXX, BL_UP,   RGB_VAI, RGB_HUD, RGB_HUI,      RGB_HUI, RGB_HUD, RGB_VAI, BL_UP,   XXXXXXX, DB_TOGG, QK_BOOT,
 | 
			
		||||
           XXXXXXX, XXXXXXX, BL_DOWN, RGB_VAD, RGB_SAD, RGB_SAI,      RGB_SAI, RGB_SAD, RGB_VAD, BL_DOWN, XXXXXXX, XXXXXXX,
 | 
			
		||||
           XXXXXXX, BL_BRTG, BL_TOGG, RGB_TOG, RGB_RMOD,RGB_MOD,      RGB_MOD, RGB_RMOD,RGB_TOG, BL_TOGG, BL_BRTG, XXXXXXX,
 | 
			
		||||
                                      _______, _______, _______,      _______, _______, _______
 | 
			
		||||
)
 | 
			
		||||
};
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue