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

4 files changed, 1 insertions, 23 deletions

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"
 }