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

1 files changed, 101 insertions, 88 deletions

diff --git a/keyboards/mechlovin/infinity87/rev1/rouge87/info.json b/keyboards/mechlovin/infinity87/rev1/rouge87/info.json
index 2957247ad4..983d20fdbf 100644
--- a/keyboards/mechlovin/infinity87/rev1/rouge87/info.json
+++ b/keyboards/mechlovin/infinity87/rev1/rouge87/info.json
@@ -11,94 +11,107 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"K00", "x":0, "y":0},
-                {"label":"K01", "x":2, "y":0},
-                {"label":"K02", "x":3, "y":0},
-                {"label":"K03", "x":4, "y":0},
-                {"label":"K04", "x":5, "y":0},
-                {"label":"K05", "x":6.5, "y":0},
-                {"label":"K06", "x":7.5, "y":0},
-                {"label":"K07", "x":8.5, "y":0},
-                {"label":"K08", "x":9.5, "y":0},
-                {"label":"K09", "x":11, "y":0},
-                {"label":"K0A", "x":12, "y":0},
-                {"label":"K0B", "x":13, "y":0},
-                {"label":"K0C", "x":14, "y":0},
-                {"label":"K0E", "x":15.25, "y":0},
-                {"label":"K0F", "x":16.25, "y":0},
-                {"label":"K0G", "x":17.25, "y":0},
-                {"label":"K10", "x":0, "y":1.25},
-                {"label":"K11", "x":1, "y":1.25},
-                {"label":"K12", "x":2, "y":1.25},
-                {"label":"K13", "x":3, "y":1.25},
-                {"label":"K14", "x":4, "y":1.25},
-                {"label":"K15", "x":5, "y":1.25},
-                {"label":"K16", "x":6, "y":1.25},
-                {"label":"K17", "x":7, "y":1.25},
-                {"label":"K18", "x":8, "y":1.25},
-                {"label":"K19", "x":9, "y":1.25},
-                {"label":"K1A", "x":10, "y":1.25},
-                {"label":"K1B", "x":11, "y":1.25},
-                {"label":"K1C", "x":12, "y":1.25},
-                {"label":"K1D", "x":13, "y":1.25, "w":2},
-                {"label":"K1E", "x":15.25, "y":1.25},
-                {"label":"K1F", "x":16.25, "y":1.25},
-                {"label":"K1G", "x":17.25, "y":1.25},
-                {"label":"K20", "x":0, "y":2.25, "w":1.5},
-                {"label":"K21", "x":1.5, "y":2.25},
-                {"label":"K22", "x":2.5, "y":2.25},
-                {"label":"K23", "x":3.5, "y":2.25},
-                {"label":"K24", "x":4.5, "y":2.25},
-                {"label":"K25", "x":5.5, "y":2.25},
-                {"label":"K26", "x":6.5, "y":2.25},
-                {"label":"K27", "x":7.5, "y":2.25},
-                {"label":"K28", "x":8.5, "y":2.25},
-                {"label":"K29", "x":9.5, "y":2.25},
-                {"label":"K2A", "x":10.5, "y":2.25},
-                {"label":"K2B", "x":11.5, "y":2.25},
-                {"label":"K2C", "x":12.5, "y":2.25},
-                {"label":"K2D", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"K2E", "x":15.25, "y":2.25},
-                {"label":"K2F", "x":16.25, "y":2.25},
-                {"label":"K2G", "x":17.25, "y":2.25},
-                {"label":"K30", "x":0, "y":3.25, "w":1.75},
-                {"label":"K31", "x":1.75, "y":3.25},
-                {"label":"K32", "x":2.75, "y":3.25},
-                {"label":"K33", "x":3.75, "y":3.25},
-                {"label":"K34", "x":4.75, "y":3.25},
-                {"label":"K35", "x":5.75, "y":3.25},
-                {"label":"K36", "x":6.75, "y":3.25},
-                {"label":"K37", "x":7.75, "y":3.25},
-                {"label":"K38", "x":8.75, "y":3.25},
-                {"label":"K39", "x":9.75, "y":3.25},
-                {"label":"K3A", "x":10.75, "y":3.25},
-                {"label":"K3B", "x":11.75, "y":3.25},
-                {"label":"K3C", "x":12.75, "y":3.25},
-                {"label":"K3D", "x":13.75, "y":3.25, "w":1.25},
-                {"label":"K40", "x":0, "y":4.25, "w":1.25},
-                {"label":"K41", "x":1.25, "y":4.25},
-                {"label":"K42", "x":2.25, "y":4.25},
-                {"label":"K43", "x":3.25, "y":4.25},
-                {"label":"K44", "x":4.25, "y":4.25},
-                {"label":"K45", "x":5.25, "y":4.25},
-                {"label":"K46", "x":6.25, "y":4.25},
-                {"label":"K47", "x":7.25, "y":4.25},
-                {"label":"K48", "x":8.25, "y":4.25},
-                {"label":"K49", "x":9.25, "y":4.25},
-                {"label":"K4A", "x":10.25, "y":4.25},
-                {"label":"K4B", "x":11.25, "y":4.25},
-                {"label":"K4D", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"K4F", "x":16.25, "y":4.25},
-                {"label":"K50", "x":0, "y":5.25, "w":1.5},
-                {"label":"K51", "x":1.5, "y":5.25},
-                {"label":"K52", "x":2.5, "y":5.25, "w":1.5},
-                {"label":"K56", "x":4, "y":5.25, "w":7},
-                {"label":"K5B", "x":11, "y":5.25, "w":1.5},
-                {"label":"K5C", "x":12.5, "y":5.25},
-                {"label":"K5D", "x":13.5, "y":5.25, "w":1.5},
-                {"label":"K5E", "x":15.25, "y":5.25},
-                {"label":"K5F", "x":16.25, "y":5.25},
-                {"label":"K5G", "x":17.25, "y":5.25}
+                {"label":"K00", "x":0, "y":0, "matrix": [0, 0]},
+
+                {"label":"K01", "x":2, "y":0, "matrix": [0, 1]},
+                {"label":"K02", "x":3, "y":0, "matrix": [0, 2]},
+                {"label":"K03", "x":4, "y":0, "matrix": [0, 3]},
+                {"label":"K04", "x":5, "y":0, "matrix": [0, 4]},
+
+                {"label":"K05", "x":6.5, "y":0, "matrix": [0, 5]},
+                {"label":"K06", "x":7.5, "y":0, "matrix": [0, 6]},
+                {"label":"K07", "x":8.5, "y":0, "matrix": [0, 7]},
+                {"label":"K08", "x":9.5, "y":0, "matrix": [0, 8]},
+
+                {"label":"K09", "x":11, "y":0, "matrix": [0, 9]},
+                {"label":"K0A", "x":12, "y":0, "matrix": [0, 10]},
+                {"label":"K0B", "x":13, "y":0, "matrix": [0, 11]},
+                {"label":"K0C", "x":14, "y":0, "matrix": [0, 12]},
+
+                {"label":"K0E", "x":15.25, "y":0, "matrix": [0, 14]},
+                {"label":"K0F", "x":16.25, "y":0, "matrix": [0, 15]},
+                {"label":"K0G", "x":17.25, "y":0, "matrix": [0, 16]},
+
+                {"label":"K10", "x":0, "y":1.25, "matrix": [1, 0]},
+                {"label":"K11", "x":1, "y":1.25, "matrix": [1, 1]},
+                {"label":"K12", "x":2, "y":1.25, "matrix": [1, 2]},
+                {"label":"K13", "x":3, "y":1.25, "matrix": [1, 3]},
+                {"label":"K14", "x":4, "y":1.25, "matrix": [1, 4]},
+                {"label":"K15", "x":5, "y":1.25, "matrix": [1, 5]},
+                {"label":"K16", "x":6, "y":1.25, "matrix": [1, 6]},
+                {"label":"K17", "x":7, "y":1.25, "matrix": [1, 7]},
+                {"label":"K18", "x":8, "y":1.25, "matrix": [1, 8]},
+                {"label":"K19", "x":9, "y":1.25, "matrix": [1, 9]},
+                {"label":"K1A", "x":10, "y":1.25, "matrix": [1, 10]},
+                {"label":"K1B", "x":11, "y":1.25, "matrix": [1, 11]},
+                {"label":"K1C", "x":12, "y":1.25, "matrix": [1, 12]},
+                {"label":"K1D", "x":13, "y":1.25, "w":2, "matrix": [1, 13]},
+
+                {"label":"K1E", "x":15.25, "y":1.25, "matrix": [1, 14]},
+                {"label":"K1F", "x":16.25, "y":1.25, "matrix": [1, 15]},
+                {"label":"K1G", "x":17.25, "y":1.25, "matrix": [1, 16]},
+
+                {"label":"K20", "x":0, "y":2.25, "w":1.5, "matrix": [2, 0]},
+                {"label":"K21", "x":1.5, "y":2.25, "matrix": [2, 1]},
+                {"label":"K22", "x":2.5, "y":2.25, "matrix": [2, 2]},
+                {"label":"K23", "x":3.5, "y":2.25, "matrix": [2, 3]},
+                {"label":"K24", "x":4.5, "y":2.25, "matrix": [2, 4]},
+                {"label":"K25", "x":5.5, "y":2.25, "matrix": [2, 5]},
+                {"label":"K26", "x":6.5, "y":2.25, "matrix": [2, 6]},
+                {"label":"K27", "x":7.5, "y":2.25, "matrix": [2, 7]},
+                {"label":"K28", "x":8.5, "y":2.25, "matrix": [2, 8]},
+                {"label":"K29", "x":9.5, "y":2.25, "matrix": [2, 9]},
+                {"label":"K2A", "x":10.5, "y":2.25, "matrix": [2, 10]},
+                {"label":"K2B", "x":11.5, "y":2.25, "matrix": [2, 11]},
+                {"label":"K2C", "x":12.5, "y":2.25, "matrix": [2, 12]},
+                {"label":"K2D", "x":13.5, "y":2.25, "w":1.5, "matrix": [2, 13]},
+
+                {"label":"K2E", "x":15.25, "y":2.25, "matrix": [2, 14]},
+                {"label":"K2F", "x":16.25, "y":2.25, "matrix": [2, 15]},
+                {"label":"K2G", "x":17.25, "y":2.25, "matrix": [2, 16]},
+
+                {"label":"K30", "x":0, "y":3.25, "w":1.75, "matrix": [3, 0]},
+                {"label":"K31", "x":1.75, "y":3.25, "matrix": [3, 1]},
+                {"label":"K32", "x":2.75, "y":3.25, "matrix": [3, 2]},
+                {"label":"K33", "x":3.75, "y":3.25, "matrix": [3, 3]},
+                {"label":"K34", "x":4.75, "y":3.25, "matrix": [3, 4]},
+                {"label":"K35", "x":5.75, "y":3.25, "matrix": [3, 5]},
+                {"label":"K36", "x":6.75, "y":3.25, "matrix": [3, 6]},
+                {"label":"K37", "x":7.75, "y":3.25, "matrix": [3, 7]},
+                {"label":"K38", "x":8.75, "y":3.25, "matrix": [3, 8]},
+                {"label":"K39", "x":9.75, "y":3.25, "matrix": [3, 9]},
+                {"label":"K3A", "x":10.75, "y":3.25, "matrix": [3, 10]},
+                {"label":"K3B", "x":11.75, "y":3.25, "matrix": [3, 11]},
+                {"label":"K3C", "x":12.75, "y":3.25, "matrix": [3, 12]},
+                {"label":"K3D", "x":13.75, "y":3.25, "w":1.25, "matrix": [3, 13]},
+
+                {"label":"K40", "x":0, "y":4.25, "w":1.25, "matrix": [4, 0]},
+                {"label":"K41", "x":1.25, "y":4.25, "matrix": [4, 1]},
+                {"label":"K42", "x":2.25, "y":4.25, "matrix": [4, 2]},
+                {"label":"K43", "x":3.25, "y":4.25, "matrix": [4, 3]},
+                {"label":"K44", "x":4.25, "y":4.25, "matrix": [4, 4]},
+                {"label":"K45", "x":5.25, "y":4.25, "matrix": [4, 5]},
+                {"label":"K46", "x":6.25, "y":4.25, "matrix": [4, 6]},
+                {"label":"K47", "x":7.25, "y":4.25, "matrix": [4, 7]},
+                {"label":"K48", "x":8.25, "y":4.25, "matrix": [4, 8]},
+                {"label":"K49", "x":9.25, "y":4.25, "matrix": [4, 9]},
+                {"label":"K4A", "x":10.25, "y":4.25, "matrix": [4, 10]},
+                {"label":"K4B", "x":11.25, "y":4.25, "matrix": [4, 11]},
+                {"label":"K4D", "x":12.25, "y":4.25, "w":2.75, "matrix": [4, 13]},
+
+                {"label":"K4F", "x":16.25, "y":4.25, "matrix": [4, 15]},
+
+                {"label":"K50", "x":0, "y":5.25, "w":1.5, "matrix": [5, 0]},
+                {"label":"K51", "x":1.5, "y":5.25, "matrix": [5, 1]},
+                {"label":"K52", "x":2.5, "y":5.25, "w":1.5, "matrix": [5, 2]},
+                {"label":"K56", "x":4, "y":5.25, "w":7, "matrix": [5, 6]},
+                {"label":"K5B", "x":11, "y":5.25, "w":1.5, "matrix": [5, 11]},
+                {"label":"K5C", "x":12.5, "y":5.25, "matrix": [5, 12]},
+                {"label":"K5D", "x":13.5, "y":5.25, "w":1.5, "matrix": [5, 13]},
+
+                {"label":"K5E", "x":15.25, "y":5.25, "matrix": [5, 14]},
+                {"label":"K5F", "x":16.25, "y":5.25, "matrix": [5, 15]},
+                {"label":"K5G", "x":17.25, "y":5.25, "matrix": [5, 16]}
             ]
         }
     }