Move miscellaneous layouts to data driven (#20516)

2 files changed, 101 insertions, 50 deletions

diff --git a/keyboards/handwired/curiosity/curiosity.h b/keyboards/handwired/curiosity/curiosity.h
deleted file mode 100644
index a79bfa6633..0000000000
--- a/keyboards/handwired/curiosity/curiosity.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2020 Spaceman
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * 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/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_small_mods( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b,   k3b, \
-     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b,  k3a, \
-      k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k39, \
-       k30,  k31,  k32,     k33,       k34,    k35, k36, k37, k38 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }, \
-}
-#define LAYOUT_large_mods( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b,   k3b, \
-     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a,    k1b,    \
-      k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a,    k2b,   \
-       k30,  k31,  k32,     k33,       k34,    k35, k36, k37, k38 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, KC_NO, KC_NO, k3b }, \
-}
diff --git a/keyboards/handwired/curiosity/info.json b/keyboards/handwired/curiosity/info.json
index a9a22fc39c..37f66a8029 100644
--- a/keyboards/handwired/curiosity/info.json
+++ b/keyboards/handwired/curiosity/info.json
@@ -18,18 +18,110 @@
   "layouts": {
     "LAYOUT_small_mods": {
       "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":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0, "w":1.5},
-        {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1}, {"x":12.25, "y":1, "w":1.25},
-        {"x":0, "y":2, "w":1.5}, {"x":1.5, "y":2}, {"x":2.5, "y":2}, {"x":3.5, "y":2}, {"x":4.5, "y":2}, {"x":5.5, "y":2}, {"x":6.5, "y":2}, {"x":7.5, "y":2}, {"x":8.5, "y":2}, {"x":9.5, "y":2}, {"x":10.5, "y":2}, {"x":11.5, "y":2}, {"x":12.5, "y":2},
-        {"x":0.75, "y":3, "w":1.25}, {"x":2, "y":3, "w":1.25}, {"x":3.25, "y":3, "w":1.25}, {"x":4.5, "y":3, "w":2}, {"x":6.5, "y":3, "w":2.25}, {"x":8.75, "y":3}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3}
+        {"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": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [3, 11], "x": 12, "y": 0, "w": 1.5},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+        {"matrix": [1, 1], "x": 1.25, "y": 1},
+        {"matrix": [1, 2], "x": 2.25, "y": 1},
+        {"matrix": [1, 3], "x": 3.25, "y": 1},
+        {"matrix": [1, 4], "x": 4.25, "y": 1},
+        {"matrix": [1, 5], "x": 5.25, "y": 1},
+        {"matrix": [1, 6], "x": 6.25, "y": 1},
+        {"matrix": [1, 7], "x": 7.25, "y": 1},
+        {"matrix": [1, 8], "x": 8.25, "y": 1},
+        {"matrix": [1, 9], "x": 9.25, "y": 1},
+        {"matrix": [1, 10], "x": 10.25, "y": 1},
+        {"matrix": [1, 11], "x": 11.25, "y": 1},
+        {"matrix": [3, 10], "x": 12.25, "y": 1, "w": 1.25},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2},
+        {"matrix": [2, 2], "x": 2.5, "y": 2},
+        {"matrix": [2, 3], "x": 3.5, "y": 2},
+        {"matrix": [2, 4], "x": 4.5, "y": 2},
+        {"matrix": [2, 5], "x": 5.5, "y": 2},
+        {"matrix": [2, 6], "x": 6.5, "y": 2},
+        {"matrix": [2, 7], "x": 7.5, "y": 2},
+        {"matrix": [2, 8], "x": 8.5, "y": 2},
+        {"matrix": [2, 9], "x": 9.5, "y": 2},
+        {"matrix": [2, 10], "x": 10.5, "y": 2},
+        {"matrix": [2, 11], "x": 11.5, "y": 2},
+        {"matrix": [3, 9], "x": 12.5, "y": 2},
+
+        {"matrix": [3, 0], "x": 0.75, "y": 3, "w": 1.25},
+        {"matrix": [3, 1], "x": 2, "y": 3, "w": 1.25},
+        {"matrix": [3, 2], "x": 3.25, "y": 3, "w": 1.25},
+        {"matrix": [3, 3], "x": 4.5, "y": 3, "w": 2},
+        {"matrix": [3, 4], "x": 6.5, "y": 3, "w": 2.25},
+        {"matrix": [3, 5], "x": 8.75, "y": 3},
+        {"matrix": [3, 6], "x": 9.75, "y": 3},
+        {"matrix": [3, 7], "x": 10.75, "y": 3},
+        {"matrix": [3, 8], "x": 11.75, "y": 3}
       ]
