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.

Sign up for GitHub

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

Jump to bottom

CannonKeys Nearfield Layout Macro Addition #20566

Merged
merged 3 commits into from
Apr 26, 2023
Merged

CannonKeys Nearfield Layout Macro Addition #20566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a48b208
add matrix_diagram.md
noroadsleft Apr 22, 2023
cfc1221
info.json: apply friendly formatting
noroadsleft Apr 22, 2023
d0b5565
add LAYOUT_3u_space
noroadsleft Apr 22, 2023
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
257 changes: 168 additions & 89 deletions keyboards/cannonkeys/nearfield/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,93 +17,172 @@
"bootloader": "atmel-dfu",
"debounce": 0,
"layouts": {
"LAYOUT_all": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1, "y": 0},
{"matrix": [0, 2], "x": 2, "y": 0},
{"matrix": [0, 3], "x": 3, "y": 0},
{"matrix": [0, 4], "x": 4, "y": 0},
{"matrix": [0, 5], "x": 5, "y": 0},

{"matrix": [0, 6], "x": 7.5, "y": 0},
{"matrix": [0, 7], "x": 8.5, "y": 0},
{"matrix": [0, 8], "x": 9.5, "y": 0},
{"matrix": [0, 9], "x": 10.5, "y": 0},
{"matrix": [0, 10], "x": 11.5, "y": 0},
{"matrix": [0, 11], "x": 12.5, "y": 0},
{"matrix": [0, 12], "x": 13.5, "y": 0},

{"matrix": [0, 13], "x": 15.5, "y": 0},
{"matrix": [0, 14], "x": 16.5, "y": 0},
{"matrix": [0, 15], "x": 17.5, "y": 0},

{"matrix": [1, 0], "x": 0, "y": 1.5},
{"matrix": [1, 1], "x": 1, "y": 1.5},
{"matrix": [1, 2], "x": 2, "y": 1.5},
{"matrix": [1, 3], "x": 3, "y": 1.5},
{"matrix": [1, 4], "x": 4, "y": 1.5},
{"matrix": [1, 5], "x": 5, "y": 1.5},

{"matrix": [1, 6], "x": 7.5, "y": 1.5},
{"matrix": [1, 7], "x": 8.5, "y": 1.5},
{"matrix": [1, 8], "x": 9.5, "y": 1.5},
{"matrix": [1, 9], "x": 10.5, "y": 1.5},
{"matrix": [1, 10], "x": 11.5, "y": 1.5},
{"matrix": [1, 11], "x": 12.5, "y": 1.5},
{"matrix": [1, 12], "x": 13.5, "y": 1.5},

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

{"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.25},
{"matrix": [2, 1], "x": 1.25, "y": 2.5},
{"matrix": [2, 2], "x": 2.25, "y": 2.5},
{"matrix": [2, 3], "x": 3.25, "y": 2.5},
{"matrix": [2, 4], "x": 4.25, "y": 2.5},
{"matrix": [2, 5], "x": 5.25, "y": 2.5},

{"matrix": [2, 6], "x": 7.75, "y": 2.5},
{"matrix": [2, 7], "x": 8.75, "y": 2.5},
{"matrix": [2, 8], "x": 9.75, "y": 2.5},
{"matrix": [2, 9], "x": 10.75, "y": 2.5},
{"matrix": [2, 10], "x": 11.75, "y": 2.5},
{"matrix": [2, 11], "x": 12.75, "y": 2.5, "w": 1.75},

{"matrix": [2, 13], "x": 15.5, "y": 2.5},
{"matrix": [2, 14], "x": 16.5, "y": 2.5},
{"matrix": [2, 15], "x": 17.5, "y": 2.5},

{"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
{"matrix": [3, 1], "x": 1.75, "y": 3.5},
{"matrix": [3, 2], "x": 2.75, "y": 3.5},
{"matrix": [3, 3], "x": 3.75, "y": 3.5},
{"matrix": [3, 4], "x": 4.75, "y": 3.5},
{"matrix": [3, 5], "x": 5.75, "y": 3.5},

{"matrix": [3, 6], "x": 8.25, "y": 3.5},
{"matrix": [3, 7], "x": 9.25, "y": 3.5},
{"matrix": [3, 8], "x": 10.25, "y": 3.5},
{"matrix": [3, 9], "x": 11.25, "y": 3.5},
{"matrix": [3, 10], "x": 12.25, "y": 3.5},
{"matrix": [3, 11], "x": 13.25, "y": 3.5, "w": 1.25},

{"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
{"matrix": [4, 1], "x": 2.5, "y": 4.5, "w": 1.25},
{"matrix": [4, 3], "x": 3.75, "y": 4.5},
{"matrix": [4, 4], "x": 4.75, "y": 4.5, "w": 2},

{"matrix": [4, 6], "x": 8.25, "y": 4.5, "w": 2.25},
{"matrix": [4, 8], "x": 10.5, "y": 4.5, "w": 1.25},
{"matrix": [4, 10], "x": 13, "y": 4.5, "w": 1.5},

{"matrix": [4, 12], "x": 16.5, "y": 4.5},

{"matrix": [4, 13], "x": 15.5, "y": 5.5},
{"matrix": [4, 14], "x": 16.5, "y": 5.5},
{"matrix": [4, 15], "x": 17.5, "y": 5.5}
]
}
"LAYOUT_all": {
"layout": [
{"label": "`", "matrix": [0, 0], "x": 0, "y": 0},
{"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
{"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
{"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
{"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
{"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
{"label": "6", "matrix": [0, 6], "x": 7.5, "y": 0},

{"label": "7", "matrix": [0, 7], "x": 8.5, "y": 0},
{"label": "8", "matrix": [0, 8], "x": 9.5, "y": 0},
{"label": "9", "matrix": [0, 9], "x": 10.5, "y": 0},
{"label": "0", "matrix": [0, 10], "x": 11.5, "y": 0},
{"label": "-", "matrix": [0, 11], "x": 12.5, "y": 0},
{"label": "=", "matrix": [0, 12], "x": 13.5, "y": 0},

{"label": "Insert", "matrix": [0, 13], "x": 15.5, "y": 0},
{"label": "Home", "matrix": [0, 14], "x": 16.5, "y": 0},
{"label": "Page Up", "matrix": [0, 15], "x": 17.5, "y": 0},

{"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1.5},
{"label": "Q", "matrix": [1, 1], "x": 1, "y": 1.5},
{"label": "W", "matrix": [1, 2], "x": 2, "y": 1.5},
{"label": "E", "matrix": [1, 3], "x": 3, "y": 1.5},
{"label": "R", "matrix": [1, 4], "x": 4, "y": 1.5},
{"label": "T", "matrix": [1, 5], "x": 5, "y": 1.5},

{"label": "Y", "matrix": [1, 6], "x": 7.5, "y": 1.5},
{"label": "U", "matrix": [1, 7], "x": 8.5, "y": 1.5},
{"label": "I", "matrix": [1, 8], "x": 9.5, "y": 1.5},
{"label": "O", "matrix": [1, 9], "x": 10.5, "y": 1.5},
{"label": "P", "matrix": [1, 10], "x": 11.5, "y": 1.5},
{"label": "[", "matrix": [1, 11], "x": 12.5, "y": 1.5},
{"label": "]", "matrix": [1, 12], "x": 13.5, "y": 1.5},

{"label": "Insert", "matrix": [1, 13], "x": 15.5, "y": 1.5},
{"label": "Home", "matrix": [1, 14], "x": 16.5, "y": 1.5},
{"label": "Page Up", "matrix": [1, 15], "x": 17.5, "y": 1.5},

{"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.25},
{"label": "A", "matrix": [2, 1], "x": 1.25, "y": 2.5},
{"label": "S", "matrix": [2, 2], "x": 2.25, "y": 2.5},
{"label": "D", "matrix": [2, 3], "x": 3.25, "y": 2.5},
{"label": "F", "matrix": [2, 4], "x": 4.25, "y": 2.5},
{"label": "G", "matrix": [2, 5], "x": 5.25, "y": 2.5},

{"label": "H", "matrix": [2, 6], "x": 7.75, "y": 2.5},
{"label": "J", "matrix": [2, 7], "x": 8.75, "y": 2.5},
{"label": "K", "matrix": [2, 8], "x": 9.75, "y": 2.5},
{"label": "L", "matrix": [2, 9], "x": 10.75, "y": 2.5},
{"label": "'", "matrix": [2, 10], "x": 11.75, "y": 2.5},
{"label": "Enter", "matrix": [2, 11], "x": 12.75, "y": 2.5, "w": 1.75},

{"label": "Delete", "matrix": [2, 13], "x": 15.5, "y": 2.5},
{"label": "End", "matrix": [2, 14], "x": 16.5, "y": 2.5},
{"label": "Page Down", "matrix": [2, 15], "x": 17.5, "y": 2.5},

{"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
{"label": "Z", "matrix": [3, 1], "x": 1.75, "y": 3.5},
{"label": "X", "matrix": [3, 2], "x": 2.75, "y": 3.5},
{"label": "C", "matrix": [3, 3], "x": 3.75, "y": 3.5},
{"label": "V", "matrix": [3, 4], "x": 4.75, "y": 3.5},
{"label": "B", "matrix": [3, 5], "x": 5.75, "y": 3.5},

{"label": "N", "matrix": [3, 6], "x": 8.25, "y": 3.5},
{"label": "M", "matrix": [3, 7], "x": 9.25, "y": 3.5},
{"label": ",", "matrix": [3, 8], "x": 10.25, "y": 3.5},
{"label": ".", "matrix": [3, 9], "x": 11.25, "y": 3.5},
{"label": "/", "matrix": [3, 10], "x": 12.25, "y": 3.5},
{"label": "Shift", "matrix": [3, 11], "x": 13.25, "y": 3.5, "w": 1.25},

{"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
{"label": "Alt", "matrix": [4, 1], "x": 2.5, "y": 4.5, "w": 1.25},
{"label": "Space", "matrix": [4, 3], "x": 3.75, "y": 4.5},
{"label": "\u2298", "matrix": [4, 4], "x": 4.75, "y": 4.5, "w": 2},

{"label": "Space", "matrix": [4, 6], "x": 8.25, "y": 4.5, "w": 2.25},
{"label": "Alt", "matrix": [4, 8], "x": 10.5, "y": 4.5, "w": 1.25},
{"label": "Ctrl", "matrix": [4, 10], "x": 13, "y": 4.5, "w": 1.5},

{"label": "\u2191", "matrix": [4, 12], "x": 16.5, "y": 4.5},

{"label": "\u2190", "matrix": [4, 13], "x": 15.5, "y": 5.5},
{"label": "\u2193", "matrix": [4, 14], "x": 16.5, "y": 5.5},
{"label": "\u2192", "matrix": [4, 15], "x": 17.5, "y": 5.5}
]
},

"LAYOUT_3u_space": {
"layout": [
{ "label": "~", "matrix": [0, 0], "x": 0, "y": 0 },
{ "label": "!", "matrix": [0, 1], "x": 1, "y": 0 },
{ "label": "@", "matrix": [0, 2], "x": 2, "y": 0 },
{ "label": "#", "matrix": [0, 3], "x": 3, "y": 0 },
{ "label": "$", "matrix": [0, 4], "x": 4, "y": 0 },
{ "label": "%", "matrix": [0, 5], "x": 5, "y": 0 },
{ "label": "^", "matrix": [0, 6], "x": 7.5, "y": 0 },
{ "label": "&", "matrix": [0, 7], "x": 8.5, "y": 0 },
{ "label": "*", "matrix": [0, 8], "x": 9.5, "y": 0 },
{ "label": "(", "matrix": [0, 9], "x": 10.5, "y": 0 },
{ "label": ")", "matrix": [0, 10], "x": 11.5, "y": 0 },
{ "label": "_", "matrix": [0, 11], "x": 12.5, "y": 0 },
{ "label": "+", "matrix": [0, 12], "x": 13.5, "y": 0 },
{ "label": "Insert", "matrix": [0, 13], "x": 15.5, "y": 0 },
{ "label": "Home", "matrix": [0, 14], "x": 16.5, "y": 0 },
{ "label": "PgUp", "matrix": [0, 15], "x": 17.5, "y": 0 },

{ "label": "Tab", "matrix": [1, 0], "x": 0, "y": 1.5 },
{ "label": "Q", "matrix": [1, 1], "x": 1, "y": 1.5 },
{ "label": "W", "matrix": [1, 2], "x": 2, "y": 1.5 },
{ "label": "E", "matrix": [1, 3], "x": 3, "y": 1.5 },
{ "label": "R", "matrix": [1, 4], "x": 4, "y": 1.5 },
{ "label": "T", "matrix": [1, 5], "x": 5, "y": 1.5 },
{ "label": "Y", "matrix": [1, 6], "x": 7.5, "y": 1.5 },
{ "label": "U", "matrix": [1, 7], "x": 8.5, "y": 1.5 },
{ "label": "I", "matrix": [1, 8], "x": 9.5, "y": 1.5 },
{ "label": "O", "matrix": [1, 9], "x": 10.5, "y": 1.5 },
{ "label": "P", "matrix": [1, 10], "x": 11.5, "y": 1.5 },
{ "label": "{ ", "matrix": [1, 11], "x": 12.5, "y": 1.5 },
{ "label": " }", "matrix": [1, 12], "x": 13.5, "y": 1.5 },
{ "label": "Insert", "matrix": [1, 13], "x": 15.5, "y": 1.5 },
{ "label": "Home", "matrix": [1, 14], "x": 16.5, "y": 1.5 },
{ "label": "PgUp", "matrix": [1, 15], "x": 17.5, "y": 1.5 },

{ "label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.25 },
{ "label": "A", "matrix": [2, 1], "x": 1.25, "y": 2.5 },
{ "label": "S", "matrix": [2, 2], "x": 2.25, "y": 2.5 },
{ "label": "D", "matrix": [2, 3], "x": 3.25, "y": 2.5 },
{ "label": "F", "matrix": [2, 4], "x": 4.25, "y": 2.5 },
{ "label": "G", "matrix": [2, 5], "x": 5.25, "y": 2.5 },
{ "label": "H", "matrix": [2, 6], "x": 7.75, "y": 2.5 },
{ "label": "J", "matrix": [2, 7], "x": 8.75, "y": 2.5 },
{ "label": "K", "matrix": [2, 8], "x": 9.75, "y": 2.5 },
{ "label": "L", "matrix": [2, 9], "x": 10.75, "y": 2.5 },
{ "label": "\"", "matrix": [2, 10], "x": 11.75, "y": 2.5 },
{ "label": "Enter", "matrix": [2, 11], "x": 12.75, "y": 2.5, "w": 1.75 },
{ "label": "Delete", "matrix": [2, 13], "x": 15.5, "y": 2.5 },
{ "label": "End", "matrix": [2, 14], "x": 16.5, "y": 2.5 },
{ "label": "PgDn", "matrix": [2, 15], "x": 17.5, "y": 2.5 },

{ "label": "Shift", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75 },
{ "label": "Z", "matrix": [3, 1], "x": 1.75, "y": 3.5 },
{ "label": "X", "matrix": [3, 2], "x": 2.75, "y": 3.5 },
{ "label": "C", "matrix": [3, 3], "x": 3.75, "y": 3.5 },
{ "label": "V", "matrix": [3, 4], "x": 4.75, "y": 3.5 },
{ "label": "B", "matrix": [3, 5], "x": 5.75, "y": 3.5 },
{ "label": "N", "matrix": [3, 6], "x": 8.25, "y": 3.5 },
{ "label": "M", "matrix": [3, 7], "x": 9.25, "y": 3.5 },
{ "label": "<", "matrix": [3, 8], "x": 10.25, "y": 3.5 },
{ "label": ">", "matrix": [3, 9], "x": 11.25, "y": 3.5 },
{ "label": "?", "matrix": [3, 10], "x": 12.25, "y": 3.5 },
{ "label": "r4 dogshift", "matrix": [3, 11], "x": 13.25, "y": 3.5, "w": 1.25 },

{ "label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25 },
{ "label": "Alt", "matrix": [4, 1], "x": 2.5, "y": 4.5, "w": 1.25 },
{ "label": "Space", "matrix": [4, 3], "x": 3.75, "y": 4.5, "w": 3 },
{ "label": "Space", "matrix": [4, 6], "x": 8.25, "y": 4.5, "w": 2.25 },
{ "label": "Alt", "matrix": [4, 8], "x": 10.5, "y": 4.5, "w": 1.25 },
{ "label": "Ctrl", "matrix": [4, 10], "x": 13, "y": 4.5, "w": 1.5 },
{ "label": "\u2191", "matrix": [4, 12], "x": 16.5, "y": 4.5 },

{ "label": "\u2190", "matrix": [4, 13], "x": 15.5, "y": 5.5 },
{ "label": "\u2193", "matrix": [4, 14], "x": 16.5, "y": 5.5 },
{ "label": "\u2192", "matrix": [4, 15], "x": 17.5, "y": 5.5 }
]
}
}
}
}
20 changes: 20 additions & 0 deletions keyboards/cannonkeys/nearfield/matrix_diagram.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Matrix Diagram for Nearfield

```
┌───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐
│00 │01 │02 │03 │04 │05 │ │06 │07 │08 │09 │0A │0B │0C │ │0D │0E │0F │
└───┴───┴───┴───┴───┴───┘ └───┴───┴───┴───┴───┴───┴───┘ └───┴───┴───┘
┌───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐
│10 │11 │12 │13 │14 │15 │ │16 │17 │18 │19 │1A │1B │1C │ │1D │1E │1F │
├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ ├───┼───┼───┤
│20 │21 │22 │23 │24 │25 │ │26 │27 │28 │29 │2A │2B │ │2D │2E │2F │
├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐ └─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤ └───┴───┴───┘
│30 │31 │32 │33 │34 │35 │ │36 │37 │38 │39 │3A │3B │ ┌───┐
├────┬─┴──┬┴───┼───┼───┴───┤ ├───┴───┴┬──┴─┬─┴──┬┴────┤ │4C │
│40 │ │41 │43 │44 │ │46 │48 │ │4A │ ┌───┼───┼───┐
└────┘ └────┴───┴───────┘ └────────┴────┘ └─────┘ │4D │4E │4F │
└───┴───┴───┘
┌───────────┐
3u Space │43?? │
└───────────┘
```