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

26 files changed, 7 insertions, 60 deletions

diff --git a/keyboards/evyd13/atom47/rev2/info.json b/keyboards/evyd13/atom47/rev2/info.json
index a9947ae898..5603c0e247 100644
--- a/keyboards/evyd13/atom47/rev2/info.json
+++ b/keyboards/evyd13/atom47/rev2/info.json
@@ -2,8 +2,6 @@
     "keyboard_name": "Atom47 rev2", 
     "url": "", 
     "maintainer": "evyd13", 
-    "width": 13, 
-    "height": 4, 
     "layouts": {
         "LAYOUT_split_space": {
             "layout": [
diff --git a/keyboards/evyd13/atom47/rev3/info.json b/keyboards/evyd13/atom47/rev3/info.json
index 28a83c1199..fc602f699b 100644
--- a/keyboards/evyd13/atom47/rev3/info.json
+++ b/keyboards/evyd13/atom47/rev3/info.json
@@ -2,8 +2,6 @@
     "keyboard_name": "Atom47 rev3", 
     "url": "", 
     "maintainer": "evyd13", 
-    "width": 13, 
-    "height": 4, 
     "layouts": {
         "LAYOUT_split_space": {
             "layout": [
diff --git a/keyboards/evyd13/atom47/rev4/info.json b/keyboards/evyd13/atom47/rev4/info.json
index dead529afb..d0fbf98742 100644
--- a/keyboards/evyd13/atom47/rev4/info.json
+++ b/keyboards/evyd13/atom47/rev4/info.json
@@ -2,8 +2,6 @@
     "keyboard_name": "Atom47 rev4", 
     "url": "", 
     "maintainer": "evyd13", 
-    "width": 13, 
-    "height": 4, 
     "layouts": {
         "LAYOUT_split_space": {
             "layout": [
diff --git a/keyboards/evyd13/atom47/rev5/info.json b/keyboards/evyd13/atom47/rev5/info.json
index f66c86e94c..eae42fe746 100644
--- a/keyboards/evyd13/atom47/rev5/info.json
+++ b/keyboards/evyd13/atom47/rev5/info.json
@@ -2,8 +2,6 @@
     "keyboard_name": "Atom47 rev5", 
     "url": "", 
     "maintainer": "evyd13", 
-    "width": 13, 
-    "height": 4, 
     "layouts": {
         "LAYOUT_split_space": {
             "layout": [
@@ -60,4 +58,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/evyd13/eon40/info.json b/keyboards/evyd13/eon40/info.json
index 056be65d0d..38348b49b9 100644
--- a/keyboards/evyd13/eon40/info.json
+++ b/keyboards/evyd13/eon40/info.json
@@ -2,8 +2,6 @@
   "keyboard_name": "Eon40", 
   "url": "https://maartenwut.com/product/eon40/", 
   "maintainer": "qmk", 
-  "width": 12, 
-  "height": 4, 
   "layouts": {
     "LAYOUT_ortho_4x12": {
       "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "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":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}]
diff --git a/keyboards/evyd13/eon65/info.json b/keyboards/evyd13/eon65/info.json
index 1a9f749576..41b1b056ee 100644
--- a/keyboards/evyd13/eon65/info.json
+++ b/keyboards/evyd13/eon65/info.json
@@ -2,8 +2,6 @@
     "keyboard_name": "Eon65", 
     "url": "", 
     "maintainer": "qmk", 
-    "width": 16, 
-    "height": 5, 
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/evyd13/eon75/info.json b/keyboards/evyd13/eon75/info.json
index 9066542a1f..9730b069e8 100644
--- a/keyboards/evyd13/eon75/info.json
+++ b/keyboards/evyd13/eon75/info.json
@@ -2,8 +2,6 @@
     "keyboard_name": "Eon75", 
     "url": "", 
     "maintainer": "qmk", 
-    "width": 16.5, 
-    "height": 6.5, 
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/evyd13/eon87/info.json b/keyboards/evyd13/eon87/info.json
index b0ed86a7ea..1020ccd06e 100644
--- a/keyboards/evyd13/eon87/info.json
+++ b/keyboards/evyd13/eon87/info.json
@@ -2,8 +2,6 @@
     "keyboard_name": "Eon87",
     "url": "",
     "maintainer": "qmk",
-    "width": 18.25,
-    "height": 6.25,
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/evyd13/eon95/info.json b/keyboards/evyd13/eon95/info.json
index 6580ef66ee..18cb38ad2f 100644
--- a/keyboards/evyd13/eon95/info.json
+++ b/keyboards/evyd13/eon95/info.json
@@ -2,8 +2,6 @@
     "keyboard_name": "Eon95", 
     "url": "", 
     "maintainer": "qmk", 
-    "width": 19.5, 
-    "height": 6.5, 
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/evyd13/gh80_1800/info.json b/keyboards/evyd13/gh80_1800/info.json
index b468320d8c..5019157c06 100644
--- a/keyboards/evyd13/gh80_1800/info.json
+++ b/keyboards/evyd13/gh80_1800/info.json
@@ -2,8 +2,6 @@
     "keyboard_name": "GH80-1800", 
     "url": "https://github.com/evyd13/gh80-series/tree/master/GH80-1800", 
     "maintainer": "evyd13", 
-    "width": 19.5, 
-    "height": 7.25, 
     "layouts": {
         "LAYOUT_all": {
             "layout": [
@@ -353,4 +351,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/evyd13/gh80_3700/info.json b/keyboards/evyd13/gh80_3700/info.json
index 9f3ff6e5ed..8f6402a45e 100644
--- a/keyboards/evyd13/gh80_3700/info.json
+++ b/keyboards/evyd13/gh80_3700/info.json
@@ -2,8 +2,6 @@
     "keyboard_name": "GH80-3700", 
     "url": "https://github.com/evyd13/gh80-series/tree/master/GH80-3700", 
     "maintainer": "evyd13", 
-    "width": 4, 
-    "height": 7, 
     "layouts": {
         "LAYOUT_ortho_6x4": {
             "layout": [
diff --git a/keyboards/evyd13/gud70/info.json b/keyboards/evyd13/gud70/info.json
index d2a9d9248c..bf0ac9df4e 100644
--- a/keyboards/evyd13/gud70/info.json
+++ b/keyboards/evyd13/gud70/info.json
@@ -2,8 +2,6 @@
     "keyboard_name": "Gud70", 
     "url": "https://github.com/evyd13/gud70-pcb", 
     "maintainer": "evyd13", 
-    "width": 17, 
-    "height": 5, 
     "layouts": {
         "LAYOUT_all": {
             "layout": [
@@ -249,4 +247,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/evyd13/minitomic/info.json b/keyboards/evyd13/minitomic/info.json
index 4af72b36e1..388569fac8 100644
--- a/keyboards/evyd13/minitomic/info.json
+++ b/keyboards/evyd13/minitomic/info.json
@@ -2,8 +2,6 @@
   "keyboard_name": "Minitomic", 
   "url": "", 
   "maintainer": "qmk", 
-  "width": 13, 
-  "height": 4, 
   "layouts": {
     "LAYOUT_split_space": {
       "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1, "w":1.75}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2, "w":1.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3, "w":1.25}, {"x":2.5, "y":3}, {"x":3.5, "y":3}, {"x":4.5, "y":3, "w":1.75}, {"x":6.25, "y":3, "w":2}, {"x":8.25, "y":3}, {"x":9.25, "y":3, "w":1.25}, {"x":10.5, "y":3, "w":1.25}, {"x":11.75, "y":3, "w":1.25}]
diff --git a/keyboards/evyd13/mx5160/info.json b/keyboards/evyd13/mx5160/info.json
index af35cd70d6..7c1a0bb396 100644
--- a/keyboards/evyd13/mx5160/info.json
+++ b/keyboards/evyd13/mx5160/info.json
@@ -2,11 +2,9 @@
     "keyboard_name": "mx5160", 
     "url": "https://github.com/evyd13/mx-5160", 
     "maintainer": "qmk", 
-    "width": 22, 
-    "height": 5, 
     "layouts": {
         "LAYOUT_all": {
             "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":10.5, "y":0}, {"x":11.5, "y":0}, {"x":12.5, "y":0}, {"x":13.5, "y":0}, {"x":14.5, "y":0}, {"x":15.5, "y":0}, {"x":16.5, "y":0}, {"x":18, "y":0}, {"x":19, "y":0}, {"x":20, "y":0}, {"x":21, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2.5, "y":1, "w":1.5}, {"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}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":16, "y":1, "w":1.5}, {"x":18, "y":1}, {"x":19, "y":1}, {"x":20, "y":1}, {"x":21, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2.5, "y":2, "w":1.75}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2}, {"x":11.25, "y":2}, {"x":12.25, "y":2}, {"x":13.25, "y":2}, {"x":14.25, "y":2}, {"x":15.25, "y":2}, {"x":16.25, "y":2, "w":1.25}, {"x":18, "y":2}, {"x":19, "y":2}, {"x":20, "y":2}, {"x":21, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2.5, "y":3, "w":1.25}, {"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}, {"x":13.75, "y":3}, {"x":14.75, "y":3, "w":1.75}, {"x":16.5, "y":3}, {"x":18, "y":3}, {"x":19, "y":3}, {"x":20, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2.5, "y":4, "w":1.5}, {"x":5, "y":4, "w":1.5}, {"x":6.5, "y":4, "w":7}, {"x":13.5, "y":4, "w":1.5}, {"x":16, "y":4, "w":1.5}, {"x":18, "y":4}, {"x":19, "y":4}, {"x":20, "y":4}, {"x":21, "y":3, "h":2}]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/evyd13/nt660/info.json b/keyboards/evyd13/nt660/info.json
index 371fd9a05e..8f087c68c3 100644
--- a/keyboards/evyd13/nt660/info.json
+++ b/keyboards/evyd13/nt660/info.json
@@ -2,8 +2,6 @@
     "keyboard_name": "nt660", 
     "url": "", 
     "maintainer": "evyd13", 
-    "width": 16.5, 
-    "height": 5, 
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/evyd13/nt750/info.json b/keyboards/evyd13/nt750/info.json
index 9ac63a9b4b..5342807d65 100644
--- a/keyboards/evyd13/nt750/info.json
+++ b/keyboards/evyd13/nt750/info.json
@@ -2,8 +2,6 @@
     "keyboard_name": "nt750", 
     "url": "https://github.com/evyd13/nt-series/tree/main/nt-750", 
     "maintainer": "evyd13", 
-    "width": 18.25, 
-    "height": 6.5, 
     "layouts": {
         "LAYOUT_all": {
             "layout": [
@@ -297,4 +295,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/evyd13/nt980/info.json b/keyboards/evyd13/nt980/info.json
index 408e1287d3..8b1b32449e 100644
--- a/keyboards/evyd13/nt980/info.json
+++ b/keyboards/evyd13/nt980/info.json
@@ -2,8 +2,6 @@
     "keyboard_name": "nt980", 
     "url": "", 
     "maintainer": "maartenwut", 
-    "width": 19.5, 
-    "height": 6.75, 
     "layouts": {
         "LAYOUT_all": {
             "layout": [
@@ -330,4 +328,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/evyd13/omrontkl/info.json b/keyboards/evyd13/omrontkl/info.json
index faf9569644..3f0dfb9bc3 100644
--- a/keyboards/evyd13/omrontkl/info.json
+++ b/keyboards/evyd13/omrontkl/info.json
@@ -2,8 +2,6 @@
     "keyboard_name": "OmronTKL",
     "url": "",
     "maintainer": "qmk",
-    "width": 18.25,
-    "height": 6.25,
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/evyd13/plain60/info.json b/keyboards/evyd13/plain60/info.json
index 48aad441fb..64eb305464 100644
--- a/keyboards/evyd13/plain60/info.json
+++ b/keyboards/evyd13/plain60/info.json
@@ -2,8 +2,6 @@
     "keyboard_name": "Plain60",
     "url": "",
     "maintainer": "evyd13",
-    "width": 15,
-    "height": 5,
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/evyd13/pockettype/info.json b/keyboards/evyd13/pockettype/info.json
index d1999273f6..f81dbec539 100644
--- a/keyboards/evyd13/pockettype/info.json
+++ b/keyboards/evyd13/pockettype/info.json
@@ -2,8 +2,6 @@
   "keyboard_name": "PocketType", 
   "url": "https://mechboards.co.uk/shop/kits/pockettype/", 
   "maintainer": "evyd13", 
-  "width": 12, 
-  "height": 4, 
   "layouts": {
     "LAYOUT_ortho_4x12": {
       "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "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":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}]
diff --git a/keyboards/evyd13/quackfire/info.json b/keyboards/evyd13/quackfire/info.json
index de7c9384cf..68a0767c94 100644
--- a/keyboards/evyd13/quackfire/info.json
+++ b/keyboards/evyd13/quackfire/info.json
@@ -2,8 +2,6 @@
     "keyboard_name": "Quackfire",
     "url": "https://github.com/evyd13/quackfire-controller",
     "maintainer": "evyd13",
-    "width": 18.5,
-    "height": 6.5,
     "layouts": {
         "LAYOUT_tkl_ansi": {
             "layout": [
diff --git a/keyboards/evyd13/solheim68/info.json b/keyboards/evyd13/solheim68/info.json
index dbafbc0d4d..b0776223b6 100644
--- a/keyboards/evyd13/solheim68/info.json
+++ b/keyboards/evyd13/solheim68/info.json
@@ -2,8 +2,6 @@
     "keyboard_name": "Solheim68", 
     "url": "https://github.com/evyd13/solheim68", 
     "maintainer": "evyd13", 
-    "width": 17.25, 
-    "height": 5, 
     "layouts": {
         "LAYOUT_all": {
             "layout": [
@@ -394,4 +392,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/evyd13/ta65/info.json b/keyboards/evyd13/ta65/info.json
index e509521d4d..5d390c9f6e 100644
--- a/keyboards/evyd13/ta65/info.json
+++ b/keyboards/evyd13/ta65/info.json
@@ -2,8 +2,6 @@
     "keyboard_name": "ta65",
     "url": "",
     "maintainer": "qmk",
-    "width": 16,
-    "height": 5,
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/evyd13/wasdat/info.json b/keyboards/evyd13/wasdat/info.json
index 83c413eda2..23e59c6b33 100644
--- a/keyboards/evyd13/wasdat/info.json
+++ b/keyboards/evyd13/wasdat/info.json
@@ -2,8 +2,6 @@
     "keyboard_name": "Wasdat",
     "url": "https://maartenwut.com/product/wasdat/",
     "maintainer": "evyd13",
-    "width": 22.5,
-    "height": 6.5,
     "layouts": {
         "LAYOUT_fullsize_ansi": {
             "layout": [
diff --git a/keyboards/evyd13/wasdat_code/info.json b/keyboards/evyd13/wasdat_code/info.json
index 4e6ed630ca..1c0f14ed3d 100644
--- a/keyboards/evyd13/wasdat_code/info.json
+++ b/keyboards/evyd13/wasdat_code/info.json
@@ -2,8 +2,6 @@
     "keyboard_name": "Wasdat Code",
     "url": "https://maartenwut.com/product/wasdat-code/",
     "maintainer": "evyd13",
-    "width": 22.5,
-    "height": 6.5,
     "layouts": {
         "LAYOUT_fullsize_ansi": {
             "layout": [
diff --git a/keyboards/evyd13/wonderland/info.json b/keyboards/evyd13/wonderland/info.json
index a98ee650cf..fd91f32dc1 100644
--- a/keyboards/evyd13/wonderland/info.json
+++ b/keyboards/evyd13/wonderland/info.json
@@ -2,11 +2,8 @@
     "keyboard_name": "Wonderland",
     "url": "",
     "maintainer": "evyd13",
-    "width": 18.25,
-    "height": 5,
     "layouts": {
         "LAYOUT_alice_split_bs": {
-            "key_count": 66,
             "layout": [
                 {"label":"k10", "x":0, "y":0},
                 {"label":"k00", "x":1.25, "y":0},