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

20 files changed, 23 insertions, 23 deletions

diff --git a/keyboards/bkf/info.json b/keyboards/bkf/info.json
index 1ab228c1c2..c7b109d651 100644
--- a/keyboards/bkf/info.json
+++ b/keyboards/bkf/info.json
@@ -9,7 +9,7 @@
 
         "LAYOUT_2x3uC": {
             "layout": [{"label":"Tab", "x":0, "y":0, "w":1.5}, {"label":"Q", "x":1.5, "y":0}, {"label":"W", "x":2.5, "y":0}, {"label":"E", "x":3.5, "y":0}, {"label":"R", "x":4.5, "y":0}, {"label":"T", "x":5.5, "y":0}, {"label":"Y", "x":6.5, "y":0}, {"label":"U", "x":7.5, "y":0}, {"label":"I", "x":8.5, "y":0}, {"label":"O", "x":9.5, "y":0}, {"label":"P", "x":10.5, "y":0}, {"label":"{", "x":11.5, "y":0}, {"label":"}", "x":12.5, "y":0}, {"label":"Caps Lock", "x":0, "y":1, "w":1.75}, {"label":"A", "x":1.75, "y":1}, {"label":"S", "x":2.75, "y":1}, {"label":"D", "x":3.75, "y":1}, {"label":"F", "x":4.75, "y":1}, {"label":"G", "x":5.75, "y":1}, {"label":"H", "x":6.75, "y":1}, {"label":"J", "x":7.75, "y":1}, {"label":"K", "x":8.75, "y":1}, {"label":"L", "x":9.75, "y":1}, {"label":":", "x":10.75, "y":1}, {"label":"Control", "x":11.75, "y":1, "w":1.75}, {"label":"Shift", "x":0, "y":2, "w":2.25}, {"label":"Z", "x":2.25, "y":2}, {"label":"X", "x":3.25, "y":2}, {"label":"C", "x":4.25, "y":2}, {"label":"V", "x":5.25, "y":2}, {"label":"B", "x":6.25, "y":2}, {"label":"N", "x":7.25, "y":2}, {"label":"M", "x":8.25, "y":2}, {"label":"<", "x":9.25, "y":2}, {"label":">", "x":10.25, "y":2}, {"label":"?", "x":11.25, "y":2}, {"label":"Shift", "x":12.25, "y":2, "w":1.25}, {"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"Win", "x":1.25, "y":3, "w":1.25}, {"label":"Alt", "x":2.5, "y":3, "w":1.25}, {"label":"", "x":3.75, "y":3, "w":3}, {"label":"", "x":6.75, "y":3, "w":3}, {"label":"Alt", "x":9.75, "y":3, "w":1.25}, {"label":"Win", "x":11, "y":3, "w":1.25}, {"label":"Menu", "x":12.25, "y":3, "w":1.25}]
-        },
+        }
         
     }
 }
diff --git a/keyboards/dtisaac/dtisaac01/info.json b/keyboards/dtisaac/dtisaac01/info.json
index bf3582d2a2..eac22cda30 100644
--- a/keyboards/dtisaac/dtisaac01/info.json
+++ b/keyboards/dtisaac/dtisaac01/info.json
@@ -88,10 +88,10 @@
 				{"label":"K100", "x":10, "y":5.5, "w":1.25}, 
                 {"label":"K111", "x":11.25, "y":5.5, "w":1.25}, 
                 {"label":"K112", "x":12.5, "y":5.5, "w":1.25}, 
-                {"label":"K113", "x":13.75, "y":5.5, "w":1.25}
+                {"label":"K113", "x":13.75, "y":5.5, "w":1.25},
 				{"label":"K114", "x":15.25, "y":5.5}, 
 				{"label":"K115", "x":16.25, "y":5.5}, 
-				{"label":"K116", "x":17.25, "y":5.5},
+				{"label":"K116", "x":17.25, "y":5.5}
             ]
         }
     }
diff --git a/keyboards/ez_maker/directpins/teensy_2pp/info.json b/keyboards/ez_maker/directpins/teensy_2pp/info.json
index 214d4bdadc..d1aa41edd5 100644
--- a/keyboards/ez_maker/directpins/teensy_2pp/info.json
+++ b/keyboards/ez_maker/directpins/teensy_2pp/info.json
@@ -31,7 +31,7 @@
             ["C4", "A7", "A3", "F4"],
             ["C5", null, null, "F5"],
             ["C6", null, null, "F6"],
-            ["C7", null, null, "F7"],
+            ["C7", null, null, "F7"]
         ]
     },
     "usb": {
diff --git a/keyboards/ez_maker/directpins/teensy_32/info.json b/keyboards/ez_maker/directpins/teensy_32/info.json
index 851f9e67d1..5cebcae152 100644
--- a/keyboards/ez_maker/directpins/teensy_32/info.json
+++ b/keyboards/ez_maker/directpins/teensy_32/info.json
@@ -23,7 +23,7 @@
             ["LINE_PIN9",  null,         "LINE_PIN16"],
             ["LINE_PIN10", null,         "LINE_PIN15"],
             ["LINE_PIN11", null,         "LINE_PIN14"],
-            ["LINE_PIN12", "E30",        "LINE_PIN13"],
+            ["LINE_PIN12", "E30",        "LINE_PIN13"]
         ]
     },
     "usb": {
diff --git a/keyboards/ez_maker/directpins/teensy_lc/info.json b/keyboards/ez_maker/directpins/teensy_lc/info.json
index 8f64145e45..856a462bb7 100644
--- a/keyboards/ez_maker/directpins/teensy_lc/info.json
+++ b/keyboards/ez_maker/directpins/teensy_lc/info.json
@@ -23,7 +23,7 @@
             ["LINE_PIN9",  null,         "LINE_PIN16"],
             ["LINE_PIN10", null,         "LINE_PIN15"],
             ["LINE_PIN11", null,         "LINE_PIN14"],
-            ["LINE_PIN12", "E30",        "LINE_PIN13"],
+            ["LINE_PIN12", "E30",        "LINE_PIN13"]
         ]
     },
     "usb": {
diff --git a/keyboards/fjlabs/7vhotswap/info.json b/keyboards/fjlabs/7vhotswap/info.json
index 87e492bc4c..a4955756e9 100644
--- a/keyboards/fjlabs/7vhotswap/info.json
+++ b/keyboards/fjlabs/7vhotswap/info.json
@@ -18,7 +18,7 @@
                 {"label":"F10", "x":10.75, "y":0},
                 {"label":"F11", "x":11.75, "y":0},
                 {"label":"F12", "x":12.75, "y":0},
-                {"label":"Print Screen", "x":14, "y":0}
+                {"label":"Print Screen", "x":14, "y":0},
 
                 {"label":"~", "x":0, "y":1.25},
                 {"label":"!", "x":1, "y":1.25},
diff --git a/keyboards/frooastboard/info.json b/keyboards/frooastboard/info.json
index 4217439b5e..b1f7df7502 100644
--- a/keyboards/frooastboard/info.json
+++ b/keyboards/frooastboard/info.json
@@ -28,7 +28,7 @@
               "y": 1
             }
           ]
-        },
+        }
     },
     "matrix_pins": {
         "rows": ["B0", "B1"],
diff --git a/keyboards/handwired/hillside/0_1/info.json b/keyboards/handwired/hillside/0_1/info.json
index e45e4571f5..4505bf3e35 100644
--- a/keyboards/handwired/hillside/0_1/info.json
+++ b/keyboards/handwired/hillside/0_1/info.json
@@ -1,7 +1,7 @@
 {
     "matrix_pins": {
         "rows": ["D7", "E6", "B4", "B5"],
-        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"]
      },    
     "diode_direction": "COL2ROW",
 
@@ -9,5 +9,5 @@
       "vid": "0xFEED",
       "pid": "0x67C0",
       "device_ver": "0x0001"
-    },
+    }
 }
diff --git a/keyboards/macro3/info.json b/keyboards/macro3/info.json
index b25779cb70..a29313c2b3 100644
--- a/keyboards/macro3/info.json
+++ b/keyboards/macro3/info.json
@@ -13,7 +13,7 @@
                 {"x": 0, "y": 1},
                 {"x": 1, "y": 1},
                 {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
+                {"x": 3, "y": 1}
             ]
         }
     }
diff --git a/keyboards/mini_ten_key_plus/info.json b/keyboards/mini_ten_key_plus/info.json
index c300a0bcff..7dd50afbf3 100644
--- a/keyboards/mini_ten_key_plus/info.json
+++ b/keyboards/mini_ten_key_plus/info.json
@@ -9,7 +9,7 @@
                 {"label":"Backspace", "x":0, "y":1},{"label":"7", "x":1, "y":1}         ,{"label":"8", "x":2, "y":1},{"label":"9", "x":3, "y":1},{"label":"+", "x":4, "y":1},
                 {"label":"(", "x":0, "y":2}        ,{"label":"4", "x":1, "y":2}         ,{"label":"5", "x":2, "y":2},{"label":"6", "x":3, "y":2},{"label":"+", "x":4, "y":2},
                 {"label":")", "x":0, "y":3}        ,{"label":"1", "x":1, "y":3}         ,{"label":"2", "x":2, "y":3},{"label":"3", "x":3, "y":3},{"label":"Enter", "x":4, "y":3},
-                {"label":"y", "x":0, "y":4}        ,{"label":"00", "x":1, "y":4}        ,{"label":"0", "x":2, "y":4},{"label":".", "x":3, "y":4},{"label":"Enter", "x":4, "y":4},
+                {"label":"y", "x":0, "y":4}        ,{"label":"00", "x":1, "y":4}        ,{"label":"0", "x":2, "y":4},{"label":".", "x":3, "y":4},{"label":"Enter", "x":4, "y":4}
             ]
         },
         "LAYOUT_standard_numpad": {
@@ -18,7 +18,7 @@
                 {"label":"Backspace", "x":0, "y":1},{"label":"7", "x":1, "y":1}         ,{"label":"8", "x":2, "y":1},{"label":"9", "x":3, "y":1},
                 {"label":"(", "x":0, "y":2}        ,{"label":"4", "x":1, "y":2}         ,{"label":"5", "x":2, "y":2},{"label":"6", "x":3, "y":2},{"label":"+", "x":4, "y":2, "h":2},
                 {"label":")", "x":0, "y":3}        ,{"label":"1", "x":1, "y":3}         ,{"label":"2", "x":2, "y":3},{"label":"3", "x":3, "y":3},
-                {"label":"y", "x":0, "y":4}        ,{"label":"0", "x":1, "y":4 ,"w":2}  ,{"label":".", "x":3, "y":4},{"label":"Enter", "x":4, "y":3, "h":2},
+                {"label":"y", "x":0, "y":4}        ,{"label":"0", "x":1, "y":4 ,"w":2}  ,{"label":".", "x":3, "y":4},{"label":"Enter", "x":4, "y":3, "h":2}
             ]
         }
     }
diff --git a/keyboards/mntre/info.json b/keyboards/mntre/info.json
index 05e4bd4fd0..cf3ce47394 100644
--- a/keyboards/mntre/info.json
+++ b/keyboards/mntre/info.json
@@ -91,7 +91,7 @@
                 {"label": "PGDOWN",  "x": 10.5, "y": 5},
                 {"label": "LEFT",    "x": 11.5, "y": 5},
                 {"label": "DOWN",    "x": 12.5, "y": 5},
-                {"label": "RIGHT",   "x": 13.5, "y": 5},
+                {"label": "RIGHT",   "x": 13.5, "y": 5}
             ]
         }
     }
diff --git a/keyboards/mokey/ginkgo65hot/info.json b/keyboards/mokey/ginkgo65hot/info.json
index d4e32f436d..e2e96c167c 100644
--- a/keyboards/mokey/ginkgo65hot/info.json
+++ b/keyboards/mokey/ginkgo65hot/info.json
@@ -35,7 +35,7 @@
                 {"label":"k1b", "x":11.5, "y":1},
                 {"label":"k1c", "x":12.5, "y":1},
                 {"label":"k1d", "x":13.5, "y":1, "w":1.5},
-                {"label":"k1e", "x":15, "y":1,},
+                {"label":"k1e", "x":15, "y":1},
                 
                 {"label":"k20", "x":0, "y":2, "w":1.75},
                 {"label":"k21", "x":1.75, "y":2},
diff --git a/keyboards/ogurec/info.json b/keyboards/ogurec/info.json
index bc4e637b32..1cb6823f95 100644
--- a/keyboards/ogurec/info.json
+++ b/keyboards/ogurec/info.json
@@ -80,7 +80,7 @@
                 {"label":"<", "x":9, "y":2}, 
                 {"label":">", "x":10, "y":2}, 
                 {"label":"?", "x":11, "y":2}]
-        },
+        }
 
     }
 }
diff --git a/keyboards/ramonimbao/squishyfrl/info.json b/keyboards/ramonimbao/squishyfrl/info.json
index 03cdda4fd9..15a1cd1f86 100644
--- a/keyboards/ramonimbao/squishyfrl/info.json
+++ b/keyboards/ramonimbao/squishyfrl/info.json
@@ -67,7 +67,7 @@
                 {"x":10.25, "y":3}, 
                 {"x":11.25, "y":3}, 
                 {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3} 
+                {"x":14, "y":3}, 
                 {"x":16.25, "y":3}, 
                 
                 {"x":0, "y":4, "w":1.25}, 
diff --git a/keyboards/tgr/jane/v2ce/info.json b/keyboards/tgr/jane/v2ce/info.json
index 582bfcd30e..97e12227f2 100644
--- a/keyboards/tgr/jane/v2ce/info.json
+++ b/keyboards/tgr/jane/v2ce/info.json
@@ -27,7 +27,7 @@
 
       "LAYOUT_tkl_f13_iso_tsangan": {
         "layout": [{"x":0, "y":0}, {"x":1.25, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.75, "y":0}, {"x":10.75, "y":0}, {"x":11.75, "y":0}, {"x":12.75, "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}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"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.75, "y":2.5, "w":1.25, "h":2}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"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}, {"x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"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.5}, {"x":1.5, "y":5.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":12.5, "y":5.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}]
-      }
+      },
 
       "LAYOUT_tkl_f13_iso_tsangan_split_rshift": {
         "layout": [{"x":0, "y":0}, {"x":1.25, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.75, "y":0}, {"x":10.75, "y":0}, {"x":11.75, "y":0}, {"x":12.75, "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}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"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.75, "y":2.5, "w":1.25, "h":2}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"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}, {"x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"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":1.75}, {"x":14, "y":4.5}, {"x":16.25, "y":4.5}, {"x":0, "y":5.5, "w":1.5}, {"x":1.5, "y":5.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":12.5, "y":5.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}]
diff --git a/keyboards/tkc/portico/info.json b/keyboards/tkc/portico/info.json
index 4fd61be674..b2ff8054c7 100644
--- a/keyboards/tkc/portico/info.json
+++ b/keyboards/tkc/portico/info.json
@@ -3,7 +3,7 @@
     "url": "",
     "maintainer": "TerryMathews",
     "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_65_ansi_blocker",
+        "LAYOUT_all": "LAYOUT_65_ansi_blocker"
     },
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
diff --git a/keyboards/work_louder/loop/info.json b/keyboards/work_louder/loop/info.json
index 6e5f76c7f4..2190f53512 100644
--- a/keyboards/work_louder/loop/info.json
+++ b/keyboards/work_louder/loop/info.json
@@ -17,7 +17,7 @@
                 {"label": "k08", "x": 8, "y": 1, "w": 0},
                 {"label": "k09", "x": 9, "y": 1, "w": 0},
                 {"label": "k0a", "x": 10, "y": 1, "w": 0},
-                {"label": "k0b", "x": 11, "y": 1, "w": 0},
+                {"label": "k0b", "x": 11, "y": 1, "w": 0}
             ]
         }
     }
diff --git a/keyboards/work_louder/nano/info.json b/keyboards/work_louder/nano/info.json
index 4c21048597..a80ef21d63 100644
--- a/keyboards/work_louder/nano/info.json
+++ b/keyboards/work_louder/nano/info.json
@@ -7,7 +7,7 @@
             "layout": [
                 {"label": "k00", "x": 0, "y": 0},
                 {"label": "k01", "x": 1, "y": 0},
-                {"label": "k02", "x": 2, "y": 0},
+                {"label": "k02", "x": 2, "y": 0}
             ]
         }
     }
diff --git a/keyboards/ymdk/np24/u4rgb6/info.json b/keyboards/ymdk/np24/u4rgb6/info.json
index 1a107c0b98..fe5a940c08 100644
--- a/keyboards/ymdk/np24/u4rgb6/info.json
+++ b/keyboards/ymdk/np24/u4rgb6/info.json
@@ -81,7 +81,7 @@
                 {"x": 2.5, "y": 1},
                 {"x": 3.5, "y": 1},
                 {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1,},
+                {"x": 5.5, "y": 1},
 
                 {"x": 0, "y": 2, "w": 1.5},
                 {"x": 1.5, "y": 2},
diff --git a/keyboards/z12/info.json b/keyboards/z12/info.json
index 3ae8937571..2395401e47 100644
--- a/keyboards/z12/info.json
+++ b/keyboards/z12/info.json
@@ -19,7 +19,7 @@
 
                 {"x": 0.5, "y": 3},
                 {"x": 1.5, "y": 3},
-                {"x": 2.5, "y": 3},
+                {"x": 2.5, "y": 3}
             ]
         }
     }