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

2 files changed, 47 insertions, 67 deletions

diff --git a/keyboards/keebio/fourier/fourier.h b/keyboards/keebio/fourier/fourier.h
deleted file mode 100644
index 1bc5e1653c..0000000000
--- a/keyboards/keebio/fourier/fourier.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    LA1, LA2, LA3, LA4, LA5, LA6, RA1, RA2, RA3, RA4, RA5, RA6, RA7, \
-    LB1, LB2, LB3, LB4, LB5, LB6, RB1, RB2, RB3, RB4, RB5,      RB7, \
-    LC1, LC2, LC3, LC4, LC5, LC6, RC1,      RC3, RC4, RC5, RC6, RC7, \
-    LD1, LD2, LD3, LD4, LD5,      RD1,           RD4, RD5, RD6, RD7 \
-    ) \
-    { \
-        { LA1, LA2, LA3, LA4, LA5, LA6, KC_NO}, \
-        { LB1, LB2, LB3, LB4, LB5, LB6, KC_NO}, \
-        { LC1, LC2, LC3, LC4, LC5, LC6, KC_NO}, \
-        { LD1, LD2, LD3, LD4, LD5, KC_NO, KC_NO}, \
-        { RA1, RA2, RA3, RA4, RA5, RA6, RA7}, \
-        { RB1, RB2, RB3, RB4, RB5, KC_NO, RB7}, \
-        { RC1, KC_NO, RC3, RC4, RC5, RC6, RC7}, \
-        { RD1, KC_NO, KC_NO, RD4, RD5, RD6, RD7} \
-    }
diff --git a/keyboards/keebio/fourier/info.json b/keyboards/keebio/fourier/info.json
index 48b04f122e..22c24e13c8 100644
--- a/keyboards/keebio/fourier/info.json
+++ b/keyboards/keebio/fourier/info.json
@@ -30,60 +30,60 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Tab", "x":0, "y":0},
-                {"label":"Q", "x":1, "y":0},
-                {"label":"W", "x":2, "y":0},
-                {"label":"E", "x":3, "y":0},
-                {"label":"R", "x":4, "y":0},
-                {"label":"T", "x":5, "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": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
 
-                {"label":"Y", "x":7, "y":0},
-                {"label":"U", "x":8, "y":0},
-                {"label":"I", "x":9, "y":0},
-                {"label":"O", "x":10, "y":0},
-                {"label":"P", "x":11, "y":0},
-                {"label":"Del", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0},
+                {"matrix": [4, 0], "x": 7, "y": 0},
+                {"matrix": [4, 1], "x": 8, "y": 0},
+                {"matrix": [4, 2], "x": 9, "y": 0},
+                {"matrix": [4, 3], "x": 10, "y": 0},
+                {"matrix": [4, 4], "x": 11, "y": 0},
+                {"matrix": [4, 5], "x": 12, "y": 0},
+                {"matrix": [4, 6], "x": 13, "y": 0},
 
-                {"label":"Esc", "x":0, "y":1, "w":1.25},
-                {"label":"A", "x":1.25, "y":1},
-                {"label":"S", "x":2.25, "y":1},
-                {"label":"D", "x":3.25, "y":1},
-                {"label":"F", "x":4.25, "y":1},
-                {"label":"G", "x":5.25, "y":1},
+                {"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},
 
-                {"label":"H", "x":7.25, "y":1},
-                {"label":"J", "x":8.25, "y":1},
-                {"label":"K", "x":9.25, "y":1},
-                {"label":"L", "x":10.25, "y":1},
-                {"label":";", "x":11.25, "y":1},
-                {"label":"Enter", "x":12.25, "y":1, "w":1.75},
+                {"matrix": [5, 0], "x": 7.25, "y": 1},
+                {"matrix": [5, 1], "x": 8.25, "y": 1},
+                {"matrix": [5, 2], "x": 9.25, "y": 1},
+                {"matrix": [5, 3], "x": 10.25, "y": 1},
+                {"matrix": [5, 4], "x": 11.25, "y": 1},
+                {"matrix": [5, 6], "x": 12.25, "y": 1, "w": 1.75},
 
-                {"label":"Shift", "x":0, "y":2, "w":1.75},
-                {"label":"Z", "x":1.75, "y":2},
-                {"label":"X", "x":2.75, "y":2},
-                {"label":"C", "x":3.75, "y":2},
-                {"label":"V", "x":4.75, "y":2},
-                {"label":"B", "x":5.75, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
 
-                {"label":"N", "x":7.75, "y":2},
-                {"label":"M", "x":8.75, "y":2},
-                {"label":"<", "x":9.75, "y":2},
-                {"label":">", "x":10.75, "y":2},
-                {"label":"?", "x":11.75, "y":2},
-                {"label":"Shift", "x":12.75, "y":2, "w":1.25},
+                {"matrix": [6, 0], "x": 7.75, "y": 2},
+                {"matrix": [6, 2], "x": 8.75, "y": 2},
+                {"matrix": [6, 3], "x": 9.75, "y": 2},
+                {"matrix": [6, 4], "x": 10.75, "y": 2},
+                {"matrix": [6, 5], "x": 11.75, "y": 2},
+                {"matrix": [6, 6], "x": 12.75, "y": 2, "w": 1.25},
 
-                {"label":"Ctrl", "x":0, "y":3},
-                {"label":"Alt", "x":1, "y":3},
-                {"label":"Gui", "x":2, "y":3},
-                {"label":"Fn1", "x":3, "y":3},
-                {"label":"Space", "x":4, "y":3, "w":2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3, "w": 2.25},
 
-                {"label":"Backspace", "x":7.25, "y":3, "w":2.25},
-                {"label":"Gui", "x":9.5, "y":3},
-                {"label":"Alt", "x":10.5, "y":3, "w":1.25},
-                {"label":"Fn2", "x":11.75, "y":3},
-                {"label":"Ctrl", "x":12.75, "y":3, "w":1.25}
+                {"matrix": [7, 0], "x": 7.25, "y": 3, "w": 2.25},
+                {"matrix": [7, 3], "x": 9.5, "y": 3},
+                {"matrix": [7, 4], "x": 10.5, "y": 3, "w": 1.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3},
+                {"matrix": [7, 6], "x": 12.75, "y": 3, "w": 1.25}
             ]
         }
     }