marco/qmk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
QMK Bot 2023-06-15 20:57:46 +00:00
commit 579db6131e
2 changed files with 66 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
keyboards/alas/info.json
View File

@ -326,21 +326,21 @@
{"matrix": [1, 10], "x": 10.5, "y": 1}, {"matrix": [1, 10], "x": 10.5, "y": 1},
{"matrix": [1, 11], "x": 11.5, "y": 1}, {"matrix": [1, 11], "x": 11.5, "y": 1},
{"matrix": [1, 12], "x": 12.5, "y": 1}, {"matrix": [1, 12], "x": 12.5, "y": 1},
{"matrix": [2, 0], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
{"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75}, {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
{"matrix": [2, 2], "x": 1.75, "y": 2}, {"matrix": [2, 1], "x": 1.75, "y": 2},
{"matrix": [2, 3], "x": 2.75, "y": 2}, {"matrix": [2, 2], "x": 2.75, "y": 2},
{"matrix": [2, 4], "x": 3.75, "y": 2}, {"matrix": [2, 3], "x": 3.75, "y": 2},
{"matrix": [2, 5], "x": 4.75, "y": 2}, {"matrix": [2, 4], "x": 4.75, "y": 2},
{"matrix": [2, 6], "x": 5.75, "y": 2}, {"matrix": [2, 5], "x": 5.75, "y": 2},
{"matrix": [2, 7], "x": 6.75, "y": 2}, {"matrix": [2, 6], "x": 6.75, "y": 2},
{"matrix": [2, 8], "x": 7.75, "y": 2}, {"matrix": [2, 7], "x": 7.75, "y": 2},
{"matrix": [2, 9], "x": 8.75, "y": 2}, {"matrix": [2, 8], "x": 8.75, "y": 2},
{"matrix": [2, 10], "x": 9.75, "y": 2}, {"matrix": [2, 9], "x": 9.75, "y": 2},
{"matrix": [2, 11], "x": 10.75, "y": 2}, {"matrix": [2, 10], "x": 10.75, "y": 2},
{"matrix": [1, 13], "x": 11.75, "y": 2}, {"matrix": [2, 11], "x": 11.75, "y": 2},
{"matrix": [2, 13], "x": 12.75, "y": 2}, {"matrix": [1, 13], "x": 12.75, "y": 2},
{"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
{"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
{"matrix": [3, 1], "x": 1.25, "y": 3}, {"matrix": [3, 1], "x": 1.25, "y": 3},
@ -397,21 +397,21 @@
{"matrix": [1, 10], "x": 10.5, "y": 1}, {"matrix": [1, 10], "x": 10.5, "y": 1},
{"matrix": [1, 11], "x": 11.5, "y": 1}, {"matrix": [1, 11], "x": 11.5, "y": 1},
{"matrix": [1, 12], "x": 12.5, "y": 1}, {"matrix": [1, 12], "x": 12.5, "y": 1},
{"matrix": [2, 0], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
{"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75}, {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
{"matrix": [2, 2], "x": 1.75, "y": 2}, {"matrix": [2, 1], "x": 1.75, "y": 2},
{"matrix": [2, 3], "x": 2.75, "y": 2}, {"matrix": [2, 2], "x": 2.75, "y": 2},
{"matrix": [2, 4], "x": 3.75, "y": 2}, {"matrix": [2, 3], "x": 3.75, "y": 2},
{"matrix": [2, 5], "x": 4.75, "y": 2}, {"matrix": [2, 4], "x": 4.75, "y": 2},
{"matrix": [2, 6], "x": 5.75, "y": 2}, {"matrix": [2, 5], "x": 5.75, "y": 2},
{"matrix": [2, 7], "x": 6.75, "y": 2}, {"matrix": [2, 6], "x": 6.75, "y": 2},
{"matrix": [2, 8], "x": 7.75, "y": 2}, {"matrix": [2, 7], "x": 7.75, "y": 2},
{"matrix": [2, 9], "x": 8.75, "y": 2}, {"matrix": [2, 8], "x": 8.75, "y": 2},
{"matrix": [2, 10], "x": 9.75, "y": 2}, {"matrix": [2, 9], "x": 9.75, "y": 2},
{"matrix": [2, 11], "x": 10.75, "y": 2}, {"matrix": [2, 10], "x": 10.75, "y": 2},
{"matrix": [1, 13], "x": 11.75, "y": 2}, {"matrix": [2, 11], "x": 11.75, "y": 2},
{"matrix": [2, 13], "x": 12.75, "y": 2}, {"matrix": [1, 13], "x": 12.75, "y": 2},
{"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
{"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
{"matrix": [3, 1], "x": 1.25, "y": 3}, {"matrix": [3, 1], "x": 1.25, "y": 3},
@ -468,21 +468,21 @@
{"matrix": [1, 10], "x": 10.5, "y": 1}, {"matrix": [1, 10], "x": 10.5, "y": 1},
{"matrix": [1, 11], "x": 11.5, "y": 1}, {"matrix": [1, 11], "x": 11.5, "y": 1},
{"matrix": [1, 12], "x": 12.5, "y": 1}, {"matrix": [1, 12], "x": 12.5, "y": 1},
{"matrix": [2, 0], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
{"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75}, {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
{"matrix": [2, 2], "x": 1.75, "y": 2}, {"matrix": [2, 1], "x": 1.75, "y": 2},
{"matrix": [2, 3], "x": 2.75, "y": 2}, {"matrix": [2, 2], "x": 2.75, "y": 2},
{"matrix": [2, 4], "x": 3.75, "y": 2}, {"matrix": [2, 3], "x": 3.75, "y": 2},
{"matrix": [2, 5], "x": 4.75, "y": 2}, {"matrix": [2, 4], "x": 4.75, "y": 2},
{"matrix": [2, 6], "x": 5.75, "y": 2}, {"matrix": [2, 5], "x": 5.75, "y": 2},
{"matrix": [2, 7], "x": 6.75, "y": 2}, {"matrix": [2, 6], "x": 6.75, "y": 2},
{"matrix": [2, 8], "x": 7.75, "y": 2}, {"matrix": [2, 7], "x": 7.75, "y": 2},
{"matrix": [2, 9], "x": 8.75, "y": 2}, {"matrix": [2, 8], "x": 8.75, "y": 2},
{"matrix": [2, 10], "x": 9.75, "y": 2}, {"matrix": [2, 9], "x": 9.75, "y": 2},
{"matrix": [2, 11], "x": 10.75, "y": 2}, {"matrix": [2, 10], "x": 10.75, "y": 2},
{"matrix": [1, 13], "x": 11.75, "y": 2}, {"matrix": [2, 11], "x": 11.75, "y": 2},
{"matrix": [2, 13], "x": 12.75, "y": 2}, {"matrix": [1, 13], "x": 12.75, "y": 2},
{"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
{"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
{"matrix": [3, 1], "x": 1.25, "y": 3}, {"matrix": [3, 1], "x": 1.25, "y": 3},

24
keyboards/alas/matrix_diagram.md Normal file
View File

@ -0,0 +1,24 @@
# Matrix Diagram for Yiancar-Designs Alas
```
┌───────┐
2u Backspace │0D │
└───────┘
┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │2C │
├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ┌─────┐
│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │ │ │
├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ┌──┴┐2D │ ISO Enter
│20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D │ │1D │ │
├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ └───┴────┘
│30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │
├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤
│40 │41 │42 │46 │4A │4B │4C │4D │
└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
┌────────┐ ┌──────────┐
│30 │ 2.25u LShift 2.75u RShift │3C │
└────────┘ └──────────┘
┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
│40 │41 │42 │46 │4B │4C │4D │ Tsangan/WKL/HHKB
└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
```