Skip to content

Commit

Permalink
4pplet/aekiso60 Layout Macro Conversion and Additions (#20399)
Browse files Browse the repository at this point in the history 
* add matrix_diagram.md

Adds `matrix_diagram.md` to the `4pplet/aekiso60` directory, and removes the diagrams from the keyboard revision header files.

* info.json: apply friendly formatting

* move matrix data to info.json

* create keyboard-level info.json

* add LAYOUT_60_iso_tsangan

* enable Community Layout support
  • Loading branch information
@noroadsleft
noroadsleft authored Apr 11, 2023
1 parent 38700f7 commit 26b35a5
Show file tree
Hide file tree
Showing 8 changed files with 190 additions and 257 deletions.
155 changes: 155 additions & 0 deletions keyboards/4pplet/aekiso60/info.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,155 @@
{
"manufacturer": "4pplet",
"url": "",
"maintainer": "4pplet",
"usb": {
"vid": "0x4444"
},
"community_layouts": [
"60_iso_tsangan"
],
"layouts": {
"LAYOUT_all": {
"layout": [
{"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0, "w": 1.25},
{"label": "1", "matrix": [0, 1], "x": 1.25, "y": 0},
{"label": "2", "matrix": [0, 2], "x": 2.25, "y": 0},
{"label": "3", "matrix": [0, 3], "x": 3.25, "y": 0},
{"label": "4", "matrix": [0, 4], "x": 4.25, "y": 0},
{"label": "5", "matrix": [0, 5], "x": 5.25, "y": 0},
{"label": "6", "matrix": [0, 6], "x": 6.25, "y": 0},
{"label": "7", "matrix": [0, 7], "x": 7.25, "y": 0},
{"label": "8", "matrix": [0, 8], "x": 8.25, "y": 0},
{"label": "9", "matrix": [0, 9], "x": 9.25, "y": 0},
{"label": "0", "matrix": [0, 10], "x": 10.25, "y": 0},
{"label": "-", "matrix": [0, 11], "x": 11.25, "y": 0},
{"label": "=", "matrix": [0, 12], "x": 12.25, "y": 0},
{"label": "Backspace", "matrix": [0, 13], "x": 13.25, "y": 0, "w": 1.75},

{"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.75},
{"label": "Q", "matrix": [1, 1], "x": 1.75, "y": 1},
{"label": "W", "matrix": [1, 2], "x": 2.75, "y": 1},
{"label": "E", "matrix": [1, 3], "x": 3.75, "y": 1},
{"label": "R", "matrix": [1, 4], "x": 4.75, "y": 1},
{"label": "T", "matrix": [1, 5], "x": 5.75, "y": 1},
{"label": "Y", "matrix": [1, 6], "x": 6.75, "y": 1},
{"label": "U", "matrix": [1, 7], "x": 7.75, "y": 1},
{"label": "I", "matrix": [1, 8], "x": 8.75, "y": 1},
{"label": "O", "matrix": [1, 9], "x": 9.75, "y": 1},
{"label": "P", "matrix": [1, 10], "x": 10.75, "y": 1},
{"label": "[", "matrix": [1, 11], "x": 11.75, "y": 1},
{"label": "]", "matrix": [1, 12], "x": 12.75, "y": 1},

{"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 2, "w": 2},
{"label": "A", "matrix": [2, 1], "x": 2, "y": 2},
{"label": "S", "matrix": [2, 2], "x": 3, "y": 2},
{"label": "D", "matrix": [2, 3], "x": 4, "y": 2},
{"label": "F", "matrix": [2, 4], "x": 5, "y": 2},
{"label": "G", "matrix": [2, 5], "x": 6, "y": 2},
{"label": "H", "matrix": [2, 6], "x": 7, "y": 2},
{"label": "J", "matrix": [2, 7], "x": 8, "y": 2},
{"label": "K", "matrix": [2, 8], "x": 9, "y": 2},
{"label": "L", "matrix": [2, 9], "x": 10, "y": 2},
{"label": ";", "matrix": [2, 10], "x": 11, "y": 2},
{"label": "'", "matrix": [2, 11], "x": 12, "y": 2},
{"label": "#", "matrix": [2, 12], "x": 13, "y": 2},
{"label": "Enter", "matrix": [1, 13], "x": 14, "y": 1, "h": 2},

{"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
{"label": "\\", "matrix": [3, 1], "x": 1.5, "y": 3},
{"label": "Z", "matrix": [3, 2], "x": 2.5, "y": 3},
{"label": "X", "matrix": [3, 3], "x": 3.5, "y": 3},
{"label": "C", "matrix": [3, 4], "x": 4.5, "y": 3},
{"label": "V", "matrix": [3, 5], "x": 5.5, "y": 3},
{"label": "B", "matrix": [3, 6], "x": 6.5, "y": 3},
{"label": "N", "matrix": [3, 7], "x": 7.5, "y": 3},
{"label": "M", "matrix": [3, 8], "x": 8.5, "y": 3},
{"label": ",", "matrix": [3, 9], "x": 9.5, "y": 3},
{"label": ".", "matrix": [3, 10], "x": 10.5, "y": 3},
{"label": "/", "matrix": [3, 11], "x": 11.5, "y": 3},
{"label": "Shift", "matrix": [3, 12], "x": 12.5, "y": 3, "w": 1.5},
{"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},

{"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
{"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
{"label": "Alt", "matrix": [4, 3], "x": 2.75, "y": 4, "w": 1.5},
{"label": "\u25bd", "matrix": [4, 4], "x": 4.25, "y": 4, "w": 2.75},
{"label": "Space", "matrix": [4, 5], "x": 7, "y": 4},
{"label": "\u25bd", "matrix": [4, 6], "x": 8, "y": 4, "w": 2.75},
{"label": "Alt", "matrix": [4, 8], "x": 10.75, "y": 4, "w": 1.5},
{"label": "GUI", "matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.25},
{"label": "Ctrl", "matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.5}
]
},

"LAYOUT_60_iso_tsangan": {
"layout": [
{"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0, "w": 1.25},
{"label": "1", "matrix": [0, 1], "x": 1.25, "y": 0},
{"label": "2", "matrix": [0, 2], "x": 2.25, "y": 0},
{"label": "3", "matrix": [0, 3], "x": 3.25, "y": 0},
{"label": "4", "matrix": [0, 4], "x": 4.25, "y": 0},
{"label": "5", "matrix": [0, 5], "x": 5.25, "y": 0},
{"label": "6", "matrix": [0, 6], "x": 6.25, "y": 0},
{"label": "7", "matrix": [0, 7], "x": 7.25, "y": 0},
{"label": "8", "matrix": [0, 8], "x": 8.25, "y": 0},
{"label": "9", "matrix": [0, 9], "x": 9.25, "y": 0},
{"label": "0", "matrix": [0, 10], "x": 10.25, "y": 0},
{"label": "-", "matrix": [0, 11], "x": 11.25, "y": 0},
{"label": "=", "matrix": [0, 12], "x": 12.25, "y": 0},
{"label": "Backspace", "matrix": [0, 13], "x": 13.25, "y": 0, "w": 1.75},

{"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.75},
{"label": "Q", "matrix": [1, 1], "x": 1.75, "y": 1},
{"label": "W", "matrix": [1, 2], "x": 2.75, "y": 1},
{"label": "E", "matrix": [1, 3], "x": 3.75, "y": 1},
{"label": "R", "matrix": [1, 4], "x": 4.75, "y": 1},
{"label": "T", "matrix": [1, 5], "x": 5.75, "y": 1},
{"label": "Y", "matrix": [1, 6], "x": 6.75, "y": 1},
{"label": "U", "matrix": [1, 7], "x": 7.75, "y": 1},
{"label": "I", "matrix": [1, 8], "x": 8.75, "y": 1},
{"label": "O", "matrix": [1, 9], "x": 9.75, "y": 1},
{"label": "P", "matrix": [1, 10], "x": 10.75, "y": 1},
{"label": "[", "matrix": [1, 11], "x": 11.75, "y": 1},
{"label": "]", "matrix": [1, 12], "x": 12.75, "y": 1},

{"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 2, "w": 2},
{"label": "A", "matrix": [2, 1], "x": 2, "y": 2},
{"label": "S", "matrix": [2, 2], "x": 3, "y": 2},
{"label": "D", "matrix": [2, 3], "x": 4, "y": 2},
{"label": "F", "matrix": [2, 4], "x": 5, "y": 2},
{"label": "G", "matrix": [2, 5], "x": 6, "y": 2},
{"label": "H", "matrix": [2, 6], "x": 7, "y": 2},
{"label": "J", "matrix": [2, 7], "x": 8, "y": 2},
{"label": "K", "matrix": [2, 8], "x": 9, "y": 2},
{"label": "L", "matrix": [2, 9], "x": 10, "y": 2},
{"label": ";", "matrix": [2, 10], "x": 11, "y": 2},
{"label": "'", "matrix": [2, 11], "x": 12, "y": 2},
{"label": "#", "matrix": [2, 12], "x": 13, "y": 2},
{"label": "Enter", "matrix": [1, 13], "x": 14, "y": 1, "h": 2},

{"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
{"label": "\\", "matrix": [3, 1], "x": 1.5, "y": 3},
{"label": "Z", "matrix": [3, 2], "x": 2.5, "y": 3},
{"label": "X", "matrix": [3, 3], "x": 3.5, "y": 3},
{"label": "C", "matrix": [3, 4], "x": 4.5, "y": 3},
{"label": "V", "matrix": [3, 5], "x": 5.5, "y": 3},
{"label": "B", "matrix": [3, 6], "x": 6.5, "y": 3},
{"label": "N", "matrix": [3, 7], "x": 7.5, "y": 3},
{"label": "M", "matrix": [3, 8], "x": 8.5, "y": 3},
{"label": ",", "matrix": [3, 9], "x": 9.5, "y": 3},
{"label": ".", "matrix": [3, 10], "x": 10.5, "y": 3},
{"label": "/", "matrix": [3, 11], "x": 11.5, "y": 3},
{"label": "Shift", "matrix": [3, 12], "x": 12.5, "y": 3, "w": 2.5},

{"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
{"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
{"label": "Alt", "matrix": [4, 3], "x": 2.75, "y": 4, "w": 1.5},
{"label": "Space", "matrix": [4, 5], "x": 4.25, "y": 4, "w": 6.5},
{"label": "Alt", "matrix": [4, 8], "x": 10.75, "y": 4, "w": 1.5},
{"label": "GUI", "matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.25},
{"label": "Ctrl", "matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.5}
]
}
}
}
33 changes: 33 additions & 0 deletions keyboards/4pplet/aekiso60/matrix_diagram.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Matrix Diagram for 4pplet AEKISO60 (Revs. A and B)

```
┌────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬──────┐
│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │
├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤
│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │ │
├──────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐1d │
│20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │ │
├─────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ ┌─────────┐
│30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c │3d │ │3c │ 2.75u RShift
├─────┼───┴┬──┴──┬┴───┴───┴─┬─┴─┬─┴───┴───┴┬──┴──┬┴───┬─┴───┤ └─────────┘
│40 │41 │43 │44 │45 │46 │48 │4a │4b │
└─────┴────┴─────┴──────────┴───┴──────────┴─────┴────┴─────┘
┌─────┬────┬─────┬─────────────────────────┬─────┬────┬─────┐ ─┐
│40 │41 │43 │45 │48 │4a │4b │ ├─ Tsangan
└─────┴────┴─────┴─────────────────────────┴─────┴────┴─────┘ │
┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐ │
│40 │41 │43 │45 │48 │4a │4b │ │
└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ ─┘
┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
│40 │ │43 │45 │48 │ │4b │ WKL
└─────┘ └─────┴───────────────────────────┴─────┘ └─────┘
┌─────┬────┬─────┬─────────┬─────┬─────────┬─────┬────┬─────┐ ─┐
│40 │41 │43 │44 │45 │46 │48 │4a │4b │ ├─ same matrix as LAYOUT_all
└─────┴────┴─────┴─────────┴─────┴─────────┴─────┴────┴─────┘ │
┌─────┬────┬─────┬────────┬─────┬──────────┬─────┬────┬─────┐ │
│40 │41 │43 │44 │45 │46 │48 │4a │4b │ │
└─────┴────┴─────┴────────┴─────┴──────────┴─────┴────┴─────┘ │
┌─────┬────┬─────┬─────────┬────┬──────────┬─────┬────┬─────┐ │
│40 │41 │43 │44 │45 │46 │48 │4a │4b │ │
└─────┴────┴─────┴─────────┴────┴──────────┴─────┴────┴─────┘ ─┘
```
80 changes: 1 addition & 79 deletions keyboards/4pplet/aekiso60/rev_a/info.json
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
{
"keyboard_name": "AEKISO60 Rev A",
"manufacturer": "4pplet",
"url": "",
"maintainer": "4pplet",
"usb": {
"vid": "0x4444",
"pid": "0x0001",
"device_version": "0.0.1"
},
Expand All @@ -13,79 +9,5 @@
"esc_output": "C4"
},
"processor": "atmega32u2",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_all": {
"layout": [
{"x":0, "y":0, "w":1.25},
{"x":1.25, "y":0},
{"x":2.25, "y":0},
{"x":3.25, "y":0},
{"x":4.25, "y":0},
{"x":5.25, "y":0},
{"x":6.25, "y":0},
{"x":7.25, "y":0},
{"x":8.25, "y":0},
{"x":9.25, "y":0},
{"x":10.25, "y":0},
{"x":11.25, "y":0},
{"x":12.25, "y":0},
{"x":13.25, "y":0, "w":1.75},

{"x":0, "y":1, "w":1.75},
{"x":1.75, "y":1},
{"x":2.75, "y":1},
{"x":3.75, "y":1},
{"x":4.75, "y":1},
{"x":5.75, "y":1},
{"x":6.75, "y":1},
{"x":7.75, "y":1},
{"x":8.75, "y":1},
{"x":9.75, "y":1},
{"x":10.75, "y":1},
{"x":11.75, "y":1},
{"x":12.75, "y":1},

{"x":0, "y":2, "w":2},
{"x":2, "y":2},
{"x":3, "y":2},
{"x":4, "y":2},
{"x":5, "y":2},
{"x":6, "y":2},
{"x":7, "y":2},
{"x":8, "y":2},
{"x":9, "y":2},
{"x":10, "y":2},
{"x":11, "y":2},
{"x":12, "y":2},
{"x":13, "y":2},
{"x":14, "y":1, "h":2},

{"x":0, "y":3, "w":1.5},
{"x":1.5, "y":3},
{"x":2.5, "y":3},
{"x":3.5, "y":3},
{"x":4.5, "y":3},
{"x":5.5, "y":3},
{"x":6.5, "y":3},
{"x":7.5, "y":3},
{"x":8.5, "y":3},
{"x":9.5, "y":3},
{"x":10.5, "y":3},
{"x":11.5, "y":3},
{"x":12.5, "y":3, "w":1.5},
{"x":14, "y":3},

{"x":0, "y":4, "w":1.5},
{"x":1.5, "y":4, "w":1.25},
{"x":2.75, "y":4, "w":1.5},
{"x":4.25, "y":4, "w":2.75},
{"x":7, "y":4},
{"x":8, "y":4, "w":2.75},
{"x":10.75, "y":4, "w":1.5},
{"x":12.25, "y":4, "w":1.25},
{"x":13.5, "y":4, "w":1.5}
]
}
}
"bootloader": "atmel-dfu"
}
1 change: 0 additions & 1 deletion keyboards/4pplet/aekiso60/rev_a/rev_a.c
View file

This file was deleted.

31 changes: 0 additions & 31 deletions keyboards/4pplet/aekiso60/rev_a/rev_a.h
View file

This file was deleted.

Loading

0 comments on commit 26b35a5

Please sign in to comment.