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

14 files changed, 2 insertions, 68 deletions

diff --git a/keyboards/clueboard/17/info.json b/keyboards/clueboard/17/info.json
index 47260572e6..8ef87244ee 100644
--- a/keyboards/clueboard/17/info.json
+++ b/keyboards/clueboard/17/info.json
@@ -2,8 +2,6 @@
   "manufacturer": "Clueboard",
   "keyboard_name": "Clueboard 17% (Cluepad)",
   "maintainer": "skullydazed",
-  "height": 5,
-  "width": 4,
   "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "features": {
@@ -44,7 +42,6 @@
   },
   "layouts": {
     "LAYOUT_numpad_5x4": {
-      "key_count": 17,
       "layout": [
         { "label": "Num Lock", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
         { "label": "/", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
diff --git a/keyboards/clueboard/2x1800/2018/info.json b/keyboards/clueboard/2x1800/2018/info.json
index 878b24ce17..3028fd4c20 100644
--- a/keyboards/clueboard/2x1800/2018/info.json
+++ b/keyboards/clueboard/2x1800/2018/info.json
@@ -2,8 +2,6 @@
   "manufacturer": "Clueboard",
   "keyboard_name": "Clueboard 2x1800 2018",
   "maintainer": "skullydazed",
-  "height": 6.5,
-  "width": 24,
   "processor": "at90usb1286",
   "bootloader": "halfkay",
   "debounce": 5,
@@ -48,7 +46,6 @@
   },
   "layouts": {
     "LAYOUT_4u_space": {
-      "key_count": 124,
       "layout": [
         { "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
         { "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
@@ -177,7 +174,6 @@
       ]
     },
     "LAYOUT_7u_space": {
-      "key_count": 121,
       "layout": [
         { "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
         { "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
@@ -303,7 +299,6 @@
       ]
     },
     "LAYOUT_all": {
-      "key_count": 127,
       "layout": [
         { "label": "Home", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
         { "label": "End", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
diff --git a/keyboards/clueboard/2x1800/2019/info.json b/keyboards/clueboard/2x1800/2019/info.json
index 26185b7a48..a877cae8b0 100644
--- a/keyboards/clueboard/2x1800/2019/info.json
+++ b/keyboards/clueboard/2x1800/2019/info.json
@@ -2,8 +2,6 @@
   "manufacturer": "Clueboard",
   "keyboard_name": "Clueboard 2x1800 2019",
   "maintainer": "skullydazed",
-  "height": 8,
-  "width": 24,
   "debounce": 5,
   "processor": "at90usb1286",
   "bootloader": "halfkay",
@@ -35,7 +33,6 @@
   },
   "layouts": {
     "LAYOUT_1u_ansi": {
-      "key_count": 131,
       "layout": [
         { "matrix": [12, 3], "w": 1, "x": 3, "y": 0 },
         { "matrix": [12, 4], "w": 1, "x": 4, "y": 0 },
@@ -171,7 +168,6 @@
       ]
     },
     "LAYOUT_1u_iso": {
-      "key_count": 131,
       "layout": [
         { "matrix": [12, 3], "w": 1, "x": 3, "y": 0 },
         { "matrix": [12, 4], "w": 1, "x": 4, "y": 0 },
@@ -307,7 +303,6 @@
       ]
     },
     "LAYOUT_2u_ansi": {
-      "key_count": 130,
       "layout": [
         { "matrix": [12, 3], "w": 1, "x": 3, "y": 0 },
         { "matrix": [12, 4], "w": 1, "x": 4, "y": 0 },
@@ -442,7 +437,6 @@
       ]
     },
     "LAYOUT_2u_iso": {
-      "key_count": 130,
       "layout": [
         { "matrix": [12, 3], "w": 1, "x": 3, "y": 0 },
         { "matrix": [12, 4], "w": 1, "x": 4, "y": 0 },
@@ -577,7 +571,6 @@
       ]
     },
     "LAYOUT_4u_ansi": {
-      "key_count": 128,
       "layout": [
         { "matrix": [12, 3], "w": 1, "x": 3, "y": 0 },
         { "matrix": [12, 4], "w": 1, "x": 4, "y": 0 },
@@ -710,7 +703,6 @@
       ]
     },
     "LAYOUT_4u_iso": {
-      "key_count": 128,
       "layout": [
         { "matrix": [12, 3], "w": 1, "x": 3, "y": 0 },
         { "matrix": [12, 4], "w": 1, "x": 4, "y": 0 },
@@ -843,7 +835,6 @@
       ]
     },
     "LAYOUT_7u_ansi": {
-      "key_count": 125,
       "layout": [
         { "matrix": [12, 3], "w": 1, "x": 3, "y": 0 },
         { "matrix": [12, 4], "w": 1, "x": 4, "y": 0 },
@@ -973,7 +964,6 @@
       ]
     },
     "LAYOUT_7u_iso": {
-      "key_count": 125,
       "layout": [
         { "matrix": [12, 3], "w": 1, "x": 3, "y": 0 },
         { "matrix": [12, 4], "w": 1, "x": 4, "y": 0 },
@@ -1103,7 +1093,6 @@
       ]
     },
     "LAYOUT_all": {
-      "key_count": 132,
       "layout": [
         { "matrix": [12, 3], "w": 1, "x": 3, "y": 0 },
         { "matrix": [12, 4], "w": 1, "x": 4, "y": 0 },
diff --git a/keyboards/clueboard/2x1800/2021/info.json b/keyboards/clueboard/2x1800/2021/info.json
index 460be68cb6..376b9151e5 100644
--- a/keyboards/clueboard/2x1800/2021/info.json
+++ b/keyboards/clueboard/2x1800/2021/info.json
@@ -2,8 +2,6 @@
     "manufacturer": "Clueboard",
     "keyboard_name": "Clueboard 2x1800 2021",
     "maintainer": "skullydazed",
-    "height": 6.5,
-    "width": 24,
     "bootloader": "halfkay",
     "debounce": 5,
     "diode_direction": "ROW2COL",
@@ -35,7 +33,6 @@
     },
     "layouts": {
         "LAYOUT_4u_space": {
-            "key_count": 124,
             "layout": [
                 { "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
                 { "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
@@ -164,7 +161,6 @@
             ]
         },
         "LAYOUT_7u_space": {
-            "key_count": 121,
             "layout": [
                 { "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
                 { "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
@@ -290,7 +286,6 @@
             ]
         },
         "LAYOUT_all": {
-            "key_count": 127,
             "layout": [
                 { "label": "Home", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
                 { "label": "End", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
diff --git a/keyboards/clueboard/2x1800/info.json b/keyboards/clueboard/2x1800/info.json
index 55207e2b4d..e3fa1b8b84 100644
--- a/keyboards/clueboard/2x1800/info.json
+++ b/keyboards/clueboard/2x1800/info.json
@@ -1,4 +1,3 @@
 {
-    "diode_direction": "ROW2COL",
-    "width": 24
+    "diode_direction": "ROW2COL"
 }
diff --git a/keyboards/clueboard/60/info.json b/keyboards/clueboard/60/info.json
index a68081daf0..695194e827 100644
--- a/keyboards/clueboard/60/info.json
+++ b/keyboards/clueboard/60/info.json
@@ -2,8 +2,6 @@
   "manufacturer": "Clueboard",
   "keyboard_name": "Clueboard 60%",
   "maintainer": "skullydazed",
-  "height": 5,
-  "width": 15,
   "debounce": 6,
   "processor": "STM32F303",
   "board": "QMK_PROTON_C",
@@ -37,7 +35,6 @@
   },
   "layouts": {
     "LAYOUT_60_ansi": {
-      "key_count": 61,
       "layout": [
         { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
         { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
@@ -103,7 +100,6 @@
       ]
     },
     "LAYOUT_60_ansi_split_bs_rshift": {
-      "key_count": 63,
       "layout": [
         { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
         { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
@@ -171,7 +167,6 @@
       ]
     },
     "LAYOUT_60_iso": {
-      "key_count": 62,
       "layout": [
         { "label": "\\u00ac", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
         { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
@@ -238,7 +233,6 @@
       ]
     },
     "LAYOUT_aek": {
-      "key_count": 60,
       "layout": [
         { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
         { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
@@ -303,7 +297,6 @@
       ]
     },
     "LAYOUT_all": {
-      "key_count": 65,
       "layout": [
         { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
         { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
diff --git a/keyboards/clueboard/66/info.json b/keyboards/clueboard/66/info.json
index df88648d80..0967ef424b 100644
--- a/keyboards/clueboard/66/info.json
+++ b/keyboards/clueboard/66/info.json
@@ -1,4 +1 @@
-{
-  "width": 16.5,
-  "height": 5
-}
+{}
diff --git a/keyboards/clueboard/66/rev1/info.json b/keyboards/clueboard/66/rev1/info.json
index beb83b5e65..c59cfa0b81 100644
--- a/keyboards/clueboard/66/rev1/info.json
+++ b/keyboards/clueboard/66/rev1/info.json
@@ -2,8 +2,6 @@
   "manufacturer": "Clueboard",
   "keyboard_name": "Clueboard 66%",
   "maintainer": "skullydazed",
-  "height": 5,
-  "width": 16.5,
   "processor": "atmega32u4",
   "debounce": 5,
   "diode_direction": "COL2ROW",
@@ -50,7 +48,6 @@
   },
   "layouts": {
     "LAYOUT_66_ansi": {
-      "key_count": 66,
       "layout": [
         { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
         { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
@@ -121,7 +118,6 @@
       ]
     },
     "LAYOUT_66_iso": {
-      "key_count": 67,
       "layout": [
         { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
         { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
@@ -193,7 +189,6 @@
       ]
     },
     "LAYOUT_all": {
-      "key_count": 73,
       "layout": [
         { "label": "GRAVE", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
         { "label": "1", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
diff --git a/keyboards/clueboard/66/rev2/info.json b/keyboards/clueboard/66/rev2/info.json
index 603558de82..5ef47cca98 100644
--- a/keyboards/clueboard/66/rev2/info.json
+++ b/keyboards/clueboard/66/rev2/info.json
@@ -2,8 +2,6 @@
   "manufacturer": "Clueboard",
   "keyboard_name": "Clueboard 66%",
   "maintainer": "skullydazed",
-  "height": 5,
-  "width": 16.5,
   "processor": "atmega32u4",
   "debounce": 5,
   "diode_direction": "COL2ROW",
@@ -50,7 +48,6 @@
   },
   "layouts": {
     "LAYOUT_66_ansi": {
-      "key_count": 66,
       "layout": [
         { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
         { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
@@ -121,7 +118,6 @@
       ]
     },
     "LAYOUT_66_iso": {
-      "key_count": 67,
       "layout": [
         { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
         { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
@@ -193,7 +189,6 @@
       ]
     },
     "LAYOUT_all": {
-      "key_count": 73,
       "layout": [
         { "label": "GRAVE", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
         { "label": "1", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
diff --git a/keyboards/clueboard/66/rev3/info.json b/keyboards/clueboard/66/rev3/info.json
index d3b13bed7a..1944331e2b 100644
--- a/keyboards/clueboard/66/rev3/info.json
+++ b/keyboards/clueboard/66/rev3/info.json
@@ -2,8 +2,6 @@
   "manufacturer": "Clueboard",
   "keyboard_name": "Clueboard 66% rev3",
   "maintainer": "skullydazed",
-  "height": 5,
-  "width": 16.5,
   "processor": "atmega32u4",
   "debounce": 5,
   "diode_direction": "COL2ROW",
@@ -50,7 +48,6 @@
   },
   "layouts": {
     "LAYOUT_66_ansi": {
-      "key_count": 66,
       "layout": [
         { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
         { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
@@ -121,7 +118,6 @@
       ]
     },
     "LAYOUT_66_iso": {
-      "key_count": 67,
       "layout": [
         { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
         { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
@@ -193,7 +189,6 @@
       ]
     },
     "LAYOUT_all": {
-      "key_count": 73,
       "layout": [
         { "label": "GRAVE", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
         { "label": "1", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
diff --git a/keyboards/clueboard/66/rev4/info.json b/keyboards/clueboard/66/rev4/info.json
index 9c8fcbef5e..1a81b3d088 100644
--- a/keyboards/clueboard/66/rev4/info.json
+++ b/keyboards/clueboard/66/rev4/info.json
@@ -2,8 +2,6 @@
   "manufacturer": "Clueboard",
   "keyboard_name": "Clueboard 66% rev4",
   "maintainer": "skullydazed",
-  "height": 5,
-  "width": 16.5,
   "debounce": 5,
   "processor": "STM32F303",
   "board": "QMK_PROTON_C",
@@ -48,7 +46,6 @@
   },
   "layouts": {
     "LAYOUT_66_ansi": {
-      "key_count": 66,
       "layout": [
         { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
         { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
@@ -119,7 +116,6 @@
       ]
     },
     "LAYOUT_66_iso": {
-      "key_count": 67,
       "layout": [
         { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
         { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
@@ -191,7 +187,6 @@
       ]
     },
     "LAYOUT_all": {
-      "key_count": 73,
       "layout": [
         { "label": "GRAVE", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
         { "label": "1", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
diff --git a/keyboards/clueboard/66_hotswap/gen1/info.json b/keyboards/clueboard/66_hotswap/gen1/info.json
index bcf66e8afc..5e0e5b8aca 100644
--- a/keyboards/clueboard/66_hotswap/gen1/info.json
+++ b/keyboards/clueboard/66_hotswap/gen1/info.json
@@ -2,8 +2,6 @@
   "manufacturer": "Clueboard",
   "keyboard_name": "Clueboard 66% HotSwap Gen1",
   "maintainer": "skullydazed",
-  "height": 5,
-  "width": 16.5,
   "debounce": 5,
   "processor": "STM32F303",
   "board": "QMK_PROTON_C",
@@ -36,7 +34,6 @@
   },
   "layouts": {
     "LAYOUT_66_ansi": {
-      "key_count": 66,
       "layout": [
         { "label": "k00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
         { "label": "k01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
@@ -107,7 +104,6 @@
       ]
     },
     "LAYOUT_all": {
-      "key_count": 68,
       "layout": [
         { "label": "k00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
         { "label": "k01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
diff --git a/keyboards/clueboard/66_hotswap/prototype/info.json b/keyboards/clueboard/66_hotswap/prototype/info.json
index 0b55b3b638..8f31373986 100644
--- a/keyboards/clueboard/66_hotswap/prototype/info.json
+++ b/keyboards/clueboard/66_hotswap/prototype/info.json
@@ -2,8 +2,6 @@
   "manufacturer": "Clueboard",
   "keyboard_name": "Clueboard 66% HotSwap Prototype",
   "maintainer": "skullydazed",
-  "height": 5,
-  "width": 16.5,
   "debounce": 5,
   "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
@@ -50,7 +48,6 @@
   },
   "layouts": {
     "LAYOUT_66_ansi": {
-      "key_count": 66,
       "layout": [
         { "label": "k00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
         { "label": "k01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
@@ -121,7 +118,6 @@
       ]
     },
     "LAYOUT_all": {
-      "key_count": 70,
       "layout": [
         { "label": "k00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
         { "label": "k01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
diff --git a/keyboards/clueboard/card/info.json b/keyboards/clueboard/card/info.json
index 67830c4235..24088b2c41 100644
--- a/keyboards/clueboard/card/info.json
+++ b/keyboards/clueboard/card/info.json
@@ -2,8 +2,6 @@
   "manufacturer": "Clueboard",
   "keyboard_name": "Cluecard",
   "maintainer": "skullydazed",
-  "height": 8,
-  "width": 10,
   "debounce": 20,
   "processor": "atmega32u4",
   "diode_direction": "ROW2COL",
@@ -43,7 +41,6 @@
   },
   "layouts": {
     "LAYOUT_all": {
-      "key_count": 12,
       "layout": [
         { "label": "ON/OFF", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
         { "label": "SAT+", "matrix": [0, 1], "w": 1, "x": 4, "y": 0 },