Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						eeb3f9c043
					
				
					 82 changed files with 3906 additions and 974 deletions
				
			
		| 
						 | 
				
			
			@ -24,21 +24,56 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
 | 
			
		||||
#define  ___ KC_NO
 | 
			
		||||
 | 
			
		||||
#define LAYOUT( \
 | 
			
		||||
	KJ6,      KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0,   KC7, KC5, KA5,                       \
 | 
			
		||||
	KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2,   KL4, KO4, KQ4,   KK1, KL1, KQ1, KQ0, \
 | 
			
		||||
	KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2, KB3,   KK4, KO7, KQ7,   KK5, KL5, KQ5, KO5, \
 | 
			
		||||
	KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6,      KB1,                    KK2, KL2, KQ2,      \
 | 
			
		||||
	KN2, KI6, KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0,      KN3,        KO6,        KK3, KL3, KQ3, KO3, \
 | 
			
		||||
	KA4, KP2, KC6,                KK6,                KC0, KM3, KD0, KA1,   KO0, KK0, KL0,   KL6,      KQ6       \
 | 
			
		||||
	) { /*        00-A  01-B  02-C  03-D  04-E  05-F  06-G  07-H  08-I  09-J  10-K  11-L  12-M  13-N  14-O  15-P  16-Q  17-R */ \
 | 
			
		||||
		/* 0 */  { ___ , KB0 , KC0 , KD0 , ___ , KF0 , KG0 , ___ , ___ , ___ , KK0 , KL0 , ___ , ___ , KO0 , ___ , KQ0 , KR0 }, \
 | 
			
		||||
		/* 1 */  { KA1 , KB1 , ___ , KD1 , KE1 , KF1 , KG1 , KH1 , KI1 , KJ1 , KK1 , KL1 , ___ , ___ , ___ , ___ , KQ1 , ___ }, \
 | 
			
		||||
		/* 2 */  { ___ , KB2 , ___ , KD2 , KE2 , KF2 , KG2 , KH2 , KI2 , KJ2 , KK2 , KL2 , ___ , KN2 , ___ , KP2 , KQ2 , KR2 }, \
 | 
			
		||||
		/* 3 */  { ___ , KB3 , ___ , KD3 , KE3 , KF3 , KG3 , KH3 , KI3 , KJ3 , KK3 , KL3 , KM3 , KN3 , KO3 , ___ , KQ3 , KR3 }, \
 | 
			
		||||
		/* 4 */  { KA4 , KB4 , ___ , KD4 , KE4 , KF4 , KG4 , KH4 , KI4 , KJ4 , KK4 , KL4 , ___ , ___ , KO4 , ___ , KQ4 , KR4 }, \
 | 
			
		||||
		/* 5 */  { KA5 , ___ , KC5 , KD5 , KE5 , KF5 , KG5 , KH5 , KI5 , KJ5 , KK5 , KL5 , ___ , ___ , KO5 , ___ , KQ5 , KR5 }, \
 | 
			
		||||
		/* 6 */  { ___ , KB6 , KC6 , ___ , KE6 , KF6 , KG6 , KH6 , KI6 , KJ6 , KK6 , KL6 , ___ , ___ , KO6 , ___ , KQ6 , KR6 }, \
 | 
			
		||||
		/* 7 */  { KA7 , KB7 , KC7 , KD7 , KE7 , KF7 , KG7 , KH7 , KI7 , KJ7 , ___ , ___ , ___ , ___ , KO7 , ___ , KQ7 , KR7 }  \
 | 
			
		||||
	}
 | 
			
		||||
