Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Teleport Native Layout Implementation Rework #19576

Merged
merged 3 commits into from
Jan 13, 2023
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
move layout macros to their respective PCB directories
Make it so each PCB cannot access layout macros for the other PCB (can't use ISO macro with ANSI PCB and vice versa).
  • Loading branch information
noroadsleft committed Jan 9, 2023

Verified

This commit was signed with the committer’s verified signature.
noroadsleft James Young
commit 23b6a3a9ffd2130494db9e801f7270f8e25881b9
96 changes: 95 additions & 1 deletion keyboards/teleport/native/ansi/info.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,100 @@
{
"usb": {
"pid": "0x0003"
},
"layouts": {
"LAYOUT_75_ansi": {
"layout": [
{"matrix":[0,0], "x":0, "y":0},
{"matrix":[1,0], "x":1, "y":0},
{"matrix":[0,1], "x":2, "y":0},
{"matrix":[1,1], "x":3, "y":0},
{"matrix":[0,2], "x":4, "y":0},
{"matrix":[1,2], "x":5, "y":0},
{"matrix":[0,3], "x":6, "y":0},
{"matrix":[1,3], "x":7, "y":0},
{"matrix":[0,4], "x":8, "y":0},
{"matrix":[1,4], "x":9, "y":0},
{"matrix":[0,5], "x":10, "y":0},
{"matrix":[1,5], "x":11, "y":0},
{"matrix":[0,6], "x":12, "y":0},
{"matrix":[1,6], "x":13, "y":0},
{"matrix":[0,7], "x":14, "y":0},
{"matrix":[1,7], "x":15, "y":0},

{"matrix":[2,0], "x":0, "y":1},
{"matrix":[3,0], "x":1, "y":1},
{"matrix":[2,1], "x":2, "y":1},
{"matrix":[3,1], "x":3, "y":1},
{"matrix":[2,2], "x":4, "y":1},
{"matrix":[3,2], "x":5, "y":1},
{"matrix":[2,3], "x":6, "y":1},
{"matrix":[3,3], "x":7, "y":1},
{"matrix":[2,4], "x":8, "y":1},
{"matrix":[3,4], "x":9, "y":1},
{"matrix":[2,5], "x":10, "y":1},
{"matrix":[3,5], "x":11, "y":1},
{"matrix":[2,6], "x":12, "y":1},
{"matrix":[3,6], "x":13, "y":1, "w":2},
{"matrix":[3,7], "x":15, "y":1},

{"matrix":[4,0], "x":0, "y":2, "w":1.5},
{"matrix":[4,1], "x":1.5, "y":2},
{"matrix":[5,1], "x":2.5, "y":2},
{"matrix":[4,2], "x":3.5, "y":2},
{"matrix":[5,2], "x":4.5, "y":2},
{"matrix":[4,3], "x":5.5, "y":2},
{"matrix":[5,3], "x":6.5, "y":2},
{"matrix":[4,4], "x":7.5, "y":2},
{"matrix":[5,4], "x":8.5, "y":2},
{"matrix":[4,5], "x":9.5, "y":2},
{"matrix":[5,5], "x":10.5, "y":2},
{"matrix":[4,6], "x":11.5, "y":2},
{"matrix":[5,6], "x":12.5, "y":2},
{"matrix":[4,7], "x":13.5, "y":2, "w":1.5},
{"matrix":[5,7], "x":15, "y":2},

{"matrix":[6,0], "x":0, "y":3, "w":1.75},
{"matrix":[7,0], "x":1.75, "y":3},
{"matrix":[6,1], "x":2.75, "y":3},
{"matrix":[7,1], "x":3.75, "y":3},
{"matrix":[6,2], "x":4.75, "y":3},
{"matrix":[7,2], "x":5.75, "y":3},
{"matrix":[6,3], "x":6.75, "y":3},
{"matrix":[7,3], "x":7.75, "y":3},
{"matrix":[6,4], "x":8.75, "y":3},
{"matrix":[7,4], "x":9.75, "y":3},
{"matrix":[6,5], "x":10.75, "y":3},
{"matrix":[7,5], "x":11.75, "y":3},
{"matrix":[6,7], "x":12.75, "y":3, "w":2.25},
{"matrix":[7,7], "x":15, "y":3},

{"matrix":[8,0], "x":0, "y":4, "w":1.25},
{"matrix":[8,1], "x":2.25, "y":4},
{"matrix":[9,1], "x":3.25, "y":4},
{"matrix":[8,2], "x":4.25, "y":4},
{"matrix":[9,2], "x":5.25, "y":4},
{"matrix":[8,3], "x":6.25, "y":4},
{"matrix":[9,3], "x":7.25, "y":4},
{"matrix":[8,4], "x":8.25, "y":4},
{"matrix":[9,4], "x":9.25, "y":4},
{"matrix":[8,5], "x":10.25, "y":4},
{"matrix":[9,5], "x":11.25, "y":4},
{"matrix":[9,6], "x":12.25, "y":4, "w":1.75},
{"matrix":[8,7], "x":14, "y":4},
{"matrix":[9,7], "x":15, "y":4},

{"matrix":[10,0], "x":0, "y":5, "w":1.25},
{"matrix":[11,0], "x":1.25, "y":5, "w":1.25},
{"matrix":[11,1], "x":2.5, "y":5, "w":1.25},
{"matrix":[10,1], "x":3.75, "y":5, "w":6.25},
{"matrix":[10,5], "x":10, "y":5},
{"matrix":[11,5], "x":11, "y":5},
{"matrix":[10,6], "x":12, "y":5},
{"matrix":[11,6], "x":13, "y":5},
{"matrix":[10,7], "x":14, "y":5},
{"matrix":[11,7], "x":15, "y":5}
]
}
}
}

189 changes: 0 additions & 189 deletions keyboards/teleport/native/info.json
Original file line number Diff line number Diff line change
@@ -23,195 +23,6 @@
"matrix_pins": {
"cols": [ "A5", "A4", "B12", "B14", "B8", "B3", "B4", "B5" ],
"rows": [ "C14", "C15", "C13", "A1", "A15", "A14", "A13", "B13", "B15", "A8", "A2", "A3" ]
},
"layouts": {
"LAYOUT_75_iso": {
"layout": [
{"matrix":[0,0], "x":0, "y":0},
{"matrix":[1,0], "x":1, "y":0},
{"matrix":[0,1], "x":2, "y":0},
{"matrix":[1,1], "x":3, "y":0},
{"matrix":[0,2], "x":4, "y":0},
{"matrix":[1,2], "x":5, "y":0},
{"matrix":[0,3], "x":6, "y":0},
{"matrix":[1,3], "x":7, "y":0},
{"matrix":[0,4], "x":8, "y":0},
{"matrix":[1,4], "x":9, "y":0},
{"matrix":[0,5], "x":10, "y":0},
{"matrix":[1,5], "x":11, "y":0},
{"matrix":[0,6], "x":12, "y":0},
{"matrix":[1,6], "x":13, "y":0},
{"matrix":[0,7], "x":14, "y":0},
{"matrix":[1,7], "x":15, "y":0},

{"matrix":[2,0], "x":0, "y":1},
{"matrix":[3,0], "x":1, "y":1},
{"matrix":[2,1], "x":2, "y":1},
{"matrix":[3,1], "x":3, "y":1},
{"matrix":[2,2], "x":4, "y":1},
{"matrix":[3,2], "x":5, "y":1},
{"matrix":[2,3], "x":6, "y":1},
{"matrix":[3,3], "x":7, "y":1},
{"matrix":[2,4], "x":8, "y":1},
{"matrix":[3,4], "x":9, "y":1},
{"matrix":[2,5], "x":10, "y":1},
{"matrix":[3,5], "x":11, "y":1},
{"matrix":[2,6], "x":12, "y":1},
{"matrix":[3,6], "x":13, "y":1, "w":2},
{"matrix":[3,7], "x":15, "y":1},

{"matrix":[4,0], "x":0, "y":2, "w":1.5},
{"matrix":[4,1], "x":1.5, "y":2},
{"matrix":[5,1], "x":2.5, "y":2},
{"matrix":[4,2], "x":3.5, "y":2},
{"matrix":[5,2], "x":4.5, "y":2},
{"matrix":[4,3], "x":5.5, "y":2},
{"matrix":[5,3], "x":6.5, "y":2},
{"matrix":[4,4], "x":7.5, "y":2},
{"matrix":[5,4], "x":8.5, "y":2},
{"matrix":[4,5], "x":9.5, "y":2},
{"matrix":[5,5], "x":10.5, "y":2},
{"matrix":[4,6], "x":11.5, "y":2},
{"matrix":[5,6], "x":12.5, "y":2},
{"matrix":[4,7], "x":13.75, "y":2, "w":1.25, "h":2},
{"matrix":[5,7], "x":15, "y":2},

{"matrix":[6,0], "x":0, "y":3, "w":1.75},
{"matrix":[7,0], "x":1.75, "y":3},
{"matrix":[6,1], "x":2.75, "y":3},
{"matrix":[7,1], "x":3.75, "y":3},
{"matrix":[6,2], "x":4.75, "y":3},
{"matrix":[7,2], "x":5.75, "y":3},
{"matrix":[6,3], "x":6.75, "y":3},
{"matrix":[7,3], "x":7.75, "y":3},
{"matrix":[6,4], "x":8.75, "y":3},
{"matrix":[7,4], "x":9.75, "y":3},
{"matrix":[6,5], "x":10.75, "y":3},
{"matrix":[7,5], "x":11.75, "y":3},
{"matrix":[6,7], "x":12.75, "y":3},
{"matrix":[7,7], "x":15, "y":3},

{"matrix":[8,0], "x":0, "y":4, "w":1.25},
{"matrix":[9,0], "x":1.25, "y":4},
{"matrix":[8,1], "x":2.25, "y":4},
{"matrix":[9,1], "x":3.25, "y":4},
{"matrix":[8,2], "x":4.25, "y":4},
{"matrix":[9,2], "x":5.25, "y":4},
{"matrix":[8,3], "x":6.25, "y":4},
{"matrix":[9,3], "x":7.25, "y":4},
{"matrix":[8,4], "x":8.25, "y":4},
{"matrix":[9,4], "x":9.25, "y":4},
{"matrix":[8,5], "x":10.25, "y":4},
{"matrix":[9,5], "x":11.25, "y":4},
{"matrix":[9,6], "x":12.25, "y":4, "w":1.75},
{"matrix":[8,7], "x":14, "y":4},
{"matrix":[9,7], "x":15, "y":4},

{"matrix":[10,0], "x":0, "y":5, "w":1.25},
{"matrix":[11,0], "x":1.25, "y":5, "w":1.25},
{"matrix":[11,1], "x":2.5, "y":5, "w":1.25},
{"matrix":[10,1], "x":3.75, "y":5, "w":6.25},
{"matrix":[10,5], "x":10, "y":5},
{"matrix":[11,5], "x":11, "y":5},
{"matrix":[10,6], "x":12, "y":5},
{"matrix":[11,6], "x":13, "y":5},
{"matrix":[10,7], "x":14, "y":5},
{"matrix":[11,7], "x":15, "y":5}
]
},
"LAYOUT_75_ansi": {
"layout": [
{"matrix":[0,0], "x":0, "y":0},
{"matrix":[1,0], "x":1, "y":0},
{"matrix":[0,1], "x":2, "y":0},
{"matrix":[1,1], "x":3, "y":0},
{"matrix":[0,2], "x":4, "y":0},
{"matrix":[1,2], "x":5, "y":0},
{"matrix":[0,3], "x":6, "y":0},
{"matrix":[1,3], "x":7, "y":0},
{"matrix":[0,4], "x":8, "y":0},
{"matrix":[1,4], "x":9, "y":0},
{"matrix":[0,5], "x":10, "y":0},
{"matrix":[1,5], "x":11, "y":0},
{"matrix":[0,6], "x":12, "y":0},
{"matrix":[1,6], "x":13, "y":0},
{"matrix":[0,7], "x":14, "y":0},
{"matrix":[1,7], "x":15, "y":0},

{"matrix":[2,0], "x":0, "y":1},
{"matrix":[3,0], "x":1, "y":1},
{"matrix":[2,1], "x":2, "y":1},
{"matrix":[3,1], "x":3, "y":1},
{"matrix":[2,2], "x":4, "y":1},
{"matrix":[3,2], "x":5, "y":1},
{"matrix":[2,3], "x":6, "y":1},
{"matrix":[3,3], "x":7, "y":1},
{"matrix":[2,4], "x":8, "y":1},
{"matrix":[3,4], "x":9, "y":1},
{"matrix":[2,5], "x":10, "y":1},
{"matrix":[3,5], "x":11, "y":1},
{"matrix":[2,6], "x":12, "y":1},
{"matrix":[3,6], "x":13, "y":1, "w":2},
{"matrix":[3,7], "x":15, "y":1},

{"matrix":[4,0], "x":0, "y":2, "w":1.5},
{"matrix":[4,1], "x":1.5, "y":2},
{"matrix":[5,1], "x":2.5, "y":2},
{"matrix":[4,2], "x":3.5, "y":2},
{"matrix":[5,2], "x":4.5, "y":2},
{"matrix":[4,3], "x":5.5, "y":2},
{"matrix":[5,3], "x":6.5, "y":2},
{"matrix":[4,4], "x":7.5, "y":2},
{"matrix":[5,4], "x":8.5, "y":2},
{"matrix":[4,5], "x":9.5, "y":2},
{"matrix":[5,5], "x":10.5, "y":2},
{"matrix":[4,6], "x":11.5, "y":2},
{"matrix":[5,6], "x":12.5, "y":2},
{"matrix":[4,7], "x":13.5, "y":2, "w":1.5},
{"matrix":[5,7], "x":15, "y":2},

{"matrix":[6,0], "x":0, "y":3, "w":1.75},
{"matrix":[7,0], "x":1.75, "y":3},
{"matrix":[6,1], "x":2.75, "y":3},
{"matrix":[7,1], "x":3.75, "y":3},
{"matrix":[6,2], "x":4.75, "y":3},
{"matrix":[7,2], "x":5.75, "y":3},
{"matrix":[6,3], "x":6.75, "y":3},
{"matrix":[7,3], "x":7.75, "y":3},
{"matrix":[6,4], "x":8.75, "y":3},
{"matrix":[7,4], "x":9.75, "y":3},
{"matrix":[6,5], "x":10.75, "y":3},
{"matrix":[7,5], "x":11.75, "y":3},
{"matrix":[6,7], "x":12.75, "y":3, "w":2.25},
{"matrix":[7,7], "x":15, "y":3},

{"matrix":[8,0], "x":0, "y":4, "w":1.25},
{"matrix":[8,1], "x":2.25, "y":4},
{"matrix":[9,1], "x":3.25, "y":4},
{"matrix":[8,2], "x":4.25, "y":4},
{"matrix":[9,2], "x":5.25, "y":4},
{"matrix":[8,3], "x":6.25, "y":4},
{"matrix":[9,3], "x":7.25, "y":4},
{"matrix":[8,4], "x":8.25, "y":4},
{"matrix":[9,4], "x":9.25, "y":4},
{"matrix":[8,5], "x":10.25, "y":4},
{"matrix":[9,5], "x":11.25, "y":4},
{"matrix":[9,6], "x":12.25, "y":4, "w":1.75},
{"matrix":[8,7], "x":14, "y":4},
{"matrix":[9,7], "x":15, "y":4},

{"matrix":[10,0], "x":0, "y":5, "w":1.25},
{"matrix":[11,0], "x":1.25, "y":5, "w":1.25},
{"matrix":[11,1], "x":2.5, "y":5, "w":1.25},
{"matrix":[10,1], "x":3.75, "y":5, "w":6.25},
{"matrix":[10,5], "x":10, "y":5},
{"matrix":[11,5], "x":11, "y":5},
{"matrix":[10,6], "x":12, "y":5},
{"matrix":[11,6], "x":13, "y":5},
{"matrix":[10,7], "x":14, "y":5},
{"matrix":[11,7], "x":15, "y":5}
]
}
}
}

Loading