Swift65 Solder Layout Name Standardization (#23289)
* Rename `LAYOUT_625u_space` to `LAYOUT_ansi_blocker` [refactor] * Rename `LAYOUT_625u_space_split_bs` to `LAYOUT_ansi_blocker_split_bs` [refactor] * Rename `LAYOUT_7u_space` to `LAYOUT_ansi_blocker_tsangan` [refactor] * Rename `LAYOUT_7u_space_split_bs` to `LAYOUT_ansi_blocker_tsangan_split_bs` [refactor] * Rename `LAYOUT_iso_625u_space` to `LAYOUT_iso_blocker` [refactor] * Rename `LAYOUT_iso_625u_space_split_bs` to `LAYOUT_iso_blocker_split_bs` [refactor] * Rename `LAYOUT_iso_7u_space` to `LAYOUT_iso_blocker_tsangan` [refactor] * Rename `LAYOUT_iso_7u_space_split_bs` to `LAYOUT_iso_blocker_tsangan_split_bs` [refactor] * Refactor keymaps Updates the keycode grid alignment to better resemble the assembled board. [style]
This commit is contained in:
		
							parent
							
								
									bbe0c515f8
								
							
						
					
					
						commit
						7e39635c0a
					
				
					 3 changed files with 55 additions and 47 deletions
				
			
		|  | @ -47,11 +47,19 @@ | |||
|     "processor": "atmega32u4", | ||||
|     "bootloader": "atmel-dfu", | ||||
|     "layout_aliases": { | ||||
|         "LAYOUT": "LAYOUT_625u_space_split_bs", | ||||
|         "LAYOUT_all": "LAYOUT_625u_space_split_bs" | ||||
|         "LAYOUT": "LAYOUT_ansi_blocker_split_bs", | ||||
|         "LAYOUT_all": "LAYOUT_ansi_blocker_split_bs", | ||||
|         "LAYOUT_625u_space": "LAYOUT_ansi_blocker", | ||||
|         "LAYOUT_625u_space_split_bs": "LAYOUT_ansi_blocker_split_bs", | ||||
|         "LAYOUT_7u_space": "LAYOUT_ansi_blocker_tsangan", | ||||
|         "LAYOUT_7u_space_split_bs": "LAYOUT_ansi_blocker_tsangan_split_bs", | ||||
|         "LAYOUT_iso_625u_space": "LAYOUT_iso_blocker", | ||||
|         "LAYOUT_iso_625u_space_split_bs": "LAYOUT_iso_blocker_split_bs", | ||||
|         "LAYOUT_iso_7u_space": "LAYOUT_iso_blocker_tsangan", | ||||
|         "LAYOUT_iso_7u_space_split_bs": "LAYOUT_iso_blocker_tsangan_split_bs" | ||||
|     }, | ||||
|     "layouts": { | ||||
|         "LAYOUT_625u_space": { | ||||
|         "LAYOUT_ansi_blocker": { | ||||
|             "layout": [ | ||||
|                 {"matrix": [0, 0], "x": 0, "y": 0}, | ||||
|                 {"matrix": [0, 1], "x": 1, "y": 0}, | ||||
|  | @ -129,7 +137,7 @@ | |||
|                 {"matrix": [4, 14], "x": 15, "y": 4} | ||||
|             ] | ||||
|         }, | ||||
|         "LAYOUT_625u_space_split_bs": { | ||||
|         "LAYOUT_ansi_blocker_split_bs": { | ||||
|             "layout": [ | ||||
|                 {"matrix": [0, 0], "x": 0, "y": 0}, | ||||
|                 {"matrix": [0, 1], "x": 1, "y": 0}, | ||||
|  | @ -208,7 +216,7 @@ | |||
|                 {"matrix": [4, 14], "x": 15, "y": 4} | ||||
|             ] | ||||
|         }, | ||||
|         "LAYOUT_7u_space": { | ||||
|         "LAYOUT_ansi_blocker_tsangan": { | ||||
|             "layout": [ | ||||
|                 {"matrix": [0, 0], "x": 0, "y": 0}, | ||||
|                 {"matrix": [0, 1], "x": 1, "y": 0}, | ||||
|  | @ -285,7 +293,7 @@ | |||
|                 {"matrix": [4, 14], "x": 15, "y": 4} | ||||
|             ] | ||||
|         }, | ||||
|         "LAYOUT_7u_space_split_bs": { | ||||
|         "LAYOUT_ansi_blocker_tsangan_split_bs": { | ||||
|             "layout": [ | ||||
|                 {"matrix": [0, 0], "x": 0, "y": 0}, | ||||
|                 {"matrix": [0, 1], "x": 1, "y": 0}, | ||||
|  | @ -363,7 +371,7 @@ | |||
|                 {"matrix": [4, 14], "x": 15, "y": 4} | ||||
|             ] | ||||
|         }, | ||||
|         "LAYOUT_iso_625u_space": { | ||||
|         "LAYOUT_iso_blocker": { | ||||
|             "layout": [ | ||||
|                 {"matrix": [0, 0], "x": 0, "y": 0}, | ||||
|                 {"matrix": [0, 1], "x": 1, "y": 0}, | ||||
|  | @ -442,7 +450,7 @@ | |||
|                 {"matrix": [4, 14], "x": 15, "y": 4} | ||||
|             ] | ||||
|         }, | ||||
|         "LAYOUT_iso_625u_space_split_bs": { | ||||
|         "LAYOUT_iso_blocker_split_bs": { | ||||
|             "layout": [ | ||||
|                 {"matrix": [0, 0], "x": 0, "y": 0}, | ||||
|                 {"matrix": [0, 1], "x": 1, "y": 0}, | ||||
|  | @ -522,7 +530,7 @@ | |||
|                 {"matrix": [4, 14], "x": 15, "y": 4} | ||||
|             ] | ||||
|         }, | ||||
|         "LAYOUT_iso_7u_space": { | ||||
|         "LAYOUT_iso_blocker_tsangan": { | ||||
|             "layout": [ | ||||
|                 {"matrix": [0, 0], "x": 0, "y": 0}, | ||||
|                 {"matrix": [0, 1], "x": 1, "y": 0}, | ||||
|  | @ -600,7 +608,7 @@ | |||
|                 {"matrix": [4, 14], "x": 15, "y": 4} | ||||
|             ] | ||||
|         }, | ||||
|         "LAYOUT_iso_7u_space_split_bs": { | ||||
|         "LAYOUT_iso_blocker_tsangan_split_bs": { | ||||
|             "layout": [ | ||||
|                 {"matrix": [0, 0], "x": 0, "y": 0}, | ||||
|                 {"matrix": [0, 1], "x": 1, "y": 0}, | ||||
|  |  | |||
|  | @ -17,19 +17,19 @@ | |||
| #include QMK_KEYBOARD_H | ||||
| 
 | ||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     [0] = LAYOUT_625u_space_split_bs( | ||||
|         KC_ESC,  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_GRV,  KC_BSPC,   KC_HOME, | ||||
|         KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,        KC_DEL, | ||||
|         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_ENT,                KC_PGUP, | ||||
|         KC_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,        KC_UP, | ||||
|         KC_LCTL,   KC_LGUI,   KC_LALT,                       KC_SPC,                              KC_LALT,   MO(1),          KC_LEFT, KC_DOWN, KC_RGHT | ||||
|     [0] = LAYOUT_ansi_blocker_split_bs( | ||||
|         KC_ESC,  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_GRV,  KC_BSPC,    KC_HOME, | ||||
|         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL, | ||||
|         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_ENT,              KC_PGUP, | ||||
|         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT, KC_UP, | ||||
|         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_LALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT | ||||
|     ), | ||||
|     [1] = LAYOUT_625u_space_split_bs( | ||||
|         KC_GRV,  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_DEL,    _______, | ||||
|         _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______, | ||||
|         _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,               KC_PGDN, | ||||
|         QK_BOOT,              _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        KC_PGUP, | ||||
|         _______,   _______,   _______,                      _______,                              _______,   _______,        KC_HOME, KC_PGDN, KC_END | ||||
|     [1] = LAYOUT_ansi_blocker_split_bs( | ||||
|         KC_GRV,  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_DEL,     _______, | ||||
|         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, | ||||
|         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,             KC_PGDN, | ||||
|         QK_BOOT,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, | ||||
|         _______, _______, _______,                            _______,                   _______, _______,          KC_HOME, KC_PGDN, KC_END | ||||
|     ), | ||||
| 
 | ||||
| }; | ||||
| }; | ||||
|  |  | |||
|  | @ -17,33 +17,33 @@ | |||
| #include QMK_KEYBOARD_H | ||||
| 
 | ||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     [0] = LAYOUT_625u_space_split_bs( | ||||
|         KC_ESC,  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_GRV,  KC_BSPC,   KC_HOME, | ||||
|         KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,        KC_DEL, | ||||
|         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_ENT,                KC_PGUP, | ||||
|         KC_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,        KC_UP, | ||||
|         KC_LCTL,   KC_LGUI,   KC_LALT,                       KC_SPC,                              KC_LALT,   MO(1),          KC_LEFT, KC_DOWN, KC_RGHT | ||||
|     [0] = LAYOUT_ansi_blocker_split_bs( | ||||
|         KC_ESC,  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_GRV,  KC_BSPC,    KC_HOME, | ||||
|         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL, | ||||
|         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_ENT,              KC_PGUP, | ||||
|         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT, KC_UP, | ||||
|         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_LALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT | ||||
|     ), | ||||
|     [1] = LAYOUT_625u_space_split_bs( | ||||
|         KC_GRV,  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_DEL,    _______, | ||||
|         _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______, | ||||
|         _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,               KC_PGDN, | ||||
|         QK_BOOT,              _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        KC_PGUP, | ||||
|         _______,   _______,   _______,                      _______,                              _______,   _______,        KC_HOME, KC_PGDN, KC_END | ||||
|     [1] = LAYOUT_ansi_blocker_split_bs( | ||||
|         KC_GRV,  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_DEL,     _______, | ||||
|         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, | ||||
|         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,             KC_PGDN, | ||||
|         QK_BOOT,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, | ||||
|         _______, _______, _______,                            _______,                   _______, _______,          KC_HOME, KC_PGDN, KC_END | ||||
|     ), | ||||
|     [2] = LAYOUT_625u_space_split_bs( | ||||
|         KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS, | ||||
|         KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,        KC_TRNS, | ||||
|         KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS, | ||||
|         KC_TRNS,              KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,        KC_TRNS, | ||||
|         KC_TRNS,   KC_TRNS,   KC_TRNS,                      KC_TRNS,                              KC_TRNS,   KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS | ||||
|     [2] = LAYOUT_ansi_blocker_split_bs( | ||||
|         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, | ||||
|         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, | ||||
|         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,             KC_TRNS, | ||||
|         KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||||
|         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS | ||||
|     ), | ||||
|     [3] = LAYOUT_625u_space_split_bs( | ||||
|         KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS, | ||||
|         KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,        KC_TRNS, | ||||
|         KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS, | ||||
|         KC_TRNS,              KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,        KC_TRNS, | ||||
|         KC_TRNS,   KC_TRNS,   KC_TRNS,                      KC_TRNS,                              KC_TRNS,   KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS | ||||
|     [3] = LAYOUT_ansi_blocker_split_bs( | ||||
|         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, | ||||
|         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, | ||||
|         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,             KC_TRNS, | ||||
|         KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||||
|         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS | ||||
|     ), | ||||
| 
 | ||||
| }; | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 James Young
						James Young