Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@qmk-bot
qmk-bot committed Jun 22, 2023
2 parents c601b1f + cc4ac72 commit 5a4fab0
Show file tree
Hide file tree
Showing 2 changed files with 69 additions and 28 deletions.
61 changes: 33 additions & 28 deletions keyboards/igloo/info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,13 @@
{"matrix": [0, 10], "x": 10, "y": 0},
{"matrix": [0, 11], "x": 11, "y": 0},
{"matrix": [0, 12], "x": 12, "y": 0},
{"matrix": [0, 13], "w": 2, "x": 13, "y": 0},
{"matrix": [0, 14], "x": 15.25, "y": 0},
{"matrix": [0, 15], "x": 16.25, "y": 0},
{"matrix": [0, 16], "x": 17.25, "y": 0},
{"matrix": [0, 13], "x": 14, "y": 0},

{"matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
{"matrix": [0, 14], "x": 15.5, "y": 0},
{"matrix": [0, 15], "x": 16.5, "y": 0},
{"matrix": [0, 16], "x": 17.5, "y": 0},

{"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
{"matrix": [1, 1], "x": 1.5, "y": 1},
{"matrix": [1, 2], "x": 2.5, "y": 1},
{"matrix": [1, 3], "x": 3.5, "y": 1},
Expand All @@ -59,12 +60,13 @@
{"matrix": [1, 10], "x": 10.5, "y": 1},
{"matrix": [1, 11], "x": 11.5, "y": 1},
{"matrix": [1, 12], "x": 12.5, "y": 1},
{"matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
{"matrix": [1, 14], "x": 15.25, "y": 1},
{"matrix": [1, 15], "x": 16.25, "y": 1},
{"matrix": [1, 16], "x": 17.25, "y": 1},
{"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},

{"matrix": [1, 14], "x": 15.5, "y": 1},
{"matrix": [1, 15], "x": 16.5, "y": 1},
{"matrix": [1, 16], "x": 17.5, "y": 1},

{"matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
{"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
{"matrix": [2, 1], "x": 1.75, "y": 2},
{"matrix": [2, 2], "x": 2.75, "y": 2},
{"matrix": [2, 3], "x": 3.75, "y": 2},
Expand All @@ -76,12 +78,13 @@
{"matrix": [2, 9], "x": 9.75, "y": 2},
{"matrix": [2, 10], "x": 10.75, "y": 2},
{"matrix": [2, 11], "x": 11.75, "y": 2},
{"matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2},
{"matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2},
{"matrix": [2, 14], "x": 12.75, "y": 2},
{"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},

{"matrix": [2, 13], "x": 20.5, "y": 1, "w": 1.25, "h":2},
{"matrix": [2, 14], "x": 19.5, "y": 2},
{"matrix": [2, 15], "x": 13, "y": 0},

{"matrix": [3, 0], "w": 2.25, "x": 0, "y": 3},
{"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
{"matrix": [3, 1], "x": 1.25, "y": 3},
{"matrix": [3, 2], "x": 2.25, "y": 3},
{"matrix": [3, 3], "x": 3.25, "y": 3},
Expand All @@ -93,22 +96,24 @@
{"matrix": [3, 9], "x": 9.25, "y": 3},
{"matrix": [3, 10], "x": 10.25, "y": 3},
{"matrix": [3, 11], "x": 11.25, "y": 3},
{"matrix": [3, 12], "x": 12.25, "y": 3},
{"matrix": [3, 14], "x": 13.25, "y": 3},
{"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
{"matrix": [3, 14], "x": 14, "y": 3},

{"matrix": [3, 15], "x": 16.25, "y": 3},

{"matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
{"matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
{"matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4},
{"matrix": [4, 3], "x": 6.25, "y": 4},
{"matrix": [4, 4], "w": 2.25, "x": 4, "y": 4},
{"matrix": [4, 5], "w": 6.25, "x": 3.75, "y": 4},
{"matrix": [4, 6], "w": 2.25, "x": 7.25, "y": 4},
{"matrix": [4, 9], "w": 1.25, "x": 10, "y": 4},
{"matrix": [4, 10], "w": 1.25, "x": 11.25, "y": 4},
{"matrix": [4, 11], "w": 1.25, "x": 12.5, "y": 4},
{"matrix": [4, 12], "w": 1.25, "x": 13.75, "y": 4},
{"matrix": [4, 13], "w": 1.25, "x": 15, "y": 4},
{"matrix": [4, 0], "x": 0, "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, 3], "x": 6.25, "y": 5},
{"matrix": [4, 4], "x": 4, "y": 5, "w": 2.25},
{"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
{"matrix": [4, 6], "x": 7.25, "y": 5, "w": 2.25},
{"matrix": [4, 9], "x": 10, "y": 4},
{"matrix": [4, 10], "x": 11, "y": 4},
{"matrix": [4, 11], "x": 12, "y": 4},
{"matrix": [4, 12], "x": 13, "y": 4},
{"matrix": [4, 13], "x": 14, "y": 4},

{"matrix": [4, 14], "x": 15.25, "y": 4},
{"matrix": [4, 15], "x": 16.25, "y": 4},
{"matrix": [4, 16], "x": 17.25, "y": 4}
Expand Down
36 changes: 36 additions & 0 deletions keyboards/igloo/matrix_diagram.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# Matrix Diagram for Dong Jae Shin Igloo

<!--
I've taken this matrix data from the VIA data, because the source on the
QMK side doesn't make sense to me. As a result, this diagram does not
match the QMK source.
- @noroadsleft
2023-06-19
-->

```
┌───────┐
2u Backspace │0D │
└───────┘
┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐
│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │2F │0D ││0E │0F │0G │
├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤ ┌─────┐
│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D ││1E │1F │1G │ │ │
├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘ ┌──┴┐2D │ ISO Enter
│20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │ │2E │ │
├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ ┌───┐ └───┴────┘
│30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3E │ │3F │
├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐
│40 │41 │42 │47 │49 │4A │4B │4D ││4E │4F │4G │
└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
┌────────┐ ┌──────────┐
│30 │ 2.25u LShift 2.75u RShift │3C │
└────────┘ └──────────┘
┌─────┬───┬─────┬───────────┬───┬───────────┬─────┬───┬─────┐
│40 │41 │42 │45 │44 │46 │4A │4B │4D │ Tsangan/WKL Split Space
└─────┴───┴─────┴───────────┴───┴───────────┴─────┴───┴─────┘
┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
│40 │41 │42 │44 │4A │4B │4D │ Tsangan/WKL
└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
```

0 comments on commit 5a4fab0

Please sign in to comment.