-    },       
+    },
     "LAYOUT_large_mods": {
       "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":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0, "w":1.5},
-        {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1, "w":2.25},
-        {"x":0, "y":2, "w":1.5}, {"x":1.5, "y":2}, {"x":2.5, "y":2}, {"x":3.5, "y":2}, {"x":4.5, "y":2}, {"x":5.5, "y":2}, {"x":6.5, "y":2}, {"x":7.5, "y":2}, {"x":8.5, "y":2}, {"x":9.5, "y":2}, {"x":10.5, "y":2}, {"x":11.5, "y":2, "w":2},
-        {"x":0.75, "y":3, "w":1.25}, {"x":2, "y":3, "w":1.25}, {"x":3.25, "y":3, "w":1.25}, {"x":4.5, "y":3, "w":2}, {"x":6.5, "y":3, "w":2.25}, {"x":8.75, "y":3}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3}
+        {"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": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [3, 11], "x": 12, "y": 0, "w": 1.5},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+        {"matrix": [1, 1], "x": 1.25, "y": 1},
+        {"matrix": [1, 2], "x": 2.25, "y": 1},
+        {"matrix": [1, 3], "x": 3.25, "y": 1},
+        {"matrix": [1, 4], "x": 4.25, "y": 1},
+        {"matrix": [1, 5], "x": 5.25, "y": 1},
+        {"matrix": [1, 6], "x": 6.25, "y": 1},
+        {"matrix": [1, 7], "x": 7.25, "y": 1},
+        {"matrix": [1, 8], "x": 8.25, "y": 1},
+        {"matrix": [1, 9], "x": 9.25, "y": 1},
+        {"matrix": [1, 10], "x": 10.25, "y": 1},
+        {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 2.25},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2},
+        {"matrix": [2, 2], "x": 2.5, "y": 2},
+        {"matrix": [2, 3], "x": 3.5, "y": 2},
+        {"matrix": [2, 4], "x": 4.5, "y": 2},
+        {"matrix": [2, 5], "x": 5.5, "y": 2},
+        {"matrix": [2, 6], "x": 6.5, "y": 2},
+        {"matrix": [2, 7], "x": 7.5, "y": 2},
+        {"matrix": [2, 8], "x": 8.5, "y": 2},
+        {"matrix": [2, 9], "x": 9.5, "y": 2},
+        {"matrix": [2, 10], "x": 10.5, "y": 2},
+        {"matrix": [2, 11], "x": 11.5, "y": 2, "w": 2},
+
+        {"matrix": [3, 0], "x": 0.75, "y": 3, "w": 1.25},
+        {"matrix": [3, 1], "x": 2, "y": 3, "w": 1.25},
+        {"matrix": [3, 2], "x": 3.25, "y": 3, "w": 1.25},
+        {"matrix": [3, 3], "x": 4.5, "y": 3, "w": 2},
+        {"matrix": [3, 4], "x": 6.5, "y": 3, "w": 2.25},
+        {"matrix": [3, 5], "x": 8.75, "y": 3},
+        {"matrix": [3, 6], "x": 9.75, "y": 3},
+        {"matrix": [3, 7], "x": 10.75, "y": 3},
+        {"matrix": [3, 8], "x": 11.75, "y": 3}
       ]
     }
   }