summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/cannonkeys/aella/info.json373
-rw-r--r--keyboards/cannonkeys/aella/keymaps/default_ansi/keymap.c49
-rw-r--r--keyboards/cannonkeys/aella/keymaps/default_iso/keymap.c49
-rw-r--r--keyboards/cannonkeys/aella/matrix_diagram.md20
4 files changed, 396 insertions, 95 deletions
diff --git a/keyboards/cannonkeys/aella/info.json b/keyboards/cannonkeys/aella/info.json
index 0c9548cd21..c299ecd08b 100644
--- a/keyboards/cannonkeys/aella/info.json
+++ b/keyboards/cannonkeys/aella/info.json
@@ -1,7 +1,7 @@
{
"keyboard_name": "Aella",
"manufacturer": "CannonKeys",
- "url": "https://www.alchemistkeyboards.com/aella",
+ "url": "https://alchemistkeyboards.com/aella",
"maintainer": "Alchemist Keyboards",
"usb": {
"vid": "0xCA04",
@@ -18,100 +18,283 @@
"layouts": {
"LAYOUT_all": {
"layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
-
- {"matrix": [0, 1], "x": 1.25, "y": 0},
- {"matrix": [0, 2], "x": 2.25, "y": 0},
- {"matrix": [0, 3], "x": 3.25, "y": 0},
- {"matrix": [0, 4], "x": 4.25, "y": 0},
-
- {"matrix": [0, 6], "x": 5.5, "y": 0},
- {"matrix": [0, 7], "x": 6.5, "y": 0},
- {"matrix": [0, 8], "x": 7.5, "y": 0},
- {"matrix": [0, 9], "x": 8.5, "y": 0},
-
- {"matrix": [0, 10], "x": 9.75, "y": 0},
- {"matrix": [0, 11], "x": 10.75, "y": 0},
- {"matrix": [0, 12], "x": 11.75, "y": 0},
- {"matrix": [0, 13], "x": 12.75, "y": 0},
-
- {"matrix": [0, 14], "x": 14, "y": 0},
- {"matrix": [0, 15], "x": 15, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1},
- {"matrix": [1, 1], "x": 1, "y": 1},
- {"matrix": [1, 2], "x": 2, "y": 1},
- {"matrix": [1, 3], "x": 3, "y": 1},
- {"matrix": [1, 4], "x": 4, "y": 1},
- {"matrix": [1, 5], "x": 5, "y": 1},
- {"matrix": [1, 6], "x": 6, "y": 1},
- {"matrix": [1, 7], "x": 7, "y": 1},
- {"matrix": [1, 8], "x": 8, "y": 1},
- {"matrix": [1, 9], "x": 9, "y": 1},
- {"matrix": [1, 10], "x": 10, "y": 1},
- {"matrix": [1, 11], "x": 11, "y": 1},
- {"matrix": [1, 12], "x": 12, "y": 1},
- {"matrix": [1, 13], "x": 13, "y": 1},
- {"matrix": [1, 14], "x": 14, "y": 1},
- {"matrix": [1, 15], "x": 15, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
- {"matrix": [2, 1], "x": 1.5, "y": 2},
- {"matrix": [2, 2], "x": 2.5, "y": 2},
- {"matrix": [2, 3], "x": 3.5, "y": 2},
- {"matrix": [2, 4], "x": 4.5, "y": 2},
- {"matrix": [2, 5], "x": 5.5, "y": 2},
- {"matrix": [2, 6], "x": 6.5, "y": 2},
- {"matrix": [2, 7], "x": 7.5, "y": 2},
- {"matrix": [2, 8], "x": 8.5, "y": 2},
- {"matrix": [2, 9], "x": 9.5, "y": 2},
- {"matrix": [2, 10], "x": 10.5, "y": 2},
- {"matrix": [2, 11], "x": 11.5, "y": 2},
- {"matrix": [2, 12], "x": 12.5, "y": 2},
- {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
- {"matrix": [2, 15], "x": 15, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
- {"matrix": [3, 1], "x": 1.75, "y": 3},
- {"matrix": [3, 2], "x": 2.75, "y": 3},
- {"matrix": [3, 3], "x": 3.75, "y": 3},
- {"matrix": [3, 4], "x": 4.75, "y": 3},
- {"matrix": [3, 5], "x": 5.75, "y": 3},
- {"matrix": [3, 6], "x": 6.75, "y": 3},
- {"matrix": [3, 7], "x": 7.75, "y": 3},
- {"matrix": [3, 8], "x": 8.75, "y": 3},
- {"matrix": [3, 9], "x": 9.75, "y": 3},
- {"matrix": [3, 10], "x": 10.75, "y": 3},
- {"matrix": [3, 11], "x": 11.75, "y": 3},
- {"matrix": [3, 12], "x": 12.75, "y": 3},
- {"matrix": [3, 13], "x": 13.75, "y": 3, "w": 1.25},
- {"matrix": [3, 15], "x": 15, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4},
- {"matrix": [4, 2], "x": 2.25, "y": 4},
- {"matrix": [4, 3], "x": 3.25, "y": 4},
- {"matrix": [4, 4], "x": 4.25, "y": 4},
- {"matrix": [4, 5], "x": 5.25, "y": 4},
- {"matrix": [4, 6], "x": 6.25, "y": 4},
- {"matrix": [4, 7], "x": 7.25, "y": 4},
- {"matrix": [4, 8], "x": 8.25, "y": 4},
- {"matrix": [4, 9], "x": 9.25, "y": 4},
- {"matrix": [4, 10], "x": 10.25, "y": 4},
- {"matrix": [4, 11], "x": 11.25, "y": 4},
- {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
- {"matrix": [4, 13], "x": 14, "y": 4},
- {"matrix": [4, 15], "x": 15, "y": 4},
-
- {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
- {"matrix": [5, 2], "x": 2.25, "y": 5, "w": 1.25},
- {"matrix": [5, 6], "x": 3.5, "y": 5, "w": 6.25},
- {"matrix": [5, 10], "x": 9.75, "y": 5, "w": 1.25},
- {"matrix": [5, 11], "x": 11, "y": 5, "w": 1.25},
-
- {"matrix": [5, 12], "x": 13, "y": 5},
- {"matrix": [5, 13], "x": 14, "y": 5},
- {"matrix": [5, 15], "x": 15, "y": 5}
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+ {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+ {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+ {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+ {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+ {"label": "F5", "matrix": [0, 6], "x": 5.5, "y": 0},
+ {"label": "F6", "matrix": [0, 7], "x": 6.5, "y": 0},
+ {"label": "F7", "matrix": [0, 8], "x": 7.5, "y": 0},
+ {"label": "F8", "matrix": [0, 9], "x": 8.5, "y": 0},
+
+ {"label": "F9", "matrix": [0, 10], "x": 9.75, "y": 0},
+ {"label": "F10", "matrix": [0, 11], "x": 10.75, "y": 0},
+ {"label": "F11", "matrix": [0, 12], "x": 11.75, "y": 0},
+ {"label": "F12", "matrix": [0, 13], "x": 12.75, "y": 0},
+
+ {"label": "Play/Pause", "matrix": [0, 14], "x": 14, "y": 0},
+ {"label": "Mute", "matrix": [0, 15], "x": 15, "y": 0},
+
+ {"label": "`", "matrix": [1, 0], "x": 0, "y": 1},
+ {"label": "1", "matrix": [1, 1], "x": 1, "y": 1},
+ {"label": "2", "matrix": [1, 2], "x": 2, "y": 1},
+ {"label": "3", "matrix": [1, 3], "x": 3, "y": 1},
+ {"label": "4", "matrix": [1, 4], "x": 4, "y": 1},
+ {"label": "5", "matrix": [1, 5], "x": 5, "y": 1},
+ {"label": "6", "matrix": [1, 6], "x": 6, "y": 1},
+ {"label": "7", "matrix": [1, 7], "x": 7, "y": 1},
+ {"label": "8", "matrix": [1, 8], "x": 8, "y": 1},
+ {"label": "9", "matrix": [1, 9], "x": 9, "y": 1},
+ {"label": "0", "matrix": [1, 10], "x": 10, "y": 1},
+ {"label": "-", "matrix": [1, 11], "x": 11, "y": 1},
+ {"label": "=", "matrix": [1, 12], "x": 12, "y": 1},
+ {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1},
+ {"label": "Delete", "matrix": [1, 14], "x": 14, "y": 1},
+ {"label": "Insert", "matrix": [1, 15], "x": 15, "y": 1},
+
+ {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2},
+ {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2},
+ {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2},
+ {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2},
+ {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2},
+ {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2},
+ {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2},
+ {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2},
+ {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2},
+ {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2},
+ {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2},
+ {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2},
+ {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+ {"label": "Delete", "matrix": [2, 15], "x": 15, "y": 2},
+
+ {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3},
+ {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3},
+ {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3},
+ {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3},
+ {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3},
+ {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3},
+ {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3},
+ {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3},
+ {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3},
+ {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3},
+ {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3},
+ {"label": "\\", "matrix": [3, 12], "x": 12.75, "y": 3},
+ {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 3, "w": 1.25},
+ {"label": "Page Up", "matrix": [3, 15], "x": 15, "y": 3},
+
+ {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "#", "matrix": [4, 1], "x": 1.25, "y": 4},
+ {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4},
+ {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4},
+ {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4},
+ {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4},
+ {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4},
+ {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4},
+ {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4},
+ {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4},
+ {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4},
+ {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4},
+ {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+ {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4},
+ {"label": "Page Down", "matrix": [4, 15], "x": 15, "y": 4},
+
+ {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
+ {"label": "Alt", "matrix": [5, 2], "x": 2.25, "y": 5, "w": 1.25},
+ {"label": "Space", "matrix": [5, 6], "x": 3.5, "y": 5, "w": 6.25},
+ {"label": "Fn", "matrix": [5, 10], "x": 9.75, "y": 5, "w": 1.25},
+ {"label": "GUI", "matrix": [5, 11], "x": 11, "y": 5, "w": 1.25},
+
+ {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5},
+ {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5},
+ {"label": "\u2192", "matrix": [5, 15], "x": 15, "y": 5}
+ ]
+ },
+
+ "LAYOUT_ansi": {
+ "layout": [
+ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+ { "label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0 },
+ { "label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0 },
+ { "label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0 },
+ { "label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0 },
+ { "label": "F5", "matrix": [0, 6], "x": 5.5, "y": 0 },
+ { "label": "F6", "matrix": [0, 7], "x": 6.5, "y": 0 },
+ { "label": "F7", "matrix": [0, 8], "x": 7.5, "y": 0 },
+ { "label": "F8", "matrix": [0, 9], "x": 8.5, "y": 0 },
+ { "label": "F9", "matrix": [0, 10], "x": 9.75, "y": 0 },
+ { "label": "F10", "matrix": [0, 11], "x": 10.75, "y": 0 },
+ { "label": "F11", "matrix": [0, 12], "x": 11.75, "y": 0 },
+ { "label": "F12", "matrix": [0, 13], "x": 12.75, "y": 0 },
+ { "label": "Play", "matrix": [0, 14], "x": 14, "y": 0 },
+ { "label": "Mute", "matrix": [0, 15], "x": 15, "y": 0 },
+
+ { "label": "`~", "matrix": [1, 0], "x": 0, "y": 1 },
+ { "label": "1", "matrix": [1, 1], "x": 1, "y": 1 },
+ { "label": "2", "matrix": [1, 2], "x": 2, "y": 1 },
+ { "label": "3", "matrix": [1, 3], "x": 3, "y": 1 },
+ { "label": "4", "matrix": [1, 4], "x": 4, "y": 1 },
+ { "label": "5", "matrix": [1, 5], "x": 5, "y": 1 },
+ { "label": "6", "matrix": [1, 6], "x": 6, "y": 1 },
+ { "label": "7", "matrix": [1, 7], "x": 7, "y": 1 },
+ { "label": "8", "matrix": [1, 8], "x": 8, "y": 1 },
+ { "label": "9", "matrix": [1, 9], "x": 9, "y": 1 },
+ { "label": "0", "matrix": [1, 10], "x": 10, "y": 1 },
+ { "label": "-_", "matrix": [1, 11], "x": 11, "y": 1 },
+ { "label": "=+", "matrix": [1, 12], "x": 12, "y": 1 },
+ { "label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1, "w": 2 },
+ { "label": "Insert", "matrix": [1, 15], "x": 15, "y": 1 },
+
+ { "label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5 },
+ { "label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2 },
+ { "label": "W", "matrix": [2, 2], "x": 2.5, "y": 2 },
+ { "label": "E", "matrix": [2, 3], "x": 3.5, "y": 2 },
+ { "label": "R", "matrix": [2, 4], "x": 4.5, "y": 2 },
+ { "label": "T", "matrix": [2, 5], "x": 5.5, "y": 2 },
+ { "label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2 },
+ { "label": "U", "matrix": [2, 7], "x": 7.5, "y": 2 },
+ { "label": "I", "matrix": [2, 8], "x": 8.5, "y": 2 },
+ { "label": "O", "matrix": [2, 9], "x": 9.5, "y": 2 },
+ { "label": "P", "matrix": [2, 10], "x": 10.5, "y": 2 },
+ { "label": "[{", "matrix": [2, 11], "x": 11.5, "y": 2 },
+ { "label": "]}", "matrix": [2, 12], "x": 12.5, "y": 2 },
+ { "label": "\\|", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5 },
+ { "label": "Delete", "matrix": [2, 15], "x": 15, "y": 2 },
+
+ { "label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75 },
+ { "label": "A", "matrix": [3, 1], "x": 1.75, "y": 3 },
+ { "label": "S", "matrix": [3, 2], "x": 2.75, "y": 3 },
+ { "label": "D", "matrix": [3, 3], "x": 3.75, "y": 3 },
+ { "label": "F", "matrix": [3, 4], "x": 4.75, "y": 3 },
+ { "label": "G", "matrix": [3, 5], "x": 5.75, "y": 3 },
+ { "label": "H", "matrix": [3, 6], "x": 6.75, "y": 3 },
+ { "label": "J", "matrix": [3, 7], "x": 7.75, "y": 3 },
+ { "label": "K", "matrix": [3, 8], "x": 8.75, "y": 3 },
+ { "label": "L", "matrix": [3, 9], "x": 9.75, "y": 3 },
+ { "label": ";:", "matrix": [3, 10], "x": 10.75, "y": 3 },
+ { "label": "'\"", "matrix": [3, 11], "x": 11.75, "y": 3 },
+ { "label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25 },
+ { "label": "Page Up", "matrix": [3, 15], "x": 15, "y": 3 },
+
+ { "label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25 },
+ { "label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4 },
+ { "label": "X", "matrix": [4, 3], "x": 3.25, "y": 4 },
+ { "label": "C", "matrix": [4, 4], "x": 4.25, "y": 4 },
+ { "label": "V", "matrix": [4, 5], "x": 5.25, "y": 4 },
+ { "label": "B", "matrix": [4, 6], "x": 6.25, "y": 4 },
+ { "label": "N", "matrix": [4, 7], "x": 7.25, "y": 4 },
+ { "label": "M", "matrix": [4, 8], "x": 8.25, "y": 4 },
+ { "label": ",<", "matrix": [4, 9], "x": 9.25, "y": 4 },
+ { "label": ".>", "matrix": [4, 10], "x": 10.25, "y": 4 },
+ { "label": "/?", "matrix": [4, 11], "x": 11.25, "y": 4 },
+ { "label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75 },
+ { "label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4 },
+ { "label": "Page Down", "matrix": [4, 15], "x": 15, "y": 4 },
+
+ { "label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.5 },
+ { "label": "Alt", "matrix": [5, 2], "x": 2.25, "y": 5, "w": 1.25 },
+ { "label": "Space", "matrix": [5, 6], "x": 3.5, "y": 5, "w": 6.25 },
+ { "label": "Fn", "matrix": [5, 10], "x": 9.75, "y": 5, "w": 1.25 },
+ { "label": "GUI", "matrix": [5, 11], "x": 11, "y": 5, "w": 1.25 },
+ { "label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5 },
+ { "label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5 },
+ { "label": "\u2192", "matrix": [5, 15], "x": 15, "y": 5 }
+ ]
+ },
+
+ "LAYOUT_iso": {
+ "layout": [
+ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+ { "label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0 },
+ { "label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0 },
+ { "label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0 },
+ { "label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0 },
+ { "label": "F5", "matrix": [0, 6], "x": 5.5, "y": 0 },
+ { "label": "F6", "matrix": [0, 7], "x": 6.5, "y": 0 },
+ { "label": "F7", "matrix": [0, 8], "x": 7.5, "y": 0 },
+ { "label": "F8", "matrix": [0, 9], "x": 8.5, "y": 0 },
+ { "label": "F9", "matrix": [0, 10], "x": 9.75, "y": 0 },
+ { "label": "F10", "matrix": [0, 11], "x": 10.75, "y": 0 },
+ { "label": "F11", "matrix": [0, 12], "x": 11.75, "y": 0 },
+ { "label": "F12", "matrix": [0, 13], "x": 12.75, "y": 0 },
+ { "label": "Play", "matrix": [0, 14], "x": 14, "y": 0 },
+ { "label": "Mute", "matrix": [0, 15], "x": 15, "y": 0 },
+
+ { "label": "`\u00ac", "matrix": [1, 0], "x": 0, "y": 1 },
+ { "label": "1", "matrix": [1, 1], "x": 1, "y": 1 },
+ { "label": "2", "matrix": [1, 2], "x": 2, "y": 1 },
+ { "label": "3", "matrix": [1, 3], "x": 3, "y": 1 },
+ { "label": "4", "matrix": [1, 4], "x": 4, "y": 1 },
+ { "label": "5", "matrix": [1, 5], "x": 5, "y": 1 },
+ { "label": "6", "matrix": [1, 6], "x": 6, "y": 1 },
+ { "label": "7", "matrix": [1, 7], "x": 7, "y": 1 },
+ { "label": "8", "matrix": [1, 8], "x": 8, "y": 1 },
+ { "label": "9", "matrix": [1, 9], "x": 9, "y": 1 },
+ { "label": "0", "matrix": [1, 10], "x": 10, "y": 1 },
+ { "label": "-_", "matrix": [1, 11], "x": 11, "y": 1 },
+ { "label": "=+", "matrix": [1, 12], "x": 12, "y": 1 },
+ { "label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1, "w": 2 },
+ { "label": "Insert", "matrix": [1, 15], "x": 15, "y": 1 },
+
+ { "label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5 },
+ { "label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2 },
+ { "label": "W", "matrix": [2, 2], "x": 2.5, "y": 2 },
+ { "label": "E", "matrix": [2, 3], "x": 3.5, "y": 2 },
+ { "label": "R", "matrix": [2, 4], "x": 4.5, "y": 2 },
+ { "label": "T", "matrix": [2, 5], "x": 5.5, "y": 2 },
+ { "label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2 },
+ { "label": "U", "matrix": [2, 7], "x": 7.5, "y": 2 },
+ { "label": "I", "matrix": [2, 8], "x": 8.5, "y": 2 },
+ { "label": "O", "matrix": [2, 9], "x": 9.5, "y": 2 },
+ { "label": "P", "matrix": [2, 10], "x": 10.5, "y": 2 },
+ { "label": "[{", "matrix": [2, 11], "x": 11.5, "y": 2 },
+ { "label": "]}", "matrix": [2, 12], "x": 12.5, "y": 2 },
+ { "label": "Delete", "matrix": [2, 15], "x": 15, "y": 2 },
+
+ { "label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75 },
+ { "label": "A", "matrix": [3, 1], "x": 1.75, "y": 3 },
+ { "label": "S", "matrix": [3, 2], "x": 2.75, "y": 3 },
+ { "label": "D", "matrix": [3, 3], "x": 3.75, "y": 3 },
+ { "label": "F", "matrix": [3, 4], "x": 4.75, "y": 3 },
+ { "label": "G", "matrix": [3, 5], "x": 5.75, "y": 3 },
+ { "label": "H", "matrix": [3, 6], "x": 6.75, "y": 3 },
+ { "label": "J", "matrix": [3, 7], "x": 7.75, "y": 3 },
+ { "label": "K", "matrix": [3, 8], "x": 8.75, "y": 3 },
+ { "label": "L", "matrix": [3, 9], "x": 9.75, "y": 3 },
+ { "label": ";:", "matrix": [3, 10], "x": 10.75, "y": 3 },
+ { "label": "'@", "matrix": [3, 11], "x": 11.75, "y": 3 },
+ { "label": "#~", "matrix": [3, 12], "x": 12.75, "y": 3 },
+ { "label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2 },
+ { "label": "Page Up", "matrix": [3, 15], "x": 15, "y": 3 },
+
+ { "label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25 },
+ { "label": "\\|", "matrix": [4, 1], "x": 1.25, "y": 4 },
+ { "label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4 },
+ { "label": "X", "matrix": [4, 3], "x": 3.25, "y": 4 },
+ { "label": "C", "matrix": [4, 4], "x": 4.25, "y": 4 },
+ { "label": "V", "matrix": [4, 5], "x": 5.25, "y": 4 },
+ { "label": "B", "matrix": [4, 6], "x": 6.25, "y": 4 },
+ { "label": "N", "matrix": [4, 7], "x": 7.25, "y": 4 },
+ { "label": "M", "matrix": [4, 8], "x": 8.25, "y": 4 },
+ { "label": ",<", "matrix": [4, 9], "x": 9.25, "y": 4 },
+ { "label": ".>", "matrix": [4, 10], "x": 10.25, "y": 4 },
+ { "label": "/?", "matrix": [4, 11], "x": 11.25, "y": 4 },
+ { "label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75 },
+ { "label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4 },
+ { "label": "Page Down", "matrix": [4, 15], "x": 15, "y": 4 },
+
+ { "label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.5 },
+ { "label": "Alt", "matrix": [5, 2], "x": 2.25, "y": 5, "w": 1.25 },
+ { "label": "Space", "matrix": [5, 6], "x": 3.5, "y": 5, "w": 6.25 },
+ { "label": "Fn", "matrix": [5, 10], "x": 9.75, "y": 5, "w": 1.25 },
+ { "label": "GUI", "matrix": [5, 11], "x": 11, "y": 5, "w": 1.25 },
+ { "label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5 },
+ { "label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5 },
+ { "label": "\u2192", "matrix": [5, 15], "x": 15, "y": 5 }
]
}
}
diff --git a/keyboards/cannonkeys/aella/keymaps/default_ansi/keymap.c b/keyboards/cannonkeys/aella/keymaps/default_ansi/keymap.c
new file mode 100644
index 0000000000..988233aa3f
--- /dev/null
+++ b/keyboards/cannonkeys/aella/keymaps/default_ansi/keymap.c
@@ -0,0 +1,49 @@
+/*
+Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+enum layer_names {
+ _BASE,
+ _FN1,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [_BASE] = LAYOUT_ansi(
+ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MPLY, KC_MUTE,
+ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
+ KC_LCTL, KC_LALT, KC_SPC, MO(_FN1),KC_LGUI, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+
+ [_FN1] = LAYOUT_ansi(
+ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______,
+ QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______,
+ _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ KC_GRV, _______, _______, _______, _______, QK_BOOT, _______, _______
+ )
+
+};
diff --git a/keyboards/cannonkeys/aella/keymaps/default_iso/keymap.c b/keyboards/cannonkeys/aella/keymaps/default_iso/keymap.c
new file mode 100644
index 0000000000..9b9ef64178
--- /dev/null
+++ b/keyboards/cannonkeys/aella/keymaps/default_iso/keymap.c
@@ -0,0 +1,49 @@
+/*
+Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+enum layer_names {
+ _BASE,
+ _FN1,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [_BASE] = LAYOUT_iso(
+ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MPLY, KC_MUTE,
+ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUBS, KC_ENT, KC_PGUP,
+ KC_LSFT, KC_NUHS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
+ KC_LCTL, KC_LALT, KC_SPC, MO(_FN1),KC_LGUI, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+
+ [_FN1] = LAYOUT_iso(
+ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______,
+ QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______,
+ _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ KC_GRV, _______, _______, _______, _______, QK_BOOT, _______, _______
+ )
+
+};
diff --git a/keyboards/cannonkeys/aella/matrix_diagram.md b/keyboards/cannonkeys/aella/matrix_diagram.md
new file mode 100644
index 0000000000..b58ee68865
--- /dev/null
+++ b/keyboards/cannonkeys/aella/matrix_diagram.md
@@ -0,0 +1,20 @@
+# Matrix Diagram for Cannonkeys/Alchemist Keyboards Aella
+
+```
+ ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┐
+ │00 ││01 │02 │03 │04 ││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 │ │1D │ 2u Backspace
+ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ └─┬─────┤
+ │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D │2F │ │ │
+ 2.25u ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ ┌──┴┐3D │ ISO Enter
+ LShift │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D │3F │ │3C │ │
+┌────────┐ ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ └───┴────┘
+│40 │ │40 │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C │4D │4F │
+└────────┘ ├────┴┬──┼───┴┬──┴───┴───┴───┴───┴───┴─┬─┴──┬┴───┼──┬───┼───┼───┤
+ │50 │ │52 │56 │5A │5B │ │5C │5D │5F │
+ └─────┘ └────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+ ┌─────┬───────────────────────────┬─────┐
+ │52 │56 │5B │ 7u Space
+ └─────┴───────────────────────────┴─────┘
+```