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

This commit is contained in:
QMK Bot 2024-01-13 19:17:23 +00:00
commit 458c1317bf

View File

@ -1,23 +1,99 @@
{ {
"keyboard_name": "Cor65",
"manufacturer": "Mechlovin Studio", "manufacturer": "Mechlovin Studio",
"url": "", "keyboard_name": "Cor65",
"maintainer": "Mechlovin' Studio", "maintainer": "Mechlovin' Studio",
"usb": {
"vid": "0x4D4C",
"pid": "0x6504",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["B11", "B10", "B2", "B1", "B0", "A6", "A5", "A4", "A3", "A2", "C13", "B7", "B6", "B5", "B4", "B3"],
"rows": ["B12", "B13", "B14", "B15", "A1"]
},
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"indicators": { "indicators": {
"caps_lock": "B9", "caps_lock": "B9",
"on_state": 0 "on_state": 0
}, },
"matrix_pins": {
"cols": ["B11", "B10", "B2", "B1", "B0", "A6", "A5", "A4", "A3", "A2", "C13", "B7", "B6", "B5", "B4", "B3"],
"rows": ["B12", "B13", "B14", "B15", "A1"]
},
"url": "",
"usb": {
"device_version": "0.0.1",
"pid": "0x6504",
"vid": "0x4D4C"
},
"layouts": { "layouts": {
"LAYOUT_65_ansi": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1.25, "y": 0},
{"matrix": [0, 2], "x": 2.25, "y": 0},
{"matrix": [0, 3], "x": 3.25, "y": 0},
{"matrix": [0, 4], "x": 4.25, "y": 0},
{"matrix": [0, 5], "x": 5.25, "y": 0},
{"matrix": [0, 6], "x": 6.25, "y": 0},
{"matrix": [0, 7], "x": 7.25, "y": 0},
{"matrix": [0, 8], "x": 8.25, "y": 0},
{"matrix": [0, 9], "x": 9.25, "y": 0},
{"matrix": [0, 10], "x": 10.25, "y": 0},
{"matrix": [0, 11], "x": 11.25, "y": 0},
{"matrix": [0, 12], "x": 12.25, "y": 0},
{"matrix": [0, 13], "x": 13.25, "y": 0},
{"matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
{"matrix": [0, 15], "x": 16.75, "y": 0},
{"matrix": [1, 0], "x": 0, "y": 1},
{"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
{"matrix": [1, 2], "x": 2.75, "y": 1},
{"matrix": [1, 3], "x": 3.75, "y": 1},
{"matrix": [1, 4], "x": 4.75, "y": 1},
{"matrix": [1, 5], "x": 5.75, "y": 1},
{"matrix": [1, 6], "x": 6.75, "y": 1},
{"matrix": [1, 7], "x": 7.75, "y": 1},
{"matrix": [1, 8], "x": 8.75, "y": 1},
{"matrix": [1, 9], "x": 9.75, "y": 1},
{"matrix": [1, 10], "x": 10.75, "y": 1},
{"matrix": [1, 11], "x": 11.75, "y": 1},
{"matrix": [1, 12], "x": 12.75, "y": 1},
{"matrix": [1, 13], "x": 13.75, "y": 1},
{"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
{"matrix": [1, 15], "x": 16.75, "y": 1},
{"matrix": [2, 0], "x": 0, "y": 2},
{"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
{"matrix": [2, 2], "x": 3, "y": 2},
{"matrix": [2, 3], "x": 4, "y": 2},
{"matrix": [2, 4], "x": 5, "y": 2},
{"matrix": [2, 5], "x": 6, "y": 2},
{"matrix": [2, 6], "x": 7, "y": 2},
{"matrix": [2, 7], "x": 8, "y": 2},
{"matrix": [2, 8], "x": 9, "y": 2},
{"matrix": [2, 9], "x": 10, "y": 2},
{"matrix": [2, 10], "x": 11, "y": 2},
{"matrix": [2, 11], "x": 12, "y": 2},
{"matrix": [2, 12], "x": 13, "y": 2},
{"matrix": [2, 14], "x": 14, "y": 2, "w": 2.25},
{"matrix": [2, 15], "x": 16.75, "y": 2},
{"matrix": [3, 0], "x": 0, "y": 3},
{"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
{"matrix": [3, 3], "x": 3.5, "y": 3},
{"matrix": [3, 4], "x": 4.5, "y": 3},
{"matrix": [3, 5], "x": 5.5, "y": 3},
{"matrix": [3, 6], "x": 6.5, "y": 3},
{"matrix": [3, 7], "x": 7.5, "y": 3},
{"matrix": [3, 8], "x": 8.5, "y": 3},
{"matrix": [3, 9], "x": 9.5, "y": 3},
{"matrix": [3, 10], "x": 10.5, "y": 3},
{"matrix": [3, 11], "x": 11.5, "y": 3},
{"matrix": [3, 12], "x": 12.5, "y": 3},
{"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
{"matrix": [3, 15], "x": 16.75, "y": 3},
{"matrix": [3, 14], "x": 15.5, "y": 3.25},
{"matrix": [4, 0], "x": 0, "y": 4},
{"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
{"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
{"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
{"matrix": [4, 7], "x": 5, "y": 4, "w": 6.25},
{"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
{"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
{"matrix": [4, 13], "x": 14.5, "y": 4.25},
{"matrix": [4, 14], "x": 15.5, "y": 4.25},
{"matrix": [4, 15], "x": 16.5, "y": 4.25}
]
},
"LAYOUT_all": { "LAYOUT_all": {
"layout": [ "layout": [
{"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 0], "x": 0, "y": 0},
@ -37,7 +113,6 @@
{"matrix": [0, 14], "x": 14.25, "y": 0}, {"matrix": [0, 14], "x": 14.25, "y": 0},
{"matrix": [2, 13], "x": 15.25, "y": 0}, {"matrix": [2, 13], "x": 15.25, "y": 0},
{"matrix": [0, 15], "x": 16.75, "y": 0}, {"matrix": [0, 15], "x": 16.75, "y": 0},
{"matrix": [1, 0], "x": 0, "y": 1}, {"matrix": [1, 0], "x": 0, "y": 1},
{"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5}, {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
{"matrix": [1, 2], "x": 2.75, "y": 1}, {"matrix": [1, 2], "x": 2.75, "y": 1},
@ -54,7 +129,6 @@
{"matrix": [1, 13], "x": 13.75, "y": 1}, {"matrix": [1, 13], "x": 13.75, "y": 1},
{"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5}, {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
{"matrix": [1, 15], "x": 16.75, "y": 1}, {"matrix": [1, 15], "x": 16.75, "y": 1},
{"matrix": [2, 0], "x": 0, "y": 2}, {"matrix": [2, 0], "x": 0, "y": 2},
{"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75}, {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
{"matrix": [2, 2], "x": 3, "y": 2}, {"matrix": [2, 2], "x": 3, "y": 2},
@ -70,7 +144,6 @@
{"matrix": [2, 12], "x": 13, "y": 2}, {"matrix": [2, 12], "x": 13, "y": 2},
{"matrix": [2, 14], "x": 14, "y": 2, "w": 2.25}, {"matrix": [2, 14], "x": 14, "y": 2, "w": 2.25},
{"matrix": [2, 15], "x": 16.75, "y": 2}, {"matrix": [2, 15], "x": 16.75, "y": 2},
{"matrix": [3, 0], "x": 0, "y": 3}, {"matrix": [3, 0], "x": 0, "y": 3},
{"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25}, {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
{"matrix": [3, 3], "x": 3.5, "y": 3}, {"matrix": [3, 3], "x": 3.5, "y": 3},
@ -84,10 +157,8 @@
{"matrix": [3, 11], "x": 11.5, "y": 3}, {"matrix": [3, 11], "x": 11.5, "y": 3},
{"matrix": [3, 12], "x": 12.5, "y": 3}, {"matrix": [3, 12], "x": 12.5, "y": 3},
{"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75}, {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
{"matrix": [3, 14], "x": 16.75, "y": 3}, {"matrix": [3, 15], "x": 16.75, "y": 3},
{"matrix": [3, 14], "x": 15.5, "y": 3.25},
{"matrix": [3, 15], "x": 15.5, "y": 3.25},
{"matrix": [4, 0], "x": 0, "y": 4}, {"matrix": [4, 0], "x": 0, "y": 4},
{"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
{"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
@ -95,89 +166,6 @@
{"matrix": [4, 7], "x": 5, "y": 4, "w": 6.25}, {"matrix": [4, 7], "x": 5, "y": 4, "w": 6.25},
{"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
{"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25}, {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
{"matrix": [4, 13], "x": 14.5, "y": 4.25},
{"matrix": [4, 14], "x": 15.5, "y": 4.25},
{"matrix": [4, 15], "x": 16.5, "y": 4.25}
]
},
"LAYOUT_65_ansi": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1.25, "y": 0},
{"matrix": [0, 2], "x": 2.25, "y": 0},
{"matrix": [0, 3], "x": 3.25, "y": 0},
{"matrix": [0, 4], "x": 4.25, "y": 0},
{"matrix": [0, 5], "x": 5.25, "y": 0},
{"matrix": [0, 6], "x": 6.25, "y": 0},
{"matrix": [0, 7], "x": 7.25, "y": 0},
{"matrix": [0, 8], "x": 8.25, "y": 0},
{"matrix": [0, 9], "x": 9.25, "y": 0},
{"matrix": [0, 10], "x": 10.25, "y": 0},
{"matrix": [0, 11], "x": 11.25, "y": 0},
{"matrix": [0, 12], "x": 12.25, "y": 0},
{"matrix": [0, 13], "x": 13.25, "y": 0},
{"matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
{"matrix": [0, 15], "x": 16.75, "y": 0},
{"matrix": [1, 0], "x": 0, "y": 1},
{"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
{"matrix": [1, 2], "x": 2.75, "y": 1},
{"matrix": [1, 3], "x": 3.75, "y": 1},
{"matrix": [1, 4], "x": 4.75, "y": 1},
{"matrix": [1, 5], "x": 5.75, "y": 1},
{"matrix": [1, 6], "x": 6.75, "y": 1},
{"matrix": [1, 7], "x": 7.75, "y": 1},
{"matrix": [1, 8], "x": 8.75, "y": 1},
{"matrix": [1, 9], "x": 9.75, "y": 1},
{"matrix": [1, 10], "x": 10.75, "y": 1},
{"matrix": [1, 11], "x": 11.75, "y": 1},
{"matrix": [1, 12], "x": 12.75, "y": 1},
{"matrix": [1, 13], "x": 13.75, "y": 1},
{"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
{"matrix": [1, 15], "x": 16.75, "y": 1},
{"matrix": [2, 0], "x": 0, "y": 2},
{"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
{"matrix": [2, 2], "x": 3, "y": 2},
{"matrix": [2, 3], "x": 4, "y": 2},
{"matrix": [2, 4], "x": 5, "y": 2},
{"matrix": [2, 5], "x": 6, "y": 2},
{"matrix": [2, 6], "x": 7, "y": 2},
{"matrix": [2, 7], "x": 8, "y": 2},
{"matrix": [2, 8], "x": 9, "y": 2},
{"matrix": [2, 9], "x": 10, "y": 2},
{"matrix": [2, 10], "x": 11, "y": 2},
{"matrix": [2, 11], "x": 12, "y": 2},
{"matrix": [2, 12], "x": 13, "y": 2},
{"matrix": [2, 14], "x": 14, "y": 2, "w": 2.25},
{"matrix": [2, 15], "x": 16.75, "y": 2},
{"matrix": [3, 0], "x": 0, "y": 3},
{"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
{"matrix": [3, 3], "x": 3.5, "y": 3},
{"matrix": [3, 4], "x": 4.5, "y": 3},
{"matrix": [3, 5], "x": 5.5, "y": 3},
{"matrix": [3, 6], "x": 6.5, "y": 3},
{"matrix": [3, 7], "x": 7.5, "y": 3},
{"matrix": [3, 8], "x": 8.5, "y": 3},
{"matrix": [3, 9], "x": 9.5, "y": 3},
{"matrix": [3, 10], "x": 10.5, "y": 3},
{"matrix": [3, 11], "x": 11.5, "y": 3},
{"matrix": [3, 12], "x": 12.5, "y": 3},
{"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
{"matrix": [3, 14], "x": 16.75, "y": 3},
{"matrix": [3, 15], "x": 15.5, "y": 3.25},
{"matrix": [4, 0], "x": 0, "y": 4},
{"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
{"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
{"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
{"matrix": [4, 7], "x": 5, "y": 4, "w": 6.25},
{"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
{"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
{"matrix": [4, 13], "x": 14.5, "y": 4.25}, {"matrix": [4, 13], "x": 14.5, "y": 4.25},
{"matrix": [4, 14], "x": 15.5, "y": 4.25}, {"matrix": [4, 14], "x": 15.5, "y": 4.25},
{"matrix": [4, 15], "x": 16.5, "y": 4.25} {"matrix": [4, 15], "x": 16.5, "y": 4.25}
@ -201,7 +189,6 @@
{"matrix": [0, 13], "x": 13.25, "y": 0}, {"matrix": [0, 13], "x": 13.25, "y": 0},
{"matrix": [0, 14], "x": 14.25, "y": 0, "w": 2}, {"matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
{"matrix": [0, 15], "x": 16.75, "y": 0}, {"matrix": [0, 15], "x": 16.75, "y": 0},
{"matrix": [1, 0], "x": 0, "y": 1}, {"matrix": [1, 0], "x": 0, "y": 1},
{"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5}, {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
{"matrix": [1, 2], "x": 2.75, "y": 1}, {"matrix": [1, 2], "x": 2.75, "y": 1},
@ -218,7 +205,6 @@
{"matrix": [1, 13], "x": 13.75, "y": 1}, {"matrix": [1, 13], "x": 13.75, "y": 1},
{"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5}, {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
{"matrix": [1, 15], "x": 16.75, "y": 1}, {"matrix": [1, 15], "x": 16.75, "y": 1},
{"matrix": [2, 0], "x": 0, "y": 2}, {"matrix": [2, 0], "x": 0, "y": 2},
{"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75}, {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
{"matrix": [2, 2], "x": 3, "y": 2}, {"matrix": [2, 2], "x": 3, "y": 2},
@ -234,7 +220,6 @@
{"matrix": [2, 12], "x": 13, "y": 2}, {"matrix": [2, 12], "x": 13, "y": 2},
{"matrix": [2, 14], "x": 14, "y": 2, "w": 2.25}, {"matrix": [2, 14], "x": 14, "y": 2, "w": 2.25},
{"matrix": [2, 15], "x": 16.75, "y": 2}, {"matrix": [2, 15], "x": 16.75, "y": 2},
{"matrix": [3, 0], "x": 0, "y": 3}, {"matrix": [3, 0], "x": 0, "y": 3},
{"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25}, {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
{"matrix": [3, 3], "x": 3.5, "y": 3}, {"matrix": [3, 3], "x": 3.5, "y": 3},
@ -248,20 +233,17 @@
{"matrix": [3, 11], "x": 11.5, "y": 3}, {"matrix": [3, 11], "x": 11.5, "y": 3},
{"matrix": [3, 12], "x": 12.5, "y": 3}, {"matrix": [3, 12], "x": 12.5, "y": 3},
{"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75}, {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
{"matrix": [3, 14], "x": 16.75, "y": 3}, {"matrix": [3, 15], "x": 16.75, "y": 3},
{"matrix": [3, 14], "x": 15.5, "y": 3.25},
{"matrix": [3, 15], "x": 15.5, "y": 3.25},
{"matrix": [4, 0], "x": 0, "y": 4}, {"matrix": [4, 0], "x": 0, "y": 4},
{"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5}, {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
{"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.5}, {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.5},
{"matrix": [4, 7], "x": 5.25, "y": 4, "w": 7}, {"matrix": [4, 7], "x": 5.25, "y": 4, "w": 7},
{"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.5}, {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.5},
{"matrix": [4, 13], "x": 14.5, "y": 4.25}, {"matrix": [4, 13], "x": 14.5, "y": 4.25},
{"matrix": [4, 14], "x": 15.5, "y": 4.25}, {"matrix": [4, 14], "x": 15.5, "y": 4.25},
{"matrix": [4, 15], "x": 16.5, "y": 4.25} {"matrix": [4, 15], "x": 16.5, "y": 4.25}
] ]
} }
} }
} }