Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
QMK Bot
commit
99ce5446ad
3 changed files with 131 additions and 35 deletions
|
|
@ -4,9 +4,105 @@
|
|||
"maintainer": "qmk",
|
||||
"width": 18.5,
|
||||
"height": 7,
|
||||
"layout_aliases": {
|
||||
"LAYOUT": "LAYOUT_tkl_iso_tsangan"
|
||||
},
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
||||
"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":"Druck", "x":15.5, "y":0}, {"label":"Rollen", "x":16.5, "y":0}, {"label":"Pause", "x":17.5, "y":0}, {"label":"\u00b0", "x":0, "y":2}, {"label":"!", "x":1, "y":2}, {"label":"\"", "x":2, "y":2}, {"label":"\u00a7", "x":3, "y":2}, {"label":"$", "x":4, "y":2}, {"label":"%", "x":5, "y":2}, {"label":"&", "x":6, "y":2}, {"label":"/", "x":7, "y":2}, {"label":"(", "x":8, "y":2}, {"label":")", "x":9, "y":2}, {"label":"=", "x":10, "y":2}, {"label":"?", "x":11, "y":2}, {"label":"`", "x":12, "y":2}, {"label":"\u2b60", "x":13, "y":2, "w":2}, {"label":"Einfg", "x":15.5, "y":2}, {"label":"Pos1", "x":16.5, "y":2}, {"label":"Bild", "x":17.5, "y":2}, {"label":"\u2b7e", "x":0, "y":3}, {"label":"Q", "x":1.5, "y":3}, {"label":"W", "x":2.5, "y":3}, {"label":"E", "x":3.5, "y":3}, {"label":"R", "x":4.5, "y":3}, {"label":"T", "x":5.5, "y":3}, {"label":"Z", "x":6.5, "y":3}, {"label":"U", "x":7.5, "y":3}, {"label":"I", "x":8.5, "y":3}, {"label":"O", "x":9.5, "y":3}, {"label":"P", "x":10.5, "y":3}, {"label":"\u00dc", "x":11.5, "y":3}, {"label":"*", "x":12.5, "y":3}, {"label":"\u2ba0", "x":13.75, "y":3, "w":1.25, "h":2}, {"label":"Entf", "x":15.5, "y":3}, {"label":"Ende", "x":16.5, "y":3}, {"label":"Bild", "x":17.5, "y":3}, {"x":0, "y":4, "w":1.75}, {"label":"A", "x":1.75, "y":4}, {"label":"S", "x":2.75, "y":4}, {"label":"D", "x":3.75, "y":4}, {"label":"F", "x":4.75, "y":4}, {"label":"G", "x":5.75, "y":4}, {"label":"H", "x":6.75, "y":4}, {"label":"J", "x":7.75, "y":4}, {"label":"K", "x":8.75, "y":4}, {"label":"L", "x":9.75, "y":4}, {"label":"\u00d6", "x":10.75, "y":4}, {"label":"\u00c4", "x":11.75, "y":4}, {"label":"'", "x":12.75, "y":4}, {"label":"\u21e7", "x":0, "y":5, "w":1.25}, {"label":">", "x":1.25, "y":5}, {"label":"Y", "x":2.25, "y":5}, {"label":"X", "x":3.25, "y":5}, {"label":"C", "x":4.25, "y":5}, {"label":"V", "x":5.25, "y":5}, {"label":"B", "x":6.25, "y":5}, {"label":"N", "x":7.25, "y":5}, {"label":"M", "x":8.25, "y":5}, {"label":";", "x":9.25, "y":5}, {"label":":", "x":10.25, "y":5}, {"label":"_", "x":11.25, "y":5}, {"label":"\u21e7", "x":12.25, "y":5, "w":2.75}, {"label":"\u2191", "x":16.5, "y":5}, {"label":"Strg", "x":0, "y":6, "w":1.5}, {"label":"\u2630", "x":1.5, "y":6}, {"label":"Alt", "x":2.5, "y":6, "w":1.5}, {"x":4, "y":6, "w":7}, {"label":"Alt Gr", "x":11, "y":6, "w":1.5}, {"label":"Fn", "x":12.5, "y":6}, {"label":"Strg", "x":13.5, "y":6, "w":1.5}, {"label":"\u2190", "x":15.5, "y":6}, {"label":"\u2193", "x":16.5, "y":6}, {"label":"\u2192", "x":17.5, "y":6}]
|
||||
"LAYOUT_tkl_iso_tsangan": {
|
||||
"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":"Druck", "x":15.5, "y":0},
|
||||
{"label":"Rollen", "x":16.5, "y":0},
|
||||
{"label":"Pause", "x":17.5, "y":0},
|
||||
|
||||
{"label":"\u00b0", "x":0, "y":2},
|
||||
{"label":"!", "x":1, "y":2},
|
||||
{"label":"\"", "x":2, "y":2},
|
||||
{"label":"\u00a7", "x":3, "y":2},
|
||||
{"label":"$", "x":4, "y":2},
|
||||
{"label":"%", "x":5, "y":2},
|
||||
{"label":"&", "x":6, "y":2},
|
||||
{"label":"/", "x":7, "y":2},
|
||||
{"label":"(", "x":8, "y":2},
|
||||
{"label":")", "x":9, "y":2},
|
||||
{"label":"=", "x":10, "y":2},
|
||||
{"label":"?", "x":11, "y":2},
|
||||
{"label":"`", "x":12, "y":2},
|
||||
{"label":"\u2b60", "x":13, "y":2, "w":2},
|
||||
{"label":"Einfg", "x":15.5, "y":2},
|
||||
{"label":"Pos1", "x":16.5, "y":2},
|
||||
{"label":"Bild", "x":17.5, "y":2},
|
||||
|
||||
{"label":"\u2b7e", "x":0, "y":3, "w":1.5},
|
||||
{"label":"Q", "x":1.5, "y":3},
|
||||
{"label":"W", "x":2.5, "y":3},
|
||||
{"label":"E", "x":3.5, "y":3},
|
||||
{"label":"R", "x":4.5, "y":3},
|
||||
{"label":"T", "x":5.5, "y":3},
|
||||
{"label":"Z", "x":6.5, "y":3},
|
||||
{"label":"U", "x":7.5, "y":3},
|
||||
{"label":"I", "x":8.5, "y":3},
|
||||
{"label":"O", "x":9.5, "y":3},
|
||||
{"label":"P", "x":10.5, "y":3},
|
||||
{"label":"\u00dc", "x":11.5, "y":3},
|
||||
{"label":"*", "x":12.5, "y":3},
|
||||
{"label":"Entf", "x":15.5, "y":3},
|
||||
{"label":"Ende", "x":16.5, "y":3},
|
||||
{"label":"Bild", "x":17.5, "y":3},
|
||||
|
||||
{"x":0, "y":4, "w":1.75},
|
||||
{"label":"A", "x":1.75, "y":4},
|
||||
{"label":"S", "x":2.75, "y":4},
|
||||
{"label":"D", "x":3.75, "y":4},
|
||||
{"label":"F", "x":4.75, "y":4},
|
||||
{"label":"G", "x":5.75, "y":4},
|
||||
{"label":"H", "x":6.75, "y":4},
|
||||
{"label":"J", "x":7.75, "y":4},
|
||||
{"label":"K", "x":8.75, "y":4},
|
||||
{"label":"L", "x":9.75, "y":4},
|
||||
{"label":"\u00d6", "x":10.75, "y":4},
|
||||
{"label":"\u00c4", "x":11.75, "y":4},
|
||||
{"label":"'", "x":12.75, "y":4},
|
||||
{"label":"\u2ba0", "x":13.75, "y":3, "w":1.25, "h":2},
|
||||
|
||||
{"label":"\u21e7", "x":0, "y":5, "w":1.25},
|
||||
{"label":">", "x":1.25, "y":5},
|
||||
{"label":"Y", "x":2.25, "y":5},
|
||||
{"label":"X", "x":3.25, "y":5},
|
||||
{"label":"C", "x":4.25, "y":5},
|
||||
{"label":"V", "x":5.25, "y":5},
|
||||
{"label":"B", "x":6.25, "y":5},
|
||||
{"label":"N", "x":7.25, "y":5},
|
||||
{"label":"M", "x":8.25, "y":5},
|
||||
{"label":";", "x":9.25, "y":5},
|
||||
{"label":":", "x":10.25, "y":5},
|
||||
{"label":"_", "x":11.25, "y":5},
|
||||
{"label":"\u21e7", "x":12.25, "y":5, "w":2.75},
|
||||
{"label":"\u2191", "x":16.5, "y":5},
|
||||
|
||||
{"label":"Strg", "x":0, "y":6, "w":1.5},
|
||||
{"label":"\u2630", "x":1.5, "y":6},
|
||||
{"label":"Alt", "x":2.5, "y":6, "w":1.5},
|
||||
{"x":4, "y":6, "w":7},
|
||||
{"label":"Alt Gr", "x":11, "y":6, "w":1.5},
|
||||
{"label":"Fn", "x":12.5, "y":6},
|
||||
{"label":"Strg", "x":13.5, "y":6, "w":1.5},
|
||||
{"label":"\u2190", "x":15.5, "y":6},
|
||||
{"label":"\u2193", "x":16.5, "y":6},
|
||||
{"label":"\u2192", "x":17.5, "y":6}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,22 +17,22 @@
|
|||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
/* 0: Winkey */
|
||||
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_SLCK,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_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_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_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_LCTL,KC_LGUI,KC_LALT, KC_SPC, KC_RALT, MO(1),KC_RCTL, KC_LEFT,KC_DOWN,KC_RGHT
|
||||
),
|
||||
LAYOUT_tkl_iso_tsangan(
|
||||
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_SLCK, 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_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_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_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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
|
||||
),
|
||||
|
||||
/* 2: Fn */
|
||||
LAYOUT(
|
||||
KC_TRNS, BL_ON, BL_OFF,BL_STEP,BL_BRTG,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,
|
||||
KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,
|
||||
KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,
|
||||
KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
|
||||
KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,
|
||||
KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS
|
||||
)
|
||||
LAYOUT_tkl_iso_tsangan(
|
||||
KC_TRNS, BL_ON, BL_OFF, BL_STEP, BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
|
||||
)
|
||||
};
|
||||
|
|
|
|||
|
|
@ -26,19 +26,19 @@
|
|||
* The second converts the arguments into a two-dimensional array which
|
||||
* represents the switch matrix.
|
||||
*/
|
||||
#define LAYOUT( \
|
||||
#define LAYOUT_tkl_iso_tsangan( \
|
||||
K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
|
||||
K500, K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \
|
||||
K501, K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K213, K214, K215, \
|
||||
K502, K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K212, \
|
||||
K503, K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, \
|
||||
K504, K505, K506, K507, K508, K509, K510, K512, K513, K514 \
|
||||
K501, K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K213, K214, K215, \
|
||||
K502, K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K212, \
|
||||
K503, K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, \
|
||||
K504, K505, K506, K507, K508, K509, K510, K512, K513, K514 \
|
||||
) \
|
||||
{ \
|
||||
{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015 }, \
|
||||
{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115 }, \
|
||||
{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215 }, \
|
||||
{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311 }, \
|
||||
{ K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, KC_NO, KC_NO, K412 }, \
|
||||
{ K500, K501, K502, K503, K504, K505, K506, K507, KC_NO, K508, K509, K510, KC_NO, K512, K513, K514 } \
|
||||
{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015 }, \
|
||||
{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115 }, \
|
||||
{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215 }, \
|
||||
{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, KC_NO, KC_NO, KC_NO }, \
|
||||
{ K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, KC_NO, KC_NO, K412, KC_NO }, \
|
||||
{ K500, K501, K502, K503, K504, K505, K506, K507, KC_NO, K508, K509, K510, KC_NO, K512, K513, K514 } \
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue