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

1 files changed, 36 insertions, 36 deletions

diff --git a/keyboards/zsa/voyager/keyboard.json b/keyboards/zsa/voyager/keyboard.json
index 14e7584f5c..3a7e7865ea 100644
--- a/keyboards/zsa/voyager/keyboard.json
+++ b/keyboards/zsa/voyager/keyboard.json
@@ -161,52 +161,52 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label": "k00", "matrix": [0, 1], "x": 3, "y": 0},
-                {"label": "k01", "matrix": [0, 2], "x": 12, "y": 0},
+                {"label": "k00", "matrix": [0, 1], "x": 0, "y": 0.5},
+                {"label": "k01", "matrix": [0, 2], "x": 1, "y": 0.5},
                 {"label": "k02", "matrix": [0, 3], "x": 2, "y": 0.25},
-                {"label": "k03", "matrix": [0, 4], "x": 4, "y": 0.25},
-                {"label": "k04", "matrix": [0, 5], "x": 11, "y": 0.25},
-                {"label": "k05", "matrix": [0, 6], "x": 13, "y": 0.25},
-                {"label": "k26", "matrix": [6, 0], "x": 0, "y": 0.5},
-                {"label": "k27", "matrix": [6, 1], "x": 1, "y": 0.5},
-                {"label": "k28", "matrix": [6, 2], "x": 5, "y": 0.5},
-                {"label": "k29", "matrix": [6, 3], "x": 10, "y": 0.5},
+                {"label": "k03", "matrix": [0, 4], "x": 3, "y": 0},
+                {"label": "k04", "matrix": [0, 5], "x": 4, "y": 0.25},
+                {"label": "k05", "matrix": [0, 6], "x": 5, "y": 0.5},
+                {"label": "k26", "matrix": [6, 0], "x": 10, "y": 0.5},
+                {"label": "k27", "matrix": [6, 1], "x": 11, "y": 0.25},
+                {"label": "k28", "matrix": [6, 2], "x": 12, "y": 0},
+                {"label": "k29", "matrix": [6, 3], "x": 13, "y": 0.25},
                 {"label": "k30", "matrix": [6, 4], "x": 14, "y": 0.5},
                 {"label": "k31", "matrix": [6, 5], "x": 15, "y": 0.5},
-                {"label": "k06", "matrix": [1, 1], "x": 3, "y": 1},
-                {"label": "k07", "matrix": [1, 2], "x": 12, "y": 1},
+                {"label": "k06", "matrix": [1, 1], "x": 0, "y": 1.5},
+                {"label": "k07", "matrix": [1, 2], "x": 1, "y": 1.5},
                 {"label": "k08", "matrix": [1, 3], "x": 2, "y": 1.25},
-                {"label": "k09", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "k10", "matrix": [1, 5], "x": 11, "y": 1.25},
-                {"label": "k11", "matrix": [1, 6], "x": 13, "y": 1.25},
-                {"label": "k32", "matrix": [7, 0], "x": 0, "y": 1.5},
-                {"label": "k33", "matrix": [7, 1], "x": 1, "y": 1.5},
-                {"label": "k34", "matrix": [7, 2], "x": 5, "y": 1.5},
-                {"label": "k35", "matrix": [7, 3], "x": 10, "y": 1.5},
+                {"label": "k09", "matrix": [1, 4], "x": 3, "y": 1},
+                {"label": "k10", "matrix": [1, 5], "x": 4, "y": 1.25},
+                {"label": "k11", "matrix": [1, 6], "x": 5, "y": 1.5},
+                {"label": "k32", "matrix": [7, 0], "x": 10, "y": 1.5},
+                {"label": "k33", "matrix": [7, 1], "x": 11, "y": 1.25},
+                {"label": "k34", "matrix": [7, 2], "x": 12, "y": 1},
+                {"label": "k35", "matrix": [7, 3], "x": 13, "y": 1.25},
                 {"label": "k36", "matrix": [7, 4], "x": 14, "y": 1.5},
                 {"label": "k37", "matrix": [7, 5], "x": 15, "y": 1.5},
