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

This commit is contained in:
QMK Bot 2021-11-05 15:28:51 +00:00
commit df1d9175c4
3 changed files with 255 additions and 12 deletions

View file

@ -69,6 +69,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// #define RGBLIGHT_EFFECT_STATIC_GRADIENT
// #define RGBLIGHT_EFFECT_RGB_TEST
// #define RGBLIGHT_EFFECT_ALTERNATING
// generated by KBFirmware JSON to QMK Parser
// https://noroadsleft.github.io/kbf_qmk_converter/

View file

@ -18,6 +18,28 @@
#include "quantum.h"
#define XXX KC_NO
/*
*
* 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 3E 0E 0F 0G
*
*
* 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 0D 1E 1F 1G 1D 2u Backspace
*
* 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 2G 2D
* 2.25u 3D ISO Enter ANSI Enter
* LShift 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3C 3D
*
* 40 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4F 4D 2.75u RShift 4C 4D 1u/1.75u
*
* 50 51 52 56 5A 5B 5C 5D 5E 5F 5G
*
*
* 50 51 52 56 5B 5C 5D Tsangan/WKL
*
*/
#define LAYOUT_all( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K3E, K0E, K0F, K0G, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K0D, K1E, K1F, K1G, \
@ -26,13 +48,42 @@
K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4F, \
K50, K51, K52, K56, K5A, K5B, K5C, K5D, K5E, K5F, K5G \
) { \
{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, KC_NO, KC_NO }, \
{ K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, KC_NO, K4F, KC_NO }, \
{ K50, K51, K52, KC_NO, KC_NO, KC_NO, K56, KC_NO, KC_NO, KC_NO, K5A, K5B, K5C, K5D, K5E, K5F, K5G }, \
{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, XXX, XXX }, \
{ K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, XXX, K4F, XXX }, \
{ K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F, K5G }, \
}
// generated by KBFirmware JSON to QMK Parser
// https://noroadsleft.github.io/kbf_qmk_converter/
#define LAYOUT_tkl_ansi_f13( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K3E, K0E, K0F, K0G, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, \
K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
K40, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4D, K4F, \
K50, K51, K52, K56, K5A, K5B, K5C, K5D, K5E, K5F, K5G \
) { \
{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E, K0F, K0G }, \
{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, XXX, XXX }, \
{ K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, XXX, K4F, XXX }, \
{ K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F, K5G }, \
}
#define LAYOUT_tkl_iso_f13( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K3E, K0E, K0F, K0G, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, K2F, K2G, \
K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4D, K4F, \
K50, K51, K52, K56, K5A, K5B, K5C, K5D, K5E, K5F, K5G \
) { \
{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E, K0F, K0G }, \
{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F, K2G }, \
{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, XXX, XXX }, \
{ K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, XXX, K4F, XXX }, \
{ K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F, K5G }, \
}

View file

