Move small macropad-ish layouts to data driven (qmk#20341)

coquizen · Jun 22, 2023 · 783675b · 783675b
1 parent 0d2d66c
commit 783675b
Show file tree

Hide file tree

Showing 421 changed files with 2,788 additions and 7,128 deletions.
diff --git a/keyboards/10bleoledhub/10bleoledhub.h b/keyboards/10bleoledhub/10bleoledhub.h
diff --git a/keyboards/10bleoledhub/info.json b/keyboards/10bleoledhub/info.json
@@ -23,16 +23,19 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Num Lock", "x":0, "y":0, "w":0.8, "h":0.8},
-                {"label":"7", "x":0, "y":1},
-                {"label":"8", "x":1, "y":1},
-                {"label":"9", "x":2, "y":1},
-                {"label":"4", "x":0, "y":2},
-                {"label":"5", "x":1, "y":2},
-                {"label":"6", "x":2, "y":2},
-                {"label":"1", "x":0, "y":3},
-                {"label":"2", "x":1, "y":3},
-                {"label":"3", "x":2, "y":3}
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 0.8, "h": 0.8},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3}
             ]
         }
     }

diff --git a/keyboards/2key2crawl/2key2crawl.h b/keyboards/2key2crawl/2key2crawl.h
diff --git a/keyboards/2key2crawl/info.json b/keyboards/2key2crawl/info.json
@@ -23,18 +23,19 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K00", "x":0, "y":0},
-                {"label":"K01", "x":1, "y":0},
-                {"label":"K02", "x":2, "y":0},
-                {"label":"K03", "x":3, "y":0},
-                {"label":"K15", "x":4, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [1, 5], "x": 4, "y": 0},
 
-                {"label":"K10", "x":0, "y":1},
-                {"label":"K11", "x":1, "y":1},
-                {"label":"K12", "x":2, "y":1},
-                {"label":"K13", "x":3, "y":1},
-                {"label":"K14", "x":4, "y":1},
-                {"label":"K16", "x":5.5, "y":0.5}
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+
+                {"matrix": [1, 6], "x": 5.5, "y": 0.5}
             ]
         }
     }

diff --git a/keyboards/3keyecosystem/2key2/2key2.c b/keyboards/3keyecosystem/2key2/2key2.c
@@ -14,7 +14,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include "2key2.h"
+#include "quantum.h"
 
 // RGB Matrix configuration
 // based on https://docs.qmk.fm/#/feature_rgb_matrix?id=common-configuration

diff --git a/keyboards/3keyecosystem/2key2/2key2.h b/keyboards/3keyecosystem/2key2/2key2.h
diff --git a/keyboards/3keyecosystem/2key2/info.json b/keyboards/3keyecosystem/2key2/info.json
@@ -21,8 +21,8 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label": "k00", "x": 0, "y": 0},
-                {"label": "k01", "x": 1, "y": 0}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0}
             ]
         }
     }

diff --git a/keyboards/4by3/4by3.h b/keyboards/4by3/4by3.h
diff --git a/keyboards/4by3/info.json b/keyboards/4by3/info.json
@@ -15,28 +15,64 @@
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_horizontal"
+    },
     "layouts": {
         "LAYOUT_horizontal": {
             "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 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2}
             ]
         },
         "LAYOUT_vertical_right": {
             "layout": [
-                { "x": 0, "y": 0 }, { "x": 1, "y": 0 }, { "x": 2, "y": 0 },
-                { "x": 0, "y": 1 }, { "x": 1, "y": 1 }, { "x": 2, "y": 1 },
-                { "x": 0, "y": 2 }, { "x": 1, "y": 2 }, { "x": 2, "y": 2 },
-                { "x": 0, "y": 3 }, { "x": 1, "y": 3 }, { "x": 2, "y": 3 }
+                {"matrix": [2, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 0], "x": 2, "y": 0},
+
+                {"matrix": [2, 1], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [0, 1], "x": 2, "y": 1},
+
+                {"matrix": [2, 2], "x": 0, "y": 2},
+                {"matrix": [1, 2], "x": 1, "y": 2},
+                {"matrix": [0, 2], "x": 2, "y": 2},
+
+                {"matrix": [2, 3], "x": 0, "y": 3},
+                {"matrix": [1, 3], "x": 1, "y": 3},
+                {"matrix": [0, 3], "x": 2, "y": 3}
             ]
         },
         "LAYOUT_vertical_left": {
             "layout": [
-                { "x": 0, "y": 0 }, { "x": 1, "y": 0 }, { "x": 2, "y": 0 },
-                { "x": 0, "y": 1 }, { "x": 1, "y": 1 }, { "x": 2, "y": 1 },
-                { "x": 0, "y": 2 }, { "x": 1, "y": 2 }, { "x": 2, "y": 2 },
-                { "x": 0, "y": 3 }, { "x": 1, "y": 3 }, { "x": 2, "y": 3 }
+                {"matrix": [0, 3], "x": 0, "y": 0},
+                {"matrix": [1, 3], "x": 1, "y": 0},
+                {"matrix": [2, 3], "x": 2, "y": 0},
+
+                {"matrix": [0, 2], "x": 0, "y": 1},
+                {"matrix": [1, 2], "x": 1, "y": 1},
+                {"matrix": [2, 2], "x": 2, "y": 1},
+
+                {"matrix": [0, 1], "x": 0, "y": 2},
+                {"matrix": [1, 1], "x": 1, "y": 2},
+                {"matrix": [2, 1], "x": 2, "y": 2},
+
+                {"matrix": [0, 0], "x": 0, "y": 3},
+                {"matrix": [1, 0], "x": 1, "y": 3},
+                {"matrix": [2, 0], "x": 2, "y": 3}
             ]
         }
     }

diff --git a/keyboards/9key/9key.h b/keyboards/9key/9key.h
diff --git a/keyboards/9key/info.json b/keyboards/9key/info.json
@@ -17,7 +17,19 @@
   "bootloader": "caterina",
   "layouts": {
     "LAYOUT": {
-      "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}, {"label":"k20", "x":0, "y":2}, {"label":"k21", "x":1, "y":2}, {"label":"k22", "x":2, "y":2}]
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2}
+      ]
     }
   }
 }
diff --git a/keyboards/abstract/ellipse/rev1/info.json b/keyboards/abstract/ellipse/rev1/info.json
@@ -28,7 +28,15 @@
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25}
+            ]
         }
     }
 }
diff --git a/keyboards/abstract/ellipse/rev1/rev1.h b/keyboards/abstract/ellipse/rev1/rev1.h