Merge remote-tracking branch 'origin/master' into develop

1 files changed, 89 insertions, 0 deletions

diff --git a/keyboards/kbdfans/odinmini/info.json b/keyboards/kbdfans/odinmini/info.json
index ea82309e85..19a854c4ce 100644
--- a/keyboards/kbdfans/odinmini/info.json
+++ b/keyboards/kbdfans/odinmini/info.json
@@ -54,6 +54,95 @@
         "vid": "0x4B42"
     },
     "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "~", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "#", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": ")", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "+", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [2, 13], "x": 13, "y": 0},
+                {"label": "Del", "matrix": [2, 17], "x": 14, "y": 0},
+                {"label": "Insert", "matrix": [0, 13], "x": 15.25, "y": 0},
+                {"label": "Num Lock", "matrix": [0, 14], "x": 16.5, "y": 0},
+                {"label": "/", "matrix": [0, 15], "x": 17.5, "y": 0},
+                {"label": "*", "matrix": [0, 16], "x": 18.5, "y": 0},
+                {"label": "-", "matrix": [0, 17], "x": 19.5, "y": 0},
+                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [3, 13], "w": 1.5, "x": 13.5, "y": 1},
+                {"label": "Delete", "matrix": [1, 13], "x": 15.25, "y": 1},
+                {"label": "7", "matrix": [1, 14], "x": 16.5, "y": 1},
+                {"label": "8", "matrix": [1, 15], "x": 17.5, "y": 1},
+                {"label": "9", "matrix": [1, 16], "x": 18.5, "y": 1},
+                {"h": 2, "label": "+", "matrix": [1, 17], "x": 19.5, "y": 1},
+                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2},
+                {"label": "4", "matrix": [2, 14], "x": 16.5, "y": 2},
+                {"label": "5", "matrix": [2, 15], "x": 17.5, "y": 2},
+                {"label": "6", "matrix": [2, 16], "x": 18.5, "y": 2},
+                {"label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3},
+                {"matrix": [4, 3], "w": 2.25, "x": 1.25, "y": 3},                
+                {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 6], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 7], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 8], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 9], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 10], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 11], "w": 1.75, "x": 12.25, "y": 3},
+                {"label": "Fn", "matrix": [4, 4], "x": 14, "y": 3},
+                {"label": "1", "matrix": [3, 12], "x": 16.5, "y": 3},
+                {"label": "2", "matrix": [3, 14], "x": 17.5, "y": 3},
+                {"label": "3", "matrix": [3, 15], "x": 18.5, "y": 3},
+                {"h": 2, "label": "Enter", "matrix": [3, 16], "x": 19.5, "y": 3},
+                {"label": "\u2191", "matrix": [3, 17], "x": 15.25, "y": 3.25},
+                {"label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
+                {"label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4},
+                {"label": "k45", "matrix": [4, 5], "w": 7, "x": 3.75, "y": 4},
+                {"label": "Alt", "matrix": [4, 8], "w": 1.5, "x": 10.75, "y": 4},
+                {"label": "Menu", "matrix": [4, 9], "w": 1.5, "x": 12.25, "y": 4},
+                {"label": "0", "matrix": [4, 10], "x": 17.5, "y": 4},
+                {"label": ".", "matrix": [4, 11], "x": 18.5, "y": 4},
+                {"label": "\u2190", "matrix": [4, 12], "x": 14.25, "y": 4.25},
+                {"label": "\u2193", "matrix": [4, 14], "x": 15.25, "y": 4.25},
+                {"label": "\u2192", "matrix": [4, 15], "x": 16.25, "y": 4.25}
+            ]
+        },
         "LAYOUT": {
             "layout": [
                 {"label": "~", "matrix": [0, 0], "x": 0, "y": 0},