/*
 | 
			
		||||
 *              ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
 | 
			
		||||
 *              │J6 │   │I4 │H4 │H2 │H6 │ │A7 │E6 │D2 │D4 │ │B4 │B7 │B6 │B0 │ │C7 │C5 │A5 │
 | 
			
		||||
 *              └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
 | 
			
		||||
 *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐ ┌───┬───┬───┬───┐
 | 
			
		||||
 *              │J4 │J7 │I7 │H7 │G7 │G4 │F4 │F7 │E7 │D7 │R7 │R4 │E4 │B2     │ │L4 │O4 │Q4 │ │K1 │L1 │Q1 │Q0 │
 | 
			
		||||
 *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ ├───┼───┼───┼───┤      ┌─────┐
 | 
			
		||||
 *              │J2   │J5 │I5 │H5 │G5 │G2 │F2 │F5 │E5 │D5 │R5 │R2 │E2 │B3   │ │K4 │O7 │Q7 │ │K5 │L5 │Q5 │O5 │      │     │
 | 
			
		||||
 *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘ ├───┼───┼───┤   │   ┌──┴┐B1  │ ISO Enter
 | 
			
		||||
 *  LShift      │I2    │J3 │I3 │H3 │G3 │G6 │F6 │F3 │E3 │D3 │R3 │R6 │B1      │               │K2 │L2 │Q2 │   │   │B3 │    │
 | 
			
		||||
 * ┌────────┐   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───┐     ├───┼───┼───┼───┤   └───┴────┘
 | 
			
		||||
 * │N2      │   │N2  │I6 │J1 │I1 │H1 │G1 │G0 │F0 │F1 │E1 │D1 │R0 │N3        │     │O6 │     │K3 │L3 │Q3 │O3 │
 | 
			
		||||
 * └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐ ├───┴───┼───┤   │
 | 
			
		||||
 *              │A4  │P2  │C6  │K6                      │C0  │M3  │D0  │A1  │ │O0 │K0 │L0 │ │L6     │Q6 │   │
 | 
			
		||||
 *              └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#define LAYOUT_fullsize_ansi( \
 | 
			
		||||
    KJ6,      KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0,   KC7, KC5, KA5,                       \
 | 
			
		||||
    KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2,   KL4, KO4, KQ4,   KK1, KL1, KQ1, KQ0, \
 | 
			
		||||
    KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2, KB3,   KK4, KO7, KQ7,   KK5, KL5, KQ5, KO5, \
 | 
			
		||||
    KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6,      KB1,                    KK2, KL2, KQ2,      \
 | 
			
		||||
    KN2,      KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0,      KN3,        KO6,        KK3, KL3, KQ3, KO3, \
 | 
			
		||||
    KA4, KP2, KC6,                KK6,                KC0, KM3, KD0, KA1,   KO0, KK0, KL0,   KL6,      KQ6       \
 | 
			
		||||
    ) { /*        00-A  01-B  02-C  03-D  04-E  05-F  06-G  07-H  08-I  09-J  10-K  11-L  12-M  13-N  14-O  15-P  16-Q  17-R */ \
 | 
			
		||||
        /* 0 */  { ___ , KB0 , KC0 , KD0 , ___ , KF0 , KG0 , ___ , ___ , ___ , KK0 , KL0 , ___ , ___ , KO0 , ___ , KQ0 , KR0 }, \
 | 
			
		||||
        /* 1 */  { KA1 , KB1 , ___ , KD1 , KE1 , KF1 , KG1 , KH1 , KI1 , KJ1 , KK1 , KL1 , ___ , ___ , ___ , ___ , KQ1 , ___ }, \
 | 
			
		||||
        /* 2 */  { ___ , KB2 , ___ , KD2 , KE2 , KF2 , KG2 , KH2 , KI2 , KJ2 , KK2 , KL2 , ___ , KN2 , ___ , KP2 , KQ2 , KR2 }, \
 | 
			
		||||
        /* 3 */  { ___ , KB3 , ___ , KD3 , KE3 , KF3 , KG3 , KH3 , KI3 , KJ3 , KK3 , KL3 , KM3 , KN3 , KO3 , ___ , KQ3 , KR3 }, \
 | 
			
		||||
        /* 4 */  { KA4 , KB4 , ___ , KD4 , KE4 , KF4 , KG4 , KH4 , KI4 , KJ4 , KK4 , KL4 , ___ , ___ , KO4 , ___ , KQ4 , KR4 }, \
 | 
			
		||||
        /* 5 */  { KA5 , ___ , KC5 , KD5 , KE5 , KF5 , KG5 , KH5 , KI5 , KJ5 , KK5 , KL5 , ___ , ___ , KO5 , ___ , KQ5 , KR5 }, \
 | 
			
		||||
        /* 6 */  { ___ , KB6 , KC6 , ___ , KE6 , KF6 , KG6 , KH6 , ___ , KJ6 , KK6 , KL6 , ___ , ___ , KO6 , ___ , KQ6 , KR6 }, \
 | 
			
		||||
        /* 7 */  { KA7 , KB7 , KC7 , KD7 , KE7 , KF7 , KG7 , KH7 , KI7 , KJ7 , ___ , ___ , ___ , ___ , KO7 , ___ , KQ7 , KR7 }  \
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
#define LAYOUT_fullsize_iso( \
 | 
			
		||||
    KJ6,      KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0,   KC7, KC5, KA5,                       \
 | 
			
		||||
    KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2,   KL4, KO4, KQ4,   KK1, KL1, KQ1, KQ0, \
 | 
			
		||||
    KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2,        KK4, KO7, KQ7,   KK5, KL5, KQ5, KO5, \
 | 
			
		||||
    KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6, KB3, KB1,                    KK2, KL2, KQ2,      \
 | 
			
		||||
    KN2, KI6, KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0,      KN3,        KO6,        KK3, KL3, KQ3, KO3, \
 | 
			
		||||
    KA4, KP2, KC6,                KK6,                KC0, KM3, KD0, KA1,   KO0, KK0, KL0,   KL6,      KQ6       \
 | 
			
		||||
    ) { /*        00-A  01-B  02-C  03-D  04-E  05-F  06-G  07-H  08-I  09-J  10-K  11-L  12-M  13-N  14-O  15-P  16-Q  17-R */ \
 | 
			
		||||
        /* 0 */  { ___ , KB0 , KC0 , KD0 , ___ , KF0 , KG0 , ___ , ___ , ___ , KK0 , KL0 , ___ , ___ , KO0 , ___ , KQ0 , KR0 }, \
 | 
			
		||||
        /* 1 */  { KA1 , KB1 , ___ , KD1 , KE1 , KF1 , KG1 , KH1 , KI1 , KJ1 , KK1 , KL1 , ___ , ___ , ___ , ___ , KQ1 , ___ }, \
 | 
			
		||||
        /* 2 */  { ___ , KB2 , ___ , KD2 , KE2 , KF2 , KG2 , KH2 , KI2 , KJ2 , KK2 , KL2 , ___ , KN2 , ___ , KP2 , KQ2 , KR2 }, \
 | 
			
		||||
        /* 3 */  { ___ , KB3 , ___ , KD3 , KE3 , KF3 , KG3 , KH3 , KI3 , KJ3 , KK3 , KL3 , KM3 , KN3 , KO3 , ___ , KQ3 , KR3 }, \
 | 
			
		||||
        /* 4 */  { KA4 , KB4 , ___ , KD4 , KE4 , KF4 , KG4 , KH4 , KI4 , KJ4 , KK4 , KL4 , ___ , ___ , KO4 , ___ , KQ4 , KR4 }, \
 | 
			
		||||
        /* 5 */  { KA5 , ___ , KC5 , KD5 , KE5 , KF5 , KG5 , KH5 , KI5 , KJ5 , KK5 , KL5 , ___ , ___ , KO5 , ___ , KQ5 , KR5 }, \
 | 
			
		||||
        /* 6 */  { ___ , KB6 , KC6 , ___ , KE6 , KF6 , KG6 , KH6 , KI6 , KJ6 , KK6 , KL6 , ___ , ___ , KO6 , ___ , KQ6 , KR6 }, \
 | 
			
		||||
        /* 7 */  { KA7 , KB7 , KC7 , KD7 , KE7 , KF7 , KG7 , KH7 , KI7 , KJ7 , ___ , ___ , ___ , ___ , KO7 , ___ , KQ7 , KR7 }  \
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -8,8 +8,12 @@
 | 
			
		|||
        "pid": "0x6050",
 | 
			
		||||
        "device_version": "1.0.4"
 | 
			
		||||
    },
 | 
			
		||||
    "community_layouts": [
 | 
			
		||||
        "fullsize_ansi",
 | 
			
		||||
        "fullsize_iso"
 | 
			
		||||
    ],
 | 
			
		||||
    "layouts": {
 | 
			
		||||
        "LAYOUT": {
 | 
			
		||||
        "LAYOUT_fullsize_ansi": {
 | 
			
		||||
            "layout": [
 | 
			
		||||
                {"label":"Esc", "x":0, "y":0},
 | 
			
		||||
                {"label":"F1", "x":2, "y":0},
 | 
			
		||||
| 
						 | 
				
			
			@ -66,7 +70,7 @@
 | 
			
		|||
                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
 | 
			
		||||
                {"label":"Delete", "x":15.25, "y":2.25},
 | 
			
		||||
                {"label":"End", "x":16.25, "y":2.25},
 | 
			
		||||
                {"label":"Page DownDN", "x":17.25, "y":2.25},
 | 
			
		||||
                {"label":"Page Down", "x":17.25, "y":2.25},
 | 
			
		||||
                {"label":"7", "x":18.5, "y":2.25},
 | 
			
		||||
                {"label":"8", "x":19.5, "y":2.25},
 | 
			
		||||
                {"label":"9", "x":20.5, "y":2.25},
 | 
			
		||||
| 
						 | 
				
			
			@ -89,8 +93,7 @@
 | 
			
		|||
                {"label":"5", "x":19.5, "y":3.25},
 | 
			
		||||
                {"label":"6", "x":20.5, "y":3.25},
 | 
			
		||||
 | 
			
		||||
                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
 | 
			
		||||
                {"label":"\\|", "x":1.25, "y":4.25},
 | 
			
		||||
                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
 | 
			
		||||
                {"label":"Z", "x":2.25, "y":4.25},
 | 
			
		||||
                {"label":"X", "x":3.25, "y":4.25},
 | 
			
		||||
                {"label":"C", "x":4.25, "y":4.25},
 | 
			
		||||
| 
						 | 
				
			
			@ -122,6 +125,120 @@
 | 
			
		|||
                {"label":"0", "x":18.5, "y":5.25, "w":2},
 | 
			
		||||
                {"label":".", "x":20.5, "y":5.25}
 | 
			
		||||
            ]
 | 
			
		||||
        },
 | 
			
		||||
        "LAYOUT_fullsize_iso": {
 | 
			
		||||
            "layout": [
 | 
			
		||||
                {"label":"Esc", "x":0, "y":0},
 | 
			
		||||
                {"label":"F1", "x":2, "y":0},
 | 
			
		||||
                {"label":"F2", "x":3, "y":0},
 | 
			
		||||
                {"label":"F3", "x":4, "y":0},
 | 
			
		||||
                {"label":"F4", "x":5, "y":0},
 | 
			
		||||
                {"label":"F5", "x":6.5, "y":0},
 | 
			
		||||
                {"label":"F6", "x":7.5, "y":0},
 | 
			
		||||
                {"label":"F7", "x":8.5, "y":0},
 | 
			
		||||
                {"label":"F8", "x":9.5, "y":0},
 | 
			
		||||
                {"label":"F9", "x":11, "y":0},
 | 
			
		||||
                {"label":"F10", "x":12, "y":0},
 | 
			
		||||
                {"label":"F11", "x":13, "y":0},
 | 
			
		||||
                {"label":"F12", "x":14, "y":0},
 | 
			
		||||
                {"label":"Print Screen,", "x":15.25, "y":0},
 | 
			
		||||
                {"label":"Scroll Lock", "x":16.25, "y":0},
 | 
			
		||||
                {"label":"Pause", "x":17.25, "y":0},
 | 
			
		||||
 | 
			
		||||
                {"label":"`\u00ac", "x":0, "y":1.25},
 | 
			
		||||
                {"label":"1!", "x":1, "y":1.25},
 | 
			
		||||
                {"label":"2\"", "x":2, "y":1.25},
 | 
			
		||||
                {"label":"3\u00a3", "x":3, "y":1.25},
 | 
			
		||||
                {"label":"4$", "x":4, "y":1.25},
 | 
			
		||||
                {"label":"5%", "x":5, "y":1.25},
 | 
			
		||||
                {"label":"6^", "x":6, "y":1.25},
 | 
			
		||||
                {"label":"7&", "x":7, "y":1.25},
 | 
			
		||||
                {"label":"8*", "x":8, "y":1.25},
 | 
			
		||||
                {"label":"9(", "x":9, "y":1.25},
 | 
			
		||||
                {"label":"0)", "x":10, "y":1.25},
 | 
			
		||||
                {"label":"-_", "x":11, "y":1.25},
 | 
			
		||||
                {"label":"=+", "x":12, "y":1.25},
 | 
			
		||||
                {"label":"Backspace", "x":13, "y":1.25, "w":2},
 | 
			
		||||
                {"label":"Insert", "x":15.25, "y":1.25},
 | 
			
		||||
                {"label":"Home", "x":16.25, "y":1.25},
 | 
			
		||||
                {"label":"Page Up", "x":17.25, "y":1.25},
 | 
			
		||||
                {"label":"Num Lock", "x":18.5, "y":1.25},
 | 
			
		||||
                {"label":"/", "x":19.5, "y":1.25},
 | 
			
		||||
                {"label":"*", "x":20.5, "y":1.25},
 | 
			
		||||
                {"label":"-", "x":21.5, "y":1.25},
 | 
			
		||||
 | 
			
		||||
                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
 | 
			
		||||
                {"label":"Q", "x":1.5, "y":2.25},
 | 
			
		||||
                {"label":"W", "x":2.5, "y":2.25},
 | 
			
		||||
                {"label":"E", "x":3.5, "y":2.25},
 | 
			
		||||
                {"label":"R", "x":4.5, "y":2.25},
 | 
			
		||||
                {"label":"T", "x":5.5, "y":2.25},
 | 
			
		||||
                {"label":"Y", "x":6.5, "y":2.25},
 | 
			
		||||
                {"label":"U", "x":7.5, "y":2.25},
 | 
			
		||||
                {"label":"I", "x":8.5, "y":2.25},
 | 
			
		||||
                {"label":"O", "x":9.5, "y":2.25},
 | 
			
		||||
                {"label":"P", "x":10.5, "y":2.25},
 | 
			
		||||
                {"label":"[{", "x":11.5, "y":2.25},
 | 
			
		||||
                {"label":"]}", "x":12.5, "y":2.25},
 | 
			
		||||
                {"label":"Delete", "x":15.25, "y":2.25},
 | 
			
		||||
                {"label":"End", "x":16.25, "y":2.25},
 | 
			
		||||
                {"label":"Page Down", "x":17.25, "y":2.25},
 | 
			
		||||
                {"label":"7", "x":18.5, "y":2.25},
 | 
			
		||||
                {"label":"8", "x":19.5, "y":2.25},
 | 
			
		||||
                {"label":"9", "x":20.5, "y":2.25},
 | 
			
		||||
                {"label":"+", "x":21.5, "y":2.25, "h": 2},
 | 
			
		||||
 | 
			
		||||
                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
 | 
			
		||||
                {"label":"A", "x":1.75, "y":3.25},
 | 
			
		||||
                {"label":"S", "x":2.75, "y":3.25},
 | 
			
		||||
                {"label":"D", "x":3.75, "y":3.25},
 | 
			
		||||
                {"label":"F", "x":4.75, "y":3.25},
 | 
			
		||||
                {"label":"G", "x":5.75, "y":3.25},
 | 
			
		||||
                {"label":"H", "x":6.75, "y":3.25},
 | 
			
		||||
                {"label":"J", "x":7.75, "y":3.25},
 | 
			
		||||
                {"label":"K", "x":8.75, "y":3.25},
 | 
			
		||||
                {"label":"L", "x":9.75, "y":3.25},
 | 
			
		||||
                {"label":";:", "x":10.75, "y":3.25},
 | 
			
		||||
                {"label":"'@", "x":11.75, "y":3.25},
 | 
			
		||||
                {"label":"#~", "x":12.75, "y":3.25},
 | 
			
		||||
                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
 | 
			
		||||
                {"label":"4", "x":18.5, "y":3.25},
 | 
			
		||||
                {"label":"5", "x":19.5, "y":3.25},
 | 
			
		||||
                {"label":"6", "x":20.5, "y":3.25},
 | 
			
		||||
 | 
			
		||||
                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
 | 
			
		||||
                {"label":"\\|", "x":1.25, "y":4.25},
 | 
			
		||||
                {"label":"Z", "x":2.25, "y":4.25},
 | 
			
		||||
                {"label":"X", "x":3.25, "y":4.25},
 | 
			
		||||
                {"label":"C", "x":4.25, "y":4.25},
 | 
			
		||||
                {"label":"V", "x":5.25, "y":4.25},
 | 
			
		||||
                {"label":"B", "x":6.25, "y":4.25},
 | 
			
		||||
                {"label":"N", "x":7.25, "y":4.25},
 | 
			
		||||
                {"label":"M", "x":8.25, "y":4.25},
 | 
			
		||||
                {"label":",<", "x":9.25, "y":4.25},
 | 
			
		||||
                {"label":".>", "x":10.25, "y":4.25},
 | 
			
		||||
                {"label":"/?", "x":11.25, "y":4.25},
 | 
			
		||||
                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
 | 
			
		||||
                {"label":"\u2191", "x":16.25, "y":4.25},
 | 
			
		||||
                {"label":"1", "x":18.5, "y":4.25},
 | 
			
		||||
                {"label":"2", "x":19.5, "y":4.25},
 | 
			
		||||
                {"label":"3", "x":20.5, "y":4.25},
 | 
			
		||||
                {"label":"Enter", "x":21.5, "y":4.25, "h":2},
 | 
			
		||||
 | 
			
		||||
                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
 | 
			
		||||
                {"label":"GUI", "x":1.25, "y":5.25, "w":1.25},
 | 
			
		||||
                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
 | 
			
		||||
                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
 | 
			
		||||
                {"label":"AltGr", "x":10, "y":5.25, "w":1.25},
 | 
			
		||||
                {"label":"GUI", "x":11.25, "y":5.25, "w":1.25},
 | 
			
		||||
                {"label":"Fn", "x":12.5, "y":5.25, "w":1.25},
 | 
			
		||||
                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
 | 
			
		||||
                {"label":"\u2190", "x":15.25, "y":5.25},
 | 
			
		||||
                {"label":"\u2193", "x":16.25, "y":5.25},
 | 
			
		||||
                {"label":"\u2192", "x":17.25, "y":5.25},
 | 
			
		||||
                {"label":"0", "x":18.5, "y":5.25, "w":2},
 | 
			
		||||
                {"label":".", "x":20.5, "y":5.25}
 | 
			
		||||
            ]
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -25,50 +25,47 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
* │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ │INS│HOM│PgU│ │NUM│ / │ * │ - │
 | 
			
		||||
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ ├───┼───┼───┼───┤
 | 
			
		||||
* │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │     │ │DEL│END│PgD│ │ 7 │ 8 │ 9 │   │
 | 
			
		||||
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐  ↲ │ └───┴───┴───┘ ├───┼───┼───┤ + │
 | 
			
		||||
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent│ └───┴───┴───┘ ├───┼───┼───┤ + │
 | 
			
		||||
* │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ \ │    │               │ 7 │ 8 │ 9 │   │
 | 
			
		||||
* ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤     ┌───┐     ├───┼───┼───┼───┤
 | 
			
		||||
* │Shif│ # │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │    Shift │     │ ↑ │     │ 1 │ 2 │ 3 │   │
 | 
			
		||||
* ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐ ├───┴───┼───┤ ↲ │
 | 
			
		||||
* │Ctrl│GUI │Alt │                        │ Alt│ GUI│Fn  │Ctrl│ │ ← │ ↓ │ → │ │   0   │ , │   │ 
 | 
			
		||||
* ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐ ├───┴───┼───┤Ent│
 | 
			
		||||
* │Ctrl│GUI │Alt │                        │ Alt│ GUI│Fn  │Ctrl│ │ ← │ ↓ │ → │ │   0   │ , │   │
 | 
			
		||||
* └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
 | 
			
		||||
*/
 | 
			
		||||
 | 
			
		||||
enum layer_names {
 | 
			
		||||
    KM_QWERTY,
 | 
			
		||||
    KM_MEDIA,
 | 
			
		||||
    KM_GUI_LOCK
 | 
			
		||||
    _QW,
 | 
			
		||||
    _MD
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
	/* Layer 0: Standard ISO layer */
 | 
			
		||||
	[KM_QWERTY] = LAYOUT(
 | 
			
		||||
KC_ESC,          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_PSCR,KC_SCRL,KC_PAUS,
 | 
			
		||||
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_INS, KC_HOME,KC_PGUP,    KC_NUM, KC_PSLS,KC_PAST,KC_PMNS,
 | 
			
		||||
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_END, KC_PGDN,    KC_P7,  KC_P8,  KC_P9,  KC_PPLS,
 | 
			
		||||
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_P4,  KC_P5,  KC_P6,
 | 
			
		||||
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_P1,  KC_P2,  KC_P3,  KC_PENT,
 | 
			
		||||
KC_LCTL, KC_LGUI,KC_LALT,                       KC_SPC,                          KC_RALT,KC_RGUI,MO(KM_MEDIA),KC_RCTL,   KC_LEFT,KC_DOWN,KC_RGHT,    KC_P0,          KC_PDOT),
 | 
			
		||||
	/* Layer 1: Function layer */
 | 
			
		||||
	[KM_MEDIA] = LAYOUT(
 | 
			
		||||
_______,_______,_______,_______,_______,  KC_MEDIA_PLAY_PAUSE, KC_MEDIA_STOP, KC_MEDIA_PREV_TRACK, KC_MEDIA_NEXT_TRACK,  TG(KM_GUI_LOCK),KC_MUTE, KC_VOLD, KC_VOLU,_______,_______, QK_BOOT,
 | 
			
		||||
_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
 | 
			
		||||
_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
 | 
			
		||||
_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
 | 
			
		||||
_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,  _______,_______,
 | 
			
		||||
_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______),
 | 
			
		||||
	[KM_GUI_LOCK] = LAYOUT(
 | 
			
		||||
_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,
 | 
			
		||||
_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
 | 
			
		||||
_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
 | 
			
		||||
_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
 | 
			
		||||
_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
 | 
			
		||||
_______,KC_NO,_______,_______,_______,KC_NO,_______,_______,_______,_______,_______,_______,_______)
 | 
			
		||||
 | 
			
		||||
    /* Layer 0: Standard ISO layer */
 | 
			
		||||
    [_QW] = LAYOUT_fullsize_iso(
 | 
			
		||||
        KC_ESC,           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_PSCR, KC_SCRL, KC_PAUS,
 | 
			
		||||
        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_INS,  KC_HOME, KC_PGUP,    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
 | 
			
		||||
        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_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
 | 
			
		||||
        KC_CLCK, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,                                   KC_P4,   KC_P5,   KC_P6,
 | 
			
		||||
        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_P1,   KC_P2,   KC_P3,   KC_PENT,
 | 
			
		||||
        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(_MD), KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,            KC_PDOT
 | 
			
		||||
    ),
 | 
			
		||||
 | 
			
		||||
    /* Layer 1: Function layer */
 | 
			
		||||
    [_MD] = LAYOUT_fullsize_iso(
 | 
			
		||||
        _______,          _______, _______, _______, _______, KC_MPLY, KC_MSTP, KC_MPRV, KC_MNXT, GUI_TOG, KC_MUTE, KC_VOLD, KC_VOLU,    _______, _______, QK_BOOT,
 | 
			
		||||
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,    _______, _______, _______, _______,
 | 
			
		||||
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,    _______, _______, _______, _______,
 | 
			
		||||
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                                  _______, _______, _______,
 | 
			
		||||
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,             _______,             _______, _______, _______, _______,
 | 
			
		||||
        _______, _______, _______,                            _______,                            _______, _______, _______, _______,    _______, _______, _______,    _______,          _______
 | 
			
		||||
    ),
 | 
			
		||||
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
layer_state_t layer_state_set_user(layer_state_t state) {
 | 
			
		||||
    if (IS_LAYER_ON_STATE(state, KM_GUI_LOCK)) {
 | 
			
		||||
    if (IS_LAYER_ON_STATE(state, _MD)) {
 | 
			
		||||
        fn_led_on();
 | 
			
		||||
    } else {
 | 
			
		||||
        fn_led_off();
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1 +1,33 @@
 | 
			
		|||
# Default layout desc TODO
 | 
			
		||||
# Ghost Squid Default Keymap
 | 
			
		||||
 | 
			
		||||
## Base Layer
 | 
			
		||||
 | 
			
		||||
```
 | 
			
		||||
 ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐     ┌───────────┐
 | 
			
		||||
 │ESC│   │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12│ │PRT│SCR│PAU│     │Ghost Squid│
 | 
			
		||||
 └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘     └───────────┘
 | 
			
		||||
 ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐ ┌───┬───┬───┬───┐
 | 
			
		||||
 │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ │INS│HOM│PgU│ │NUM│ / │ * │ - │
 | 
			
		||||
 ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ ├───┼───┼───┼───┤
 | 
			
		||||
 │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │     │ │DEL│END│PgD│ │ 7 │ 8 │ 9 │   │
 | 
			
		||||
 ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent│ └───┴───┴───┘ ├───┼───┼───┤ + │
 | 
			
		||||
 │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ \ │    │               │ 7 │ 8 │ 9 │   │
 | 
			
		||||
 ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤     ┌───┐     ├───┼───┼───┼───┤
 | 
			
		||||
 │Shif│ # │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │    Shift │     │ ↑ │     │ 1 │ 2 │ 3 │   │
 | 
			
		||||
 ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐ ├───┴───┼───┤Ent│
 | 
			
		||||
 │Ctrl│GUI │Alt │                        │ Alt│ GUI│Fn  │Ctrl│ │ ← │ ↓ │ → │ │   0   │ , │   │
 | 
			
		||||
 └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
 | 
			
		||||
 | 
			
		||||
```
 | 
			
		||||
 | 
			
		||||
## Function Layer
 | 
			
		||||
 | 
			
		||||
* `Fn` + `F5`  =  Play
 | 
			
		||||
* `Fn` + `F6`  =  Stop
 | 
			
		||||
* `Fn` + `F7`  =  Previous Track
 | 
			
		||||
* `Fn` + `F8`  =  Next Track
 | 
			
		||||
* `Fn` + `F9`  =  Toggle GUI key
 | 
			
		||||
* `Fn` + `F10` =  Mute
 | 
			
		||||
* `Fn` + `F11` =  Volume Down
 | 
			
		||||
* `Fn` + `F12` =  Volume Up
 | 
			
		||||
* `Fn` + `Pause` = Reset to Bootloader
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue