Move single `LAYOUT_all`s to data driven (#20430)

2 files changed, 88 insertions, 115 deletions

diff --git a/keyboards/cablecardesigns/cypher/rev6/info.json b/keyboards/cablecardesigns/cypher/rev6/info.json
index 4301e45de5..288222a918 100644
--- a/keyboards/cablecardesigns/cypher/rev6/info.json
+++ b/keyboards/cablecardesigns/cypher/rev6/info.json
@@ -24,105 +24,105 @@
     "layouts": {
       "LAYOUT_all": {
         "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},
-          {"label":"~","x":14,"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},
+          {"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": [5, 0], "x": 10, "y": 0},
+          {"matrix": [5, 1], "x": 11, "y": 0},
+          {"matrix": [5, 2], "x": 12, "y": 0},
+          {"matrix": [5, 3], "x": 13, "y": 0},
+          {"matrix": [5, 4], "x": 14, "y": 0},
 
-          {"label":"Num Lock","x":15.5,"y":0},
-          {"label":"/","x":16.5,"y":0},
-          {"label":"*","x":17.5,"y":0},
-          {"label":"-","x":18.5,"y":0},
+          {"matrix": [5, 5], "x": 15.5, "y": 0},
+          {"matrix": [5, 6], "x": 16.5, "y": 0},
+          {"matrix": [5, 7], "x": 17.5, "y": 0},
+          {"matrix": [5, 8], "x": 18.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},
+          {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+          {"matrix": [1, 1], "x": 1.5, "y": 1},
+          {"matrix": [1, 2], "x": 2.5, "y": 1},
+          {"matrix": [1, 3], "x": 3.5, "y": 1},
+          {"matrix": [1, 4], "x": 4.5, "y": 1},
+          {"matrix": [1, 5], "x": 5.5, "y": 1},
+          {"matrix": [1, 6], "x": 6.5, "y": 1},
+          {"matrix": [1, 7], "x": 7.5, "y": 1},
+          {"matrix": [1, 8], "x": 8.5, "y": 1},
+          {"matrix": [1, 9], "x": 9.5, "y": 1},
+          {"matrix": [6, 0], "x": 10.5, "y": 1},
+          {"matrix": [6, 1], "x": 11.5, "y": 1},
+          {"matrix": [6, 2], "x": 12.5, "y": 1},
+          {"matrix": [6, 3], "x": 13.5, "y": 1, "w": 1.5},
 
-          {"label":"7","x":15.5,"y":1},
-          {"label":"8","x":16.5,"y":1},
-          {"label":"9","x":17.5,"y":1},
-          {"label":"+","x":18.5,"y":1},
+          {"matrix": [6, 5], "x": 15.5, "y": 1},
+          {"matrix": [6, 6], "x": 16.5, "y": 1},
+          {"matrix": [6, 7], "x": 17.5, "y": 1},
+          {"matrix": [6, 8], "x": 18.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":"NUHS","x":12.75,"y":2},
-          {"label":"Enter","x":13.75,"y":2,"w":1.25},
+          {"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},
+          {"matrix": [2, 6], "x": 6.75, "y": 2},
+          {"matrix": [2, 7], "x": 7.75, "y": 2},
+          {"matrix": [2, 8], "x": 8.75, "y": 2},
+          {"matrix": [2, 9], "x": 9.75, "y": 2},
+          {"matrix": [7, 0], "x": 10.75, "y": 2},
+          {"matrix": [7, 1], "x": 11.75, "y": 2},
+          {"matrix": [7, 2], "x": 12.75, "y": 2},
+          {"matrix": [7, 3], "x": 13.75, "y": 2, "w": 1.25},
 
-          {"label":"4","x":15.5,"y":2},
-          {"label":"5","x":16.5,"y":2},
-          {"label":"6","x":17.5,"y":2},
-          {"label":"=","x":18.5,"y":2},
+          {"matrix": [7, 5], "x": 15.5, "y": 2},
+          {"matrix": [7, 6], "x": 16.5, "y": 2},
+          {"matrix": [7, 7], "x": 17.5, "y": 2},
+          {"matrix": [7, 8], "x": 18.5, "y": 2},
 
-          {"label":"Shift","x":0,"y":3,"w":1.25},
-          {"label":"Shift","x":1.25,"y":3},
-          {"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":1.75},
+          {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+          {"matrix": [3, 1], "x": 1.25, "y": 3},
+          {"matrix": [3, 2], "x": 2.25, "y": 3},
+          {"matrix": [3, 3], "x": 3.25, "y": 3},
+          {"matrix": [3, 4], "x": 4.25, "y": 3},
+          {"matrix": [3, 5], "x": 5.25, "y": 3},
+          {"matrix": [3, 6], "x": 6.25, "y": 3},
+          {"matrix": [3, 7], "x": 7.25, "y": 3},
+          {"matrix": [3, 8], "x": 8.25, "y": 3},
+          {"matrix": [3, 9], "x": 9.25, "y": 3},
+          {"matrix": [8, 0], "x": 10.25, "y": 3},
+          {"matrix": [8, 1], "x": 11.25, "y": 3},
+          {"matrix": [8, 2], "x": 12.25, "y": 3, "w": 1.75},
 
-          {"label":"Up","x":14.25,"y":3.25},
+          {"matrix": [8, 3], "x": 14.25, "y": 3.25},
 
-          {"label":"1","x":15.5,"y":3},
-          {"label":"2","x":16.5,"y":3},
-          {"label":"3","x":17.5,"y":3},
-          {"label":"Enter","x":18.5,"y":3},
+          {"matrix": [8, 5], "x": 15.5, "y": 3},
+          {"matrix": [8, 6], "x": 16.5, "y": 3},
+          {"matrix": [8, 7], "x": 17.5, "y": 3},
+          {"matrix": [8, 8], "x": 18.5, "y": 3},
 
-          {"label":"Ctrl","x":0,"y":4,"w":1.25},
-          {"label":"Win","x":1.25,"y":4},
-          {"label":"Alt","x":2.25,"y":4,"w":1.25},
-          {"label":"Space","x":3.5,"y":4,"w":1.5},
-          {"label":"Space","x":5,"y":4,"w":3},
-          {"label":"Space","x":8,"y":4,"w":1.5},
-          {"label":"Alt","x":9.5,"y":4,"w":1.25},
-          {"label":"Win","x":10.75,"y":4},
-          {"label":"Ctrl","x":11.75,"y":4,"w":1.25},
+          {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+          {"matrix": [4, 1], "x": 1.25, "y": 4},
+          {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+          {"matrix": [4, 4], "x": 3.5, "y": 4, "w": 1.5},
+          {"matrix": [4, 6], "x": 5, "y": 4, "w": 3},
+          {"matrix": [4, 7], "x": 8, "y": 4, "w": 1.5},
+          {"matrix": [4, 9], "x": 9.5, "y": 4, "w": 1.25},
+          {"matrix": [9, 0], "x": 10.75, "y": 4},
+          {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.25},
 
-          {"label":"Left","x":13.25,"y":4.25},
-          {"label":"Down","x":14.25,"y":4.25},
-          {"label":"Right","x":15.25,"y":4.25},
+          {"matrix": [9, 2], "x": 13.25, "y": 4.25},
+          {"matrix": [9, 3], "x": 14.25, "y": 4.25},
+          {"matrix": [9, 5], "x": 15.25, "y": 4.25},
 
-          {"label":"0","x":16.5,"y":4},
-          {"label":".","x":17.5,"y":4},
-          {"label":"Backspace","x":18.5,"y":4}
+          {"matrix": [9, 6], "x": 16.5, "y": 4},
+          {"matrix": [9, 7], "x": 17.5, "y": 4},
+          {"matrix": [9, 8], "x": 18.5, "y": 4}
         ]
       }
     }
diff --git a/keyboards/cablecardesigns/cypher/rev6/rev6.h b/keyboards/cablecardesigns/cypher/rev6/rev6.h
deleted file mode 100644
index 6a5db7f0f2..0000000000
--- a/keyboards/cablecardesigns/cypher/rev6/rev6.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2022 Cable Car Designs (@westfoxtrot)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-#define ___ KC_NO
-
-#include "quantum.h"
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50, K51, K52, K53, K54, 		  K55, K56, K57, K58,\
-      K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K60, K61, K62, K63,     	  K65, K66, K67, K68,   \
-		K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K70, K71, K72, K73,         K75, K76, K77, K78,   \
-	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K80, K81, K82, 		K83,      K85, K86, K87, K88,   \
-	K40, K41, K42,       K44,      K46,  K47,     K49, K90, K91,       K92, K93, K95, K96, K97, K98   \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39 }, \
-    { K40, K41, K42, ___, K44, ___, K46, K47, ___, K49 }, \
-    { K50, K51, K52, K53, K54, K55, K56, K57, K58 }, \
-    { K60, K61, K62, K63, ___, K65, K66, K67, K68 }, \
-    { K70, K71, K72, K73, ___, K75, K76, K77, K78 }, \
-    { K80, K81, K82, K83, ___, K85, K86, K87, K88 }, \
-    { K90, K91, K92, K93, ___, K95, K96, K97, K98 } \
-}