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

This commit is contained in:
QMK Bot 2024-03-15 01:32:49 +00:00
commit 16ad09299c
2 changed files with 246 additions and 0 deletions

View File

@ -130,6 +130,227 @@
{"matrix": [0, 14], "x": 17, "y": 4},
{"matrix": [0, 7], "x": 18, "y": 4},
{"matrix": [6, 0], "x": 0, "y": 5, "w": 1.25},
{"matrix": [6, 1], "x": 1.25, "y": 5, "w": 1.25},
{"matrix": [6, 2], "x": 2.5, "y": 5, "w": 1.25},
{"matrix": [6, 3], "x": 3.75, "y": 5, "w": 6.25},
{"matrix": [6, 4], "x": 10, "y": 5, "w": 1.5},
{"matrix": [6, 5], "x": 11.5, "y": 5, "w": 1.5},
{"matrix": [6, 6], "x": 13, "y": 5},
{"matrix": [6, 8], "x": 14, "y": 5},
{"matrix": [6, 9], "x": 15, "y": 5},
{"matrix": [6, 10], "x": 16, "y": 5},
{"matrix": [6, 11], "x": 17, "y": 5},
{"matrix": [6, 12], "x": 18, "y": 5}
]
},
"LAYOUT_96_ansi_rwkl_split_num_plus_enter": {
"layout": [
{"matrix": [1, 0], "x": 0, "y": 0},
{"matrix": [1, 1], "x": 1, "y": 0},
{"matrix": [1, 2], "x": 2, "y": 0},
{"matrix": [1, 3], "x": 3, "y": 0},
{"matrix": [1, 4], "x": 4, "y": 0},
{"matrix": [1, 5], "x": 5, "y": 0},
{"matrix": [1, 6], "x": 6, "y": 0},
{"matrix": [1, 7], "x": 7, "y": 0},
{"matrix": [1, 8], "x": 8, "y": 0},
{"matrix": [1, 9], "x": 9, "y": 0},
{"matrix": [1, 10], "x": 10, "y": 0},
{"matrix": [1, 11], "x": 11, "y": 0},
{"matrix": [1, 12], "x": 12, "y": 0},
{"matrix": [1, 13], "x": 13, "y": 0},
{"matrix": [1, 14], "x": 14, "y": 0},
{"matrix": [1, 15], "x": 15, "y": 0},
{"matrix": [0, 9], "x": 16, "y": 0},
{"matrix": [0, 10], "x": 17, "y": 0},
{"matrix": [0, 12], "x": 18, "y": 0},
{"matrix": [2, 0], "x": 0, "y": 1},
{"matrix": [2, 1], "x": 1, "y": 1},
{"matrix": [2, 2], "x": 2, "y": 1},
{"matrix": [2, 3], "x": 3, "y": 1},
{"matrix": [2, 4], "x": 4, "y": 1},
{"matrix": [2, 5], "x": 5, "y": 1},
{"matrix": [2, 6], "x": 6, "y": 1},
{"matrix": [2, 7], "x": 7, "y": 1},
{"matrix": [2, 8], "x": 8, "y": 1},
{"matrix": [2, 9], "x": 9, "y": 1},
{"matrix": [2, 10], "x": 10, "y": 1},
{"matrix": [2, 11], "x": 11, "y": 1},
{"matrix": [2, 12], "x": 12, "y": 1},
{"matrix": [2, 13], "x": 13, "y": 1, "w": 2},
{"matrix": [2, 15], "x": 15, "y": 1},
{"matrix": [0, 11], "x": 16, "y": 1},
{"matrix": [0, 15], "x": 17, "y": 1},
{"matrix": [6, 15], "x": 18, "y": 1},
{"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
{"matrix": [3, 1], "x": 1.5, "y": 2},
{"matrix": [3, 2], "x": 2.5, "y": 2},
{"matrix": [3, 3], "x": 3.5, "y": 2},
{"matrix": [3, 4], "x": 4.5, "y": 2},
{"matrix": [3, 5], "x": 5.5, "y": 2},
{"matrix": [3, 6], "x": 6.5, "y": 2},
{"matrix": [3, 7], "x": 7.5, "y": 2},
{"matrix": [3, 8], "x": 8.5, "y": 2},
{"matrix": [3, 9], "x": 9.5, "y": 2},
{"matrix": [3, 10], "x": 10.5, "y": 2},
{"matrix": [3, 11], "x": 11.5, "y": 2},
{"matrix": [3, 12], "x": 12.5, "y": 2},
{"matrix": [3, 13], "x": 13.5, "y": 2, "w": 1.5},
{"matrix": [3, 14], "x": 15, "y": 2},
{"matrix": [3, 15], "x": 16, "y": 2},
{"matrix": [0, 13], "x": 17, "y": 2},
{"matrix": [6, 13], "x": 18, "y": 2},
{"matrix": [4, 0], "x": 0, "y": 3, "w": 1.75},
{"matrix": [4, 1], "x": 1.75, "y": 3},
{"matrix": [4, 2], "x": 2.75, "y": 3},
{"matrix": [4, 3], "x": 3.75, "y": 3},
{"matrix": [4, 4], "x": 4.75, "y": 3},
{"matrix": [4, 5], "x": 5.75, "y": 3},
{"matrix": [4, 6], "x": 6.75, "y": 3},
{"matrix": [4, 7], "x": 7.75, "y": 3},
{"matrix": [4, 8], "x": 8.75, "y": 3},
{"matrix": [4, 9], "x": 9.75, "y": 3},
{"matrix": [4, 10], "x": 10.75, "y": 3},
{"matrix": [4, 11], "x": 11.75, "y": 3},
{"matrix": [4, 12], "x": 12.75, "y": 3, "w": 2.25},
{"matrix": [4, 13], "x": 15, "y": 3},
{"matrix": [4, 14], "x": 16, "y": 3},
{"matrix": [4, 15], "x": 17, "y": 3},
{"matrix": [6, 14], "x": 18, "y": 3},
{"matrix": [5, 0], "x": 0, "y": 4, "w": 2.25},
{"matrix": [5, 2], "x": 2.25, "y": 4},
{"matrix": [5, 3], "x": 3.25, "y": 4},
{"matrix": [5, 4], "x": 4.25, "y": 4},
{"matrix": [5, 5], "x": 5.25, "y": 4},
{"matrix": [5, 6], "x": 6.25, "y": 4},
{"matrix": [5, 7], "x": 7.25, "y": 4},
{"matrix": [5, 8], "x": 8.25, "y": 4},
{"matrix": [5, 9], "x": 9.25, "y": 4},
{"matrix": [5, 10], "x": 10.25, "y": 4},
{"matrix": [5, 11], "x": 11.25, "y": 4},
{"matrix": [5, 12], "x": 12.25, "y": 4, "w": 1.75},
{"matrix": [5, 13], "x": 14, "y": 4},
{"matrix": [5, 14], "x": 15, "y": 4},
{"matrix": [5, 15], "x": 16, "y": 4},
{"matrix": [0, 14], "x": 17, "y": 4},
{"matrix": [0, 7], "x": 18, "y": 4},
{"matrix": [6, 0], "x": 0, "y": 5, "w": 1.25},
{"matrix": [6, 1], "x": 1.25, "y": 5, "w": 1.25},
{"matrix": [6, 2], "x": 2.5, "y": 5, "w": 1.25},
{"matrix": [6, 3], "x": 3.75, "y": 5, "w": 6.25},
{"matrix": [6, 4], "x": 10, "y": 5, "w": 1.5},
{"matrix": [6, 5], "x": 11.5, "y": 5, "w": 1.5},
{"matrix": [6, 6], "x": 13, "y": 5},
{"matrix": [6, 8], "x": 14, "y": 5},
{"matrix": [6, 9], "x": 15, "y": 5},
{"matrix": [6, 10], "x": 16, "y": 5},
{"matrix": [6, 11], "x": 17, "y": 5},
{"matrix": [6, 12], "x": 18, "y": 5}
]
},
"LAYOUT_96_ansi_rwkl_split_bs_num_plus_enter": {
"layout": [
{"matrix": [1, 0], "x": 0, "y": 0},
{"matrix": [1, 1], "x": 1, "y": 0},
{"matrix": [1, 2], "x": 2, "y": 0},
{"matrix": [1, 3], "x": 3, "y": 0},
{"matrix": [1, 4], "x": 4, "y": 0},
{"matrix": [1, 5], "x": 5, "y": 0},
{"matrix": [1, 6], "x": 6, "y": 0},
{"matrix": [1, 7], "x": 7, "y": 0},
{"matrix": [1, 8], "x": 8, "y": 0},
{"matrix": [1, 9], "x": 9, "y": 0},
{"matrix": [1, 10], "x": 10, "y": 0},
{"matrix": [1, 11], "x": 11, "y": 0},
{"matrix": [1, 12], "x": 12, "y": 0},
{"matrix": [1, 13], "x": 13, "y": 0},
{"matrix": [1, 14], "x": 14, "y": 0},
{"matrix": [1, 15], "x": 15, "y": 0},
{"matrix": [0, 9], "x": 16, "y": 0},
{"matrix": [0, 10], "x": 17, "y": 0},
{"matrix": [0, 12], "x": 18, "y": 0},
{"matrix": [2, 0], "x": 0, "y": 1},
{"matrix": [2, 1], "x": 1, "y": 1},
{"matrix": [2, 2], "x": 2, "y": 1},
{"matrix": [2, 3], "x": 3, "y": 1},
{"matrix": [2, 4], "x": 4, "y": 1},
{"matrix": [2, 5], "x": 5, "y": 1},
{"matrix": [2, 6], "x": 6, "y": 1},
{"matrix": [2, 7], "x": 7, "y": 1},
{"matrix": [2, 8], "x": 8, "y": 1},
{"matrix": [2, 9], "x": 9, "y": 1},
{"matrix": [2, 10], "x": 10, "y": 1},
{"matrix": [2, 11], "x": 11, "y": 1},
{"matrix": [2, 12], "x": 12, "y": 1},
{"matrix": [2, 13], "x": 13, "y": 1},
{"matrix": [2, 14], "x": 14, "y": 1},
{"matrix": [2, 15], "x": 15, "y": 1},
{"matrix": [0, 11], "x": 16, "y": 1},
{"matrix": [0, 15], "x": 17, "y": 1},
{"matrix": [6, 15], "x": 18, "y": 1},
{"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
{"matrix": [3, 1], "x": 1.5, "y": 2},
{"matrix": [3, 2], "x": 2.5, "y": 2},
{"matrix": [3, 3], "x": 3.5, "y": 2},
{"matrix": [3, 4], "x": 4.5, "y": 2},
{"matrix": [3, 5], "x": 5.5, "y": 2},
{"matrix": [3, 6], "x": 6.5, "y": 2},
{"matrix": [3, 7], "x": 7.5, "y": 2},
{"matrix": [3, 8], "x": 8.5, "y": 2},
{"matrix": [3, 9], "x": 9.5, "y": 2},
{"matrix": [3, 10], "x": 10.5, "y": 2},
{"matrix": [3, 11], "x": 11.5, "y": 2},
{"matrix": [3, 12], "x": 12.5, "y": 2},
{"matrix": [3, 13], "x": 13.5, "y": 2, "w": 1.5},
{"matrix": [3, 14], "x": 15, "y": 2},
{"matrix": [3, 15], "x": 16, "y": 2},
{"matrix": [0, 13], "x": 17, "y": 2},
{"matrix": [6, 13], "x": 18, "y": 2},
{"matrix": [4, 0], "x": 0, "y": 3, "w": 1.75},
{"matrix": [4, 1], "x": 1.75, "y": 3},
{"matrix": [4, 2], "x": 2.75, "y": 3},
{"matrix": [4, 3], "x": 3.75, "y": 3},
{"matrix": [4, 4], "x": 4.75, "y": 3},
{"matrix": [4, 5], "x": 5.75, "y": 3},
{"matrix": [4, 6], "x": 6.75, "y": 3},
{"matrix": [4, 7], "x": 7.75, "y": 3},
{"matrix": [4, 8], "x": 8.75, "y": 3},
{"matrix": [4, 9], "x": 9.75, "y": 3},
{"matrix": [4, 10], "x": 10.75, "y": 3},
{"matrix": [4, 11], "x": 11.75, "y": 3},
{"matrix": [4, 12], "x": 12.75, "y": 3, "w": 2.25},
{"matrix": [4, 13], "x": 15, "y": 3},
{"matrix": [4, 14], "x": 16, "y": 3},
{"matrix": [4, 15], "x": 17, "y": 3},
{"matrix": [6, 14], "x": 18, "y": 3},
{"matrix": [5, 0], "x": 0, "y": 4, "w": 2.25},
{"matrix": [5, 2], "x": 2.25, "y": 4},
{"matrix": [5, 3], "x": 3.25, "y": 4},
{"matrix": [5, 4], "x": 4.25, "y": 4},
{"matrix": [5, 5], "x": 5.25, "y": 4},
{"matrix": [5, 6], "x": 6.25, "y": 4},
{"matrix": [5, 7], "x": 7.25, "y": 4},
{"matrix": [5, 8], "x": 8.25, "y": 4},
{"matrix": [5, 9], "x": 9.25, "y": 4},
{"matrix": [5, 10], "x": 10.25, "y": 4},
{"matrix": [5, 11], "x": 11.25, "y": 4},
{"matrix": [5, 12], "x": 12.25, "y": 4, "w": 1.75},
{"matrix": [5, 13], "x": 14, "y": 4},
{"matrix": [5, 14], "x": 15, "y": 4},
{"matrix": [5, 15], "x": 16, "y": 4},
{"matrix": [0, 14], "x": 17, "y": 4},
{"matrix": [0, 7], "x": 18, "y": 4},
{"matrix": [6, 0], "x": 0, "y": 5, "w": 1.25},
{"matrix": [6, 1], "x": 1.25, "y": 5, "w": 1.25},
{"matrix": [6, 2], "x": 2.5, "y": 5, "w": 1.25},

View File

@ -0,0 +1,25 @@
# Matrix Diagram for Han Chen AMJ96
There's a lot of options available on the PCB, including some on the
bottom row, but I haven't ever found high quality images of a bare PCB
with which to determine what's actually supported. :\\\
\- @noroadsleft, 19 January, 2024
```
┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │1F │09 │0A │0C │
├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ ┌───────┐
│20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D │2E │2F │0B │0F │6F │ │2D │ 2u Backspace
├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┼───┼───┼───┤ └─┬─────┤ ┌─────┐ ┌───┐
│30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3E │3F │0D │6D │ │ │ │3D │ │ │
├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┼───┼───┼───┤ ┌──┴┐?? │ ISO Enter ┌──┴┬────┤ Split Enter │?? │ 2u Numpad Plus
│40 │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C │4D │4E │4F │6E │ │?? │ │ │?? │?? │ │ │
├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┼───┼───┼───┤ ┌─┴───┴────┤ └───┴────┘ ├───┤
│50 │51 │52 │53 │54 │55 │56 │57 │58 │59 │5A │5B │5C │5D │5E │5F │0E │07 │ │?? │ 2.75u │ │
├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┼───┼───┼───┼───┼───┤ └──────────┘ RShift │?? │ 2u Numpad Enter
│60 │61 │62 │63 │64 │65 │66 │68 │69 │6A │6B │6C │ │ │
└────┴────┴────┴────────────────────────┴─────┴─────┴───┴───┴───┴───┴───┴───┘ └───┘
┌────────┐ ┌───────┐
│50 │ 2.25u LShift │?? │ 2u Numpad Zero
└────────┘ └───────┘
```