Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2022-06-22 16:41:19 +00:00
commit 2e27eb318e
4 changed files with 391 additions and 352 deletions

View file

@ -20,6 +20,23 @@
#define ___ KC_NO #define ___ KC_NO
/*
*
* 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 48 0E 0D 2u Backspace
*
* 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
* 2.25u 2C ISO Enter
* LShift 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 1D
*
* 30 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
*
* 40 41 42 46 4A 4B 4C 4D 4E
*
*
* 40 41 42 46 4A 4C 4D 4E Tsangan
*
*/
#define LAYOUT_all( \ #define LAYOUT_all( \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k48, k0E, \ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k48, k0E, \
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
@ -64,8 +81,8 @@
#define LAYOUT_65_iso_blocker( \ #define LAYOUT_65_iso_blocker( \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k2C, k1E, \ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1E, \
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k1D, k2D, \ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k1D, k2C, k2D, \
k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
k40, k41, k42, k46, k4A, k4B, k4C, k4D, k4E \ k40, k41, k42, k46, k4A, k4B, k4C, k4D, k4E \
) { \ ) { \
@ -78,8 +95,8 @@
#define LAYOUT_65_iso_blocker_tsangan( \ #define LAYOUT_65_iso_blocker_tsangan( \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k2C, k1E, \ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1E, \
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k1D, k2D, \ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k1D, k2C, k2D, \
k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
k40, k41, k42, k46, k4A, k4C, k4D, k4E \ k40, k41, k42, k46, k4A, k4C, k4D, k4E \
) { \ ) { \

View file

@ -5,359 +5,379 @@
"layouts": { "layouts": {
"LAYOUT_all": { "LAYOUT_all": {
"layout": [ "layout": [
{"x":0, "y":0}, {"label":"Esc", "x":0, "y":0},
{"x":1, "y":0}, {"label":"1!", "x":1, "y":0},
{"x":2, "y":0}, {"label":"2@", "x":2, "y":0},
{"x":3, "y":0}, {"label":"3#", "x":3, "y":0},
{"x":4, "y":0}, {"label":"4$", "x":4, "y":0},
{"x":5, "y":0}, {"label":"5%", "x":5, "y":0},
{"x":6, "y":0}, {"label":"6^", "x":6, "y":0},
{"x":7, "y":0}, {"label":"7&", "x":7, "y":0},
{"x":8, "y":0}, {"label":"8*", "x":8, "y":0},
{"x":9, "y":0}, {"label":"9(", "x":9, "y":0},
{"x":10, "y":0}, {"label":"0)", "x":10, "y":0},
{"x":11, "y":0}, {"label":"-_", "x":11, "y":0},
{"x":12, "y":0}, {"label":"=+", "x":12, "y":0},
{"x":13, "y":0}, {"label":"Backspace", "x":13, "y":0},
{"x":14, "y":0}, {"label":"Backspace", "x":14, "y":0},
{"x":15, "y":0}, {"label":"Delete", "x":15, "y":0},
{"x":0, "y":1, "w":1.5},
{"x":1.5, "y":1}, {"label":"Tab", "x":0, "y":1, "w":1.5},
{"x":2.5, "y":1}, {"label":"Q", "x":1.5, "y":1},
{"x":3.5, "y":1}, {"label":"W", "x":2.5, "y":1},
{"x":4.5, "y":1}, {"label":"E", "x":3.5, "y":1},
{"x":5.5, "y":1}, {"label":"R", "x":4.5, "y":1},
{"x":6.5, "y":1}, {"label":"T", "x":5.5, "y":1},
{"x":7.5, "y":1}, {"label":"Y", "x":6.5, "y":1},
{"x":8.5, "y":1}, {"label":"U", "x":7.5, "y":1},
{"x":9.5, "y":1}, {"label":"I", "x":8.5, "y":1},
{"x":10.5, "y":1}, {"label":"O", "x":9.5, "y":1},
{"x":11.5, "y":1}, {"label":"P", "x":10.5, "y":1},
{"x":12.5, "y":1}, {"label":"[{", "x":11.5, "y":1},
{"x":13.5, "y":1, "w":1.5}, {"label":"]}", "x":12.5, "y":1},
{"x":15, "y":1}, {"label":"\\|", "x":13.5, "y":1, "w":1.5},
{"x":0, "y":2, "w":1.75}, {"label":"End", "x":15, "y":1},
{"x":1.75, "y":2},
{"x":2.75, "y":2}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
{"x":3.75, "y":2}, {"label":"A", "x":1.75, "y":2},
{"x":4.75, "y":2}, {"label":"S", "x":2.75, "y":2},
{"x":5.75, "y":2}, {"label":"D", "x":3.75, "y":2},
{"x":6.75, "y":2}, {"label":"F", "x":4.75, "y":2},
{"x":7.75, "y":2}, {"label":"G", "x":5.75, "y":2},
{"x":8.75, "y":2}, {"label":"H", "x":6.75, "y":2},
{"x":9.75, "y":2}, {"label":"J", "x":7.75, "y":2},
{"x":10.75, "y":2}, {"label":"K", "x":8.75, "y":2},
{"x":11.75, "y":2}, {"label":"L", "x":9.75, "y":2},
{"x":12.75, "y":2, "w":2.25}, {"label":";:", "x":10.75, "y":2},
{"x":15, "y":2}, {"label":"'\"", "x":11.75, "y":2},
{"x":0, "y":3, "w":1.25}, {"label":"Enter", "x":12.75, "y":2, "w":2.25},
{"x":1.25, "y":3}, {"label":"Page Up", "x":15, "y":2},
{"x":2.25, "y":3},
{"x":3.25, "y":3}, {"label":"Shift", "x":0, "y":3, "w":1.25},
{"x":4.25, "y":3}, {"label":"\\|", "x":1.25, "y":3},
{"x":5.25, "y":3}, {"label":"Z", "x":2.25, "y":3},
{"x":6.25, "y":3}, {"label":"X", "x":3.25, "y":3},
{"x":7.25, "y":3}, {"label":"C", "x":4.25, "y":3},
{"x":8.25, "y":3}, {"label":"V", "x":5.25, "y":3},
{"x":9.25, "y":3}, {"label":"B", "x":6.25, "y":3},
{"x":10.25, "y":3}, {"label":"N", "x":7.25, "y":3},
{"x":11.25, "y":3}, {"label":"M", "x":8.25, "y":3},
{"x":12.25, "y":3, "w":1.75}, {"label":",<", "x":9.25, "y":3},
{"x":14, "y":3}, {"label":".>", "x":10.25, "y":3},
{"x":15, "y":3}, {"label":"/?", "x":11.25, "y":3},
{"x":0, "y":4, "w":1.25}, {"label":"Shift", "x":12.25, "y":3, "w":1.75},
{"x":1.25, "y":4, "w":1.25}, {"label":"\u2191", "x":14, "y":3},
{"x":2.5, "y":4, "w":1.25}, {"label":"Page Down", "x":15, "y":3},
{"x":3.75, "y":4, "w":6.25},
{"x":10, "y":4, "w":1.25}, {"label":"Ctrl", "x":0, "y":4, "w":1.25},
{"x":11.25, "y":4, "w":1.25}, {"label":"GUI", "x":1.25, "y":4, "w":1.25},
{"x":13, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.25},
{"x":14, "y":4}, {"label":"Space", "x":3.75, "y":4, "w":6.25},
{"x":15, "y":4} {"label":"Alt", "x":10, "y":4, "w":1.25},
{"label":"Fn", "x":11.25, "y":4, "w":1.25},
{"label":"\u2190", "x":13, "y":4},
{"label":"\u2193", "x":14, "y":4},
{"label":"\u2192" "x":15, "y":4}
] ]
}, },
"LAYOUT_65_ansi_blocker": { "LAYOUT_65_ansi_blocker": {
"layout": [ "layout": [
{"x":0, "y":0}, {"label":"Esc", "x":0, "y":0},
{"x":1, "y":0}, {"label":"1!", "x":1, "y":0},
{"x":2, "y":0}, {"label":"2@", "x":2, "y":0},
{"x":3, "y":0}, {"label":"3#", "x":3, "y":0},
{"x":4, "y":0}, {"label":"4$", "x":4, "y":0},
{"x":5, "y":0}, {"label":"5%", "x":5, "y":0},
{"x":6, "y":0}, {"label":"6^", "x":6, "y":0},
{"x":7, "y":0}, {"label":"7&", "x":7, "y":0},
{"x":8, "y":0}, {"label":"8*", "x":8, "y":0},
{"x":9, "y":0}, {"label":"9(", "x":9, "y":0},
{"x":10, "y":0}, {"label":"0)", "x":10, "y":0},
{"x":11, "y":0}, {"label":"-_", "x":11, "y":0},
{"x":12, "y":0}, {"label":"=+", "x":12, "y":0},
{"x":13, "y":0, "w":2}, {"label":"Backspace", "x":13, "y":0, "w":2},
{"x":15, "y":0}, {"label":"Delete", "x":15, "y":0},
{"x":0, "y":1, "w":1.5},
{"x":1.5, "y":1}, {"label":"Tab", "x":0, "y":1, "w":1.5},
{"x":2.5, "y":1}, {"label":"Q", "x":1.5, "y":1},
{"x":3.5, "y":1}, {"label":"W", "x":2.5, "y":1},
{"x":4.5, "y":1}, {"label":"E", "x":3.5, "y":1},
{"x":5.5, "y":1}, {"label":"R", "x":4.5, "y":1},
{"x":6.5, "y":1}, {"label":"T", "x":5.5, "y":1},
{"x":7.5, "y":1}, {"label":"Y", "x":6.5, "y":1},
{"x":8.5, "y":1}, {"label":"U", "x":7.5, "y":1},
{"x":9.5, "y":1}, {"label":"I", "x":8.5, "y":1},
{"x":10.5, "y":1}, {"label":"O", "x":9.5, "y":1},
{"x":11.5, "y":1}, {"label":"P", "x":10.5, "y":1},
{"x":12.5, "y":1}, {"label":"[{", "x":11.5, "y":1},
{"x":13.5, "y":1, "w":1.5}, {"label":"]}", "x":12.5, "y":1},
{"x":15, "y":1}, {"label":"\\|", "x":13.5, "y":1, "w":1.5},
{"x":0, "y":2, "w":1.75}, {"label":"End", "x":15, "y":1},
{"x":1.75, "y":2},
{"x":2.75, "y":2}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
{"x":3.75, "y":2}, {"label":"A", "x":1.75, "y":2},
{"x":4.75, "y":2}, {"label":"S", "x":2.75, "y":2},
{"x":5.75, "y":2}, {"label":"D", "x":3.75, "y":2},
{"x":6.75, "y":2}, {"label":"F", "x":4.75, "y":2},
{"x":7.75, "y":2}, {"label":"G", "x":5.75, "y":2},
{"x":8.75, "y":2}, {"label":"H", "x":6.75, "y":2},
{"x":9.75, "y":2}, {"label":"J", "x":7.75, "y":2},
{"x":10.75, "y":2}, {"label":"K", "x":8.75, "y":2},
{"x":11.75, "y":2}, {"label":"L", "x":9.75, "y":2},
{"x":12.75, "y":2, "w":2.25}, {"label":";:", "x":10.75, "y":2},
{"x":15, "y":2}, {"label":"'\"", "x":11.75, "y":2},
{"x":0, "y":3, "w":2.25}, {"label":"Enter", "x":12.75, "y":2, "w":2.25},
{"x":2.25, "y":3}, {"label":"Page Up", "x":15, "y":2},
{"x":3.25, "y":3},
{"x":4.25, "y":3}, {"label":"Shift", "x":0, "y":3, "w":2.25},
{"x":5.25, "y":3}, {"label":"Z", "x":2.25, "y":3},
{"x":6.25, "y":3}, {"label":"X", "x":3.25, "y":3},
{"x":7.25, "y":3}, {"label":"C", "x":4.25, "y":3},
{"x":8.25, "y":3}, {"label":"V", "x":5.25, "y":3},
{"x":9.25, "y":3}, {"label":"B", "x":6.25, "y":3},
{"x":10.25, "y":3}, {"label":"N", "x":7.25, "y":3},
{"x":11.25, "y":3}, {"label":"M", "x":8.25, "y":3},
{"x":12.25, "y":3, "w":1.75}, {"label":",<", "x":9.25, "y":3},
{"x":14, "y":3}, {"label":".>", "x":10.25, "y":3},
{"x":15, "y":3}, {"label":"/?", "x":11.25, "y":3},
{"x":0, "y":4, "w":1.25}, {"label":"Shift", "x":12.25, "y":3, "w":1.75},
{"x":1.25, "y":4, "w":1.25}, {"label":"\u2191", "x":14, "y":3},
{"x":2.5, "y":4, "w":1.25}, {"label":"Page Down", "x":15, "y":3},
{"x":3.75, "y":4, "w":6.25},
{"x":10, "y":4, "w":1.25}, {"label":"Ctrl", "x":0, "y":4, "w":1.25},
{"x":11.25, "y":4, "w":1.25}, {"label":"GUI", "x":1.25, "y":4, "w":1.25},
{"x":13, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.25},
{"x":14, "y":4}, {"label":"Space", "x":3.75, "y":4, "w":6.25},
{"x":15, "y":4} {"label":"Alt", "x":10, "y":4, "w":1.25},
{"label":"Fn", "x":11.25, "y":4, "w":1.25},
{"label":"\u2190", "x":13, "y":4},
{"label":"\u2193", "x":14, "y":4},
{"label":"\u2192" "x":15, "y":4}
] ]
}, },
"LAYOUT_65_ansi_blocker_tsangan": { "LAYOUT_65_ansi_blocker_tsangan": {
"layout": [ "layout": [
{"x":0, "y":0}, {"label":"Esc", "x":0, "y":0},
{"x":1, "y":0}, {"label":"1!", "x":1, "y":0},
{"x":2, "y":0}, {"label":"2@", "x":2, "y":0},
{"x":3, "y":0}, {"label":"3#", "x":3, "y":0},
{"x":4, "y":0}, {"label":"4$", "x":4, "y":0},
{"x":5, "y":0}, {"label":"5%", "x":5, "y":0},
{"x":6, "y":0}, {"label":"6^", "x":6, "y":0},
{"x":7, "y":0}, {"label":"7&", "x":7, "y":0},
{"x":8, "y":0}, {"label":"8*", "x":8, "y":0},
{"x":9, "y":0}, {"label":"9(", "x":9, "y":0},
{"x":10, "y":0}, {"label":"0)", "x":10, "y":0},
{"x":11, "y":0}, {"label":"-_", "x":11, "y":0},
{"x":12, "y":0}, {"label":"=+", "x":12, "y":0},
{"x":13, "y":0, "w":2}, {"label":"Backspace", "x":13, "y":0, "w":2},
{"x":15, "y":0}, {"label":"Delete", "x":15, "y":0},
{"x":0, "y":1, "w":1.5},
{"x":1.5, "y":1}, {"label":"Tab", "x":0, "y":1, "w":1.5},
{"x":2.5, "y":1}, {"label":"Q", "x":1.5, "y":1},
{"x":3.5, "y":1}, {"label":"W", "x":2.5, "y":1},
{"x":4.5, "y":1}, {"label":"E", "x":3.5, "y":1},
{"x":5.5, "y":1}, {"label":"R", "x":4.5, "y":1},
{"x":6.5, "y":1}, {"label":"T", "x":5.5, "y":1},
{"x":7.5, "y":1}, {"label":"Y", "x":6.5, "y":1},
{"x":8.5, "y":1}, {"label":"U", "x":7.5, "y":1},
{"x":9.5, "y":1}, {"label":"I", "x":8.5, "y":1},
{"x":10.5, "y":1}, {"label":"O", "x":9.5, "y":1},
{"x":11.5, "y":1}, {"label":"P", "x":10.5, "y":1},
{"x":12.5, "y":1}, {"label":"[{", "x":11.5, "y":1},
{"x":13.5, "y":1, "w":1.5}, {"label":"]}", "x":12.5, "y":1},
{"x":15, "y":1}, {"label":"\\|", "x":13.5, "y":1, "w":1.5},
{"x":0, "y":2, "w":1.75}, {"label":"End", "x":15, "y":1},
{"x":1.75, "y":2},
{"x":2.75, "y":2}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
{"x":3.75, "y":2}, {"label":"A", "x":1.75, "y":2},
{"x":4.75, "y":2}, {"label":"S", "x":2.75, "y":2},
{"x":5.75, "y":2}, {"label":"D", "x":3.75, "y":2},
{"x":6.75, "y":2}, {"label":"F", "x":4.75, "y":2},
{"x":7.75, "y":2}, {"label":"G", "x":5.75, "y":2},
{"x":8.75, "y":2}, {"label":"H", "x":6.75, "y":2},
{"x":9.75, "y":2}, {"label":"J", "x":7.75, "y":2},
{"x":10.75, "y":2}, {"label":"K", "x":8.75, "y":2},
{"x":11.75, "y":2}, {"label":"L", "x":9.75, "y":2},
{"x":12.75, "y":2, "w":2.25}, {"label":";:", "x":10.75, "y":2},
{"x":15, "y":2}, {"label":"'\"", "x":11.75, "y":2},
{"x":0, "y":3, "w":2.25}, {"label":"Enter", "x":12.75, "y":2, "w":2.25},
{"x":2.25, "y":3}, {"label":"Page Up", "x":15, "y":2},
{"x":3.25, "y":3},
{"x":4.25, "y":3}, {"label":"Shift", "x":0, "y":3, "w":2.25},
{"x":5.25, "y":3}, {"label":"Z", "x":2.25, "y":3},
{"x":6.25, "y":3}, {"label":"X", "x":3.25, "y":3},
{"x":7.25, "y":3}, {"label":"C", "x":4.25, "y":3},
{"x":8.25, "y":3}, {"label":"V", "x":5.25, "y":3},
{"x":9.25, "y":3}, {"label":"B", "x":6.25, "y":3},
{"x":10.25, "y":3}, {"label":"N", "x":7.25, "y":3},
{"x":11.25, "y":3}, {"label":"M", "x":8.25, "y":3},
{"x":12.25, "y":3, "w":1.75}, {"label":",<", "x":9.25, "y":3},
{"x":14, "y":3}, {"label":".>", "x":10.25, "y":3},
{"x":15, "y":3}, {"label":"/?", "x":11.25, "y":3},
{"x":0, "y":4, "w":1.5}, {"label":"Shift", "x":12.25, "y":3, "w":1.75},
{"x":1.5, "y":4}, {"label":"\u2191", "x":14, "y":3},
{"x":2.5, "y":4, "w":1.5}, {"label":"Page Down", "x":15, "y":3},
{"x":4, "y":4, "w":7},
{"x":11, "y":4, "w":1.5}, {"label":"Ctrl", "x":0, "y":4, "w":1.5},
{"x":13, "y":4}, {"label":"GUI", "x":1.5, "y":4},
{"x":14, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5},
{"x":15, "y":4} {"label":"Space", "x":4, "y":4, "w":7},
{"label":"Fn", "x":11, "y":4, "w":1.5},
{"label":"\u2190", "x":13, "y":4},
{"label":"\u2193", "x":14, "y":4},
{"label":"\u2192" "x":15, "y":4}
] ]
}, },
"LAYOUT_65_iso_blocker": { "LAYOUT_65_iso_blocker": {
"layout": [ "layout": [
{"x":0, "y":0}, {"label":"Esc", "x":0, "y":0},
{"x":1, "y":0}, {"label":"1!", "x":1, "y":0},
{"x":2, "y":0}, {"label":"2\"", "x":2, "y":0},
{"x":3, "y":0}, {"label":"3\u00a3", "x":3, "y":0},
{"x":4, "y":0}, {"label":"4$", "x":4, "y":0},
{"x":5, "y":0}, {"label":"5%", "x":5, "y":0},
{"x":6, "y":0}, {"label":"6^", "x":6, "y":0},
{"x":7, "y":0}, {"label":"7&", "x":7, "y":0},
{"x":8, "y":0}, {"label":"8*", "x":8, "y":0},
{"x":9, "y":0}, {"label":"9(", "x":9, "y":0},
{"x":10, "y":0}, {"label":"0)", "x":10, "y":0},
{"x":11, "y":0}, {"label":"-_", "x":11, "y":0},
{"x":12, "y":0}, {"label":"=+", "x":12, "y":0},
{"x":13, "y":0, "w":2}, {"label":"Backspace", "x":13, "y":0, "w":2},
{"x":15, "y":0}, {"label":"Delete", "x":15, "y":0},
{"x":0, "y":1, "w":1.5},
{"x":1.5, "y":1}, {"label":"Tab", "x":0, "y":1, "w":1.5},
{"x":2.5, "y":1}, {"label":"Q", "x":1.5, "y":1},
{"x":3.5, "y":1}, {"label":"W", "x":2.5, "y":1},
{"x":4.5, "y":1}, {"label":"E", "x":3.5, "y":1},
{"x":5.5, "y":1}, {"label":"R", "x":4.5, "y":1},
{"x":6.5, "y":1}, {"label":"T", "x":5.5, "y":1},
{"x":7.5, "y":1}, {"label":"Y", "x":6.5, "y":1},
{"x":8.5, "y":1}, {"label":"U", "x":7.5, "y":1},
{"x":9.5, "y":1}, {"label":"I", "x":8.5, "y":1},
{"x":10.5, "y":1}, {"label":"O", "x":9.5, "y":1},
{"x":11.5, "y":1}, {"label":"P", "x":10.5, "y":1},
{"x":12.5, "y":1}, {"label":"[{", "x":11.5, "y":1},
{"x":13.75, "y":1, "w":1.25, "h":2}, {"label":"]}", "x":12.5, "y":1},
{"x":15, "y":1}, {"label":"End", "x":15, "y":1},
{"x":0, "y":2, "w":1.75},
{"x":1.75, "y":2}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
{"x":2.75, "y":2}, {"label":"A", "x":1.75, "y":2},
{"x":3.75, "y":2}, {"label":"S", "x":2.75, "y":2},
{"x":4.75, "y":2}, {"label":"D", "x":3.75, "y":2},
{"x":5.75, "y":2}, {"label":"F", "x":4.75, "y":2},
{"x":6.75, "y":2}, {"label":"G", "x":5.75, "y":2},
{"x":7.75, "y":2}, {"label":"H", "x":6.75, "y":2},
{"x":8.75, "y":2}, {"label":"J", "x":7.75, "y":2},
{"x":9.75, "y":2}, {"label":"K", "x":8.75, "y":2},
{"x":10.75, "y":2}, {"label":"L", "x":9.75, "y":2},
{"x":11.75, "y":2}, {"label":";:", "x":10.75, "y":2},
{"x":12.75, "y":2}, {"label":"'@", "x":11.75, "y":2},
{"x":15, "y":2}, {"label":"#~", "x":12.75, "y":2},
{"x":0, "y":3, "w":1.25}, {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
{"x":1.25, "y":3}, {"label":"Page Up", "x":15, "y":2},
{"x":2.25, "y":3},
{"x":3.25, "y":3}, {"label":"Shift", "x":0, "y":3, "w":1.25},
{"x":4.25, "y":3}, {"label":"\\|", "x":1.25, "y":3},
{"x":5.25, "y":3}, {"label":"Z", "x":2.25, "y":3},
{"x":6.25, "y":3}, {"label":"X", "x":3.25, "y":3},
{"x":7.25, "y":3}, {"label":"C", "x":4.25, "y":3},
{"x":8.25, "y":3}, {"label":"V", "x":5.25, "y":3},
{"x":9.25, "y":3}, {"label":"B", "x":6.25, "y":3},
{"x":10.25, "y":3}, {"label":"N", "x":7.25, "y":3},
{"x":11.25, "y":3}, {"label":"M", "x":8.25, "y":3},
{"x":12.25, "y":3, "w":1.75}, {"label":",<", "x":9.25, "y":3},
{"x":14, "y":3}, {"label":".>", "x":10.25, "y":3},
{"x":15, "y":3}, {"label":"/?", "x":11.25, "y":3},
{"x":0, "y":4, "w":1.25}, {"label":"Shift", "x":12.25, "y":3, "w":1.75},
{"x":1.25, "y":4, "w":1.25}, {"label":"\u2191", "x":14, "y":3},
{"x":2.5, "y":4, "w":1.25}, {"label":"Page Down", "x":15, "y":3},
{"x":3.75, "y":4, "w":6.25},
{"x":10, "y":4, "w":1.25}, {"label":"Ctrl", "x":0, "y":4, "w":1.25},
{"x":11.25, "y":4, "w":1.25}, {"label":"GUI", "x":1.25, "y":4, "w":1.25},
{"x":13, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.25},
{"x":14, "y":4}, {"label":"Space", "x":3.75, "y":4, "w":6.25},
{"x":15, "y":4} {"label":"Alt", "x":10, "y":4, "w":1.25},
{"label":"Fn", "x":11.25, "y":4, "w":1.25},
{"label":"\u2190", "x":13, "y":4},
{"label":"\u2193", "x":14, "y":4},
{"label":"\u2192" "x":15, "y":4}
] ]
}, },
"LAYOUT_65_iso_blocker_tsangan": { "LAYOUT_65_iso_blocker_tsangan": {
"layout": [ "layout": [
{"x":0, "y":0}, {"label":"Esc", "x":0, "y":0},
{"x":1, "y":0}, {"label":"1!", "x":1, "y":0},
{"x":2, "y":0}, {"label":"2\"", "x":2, "y":0},
{"x":3, "y":0}, {"label":"3\u00a3", "x":3, "y":0},
{"x":4, "y":0}, {"label":"4$", "x":4, "y":0},
{"x":5, "y":0}, {"label":"5%", "x":5, "y":0},
{"x":6, "y":0}, {"label":"6^", "x":6, "y":0},
{"x":7, "y":0}, {"label":"7&", "x":7, "y":0},
{"x":8, "y":0}, {"label":"8*", "x":8, "y":0},
{"x":9, "y":0}, {"label":"9(", "x":9, "y":0},
{"x":10, "y":0}, {"label":"0)", "x":10, "y":0},
{"x":11, "y":0}, {"label":"-_", "x":11, "y":0},
{"x":12, "y":0}, {"label":"=+", "x":12, "y":0},
{"x":13, "y":0, "w":2}, {"label":"Backspace", "x":13, "y":0, "w":2},
{"x":15, "y":0}, {"label":"Delete", "x":15, "y":0},
{"x":0, "y":1, "w":1.5},
{"x":1.5, "y":1}, {"label":"Tab", "x":0, "y":1, "w":1.5},
{"x":2.5, "y":1}, {"label":"Q", "x":1.5, "y":1},
{"x":3.5, "y":1}, {"label":"W", "x":2.5, "y":1},
{"x":4.5, "y":1}, {"label":"E", "x":3.5, "y":1},
{"x":5.5, "y":1}, {"label":"R", "x":4.5, "y":1},
{"x":6.5, "y":1}, {"label":"T", "x":5.5, "y":1},
{"x":7.5, "y":1}, {"label":"Y", "x":6.5, "y":1},
{"x":8.5, "y":1}, {"label":"U", "x":7.5, "y":1},
{"x":9.5, "y":1}, {"label":"I", "x":8.5, "y":1},
{"x":10.5, "y":1}, {"label":"O", "x":9.5, "y":1},
{"x":11.5, "y":1}, {"label":"P", "x":10.5, "y":1},
{"x":12.5, "y":1}, {"label":"[{", "x":11.5, "y":1},
{"x":13.75, "y":1, "w":1.25, "h":2}, {"label":"]}", "x":12.5, "y":1},
{"x":15, "y":1}, {"label":"End", "x":15, "y":1},
{"x":0, "y":2, "w":1.75},
{"x":1.75, "y":2}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
{"x":2.75, "y":2}, {"label":"A", "x":1.75, "y":2},
{"x":3.75, "y":2}, {"label":"S", "x":2.75, "y":2},
{"x":4.75, "y":2}, {"label":"D", "x":3.75, "y":2},
{"x":5.75, "y":2}, {"label":"F", "x":4.75, "y":2},
{"x":6.75, "y":2}, {"label":"G", "x":5.75, "y":2},
{"x":7.75, "y":2}, {"label":"H", "x":6.75, "y":2},
{"x":8.75, "y":2}, {"label":"J", "x":7.75, "y":2},
{"x":9.75, "y":2}, {"label":"K", "x":8.75, "y":2},
{"x":10.75, "y":2}, {"label":"L", "x":9.75, "y":2},
{"x":11.75, "y":2}, {"label":";:", "x":10.75, "y":2},
{"x":12.75, "y":2}, {"label":"'@", "x":11.75, "y":2},
{"x":15, "y":2}, {"label":"#~", "x":12.75, "y":2},
{"x":0, "y":3, "w":1.25}, {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
{"x":1.25, "y":3}, {"label":"Page Up", "x":15, "y":2},
{"x":2.25, "y":3},
{"x":3.25, "y":3}, {"label":"Shift", "x":0, "y":3, "w":1.25},
{"x":4.25, "y":3}, {"label":"\\|", "x":1.25, "y":3},
{"x":5.25, "y":3}, {"label":"Z", "x":2.25, "y":3},
{"x":6.25, "y":3}, {"label":"X", "x":3.25, "y":3},
{"x":7.25, "y":3}, {"label":"C", "x":4.25, "y":3},
{"x":8.25, "y":3}, {"label":"V", "x":5.25, "y":3},
{"x":9.25, "y":3}, {"label":"B", "x":6.25, "y":3},
{"x":10.25, "y":3}, {"label":"N", "x":7.25, "y":3},
{"x":11.25, "y":3}, {"label":"M", "x":8.25, "y":3},
{"x":12.25, "y":3, "w":1.75}, {"label":",<", "x":9.25, "y":3},
{"x":14, "y":3}, {"label":".>", "x":10.25, "y":3},
{"x":15, "y":3}, {"label":"/?", "x":11.25, "y":3},
{"x":0, "y":4, "w":1.5}, {"label":"Shift", "x":12.25, "y":3, "w":1.75},
{"x":1.5, "y":4}, {"label":"\u2191", "x":14, "y":3},
{"x":2.5, "y":4, "w":1.5}, {"label":"Page Down", "x":15, "y":3},
{"x":4, "y":4, "w":7},
{"x":11, "y":4, "w":1.5}, {"label":"Ctrl", "x":0, "y":4, "w":1.5},
{"x":13, "y":4}, {"label":"GUI", "x":1.5, "y":4},
{"x":14, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5},
{"x":15, "y":4} {"label":"Space", "x":4, "y":4, "w":7},
{"label":"Fn", "x":11, "y":4, "w":1.5},
{"label":"\u2190", "x":13, "y":4},
{"label":"\u2193", "x":14, "y":4},
{"label":"\u2192" "x":15, "y":4}
] ]
} }
} }

View file

@ -19,30 +19,30 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_65_iso_blocker( [0] = LAYOUT_65_iso_blocker(
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_DEL, 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_DEL,
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_END, 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_END,
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_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_PGUP,
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_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_PGDN,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
), ),
[1] = LAYOUT_65_iso_blocker( [1] = LAYOUT_65_iso_blocker(
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_TRNS, KC_INS, 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_TRNS, KC_INS,
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_HOME, 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_HOME,
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_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY, 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
), ),
[2] = LAYOUT_65_iso_blocker( [2] = LAYOUT_65_iso_blocker(
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, KC_TRNS, KC_TRNS, KC_TRNS KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
), ),
[3] = LAYOUT_65_iso_blocker( [3] = LAYOUT_65_iso_blocker(
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, KC_TRNS, KC_TRNS, KC_TRNS KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
) )
}; };

View file

@ -16,3 +16,5 @@ NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output AUDIO_ENABLE = no # Audio output
LAYOUTS = 65_ansi_blocker 65_ansi_blocker_tsangan 65_iso_blocker