-                {"label": "k12", "matrix": [2, 1], "x": 3, "y": 2},
-                {"label": "k13", "matrix": [2, 2], "x": 12, "y": 2},
+                {"label": "k12", "matrix": [2, 1], "x": 0, "y": 2.5},
+                {"label": "k13", "matrix": [2, 2], "x": 1, "y": 2.5},
                 {"label": "k14", "matrix": [2, 3], "x": 2, "y": 2.25},
-                {"label": "k15", "matrix": [2, 4], "x": 4, "y": 2.25},
-                {"label": "k16", "matrix": [2, 5], "x": 11, "y": 2.25},
-                {"label": "k17", "matrix": [2, 6], "x": 13, "y": 2.25},
-                {"label": "k38", "matrix": [8, 0], "x": 0, "y": 2.5},
-                {"label": "k39", "matrix": [8, 1], "x": 1, "y": 2.5},
-                {"label": "k40", "matrix": [8, 2], "x": 5, "y": 2.5},
-                {"label": "k41", "matrix": [8, 3], "x": 10, "y": 2.5},
+                {"label": "k15", "matrix": [2, 4], "x": 3, "y": 2},
+                {"label": "k16", "matrix": [2, 5], "x": 4, "y": 2.25},
+                {"label": "k17", "matrix": [2, 6], "x": 5, "y": 2.5},
+                {"label": "k38", "matrix": [8, 0], "x": 10, "y": 2.5},
+                {"label": "k39", "matrix": [8, 1], "x": 11, "y": 2.25},
+                {"label": "k40", "matrix": [8, 2], "x": 12, "y": 2},
+                {"label": "k41", "matrix": [8, 3], "x": 13, "y": 2.25},
                 {"label": "k42", "matrix": [8, 4], "x": 14, "y": 2.5},
                 {"label": "k43", "matrix": [8, 5], "x": 15, "y": 2.5},
-                {"label": "k18", "matrix": [3, 1], "x": 3, "y": 3},
-                {"label": "k19", "matrix": [3, 2], "x": 12, "y": 3},
+                {"label": "k18", "matrix": [3, 1], "x": 0, "y": 3.5},
+                {"label": "k19", "matrix": [3, 2], "x": 1, "y": 3.5},
                 {"label": "k20", "matrix": [3, 3], "x": 2, "y": 3.25},
-                {"label": "k21", "matrix": [3, 4], "x": 4, "y": 3.25},
-                {"label": "k22", "matrix": [3, 5], "x": 11, "y": 3.25},
-                {"label": "k23", "matrix": [4, 4], "x": 13, "y": 3.25},
-                {"label": "k44", "matrix": [10, 2], "x": 0, "y": 3.5},
-                {"label": "k45", "matrix": [9, 1], "x": 1, "y": 3.5},
-                {"label": "k46", "matrix": [9, 2], "x": 5, "y": 3.5},
-                {"label": "k47", "matrix": [9, 3], "x": 10, "y": 3.5},
+                {"label": "k21", "matrix": [3, 4], "x": 3, "y": 3},
+                {"label": "k22", "matrix": [3, 5], "x": 4, "y": 3.25},
+                {"label": "k23", "matrix": [4, 4], "x": 5, "y": 3.5},
+                {"label": "k44", "matrix": [10, 2], "x": 10, "y": 3.5},
+                {"label": "k45", "matrix": [9, 1], "x": 11, "y": 3.25},
+                {"label": "k46", "matrix": [9, 2], "x": 12, "y": 3},
+                {"label": "k47", "matrix": [9, 3], "x": 13, "y": 3.25},
                 {"label": "k48", "matrix": [9, 4], "x": 14, "y": 3.5},
                 {"label": "k49", "matrix": [9, 5], "x": 15, "y": 3.5},
                 {"label": "k24", "matrix": [5, 0], "x": 5, "y": 4.5},