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

2 files changed, 101 insertions, 1 deletions

diff --git a/keyboards/xelus/valor/rev2/info.json b/keyboards/xelus/valor/rev2/info.json
index 0d0629408e..c082afbca2 100644
--- a/keyboards/xelus/valor/rev2/info.json
+++ b/keyboards/xelus/valor/rev2/info.json
@@ -25,11 +25,90 @@
     },
     "processor": "STM32L422",
     "bootloader": "stm32-dfu",
-    "community_layouts": ["alice_split_bs"],
+    "community_layouts": ["alice", "alice_split_bs"],
     "layout_aliases": {
         "LAYOUT_all": "LAYOUT_alice_split_bs"
     },
     "layouts": {
+        "LAYOUT_alice": {
+            "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, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+
+                {"matrix": [0, 8], "x": 10.25, "y": 0},
+                {"matrix": [0, 9], "x": 11.25, "y": 0},
+                {"matrix": [0, 10], "x": 12.25, "y": 0},
+                {"matrix": [0, 11], "x": 13.25, "y": 0},
+                {"matrix": [0, 12], "x": 14.25, "y": 0},
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+                {"matrix": [1, 7], "x": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1},
+                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [2, 7], "x": 10, "y": 2},
+                {"matrix": [2, 8], "x": 11, "y": 2},
+                {"matrix": [2, 9], "x": 12, "y": 2},
+                {"matrix": [2, 10], "x": 13, "y": 2},
+                {"matrix": [2, 11], "x": 14, "y": 2},
+                {"matrix": [2, 12], "x": 15, "y": 2},
+                {"matrix": [2, 13], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.5, "y": 3},
+                {"matrix": [3, 8], "x": 10.5, "y": 3},
+                {"matrix": [3, 9], "x": 11.5, "y": 3},
+                {"matrix": [3, 10], "x": 12.5, "y": 3},
+                {"matrix": [3, 11], "x": 13.5, "y": 3},
+                {"matrix": [3, 12], "x": 14.5, "y": 3},
+                {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 16.75, "y": 4, "w": 1.5}
+            ]
+        },
         "LAYOUT_alice_split_bs": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
diff --git a/keyboards/xelus/valor/rev2/matrix_diagram.md b/keyboards/xelus/valor/rev2/matrix_diagram.md
new file mode 100644
index 0000000000..b8a071af53
--- /dev/null
+++ b/keyboards/xelus/valor/rev2/matrix_diagram.md
@@ -0,0 +1,21 @@
+# Matrix Diagram for Xelus Valor Rev. 2
+
+```
+                                                                       ┌───────┐
+                                                          2u Backspace │0E     │
+                                                                       └───────┘
+  ┌───┐  ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐
+  │00 │  │01 │02 │03 │04 │05 │06 │07 │         │08 │09 │0A │0B │0C │0D │0E │2E │
+ ┌┴──┬┘ ┌┴───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┐
+ │10 │  │11   │12 │13 │14 │15 │16 │          │17 │18 │19 │1A │1B │1C │1D │1E    │
+┌┴──┬┘ ┌┴─────┼───┼───┼───┼───┼───┤          └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴──────┴┐
+│20 │  │21    │22 │23 │24 │25 │26 │           │27 │28 │29 │2A │2B │2C │2D        │
+└───┘ ┌┴──────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───────┬──┴┐
+      │31      │32 │33 │34 │35 │36 │        │37 │38 │39 │3A │3B │3C │3D       │3E │
+      ├─────┬──┴──┬┴───┴┬──┴───┴──┬┴──┐     ├───┴───┴──┬┴───┴┬──┴───┴──────┬──┴──┬┘
+      │41   │     │43   │45       │46 │     │48        │4A   │             │4D   │
+      └─────┘     └─────┴─────────┴───┘     └──────────┴─────┘             └─────┘
+                                                                     ┌────────────┐
+                                                        2.75u RShift │3D          │
+                                                                     └────────────┘
+```