diff --git a/keyboards/aeboards/aegis/info.json b/keyboards/aeboards/aegis/info.json
index 5fe143318f0..823e45c8e2e 100644
--- a/keyboards/aeboards/aegis/info.json
+++ b/keyboards/aeboards/aegis/info.json
@@ -15,126 +15,367 @@
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "layout_aliases": {
+ "LAYOUT_aegis": "LAYOUT_all"
+ },
"layouts": {
- "LAYOUT_aegis": {
+ "LAYOUT_all": {
"layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [1, 0], "x": 1, "y": 0},
- {"matrix": [0, 1], "x": 2, "y": 0},
- {"matrix": [1, 1], "x": 3, "y": 0},
+ {"label": "End", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "Home", "matrix": [1, 0], "x": 1, "y": 0},
+ {"label": "Page Down", "matrix": [0, 1], "x": 2, "y": 0},
+ {"label": "Page Up", "matrix": [1, 1], "x": 3, "y": 0},
- {"matrix": [0, 2], "x": 4.5, "y": 0},
+ {"label": "Esc", "matrix": [0, 2], "x": 4.5, "y": 0},
- {"matrix": [1, 2], "x": 6.5, "y": 0},
- {"matrix": [0, 3], "x": 7.5, "y": 0},
- {"matrix": [1, 3], "x": 8.5, "y": 0},
- {"matrix": [0, 4], "x": 9.5, "y": 0},
+ {"label": "F1", "matrix": [1, 2], "x": 6.5, "y": 0},
+ {"label": "F2", "matrix": [0, 3], "x": 7.5, "y": 0},
+ {"label": "F3", "matrix": [1, 3], "x": 8.5, "y": 0},
+ {"label": "F4", "matrix": [0, 4], "x": 9.5, "y": 0},
- {"matrix": [1, 4], "x": 11, "y": 0},
- {"matrix": [0, 5], "x": 12, "y": 0},
- {"matrix": [1, 5], "x": 13, "y": 0},
- {"matrix": [0, 6], "x": 14, "y": 0},
+ {"label": "F5", "matrix": [1, 4], "x": 11, "y": 0},
+ {"label": "F6", "matrix": [0, 5], "x": 12, "y": 0},
+ {"label": "F7", "matrix": [1, 5], "x": 13, "y": 0},
+ {"label": "F8", "matrix": [0, 6], "x": 14, "y": 0},
- {"matrix": [1, 6], "x": 15.5, "y": 0},
- {"matrix": [0, 7], "x": 16.5, "y": 0},
- {"matrix": [1, 7], "x": 17.5, "y": 0},
- {"matrix": [0, 8], "x": 18.5, "y": 0},
+ {"label": "F9", "matrix": [1, 6], "x": 15.5, "y": 0},
+ {"label": "F10", "matrix": [0, 7], "x": 16.5, "y": 0},
+ {"label": "F11", "matrix": [1, 7], "x": 17.5, "y": 0},
+ {"label": "F12", "matrix": [0, 8], "x": 18.5, "y": 0},
- {"matrix": [2, 0], "x": 0, "y": 1.5},
- {"matrix": [3, 0], "x": 1, "y": 1.5},
- {"matrix": [2, 1], "x": 2, "y": 1.5},
- {"matrix": [3, 1], "x": 3, "y": 1.5},
+ {"label": "-", "matrix": [2, 0], "x": 0, "y": 1.5},
+ {"label": "*", "matrix": [3, 0], "x": 1, "y": 1.5},
+ {"label": "/", "matrix": [2, 1], "x": 2, "y": 1.5},
+ {"label": "Backspace", "matrix": [3, 1], "x": 3, "y": 1.5},
- {"matrix": [2, 2], "x": 4.5, "y": 1.5},
- {"matrix": [3, 2], "x": 5.5, "y": 1.5},
- {"matrix": [2, 3], "x": 6.5, "y": 1.5},
- {"matrix": [3, 3], "x": 7.5, "y": 1.5},
- {"matrix": [2, 4], "x": 8.5, "y": 1.5},
- {"matrix": [3, 4], "x": 9.5, "y": 1.5},
- {"matrix": [2, 5], "x": 10.5, "y": 1.5},
- {"matrix": [3, 5], "x": 11.5, "y": 1.5},
- {"matrix": [2, 6], "x": 12.5, "y": 1.5},
- {"matrix": [3, 6], "x": 13.5, "y": 1.5},
- {"matrix": [2, 7], "x": 14.5, "y": 1.5},
- {"matrix": [3, 7], "x": 15.5, "y": 1.5},
- {"matrix": [2, 8], "x": 16.5, "y": 1.5},
- {"matrix": [3, 8], "x": 17.5, "y": 1.5},
- {"matrix": [1, 8], "x": 18.5, "y": 1.5},
+ {"label": "`", "matrix": [2, 2], "x": 4.5, "y": 1.5},
+ {"label": "1", "matrix": [3, 2], "x": 5.5, "y": 1.5},
+ {"label": "2", "matrix": [2, 3], "x": 6.5, "y": 1.5},
+ {"label": "3", "matrix": [3, 3], "x": 7.5, "y": 1.5},
+ {"label": "4", "matrix": [2, 4], "x": 8.5, "y": 1.5},
+ {"label": "5", "matrix": [3, 4], "x": 9.5, "y": 1.5},
+ {"label": "6", "matrix": [2, 5], "x": 10.5, "y": 1.5},
+ {"label": "7", "matrix": [3, 5], "x": 11.5, "y": 1.5},
+ {"label": "8", "matrix": [2, 6], "x": 12.5, "y": 1.5},
+ {"label": "9", "matrix": [3, 6], "x": 13.5, "y": 1.5},
+ {"label": "0", "matrix": [2, 7], "x": 14.5, "y": 1.5},
+ {"label": "-", "matrix": [3, 7], "x": 15.5, "y": 1.5},
+ {"label": "=", "matrix": [2, 8], "x": 16.5, "y": 1.5},
+ {"label": "\\", "matrix": [3, 8], "x": 17.5, "y": 1.5},
+ {"label": "Delete", "matrix": [1, 8], "x": 18.5, "y": 1.5},
- {"matrix": [4, 0], "x": 0, "y": 2.5},
- {"matrix": [5, 0], "x": 1, "y": 2.5},
- {"matrix": [4, 1], "x": 2, "y": 2.5},
- {"matrix": [5, 1], "x": 3, "y": 2.5},
+ {"label": "+", "matrix": [4, 0], "x": 0, "y": 2.5},
+ {"label": "9", "matrix": [5, 0], "x": 1, "y": 2.5},
+ {"label": "8", "matrix": [4, 1], "x": 2, "y": 2.5},
+ {"label": "7", "matrix": [5, 1], "x": 3, "y": 2.5},
- {"matrix": [4, 2], "x": 4.5, "y": 2.5, "w": 1.5},
- {"matrix": [5, 2], "x": 6, "y": 2.5},
- {"matrix": [4, 3], "x": 7, "y": 2.5},
- {"matrix": [5, 3], "x": 8, "y": 2.5},
- {"matrix": [4, 4], "x": 9, "y": 2.5},
- {"matrix": [5, 4], "x": 10, "y": 2.5},
- {"matrix": [4, 5], "x": 11, "y": 2.5},
- {"matrix": [5, 5], "x": 12, "y": 2.5},
- {"matrix": [4, 6], "x": 13, "y": 2.5},
- {"matrix": [5, 6], "x": 14, "y": 2.5},
- {"matrix": [4, 7], "x": 15, "y": 2.5},
- {"matrix": [5, 7], "x": 16, "y": 2.5},
- {"matrix": [4, 8], "x": 17, "y": 2.5},
- {"matrix": [5, 8], "x": 18, "y": 2.5, "w": 1.5},
+ {"label": "Tab", "matrix": [4, 2], "x": 4.5, "y": 2.5, "w": 1.5},
+ {"label": "Q", "matrix": [5, 2], "x": 6, "y": 2.5},
+ {"label": "W", "matrix": [4, 3], "x": 7, "y": 2.5},
+ {"label": "E", "matrix": [5, 3], "x": 8, "y": 2.5},
+ {"label": "R", "matrix": [4, 4], "x": 9, "y": 2.5},
+ {"label": "T", "matrix": [5, 4], "x": 10, "y": 2.5},
+ {"label": "Y", "matrix": [4, 5], "x": 11, "y": 2.5},
+ {"label": "U", "matrix": [5, 5], "x": 12, "y": 2.5},
+ {"label": "I", "matrix": [4, 6], "x": 13, "y": 2.5},
+ {"label": "O", "matrix": [5, 6], "x": 14, "y": 2.5},
+ {"label": "P", "matrix": [4, 7], "x": 15, "y": 2.5},
+ {"label": "[", "matrix": [5, 7], "x": 16, "y": 2.5},
+ {"label": "]", "matrix": [4, 8], "x": 17, "y": 2.5},
+ {"label": "Backspace", "matrix": [5, 8], "x": 18, "y": 2.5, "w": 1.5},
- {"matrix": [6, 0], "x": 0, "y": 3.5},
- {"matrix": [7, 0], "x": 1, "y": 3.5},
- {"matrix": [6, 1], "x": 2, "y": 3.5},
- {"matrix": [7, 1], "x": 3, "y": 3.5},
+ {"label": "+", "matrix": [6, 0], "x": 0, "y": 3.5},
+ {"label": "6", "matrix": [7, 0], "x": 1, "y": 3.5},
+ {"label": "5", "matrix": [6, 1], "x": 2, "y": 3.5},
+ {"label": "4", "matrix": [7, 1], "x": 3, "y": 3.5},
- {"matrix": [6, 2], "x": 4.5, "y": 3.5, "w": 1.75},
- {"matrix": [7, 2], "x": 6.25, "y": 3.5},
- {"matrix": [6, 3], "x": 7.25, "y": 3.5},
- {"matrix": [7, 3], "x": 8.25, "y": 3.5},
- {"matrix": [6, 4], "x": 9.25, "y": 3.5},
- {"matrix": [7, 4], "x": 10.25, "y": 3.5},
- {"matrix": [6, 5], "x": 11.25, "y": 3.5},
- {"matrix": [7, 5], "x": 12.25, "y": 3.5},
- {"matrix": [6, 6], "x": 13.25, "y": 3.5},
- {"matrix": [7, 6], "x": 14.25, "y": 3.5},
- {"matrix": [6, 7], "x": 15.25, "y": 3.5},
- {"matrix": [7, 7], "x": 16.25, "y": 3.5},
- {"matrix": [6, 8], "x": 17.25, "y": 3.5, "w": 2.25},
+ {"label": "Ctrl", "matrix": [6, 2], "x": 4.5, "y": 3.5, "w": 1.75},
+ {"label": "A", "matrix": [7, 2], "x": 6.25, "y": 3.5},
+ {"label": "S", "matrix": [6, 3], "x": 7.25, "y": 3.5},
+ {"label": "D", "matrix": [7, 3], "x": 8.25, "y": 3.5},
+ {"label": "F", "matrix": [6, 4], "x": 9.25, "y": 3.5},
+ {"label": "G", "matrix": [7, 4], "x": 10.25, "y": 3.5},
+ {"label": "H", "matrix": [6, 5], "x": 11.25, "y": 3.5},
+ {"label": "J", "matrix": [7, 5], "x": 12.25, "y": 3.5},
+ {"label": "K", "matrix": [6, 6], "x": 13.25, "y": 3.5},
+ {"label": "L", "matrix": [7, 6], "x": 14.25, "y": 3.5},
+ {"label": ";", "matrix": [6, 7], "x": 15.25, "y": 3.5},
+ {"label": "'", "matrix": [7, 7], "x": 16.25, "y": 3.5},
+ {"label": "Enter", "matrix": [6, 8], "x": 17.25, "y": 3.5, "w": 2.25},
- {"matrix": [8, 0], "x": 0, "y": 4.5},
- {"matrix": [9, 0], "x": 1, "y": 4.5},
- {"matrix": [8, 1], "x": 2, "y": 4.5},
- {"matrix": [9, 1], "x": 3, "y": 4.5},
+ {"label": "Enter", "matrix": [8, 0], "x": 0, "y": 4.5},
+ {"label": "3", "matrix": [9, 0], "x": 1, "y": 4.5},
+ {"label": "2", "matrix": [8, 1], "x": 2, "y": 4.5},
+ {"label": "1", "matrix": [9, 1], "x": 3, "y": 4.5},
- {"matrix": [8, 2], "x": 4.25, "y": 4.75},
+ {"label": "\u2191", "matrix": [8, 2], "x": 4.25, "y": 4.75},
- {"matrix": [9, 2], "x": 5.5, "y": 4.5, "w": 1.25},
- {"matrix": [8, 3], "x": 6.75, "y": 4.5},
- {"matrix": [9, 3], "x": 7.75, "y": 4.5},
- {"matrix": [8, 4], "x": 8.75, "y": 4.5},
- {"matrix": [9, 4], "x": 9.75, "y": 4.5},
- {"matrix": [8, 5], "x": 10.75, "y": 4.5},
- {"matrix": [9, 5], "x": 11.75, "y": 4.5},
- {"matrix": [8, 6], "x": 12.75, "y": 4.5},
- {"matrix": [9, 6], "x": 13.75, "y": 4.5},
- {"matrix": [8, 7], "x": 14.75, "y": 4.5},
- {"matrix": [9, 7], "x": 15.75, "y": 4.5},
- {"matrix": [8, 8], "x": 16.75, "y": 4.5, "w": 1.75},
- {"matrix": [9, 8], "x": 18.5, "y": 4.5},
+ {"label": "Shift", "matrix": [9, 2], "x": 5.5, "y": 4.5, "w": 1.25},
+ {"label": "Z", "matrix": [8, 3], "x": 6.75, "y": 4.5},
+ {"label": "X", "matrix": [9, 3], "x": 7.75, "y": 4.5},
+ {"label": "C", "matrix": [8, 4], "x": 8.75, "y": 4.5},
+ {"label": "V", "matrix": [9, 4], "x": 9.75, "y": 4.5},
+ {"label": "B", "matrix": [8, 5], "x": 10.75, "y": 4.5},
+ {"label": "N", "matrix": [9, 5], "x": 11.75, "y": 4.5},
+ {"label": "M", "matrix": [8, 6], "x": 12.75, "y": 4.5},
+ {"label": ",", "matrix": [9, 6], "x": 13.75, "y": 4.5},
+ {"label": ".", "matrix": [8, 7], "x": 14.75, "y": 4.5},
+ {"label": "/", "matrix": [9, 7], "x": 15.75, "y": 4.5},
+ {"label": "Shift", "matrix": [8, 8], "x": 16.75, "y": 4.5, "w": 1.75},
+ {"label": "Fn", "matrix": [9, 8], "x": 18.5, "y": 4.5},
- {"matrix": [10, 0], "x": 0, "y": 5.5},
- {"matrix": [11, 0], "x": 1, "y": 5.5},
- {"matrix": [10, 1], "x": 2, "y": 5.5},
+ {"label": "Enter", "matrix": [10, 0], "x": 0, "y": 5.5},
+ {"label": ".", "matrix": [11, 0], "x": 1, "y": 5.5},
+ {"label": "0", "matrix": [10, 1], "x": 2, "y": 5.5},
- {"matrix": [11, 1], "x": 3.25, "y": 5.75},
- {"matrix": [10, 2], "x": 4.25, "y": 5.75},
- {"matrix": [11, 2], "x": 5.25, "y": 5.75},
+ {"label": "\u2190", "matrix": [11, 1], "x": 3.25, "y": 5.75},
+ {"label": "\u2193", "matrix": [10, 2], "x": 4.25, "y": 5.75},
+ {"label": "\u2192", "matrix": [11, 2], "x": 5.25, "y": 5.75},
- {"matrix": [10, 3], "x": 6.5, "y": 5.5, "w": 1.25},
- {"matrix": [11, 3], "x": 7.75, "y": 5.5, "w": 1.25},
- {"matrix": [11, 5], "x": 9, "y": 5.5, "w": 6.25},
- {"matrix": [11, 7], "x": 15.25, "y": 5.5, "w": 1.5},
- {"matrix": [10, 8], "x": 16.75, "y": 5.5, "w": 1.25},
- {"matrix": [11, 8], "x": 18, "y": 5.5, "w": 1.5}
+ {"label": "Fn", "matrix": [10, 3], "x": 6.5, "y": 5.5, "w": 1.25},
+ {"label": "Alt", "matrix": [11, 3], "x": 7.75, "y": 5.5, "w": 1.25},
+ {"label": "Space", "matrix": [11, 5], "x": 9, "y": 5.5, "w": 6.25},
+ {"label": "Alt", "matrix": [11, 7], "x": 15.25, "y": 5.5, "w": 1.5},
+ {"label": "GUI", "matrix": [10, 8], "x": 16.75, "y": 5.5, "w": 1.25},
+ {"label": "Ctrl", "matrix": [11, 8], "x": 18, "y": 5.5, "w": 1.5}
+ ]
+ },
+ "LAYOUT_2u_bs_275u_rshift": {
+ "layout": [
+ {"label": "End", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "Home", "matrix": [1, 0], "x": 1, "y": 0},
+ {"label": "Page Down", "matrix": [0, 1], "x": 2, "y": 0},
+ {"label": "Page Up", "matrix": [1, 1], "x": 3, "y": 0},
+
+ {"label": "Esc", "matrix": [0, 2], "x": 4.5, "y": 0},
+
+ {"label": "F1", "matrix": [1, 2], "x": 6.5, "y": 0},
+ {"label": "F2", "matrix": [0, 3], "x": 7.5, "y": 0},
+ {"label": "F3", "matrix": [1, 3], "x": 8.5, "y": 0},
+ {"label": "F4", "matrix": [0, 4], "x": 9.5, "y": 0},
+
+ {"label": "F5", "matrix": [1, 4], "x": 11, "y": 0},
+ {"label": "F6", "matrix": [0, 5], "x": 12, "y": 0},
+ {"label": "F7", "matrix": [1, 5], "x": 13, "y": 0},
+ {"label": "F8", "matrix": [0, 6], "x": 14, "y": 0},
+
+ {"label": "F9", "matrix": [1, 6], "x": 15.5, "y": 0},
+ {"label": "F10", "matrix": [0, 7], "x": 16.5, "y": 0},
+ {"label": "F11", "matrix": [1, 7], "x": 17.5, "y": 0},
+ {"label": "F12", "matrix": [0, 8], "x": 18.5, "y": 0},
+
+ {"label": "-", "matrix": [2, 0], "x": 0, "y": 1.5},
+ {"label": "*", "matrix": [3, 0], "x": 1, "y": 1.5},
+ {"label": "/", "matrix": [2, 1], "x": 2, "y": 1.5},
+ {"label": "Backspace", "matrix": [3, 1], "x": 3, "y": 1.5},
+
+ {"label": "`", "matrix": [2, 2], "x": 4.5, "y": 1.5},
+ {"label": "1", "matrix": [3, 2], "x": 5.5, "y": 1.5},
+ {"label": "2", "matrix": [2, 3], "x": 6.5, "y": 1.5},
+ {"label": "3", "matrix": [3, 3], "x": 7.5, "y": 1.5},
+ {"label": "4", "matrix": [2, 4], "x": 8.5, "y": 1.5},
+ {"label": "5", "matrix": [3, 4], "x": 9.5, "y": 1.5},
+ {"label": "6", "matrix": [2, 5], "x": 10.5, "y": 1.5},
+ {"label": "7", "matrix": [3, 5], "x": 11.5, "y": 1.5},
+ {"label": "8", "matrix": [2, 6], "x": 12.5, "y": 1.5},
+ {"label": "9", "matrix": [3, 6], "x": 13.5, "y": 1.5},
+ {"label": "0", "matrix": [2, 7], "x": 14.5, "y": 1.5},
+ {"label": "-", "matrix": [3, 7], "x": 15.5, "y": 1.5},
+ {"label": "=", "matrix": [2, 8], "x": 16.5, "y": 1.5},
+ {"label": "Backspace", "matrix": [3, 8], "x": 17.5, "y": 1.5, "w": 2},
+
+ {"label": "+", "matrix": [4, 0], "x": 0, "y": 2.5},
+ {"label": "9", "matrix": [5, 0], "x": 1, "y": 2.5},
+ {"label": "8", "matrix": [4, 1], "x": 2, "y": 2.5},
+ {"label": "7", "matrix": [5, 1], "x": 3, "y": 2.5},
+
+ {"label": "Tab", "matrix": [4, 2], "x": 4.5, "y": 2.5, "w": 1.5},
+ {"label": "Q", "matrix": [5, 2], "x": 6, "y": 2.5},
+ {"label": "W", "matrix": [4, 3], "x": 7, "y": 2.5},
+ {"label": "E", "matrix": [5, 3], "x": 8, "y": 2.5},
+ {"label": "R", "matrix": [4, 4], "x": 9, "y": 2.5},
+ {"label": "T", "matrix": [5, 4], "x": 10, "y": 2.5},
+ {"label": "Y", "matrix": [4, 5], "x": 11, "y": 2.5},
+ {"label": "U", "matrix": [5, 5], "x": 12, "y": 2.5},
+ {"label": "I", "matrix": [4, 6], "x": 13, "y": 2.5},
+ {"label": "O", "matrix": [5, 6], "x": 14, "y": 2.5},
+ {"label": "P", "matrix": [4, 7], "x": 15, "y": 2.5},
+ {"label": "[", "matrix": [5, 7], "x": 16, "y": 2.5},
+ {"label": "]", "matrix": [4, 8], "x": 17, "y": 2.5},
+ {"label": "Backspace", "matrix": [5, 8], "x": 18, "y": 2.5, "w": 1.5},
+
+ {"label": "+", "matrix": [6, 0], "x": 0, "y": 3.5},
+ {"label": "6", "matrix": [7, 0], "x": 1, "y": 3.5},
+ {"label": "5", "matrix": [6, 1], "x": 2, "y": 3.5},
+ {"label": "4", "matrix": [7, 1], "x": 3, "y": 3.5},
+
+ {"label": "Ctrl", "matrix": [6, 2], "x": 4.5, "y": 3.5, "w": 1.75},
+ {"label": "A", "matrix": [7, 2], "x": 6.25, "y": 3.5},
+ {"label": "S", "matrix": [6, 3], "x": 7.25, "y": 3.5},
+ {"label": "D", "matrix": [7, 3], "x": 8.25, "y": 3.5},
+ {"label": "F", "matrix": [6, 4], "x": 9.25, "y": 3.5},
+ {"label": "G", "matrix": [7, 4], "x": 10.25, "y": 3.5},
+ {"label": "H", "matrix": [6, 5], "x": 11.25, "y": 3.5},
+ {"label": "J", "matrix": [7, 5], "x": 12.25, "y": 3.5},
+ {"label": "K", "matrix": [6, 6], "x": 13.25, "y": 3.5},
+ {"label": "L", "matrix": [7, 6], "x": 14.25, "y": 3.5},
+ {"label": ";", "matrix": [6, 7], "x": 15.25, "y": 3.5},
+ {"label": "'", "matrix": [7, 7], "x": 16.25, "y": 3.5},
+ {"label": "Enter", "matrix": [6, 8], "x": 17.25, "y": 3.5, "w": 2.25},
+
+ {"label": "Enter", "matrix": [8, 0], "x": 0, "y": 4.5},
+ {"label": "3", "matrix": [9, 0], "x": 1, "y": 4.5},
+ {"label": "2", "matrix": [8, 1], "x": 2, "y": 4.5},
+ {"label": "1", "matrix": [9, 1], "x": 3, "y": 4.5},
+
+ {"label": "\u2191", "matrix": [8, 2], "x": 4.25, "y": 4.75},
+
+ {"label": "Shift", "matrix": [9, 2], "x": 5.5, "y": 4.5, "w": 1.25},
+ {"label": "Z", "matrix": [8, 3], "x": 6.75, "y": 4.5},
+ {"label": "X", "matrix": [9, 3], "x": 7.75, "y": 4.5},
+ {"label": "C", "matrix": [8, 4], "x": 8.75, "y": 4.5},
+ {"label": "V", "matrix": [9, 4], "x": 9.75, "y": 4.5},
+ {"label": "B", "matrix": [8, 5], "x": 10.75, "y": 4.5},
+ {"label": "N", "matrix": [9, 5], "x": 11.75, "y": 4.5},
+ {"label": "M", "matrix": [8, 6], "x": 12.75, "y": 4.5},
+ {"label": ",", "matrix": [9, 6], "x": 13.75, "y": 4.5},
+ {"label": ".", "matrix": [8, 7], "x": 14.75, "y": 4.5},
+ {"label": "/", "matrix": [9, 7], "x": 15.75, "y": 4.5},
+ {"label": "Shift", "matrix": [8, 8], "x": 16.75, "y": 4.5, "w": 2.75},
+
+ {"label": "Enter", "matrix": [10, 0], "x": 0, "y": 5.5},
+ {"label": ".", "matrix": [11, 0], "x": 1, "y": 5.5},
+ {"label": "0", "matrix": [10, 1], "x": 2, "y": 5.5},
+
+ {"label": "\u2190", "matrix": [11, 1], "x": 3.25, "y": 5.75},
+ {"label": "\u2193", "matrix": [10, 2], "x": 4.25, "y": 5.75},
+ {"label": "\u2192", "matrix": [11, 2], "x": 5.25, "y": 5.75},
+
+ {"label": "Fn", "matrix": [10, 3], "x": 6.5, "y": 5.5, "w": 1.25},
+ {"label": "Alt", "matrix": [11, 3], "x": 7.75, "y": 5.5, "w": 1.25},
+ {"label": "Space", "matrix": [11, 5], "x": 9, "y": 5.5, "w": 6.25},
+ {"label": "Alt", "matrix": [11, 7], "x": 15.25, "y": 5.5, "w": 1.5},
+ {"label": "GUI", "matrix": [10, 8], "x": 16.75, "y": 5.5, "w": 1.25},
+ {"label": "Ctrl", "matrix": [11, 8], "x": 18, "y": 5.5, "w": 1.5}
+ ]
+ },
+ "LAYOUT_numpad": {
+ "layout": [
+ {"label": "End", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "Home", "matrix": [1, 0], "x": 1, "y": 0},
+ {"label": "Page Down", "matrix": [0, 1], "x": 2, "y": 0},
+ {"label": "Page Up", "matrix": [1, 1], "x": 3, "y": 0},
+
+ {"label": "Esc", "matrix": [0, 2], "x": 4.5, "y": 0},
+
+ {"label": "F1", "matrix": [1, 2], "x": 6.5, "y": 0},
+ {"label": "F2", "matrix": [0, 3], "x": 7.5, "y": 0},
+ {"label": "F3", "matrix": [1, 3], "x": 8.5, "y": 0},
+ {"label": "F4", "matrix": [0, 4], "x": 9.5, "y": 0},
+
+ {"label": "F5", "matrix": [1, 4], "x": 11, "y": 0},
+ {"label": "F6", "matrix": [0, 5], "x": 12, "y": 0},
+ {"label": "F7", "matrix": [1, 5], "x": 13, "y": 0},
+ {"label": "F8", "matrix": [0, 6], "x": 14, "y": 0},
+
+ {"label": "F9", "matrix": [1, 6], "x": 15.5, "y": 0},
+ {"label": "F10", "matrix": [0, 7], "x": 16.5, "y": 0},
+ {"label": "F11", "matrix": [1, 7], "x": 17.5, "y": 0},
+ {"label": "F12", "matrix": [0, 8], "x": 18.5, "y": 0},
+
+ {"label": "-", "matrix": [2, 0], "x": 0, "y": 1.5},
+ {"label": "*", "matrix": [3, 0], "x": 1, "y": 1.5},
+ {"label": "/", "matrix": [2, 1], "x": 2, "y": 1.5},
+ {"label": "Backspace", "matrix": [3, 1], "x": 3, "y": 1.5},
+
+ {"label": "`", "matrix": [2, 2], "x": 4.5, "y": 1.5},
+ {"label": "1", "matrix": [3, 2], "x": 5.5, "y": 1.5},
+ {"label": "2", "matrix": [2, 3], "x": 6.5, "y": 1.5},
+ {"label": "3", "matrix": [3, 3], "x": 7.5, "y": 1.5},
+ {"label": "4", "matrix": [2, 4], "x": 8.5, "y": 1.5},
+ {"label": "5", "matrix": [3, 4], "x": 9.5, "y": 1.5},
+ {"label": "6", "matrix": [2, 5], "x": 10.5, "y": 1.5},
+ {"label": "7", "matrix": [3, 5], "x": 11.5, "y": 1.5},
+ {"label": "8", "matrix": [2, 6], "x": 12.5, "y": 1.5},
+ {"label": "9", "matrix": [3, 6], "x": 13.5, "y": 1.5},
+ {"label": "0", "matrix": [2, 7], "x": 14.5, "y": 1.5},
+ {"label": "-", "matrix": [3, 7], "x": 15.5, "y": 1.5},
+ {"label": "=", "matrix": [2, 8], "x": 16.5, "y": 1.5},
+ {"label": "\\", "matrix": [3, 8], "x": 17.5, "y": 1.5},
+ {"label": "Delete", "matrix": [1, 8], "x": 18.5, "y": 1.5},
+
+ {"label": "+", "matrix": [6, 0], "x": 0, "y": 2.5, "h": 2},
+ {"label": "9", "matrix": [5, 0], "x": 1, "y": 2.5},
+ {"label": "8", "matrix": [4, 1], "x": 2, "y": 2.5},
+ {"label": "7", "matrix": [5, 1], "x": 3, "y": 2.5},
+
+ {"label": "Tab", "matrix": [4, 2], "x": 4.5, "y": 2.5, "w": 1.5},
+ {"label": "Q", "matrix": [5, 2], "x": 6, "y": 2.5},
+ {"label": "W", "matrix": [4, 3], "x": 7, "y": 2.5},
+ {"label": "E", "matrix": [5, 3], "x": 8, "y": 2.5},
+ {"label": "R", "matrix": [4, 4], "x": 9, "y": 2.5},
+ {"label": "T", "matrix": [5, 4], "x": 10, "y": 2.5},
+ {"label": "Y", "matrix": [4, 5], "x": 11, "y": 2.5},
+ {"label": "U", "matrix": [5, 5], "x": 12, "y": 2.5},
+ {"label": "I", "matrix": [4, 6], "x": 13, "y": 2.5},
+ {"label": "O", "matrix": [5, 6], "x": 14, "y": 2.5},
+ {"label": "P", "matrix": [4, 7], "x": 15, "y": 2.5},
+ {"label": "[", "matrix": [5, 7], "x": 16, "y": 2.5},
+ {"label": "]", "matrix": [4, 8], "x": 17, "y": 2.5},
+ {"label": "Backspace", "matrix": [5, 8], "x": 18, "y": 2.5, "w": 1.5},
+
+ {"label": "6", "matrix": [7, 0], "x": 1, "y": 3.5},
+ {"label": "5", "matrix": [6, 1], "x": 2, "y": 3.5},
+ {"label": "4", "matrix": [7, 1], "x": 3, "y": 3.5},
+
+ {"label": "Ctrl", "matrix": [6, 2], "x": 4.5, "y": 3.5, "w": 1.75},
+ {"label": "A", "matrix": [7, 2], "x": 6.25, "y": 3.5},
+ {"label": "S", "matrix": [6, 3], "x": 7.25, "y": 3.5},
+ {"label": "D", "matrix": [7, 3], "x": 8.25, "y": 3.5},
+ {"label": "F", "matrix": [6, 4], "x": 9.25, "y": 3.5},
+ {"label": "G", "matrix": [7, 4], "x": 10.25, "y": 3.5},
+ {"label": "H", "matrix": [6, 5], "x": 11.25, "y": 3.5},
+ {"label": "J", "matrix": [7, 5], "x": 12.25, "y": 3.5},
+ {"label": "K", "matrix": [6, 6], "x": 13.25, "y": 3.5},
+ {"label": "L", "matrix": [7, 6], "x": 14.25, "y": 3.5},
+ {"label": ";", "matrix": [6, 7], "x": 15.25, "y": 3.5},
+ {"label": "'", "matrix": [7, 7], "x": 16.25, "y": 3.5},
+ {"label": "Enter", "matrix": [6, 8], "x": 17.25, "y": 3.5, "w": 2.25},
+
+ {"label": "Enter", "matrix": [8, 0], "x": 0, "y": 4.5, "h": 2},
+ {"label": "3", "matrix": [9, 0], "x": 1, "y": 4.5},
+ {"label": "2", "matrix": [8, 1], "x": 2, "y": 4.5},
+ {"label": "1", "matrix": [9, 1], "x": 3, "y": 4.5},
+
+ {"label": "\u2191", "matrix": [8, 2], "x": 4.25, "y": 4.75},
+
+ {"label": "Shift", "matrix": [9, 2], "x": 5.5, "y": 4.5, "w": 1.25},
+ {"label": "Z", "matrix": [8, 3], "x": 6.75, "y": 4.5},
+ {"label": "X", "matrix": [9, 3], "x": 7.75, "y": 4.5},
+ {"label": "C", "matrix": [8, 4], "x": 8.75, "y": 4.5},
+ {"label": "V", "matrix": [9, 4], "x": 9.75, "y": 4.5},
+ {"label": "B", "matrix": [8, 5], "x": 10.75, "y": 4.5},
+ {"label": "N", "matrix": [9, 5], "x": 11.75, "y": 4.5},
+ {"label": "M", "matrix": [8, 6], "x": 12.75, "y": 4.5},
+ {"label": ",", "matrix": [9, 6], "x": 13.75, "y": 4.5},
+ {"label": ".", "matrix": [8, 7], "x": 14.75, "y": 4.5},
+ {"label": "/", "matrix": [9, 7], "x": 15.75, "y": 4.5},
+ {"label": "Shift", "matrix": [8, 8], "x": 16.75, "y": 4.5, "w": 1.75},
+ {"label": "Fn", "matrix": [9, 8], "x": 18.5, "y": 4.5},
+
+ {"label": ".", "matrix": [11, 0], "x": 1, "y": 5.5},
+ {"label": "0", "matrix": [10, 1], "x": 2, "y": 5.5},
+
+ {"label": "\u2190", "matrix": [11, 1], "x": 3.25, "y": 5.75},
+ {"label": "\u2193", "matrix": [10, 2], "x": 4.25, "y": 5.75},
+ {"label": "\u2192", "matrix": [11, 2], "x": 5.25, "y": 5.75},
+
+ {"label": "Fn", "matrix": [10, 3], "x": 6.5, "y": 5.5, "w": 1.25},
+ {"label": "Alt", "matrix": [11, 3], "x": 7.75, "y": 5.5, "w": 1.25},
+ {"label": "Space", "matrix": [11, 5], "x": 9, "y": 5.5, "w": 6.25},
+ {"label": "Alt", "matrix": [11, 7], "x": 15.25, "y": 5.5, "w": 1.5},
+ {"label": "GUI", "matrix": [10, 8], "x": 16.75, "y": 5.5, "w": 1.25},
+ {"label": "Ctrl", "matrix": [11, 8], "x": 18, "y": 5.5, "w": 1.5}
]
}
}
diff --git a/keyboards/aeboards/aegis/keymaps/default/keymap.c b/keyboards/aeboards/aegis/keymaps/default/keymap.c
index 8437ffeb4ed..0aa14fdea8e 100644
--- a/keyboards/aeboards/aegis/keymaps/default/keymap.c
+++ b/keyboards/aeboards/aegis/keymaps/default/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | 0 | left |Dn| rhgt | FN | Alt | Space |Alt |Gui| ctrl| |
* `------------------------------------------------------------------------------------'
*/
- [0] = LAYOUT_aegis(
+ [0] = LAYOUT_all(
KC_END , KC_HOME, KC_PGDN, KC_PGUP, 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_PMNS, KC_PAST, KC_PSLS, KC_BSPC, 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_BSLS, KC_DEL,
KC_PPLS, KC_P9 , KC_P8 , KC_P7 , 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_BSPC,
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_PENT, KC_PDOT, KC_P0 , KC_LEFT, KC_DOWN, KC_RGHT, MO(1), KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL
),
- [1] = LAYOUT_aegis(
+ [1] = LAYOUT_all(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_UP , KC_PGDN, KC_BSPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),
- [2] = LAYOUT_aegis(
+ [2] = LAYOUT_all(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),
- [3] = LAYOUT_aegis(
+ [3] = LAYOUT_all(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/aeboards/aegis/keymaps/default_2u_bs_275u_rshift/keymap.c b/keyboards/aeboards/aegis/keymaps/default_2u_bs_275u_rshift/keymap.c
new file mode 100644
index 00000000000..f43df66f230
--- /dev/null
+++ b/keyboards/aeboards/aegis/keymaps/default_2u_bs_275u_rshift/keymap.c
@@ -0,0 +1,72 @@
+/* Copyright 2018 Jason Williams (Wilba)
+ *
+ * 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 .
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /* Keymap BASE: (Base Layer) Default Layer
+ * ,-------------------. ,-------------------------------------------------------------.
+ * |End |Home|PgDn|PgUp| |Esc| F1| F2| F3| F4| | F5| F6| F7| F8| | F9|F10|F11|F12|
+ * `-------------------' `-------------------------------------------------------------'
+ *
+ * |-------------------| ,-------------------------------------------------------------.
+ * | - | * | / |BSPC| | ~ | 1 | 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| Bcksp |
+ * |-------------------| |-------------------------------------------------------------|
+ * | + | 9 | 8 | 7 | |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \ |
+ * |-------------------| |-------------------------------------------------------------|
+ * | + | 6 | 5 | 4 | |Ctrl | A| S| D| F| G| H| J| K| L| ;| '|Return |
+ * |-------------------| |-------------------------------------------------------------|
+ * |Ent | 3 | 2 | 1 | |Up| |Shift| Z| X| C| V| B| N| M| ,| .| /| Shift |
+ * |------------------------------------------------------------------------------------|
+ * |Ent | . | 0 | left |Dn| rhgt | FN | Alt | Space |Alt |Gui| ctrl|
+ * `------------------------------------------------------------------------------------'
+ */
+ [0] = LAYOUT_2u_bs_275u_rshift(
+ KC_END , KC_HOME, KC_PGDN, KC_PGUP, 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_PMNS, KC_PAST, KC_PSLS, KC_BSPC, 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_PPLS, KC_P9 , KC_P8 , KC_P7 , 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_PPLS, KC_P6 , KC_P5 , KC_P4 , KC_LCTL, 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_PENT, KC_P3 , KC_P2 , KC_P1 , KC_UP , 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_PENT, KC_PDOT, KC_P0 , KC_LEFT, KC_DOWN, KC_RGHT, MO(1), KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL
+ ),
+
+ [1] = LAYOUT_2u_bs_275u_rshift(
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_UP , KC_PGDN, KC_BSPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_ENT , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ ),
+
+ [2] = LAYOUT_2u_bs_275u_rshift(
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ ),
+
+ [3] = LAYOUT_2u_bs_275u_rshift(
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ )
+
+};
diff --git a/keyboards/aeboards/aegis/keymaps/default_numpad/keymap.c b/keyboards/aeboards/aegis/keymaps/default_numpad/keymap.c
new file mode 100644
index 00000000000..3ee23cf8c29
--- /dev/null
+++ b/keyboards/aeboards/aegis/keymaps/default_numpad/keymap.c
@@ -0,0 +1,72 @@
+/* Copyright 2018 Jason Williams (Wilba)
+ *
+ * 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 .
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /* Keymap BASE: (Base Layer) Default Layer
+ * ,-------------------. ,-------------------------------------------------------------.
+ * |End |Home|PgDn|PgUp| |Esc| F1| F2| F3| F4| | F5| F6| F7| F8| | F9|F10|F11|F12|
+ * `-------------------' `-------------------------------------------------------------'
+ *
+ * |-------------------| ,-------------------------------------------------------------.
+ * |- | * | / |BSPC| | ~ | 1 | 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|pipe| del|
+ * |-------------------| |-------------------------------------------------------------|
+ * | | 9 | 8 | 7 | |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| BSPC |
+ * | + |--------------| |-------------------------------------------------------------|
+ * | | 6 | 5 | 4 | |Ctrl | A| S| D| F| G| H| J| K| L| ;| '|Return |
+ * |-------------------| |-------------------------------------------------------------|
+ * | | 3 | 2 | 1 | |Up| |Shift| Z| X| C| V| B| N| M| ,| .| /|Shift | FN |
+ * | ENT|-------------------------------------------------------------------------------|
+ * | | . | 0 | left |Dn| rhgt | FN | Alt | Space |Alt |Gui| ctrl| |
+ * `------------------------------------------------------------------------------------'
+ */
+ [0] = LAYOUT_numpad(
+ KC_END , KC_HOME, KC_PGDN, KC_PGUP, 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_PMNS, KC_PAST, KC_PSLS, KC_BSPC, 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_BSLS, KC_DEL,
+ KC_PPLS, KC_P9 , KC_P8 , KC_P7 , 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_BSPC,
+ KC_P6 , KC_P5 , KC_P4 , KC_LCTL, 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_PENT, KC_P3 , KC_P2 , KC_P1 , KC_UP , KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1),
+ KC_PDOT, KC_P0 , KC_LEFT, KC_DOWN, KC_RGHT, MO(1), KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL
+ ),
+
+ [1] = LAYOUT_numpad(
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_UP , KC_PGDN, KC_BSPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_ENT , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ ),
+
+ [2] = LAYOUT_numpad(
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ ),
+
+ [3] = LAYOUT_numpad(
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ )
+
+};
diff --git a/keyboards/aeboards/aegis/keymaps/via/keymap.c b/keyboards/aeboards/aegis/keymaps/via/keymap.c
index 8437ffeb4ed..0aa14fdea8e 100644
--- a/keyboards/aeboards/aegis/keymaps/via/keymap.c
+++ b/keyboards/aeboards/aegis/keymaps/via/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | 0 | left |Dn| rhgt | FN | Alt | Space |Alt |Gui| ctrl| |
* `------------------------------------------------------------------------------------'
*/
- [0] = LAYOUT_aegis(
+ [0] = LAYOUT_all(
KC_END , KC_HOME, KC_PGDN, KC_PGUP, 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_PMNS, KC_PAST, KC_PSLS, KC_BSPC, 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_BSLS, KC_DEL,
KC_PPLS, KC_P9 , KC_P8 , KC_P7 , 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_BSPC,
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_PENT, KC_PDOT, KC_P0 , KC_LEFT, KC_DOWN, KC_RGHT, MO(1), KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL
),
- [1] = LAYOUT_aegis(
+ [1] = LAYOUT_all(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_UP , KC_PGDN, KC_BSPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),
- [2] = LAYOUT_aegis(
+ [2] = LAYOUT_all(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),
- [3] = LAYOUT_aegis(
+ [3] = LAYOUT_all(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/aeboards/aegis/matrix_diagram.md b/keyboards/aeboards/aegis/matrix_diagram.md
new file mode 100644
index 00000000000..d768f661531
--- /dev/null
+++ b/keyboards/aeboards/aegis/matrix_diagram.md
@@ -0,0 +1,32 @@
+# Matrix Diagram for AEboards Aegis
+
+```
+┌───┬───┬───┬───┐ ┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐
+│00 │10 │01 │11 │ │02 │ │12 │03 │13 │04 │ │14 │05 │15 │06 │ │16 │07 │17 │08 │
+└───┴───┴───┴───┘ └───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘
+┌───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───────┐
+│20 │30 │21 │31 │ │22 │32 │23 │33 │24 │34 │25 │35 │26 │36 │27 │37 │28 │38 │18 │ │38 │ 2u Backspace
+├───┼───┼───┼───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ └───────┘
+│40 │50 │41 │51 │ │42 │52 │43 │53 │44 │54 │45 │55 │46 │56 │47 │57 │48 │58 │
+├───┼───┼───┼───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+│60 │70 │61 │71 │ │62 │72 │63 │73 │64 │74 │65 │75 │66 │76 │67 │77 │68 │
+├───┼───┼───┼───┤ └───┬──┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ ┌──────────┐
+│80 │90 │81 │91 │┌───┐│92 │83 │93 │84 │94 │85 │95 │86 │96 │87 │97 │88 │98 │ │88 │ 2.75u RShift
+├───┼───┼───┼───┘│82 │└───┬┴───┼───┴┬──┴───┴───┴───┴───┴───┴─┬─┴───┼────┬─┴───┤ └──────────┘
+│A0 │B0 │A1 │┌───┼───┼───┐│A3 │B3 │B5 │B7 │A8 │B8 │
+└───┴───┴───┘│B1 │A2 │B2 │└────┴────┴────────────────────────┴─────┴────┴─────┘
+ └───┴───┴───┘
+ ┌───┬───┬───────────────────────────┬─────┬───┬─────┐
+ │A3 │B3 │B5 │B7 │A8 │B8 │ 7u Space
+ └───┴───┴───────────────────────────┴─────┴───┴─────┘
+[NUMPAD OPTIONS]───────────────────
+┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐
+│40 │50 │41 │51 │ │ │50 │41 │51 │
+├───┼───┼───┼───┤ │60 ├───┼───┼───┤
+│60 │70 │61 │ │ │ │70 │61 │71 │
+├───┼───┼───┤91 │ ├───┼───┼───┼───┤
+│80 │90 │81 │ │ │ │90 │81 │91 │
+├───┴───┼───┼───┘ │80 ├───┴───┼───┘
+│A0 │A1 │ │ │A1 │
+└───────┴───┘ └───┴───────┘
+```
diff --git a/keyboards/moondrop/dash75/info.json b/keyboards/moondrop/dash75/info.json
new file mode 100644
index 00000000000..13e28fb3254
--- /dev/null
+++ b/keyboards/moondrop/dash75/info.json
@@ -0,0 +1,119 @@
+{
+ "manufacturer": "MOONDROP",
+ "keyboard_name": "Dash 75",
+ "maintainer": "vinorodrigues",
+ "bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "lto": true
+ },
+ "diode_direction": "COL2ROW",
+ "matrix_pins": {
+ "rows": ["B6", "B5", "B4", "D7", "D6", "D4"],
+ "cols": ["C6", "B2", "B3", "F7", "F6", "F5", "F4", "F1", "F0", "B7", "D5", "D3", "D2", "D0", "D1"]
+ },
+ "processor": "atmega32u4",
+ "url": "https://moondroplab.com/en/products/dash75",
+ "usb": {
+ "vid": "0x6DD4",
+ "pid": "0x7501",
+ "device_version": "1.5.0"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ { "matrix": [0, 0], "x": 0, "y": 0 },
+ { "matrix": [0, 1], "x": 1.5, "y": 0 },
+ { "matrix": [0, 2], "x": 2.5, "y": 0 },
+ { "matrix": [0, 3], "x": 3.5, "y": 0 },
+ { "matrix": [0, 4], "x": 4.5, "y": 0 },
+ { "matrix": [0, 6], "x": 6, "y": 0 },
+ { "matrix": [0, 7], "x": 7, "y": 0 },
+ { "matrix": [0, 8], "x": 8, "y": 0 },
+ { "matrix": [0, 9], "x": 9, "y": 0 },
+ { "matrix": [0, 10], "x": 10.5, "y": 0 },
+ { "matrix": [0, 11], "x": 11.5, "y": 0 },
+ { "matrix": [0, 12], "x": 12.5, "y": 0 },
+ { "matrix": [0, 13], "x": 13.5, "y": 0 },
+ { "matrix": [0, 14], "x": 15, "y": 0 },
+
+ { "matrix": [1, 0], "x": 0, "y": 1.25 },
+ { "matrix": [1, 1], "x": 1, "y": 1.25 },
+ { "matrix": [1, 2], "x": 2, "y": 1.25 },
+ { "matrix": [1, 3], "x": 3, "y": 1.25 },
+ { "matrix": [1, 4], "x": 4, "y": 1.25 },
+ { "matrix": [1, 5], "x": 5, "y": 1.25 },
+ { "matrix": [1, 6], "x": 6, "y": 1.25 },
+ { "matrix": [1, 7], "x": 7, "y": 1.25 },
+ { "matrix": [1, 8], "x": 8, "y": 1.25 },
+ { "matrix": [1, 9], "x": 9, "y": 1.25 },
+ { "matrix": [1, 10], "x": 10, "y": 1.25 },
+ { "matrix": [1, 11], "x": 11, "y": 1.25 },
+ { "matrix": [1, 12], "x": 12, "y": 1.25 },
+ { "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2 },
+ { "matrix": [1, 14], "x": 15, "y": 1.25 },
+
+ { "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5 },
+ { "matrix": [2, 1], "x": 1.5, "y": 2.25 },
+ { "matrix": [2, 2], "x": 2.5, "y": 2.25 },
+ { "matrix": [2, 3], "x": 3.5, "y": 2.25 },
+ { "matrix": [2, 4], "x": 4.5, "y": 2.25 },
+ { "matrix": [2, 5], "x": 5.5, "y": 2.25 },
+ { "matrix": [2, 6], "x": 6.5, "y": 2.25 },
+ { "matrix": [2, 7], "x": 7.5, "y": 2.25 },
+ { "matrix": [2, 8], "x": 8.5, "y": 2.25 },
+ { "matrix": [2, 9], "x": 9.5, "y": 2.25 },
+ { "matrix": [2, 10], "x": 10.5, "y": 2.25 },
+ { "matrix": [2, 11], "x": 11.5, "y": 2.25 },
+ { "matrix": [2, 12], "x": 12.5, "y": 2.25 },
+ { "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5 },
+ { "matrix": [2, 14], "x": 15, "y": 2.25 },
+
+ { "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75 },
+ { "matrix": [3, 1], "x": 1.75, "y": 3.25 },
+ { "matrix": [3, 2], "x": 2.75, "y": 3.25 },
+ { "matrix": [3, 3], "x": 3.75, "y": 3.25 },
+ { "matrix": [3, 4], "x": 4.75, "y": 3.25 },
+ { "matrix": [3, 5], "x": 5.75, "y": 3.25 },
+ { "matrix": [3, 6], "x": 6.75, "y": 3.25 },
+ { "matrix": [3, 7], "x": 7.75, "y": 3.25 },
+ { "matrix": [3, 8], "x": 8.75, "y": 3.25 },
+ { "matrix": [3, 9], "x": 9.75, "y": 3.25 },
+ { "matrix": [3, 10], "x": 10.75, "y": 3.25 },
+ { "matrix": [3, 11], "x": 11.75, "y": 3.25 },
+ { "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25 },
+ { "matrix": [3, 14], "x": 15, "y": 3.25 },
+
+ { "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25 },
+ { "matrix": [4, 1], "x": 2.25, "y": 4.25 },
+ { "matrix": [4, 2], "x": 3.25, "y": 4.25 },
+ { "matrix": [4, 3], "x": 4.25, "y": 4.25 },
+ { "matrix": [4, 4], "x": 5.25, "y": 4.25 },
+ { "matrix": [4, 5], "x": 6.25, "y": 4.25 },
+ { "matrix": [4, 6], "x": 7.25, "y": 4.25 },
+ { "matrix": [4, 7], "x": 8.25, "y": 4.25 },
+ { "matrix": [4, 8], "x": 9.25, "y": 4.25 },
+ { "matrix": [4, 9], "x": 10.25, "y": 4.25 },
+ { "matrix": [4, 10], "x": 11.25, "y": 4.25 },
+ { "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75 },
+ { "matrix": [4, 13], "x": 14, "y": 4.25 },
+ { "matrix": [4, 14], "x": 15, "y": 4.25 },
+
+ { "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25 },
+ { "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25 },
+ { "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25 },
+ { "matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25 },
+ { "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25 },
+ { "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25 },
+ { "matrix": [5, 12], "x": 13, "y": 5.25 },
+ { "matrix": [5, 13], "x": 14, "y": 5.25 },
+ { "matrix": [5, 14], "x": 15, "y": 5.25 }
+ ]
+ }
+ }
+}
diff --git a/keyboards/moondrop/dash75/keymaps/default/keymap.json b/keyboards/moondrop/dash75/keymaps/default/keymap.json
new file mode 100644
index 00000000000..67811c18a37
--- /dev/null
+++ b/keyboards/moondrop/dash75/keymaps/default/keymap.json
@@ -0,0 +1,18 @@
+{
+ "version": 1,
+ "notes": "This file is a keymap.json file for moondrop/dash75",
+ "keyboard": "moondrop/dash75",
+ "keymap": "default",
+ "layout": "LAYOUT",
+ "author": "vinorodrigues",
+ "layers": [
+ [
+ "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_PSCR",
+ "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_LGUI", "KC_LALT", "KC_SPC", "KC_RALT", "KC_APP", "KC_LEFT", "KC_DOWN", "KC_RGHT"
+ ]
+ ]
+}
diff --git a/keyboards/moondrop/dash75/keymaps/via/config.h b/keyboards/moondrop/dash75/keymaps/via/config.h
new file mode 100644
index 00000000000..3b36fe3a07b
--- /dev/null
+++ b/keyboards/moondrop/dash75/keymaps/via/config.h
@@ -0,0 +1,6 @@
+// Copyright 2023 moondroplab (@moondroplab)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define VIA_FIRMWARE_VERSION 1
diff --git a/keyboards/moondrop/dash75/keymaps/via/keymap.json b/keyboards/moondrop/dash75/keymaps/via/keymap.json
new file mode 100644
index 00000000000..6d43ee82c80
--- /dev/null
+++ b/keyboards/moondrop/dash75/keymaps/via/keymap.json
@@ -0,0 +1,24 @@
+{
+ "version": 1,
+ "notes": "This file is a keymap.json file for moondrop/dash75",
+ "keyboard": "moondrop/dash75",
+ "keymap": "via",
+ "layout": "LAYOUT",
+ "author": "vinorodrigues",
+ "config": {
+ "features": {
+ "via": true,
+ "lto": true
+ }
+ },
+ "layers": [
+ [
+ "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_PSCR",
+ "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_LGUI", "KC_LALT", "KC_SPC", "KC_RALT", "KC_APP", "KC_LEFT", "KC_DOWN", "KC_RGHT"
+ ]
+ ]
+}
diff --git a/keyboards/moondrop/dash75/r1/config.h b/keyboards/moondrop/dash75/r1/config.h
new file mode 100644
index 00000000000..16b6125a2d8
--- /dev/null
+++ b/keyboards/moondrop/dash75/r1/config.h
@@ -0,0 +1,10 @@
+// Copyright 2023 moondroplab (@moondroplab)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define SERIAL_NUMBER "Dash 75"
+
+#define USB_SUSPEND_WAKEUP_DELAY 5000 // wait for USB hub to start
+
+#define HOLD_ON_OTHER_KEY_PRESS
diff --git a/keyboards/moondrop/dash75/r1/info.json b/keyboards/moondrop/dash75/r1/info.json
new file mode 100644
index 00000000000..b562070dc9d
--- /dev/null
+++ b/keyboards/moondrop/dash75/r1/info.json
@@ -0,0 +1,6 @@
+{
+ "usb": {
+ "pid": "0x7501",
+ "device_version": "1.5.0"
+ }
+}
diff --git a/keyboards/moondrop/dash75/r1/rules.mk b/keyboards/moondrop/dash75/r1/rules.mk
new file mode 100644
index 00000000000..6441046fb6a
--- /dev/null
+++ b/keyboards/moondrop/dash75/r1/rules.mk
@@ -0,0 +1,2 @@
+# This file intentionally left blank
+# ** Settings are Data Driven and reside in `info.json` **
diff --git a/keyboards/moondrop/dash75/readme.md b/keyboards/moondrop/dash75/readme.md
new file mode 100644
index 00000000000..5b015f6d5b0
--- /dev/null
+++ b/keyboards/moondrop/dash75/readme.md
@@ -0,0 +1,29 @@
+# Moondrop Dash75
+
+![Moondrop Dash75](https://i.imgur.com/mxaYcvqh.jpg)
+
+The 75%, Commodore 64 inspired, keyboard with integrated USB Hub and headphone DAC/Amp
+
+* Keyboard Maintainer: [vinorodrigues](https://github.com/vinorodrigues)
+* Hardware Supported:
+ * Moondrop Dash75
+* Hardware Availability: [moondroplab.com](https://moondroplab.com/en/products/dash75)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make moondrop/dash75/r1:default
+
+Flashing example for this keyboard:
+
+ make moondrop/dash75/r1:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
+Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available