wilba.tech WT60-H3 Layout Macro Refactor (#16140)
* move ISO Enter argument to home row Moves the ISO Enter key's argument to the home row to conform to QMK's standard for traditionally-staggered boards. * update info.json data
This commit is contained in:
		
							parent
							
								
									2e13f7d9f0
								
							
						
					
					
						commit
						4277dc3ac9
					
				
					 3 changed files with 81 additions and 11 deletions
				
			
		| 
						 | 
					@ -2,9 +2,79 @@
 | 
				
			||||||
    "keyboard_name": "wilba.tech WT60-H3", 
 | 
					    "keyboard_name": "wilba.tech WT60-H3", 
 | 
				
			||||||
    "url": "https://wilba.tech", 
 | 
					    "url": "https://wilba.tech", 
 | 
				
			||||||
    "maintainer": "Wilba", 
 | 
					    "maintainer": "Wilba", 
 | 
				
			||||||
 | 
					    "layout_aliases": {
 | 
				
			||||||
 | 
					        "LAYOUT_all": "LAYOUT_60_iso_tsangan_split_rshift"
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
    "layouts": {
 | 
					    "layouts": {
 | 
				
			||||||
        "LAYOUT_all": {
 | 
					        "LAYOUT_60_iso_tsangan_split_rshift": {
 | 
				
			||||||
            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.75, "y":1, "w":1.25, "h":2}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.5}, {"x":1.5, "y":4}, {"x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"x":11, "y":4, "w":1.5}, {"x":12.5, "y":4}, {"x":13.5, "y":4, "w":1.5}]
 | 
					            "layout": [
 | 
				
			||||||
 | 
					                {"x":0, "y":0},
 | 
				
			||||||
 | 
					                {"x":1, "y":0},
 | 
				
			||||||
 | 
					                {"x":2, "y":0},
 | 
				
			||||||
 | 
					                {"x":3, "y":0},
 | 
				
			||||||
 | 
					                {"x":4, "y":0},
 | 
				
			||||||
 | 
					                {"x":5, "y":0},
 | 
				
			||||||
 | 
					                {"x":6, "y":0},
 | 
				
			||||||
 | 
					                {"x":7, "y":0},
 | 
				
			||||||
 | 
					                {"x":8, "y":0},
 | 
				
			||||||
 | 
					                {"x":9, "y":0},
 | 
				
			||||||
 | 
					                {"x":10, "y":0},
 | 
				
			||||||
 | 
					                {"x":11, "y":0},
 | 
				
			||||||
 | 
					                {"x":12, "y":0},
 | 
				
			||||||
 | 
					                {"x":13, "y":0, "w":2},
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                {"x":0, "y":1, "w":1.5},
 | 
				
			||||||
 | 
					                {"x":1.5, "y":1},
 | 
				
			||||||
 | 
					                {"x":2.5, "y":1},
 | 
				
			||||||
 | 
					                {"x":3.5, "y":1},
 | 
				
			||||||
 | 
					                {"x":4.5, "y":1},
 | 
				
			||||||
 | 
					                {"x":5.5, "y":1},
 | 
				
			||||||
 | 
					                {"x":6.5, "y":1},
 | 
				
			||||||
 | 
					                {"x":7.5, "y":1},
 | 
				
			||||||
 | 
					                {"x":8.5, "y":1},
 | 
				
			||||||
 | 
					                {"x":9.5, "y":1},
 | 
				
			||||||
 | 
					                {"x":10.5, "y":1},
 | 
				
			||||||
 | 
					                {"x":11.5, "y":1},
 | 
				
			||||||
 | 
					                {"x":12.5, "y":1},
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                {"x":0, "y":2, "w":1.75},
 | 
				
			||||||
 | 
					                {"x":1.75, "y":2},
 | 
				
			||||||
 | 
					                {"x":2.75, "y":2},
 | 
				
			||||||
 | 
					                {"x":3.75, "y":2},
 | 
				
			||||||
 | 
					                {"x":4.75, "y":2},
 | 
				
			||||||
 | 
					                {"x":5.75, "y":2},
 | 
				
			||||||
 | 
					                {"x":6.75, "y":2},
 | 
				
			||||||
 | 
					                {"x":7.75, "y":2},
 | 
				
			||||||
 | 
					                {"x":8.75, "y":2},
 | 
				
			||||||
 | 
					                {"x":9.75, "y":2},
 | 
				
			||||||
 | 
					                {"x":10.75, "y":2},
 | 
				
			||||||
 | 
					                {"x":11.75, "y":2},
 | 
				
			||||||
 | 
					                {"x":12.75, "y":2},
 | 
				
			||||||
 | 
					                {"x":13.75, "y":1, "w":1.25, "h":2},
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                {"x":0, "y":3, "w":1.25},
 | 
				
			||||||
 | 
					                {"x":1.25, "y":3},
 | 
				
			||||||
 | 
					                {"x":2.25, "y":3},
 | 
				
			||||||
 | 
					                {"x":3.25, "y":3},
 | 
				
			||||||
 | 
					                {"x":4.25, "y":3},
 | 
				
			||||||
 | 
					                {"x":5.25, "y":3},
 | 
				
			||||||
 | 
					                {"x":6.25, "y":3},
 | 
				
			||||||
 | 
					                {"x":7.25, "y":3},
 | 
				
			||||||
 | 
					                {"x":8.25, "y":3},
 | 
				
			||||||
 | 
					                {"x":9.25, "y":3},
 | 
				
			||||||
 | 
					                {"x":10.25, "y":3},
 | 
				
			||||||
 | 
					                {"x":11.25, "y":3},
 | 
				
			||||||
 | 
					                {"x":12.25, "y":3, "w":1.75},
 | 
				
			||||||
 | 
					                {"x":14, "y":3},
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                {"x":0, "y":4, "w":1.5},
 | 
				
			||||||
 | 
					                {"x":1.5, "y":4},
 | 
				
			||||||
 | 
					                {"x":2.5, "y":4, "w":1.5},
 | 
				
			||||||
 | 
					                {"x":4, "y":4, "w":7},
 | 
				
			||||||
 | 
					                {"x":11, "y":4, "w":1.5},
 | 
				
			||||||
 | 
					                {"x":12.5, "y":4},
 | 
				
			||||||
 | 
					                {"x":13.5, "y":4, "w":1.5}
 | 
				
			||||||
 | 
					            ]
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -21,32 +21,32 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
				
			||||||
	// Default layer
 | 
						// Default layer
 | 
				
			||||||
	[0] = LAYOUT_all(
 | 
						[0] = LAYOUT_all(
 | 
				
			||||||
		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_BSPC,
 | 
							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_BSPC,
 | 
				
			||||||
		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_ENT,
 | 
							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_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS,
 | 
							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_NUHS, KC_ENT,
 | 
				
			||||||
		KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
 | 
							KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
 | 
				
			||||||
		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, KC_RGUI, KC_RCTL),
 | 
							KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, KC_RGUI, KC_RCTL),
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	// Fn1 Layer
 | 
						// Fn1 Layer
 | 
				
			||||||
	[1] = LAYOUT_all(
 | 
						[1] = LAYOUT_all(
 | 
				
			||||||
		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_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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
 | 
							KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   KC_TRNS,
 | 
				
			||||||
		KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS,
 | 
							KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, KC_TRNS,
 | 
				
			||||||
		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
 | 
							KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, 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),
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	// Fn2 Layer
 | 
						// Fn2 Layer
 | 
				
			||||||
	[2] = LAYOUT_all(
 | 
						[2] = LAYOUT_all(
 | 
				
			||||||
		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, 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),
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	// Fn3 Layer
 | 
						// Fn3 Layer
 | 
				
			||||||
	[3] = LAYOUT_all(
 | 
						[3] = LAYOUT_all(
 | 
				
			||||||
		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, 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),
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -20,10 +20,10 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define ____ KC_NO
 | 
					#define ____ KC_NO
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define LAYOUT_all( \
 | 
					#define LAYOUT_60_iso_tsangan_split_rshift( \
 | 
				
			||||||
    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, \
 | 
					    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, \
 | 
				
			||||||
    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, \
 | 
					    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       \
 | 
				
			||||||
    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       \
 | 
					    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K113, \
 | 
				
			||||||
    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, \
 | 
					    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, \
 | 
				
			||||||
    K400, K401, K402,                   K406,                         K411, K412, K413  \
 | 
					    K400, K401, K402,                   K406,                         K411, K412, K413  \
 | 
				
			||||||
) { \
 | 
					) { \
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue