Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						cc7d3b75d7
					
				
					 5 changed files with 132 additions and 0 deletions
				
			
		| 
						 | 
				
			
			@ -0,0 +1,24 @@
 | 
			
		|||
#include QMK_KEYBOARD_H
 | 
			
		||||
 | 
			
		||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
    /*
 | 
			
		||||
     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
 | 
			
		||||
     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = |Bsp|Bsp|Hom│
 | 
			
		||||
     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
 | 
			
		||||
     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │     │PgU│
 | 
			
		||||
     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent├───┤
 | 
			
		||||
     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │    │PgD│
 | 
			
		||||
     * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
 | 
			
		||||
     * │Shft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│ ↑ │End│
 | 
			
		||||
     * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
 | 
			
		||||
     * │Ctrl│GUI │Alt │                        │Alt│GUI│Ctl│ ← │ ↓ │ → │
 | 
			
		||||
     * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
 | 
			
		||||
     */
 | 
			
		||||
    [0] = LAYOUT_65_iso(
 | 
			
		||||
        KC_GRV,  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_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_PGUP,
 | 
			
		||||
        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_PGDN,
 | 
			
		||||
        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, KC_UP,   KC_END,
 | 
			
		||||
        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
 | 
			
		||||
    )
 | 
			
		||||
};
 | 
			
		||||
							
								
								
									
										85
									
								
								layouts/default/65_iso_split_bs/info.json
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										85
									
								
								layouts/default/65_iso_split_bs/info.json
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,85 @@
 | 
			
		|||
{
 | 
			
		||||
    "keyboard_name": "65% ISO layout with split Backspace",
 | 
			
		||||
    "url": "",
 | 
			
		||||
    "maintainer": "qmk",
 | 
			
		||||
    "layouts": {
 | 
			
		||||
        "LAYOUT_65_iso_split_bs": {
 | 
			
		||||
            "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},
 | 
			
		||||
                {"x":14, "y":0},
 | 
			
		||||
                {"x":15, "y":0},
 | 
			
		||||
 | 
			
		||||
                {"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":15, "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":15, "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":15, "y":3},
 | 
			
		||||
 | 
			
		||||
                {"x":0, "y":4, "w":1.25},
 | 
			
		||||
                {"x":1.25, "y":4, "w":1.25},
 | 
			
		||||
                {"x":2.5, "y":4, "w":1.25},
 | 
			
		||||
                {"x":3.75, "y":4, "w":6.25},
 | 
			
		||||
                {"x":10, "y":4},
 | 
			
		||||
                {"x":11, "y":4},
 | 
			
		||||
                {"x":12, "y":4},
 | 
			
		||||
                {"x":13, "y":4},
 | 
			
		||||
                {"x":14, "y":4},
 | 
			
		||||
                {"x":15, "y":4}
 | 
			
		||||
            ]
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										5
									
								
								layouts/default/65_iso_split_bs/layout.json
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										5
									
								
								layouts/default/65_iso_split_bs/layout.json
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,5 @@
 | 
			
		|||
[{a:7},"","","","","","","","","","","","","","","",""],
 | 
			
		||||
[{w:1.5},"","","","","","","","","","","","","",{x:0.25,w:1.25,h:2,w2:1.5,h2:1,x2:-0.25},"",""],
 | 
			
		||||
[{w:1.75},"","","","","","","","","","","","","",{x:1.25},""],
 | 
			
		||||
[{w:1.25},"","","","","","","","","","","","",{w:1.75},"","",""],
 | 
			
		||||
[{w:1.25},"",{w:1.25},"",{w:1.25},"",{w:6.25},"","","","","","",""]
 | 
			
		||||
							
								
								
									
										3
									
								
								layouts/default/65_iso_split_bs/readme.md
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								layouts/default/65_iso_split_bs/readme.md
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,3 @@
 | 
			
		|||
# 65_iso_split_bs
 | 
			
		||||
 | 
			
		||||
    LAYOUT_65_iso_split_bs
 | 
			
		||||
| 
						 | 
				
			
			@ -321,6 +321,21 @@ LAYOUT_65_iso_blocker_split_bs
 | 
			
		|||
└────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
 | 
			
		||||
```
 | 
			
		||||
 | 
			
		||||
```
 | 
			
		||||
LAYOUT_65_iso_split_bs
 | 
			
		||||
┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
 | 
			
		||||
│   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │
 | 
			
		||||
├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
 | 
			
		||||
│     │   │   │   │   │   │   │   │   │   │   │   │   │     │   │
 | 
			
		||||
├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    ├───┤
 | 
			
		||||
│      │   │   │   │   │   │   │   │   │   │   │   │   │    │   │
 | 
			
		||||
├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
 | 
			
		||||
│        │   │   │   │   │   │   │   │   │   │   │      │   │   │
 | 
			
		||||
├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
 | 
			
		||||
│    │    │    │                        │   │   │   │   │   │   │
 | 
			
		||||
└────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
 | 
			
		||||
```
 | 
			
		||||
 | 
			
		||||
```
 | 
			
		||||
LAYOUT_66_ansi
 | 
			
		||||
┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┐
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue