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

10 files changed, 0 insertions, 39 deletions

diff --git a/keyboards/planck/ez/info.json b/keyboards/planck/ez/info.json
index 7444444c12..6c9332b052 100644
--- a/keyboards/planck/ez/info.json
+++ b/keyboards/planck/ez/info.json
@@ -2,11 +2,8 @@
   "keyboard_name": "Planck EZ",
   "url": "https://ergodox-ez.com/pages/planck",
   "maintainer": "jackhumbert",
-  "width": 12,
-  "height": 4,
   "layouts": {
     "LAYOUT_planck_1x2uC": {
-      "key_count": 47,
       "layout": [
         { "x": 0, "y": 0 },
         { "x": 1, "y": 0 },
@@ -58,7 +55,6 @@
       ]
     },
     "LAYOUT_ortho_4x12": {
-      "key_count": 48,
       "layout": [
         { "x": 0, "y": 0 },
         { "x": 1, "y": 0 },
diff --git a/keyboards/planck/info.json b/keyboards/planck/info.json
index 7e51595209..a4710d781f 100644
--- a/keyboards/planck/info.json
+++ b/keyboards/planck/info.json
@@ -2,8 +2,6 @@
   "keyboard_name": "Planck",
   "url": "https://olkb.com/planck",
   "maintainer": "jackhumbert",
-  "width": 12,
-  "height": 4,
   "layouts": {
     "LAYOUT_planck_1x2uC": {
       "layout": [
diff --git a/keyboards/planck/light/info.json b/keyboards/planck/light/info.json
index 53d2d77ce0..6169a8f991 100644
--- a/keyboards/planck/light/info.json
+++ b/keyboards/planck/light/info.json
@@ -2,11 +2,8 @@
   "keyboard_name": "Planck Light",
   "url": "https://olkb.com/planck",
   "maintainer": "jackhumbert",
-  "width": 12,
-  "height": 4,
   "layouts": {
     "LAYOUT_planck_1x2uC": {
-      "key_count": 47,
       "layout": [
         { "x": 0, "y": 0 },
         { "x": 1, "y": 0 },
@@ -58,7 +55,6 @@
       ]
     },
     "LAYOUT_ortho_4x12": {
-      "key_count": 48,
       "layout": [
         { "x": 0, "y": 0 },
         { "x": 1, "y": 0 },
diff --git a/keyboards/planck/rev1/info.json b/keyboards/planck/rev1/info.json
index 6291cc96da..04c6775042 100644
--- a/keyboards/planck/rev1/info.json
+++ b/keyboards/planck/rev1/info.json
@@ -2,11 +2,8 @@
   "keyboard_name": "Planck rev 1",
   "url": "https://olkb.com/planck",
   "maintainer": "jackhumbert",
-  "width": 12,
-  "height": 4,
   "layouts": {
     "LAYOUT_planck_1x2uC": {
-      "key_count": 47,
       "layout": [
         { "x": 0, "y": 0 },
         { "x": 1, "y": 0 },
@@ -58,7 +55,6 @@
       ]
     },
     "LAYOUT_ortho_4x12": {
-      "key_count": 48,
       "layout": [
         { "x": 0, "y": 0 },
         { "x": 1, "y": 0 },
diff --git a/keyboards/planck/rev2/info.json b/keyboards/planck/rev2/info.json
index 555e717cd4..42839397cb 100644
--- a/keyboards/planck/rev2/info.json
+++ b/keyboards/planck/rev2/info.json
@@ -2,11 +2,8 @@
   "keyboard_name": "Planck rev 2",
   "url": "https://olkb.com/planck",
   "maintainer": "jackhumbert",
-  "width": 12,
-  "height": 4,
   "layouts": {
     "LAYOUT_planck_1x2uC": {
-      "key_count": 47,
       "layout": [
         { "x": 0, "y": 0 },
         { "x": 1, "y": 0 },
@@ -58,7 +55,6 @@
       ]
     },
     "LAYOUT_ortho_4x12": {
-      "key_count": 48,
       "layout": [
         { "x": 0, "y": 0 },
         { "x": 1, "y": 0 },
diff --git a/keyboards/planck/rev3/info.json b/keyboards/planck/rev3/info.json
index 7302aa2b05..88a8741ad1 100644
--- a/keyboards/planck/rev3/info.json
+++ b/keyboards/planck/rev3/info.json
@@ -2,11 +2,8 @@
   "keyboard_name": "Planck rev 3",
   "url": "https://olkb.com/planck",
   "maintainer": "jackhumbert",
-  "width": 12,
-  "height": 4,
   "layouts": {
     "LAYOUT_planck_1x2uC": {
-      "key_count": 47,
       "layout": [
         { "x": 0, "y": 0 },
         { "x": 1, "y": 0 },
@@ -58,7 +55,6 @@
       ]
     },
     "LAYOUT_ortho_4x12": {
-      "key_count": 48,
       "layout": [
         { "x": 0, "y": 0 },
         { "x": 1, "y": 0 },
diff --git a/keyboards/planck/rev4/info.json b/keyboards/planck/rev4/info.json
index 40f8b6d023..5c4d9af194 100644
--- a/keyboards/planck/rev4/info.json
+++ b/keyboards/planck/rev4/info.json
@@ -2,11 +2,8 @@
   "keyboard_name": "Planck rev 4",
   "url": "https://olkb.com/planck",
   "maintainer": "jackhumbert",
-  "width": 12,
-  "height": 4,
   "layouts": {
     "LAYOUT_planck_1x2uC": {
-      "key_count": 47,
       "layout": [
         { "x": 0, "y": 0 },
         { "x": 1, "y": 0 },
@@ -58,7 +55,6 @@
       ]
     },
     "LAYOUT_ortho_4x12": {
-      "key_count": 48,
       "layout": [
         { "x": 0, "y": 0 },
         { "x": 1, "y": 0 },
diff --git a/keyboards/planck/rev5/info.json b/keyboards/planck/rev5/info.json
index 1f7942ec08..f5d667a507 100644
--- a/keyboards/planck/rev5/info.json
+++ b/keyboards/planck/rev5/info.json
@@ -2,11 +2,8 @@
   "keyboard_name": "Planck rev 5",
   "url": "https://olkb.com/planck",
   "maintainer": "jackhumbert",
-  "width": 12,
-  "height": 4,
   "layouts": {
     "LAYOUT_planck_1x2uC": {
-      "key_count": 47,
       "layout": [
         { "x": 0, "y": 0 },
         { "x": 1, "y": 0 },
@@ -58,7 +55,6 @@
       ]
     },
     "LAYOUT_ortho_4x12": {
-      "key_count": 48,
       "layout": [
         { "x": 0, "y": 0 },
         { "x": 1, "y": 0 },
diff --git a/keyboards/planck/rev6/info.json b/keyboards/planck/rev6/info.json
index 0e15f4e2c8..114a971294 100644
--- a/keyboards/planck/rev6/info.json
+++ b/keyboards/planck/rev6/info.json
@@ -2,11 +2,8 @@
   "keyboard_name": "Planck rev 6",
   "url": "https://olkb.com/planck",
   "maintainer": "jackhumbert",
-  "width": 12,
-  "height": 4,
   "layouts": {
     "LAYOUT_ortho_4x12": {
-      "key_count": 48,
       "layout": [
         { "x": 0, "y": 0 },
         { "x": 1, "y": 0 },
@@ -59,7 +56,6 @@
       ]
     },
     "LAYOUT_planck_1x2uC": {
-      "key_count": 47,
       "layout": [
         { "x": 0, "y": 0 },
         { "x": 1, "y": 0 },
@@ -111,7 +107,6 @@
       ]
     },
     "LAYOUT_planck_1x2uL": {
-      "key_count": 47,
       "layout": [
         { "x": 0, "y": 0 },
         { "x": 1, "y": 0 },
@@ -163,7 +158,6 @@
       ]
     },
     "LAYOUT_planck_1x2uR": {
-      "key_count": 47,
       "layout": [
         { "x": 0, "y": 0 },
         { "x": 1, "y": 0 },
@@ -215,7 +209,6 @@
       ]
     },
     "LAYOUT_planck_2x2u": {
-      "key_count": 46,
       "layout": [
         { "x": 0, "y": 0 },
         { "x": 1, "y": 0 },
diff --git a/keyboards/planck/thk/info.json b/keyboards/planck/thk/info.json
index 558597b4d8..70e1f0bd07 100644
--- a/keyboards/planck/thk/info.json
+++ b/keyboards/planck/thk/info.json
@@ -8,7 +8,6 @@
   },
   "layouts": {
     "LAYOUT_ortho_4x12": {
-      "key_count": 48,
       "layout": [
         { "label": "k00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
         { "label": "k01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
@@ -61,7 +60,6 @@
       ]
     },
     "LAYOUT_planck_1x2uC": {
-      "key_count": 47,
       "layout": [
         { "label": "k00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
         { "label": "k01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },