Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		@@ -5,8 +5,7 @@
 | 
			
		||||
    "width": 15,
 | 
			
		||||
    "height": 5,
 | 
			
		||||
    "layouts": {
 | 
			
		||||
        "LAYOUT_60": {
 | 
			
		||||
            "key_count": 64,
 | 
			
		||||
        "LAYOUT_all": {
 | 
			
		||||
            "layout": [
 | 
			
		||||
                {"label":"K80", "x":0, "y":0},
 | 
			
		||||
                {"label":"K10", "x":1, "y":0},
 | 
			
		||||
@@ -21,7 +20,9 @@
 | 
			
		||||
                {"label":"K05", "x":10, "y":0},
 | 
			
		||||
                {"label":"K15", "x":11, "y":0},
 | 
			
		||||
                {"label":"K06", "x":12, "y":0},
 | 
			
		||||
                {"label":"K16", "x":13, "y":0, "w":2},
 | 
			
		||||
                {"label":"K17", "x":13, "y":0},
 | 
			
		||||
                {"label":"K16", "x":14, "y":0},
 | 
			
		||||
 | 
			
		||||
                {"label":"K20", "x":0, "y":1, "w":1.5},
 | 
			
		||||
                {"label":"K30", "x":1.5, "y":1},
 | 
			
		||||
                {"label":"K21", "x":2.5, "y":1},
 | 
			
		||||
@@ -36,6 +37,7 @@
 | 
			
		||||
                {"label":"K35", "x":11.5, "y":1},
 | 
			
		||||
                {"label":"K26", "x":12.5, "y":1},
 | 
			
		||||
                {"label":"K36", "x":13.5, "y":1, "w":1.5},
 | 
			
		||||
 | 
			
		||||
                {"label":"K40", "x":0, "y":2, "w":1.75},
 | 
			
		||||
                {"label":"K41", "x":1.75, "y":2},
 | 
			
		||||
                {"label":"K51", "x":2.75, "y":2},
 | 
			
		||||
@@ -48,8 +50,8 @@
 | 
			
		||||
                {"label":"K45", "x":9.75, "y":2},
 | 
			
		||||
                {"label":"K55", "x":10.75, "y":2},
 | 
			
		||||
                {"label":"K46", "x":11.75, "y":2},
 | 
			
		||||
                {"label":"K17", "x":12.75, "y":2},
 | 
			
		||||
                {"label":"K56", "x":13.75, "y":2, "w":1.25},
 | 
			
		||||
                {"label":"K56", "x":12.75, "y":2, "w":2.25},
 | 
			
		||||
 | 
			
		||||
                {"label":"K70", "x":0, "y":3, "w":1.25},
 | 
			
		||||
                {"label":"K97", "x":1.25, "y":3},
 | 
			
		||||
                {"label":"K61", "x":2.25, "y":3},
 | 
			
		||||
@@ -64,6 +66,7 @@
 | 
			
		||||
                {"label":"K75", "x":11.25, "y":3},
 | 
			
		||||
                {"label":"K66", "x":12.25, "y":3, "w":1.75},
 | 
			
		||||
                {"label":"K76", "x":14, "y":3},
 | 
			
		||||
 | 
			
		||||
                {"label":"K60", "x":0, "y":4, "w":1.25},
 | 
			
		||||
                {"label":"K50", "x":1.25, "y":4, "w":1.25},
 | 
			
		||||
                {"label":"K87", "x":2.5, "y":4, "w":1.25},
 | 
			
		||||
@@ -73,6 +76,288 @@
 | 
			
		||||
                {"label":"K47", "x":12.5, "y":4, "w":1.25},
 | 
			
		||||
                {"label":"K57", "x":13.75, "y":4, "w":1.25}
 | 
			
		||||
            ]
 | 
			
		||||
        },
 | 
			
		||||
        "LAYOUT_60_ansi": {
 | 
			
		||||
            "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.5, "y":1, "w":1.5},
 | 
			
		||||
 | 
			
		||||
                {"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, "w":2.25},
 | 
			
		||||
 | 
			
		||||
                {"x":0, "y":3, "w":2.25},
 | 
			
		||||
                {"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":2.75},
 | 
			
		||||
 | 
			
		||||
                {"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, "w":1.25},
 | 
			
		||||
                {"x":11.25, "y":4, "w":1.25},
 | 
			
		||||
                {"x":12.5, "y":4, "w":1.25},
 | 
			
		||||
                {"x":13.75, "y":4, "w":1.25}
 | 
			
		||||
            ]
 | 
			
		||||
        },
 | 
			
		||||
        "LAYOUT_60_ansi_split_bs_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},
 | 
			
		||||
                {"x":14, "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":13.5, "y":1, "w":1.5},
 | 
			
		||||
 | 
			
		||||
                {"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, "w":2.25},
 | 
			
		||||
 | 
			
		||||
                {"x":0, "y":3, "w":2.25},
 | 
			
		||||
                {"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.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, "w":1.25},
 | 
			
		||||
                {"x":11.25, "y":4, "w":1.25},
 | 
			
		||||
                {"x":12.5, "y":4, "w":1.25},
 | 
			
		||||
                {"x":13.75, "y":4, "w":1.25}
 | 
			
		||||
            ]
 | 
			
		||||
        },
 | 
			
		||||
        "LAYOUT_60_iso": {
 | 
			
		||||
            "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":2.75},
 | 
			
		||||
 | 
			
		||||
                {"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, "w":1.25},
 | 
			
		||||
                {"x":11.25, "y":4, "w":1.25},
 | 
			
		||||
                {"x":12.5, "y":4, "w":1.25},
 | 
			
		||||
                {"x":13.75, "y":4, "w":1.25}
 | 
			
		||||
            ]
 | 
			
		||||
        },
 | 
			
		||||
        "LAYOUT_60_iso_split_bs_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},
 | 
			
		||||
                {"x":14, "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":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.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, "w":1.25},
 | 
			
		||||
                {"x":11.25, "y":4, "w":1.25},
 | 
			
		||||
                {"x":12.5, "y":4, "w":1.25},
 | 
			
		||||
                {"x":13.75, "y":4, "w":1.25}
 | 
			
		||||
            ]
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -2,18 +2,18 @@
 | 
			
		||||
 | 
			
		||||
// Keymap layers
 | 
			
		||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
    [0] = LAYOUT_60( /* Base */
 | 
			
		||||
        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,
 | 
			
		||||
    [0] = LAYOUT_all( /* Base */
 | 
			
		||||
        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_NUHS, 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_BSLS,
 | 
			
		||||
        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_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_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, MO(1),   KC_RCTL
 | 
			
		||||
    ),
 | 
			
		||||
 | 
			
		||||
    [1] = LAYOUT_60( /* System layer to have access to RESET button */
 | 
			
		||||
        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,
 | 
			
		||||
    [1] = LAYOUT_all( /* System layer to have access to RESET button */
 | 
			
		||||
        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_PGUP, KC_UP,   KC_PGDN, KC_PSCR, KC_SLCK, KC_PAUS, _______,
 | 
			
		||||
        _______, _______, _______, _______, _______, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_INS,  KC_DEL,  _______, _______,
 | 
			
		||||
        _______, _______, _______, _______, _______, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_INS,  KC_DEL,           _______,
 | 
			
		||||
        _______, _______, KC_APP,  _______, _______, _______, _______, KC_END,  _______, _______, _______, _______, _______, _______,
 | 
			
		||||
        RESET,   _______, _______,                            _______,                            _______, _______, _______, _______
 | 
			
		||||
    ),
 | 
			
		||||
 
 | 
			
		||||
@@ -1,12 +1,30 @@
 | 
			
		||||
/* Copyright 2017 Marvin Ramin (@Mauin)
 | 
			
		||||
 *
 | 
			
		||||
 * This program is free software: you can redistribute it and/or modify
 | 
			
		||||
 * it under the terms of the GNU General Public License as published by
 | 
			
		||||
 * the Free Software Foundation, either version 2 of the License, or
 | 
			
		||||
 * (at your option) any later version.
 | 
			
		||||
 *
 | 
			
		||||
 * This program is distributed in the hope that it will be useful,
 | 
			
		||||
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
			
		||||
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
			
		||||
 * GNU General Public License for more details.
 | 
			
		||||
 *
 | 
			
		||||
 * You should have received a copy of the GNU General Public License
 | 
			
		||||
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		||||
 */
 | 
			
		||||
#include QMK_KEYBOARD_H
 | 
			
		||||
 | 
			
		||||
// Keymap layers
 | 
			
		||||
#define BASE_LAYER 0
 | 
			
		||||
#define FUNCTION_LAYER 1
 | 
			
		||||
#define SYSTEM_LAYER 2
 | 
			
		||||
enum layer_names {
 | 
			
		||||
    _BS, // Base Layer
 | 
			
		||||
    _FN, // Function Layer
 | 
			
		||||
    _SY  // System Layer
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
// Key aliases
 | 
			
		||||
#define __x__ KC_NO
 | 
			
		||||
enum custom_keycodes {
 | 
			
		||||
    ESC_GRV = SAFE_RANGE
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
  /* Layer 0: Default Layer
 | 
			
		||||
@@ -22,12 +40,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
   * |  Ctl|Alt|Gui  |         Space         |Gui  |Alt| F2| Ctl |
 | 
			
		||||
   * `-----------------------------------------------------------'
 | 
			
		||||
   */
 | 
			
		||||
  [BASE_LAYER] = LAYOUT_60(
 | 
			
		||||
      F(0),     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_BSLS, \
 | 
			
		||||
      MO(1),    KC_A,     KC_S,     KC_D,    KC_F,     KC_G,     KC_H,     KC_J,    KC_K,    KC_L,     KC_SCLN,  KC_QUOT,  __x__,    KC_ENT,  \
 | 
			
		||||
      KC_LSFT,  __x__,    KC_Z,     KC_X,     KC_C,    KC_V,     KC_B,     KC_N,    KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  __x__,   \
 | 
			
		||||
      KC_LCTL,  KC_LALT,  KC_LGUI,                               KC_SPC,                               KC_RGUI,  KC_RALT,  MO(2),    KC_RCTL  \
 | 
			
		||||
  [_BS] = LAYOUT_all(
 | 
			
		||||
      ESC_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,  XXXXXXX, 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_BSLS,
 | 
			
		||||
      MO(1),   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_LSFT, XXXXXXX, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, XXXXXXX,
 | 
			
		||||
      KC_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                             KC_RGUI, KC_RALT, MO(2),   KC_RCTL
 | 
			
		||||
  ),
 | 
			
		||||
 | 
			
		||||
  /* Layer 1: Function Layer
 | 
			
		||||
@@ -43,13 +61,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
   * |     |   |     |                       |     |   |   |     |
 | 
			
		||||
   * `-----------------------------------------------------------'
 | 
			
		||||
   */
 | 
			
		||||
   [FUNCTION_LAYER] = LAYOUT_60(
 | 
			
		||||
       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, \
 | 
			
		||||
       __x__,   KC_MPRV, KC_MPLY, KC_MNXT, __x__,   __x__,   KC_PGUP, KC_HOME, KC_UP,   KC_END,  __x__,   KC_SLCK, KC_PAUS, __x__,  \
 | 
			
		||||
       KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, __x__,   __x__,   KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, __x__,   __x__,    __x__,  __x__,  \
 | 
			
		||||
       KC_LSFT,  __x__,  __x__,   __x__,   __x__,   __x__,   __x__,   __x__,   __x__,   __x__,   __x__,   __x__,    __x__,  __x__,  \
 | 
			
		||||
       KC_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                             __x__,   __x__,   __x__,   __x__   \
 | 
			
		||||
   ),
 | 
			
		||||
  [_FN] = 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,  XXXXXXX, KC_DEL,
 | 
			
		||||
      XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX, KC_PGUP, KC_HOME, KC_UP,   KC_END,  XXXXXXX, KC_SLCK, KC_PAUS, XXXXXXX,
 | 
			
		||||
      KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, XXXXXXX, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX,          XXXXXXX,
 | 
			
		||||
      KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
 | 
			
		||||
      KC_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                             XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
 | 
			
		||||
  ),
 | 
			
		||||
 | 
			
		||||
  /* Layer 2: System Layer
 | 
			
		||||
   * ,-----------------------------------------------------------.
 | 
			
		||||
@@ -64,45 +82,33 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
   * |     |   |     |                       |     |   |   |     |
 | 
			
		||||
   * `-----------------------------------------------------------'
 | 
			
		||||
   */
 | 
			
		||||
  [SYSTEM_LAYER] = LAYOUT_60(
 | 
			
		||||
      RESET,  __x__,  __x__,  __x__,  __x__,  __x__,  __x__,  __x__,  __x__,  __x__,  __x__,  __x__,  __x__,   __x__, \
 | 
			
		||||
      __x__,  __x__,  __x__,  __x__,  __x__,  __x__,  __x__,  __x__,  __x__,  __x__,  __x__,  __x__,  __x__,   __x__, \
 | 
			
		||||
      __x__,  __x__,  __x__,  __x__,  __x__,  __x__,  __x__,  __x__,  __x__,  __x__,  __x__,  __x__,  __x__,   __x__, \
 | 
			
		||||
      __x__,  __x__,  __x__,  __x__,  __x__,  __x__,  __x__,  __x__,  __x__,  __x__,  __x__,  __x__,  __x__,   __x__, \
 | 
			
		||||
      __x__,  __x__,  __x__,                          __x__,                          __x__,  __x__,  KC_TRNS, __x__  \
 | 
			
		||||
  [_SY] = LAYOUT_all(
 | 
			
		||||
      RESET,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
 | 
			
		||||
      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
 | 
			
		||||
      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,
 | 
			
		||||
      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
 | 
			
		||||
      XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, XXXXXXX, KC_TRNS, XXXXXXX
 | 
			
		||||
  ),
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
enum function_id {
 | 
			
		||||
    ESC_GRV, // Makes Esc behave like `~ when pressed with the left GUI modifier. This is the "switch between windows of the same application" key combination in macOS
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
const uint16_t PROGMEM fn_actions[] = {
 | 
			
		||||
  [0]  = ACTION_FUNCTION(ESC_GRV),
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {
 | 
			
		||||
  static uint8_t esc_grv_mask;
 | 
			
		||||
  switch (id) {
 | 
			
		||||
    case ESC_GRV:
 | 
			
		||||
      esc_grv_mask = get_mods() & MOD_BIT(KC_LGUI);
 | 
			
		||||
      if (record->event.pressed) {
 | 
			
		||||
        if (esc_grv_mask) {
 | 
			
		||||
          add_key(KC_GRV);
 | 
			
		||||
          send_keyboard_report();
 | 
			
		||||
        } else {
 | 
			
		||||
          add_key(KC_ESC);
 | 
			
		||||
          send_keyboard_report();
 | 
			
		||||
        }
 | 
			
		||||
      } else {
 | 
			
		||||
        if (esc_grv_mask) {
 | 
			
		||||
          del_key(KC_GRV);
 | 
			
		||||
          send_keyboard_report();
 | 
			
		||||
        } else {
 | 
			
		||||
          del_key(KC_ESC);
 | 
			
		||||
          send_keyboard_report();
 | 
			
		||||
        }
 | 
			
		||||
      }
 | 
			
		||||
      break;
 | 
			
		||||
  }
 | 
			
		||||
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 | 
			
		||||
    uint8_t esc_grv_mask = get_mods() & MOD_BIT(KC_LGUI);
 | 
			
		||||
    switch (keycode) {
 | 
			
		||||
        case ESC_GRV:
 | 
			
		||||
            if (esc_grv_mask) {
 | 
			
		||||
                if (record->event.pressed) {
 | 
			
		||||
                    register_code16(G(KC_GRV));
 | 
			
		||||
                } else {
 | 
			
		||||
                    unregister_code16(G(KC_GRV));
 | 
			
		||||
                }
 | 
			
		||||
            } else {
 | 
			
		||||
                if (record->event.pressed) {
 | 
			
		||||
                    register_code(KC_ESC);
 | 
			
		||||
                } else {
 | 
			
		||||
                    unregister_code(KC_ESC);
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
            break;
 | 
			
		||||
    }
 | 
			
		||||
    return true;
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -2,10 +2,86 @@
 | 
			
		||||
 | 
			
		||||
#include "quantum.h"
 | 
			
		||||
 | 
			
		||||
#define LAYOUT_60( \
 | 
			
		||||
    K80, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, \
 | 
			
		||||
#define LAYOUT_all( \
 | 
			
		||||
    K80, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K17, K16, \
 | 
			
		||||
    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, \
 | 
			
		||||
    K40, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K17, K56, \
 | 
			
		||||
    K40, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46,      K56, \
 | 
			
		||||
    K70, K97, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76, \
 | 
			
		||||
    K60, K50, K87,                K07,                K27, K37, K47, K57  \
 | 
			
		||||
) { \
 | 
			
		||||
    { KC_NO, K01,   K02,   K03,   K04,   K05,   K06,   K07   }, \
 | 
			
		||||
    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17   }, \
 | 
			
		||||
    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27   }, \
 | 
			
		||||
    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37   }, \
 | 
			
		||||
    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47   }, \
 | 
			
		||||
    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57   }, \
 | 
			
		||||
    { K60,   K61,   K62,   K63,   K64,   K65,   K66,   KC_NO }, \
 | 
			
		||||
    { K70,   K71,   K72,   K73,   K74,   K75,   K76,   KC_NO }, \
 | 
			
		||||
    { K80,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K87   }, \
 | 
			
		||||
    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K97   } \
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#define LAYOUT_60_ansi( \
 | 
			
		||||
    K80, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, \
 | 
			
		||||
    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, \
 | 
			
		||||
    K40, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46,      K56, \
 | 
			
		||||
    K70,      K61, K71, K62, K72, K63, K73, K64, K74, K65, K75,      K66, \
 | 
			
		||||
    K60, K50, K87,                K07,                K27, K37, K47, K57  \
 | 
			
		||||
) { \
 | 
			
		||||
    { KC_NO, K01,   K02,   K03,   K04,   K05,   K06,   K07   }, \
 | 
			
		||||
    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   KC_NO }, \
 | 
			
		||||
    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27   }, \
 | 
			
		||||
    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37   }, \
 | 
			
		||||
    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47   }, \
 | 
			
		||||
    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57   }, \
 | 
			
		||||
    { K60,   K61,   K62,   K63,   K64,   K65,   K66,   KC_NO }, \
 | 
			
		||||
    { K70,   K71,   K72,   K73,   K74,   K75,   KC_NO, KC_NO }, \
 | 
			
		||||
    { K80,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K87   }, \
 | 
			
		||||
    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#define LAYOUT_60_ansi_split_bs_rshift( \
 | 
			
		||||
    K80, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K17, K16, \
 | 
			
		||||
    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, \
 | 
			
		||||
    K40, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46,      K56, \
 | 
			
		||||
    K70,      K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76, \
 | 
			
		||||
    K60, K50, K87,                K07,                K27, K37, K47, K57  \
 | 
			
		||||
) { \
 | 
			
		||||
    { KC_NO, K01,   K02,   K03,   K04,   K05,   K06,   K07   }, \
 | 
			
		||||
    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17   }, \
 | 
			
		||||
    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27   }, \
 | 
			
		||||
    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37   }, \
 | 
			
		||||
    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47   }, \
 | 
			
		||||
    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57   }, \
 | 
			
		||||
    { K60,   K61,   K62,   K63,   K64,   K65,   K66,   KC_NO }, \
 | 
			
		||||
    { K70,   K71,   K72,   K73,   K74,   K75,   K76,   KC_NO }, \
 | 
			
		||||
    { K80,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K87   }, \
 | 
			
		||||
    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#define LAYOUT_60_iso( \
 | 
			
		||||
    K80, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, \
 | 
			
		||||
    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26,      \
 | 
			
		||||
    K40, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K36, K56, \
 | 
			
		||||
    K70, K97, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75,      K66, \
 | 
			
		||||
    K60, K50, K87,                K07,                K27, K37, K47, K57  \
 | 
			
		||||
) { \
 | 
			
		||||
    { KC_NO, K01,   K02,   K03,   K04,   K05,   K06,   K07   }, \
 | 
			
		||||
    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   KC_NO }, \
 | 
			
		||||
    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27   }, \
 | 
			
		||||
    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37   }, \
 | 
			
		||||
    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47   }, \
 | 
			
		||||
    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57   }, \
 | 
			
		||||
    { K60,   K61,   K62,   K63,   K64,   K65,   K66,   KC_NO }, \
 | 
			
		||||
    { K70,   K71,   K72,   K73,   K74,   K75,   KC_NO, KC_NO }, \
 | 
			
		||||
    { K80,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K87   }, \
 | 
			
		||||
    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K97   } \
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#define LAYOUT_60_iso_split_bs_rshift( \
 | 
			
		||||
    K80, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K17, K16, \
 | 
			
		||||
    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26,      \
 | 
			
		||||
    K40, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K36, K56, \
 | 
			
		||||
    K70, K97, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76, \
 | 
			
		||||
    K60, K50, K87,                K07,                K27, K37, K47, K57  \
 | 
			
		||||
) { \
 | 
			
		||||
 
 | 
			
		||||
@@ -5,13 +5,6 @@ MCU = atmega32u4
 | 
			
		||||
F_CPU = 8000000
 | 
			
		||||
 | 
			
		||||
# Bootloader selection
 | 
			
		||||
#   Teensy       halfkay
 | 
			
		||||
#   Pro Micro    caterina
 | 
			
		||||
#   Atmel DFU    atmel-dfu
 | 
			
		||||
#   LUFA DFU     lufa-dfu
 | 
			
		||||
#   QMK DFU      qmk-dfu
 | 
			
		||||
#   ATmega32A    bootloadHID
 | 
			
		||||
#   ATmega328P   USBasp
 | 
			
		||||
BOOTLOADER = atmel-dfu
 | 
			
		||||
 | 
			
		||||
# Build Options
 | 
			
		||||
@@ -28,7 +21,7 @@ SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 | 
			
		||||
NKRO_ENABLE = yes           # USB Nkey Rollover
 | 
			
		||||
BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 | 
			
		||||
RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 | 
			
		||||
MIDI_ENABLE = no            # MIDI support
 | 
			
		||||
UNICODE_ENABLE = no         # Unicode
 | 
			
		||||
BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 | 
			
		||||
AUDIO_ENABLE = no           # Audio output on port C6
 | 
			
		||||
BLUETOOTH_ENABLE = no       # Enable Bluetooth
 | 
			
		||||
AUDIO_ENABLE = no           # Audio output
 | 
			
		||||
 | 
			
		||||
LAYOUTS = 60_ansi 60_ansi_split_bs_rshift 60_iso 60_iso_split_bs_rshift
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user