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

26 files changed, 2 insertions, 59 deletions

diff --git a/keyboards/keebio/bdn9/info.json b/keyboards/keebio/bdn9/info.json
index 1c8f5dec83..e383395eea 100644
--- a/keyboards/keebio/bdn9/info.json
+++ b/keyboards/keebio/bdn9/info.json
@@ -2,8 +2,6 @@
   "keyboard_name": "Keebio BDN9",
   "url": "https://keeb.io",
   "maintainer": "Keebio",
-  "width": 3,
-  "height": 3,
   "layouts": {
     "LAYOUT": {
       "layout": [
diff --git a/keyboards/keebio/bfo9000/info.json b/keyboards/keebio/bfo9000/info.json
index 1fda64e4cc..c492ccae18 100644
--- a/keyboards/keebio/bfo9000/info.json
+++ b/keyboards/keebio/bfo9000/info.json
@@ -2,8 +2,6 @@
     "keyboard_name": "Keebio BFO-9000",
     "url": "https://keeb.io",
     "maintainer": "Keebio",
-    "width": 19,
-    "height": 6,
     "layouts": {
       "LAYOUT": {
         "layout": [
@@ -124,4 +122,3 @@
       }
     }
   }
-  
\ No newline at end of file
diff --git a/keyboards/keebio/choconum/info.json b/keyboards/keebio/choconum/info.json
index 8886235667..b036cf0b79 100644
--- a/keyboards/keebio/choconum/info.json
+++ b/keyboards/keebio/choconum/info.json
@@ -2,11 +2,8 @@
     "keyboard_name": "Choconum",
     "url": "https://keeb.io",
     "maintainer": "Keebio",
-    "width": 5,
-    "height": 4,
     "layouts": {
         "LAYOUT_numpad_5x4": {
-            "key_count": 17,
             "layout": [
                 {"x":0, "y":0},
                 {"x":1, "y":0},
@@ -32,7 +29,6 @@
             ]
         },
         "LAYOUT_ortho_5x4": {
-            "key_count": 20,
             "layout": [
                 {"x":0, "y":0},
                 {"x":1, "y":0},
diff --git a/keyboards/keebio/chocopad/info.json b/keyboards/keebio/chocopad/info.json
index c5a7d42bbc..6fbbbbd4fc 100644
--- a/keyboards/keebio/chocopad/info.json
+++ b/keyboards/keebio/chocopad/info.json
@@ -2,8 +2,6 @@
   "keyboard_name": "Chocopad",
   "url": "",
   "maintainer": "qmk",
-  "width": 4,
-  "height": 4,
   "layouts": {
     "LAYOUT_ortho_4x4": {
       "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}]
diff --git a/keyboards/keebio/dilly/info.json b/keyboards/keebio/dilly/info.json
index 6b67d45b93..fd12fce337 100644
--- a/keyboards/keebio/dilly/info.json
+++ b/keyboards/keebio/dilly/info.json
@@ -2,11 +2,8 @@
   "keyboard_name": "Dilly",
   "url": "",
   "maintainer": "qmk",
-  "width": 10,
-  "height": 3,
   "layouts": {
     "LAYOUT_ortho_3x10": {
-      "key_count": 30,
       "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":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":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}]
     }
   }
diff --git a/keyboards/keebio/dsp40/info.json b/keyboards/keebio/dsp40/info.json
index e00f4f21a6..e595a4d2a6 100644
--- a/keyboards/keebio/dsp40/info.json
+++ b/keyboards/keebio/dsp40/info.json
@@ -2,8 +2,6 @@
     "keyboard_name": "DSP40",
     "url": "https://keeb.io",
     "maintainer": "nooges",
-    "width": 12,
-    "height": 4,
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/keebio/ergodicity/info.json b/keyboards/keebio/ergodicity/info.json
index b019da3aae..83b5049e20 100644
--- a/keyboards/keebio/ergodicity/info.json
+++ b/keyboards/keebio/ergodicity/info.json
@@ -2,8 +2,6 @@
     "keyboard_name": "Ergodicity",
     "url": "https://keeb.io",
     "maintainer": "Keebio",
-    "width": 19.5,
-    "height": 5.25,
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/keebio/foldkb/info.json b/keyboards/keebio/foldkb/info.json
index cf248ae48a..e94389ef4e 100644
--- a/keyboards/keebio/foldkb/info.json
+++ b/keyboards/keebio/foldkb/info.json
@@ -2,8 +2,6 @@
     "keyboard_name": "FoldKB",
     "url": "https://keeb.io",
     "maintainer": "nooges",
-    "width": 17.5,
-    "height": 5,
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/keebio/fourier/info.json b/keyboards/keebio/fourier/info.json
index b16476c4b9..2449a399dd 100644
--- a/keyboards/keebio/fourier/info.json
+++ b/keyboards/keebio/fourier/info.json
@@ -2,8 +2,6 @@
     "keyboard_name": "Fourier", 
     "url": "https://keeb.io", 
     "maintainer": "nooges", 
-    "width": 14, 
-    "height": 4, 
     "layouts": {
         "LAYOUT": {
             "layout": [
@@ -64,4 +62,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/keebio/iris/info.json b/keyboards/keebio/iris/info.json
index 37806975f8..ec52ef04d1 100644
--- a/keyboards/keebio/iris/info.json
+++ b/keyboards/keebio/iris/info.json
@@ -2,8 +2,6 @@
     "keyboard_name": "Iris",
     "url": "https://keeb.io",
     "maintainer": "Keebio",
-    "width": 15,
-    "height": 5.75,
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/keebio/kbo5000/info.json b/keyboards/keebio/kbo5000/info.json
index 222587c26b..f4d37e012d 100644
--- a/keyboards/keebio/kbo5000/info.json
+++ b/keyboards/keebio/kbo5000/info.json
@@ -2,8 +2,6 @@
     "keyboard_name": "KBO-5000",
     "url": "https://keeb.io",
     "maintainer": "nooges",
-    "width": 20.5,
-    "height": 6.25,
     "layouts": {
         "LAYOUT_ansi": {
             "layout": [
diff --git a/keyboards/keebio/laplace/info.json b/keyboards/keebio/laplace/info.json
index e783a1f496..c4df4c3a9d 100644
--- a/keyboards/keebio/laplace/info.json
+++ b/keyboards/keebio/laplace/info.json
@@ -2,8 +2,6 @@
     "keyboard_name": "Laplace", 
     "url": "https://keeb.io", 
     "maintainer": "nooges", 
-    "width": 13, 
-    "height": 4, 
     "layouts": {
         "LAYOUT": {
             "layout": [
@@ -60,4 +58,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/keebio/levinson/info.json b/keyboards/keebio/levinson/info.json
index 2fb8fa9e3e..1d98ca9f4e 100644
--- a/keyboards/keebio/levinson/info.json
+++ b/keyboards/keebio/levinson/info.json
@@ -2,8 +2,6 @@
   "keyboard_name": "Levinson",
   "url": "https://keeb.io",
   "maintainer": "Keebio",
-  "width": 13,
-  "height": 4,
   "layouts": {
     "LAYOUT": {
       "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":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}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "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":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "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":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}]
diff --git a/keyboards/keebio/nyquist/info.json b/keyboards/keebio/nyquist/info.json
index 263b45767b..43561a553f 100644
--- a/keyboards/keebio/nyquist/info.json
+++ b/keyboards/keebio/nyquist/info.json
@@ -1,8 +1,6 @@
 {
   "keyboard_name": "Nyquist",
   "maintainer": "qmk",
-  "width": 13,
-  "height": 5,
   "layouts": {
     "LAYOUT": {
       "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":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}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "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":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "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":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}]
diff --git a/keyboards/keebio/quefrency/rev1/info.json b/keyboards/keebio/quefrency/rev1/info.json
index cf3fa10874..1e50e2e698 100644
--- a/keyboards/keebio/quefrency/rev1/info.json
+++ b/keyboards/keebio/quefrency/rev1/info.json
@@ -2,8 +2,6 @@
     "keyboard_name": "Quefrency rev1",
     "url": "https://keeb.io",
     "maintainer": "nooges",
-    "width": 19.25,
-    "height": 5,
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/keebio/quefrency/rev2/info.json b/keyboards/keebio/quefrency/rev2/info.json
index 38bd7966d9..120add8eaa 100644
--- a/keyboards/keebio/quefrency/rev2/info.json
+++ b/keyboards/keebio/quefrency/rev2/info.json
@@ -2,8 +2,6 @@
     "keyboard_name": "Quefrency rev2",
     "url": "https://keeb.io",
     "maintainer": "nooges",
-    "width": 19.25,
-    "height": 5,
     "layout_aliases": {
         "LAYOUT": "LAYOUT_60"
     },
diff --git a/keyboards/keebio/quefrency/rev3/info.json b/keyboards/keebio/quefrency/rev3/info.json
index c14a083d8b..5f59c90e80 100644
--- a/keyboards/keebio/quefrency/rev3/info.json
+++ b/keyboards/keebio/quefrency/rev3/info.json
@@ -2,8 +2,6 @@
     "keyboard_name": "Quefrency rev3",
     "url": "https://keeb.io",
     "maintainer": "nooges",
-    "width": 19.25,
-    "height": 5,
     "layout_aliases": {
         "LAYOUT": "LAYOUT_60"
     },
diff --git a/keyboards/keebio/quefrency/rev4/info.json b/keyboards/keebio/quefrency/rev4/info.json
index c0319ed872..3c2364ef15 100644
--- a/keyboards/keebio/quefrency/rev4/info.json
+++ b/keyboards/keebio/quefrency/rev4/info.json
@@ -2,8 +2,6 @@
     "keyboard_name": "Quefrency rev4",
     "url": "https://keeb.io",
     "maintainer": "nooges",
-    "width": 19.25,
-    "height": 5,
     "layout_aliases": {
         "LAYOUT": "LAYOUT_60"
     },
diff --git a/keyboards/keebio/rorschach/info.json b/keyboards/keebio/rorschach/info.json
index 8d6ec6abd5..9675f96b8a 100644
--- a/keyboards/keebio/rorschach/info.json
+++ b/keyboards/keebio/rorschach/info.json
@@ -2,11 +2,8 @@
   "keyboard_name": "Rorschach",
   "url": "https://keeb.io",
   "maintainer": "nooges",
-  "width": 15,
-  "height": 6,
   "layouts": {
     "LAYOUT": {
-      "key_count": 52,
       "layout": [
         { "w": 1, "x": 0, "y": 0 },
         { "w": 1, "x": 1, "y": 0 },
diff --git a/keyboards/keebio/sinc/info.json b/keyboards/keebio/sinc/info.json
index fbbde699c4..9b89484bba 100644
--- a/keyboards/keebio/sinc/info.json
+++ b/keyboards/keebio/sinc/info.json
@@ -2,8 +2,6 @@
     "keyboard_name": "Sinc",
     "url": "https://keeb.io",
     "maintainer": "nooges",
-    "width": 19,
-    "height": 6.25,
     "layouts": {
         "LAYOUT_75": {
             "layout": [
diff --git a/keyboards/keebio/stick/info.json b/keyboards/keebio/stick/info.json
index 33029e8cbf..494dbe664b 100644
--- a/keyboards/keebio/stick/info.json
+++ b/keyboards/keebio/stick/info.json
@@ -2,8 +2,6 @@
     "keyboard_name": "The Stick",
     "url": "https://keeb.io",
     "maintainer": "nooges",
-    "width": 12,
-    "height": 1,
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/keebio/tragicforce68/info.json b/keyboards/keebio/tragicforce68/info.json
index 3ff0b3678f..cb806cc5cb 100644
--- a/keyboards/keebio/tragicforce68/info.json
+++ b/keyboards/keebio/tragicforce68/info.json
@@ -2,8 +2,6 @@
   "keyboard_name": "Tragicforce 68",
   "url": "https://keeb.io",
   "maintainer": "Keebio",
-  "width": 17.25,
-  "height": 5,
   "layouts": {
     "LAYOUT_68_ansi": {
       "layout": [
diff --git a/keyboards/keebio/tukey/info.json b/keyboards/keebio/tukey/info.json
index a43d1dbbf4..a17d5afa44 100644
--- a/keyboards/keebio/tukey/info.json
+++ b/keyboards/keebio/tukey/info.json
@@ -2,8 +2,6 @@
     "keyboard_name": "Tukey",
     "url": "https://keeb.io",
     "maintainer": "nooges",
-    "width": 2,
-    "height": 1,
     "layouts": {
       "LAYOUT": {
         "layout": [
diff --git a/keyboards/keebio/viterbi/info.json b/keyboards/keebio/viterbi/info.json
index c37d941f40..f28a7410d1 100644
--- a/keyboards/keebio/viterbi/info.json
+++ b/keyboards/keebio/viterbi/info.json
@@ -2,8 +2,6 @@
     "keyboard_name": "Viterbi",
     "url": "https://keeb.io",
     "maintainer": "nooges",
-    "width": 15,
-    "height": 5,
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/keebio/wavelet/info.json b/keyboards/keebio/wavelet/info.json
index a71058b95a..a4bc57b86f 100644
--- a/keyboards/keebio/wavelet/info.json
+++ b/keyboards/keebio/wavelet/info.json
@@ -2,8 +2,6 @@
   "keyboard_name": "Wavelet",
   "url": "https://keeb.io",
   "maintainer": "Keebio",
-  "width": 12,
-  "height": 4,
   "layouts": {
     "LAYOUT": {
       "layout": [
diff --git a/keyboards/keebio/wtf60/info.json b/keyboards/keebio/wtf60/info.json
index cdb30ea7ad..ad7e9c8c89 100644
--- a/keyboards/keebio/wtf60/info.json
+++ b/keyboards/keebio/wtf60/info.json
@@ -2,8 +2,6 @@
     "keyboard_name": "WTF60",
     "url": "https://keeb.io",
     "maintainer": "Keebio",
-    "width": 15,
-    "height": 5,
     "layouts": {
         "LAYOUT_full_wtf": {
             "layout": [{"label":"Bksp", "x":0, "y":0}, {"label":"Del", "x":1, "y":0}, {"label":"+", "x":2, "y":0}, {"label":"_", "x":3, "y":0}, {"label":")", "x":4, "y":0}, {"label":"(", "x":5, "y":0}, {"label":"*", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"^", "x":8, "y":0}, {"label":"%", "x":9, "y":0}, {"label":"$", "x":10, "y":0}, {"label":"#", "x":11, "y":0}, {"label":"@", "x":12, "y":0}, {"label":"!", "x":13, "y":0}, {"label":"Esc", "x":14, "y":0}, {"label":"|", "x":0, "y":1, "w":1.5}, {"label":"}", "x":1.5, "y":1}, {"label":"{", "x":2.5, "y":1}, {"label":"P", "x":3.5, "y":1}, {"label":"O", "x":4.5, "y":1}, {"label":"I", "x":5.5, "y":1}, {"label":"U", "x":6.5, "y":1}, {"label":"Y", "x":7.5, "y":1}, {"label":"T", "x":8.5, "y":1}, {"label":"R", "x":9.5, "y":1}, {"label":"E", "x":10.5, "y":1}, {"label":"W", "x":11.5, "y":1}, {"label":"Q", "x":12.5, "y":1}, {"label":"Tab", "x":13.5, "y":1, "w":1.5}, {"label":"Enter", "x":0, "y":2, "w":1.25}, {"label":"~", "x":1.25, "y":2}, {"label":"\"", "x":2.25, "y":2}, {"label":":", "x":3.25, "y":2}, {"label":"L", "x":4.25, "y":2}, {"label":"K", "x":5.25, "y":2}, {"label":"J", "x":6.25, "y":2}, {"label":"H", "x":7.25, "y":2}, {"label":"G", "x":8.25, "y":2}, {"label":"F", "x":9.25, "y":2}, {"label":"D", "x":10.25, "y":2}, {"label":"S", "x":11.25, "y":2}, {"label":"A", "x":12.25, "y":2}, {"label":"Caps Lock", "x":13.25, "y":2, "w":1.75}, {"label":"Fn", "x":0, "y":3}, {"label":"Shift", "x":1, "y":3, "w":1.75}, {"label":"?", "x":2.75, "y":3}, {"label":">", "x":3.75, "y":3}, {"label":"<", "x":4.75, "y":3}, {"label":"M", "x":5.75, "y":3}, {"label":"N", "x":6.75, "y":3}, {"label":"B", "x":7.75, "y":3}, {"label":"V", "x":8.75, "y":3}, {"label":"C", "x":9.75, "y":3}, {"label":"X", "x":10.75, "y":3}, {"label":"Z", "x":11.75, "y":3}, {"label":"|", "x":12.75, "y":3}, {"label":"Shift", "x":13.75, "y":3, "w":1.25}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Menu", "x":1.25, "y":4, "w":1.25}, {"label":"Win", "x":2.5, "y":4, "w":1.25}, {"label":"Alt", "x":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":6.25}, {"label":"Alt", "x":11.25, "y":4, "w":1.25}, {"label":"Win", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]