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

3 files changed, 75 insertions, 38 deletions

diff --git a/keyboards/fc660c/fc660c.c b/keyboards/fc660c/fc660c.c
index 592697cb88..2054cd2818 100644
--- a/keyboards/fc660c/fc660c.c
+++ b/keyboards/fc660c/fc660c.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 "fc660c.h"
+#include "quantum.h"
 
 #ifdef ACTUATION_DEPTH_ADJUSTMENT
 #include "actuation_point.h"
diff --git a/keyboards/fc660c/fc660c.h b/keyboards/fc660c/fc660c.h
deleted file mode 100644
index fca02dc0e9..0000000000
--- a/keyboards/fc660c/fc660c.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-Copyright 2017 Balz Guenat
-
-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 XXX KC_NO
-
-#define LAYOUT( \
-    k13, k10, k11, k12, k14, k16, k17, k15, k1B, k18, k19, k1A, k1C, k1E,      k1F, \
-    k03, k00, k01, k02, k04, k06, k07, k05, k0B, k08, k09, k0A, k0C, k0E,      k0F, \
-    k43, k40, k41, k42, k44, k46, k47, k45, k4B, k48, k49, k4A,      k4E, \
-    k33, k31, k32, k34, k36, k37, k35, k3B, k38, k39, k3A,           k3C, k3D, \
-    k23, k21, k22,                k27,                k28, k2A, k2C, k2E, k2D, k2F  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, XXX, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, XXX, k1E, k1F }, \
-    { XXX, k21, k22, k23, XXX, XXX, XXX, k27, k28, XXX, k2A, XXX, k2C, k2D, k2E, k2F }, \
-    { XXX, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, XXX }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, XXX, XXX, k4E, XXX } \
-}
diff --git a/keyboards/fc660c/info.json b/keyboards/fc660c/info.json
index ff58c4e23c..c0385fa37f 100644
--- a/keyboards/fc660c/info.json
+++ b/keyboards/fc660c/info.json
@@ -17,7 +17,80 @@
     "debounce": 0,
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"x":15.5, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"x":15.5, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.25}, {"x":14.5, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6}, {"label":"Alt", "x":9.75, "y":4, "w":1.25}, {"label":"Win", "x":11, "y":4, "w":1.25}, {"label":"Menu", "x":12.25, "y":4, "w":1.25}, {"x":13.5, "y":4}, {"x":14.5, "y":4}, {"x":15.5, "y":4}]
+            "layout": [
+                {"matrix": [1, 3], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [1, 2], "x": 3, "y": 0},
+                {"matrix": [1, 4], "x": 4, "y": 0},
+                {"matrix": [1, 6], "x": 5, "y": 0},
+                {"matrix": [1, 7], "x": 6, "y": 0},
+                {"matrix": [1, 5], "x": 7, "y": 0},
+                {"matrix": [1, 11], "x": 8, "y": 0},
+                {"matrix": [1, 8], "x": 9, "y": 0},
+                {"matrix": [1, 9], "x": 10, "y": 0},
+                {"matrix": [1, 10], "x": 11, "y": 0},
+                {"matrix": [1, 12], "x": 12, "y": 0},
+                {"matrix": [1, 14], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.5, "y": 0},
+
+                {"matrix": [0, 3], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [0, 0], "x": 1.5, "y": 1},
+                {"matrix": [0, 1], "x": 2.5, "y": 1},
+                {"matrix": [0, 2], "x": 3.5, "y": 1},
+                {"matrix": [0, 4], "x": 4.5, "y": 1},
+                {"matrix": [0, 6], "x": 5.5, "y": 1},
+                {"matrix": [0, 7], "x": 6.5, "y": 1},
+                {"matrix": [0, 5], "x": 7.5, "y": 1},
+                {"matrix": [0, 11], "x": 8.5, "y": 1},
+                {"matrix": [0, 8], "x": 9.5, "y": 1},
+                {"matrix": [0, 9], "x": 10.5, "y": 1},
+                {"matrix": [0, 10], "x": 11.5, "y": 1},
+                {"matrix": [0, 12], "x": 12.5, "y": 1},
+                {"matrix": [0, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [0, 15], "x": 15.5, "y": 1},
+
+                {"matrix": [4, 3], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [4, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [4, 2], "x": 3.75, "y": 2},
+                {"matrix": [4, 4], "x": 4.75, "y": 2},
+                {"matrix": [4, 6], "x": 5.75, "y": 2},
+                {"matrix": [4, 7], "x": 6.75, "y": 2},
+                {"matrix": [4, 5], "x": 7.75, "y": 2},
+                {"matrix": [4, 11], "x": 8.75, "y": 2},
+                {"matrix": [4, 8], "x": 9.75, "y": 2},
+                {"matrix": [4, 9], "x": 10.75, "y": 2},
+                {"matrix": [4, 10], "x": 11.75, "y": 2},
+                {"matrix": [4, 14], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 3], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 6], "x": 5.25, "y": 3},
+                {"matrix": [3, 7], "x": 6.25, "y": 3},
+                {"matrix": [3, 5], "x": 7.25, "y": 3},
+                {"matrix": [3, 11], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 13], "x": 14.5, "y": 3},
+
+                {"matrix": [2, 3], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [2, 7], "x": 3.75, "y": 4, "w": 6},
+                {"matrix": [2, 8], "x": 9.75, "y": 4, "w": 1.25},
+                {"matrix": [2, 10], "x": 11, "y": 4, "w": 1.25},
+                {"matrix": [2, 12], "x": 12.25, "y": 4, "w": 1.25},
+                {"matrix": [2, 14], "x": 13.5, "y": 4},
+                {"matrix": [2, 13], "x": 14.5, "y": 4},
+                {"matrix": [2, 15], "x": 15.5, "y": 4}
+            ]
         }
     }
 }