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

This commit is contained in:
QMK Bot
2021-09-26 07:01:41 +00:00
32 changed files with 7 additions and 90 deletions

View File

@@ -33,6 +33,3 @@
{ K40, KC_NO, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, KC_NO, K4C }, \
{ K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E }, \
}
// generated by KBFirmware JSON to QMK Parser
// https://noroadsleft.github.io/kbf_qmk_converter/

View File

@@ -33,7 +33,7 @@
{"label":"K19 (B7,C6)", "x":9, "y":1.5},
{"label":"K1A (B7,B5)", "x":10, "y":1.5},
{"label":"K1B (B7,F4)", "x":11, "y":1.5},
{"label":"K1C (B7,F1)", "x":12, "y":1.5},
{"label":"K1C (B7,F1)", "x":12, "y":1.5},
{"label":"K1E (B7,B0)", "x":13, "y":1.5, "w":2},
{"label":"K5B (D7,F4)", "x":15.25, "y":1.5},
{"label":"K5C (D7,F1)", "x":16.25, "y":1.5},
@@ -68,7 +68,7 @@
{"label":"K3A (F0,B5)", "x":10.75, "y":3.5},
{"label":"K3B (F0,F4)", "x":11.75, "y":3.5},
{"label":"K3C (F0,F1)", "x":12.75, "y":3.5, "w":2.25},
{"label":"K40 (D6,D1)", "x":0, "y":4.5, "w":2.25},
{"label":"K40 (D6,D1)", "x":0, "y":4.5, "w":2.25},
{"label":"K42 (D6,F7)", "x":2.25, "y":4.5},
{"label":"K43 (D6,F6)", "x":3.25, "y":4.5},
{"label":"K44 (D6,F5)", "x":4.25, "y":4.5},
@@ -79,7 +79,7 @@
{"label":"K49 (D6,C6)", "x":9.25, "y":4.5},
{"label":"K4A (D6,B5)", "x":10.25, "y":4.5},
{"label":"K4B (D6,F4)", "x":11.25, "y":4.5},
{"label":"K4C (D6,F1)", "x":12.25, "y":4.5, "w":2.75},
{"label":"K4C (D6,F1)", "x":12.25, "y":4.5, "w":2.75},
{"label":"K4E (D6,B0)", "x":16.25, "y":4.5},
{"label":"K50 (D7,D1)", "x":0, "y":5.5, "w":1.25},
{"label":"K51 (D7,D0)", "x":1.25, "y":5.5, "w":1.25},
@@ -95,5 +95,4 @@
]
}
}
,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
}

View File

@@ -24,6 +24,3 @@ LTO_ENABLE = yes
KEY_LOCK_ENABLE = no # Enable KC_LOCK support
LAYOUTS = tkl_ansi
# generated by KBFirmware JSON to QMK Parser
# https://noroadsleft.github.io/kbf_qmk_converter/