@ -1,7 +1,7 @@
{
"keyboard_name": "infinity88",
"url": "",
"maintainer": "Team Mechlovin",
"maintainer": "mechlovin",
"layouts": {
"LAYOUT_all": {
"layout": [
@ -86,6 +86,201 @@
{"label":"K4C (B4,D2)", "x":12.25, "y":4.25, "w":1.75},
{"label":"K4D (B4,D3)", "x":14, "y":4.25},
{"label":"K4F (B4,D5)", "x":16.25, "y":4.25},
{"label":"K50 (B5,B6)", "x":0, "y":5.25, "w":1.25},
{"label":"K51 (B5,F4)", "x":1.25, "y":5.25, "w":1.25},
{"label":"K52 (B5,C0)", "x":2.5, "y":5.25, "w":1.25},
{"label":"K56 (B5,C4)", "x":3.75, "y":5.25, "w":6.25},
{"label":"K5A (B5,D0)", "x":10, "y":5.25, "w":1.25},
{"label":"K5B (B5,D1)", "x":11.25, "y":5.25, "w":1.25},
{"label":"K5C (B5,D2)", "x":12.5, "y":5.25, "w":1.25},
{"label":"K5D (B5,D3)", "x":13.75, "y":5.25, "w":1.25},
{"label":"K5E (B5,D4)", "x":15.25, "y":5.25},
{"label":"K5F (B5,D5)", "x":16.25, "y":5.25},
{"label":"K5G (B5,D6)", "x":17.25, "y":5.25}
]
},
"LAYOUT_tkl_ansi_f13": {
"layout": [
{"label":"K00 (B0,B6)", "x":0, "y":0},
{"label":"K01 (B0,F4)", "x":1.25, "y":0},
{"label":"K02 (B0,C0)", "x":2.25, "y":0},
{"label":"K03 (B0,C1)", "x":3.25, "y":0},
{"label":"K04 (B0,C2)", "x":4.25, "y":0},
{"label":"K05 (B0,C3)", "x":5.5, "y":0},
{"label":"K06 (B0,C4)", "x":6.5, "y":0},
{"label":"K07 (B0,C5)", "x":7.5, "y":0},
{"label":"K08 (B0,C6)", "x":8.5, "y":0},
{"label":"K09 (B0,C7)", "x":9.75, "y":0},
{"label":"K0A (B0,D0)", "x":10.75, "y":0},
{"label":"K0B (B0,D1)", "x":11.75, "y":0},
{"label":"K0C (B0,D2)", "x":12.75, "y":0},
{"label":"K3E (B3,D4)", "x":14, "y":0},
{"label":"K0E (B0,D4)", "x":15.25, "y":0},
{"label":"K0F (B0,D5)", "x":16.25, "y":0},
{"label":"K0G (B0,D6)", "x":17.25, "y":0},
{"label":"K10 (B1,B6)", "x":0, "y":1.25},
{"label":"K11 (B1,F4)", "x":1, "y":1.25},
{"label":"K12 (B1,C0)", "x":2, "y":1.25},
{"label":"K13 (B1,C1)", "x":3, "y":1.25},
{"label":"K14 (B1,C2)", "x":4, "y":1.25},
{"label":"K15 (B1,C3)", "x":5, "y":1.25},
{"label":"K16 (B1,C4)", "x":6, "y":1.25},
{"label":"K17 (B1,C5)", "x":7, "y":1.25},
{"label":"K18 (B1,C6)", "x":8, "y":1.25},
{"label":"K19 (B1,C7)", "x":9, "y":1.25},
{"label":"K1A (B1,D0)", "x":10, "y":1.25},
{"label":"K1B (B1,D1)", "x":11, "y":1.25},
{"label":"K1C (B1,D2)", "x":12, "y":1.25},
{"label":"K1D (B1,D3)", "x":13, "y":1.25, "w":2},
{"label":"K1E (B1,D4)", "x":15.25, "y":1.25},
{"label":"K1F (B1,D5)", "x":16.25, "y":1.25},
{"label":"K1G (B1,D6)", "x":17.25, "y":1.25},
{"label":"K20 (B2,B6)", "x":0, "y":2.25, "w":1.5},
{"label":"K21 (B2,F4)", "x":1.5, "y":2.25},
{"label":"K22 (B2,C0)", "x":2.5, "y":2.25},
{"label":"K23 (B2,C1)", "x":3.5, "y":2.25},
{"label":"K24 (B2,C2)", "x":4.5, "y":2.25},
{"label":"K25 (B2,C3)", "x":5.5, "y":2.25},
{"label":"K26 (B2,C4)", "x":6.5, "y":2.25},
{"label":"K27 (B2,C5)", "x":7.5, "y":2.25},
{"label":"K28 (B2,C6)", "x":8.5, "y":2.25},
{"label":"K29 (B2,C7)", "x":9.5, "y":2.25},
{"label":"K2A (B2,D0)", "x":10.5, "y":2.25},
{"label":"K2B (B2,D1)", "x":11.5, "y":2.25},
{"label":"K2C (B2,D2)", "x":12.5, "y":2.25},
{"label":"K2D (B2,D3)", "x":13.5, "y":2.25, "w":1.5},
{"label":"K2E (B2,D4)", "x":15.25, "y":2.25},
{"label":"K2F (B2,D5)", "x":16.25, "y":2.25},
{"label":"K2G (B2,D6)", "x":17.25, "y":2.25},
{"label":"K30 (B3,B6)", "x":0, "y":3.25, "w":1.75},
{"label":"K31 (B3,F4)", "x":1.75, "y":3.25},
{"label":"K32 (B3,C0)", "x":2.75, "y":3.25},
{"label":"K33 (B3,C1)", "x":3.75, "y":3.25},
{"label":"K34 (B3,C2)", "x":4.75, "y":3.25},
{"label":"K35 (B3,C3)", "x":5.75, "y":3.25},
{"label":"K36 (B3,C4)", "x":6.75, "y":3.25},
{"label":"K37 (B3,C5)", "x":7.75, "y":3.25},
{"label":"K38 (B3,C6)", "x":8.75, "y":3.25},
{"label":"K39 (B3,C7)", "x":9.75, "y":3.25},
{"label":"K3A (B3,D0)", "x":10.75, "y":3.25},
{"label":"K3B (B3,D1)", "x":11.75, "y":3.25},
{"label":"K3D (B3,D3)", "x":12.75, "y":3.25, "w":2.25},
{"label":"K40 (B4,B6)", "x":0, "y":4.25, "w":2.25},
{"label":"K42 (B4,C0)", "x":2.25, "y":4.25},
{"label":"K43 (B4,C1)", "x":3.25, "y":4.25},
{"label":"K44 (B4,C2)", "x":4.25, "y":4.25},
{"label":"K45 (B4,C3)", "x":5.25, "y":4.25},
{"label":"K46 (B4,C4)", "x":6.25, "y":4.25},
{"label":"K47 (B4,C5)", "x":7.25, "y":4.25},
{"label":"K48 (B4,C6)", "x":8.25, "y":4.25},
{"label":"K49 (B4,C7)", "x":9.25, "y":4.25},
{"label":"K4A (B4,D0)", "x":10.25, "y":4.25},
{"label":"K4B (B4,D1)", "x":11.25, "y":4.25},
{"label":"K4D (B4,D3)", "x":12.25, "y":4.25, "w":2.75},
{"label":"K4F (B4,D5)", "x":16.25, "y":4.25},
{"label":"K50 (B5,B6)", "x":0, "y":5.25, "w":1.25},
{"label":"K51 (B5,F4)", "x":1.25, "y":5.25, "w":1.25},
{"label":"K52 (B5,C0)", "x":2.5, "y":5.25, "w":1.25},
{"label":"K56 (B5,C4)", "x":3.75, "y":5.25, "w":6.25},
{"label":"K5A (B5,D0)", "x":10, "y":5.25, "w":1.25},
{"label":"K5B (B5,D1)", "x":11.25, "y":5.25, "w":1.25},
{"label":"K5C (B5,D2)", "x":12.5, "y":5.25, "w":1.25},
{"label":"K5D (B5,D3)", "x":13.75, "y":5.25, "w":1.25},
{"label":"K5E (B5,D4)", "x":15.25, "y":5.25},
{"label":"K5F (B5,D5)", "x":16.25, "y":5.25},
{"label":"K5G (B5,D6)", "x":17.25, "y":5.25}
]
},
"LAYOUT_tkl_iso_f13": {
"layout": [
{"label":"K00 (B0,B6)", "x":0, "y":0},
{"label":"K01 (B0,F4)", "x":1.25, "y":0},
{"label":"K02 (B0,C0)", "x":2.25, "y":0},
{"label":"K03 (B0,C1)", "x":3.25, "y":0},
{"label":"K04 (B0,C2)", "x":4.25, "y":0},
{"label":"K05 (B0,C3)", "x":5.5, "y":0},
{"label":"K06 (B0,C4)", "x":6.5, "y":0},
{"label":"K07 (B0,C5)", "x":7.5, "y":0},
{"label":"K08 (B0,C6)", "x":8.5, "y":0},
{"label":"K09 (B0,C7)", "x":9.75, "y":0},
{"label":"K0A (B0,D0)", "x":10.75, "y":0},
{"label":"K0B (B0,D1)", "x":11.75, "y":0},
{"label":"K0C (B0,D2)", "x":12.75, "y":0},
{"label":"K3E (B3,D4)", "x":14, "y":0},
{"label":"K0E (B0,D4)", "x":15.25, "y":0},
{"label":"K0F (B0,D5)", "x":16.25, "y":0},
{"label":"K0G (B0,D6)", "x":17.25, "y":0},
{"label":"K10 (B1,B6)", "x":0, "y":1.25},
{"label":"K11 (B1,F4)", "x":1, "y":1.25},
{"label":"K12 (B1,C0)", "x":2, "y":1.25},
{"label":"K13 (B1,C1)", "x":3, "y":1.25},
{"label":"K14 (B1,C2)", "x":4, "y":1.25},
{"label":"K15 (B1,C3)", "x":5, "y":1.25},
{"label":"K16 (B1,C4)", "x":6, "y":1.25},
{"label":"K17 (B1,C5)", "x":7, "y":1.25},
{"label":"K18 (B1,C6)", "x":8, "y":1.25},
{"label":"K19 (B1,C7)", "x":9, "y":1.25},
{"label":"K1A (B1,D0)", "x":10, "y":1.25},
{"label":"K1B (B1,D1)", "x":11, "y":1.25},
{"label":"K1C (B1,D2)", "x":12, "y":1.25},
{"label":"K1D (B1,D3)", "x":13, "y":1.25, "w":2},
{"label":"K1E (B1,D4)", "x":15.25, "y":1.25},
{"label":"K1F (B1,D5)", "x":16.25, "y":1.25},
{"label":"K1G (B1,D6)", "x":17.25, "y":1.25},
{"label":"K20 (B2,B6)", "x":0, "y":2.25, "w":1.5},
{"label":"K21 (B2,F4)", "x":1.5, "y":2.25},
{"label":"K22 (B2,C0)", "x":2.5, "y":2.25},
{"label":"K23 (B2,C1)", "x":3.5, "y":2.25},
{"label":"K24 (B2,C2)", "x":4.5, "y":2.25},
{"label":"K25 (B2,C3)", "x":5.5, "y":2.25},
{"label":"K26 (B2,C4)", "x":6.5, "y":2.25},
{"label":"K27 (B2,C5)", "x":7.5, "y":2.25},
{"label":"K28 (B2,C6)", "x":8.5, "y":2.25},
{"label":"K29 (B2,C7)", "x":9.5, "y":2.25},
{"label":"K2A (B2,D0)", "x":10.5, "y":2.25},
{"label":"K2B (B2,D1)", "x":11.5, "y":2.25},
{"label":"K2C (B2,D2)", "x":12.5, "y":2.25},
{"label":"K2E (B2,D4)", "x":15.25, "y":2.25},
{"label":"K2F (B2,D5)", "x":16.25, "y":2.25},
{"label":"K2G (B2,D6)", "x":17.25, "y":2.25},
{"label":"K30 (B3,B6)", "x":0, "y":3.25, "w":1.75},
{"label":"K31 (B3,F4)", "x":1.75, "y":3.25},
{"label":"K32 (B3,C0)", "x":2.75, "y":3.25},
{"label":"K33 (B3,C1)", "x":3.75, "y":3.25},
{"label":"K34 (B3,C2)", "x":4.75, "y":3.25},
{"label":"K35 (B3,C3)", "x":5.75, "y":3.25},
{"label":"K36 (B3,C4)", "x":6.75, "y":3.25},
{"label":"K37 (B3,C5)", "x":7.75, "y":3.25},
{"label":"K38 (B3,C6)", "x":8.75, "y":3.25},
{"label":"K39 (B3,C7)", "x":9.75, "y":3.25},
{"label":"K3A (B3,D0)", "x":10.75, "y":3.25},
{"label":"K3B (B3,D1)", "x":11.75, "y":3.25},
{"label":"K3C (B3,D2)", "x":12.75, "y":3.25},
{"label":"K3D (B3,D3)", "x":13.75, "y":2.25, "w":1.25, "h":2},
{"label":"K40 (B4,B6)", "x":0, "y":4.25, "w":1.25},
{"label":"K41 (B4,F4)", "x":1.25, "y":4.25},
{"label":"K42 (B4,C0)", "x":2.25, "y":4.25},
{"label":"K43 (B4,C1)", "x":3.25, "y":4.25},
{"label":"K44 (B4,C2)", "x":4.25, "y":4.25},
{"label":"K45 (B4,C3)", "x":5.25, "y":4.25},
{"label":"K46 (B4,C4)", "x":6.25, "y":4.25},
{"label":"K47 (B4,C5)", "x":7.25, "y":4.25},
{"label":"K48 (B4,C6)", "x":8.25, "y":4.25},
{"label":"K49 (B4,C7)", "x":9.25, "y":4.25},
{"label":"K4A (B4,D0)", "x":10.25, "y":4.25},
{"label":"K4B (B4,D1)", "x":11.25, "y":4.25},
{"label":"K4D (B4,D3)", "x":12.25, "y":4.25, "w":2.75},
{"label":"K4F (B4,D5)", "x":16.25, "y":4.25},
{"label":"K50 (B5,B6)", "x":0, "y":5.25, "w":1.25},
{"label":"K51 (B5,F4)", "x":1.25, "y":5.25, "w":1.25},
{"label":"K52 (B5,C0)", "x":2.5, "y":5.25, "w":1.25},