Move single `LAYOUT`s to data driven (#20365)

2 files changed, 113 insertions, 135 deletions

diff --git a/keyboards/handwired/frenchdev/frenchdev.h b/keyboards/handwired/frenchdev/frenchdev.h
index d608fe9f09..6bea49d87b 100644
--- a/keyboards/handwired/frenchdev/frenchdev.h
+++ b/keyboards/handwired/frenchdev/frenchdev.h
@@ -73,38 +73,3 @@ inline void frenchdev_led_all_set(uint8_t n)
     frenchdev_led_2_set(n);
     frenchdev_led_3_set(n);
 }
-
-#define LAYOUT(                                                 \
-                                                                \
-         k01, k02, k03, k04, k05, k06,                        k09, k0a, k0b, k0c, k0d, k0e,      \
-    k10, k11, k12, k13, k14, k15, k16,                        k19, k1a, k1b, k1c, k1d, k1e, k1f, \
-    k20, k21, k22, k23, k24, k25, k26,                        k29, k2a, k2b, k2c, k2d, k2e, k2f, \
-    k30, k31, k32, k33, k34, k35, k36,                        k39, k3a, k3b, k3c, k3d, k3e, k3f, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k37,    k38, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, \
-    k50, k51, k52, k53, k54, k55, k56,   k57,          k58,   k59, k5a, k5b, k5c, k5d, k5e, k5f, \
-    \
-    PL1, PL2, PL3, \
-    PR1, PR2, PR3 \
-    )                                             \
-                                                  \
-   /* matrix positions, inverted left and right for I2C to be on row 0-7 */\
-   {                                              \
-                                                  \
-    { k5f,   k4f,   k3f,  k2f,   k1f,   KC_NO},   \
-    { k5e,   k4e,   k3e,  k2e,   k1e,   k0e  },   \
-    { k5d,   k4d,   k3d,  k2d,   k1d,   k0d  },   \
-    { k5c,   k4c,   k3c,  k2c,   k1c,   k0c  },   \
-    { k5b,   k4b,   k3b,  k2b,   k1b,   k0b  },   \
-    { k5a,   k4a,   k3a,  k2a,   k1a,   k0a  },   \
-    { k59,   k49,   k39,  k29,   k19,   k09  },   \
-    { k58,   k48,   k38,  PR1,   PR2,   PR3   },   \
-    \
-    { k57,   k47,  k37,   PL1,   PL2,   PL3   },   \
-    { k56,   k46,  k36,   k26,   k16,   k06   },   \
-    { k55,   k45,  k35,   k25,   k15,   k05   },   \
-    { k54,   k44,  k34,   k24,   k14,   k04   },   \
-    { k53,   k43,  k33,   k23,   k13,   k03   },   \
-    { k52,   k42,  k32,   k22,   k12,   k02   },   \
-    { k51,   k41,  k31,   k21,   k11,   k01   },   \
-    { k50,   k40,  k30,   k20,   k10,   KC_NO }   \
-   }
diff --git a/keyboards/handwired/frenchdev/info.json b/keyboards/handwired/frenchdev/info.json
index a179dde73f..d5981aebd4 100644
--- a/keyboards/handwired/frenchdev/info.json
+++ b/keyboards/handwired/frenchdev/info.json
@@ -12,106 +12,119 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"label":"F1", "x":1, "y":0.9},
-        {"label":"F2", "x":2, "y":0.3},
-        {"label":"F3", "x":3, "y":0},
-        {"label":"F4", "x":4, "y":0.4},
-        {"label":"F5", "x":5, "y":0.5},
-        {"label":"F6", "x":6, "y":0.5},
-        {"label":"F7", "x":13, "y":0.5},
-        {"label":"F8", "x":14, "y":0.5},
-        {"label":"F9", "x":15, "y":0.4},
-        {"label":"F10", "x":16, "y":0},
-        {"label":"F11", "x":17, "y":0.3},
-        {"label":"F12", "x":18, "y":0.9},
-
-        {"label":"Esc", "x":0, "y":1.9},
-        {"label":"\"", "x":1, "y":1.9},
-        {"label":"\u00ab", "x":2, "y":1.3},
-        {"label":"\u00bb", "x":3, "y":1},
-        {"label":"(", "x":4, "y":1.4},
-        {"label":")", "x":5, "y":1.5},
-        {"label":"\u00a8", "x":6, "y":1.5},
-        {"label":"^", "x":13, "y":1.5},
-        {"label":"@", "x":14, "y":1.5},
-        {"label":"+", "x":15, "y":1.4},
-        {"label":"-", "x":16, "y":1},
-        {"label":"/", "x":17, "y":1.3},
-        {"label":"*", "x":18, "y":1.9},
-        {"label":"Backspace", "x":19, "y":1.9},
-
-        {"label":"Tab", "x":0, "y":2.9},
-        {"label":"B", "x":1, "y":2.9},
-        {"label":"É", "x":2, "y":2.3},
-        {"label":"P", "x":3, "y":2},
-        {"label":"O", "x":4, "y":2.4},
-        {"label":"È", "x":5, "y":2.5},
-        {"label":"_", "x":6, "y":2.5},
-        {"label":"=", "x":13, "y":2.5},
-        {"label":"K", "x":14, "y":2.5},
-        {"label":"V", "x":15, "y":2.4},
-        {"label":"D", "x":16, "y":2},
-        {"label":"L", "x":17, "y":2.3},
-        {"label":"J", "x":18, "y":2.9},
-        {"label":"Enter", "x":19, "y":2.9},
-
-        {"label":"`", "x":0, "y":3.9},
-        {"label":"A", "x":1, "y":3.9},
-        {"label":"U", "x":2, "y":3.3},
-        {"label":"E", "x":3, "y":3},
-        {"label":"I", "x":4, "y":3.4},
-        {"label":"F", "x":5, "y":3.5},
-        {"label":";", "x":6, "y":3.5},
-        {"label":"!", "x":13, "y":3.5},
-        {"label":"C", "x":14, "y":3.5},
-        {"label":"T", "x":15, "y":3.4},
-        {"label":"S", "x":16, "y":3},
-        {"label":"R", "x":17, "y":3.3},
-        {"label":"N", "x":18, "y":3.9},
-        {"label":"'", "x":19, "y":3.9},
-
-        {"label":"Shift", "x":0, "y":4.9},
-        {"label":"Z", "x":1, "y":4.9},
-        {"label":"À", "x":2, "y":4.3},
-        {"label":"Y", "x":3, "y":4},
-        {"label":"X", "x":4, "y":4.4},
-        {"label":"]", "x":5, "y":4.5},
-        {"label":"Shift/Space", "x":6.5, "y":5},
-        {"label":"Ctrl/Backspace", "x":7.5, "y":5},
-        {"label":"Layer 2/Insert", "x":8.5, "y":5},
-        {"label":"Layer 2 Lock", "x":10.5, "y":5},
-        {"label":"Ctrl/Delete", "x":11.5, "y":5},
-        {"label":"Shift/Space", "x":12.5, "y":5},
-        {"label":"M", "x":14, "y":4.5},
-        {"label":"G", "x":15, "y":4.4},
-        {"label":"Up", "x":16, "y":4},
-        {"label":"H", "x":17, "y":4.3},
-        {"label":"Q", "x":18, "y":4.9},
-        {"label":"Shift", "x":19, "y":4.9},
-
-        {"label":"Ctrl", "x":0, "y":5.9},
-        {"label":"GUI", "x":1, "y":5.9},
-        {"label":"Keypad /", "x":2, "y":5.3},
-        {"label":".", "x":3, "y":5},
-        {"label":",", "x":4, "y":5.4},
-        {"label":"Space", "x":5, "y":5.5},
-        {"label":"Layer 1/Space", "x":6.5, "y":6},
-        {"label":"Alt", "x":7.5, "y":6},
-        {"label":"Caps Lock", "x":11.5, "y":6},
-        {"label":"Layer 1/Space", "x":12.5, "y":6},
-        {"label":"Space", "x":14, "y":5.5},
-        {"label":"Left", "x":15, "y":5.4},
-        {"label":"Down", "x":16, "y":5},
-        {"label":"Right", "x":17, "y":5.3},
-        {"label":":", "x":18, "y":5.9},
-        {"label":"Ctrl", "x":19, "y":5.9},
-
-        {"label":"Left Pedal 1", "x":2.25, "y":7.5, "w":1.5, "h":2},
-        {"label":"Left Pedal 2", "x":3.75, "y":7.5, "w":1.5, "h":2},
-        {"label":"Left Pedal 3", "x":5.25, "y":7.5, "w":1.5, "h":2},
-        {"label":"Right Pedal 1", "x":13.25, "y":7.5, "w":1.5, "h":2},
-        {"label":"Right Pedal 2", "x":14.75, "y":7.5, "w":1.5, "h":2},
-        {"label":"Right Pedal 3", "x":16.25, "y":7.5, "w":1.5, "h":2}
+        {"matrix": [14, 5], "x": 1, "y": 0.9},
+        {"matrix": [13, 5], "x": 2, "y": 0.3},
+        {"matrix": [12, 5], "x": 3, "y": 0},
+        {"matrix": [11, 5], "x": 4, "y": 0.4},
+        {"matrix": [10, 5], "x": 5, "y": 0.5},
+        {"matrix": [9, 5], "x": 6, "y": 0.5},
+
+        {"matrix": [6, 5], "x": 13, "y": 0.5},
+        {"matrix": [5, 5], "x": 14, "y": 0.5},
+        {"matrix": [4, 5], "x": 15, "y": 0.4},
+        {"matrix": [3, 5], "x": 16, "y": 0},
+        {"matrix": [2, 5], "x": 17, "y": 0.3},
+        {"matrix": [1, 5], "x": 18, "y": 0.9},
+
+        {"matrix": [15, 4], "x": 0, "y": 1.9},
+        {"matrix": [14, 4], "x": 1, "y": 1.9},
+        {"matrix": [13, 4], "x": 2, "y": 1.3},
+        {"matrix": [12, 4], "x": 3, "y": 1},
+        {"matrix": [11, 4], "x": 4, "y": 1.4},
+        {"matrix": [10, 4], "x": 5, "y": 1.5},
+        {"matrix": [9, 4], "x": 6, "y": 1.5},
+
+        {"matrix": [6, 4], "x": 13, "y": 1.5},
+        {"matrix": [5, 4], "x": 14, "y": 1.5},
+        {"matrix": [4, 4], "x": 15, "y": 1.4},
+        {"matrix": [3, 4], "x": 16, "y": 1},
+        {"matrix": [2, 4], "x": 17, "y": 1.3},
+        {"matrix": [1, 4], "x": 18, "y": 1.9},
+        {"matrix": [0, 4], "x": 19, "y": 1.9},
+
+        {"matrix": [15, 3], "x": 0, "y": 2.9},
+        {"matrix": [14, 3], "x": 1, "y": 2.9},
+        {"matrix": [13, 3], "x": 2, "y": 2.3},
+        {"matrix": [12, 3], "x": 3, "y": 2},
+        {"matrix": [11, 3], "x": 4, "y": 2.4},
+        {"matrix": [10, 3], "x": 5, "y": 2.5},
+        {"matrix": [9, 3], "x": 6, "y": 2.5},
+
+        {"matrix": [6, 3], "x": 13, "y": 2.5},
+        {"matrix": [5, 3], "x": 14, "y": 2.5},
+        {"matrix": [4, 3], "x": 15, "y": 2.4},
+        {"matrix": [3, 3], "x": 16, "y": 2},
+        {"matrix": [2, 3], "x": 17, "y": 2.3},
+        {"matrix": [1, 3], "x": 18, "y": 2.9},
+        {"matrix": [0, 3], "x": 19, "y": 2.9},
+
+        {"matrix": [15, 2], "x": 0, "y": 3.9},
+        {"matrix": [14, 2], "x": 1, "y": 3.9},
+        {"matrix": [13, 2], "x": 2, "y": 3.3},
+        {"matrix": [12, 2], "x": 3, "y": 3},
+        {"matrix": [11, 2], "x": 4, "y": 3.4},
+        {"matrix": [10, 2], "x": 5, "y": 3.5},
+        {"matrix": [9, 2], "x": 6, "y": 3.5},
+
+        {"matrix": [6, 2], "x": 13, "y": 3.5},
+        {"matrix": [5, 2], "x": 14, "y": 3.5},
+        {"matrix": [4, 2], "x": 15, "y": 3.4},
+        {"matrix": [3, 2], "x": 16, "y": 3},
+        {"matrix": [2, 2], "x": 17, "y": 3.3},
+        {"matrix": [1, 2], "x": 18, "y": 3.9},
+        {"matrix": [0, 2], "x": 19, "y": 3.9},
+
+        {"matrix": [15, 1], "x": 0, "y": 4.9},
+        {"matrix": [14, 1], "x": 1, "y": 4.9},
+        {"matrix": [13, 1], "x": 2, "y": 4.3},
+        {"matrix": [12, 1], "x": 3, "y": 4},
+        {"matrix": [11, 1], "x": 4, "y": 4.4},
+        {"matrix": [10, 1], "x": 5, "y": 4.5},
+
+        {"matrix": [9, 1], "x": 6.5, "y": 5},
+        {"matrix": [8, 1], "x": 7.5, "y": 5},
+        {"matrix": [8, 2], "x": 8.5, "y": 5},
+
+        {"matrix": [7, 2], "x": 10.5, "y": 5},
+        {"matrix": [7, 1], "x": 11.5, "y": 5},
+        {"matrix": [6, 1], "x": 12.5, "y": 5},
+
+        {"matrix": [5, 1], "x": 14, "y": 4.5},
+        {"matrix": [4, 1], "x": 15, "y": 4.4},
+        {"matrix": [3, 1], "x": 16, "y": 4},
+        {"matrix": [2, 1], "x": 17, "y": 4.3},
+        {"matrix": [1, 1], "x": 18, "y": 4.9},
+        {"matrix": [0, 1], "x": 19, "y": 4.9},
+
+        {"matrix": [15, 0], "x": 0, "y": 5.9},
+        {"matrix": [14, 0], "x": 1, "y": 5.9},
+        {"matrix": [13, 0], "x": 2, "y": 5.3},
+        {"matrix": [12, 0], "x": 3, "y": 5},
+        {"matrix": [11, 0], "x": 4, "y": 5.4},
+        {"matrix": [10, 0], "x": 5, "y": 5.5},
+
+        {"matrix": [9, 0], "x": 6.5, "y": 6},
+        {"matrix": [8, 0], "x": 7.5, "y": 6},
+
+        {"matrix": [7, 0], "x": 11.5, "y": 6},
+        {"matrix": [6, 0], "x": 12.5, "y": 6},
+
+        {"matrix": [5, 0], "x": 14, "y": 5.5},
+        {"matrix": [4, 0], "x": 15, "y": 5.4},
+        {"matrix": [3, 0], "x": 16, "y": 5},
+        {"matrix": [2, 0], "x": 17, "y": 5.3},
+        {"matrix": [1, 0], "x": 18, "y": 5.9},
+        {"matrix": [0, 0], "x": 19, "y": 5.9},
+
+        {"matrix": [8, 3], "x": 2.25, "y": 7.5, "w": 1.5, "h": 2},
+        {"matrix": [8, 4], "x": 3.75, "y": 7.5, "w": 1.5, "h": 2},
+
+        {"matrix": [8, 5], "x": 5.25, "y": 7.5, "w": 1.5, "h": 2},
+
+        {"matrix": [7, 3], "x": 13.25, "y": 7.5, "w": 1.5, "h": 2},
+        {"matrix": [7, 4], "x": 14.75, "y": 7.5, "w": 1.5, "h": 2},
+
+        {"matrix": [7, 5], "x": 16.25, "y": 7.5, "w": 1.5, "h": 2}
       ]
     }
   }