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

1 files changed, 175 insertions, 175 deletions

diff --git a/keyboards/melgeek/mach80/info.json b/keyboards/melgeek/mach80/info.json
index e786df7c17..ea7c628c6f 100755
--- a/keyboards/melgeek/mach80/info.json
+++ b/keyboards/melgeek/mach80/info.json
@@ -4,192 +4,192 @@
     "maintainer": "melgeek001365",
     "layouts": {
         "LAYOUT_tkl_ansi": {
-			"layout": [
-				{"x":0, "y":0},
-				{"x":2, "y":0},
-				{"x":3, "y":0},
-				{"x":4, "y":0},
-				{"x":5, "y":0},
-				{"x":6.5, "y":0},
-				{"x":7.5, "y":0},
-				{"x":8.5, "y":0},
-				{"x":9.5, "y":0},
-				{"x":11, "y":0},
-				{"x":12, "y":0},
-				{"x":13, "y":0},
-				{"x":14, "y":0},
-				{"x":15.25, "y":0},
-				{"x":16.25, "y":0},
-				{"x":17.25, "y":0},
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6.5, "y": 0},
+                {"x": 7.5, "y": 0},
+                {"x": 8.5, "y": 0},
+                {"x": 9.5, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+                {"x": 15.25, "y": 0},
+                {"x": 16.25, "y": 0},
+                {"x": 17.25, "y": 0},
 
-				{"x":0, "y":1},
-				{"x":1, "y":1},
-				{"x":2, "y":1},
-				{"x":3, "y":1},
-				{"x":4, "y":1},
-				{"x":5, "y":1},
-				{"x":6, "y":1},
-				{"x":7, "y":1},
-				{"x":8, "y":1},
-				{"x":9, "y":1},
-				{"x":10, "y":1},
-				{"x":11, "y":1},
-				{"x":12, "y":1},
-				{"x":13, "y":1, "w":2.0},
-				{"x":15.25, "y":1},
-				{"x":16.25, "y":1},
-				{"x":17.25, "y":1},
+                {"x": 0, "y": 1.5},
+                {"x": 1, "y": 1.5},
+                {"x": 2, "y": 1.5},
+                {"x": 3, "y": 1.5},
+                {"x": 4, "y": 1.5},
+                {"x": 5, "y": 1.5},
+                {"x": 6, "y": 1.5},
+                {"x": 7, "y": 1.5},
+                {"x": 8, "y": 1.5},
+                {"x": 9, "y": 1.5},
+                {"x": 10, "y": 1.5},
+                {"x": 11, "y": 1.5},
+                {"x": 12, "y": 1.5},
+                {"x": 13, "y": 1.5, "w": 2.0},
+                {"x": 15.25, "y": 1.5},
+                {"x": 16.25, "y": 1.5},
+                {"x": 17.25, "y": 1.5},
 
-				{"x":0, "y":2, "w":1.5},
-				{"x":1.5, "y":2},
-				{"x":2.5, "y":2},
-				{"x":3.5, "y":2},
-				{"x":4.5, "y":2},
-				{"x":5.5, "y":2},
-				{"x":6.5, "y":2},
-				{"x":7.5, "y":2},
-				{"x":8.5, "y":2},
-				{"x":9.5, "y":2},
-				{"x":10.5, "y":2},
-				{"x":11.5, "y":2},
-				{"x":12.5, "y":2},
-				{"x":13.5, "y":2, "w":1.5},
-				{"x":15.25, "y":2},
-				{"x":16.25, "y":2},
-				{"x":17.25, "y":2},
+                {"x": 0, "y": 2.5, "w": 1.5},
+                {"x": 1.5, "y": 2.5},
+                {"x": 2.5, "y": 2.5},
+                {"x": 3.5, "y": 2.5},
+                {"x": 4.5, "y": 2.5},
+                {"x": 5.5, "y": 2.5},
+                {"x": 6.5, "y": 2.5},
+                {"x": 7.5, "y": 2.5},
+                {"x": 8.5, "y": 2.5},
+                {"x": 9.5, "y": 2.5},
+                {"x": 10.5, "y": 2.5},
+                {"x": 11.5, "y": 2.5},
+                {"x": 12.5, "y": 2.5},
+                {"x": 13.5, "y": 2.5, "w": 1.5},
+                {"x": 15.25, "y": 2.5},
+                {"x": 16.25, "y": 2.5},
+                {"x": 17.25, "y": 2.5},
 
-				{"x":0, "y":3, "w":1.75},
-				{"x":1.75, "y":3},
-				{"x":2.75, "y":3},
-				{"x":3.75, "y":3},
-				{"x":4.75, "y":3},
-				{"x":5.75, "y":3},
-				{"x":6.75, "y":3},
-				{"x":7.75, "y":3},
-				{"x":8.75, "y":3},
-				{"x":9.75, "y":3},
-				{"x":10.75, "y":3},
-				{"x":11.75, "y":3},
-				{"x":12.75, "y":3, "w":2.25},
-				
-				{"x":0, "y":4, "w":2.25},
-				{"x":2.25, "y":4},
-				{"x":3.25, "y":4},
-				{"x":4.25, "y":4},
-				{"x":5.25, "y":4},
-				{"x":6.25, "y":4},
-				{"x":7.25, "y":4},
-				{"x":8.25, "y":4},
-				{"x":9.25, "y":4},
-				{"x":10.25, "y":4},
-				{"x":11.25, "y":4},
-				{"x":12.25, "y":4, "w":2.75},
-				{"x":16.25, "y":4},
+                {"x": 0, "y": 3.5, "w": 1.75},
+                {"x": 1.75, "y": 3.5},
+                {"x": 2.75, "y": 3.5},
+                {"x": 3.75, "y": 3.5},
+                {"x": 4.75, "y": 3.5},
+                {"x": 5.75, "y": 3.5},
+                {"x": 6.75, "y": 3.5},
+                {"x": 7.75, "y": 3.5},
+                {"x": 8.75, "y": 3.5},
+                {"x": 9.75, "y": 3.5},
+                {"x": 10.75, "y": 3.5},
+                {"x": 11.75, "y": 3.5},
+                {"x": 12.75, "y": 3.5, "w": 2.25},
 
-				{"x":0, "y":5, "w":1.25},
-				{"x":1.25, "y":5, "w":1.25},
-				{"x":2.5, "y":5, "w":1.25},
-				{"x":3.75, "y":5, "w":6.25},
-				{"x":10, "y":5, "w":1.25},
-				{"x":11.25, "y":5, "w":1.25},
-				{"x":12.5, "y":5, "w":1.25},
-				{"x":13.75, "y":5, "w":1.25},
-				{"x":15.25, "y":5},
-				{"x":16.25, "y":5},
-				{"x":17.25, "y":5}
+                {"x": 0, "y": 4.5, "w": 2.25},
+                {"x": 2.25, "y": 4.5},
+                {"x": 3.25, "y": 4.5},
+                {"x": 4.25, "y": 4.5},
+                {"x": 5.25, "y": 4.5},
+                {"x": 6.25, "y": 4.5},
+                {"x": 7.25, "y": 4.5},
+                {"x": 8.25, "y": 4.5},
+                {"x": 9.25, "y": 4.5},
+                {"x": 10.25, "y": 4.5},
+                {"x": 11.25, "y": 4.5},
+                {"x": 12.25, "y": 4.5, "w": 2.75},
+                {"x": 16.25, "y": 4.5},
+
+                {"x": 0, "y": 5.5, "w": 1.25},
+                {"x": 1.25, "y": 5.5, "w": 1.25},
+                {"x": 2.5, "y": 5.5, "w": 1.25},
+                {"x": 3.75, "y": 5.5, "w": 6.25},
+                {"x": 10, "y": 5.5, "w": 1.25},
+                {"x": 11.25, "y": 5.5, "w": 1.25},
+                {"x": 12.5, "y": 5.5, "w": 1.25},
+                {"x": 13.75, "y": 5.5, "w": 1.25},
+                {"x": 15.25, "y": 5.5},
+                {"x": 16.25, "y": 5.5},
+                {"x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_ansi_wkl": {
-			"layout": [
-				{"x":0, "y":0},
-				{"x":2, "y":0},
-				{"x":3, "y":0},
-				{"x":4, "y":0},
-				{"x":5, "y":0},
-				{"x":6.5, "y":0},
-				{"x":7.5, "y":0},
-				{"x":8.5, "y":0},
-				{"x":9.5, "y":0},
-				{"x":11, "y":0},
-				{"x":12, "y":0},
-				{"x":13, "y":0},
-				{"x":14, "y":0},
-				{"x":15.25, "y":0},
-				{"x":16.25, "y":0},
-				{"x":17.25, "y":0},
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6.5, "y": 0},
+                {"x": 7.5, "y": 0},
+                {"x": 8.5, "y": 0},
+                {"x": 9.5, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+                {"x": 15.25, "y": 0},
+                {"x": 16.25, "y": 0},
+                {"x": 17.25, "y": 0},
+
+                {"x": 0, "y": 1.5},
+                {"x": 1, "y": 1.5},
+                {"x": 2, "y": 1.5},
+                {"x": 3, "y": 1.5},
+                {"x": 4, "y": 1.5},
+                {"x": 5, "y": 1.5},
+                {"x": 6, "y": 1.5},
+                {"x": 7, "y": 1.5},
+                {"x": 8, "y": 1.5},
+                {"x": 9, "y": 1.5},
+                {"x": 10, "y": 1.5},
+                {"x": 11, "y": 1.5},
+                {"x": 12, "y": 1.5},
+                {"x": 13, "y": 1.5, "w": 2.0},
+                {"x": 15.25, "y": 1.5},
+                {"x": 16.25, "y": 1.5},
+                {"x": 17.25, "y": 1.5},
 
-				{"x":0, "y":1},
-				{"x":1, "y":1},
-				{"x":2, "y":1},
-				{"x":3, "y":1},
-				{"x":4, "y":1},
-				{"x":5, "y":1},
-				{"x":6, "y":1},
-				{"x":7, "y":1},
-				{"x":8, "y":1},
-				{"x":9, "y":1},
-				{"x":10, "y":1},
-				{"x":11, "y":1},
-				{"x":12, "y":1},
-				{"x":13, "y":1, "w":2.0},
-				{"x":15.25, "y":1},
-				{"x":16.25, "y":1},
-				{"x":17.25, "y":1},
+                {"x": 0, "y": 2.5, "w": 1.5},
+                {"x": 1.5, "y": 2.5},
+                {"x": 2.5, "y": 2.5},
+                {"x": 3.5, "y": 2.5},
+                {"x": 4.5, "y": 2.5},
+                {"x": 5.5, "y": 2.5},
+                {"x": 6.5, "y": 2.5},
+                {"x": 7.5, "y": 2.5},
+                {"x": 8.5, "y": 2.5},
+                {"x": 9.5, "y": 2.5},
+                {"x": 10.5, "y": 2.5},
+                {"x": 11.5, "y": 2.5},
+                {"x": 12.5, "y": 2.5},
+                {"x": 13.5, "y": 2.5, "w": 1.5},
+                {"x": 15.25, "y": 2.5},
+                {"x": 16.25, "y": 2.5},
+                {"x": 17.25, "y": 2.5},
 
-				{"x":0, "y":2, "w":1.5},
-				{"x":1.5, "y":2},
-				{"x":2.5, "y":2},
-				{"x":3.5, "y":2},
-				{"x":4.5, "y":2},
-				{"x":5.5, "y":2},
-				{"x":6.5, "y":2},
-				{"x":7.5, "y":2},
-				{"x":8.5, "y":2},
-				{"x":9.5, "y":2},
-				{"x":10.5, "y":2},
-				{"x":11.5, "y":2},
-				{"x":12.5, "y":2},
-				{"x":13.5, "y":2, "w":1.5},
-				{"x":15.25, "y":2},
-				{"x":16.25, "y":2},
-				{"x":17.25, "y":2},
+                {"x": 0, "y": 3.5, "w": 1.75},
+                {"x": 1.75, "y": 3.5},
+                {"x": 2.75, "y": 3.5},
+                {"x": 3.75, "y": 3.5},
+                {"x": 4.75, "y": 3.5},
+                {"x": 5.75, "y": 3.5},
+                {"x": 6.75, "y": 3.5},
+                {"x": 7.75, "y": 3.5},
+                {"x": 8.75, "y": 3.5},
+                {"x": 9.75, "y": 3.5},
+                {"x": 10.75, "y": 3.5},
+                {"x": 11.75, "y": 3.5},
+                {"x": 12.75, "y": 3.5, "w": 2.25},
 
-				{"x":0, "y":3, "w":1.75},
-				{"x":1.75, "y":3},
-				{"x":2.75, "y":3},
-				{"x":3.75, "y":3},
-				{"x":4.75, "y":3},
-				{"x":5.75, "y":3},
-				{"x":6.75, "y":3},
-				{"x":7.75, "y":3},
-				{"x":8.75, "y":3},
-				{"x":9.75, "y":3},
-				{"x":10.75, "y":3},
-				{"x":11.75, "y":3},
-				{"x":12.75, "y":3, "w":2.25},
-				
-				{"x":0, "y":4, "w":2.25},
-				{"x":2.25, "y":4},
-				{"x":3.25, "y":4},
-				{"x":4.25, "y":4},
-				{"x":5.25, "y":4},
-				{"x":6.25, "y":4},
-				{"x":7.25, "y":4},
-				{"x":8.25, "y":4},
-				{"x":9.25, "y":4},
-				{"x":10.25, "y":4},
-				{"x":11.25, "y":4},
-				{"x":12.25, "y":4, "w":2.75},
-				{"x":16.25, "y":4},
+                {"x": 0, "y": 4.5, "w": 2.25},
+                {"x": 2.25, "y": 4.5},
+                {"x": 3.25, "y": 4.5},
+                {"x": 4.25, "y": 4.5},
+                {"x": 5.25, "y": 4.5},
+                {"x": 6.25, "y": 4.5},
+                {"x": 7.25, "y": 4.5},
+                {"x": 8.25, "y": 4.5},
+                {"x": 9.25, "y": 4.5},
+                {"x": 10.25, "y": 4.5},
+                {"x": 11.25, "y": 4.5},
+                {"x": 12.25, "y": 4.5, "w": 2.75},
+                {"x": 16.25, "y": 4.5},
 
-				{"x":0, "y":5, "w":1.5},
-				{"x":2.5, "y":5, "w":1.5},
-				{"x":4, "y":5, "w":7},
-				{"x":11, "y":5, "w":1.5},
-				{"x":13.5, "y":5, "w":1.5},
-				{"x":15.25, "y":5},
-				{"x":16.25, "y":5},
-				{"x":17.25, "y":5}
+                {"x": 0, "y": 5.5, "w": 1.5},
+                {"x": 2.5, "y": 5.5, "w": 1.5},
+                {"x": 4, "y": 5.5, "w": 7},
+                {"x": 11, "y": 5.5, "w": 1.5},
+                {"x": 13.5, "y": 5.5, "w": 1.5},
+                {"x": 15.25, "y": 5.5},
+                {"x": 16.25, "y": 5.5},
+                {"x": 17.25, "y": 5.5}
             ]
         }
     }