mirror of
https://github.com/qmk/qmk_firmware.git
synced 2024-12-11 04:10:58 +00:00
Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
commit
a20454c83a
@ -12,7 +12,7 @@
|
||||
{"label":"Shift", "x":0, "y":4, "w":2.25}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":"<", "x":9.25, "y":4}, {"label":">", "x":10.25, "y":4}, {"label":"?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":1.75}, {"label":"\u2191", "x":14, "y":4}, {"label":"PgDn", "x":15, "y":4}, {"label":"1", "x":16, "y":4}, {"label":"2", "x":17, "y":4}, {"label":"3", "x":18, "y":4}, {"label":"Enter", "x":19, "y":4},
|
||||
{"label":"Ctrl", "x":0, "y":5, "w":1.25}, {"label":"Win", "x":1.25, "y":5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5, "w":1.25}, {"label":"Space", "x":3.75, "y":5, "w":6.25}, {"label":"Alt", "x":10, "y":5}, {"label":"Fn", "x":11, "y":5}, {"label":"Ctrl", "x":12, "y":5}, {"label":"\u2190", "x":13, "y":5}, {"label":"\u2193", "x":14, "y":5}, {"label":"\u2192", "x":15, "y":5}, {"label":"00", "x":16, "y":5}, {"label":"0", "x":17, "y":5}, {"label":".", "x":18, "y":5}, {"label":"Bksp", "x":19, "y":5}
|
||||
]
|
||||
}
|
||||
},
|
||||
"LAYOUT_resume1800_iso_all": {
|
||||
"layout": [
|
||||
{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0}, {"label":"F13", "x":13, "y":0}, {"label":"F14", "x":14, "y":0}, {"label":"PrtSc", "x":15, "y":0}, {"label":"Scroll Lock", "x":16, "y":0}, {"label":"Pause", "x":17, "y":0}, {"label":"Insert", "x":18, "y":0}, {"label":"End", "x":19, "y":0},
|
||||
|
@ -213,7 +213,7 @@
|
||||
{"x":12.5, "y":4},
|
||||
{"x":13.5, "y":4, "w":1.5}
|
||||
]
|
||||
}
|
||||
},
|
||||
"LAYOUT_60_ansi_tsangan_split_bs_rshift": {
|
||||
"layout": [
|
||||
{"x":0, "y":0},
|
||||
|
@ -5,7 +5,7 @@
|
||||
"usb": {
|
||||
"vid": "0x1209",
|
||||
"pid": "0x69A1",
|
||||
"device_version": "0.0.1",
|
||||
"device_version": "0.0.1"
|
||||
},
|
||||
"diode_direction": "COL2ROW",
|
||||
"layouts": {
|
||||
|
@ -37,7 +37,7 @@
|
||||
{"label":"_", "x":11, "y":1.25},
|
||||
{"label":"+", "x":12, "y":1.25},
|
||||
{"label":"Back Space", "x":13, "y":1.25},
|
||||
{"label":"Back Space", "x":14, "y":1.25}
|
||||
{"label":"Back Space", "x":14, "y":1.25},
|
||||
{"label":"Insert", "x":15.25, "y":1.25},
|
||||
{"label":"Home", "x":16.25, "y":1.25},
|
||||
{"label":"PgUp", "x":17.25, "y":1.25},
|
||||
|
@ -8,7 +8,7 @@
|
||||
{"label": "k00", "x": 0, "y": 0},
|
||||
{"label": "k01", "x": 1, "y": 0},
|
||||
{"label": "k02", "x": 2, "y": 0},
|
||||
{"label": "k03", "x": 3, "y": 0},
|
||||
{"label": "k03", "x": 3, "y": 0}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
@ -80,7 +80,7 @@
|
||||
{"label":"\u2193", "x":14, "y":4},
|
||||
{"label":"\u2192", "x":15, "y":4}
|
||||
]
|
||||
}
|
||||
},
|
||||
"LAYOUT_65_all_noblocker": {
|
||||
"layout": [
|
||||
{"label":"Esc", "x":0, "y":0},
|
||||
@ -157,7 +157,7 @@
|
||||
{"label":"\u2193", "x":14, "y":4},
|
||||
{"label":"\u2192", "x":15, "y":4}
|
||||
]
|
||||
}
|
||||
},
|
||||
"LAYOUT_65_ansi_noblocker": {
|
||||
"layout": [
|
||||
{"label":"Esc", "x":0, "y":0},
|
||||
@ -232,7 +232,7 @@
|
||||
{"label":"\u2193", "x":14, "y":4},
|
||||
{"label":"\u2192", "x":15, "y":4}
|
||||
]
|
||||
}
|
||||
},
|
||||
"LAYOUT_65_ansi_noblocker_splitbs": {
|
||||
"layout": [
|
||||
{"label":"Esc", "x":0, "y":0},
|
||||
@ -308,7 +308,7 @@
|
||||
{"label":"\u2193", "x":14, "y":4},
|
||||
{"label":"\u2192", "x":15, "y":4}
|
||||
]
|
||||
}
|
||||
},
|
||||
"LAYOUT_65_iso_noblocker": {
|
||||
"layout": [
|
||||
{"label":"Esc", "x":0, "y":0},
|
||||
@ -384,7 +384,7 @@
|
||||
{"label":"\u2193", "x":14, "y":4},
|
||||
{"label":"\u2192", "x":15, "y":4}
|
||||
]
|
||||
}
|
||||
},
|
||||
"LAYOUT_65_iso_noblocker_splitbs": {
|
||||
"layout": [
|
||||
{"label":"Esc", "x":0, "y":0},
|
||||
@ -461,7 +461,7 @@
|
||||
{"label":"\u2193", "x":14, "y":4},
|
||||
{"label":"\u2192", "x":15, "y":4}
|
||||
]
|
||||
}
|
||||
},
|
||||
"LAYOUT_65_all_blocker": {
|
||||
"layout": [
|
||||
{"label":"Esc", "x":0, "y":0},
|
||||
@ -538,7 +538,7 @@
|
||||
{"label":"\u2193", "x":14, "y":4},
|
||||
{"label":"\u2192", "x":15, "y":4}
|
||||
]
|
||||
}
|
||||
},
|
||||
"LAYOUT_65_ansi_blocker": {
|
||||
"layout": [
|
||||
{"label":"Esc", "x":0, "y":0},
|
||||
@ -613,7 +613,7 @@
|
||||
{"label":"\u2193", "x":14, "y":4},
|
||||
{"label":"\u2192", "x":15, "y":4}
|
||||
]
|
||||
}
|
||||
},
|
||||
"LAYOUT_65_ansi_blocker_splitbs": {
|
||||
"layout": [
|
||||
{"label":"Esc", "x":0, "y":0},
|
||||
@ -689,7 +689,7 @@
|
||||
{"label":"\u2193", "x":14, "y":4},
|
||||
{"label":"\u2192", "x":15, "y":4}
|
||||
]
|
||||
}
|
||||
},
|
||||
"LAYOUT_65_iso_blocker": {
|
||||
"layout": [
|
||||
{"label":"Esc", "x":0, "y":0},
|
||||
@ -765,7 +765,7 @@
|
||||
{"label":"\u2193", "x":14, "y":4},
|
||||
{"label":"\u2192", "x":15, "y":4}
|
||||
]
|
||||
}
|
||||
},
|
||||
"LAYOUT_65_iso_blocker_splitbs": {
|
||||
"layout": [
|
||||
{"label":"Esc", "x":0, "y":0},
|
||||
@ -842,7 +842,7 @@
|
||||
{"label":"\u2193", "x":14, "y":4},
|
||||
{"label":"\u2192", "x":15, "y":4}
|
||||
]
|
||||
}
|
||||
},
|
||||
"LAYOUT_65_all_7u_noblocker": {
|
||||
"layout": [
|
||||
{"label":"Esc", "x":0, "y":0},
|
||||
@ -918,7 +918,7 @@
|
||||
{"label":"\u2193", "x":14, "y":4},
|
||||
{"label":"\u2192", "x":15, "y":4}
|
||||
]
|
||||
}
|
||||
},
|
||||
"LAYOUT_65_ansi_7u_noblocker": {
|
||||
"layout": [
|
||||
{"label":"Esc", "x":0, "y":0},
|
||||
@ -992,7 +992,7 @@
|
||||
{"label":"\u2193", "x":14, "y":4},
|
||||
{"label":"\u2192", "x":15, "y":4}
|
||||
]
|
||||
}
|
||||
},
|
||||
"LAYOUT_65_ansi_7u_noblocker_splitbs": {
|
||||
"layout": [
|
||||
{"label":"Esc", "x":0, "y":0},
|
||||
@ -1067,7 +1067,7 @@
|
||||
{"label":"\u2193", "x":14, "y":4},
|
||||
{"label":"\u2192", "x":15, "y":4}
|
||||
]
|
||||
}
|
||||
},
|
||||
"LAYOUT_65_iso_7u_noblocker": {
|
||||
"layout": [
|
||||
{"label":"Esc", "x":0, "y":0},
|
||||
@ -1142,7 +1142,7 @@
|
||||
{"label":"\u2193", "x":14, "y":4},
|
||||
{"label":"\u2192", "x":15, "y":4}
|
||||
]
|
||||
}
|
||||
},
|
||||
"LAYOUT_65_iso_7u_noblocker_splitbs": {
|
||||
"layout": [
|
||||
{"label":"Esc", "x":0, "y":0},
|
||||
@ -1218,7 +1218,7 @@
|
||||
{"label":"\u2193", "x":14, "y":4},
|
||||
{"label":"\u2192", "x":15, "y":4}
|
||||
]
|
||||
}
|
||||
},
|
||||
"LAYOUT_65_all_7u_wk": {
|
||||
"layout": [
|
||||
{"label":"Esc", "x":0, "y":0},
|
||||
@ -1294,7 +1294,7 @@
|
||||
{"label":"\u2193", "x":14, "y":4},
|
||||
{"label":"\u2192", "x":15, "y":4}
|
||||
]
|
||||
}
|
||||
},
|
||||
"LAYOUT_65_ansi_7u_wk": {
|
||||
"layout": [
|
||||
{"label":"Esc", "x":0, "y":0},
|
||||
@ -1368,7 +1368,7 @@
|
||||
{"label":"\u2193", "x":14, "y":4},
|
||||
{"label":"\u2192", "x":15, "y":4}
|
||||
]
|
||||
}
|
||||
},
|
||||
"LAYOUT_65_ansi_7u_wk_splitbs": {
|
||||
"layout": [
|
||||
{"label":"Esc", "x":0, "y":0},
|
||||
@ -1443,7 +1443,7 @@
|
||||
{"label":"\u2193", "x":14, "y":4},
|
||||
{"label":"\u2192", "x":15, "y":4}
|
||||
]
|
||||
}
|
||||
},
|
||||
"LAYOUT_65_iso_7u_wk": {
|
||||
"layout": [
|
||||
{"label":"Esc", "x":0, "y":0},
|
||||
@ -1518,7 +1518,7 @@
|
||||
{"label":"\u2193", "x":14, "y":4},
|
||||
{"label":"\u2192", "x":15, "y":4}
|
||||
]
|
||||
}
|
||||
},
|
||||
"LAYOUT_65_iso_7u_wk_splitbs": {
|
||||
"layout": [
|
||||
{"label":"Esc", "x":0, "y":0},
|
||||
@ -1594,7 +1594,7 @@
|
||||
{"label":"\u2193", "x":14, "y":4},
|
||||
{"label":"\u2192", "x":15, "y":4}
|
||||
]
|
||||
}
|
||||
},
|
||||
"LAYOUT_65_all_7u_wkl": {
|
||||
"layout": [
|
||||
{"label":"Esc", "x":0, "y":0},
|
||||
@ -1669,7 +1669,7 @@
|
||||
{"label":"\u2193", "x":14, "y":4},
|
||||
{"label":"\u2192", "x":15, "y":4}
|
||||
]
|
||||
}
|
||||
},
|
||||
"LAYOUT_65_ansi_7u_wkl": {
|
||||
"layout": [
|
||||
{"label":"Esc", "x":0, "y":0},
|
||||
@ -1742,7 +1742,7 @@
|
||||
{"label":"\u2193", "x":14, "y":4},
|
||||
{"label":"\u2192", "x":15, "y":4}
|
||||
]
|
||||
}
|
||||
},
|
||||
"LAYOUT_65_ansi_7u_wkl_splitbs": {
|
||||
"layout": [
|
||||
{"label":"Esc", "x":0, "y":0},
|
||||
@ -1816,7 +1816,7 @@
|
||||
{"label":"\u2193", "x":14, "y":4},
|
||||
{"label":"\u2192", "x":15, "y":4}
|
||||
]
|
||||
}
|
||||
},
|
||||
"LAYOUT_65_iso_7u_wkl": {
|
||||
"layout": [
|
||||
{"label":"Esc", "x":0, "y":0},
|
||||
@ -1890,7 +1890,7 @@
|
||||
{"label":"\u2193", "x":14, "y":4},
|
||||
{"label":"\u2192", "x":15, "y":4}
|
||||
]
|
||||
}
|
||||
},
|
||||
"LAYOUT_65_iso_7u_wkl_splitbs": {
|
||||
"layout": [
|
||||
{"label":"Esc", "x":0, "y":0},
|
||||
@ -1965,7 +1965,7 @@
|
||||
{"label":"\u2193", "x":14, "y":4},
|
||||
{"label":"\u2192", "x":15, "y":4}
|
||||
]
|
||||
}
|
||||
},
|
||||
"LAYOUT_65_all_7u_hhkb": {
|
||||
"layout": [
|
||||
{"label":"Esc", "x":0, "y":0},
|
||||
@ -2041,7 +2041,7 @@
|
||||
{"label":"\u2193", "x":14, "y":4},
|
||||
{"label":"\u2192", "x":15, "y":4}
|
||||
]
|
||||
}
|
||||
},
|
||||
"LAYOUT_65_ansi_7u_hhkb": {
|
||||
"layout": [
|
||||
{"label":"Esc", "x":0, "y":0},
|
||||
@ -2115,7 +2115,7 @@
|
||||
{"label":"\u2193", "x":14, "y":4},
|
||||
{"label":"\u2192", "x":15, "y":4}
|
||||
]
|
||||
}
|
||||
},
|
||||
"LAYOUT_65_ansi_7u_hhkb_splitbs": {
|
||||
"layout": [
|
||||
{"label":"Esc", "x":0, "y":0},
|
||||
@ -2190,7 +2190,7 @@
|
||||
{"label":"\u2193", "x":14, "y":4},
|
||||
{"label":"\u2192", "x":15, "y":4}
|
||||
]
|
||||
}
|
||||
},
|
||||
"LAYOUT_65_iso_7u_hhkb": {
|
||||
"layout": [
|
||||
{"label":"Esc", "x":0, "y":0},
|
||||
@ -2265,7 +2265,7 @@
|
||||
{"label":"\u2193", "x":14, "y":4},
|
||||
{"label":"\u2192", "x":15, "y":4}
|
||||
]
|
||||
}
|
||||
},
|
||||
"LAYOUT_65_iso_7u_hhkb_splitbs": {
|
||||
"layout": [
|
||||
{"label":"Esc", "x":0, "y":0},
|
||||
|
@ -73,7 +73,7 @@
|
||||
{"label":"Win", "x":12.5, "y":4, "w":1.25},
|
||||
{"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
|
||||
]
|
||||
}
|
||||
},
|
||||
"LAYOUT_60_ansi": {
|
||||
"layout": [
|
||||
{"label":"Esc", "x":0, "y":0},
|
||||
@ -142,7 +142,7 @@
|
||||
{"label":"Win", "x":12.5, "y":4, "w":1.25},
|
||||
{"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
|
||||
]
|
||||
}
|
||||
},
|
||||
"LAYOUT_60_ansi_tsangan": {
|
||||
"layout": [
|
||||
{"label":"Esc", "x":0, "y":0},
|
||||
@ -210,7 +210,7 @@
|
||||
{"label":"Win", "x":12.5, "y":4},
|
||||
{"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
|
||||
]
|
||||
}
|
||||
},
|
||||
"LAYOUT_60_tsangan_hhkb": {
|
||||
"layout": [
|
||||
{"label":"Esc", "x":0, "y":0},
|
||||
|
@ -6,7 +6,7 @@
|
||||
"vid": "0xFEED",
|
||||
"pid": "0x4B4E"
|
||||
},
|
||||
"manufacturer": "Quartz64"
|
||||
"manufacturer": "Quartz64",
|
||||
"diode_direction": "COL2ROW",
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
||||
|
@ -6,8 +6,8 @@
|
||||
"LAYOUT": {
|
||||
"layout": [
|
||||
{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":5, "y":0}, {"label":"U", "x":6, "y":0}, {"label":"I", "x":7, "y":0}, {"label":"O", "x":8, "y":0}, {"label":"P", "x":9, "y":0}, {"label":"7", "x":10, "y":0}, {"label":"8", "x":11, "y":0}, {"label":"9", "x":12, "y":0}, {"label":"Mute", "x":13, "y":0},
|
||||
{"label":"A", "x":0, "y":1}, {"label":"S", "x":1, "y":1}, {"label":"D", "x":2, "y":1}, {"label":"F", "x":3, "y":1}, {"label":"G", "x":4, "y":1}, {"label":"H", "x":5, "y":1}, {"label":"J", "x":6, "y":1}, {"label":"K", "x":7, "y":1}, {"label":"L", "x":8, "y":1}, {"label":"ESC", "x":9, "y":1}, {"label":"4", "x":10, "y":1}, {"label":"5", "x":11, "y":1}, {"label":"6", "x":12, "y":1}, {"label":"0", "x":13, "y":1,},
|
||||
{"label":"Z", "x":0, "y":2}, {"label":"X", "x":1, "y":2}, {"label":"C", "x":2, "y":2}, {"label":"V", "x":3, "y":2}, {"label":"BS", "x":4, "y":2}, {"label":"", "x":5, "y":2}, {"label":"B", "x":6, "y":2}, {"label":"N", "x":7, "y":2}, {"label":"M", "x":8, "y":2}, {"label":"ENT", "x":9, "y":2}, {"label":"1", "x":10, "y":2}, {"label":"2", "x":11, "y":2}, {"label":"3", "x":12, "y":2}, {"label":"EQL", "x":13, "y":2,}
|
||||
{"label":"A", "x":0, "y":1}, {"label":"S", "x":1, "y":1}, {"label":"D", "x":2, "y":1}, {"label":"F", "x":3, "y":1}, {"label":"G", "x":4, "y":1}, {"label":"H", "x":5, "y":1}, {"label":"J", "x":6, "y":1}, {"label":"K", "x":7, "y":1}, {"label":"L", "x":8, "y":1}, {"label":"ESC", "x":9, "y":1}, {"label":"4", "x":10, "y":1}, {"label":"5", "x":11, "y":1}, {"label":"6", "x":12, "y":1}, {"label":"0", "x":13, "y":1},
|
||||
{"label":"Z", "x":0, "y":2}, {"label":"X", "x":1, "y":2}, {"label":"C", "x":2, "y":2}, {"label":"V", "x":3, "y":2}, {"label":"BS", "x":4, "y":2}, {"label":"", "x":5, "y":2}, {"label":"B", "x":6, "y":2}, {"label":"N", "x":7, "y":2}, {"label":"M", "x":8, "y":2}, {"label":"ENT", "x":9, "y":2}, {"label":"1", "x":10, "y":2}, {"label":"2", "x":11, "y":2}, {"label":"3", "x":12, "y":2}, {"label":"EQL", "x":13, "y":2}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
@ -92,7 +92,7 @@
|
||||
{"label":"Fn", "x":11.25, "y":5.25, "w":1.25},
|
||||
{"label":"\u2190", "x":13.25, "y":5.5},
|
||||
{"label":"\u2193", "x":14.25, "y":5.5},
|
||||
{"label":"\u2192", "x":15.25, "y":5.5},
|
||||
{"label":"\u2192", "x":15.25, "y":5.5}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
@ -652,7 +652,7 @@
|
||||
{"x": 15, "y": 4},
|
||||
{"x": 16, "y": 4},
|
||||
{"x": 17, "y": 4},
|
||||
{"x": 18, "y": 4, "h": 2}
|
||||
{"x": 18, "y": 4, "h": 2},
|
||||
|
||||
{"x": 0, "y": 5, "w": 1.25},
|
||||
{"x": 1.25, "y": 5, "w": 1.25},
|
||||
@ -663,7 +663,7 @@
|
||||
{"x": 12.5, "y": 5, "w": 1.25},
|
||||
{"x": 13.75, "y": 5, "w": 1.25},
|
||||
{"x": 15, "y": 5, "w": 2},
|
||||
{"x": 17, "y": 5},
|
||||
{"x": 17, "y": 5}
|
||||
]
|
||||
},
|
||||
"LAYOUT_96_with60_splitbs": {
|
||||
@ -759,7 +759,7 @@
|
||||
{"x": 15, "y": 4},
|
||||
{"x": 16, "y": 4},
|
||||
{"x": 17, "y": 4},
|
||||
{"x": 18, "y": 4, "h": 2}
|
||||
{"x": 18, "y": 4, "h": 2},
|
||||
|
||||
{"x": 0, "y": 5, "w": 1.25},
|
||||
{"x": 1.25, "y": 5, "w": 1.25},
|
||||
@ -770,7 +770,7 @@
|
||||
{"x": 12.5, "y": 5, "w": 1.25},
|
||||
{"x": 13.75, "y": 5, "w": 1.25},
|
||||
{"x": 15, "y": 5, "w": 2},
|
||||
{"x": 17, "y": 5},
|
||||
{"x": 17, "y": 5}
|
||||
]
|
||||
},
|
||||
"LAYOUT_96_with60_split_num0": {
|
||||
|
Loading…
Reference in New Issue
Block a user