diff --git a/keyboards/custommk/evo70_r2/info.json b/keyboards/custommk/evo70_r2/info.json
index 772325e7f8..18c618abc6 100644
--- a/keyboards/custommk/evo70_r2/info.json
+++ b/keyboards/custommk/evo70_r2/info.json
@@ -59,88 +59,256 @@
"levels": 17,
"pin": "A6"
},
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_all"
+ },
"layouts": {
- "LAYOUT": {
+ "LAYOUT_all": {
"layout": [
- {"label":"Encoder", "matrix": [1, 0], "x":0.5, "y":0},
- {"label":"Esc", "matrix": [0, 0], "x":2.5, "y":0},
- {"label":"1", "matrix": [0, 2], "x":3.5, "y":0},
- {"label":"2", "matrix": [0, 3], "x":4.5, "y":0},
- {"label":"3", "matrix": [0, 4], "x":5.5, "y":0},
- {"label":"4", "matrix": [0, 5], "x":6.5, "y":0},
- {"label":"5", "matrix": [0, 6], "x":7.5, "y":0},
- {"label":"6", "matrix": [0, 7], "x":8.5, "y":0},
- {"label":"7", "matrix": [0, 8], "x":9.5, "y":0},
- {"label":"8", "matrix": [0, 9], "x":10.5, "y":0},
- {"label":"9", "matrix": [0, 10], "x":11.5, "y":0},
- {"label":"0", "matrix": [0, 11], "x":12.5, "y":0},
- {"label":"-", "matrix": [0, 12], "x":13.5, "y":0},
- {"label":"=", "matrix": [0, 13], "x":14.5, "y":0},
- {"label":"Backspace", "matrix": [0, 14], "x":15.5, "y":0, "w":2},
- {"label":"Delete", "matrix": [0, 15], "x":17.5, "y":0},
+ {"label": "Encoder", "matrix": [1, 0], "x": 0.5, "y": 0},
+ {"label": "Esc", "matrix": [0, 0], "x": 2.25, "y": 0},
+ {"label": "1", "matrix": [0, 2], "x": 3.25, "y": 0},
+ {"label": "2", "matrix": [0, 3], "x": 4.25, "y": 0},
+ {"label": "3", "matrix": [0, 4], "x": 5.25, "y": 0},
+ {"label": "4", "matrix": [0, 5], "x": 6.25, "y": 0},
+ {"label": "5", "matrix": [0, 6], "x": 7.25, "y": 0},
+ {"label": "6", "matrix": [0, 7], "x": 8.25, "y": 0},
+ {"label": "7", "matrix": [0, 8], "x": 9.25, "y": 0},
+ {"label": "8", "matrix": [0, 9], "x": 10.25, "y": 0},
+ {"label": "9", "matrix": [0, 10], "x": 11.25, "y": 0},
+ {"label": "0", "matrix": [0, 11], "x": 12.25, "y": 0},
+ {"label": "-", "matrix": [0, 12], "x": 13.25, "y": 0},
+ {"label": "=", "matrix": [0, 13], "x": 14.25, "y": 0},
+ {"label": "Backspace", "matrix": [0, 14], "x": 15.25, "y": 0, "w": 2},
+ {"label": "Delete", "matrix": [0, 15], "x": 17.25, "y": 0},
- {"label":"Tab", "matrix": [1, 1], "x":2.5, "y":1, "w":1.5},
- {"label":"Q", "matrix": [1, 2], "x":4, "y":1},
- {"label":"W", "matrix": [1, 3], "x":5, "y":1},
- {"label":"E", "matrix": [1, 4], "x":6, "y":1},
- {"label":"R", "matrix": [1, 5], "x":7, "y":1},
- {"label":"T", "matrix": [1, 6], "x":8, "y":1},
- {"label":"Y", "matrix": [1, 7], "x":9, "y":1},
- {"label":"U", "matrix": [1, 8], "x":10, "y":1},
- {"label":"I", "matrix": [1, 9], "x":11, "y":1},
- {"label":"O", "matrix": [1, 10], "x":12, "y":1},
- {"label":"P", "matrix": [1, 11], "x":13, "y":1},
- {"label":"[", "matrix": [1, 12], "x":14, "y":1},
- {"label":"]", "matrix": [1, 13], "x":15, "y":1},
- {"label":"\\", "matrix": [1, 14], "x":16, "y":1, "w":1.5},
- {"label":"PgUp", "matrix": [1, 15], "x":17.5, "y":1},
+ {"label": "Tab", "matrix": [1, 1], "x": 2.25, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 2], "x": 3.75, "y": 1},
+ {"label": "W", "matrix": [1, 3], "x": 4.75, "y": 1},
+ {"label": "E", "matrix": [1, 4], "x": 5.75, "y": 1},
+ {"label": "R", "matrix": [1, 5], "x": 6.75, "y": 1},
+ {"label": "T", "matrix": [1, 6], "x": 7.75, "y": 1},
+ {"label": "Y", "matrix": [1, 7], "x": 8.75, "y": 1},
+ {"label": "U", "matrix": [1, 8], "x": 9.75, "y": 1},
+ {"label": "I", "matrix": [1, 9], "x": 10.75, "y": 1},
+ {"label": "O", "matrix": [1, 10], "x": 11.75, "y": 1},
+ {"label": "P", "matrix": [1, 11], "x": 12.75, "y": 1},
+ {"label": "[", "matrix": [1, 12], "x": 13.75, "y": 1},
+ {"label": "]", "matrix": [1, 13], "x": 14.75, "y": 1},
+ {"label": "\\", "matrix": [1, 14], "x": 15.75, "y": 1, "w": 1.5},
+ {"label": "PgUp", "matrix": [1, 15], "x": 17.25, "y": 1},
- {"label":"F1", "matrix": [2, 2], "x":0, "y":2},
- {"label":"F2", "matrix": [2, 0], "x":1, "y":2},
- {"label":"Caps Lock", "matrix": [2, 1], "x":2.5, "y":2, "w":1.75},
- {"label":"A", "matrix": [2, 3], "x":4.25, "y":2},
- {"label":"S", "matrix": [2, 4], "x":5.25, "y":2},
- {"label":"D", "matrix": [2, 5], "x":6.25, "y":2},
- {"label":"F", "matrix": [2, 6], "x":7.25, "y":2},
- {"label":"G", "matrix": [2, 7], "x":8.25, "y":2},
- {"label":"H", "matrix": [2, 8], "x":9.25, "y":2},
- {"label":"J", "matrix": [2, 9], "x":10.25, "y":2},
- {"label":"K", "matrix": [2, 10], "x":11.25, "y":2},
- {"label":"L", "matrix": [2, 11], "x":12.25, "y":2},
- {"label":";", "matrix": [2, 12], "x":13.25, "y":2},
- {"label":"'", "matrix": [2, 13], "x":14.25, "y":2},
- {"label":"Enter", "matrix": [2, 14], "x":15.25, "y":2, "w":2.25},
- {"label":"PgDn", "matrix": [2, 15], "x":17.5, "y":2},
+ {"label": "F1", "matrix": [2, 2], "x": 0, "y": 2},
+ {"label": "F2", "matrix": [2, 0], "x": 1, "y": 2},
+ {"label": "Caps Lock", "matrix": [2, 1], "x": 2.25, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 3], "x": 4, "y": 2},
+ {"label": "S", "matrix": [2, 4], "x": 5, "y": 2},
+ {"label": "D", "matrix": [2, 5], "x": 6, "y": 2},
+ {"label": "F", "matrix": [2, 6], "x": 7, "y": 2},
+ {"label": "G", "matrix": [2, 7], "x": 8, "y": 2},
+ {"label": "H", "matrix": [2, 8], "x": 9, "y": 2},
+ {"label": "J", "matrix": [2, 9], "x": 10, "y": 2},
+ {"label": "K", "matrix": [2, 10], "x": 11, "y": 2},
+ {"label": "L", "matrix": [2, 11], "x": 12, "y": 2},
+ {"label": ";", "matrix": [2, 12], "x": 13, "y": 2},
+ {"label": "'", "matrix": [2, 13], "x": 14, "y": 2},
+ {"label": "Enter", "matrix": [2, 14], "x": 15, "y": 2, "w": 2.25},
+ {"label": "PgDn", "matrix": [2, 15], "x": 17.25, "y": 2},
- {"label":"F3", "matrix": [3, 1], "x":0, "y":3},
- {"label":"F4", "matrix": [3, 0], "x":1, "y":3},
- {"label":"Shift", "matrix": [3, 2], "x":2.5, "y":3, "w":1.25},
- {"label":"\u2298", "matrix": [0, 1], "x":3.75, "y":3, "w":1},
- {"label":"Z", "matrix": [3, 3], "x":4.75, "y":3},
- {"label":"X", "matrix": [3, 4], "x":5.75, "y":3},
- {"label":"C", "matrix": [3, 5], "x":6.75, "y":3},
- {"label":"V", "matrix": [3, 6], "x":7.75, "y":3},
- {"label":"B", "matrix": [3, 7], "x":8.75, "y":3},
- {"label":"N", "matrix": [3, 8], "x":9.75, "y":3},
- {"label":"M", "matrix": [3, 9], "x":10.75, "y":3},
- {"label":",", "matrix": [3, 10], "x":11.75, "y":3},
- {"label":".", "matrix": [3, 11], "x":12.75, "y":3},
- {"label":"/", "matrix": [3, 12], "x":13.75, "y":3},
- {"label":"Shift", "matrix": [3, 13], "x":14.75, "y":3, "w":1.75},
- {"label":"Up", "matrix": [3, 14], "x":16.5, "y":3},
- {"label":"End", "matrix": [3, 15], "x":17.5, "y":3},
+ {"label": "F3", "matrix": [3, 1], "x": 0, "y": 3},
+ {"label": "F4", "matrix": [3, 0], "x": 1, "y": 3},
+ {"label": "Shift", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+ {"label": "\u2298", "matrix": [0, 1], "x": 3.5, "y": 3, "w": 1},
+ {"label": "Z", "matrix": [3, 3], "x": 4.5, "y": 3},
+ {"label": "X", "matrix": [3, 4], "x": 5.5, "y": 3},
+ {"label": "C", "matrix": [3, 5], "x": 6.5, "y": 3},
+ {"label": "V", "matrix": [3, 6], "x": 7.5, "y": 3},
+ {"label": "B", "matrix": [3, 7], "x": 8.5, "y": 3},
+ {"label": "N", "matrix": [3, 8], "x": 9.5, "y": 3},
+ {"label": "M", "matrix": [3, 9], "x": 10.5, "y": 3},
+ {"label": ",", "matrix": [3, 10], "x": 11.5, "y": 3},
+ {"label": ".", "matrix": [3, 11], "x": 12.5, "y": 3},
+ {"label": "/", "matrix": [3, 12], "x": 13.5, "y": 3},
+ {"label": "Shift", "matrix": [3, 13], "x": 14.5, "y": 3, "w": 1.75},
+ {"label": "Up", "matrix": [3, 14], "x": 16.25, "y": 3},
+ {"label": "End", "matrix": [3, 15], "x": 17.25, "y": 3},
- {"label":"F5", "matrix": [4, 3], "x":0, "y":4},
- {"label":"F6", "matrix": [4, 0], "x":1, "y":4},
- {"label":"Ctrl", "matrix": [4, 1], "x":2.5, "y":4, "w":1.25},
- {"label":"GUI", "matrix": [4, 2], "x":3.75, "y":4, "w":1.25},
- {"label":"Alt", "matrix": [4, 4], "x":5, "y":4, "w":1.25},
- {"label":"Space", "matrix": [4, 7], "x":6.25, "y":4, "w":6.25},
- {"label":"Alt", "matrix": [4, 10], "x":12.5, "y":4, "w":1.25},
- {"label":"Ctrl", "matrix": [4, 11], "x":13.75, "y":4, "w":1.25},
- {"label":"Left", "matrix": [4, 13], "x":15.5, "y":4},
- {"label":"Down", "matrix": [4, 14], "x":16.5, "y":4},
- {"label":"Right", "matrix": [4, 15], "x":17.5, "y":4}
+ {"label": "F5", "matrix": [4, 3], "x": 0, "y": 4},
+ {"label": "F6", "matrix": [4, 0], "x": 1, "y": 4},
+ {"label": "Ctrl", "matrix": [4, 1], "x": 2.25, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [4, 2], "x": 3.5, "y": 4, "w": 1.25},
+ {"label": "Alt", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+ {"label": "Space", "matrix": [4, 7], "x": 6, "y": 4, "w": 6.25},
+ {"label": "Alt", "matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.25},
+ {"label": "Ctrl", "matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.25},
+ {"label": "Left", "matrix": [4, 13], "x": 15.25, "y": 4},
+ {"label": "Down", "matrix": [4, 14], "x": 16.25, "y": 4},
+ {"label": "Right", "matrix": [4, 15], "x": 17.25, "y": 4}
+ ]
+ },
+ "LAYOUT_ansi_blocker": {
+ "layout": [
+ {"label": "Encoder", "matrix": [1, 0], "x": 0.5, "y": 0},
+ {"label": "Esc", "matrix": [0, 0], "x": 2.25, "y": 0},
+ {"label": "1", "matrix": [0, 2], "x": 3.25, "y": 0},
+ {"label": "2", "matrix": [0, 3], "x": 4.25, "y": 0},
+ {"label": "3", "matrix": [0, 4], "x": 5.25, "y": 0},
+ {"label": "4", "matrix": [0, 5], "x": 6.25, "y": 0},
+ {"label": "5", "matrix": [0, 6], "x": 7.25, "y": 0},
+ {"label": "6", "matrix": [0, 7], "x": 8.25, "y": 0},
+ {"label": "7", "matrix": [0, 8], "x": 9.25, "y": 0},
+ {"label": "8", "matrix": [0, 9], "x": 10.25, "y": 0},
+ {"label": "9", "matrix": [0, 10], "x": 11.25, "y": 0},
+ {"label": "0", "matrix": [0, 11], "x": 12.25, "y": 0},
+ {"label": "-", "matrix": [0, 12], "x": 13.25, "y": 0},
+ {"label": "=", "matrix": [0, 13], "x": 14.25, "y": 0},
+ {"label": "Backspace", "matrix": [0, 14], "x": 15.25, "y": 0, "w": 2},
+ {"label": "Delete", "matrix": [0, 15], "x": 17.25, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 1], "x": 2.25, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 2], "x": 3.75, "y": 1},
+ {"label": "W", "matrix": [1, 3], "x": 4.75, "y": 1},
+ {"label": "E", "matrix": [1, 4], "x": 5.75, "y": 1},
+ {"label": "R", "matrix": [1, 5], "x": 6.75, "y": 1},
+ {"label": "T", "matrix": [1, 6], "x": 7.75, "y": 1},
+ {"label": "Y", "matrix": [1, 7], "x": 8.75, "y": 1},
+ {"label": "U", "matrix": [1, 8], "x": 9.75, "y": 1},
+ {"label": "I", "matrix": [1, 9], "x": 10.75, "y": 1},
+ {"label": "O", "matrix": [1, 10], "x": 11.75, "y": 1},
+ {"label": "P", "matrix": [1, 11], "x": 12.75, "y": 1},
+ {"label": "[", "matrix": [1, 12], "x": 13.75, "y": 1},
+ {"label": "]", "matrix": [1, 13], "x": 14.75, "y": 1},
+ {"label": "\\", "matrix": [1, 14], "x": 15.75, "y": 1, "w": 1.5},
+ {"label": "PgUp", "matrix": [1, 15], "x": 17.25, "y": 1},
+
+ {"label": "F1", "matrix": [2, 2], "x": 0, "y": 2},
+ {"label": "F2", "matrix": [2, 0], "x": 1, "y": 2},
+ {"label": "Caps Lock", "matrix": [2, 1], "x": 2.25, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 3], "x": 4, "y": 2},
+ {"label": "S", "matrix": [2, 4], "x": 5, "y": 2},
+ {"label": "D", "matrix": [2, 5], "x": 6, "y": 2},
+ {"label": "F", "matrix": [2, 6], "x": 7, "y": 2},
+ {"label": "G", "matrix": [2, 7], "x": 8, "y": 2},
+ {"label": "H", "matrix": [2, 8], "x": 9, "y": 2},
+ {"label": "J", "matrix": [2, 9], "x": 10, "y": 2},
+ {"label": "K", "matrix": [2, 10], "x": 11, "y": 2},
+ {"label": "L", "matrix": [2, 11], "x": 12, "y": 2},
+ {"label": ";", "matrix": [2, 12], "x": 13, "y": 2},
+ {"label": "'", "matrix": [2, 13], "x": 14, "y": 2},
+ {"label": "Enter", "matrix": [2, 14], "x": 15, "y": 2, "w": 2.25},
+ {"label": "PgDn", "matrix": [2, 15], "x": 17.25, "y": 2},
+
+ {"label": "F3", "matrix": [3, 1], "x": 0, "y": 3},
+ {"label": "F4", "matrix": [3, 0], "x": 1, "y": 3},
+ {"label": "Shift", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [3, 3], "x": 4.5, "y": 3},
+ {"label": "X", "matrix": [3, 4], "x": 5.5, "y": 3},
+ {"label": "C", "matrix": [3, 5], "x": 6.5, "y": 3},
+ {"label": "V", "matrix": [3, 6], "x": 7.5, "y": 3},
+ {"label": "B", "matrix": [3, 7], "x": 8.5, "y": 3},
+ {"label": "N", "matrix": [3, 8], "x": 9.5, "y": 3},
+ {"label": "M", "matrix": [3, 9], "x": 10.5, "y": 3},
+ {"label": ",", "matrix": [3, 10], "x": 11.5, "y": 3},
+ {"label": ".", "matrix": [3, 11], "x": 12.5, "y": 3},
+ {"label": "/", "matrix": [3, 12], "x": 13.5, "y": 3},
+ {"label": "Shift", "matrix": [3, 13], "x": 14.5, "y": 3, "w": 1.75},
+ {"label": "Up", "matrix": [3, 14], "x": 16.25, "y": 3},
+ {"label": "End", "matrix": [3, 15], "x": 17.25, "y": 3},
+
+ {"label": "F5", "matrix": [4, 3], "x": 0, "y": 4},
+ {"label": "F6", "matrix": [4, 0], "x": 1, "y": 4},
+ {"label": "Ctrl", "matrix": [4, 1], "x": 2.25, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [4, 2], "x": 3.5, "y": 4, "w": 1.25},
+ {"label": "Alt", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+ {"label": "Space", "matrix": [4, 7], "x": 6, "y": 4, "w": 6.25},
+ {"label": "Alt", "matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.25},
+ {"label": "Ctrl", "matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.25},
+ {"label": "Left", "matrix": [4, 13], "x": 15.25, "y": 4},
+ {"label": "Down", "matrix": [4, 14], "x": 16.25, "y": 4},
+ {"label": "Right", "matrix": [4, 15], "x": 17.25, "y": 4}
+ ]
+ },
+ "LAYOUT_iso_blocker": {
+ "layout": [
+ {"label": "Encoder", "matrix": [1, 0], "x": 0.5, "y": 0},
+ {"label": "Esc", "matrix": [0, 0], "x": 2.25, "y": 0},
+ {"label": "1", "matrix": [0, 2], "x": 3.25, "y": 0},
+ {"label": "2", "matrix": [0, 3], "x": 4.25, "y": 0},
+ {"label": "3", "matrix": [0, 4], "x": 5.25, "y": 0},
+ {"label": "4", "matrix": [0, 5], "x": 6.25, "y": 0},
+ {"label": "5", "matrix": [0, 6], "x": 7.25, "y": 0},
+ {"label": "6", "matrix": [0, 7], "x": 8.25, "y": 0},
+ {"label": "7", "matrix": [0, 8], "x": 9.25, "y": 0},
+ {"label": "8", "matrix": [0, 9], "x": 10.25, "y": 0},
+ {"label": "9", "matrix": [0, 10], "x": 11.25, "y": 0},
+ {"label": "0", "matrix": [0, 11], "x": 12.25, "y": 0},
+ {"label": "-", "matrix": [0, 12], "x": 13.25, "y": 0},
+ {"label": "=", "matrix": [0, 13], "x": 14.25, "y": 0},
+ {"label": "Backspace", "matrix": [0, 14], "x": 15.25, "y": 0, "w": 2},
+ {"label": "Delete", "matrix": [0, 15], "x": 17.25, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 1], "x": 2.25, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 2], "x": 3.75, "y": 1},
+ {"label": "W", "matrix": [1, 3], "x": 4.75, "y": 1},
+ {"label": "E", "matrix": [1, 4], "x": 5.75, "y": 1},
+ {"label": "R", "matrix": [1, 5], "x": 6.75, "y": 1},
+ {"label": "T", "matrix": [1, 6], "x": 7.75, "y": 1},
+ {"label": "Y", "matrix": [1, 7], "x": 8.75, "y": 1},
+ {"label": "U", "matrix": [1, 8], "x": 9.75, "y": 1},
+ {"label": "I", "matrix": [1, 9], "x": 10.75, "y": 1},
+ {"label": "O", "matrix": [1, 10], "x": 11.75, "y": 1},
+ {"label": "P", "matrix": [1, 11], "x": 12.75, "y": 1},
+ {"label": "[", "matrix": [1, 12], "x": 13.75, "y": 1},
+ {"label": "]", "matrix": [1, 13], "x": 14.75, "y": 1},
+ {"label": "PgUp", "matrix": [1, 15], "x": 17.25, "y": 1},
+
+ {"label": "F1", "matrix": [2, 2], "x": 0, "y": 2},
+ {"label": "F2", "matrix": [2, 0], "x": 1, "y": 2},
+ {"label": "Caps Lock", "matrix": [2, 1], "x": 2.25, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 3], "x": 4, "y": 2},
+ {"label": "S", "matrix": [2, 4], "x": 5, "y": 2},
+ {"label": "D", "matrix": [2, 5], "x": 6, "y": 2},
+ {"label": "F", "matrix": [2, 6], "x": 7, "y": 2},
+ {"label": "G", "matrix": [2, 7], "x": 8, "y": 2},
+ {"label": "H", "matrix": [2, 8], "x": 9, "y": 2},
+ {"label": "J", "matrix": [2, 9], "x": 10, "y": 2},
+ {"label": "K", "matrix": [2, 10], "x": 11, "y": 2},
+ {"label": "L", "matrix": [2, 11], "x": 12, "y": 2},
+ {"label": ";", "matrix": [2, 12], "x": 13, "y": 2},
+ {"label": "'", "matrix": [2, 13], "x": 14, "y": 2},
+ {"label": "#", "matrix": [1, 14], "x": 15, "y": 2},
+ {"label": "Enter", "matrix": [2, 14], "x": 16, "y": 1, "w": 1.25, "h": 2},
+ {"label": "PgDn", "matrix": [2, 15], "x": 17.25, "y": 2},
+
+ {"label": "F3", "matrix": [3, 1], "x": 0, "y": 3},
+ {"label": "F4", "matrix": [3, 0], "x": 1, "y": 3},
+ {"label": "Shift", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+ {"label": "\u2298", "matrix": [0, 1], "x": 3.5, "y": 3, "w": 1},
+ {"label": "Z", "matrix": [3, 3], "x": 4.5, "y": 3},
+ {"label": "X", "matrix": [3, 4], "x": 5.5, "y": 3},
+ {"label": "C", "matrix": [3, 5], "x": 6.5, "y": 3},
+ {"label": "V", "matrix": [3, 6], "x": 7.5, "y": 3},
+ {"label": "B", "matrix": [3, 7], "x": 8.5, "y": 3},
+ {"label": "N", "matrix": [3, 8], "x": 9.5, "y": 3},
+ {"label": "M", "matrix": [3, 9], "x": 10.5, "y": 3},
+ {"label": ",", "matrix": [3, 10], "x": 11.5, "y": 3},
+ {"label": ".", "matrix": [3, 11], "x": 12.5, "y": 3},
+ {"label": "/", "matrix": [3, 12], "x": 13.5, "y": 3},
+ {"label": "Shift", "matrix": [3, 13], "x": 14.5, "y": 3, "w": 1.75},
+ {"label": "Up", "matrix": [3, 14], "x": 16.25, "y": 3},
+ {"label": "End", "matrix": [3, 15], "x": 17.25, "y": 3},
+
+ {"label": "F5", "matrix": [4, 3], "x": 0, "y": 4},
+ {"label": "F6", "matrix": [4, 0], "x": 1, "y": 4},
+ {"label": "Ctrl", "matrix": [4, 1], "x": 2.25, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [4, 2], "x": 3.5, "y": 4, "w": 1.25},
+ {"label": "Alt", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+ {"label": "Space", "matrix": [4, 7], "x": 6, "y": 4, "w": 6.25},
+ {"label": "Alt", "matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.25},
+ {"label": "Ctrl", "matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.25},
+ {"label": "Left", "matrix": [4, 13], "x": 15.25, "y": 4},
+ {"label": "Down", "matrix": [4, 14], "x": 16.25, "y": 4},
+ {"label": "Right", "matrix": [4, 15], "x": 17.25, "y": 4}
]
}
},
@@ -149,4 +317,4 @@
{ "pin_a": "B7", "pin_b": "A4", "resolution": 2}
]
}
-}
\ No newline at end of file
+}
diff --git a/keyboards/custommk/evo70_r2/keymaps/default/keymap.c b/keyboards/custommk/evo70_r2/keymaps/default/keymap.c
index 9dc7beabdd..9faf2088dd 100644
--- a/keyboards/custommk/evo70_r2/keymaps/default/keymap.c
+++ b/keyboards/custommk/evo70_r2/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT(
+ [0] = LAYOUT_all(
KC_ESC, KC_ESC, 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_DEL,
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_PGUP,
KC_F1, KC_F2, 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_PGDN,
diff --git a/keyboards/custommk/evo70_r2/keymaps/via/keymap.c b/keyboards/custommk/evo70_r2/keymaps/via/keymap.c
index a971aa4e28..4c467c018e 100644
--- a/keyboards/custommk/evo70_r2/keymaps/via/keymap.c
+++ b/keyboards/custommk/evo70_r2/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT(
+ [0] = LAYOUT_all(
KC_ESC, KC_ESC, 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_DEL,
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_PGUP,
KC_F1, KC_F2, 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_PGDN,
diff --git a/keyboards/custommk/evo70_r2/matrix_diagram.md b/keyboards/custommk/evo70_r2/matrix_diagram.md
new file mode 100644
index 0000000000..e4ac5ef20e
--- /dev/null
+++ b/keyboards/custommk/evo70_r2/matrix_diagram.md
@@ -0,0 +1,18 @@
+# Matrix Diagram for customMK EVO70 R2
+
+```
+ ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+ │10 │ │00 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │
+ └───┘ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ ┌─────┐
+ │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │1F │ │ │
+┌───┬───┐├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ ┌──┴┐2E │ ISO Enter
+│22 │20 ││21 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D │2E │2F │ │1E │ │
+├───┼───┤├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ └───┴────┘
+│31 │30 ││32 │01 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3E │3F │
+├───┼───┤├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+│43 │40 ││41 │42 │44 │47 │4A │4B │ │4D │4E │4F │
+└───┴───┘└────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+ ┌────────┐
+ │32 │ 2.25u LShift
+ └────────┘
+```