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

2 files changed, 126 insertions, 51 deletions

diff --git a/keyboards/tkc/california/california.h b/keyboards/tkc/california/california.h
deleted file mode 100644
index a438e6a024..0000000000
--- a/keyboards/tkc/california/california.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-Copyright 2021 Terry Mathews
-
-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"  
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_all( \
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09,      K61, K62, K63, K64, K65, K66, K67, K68, K69, \
-    K10, k11, K12, K13, K14, K15, K16, K17, K18, K19, K70, K71, K72, K73, K74, K75, K76, K77, K78, K79, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K80, K81, K82, K83, K84, K85, K86, K87, K88, K89, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K90, K91, K92, K93,           K96, K97, K98, K99, \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, KA0, KA1, KA2,      KA4, KA5, KA6, KA7, KA8, KA9, \
-    K50, K51, K52,           K55,           K58,      KB0,      KB2,      KB4, KB5, KB6, KB7, KB8, KB9  \
-) { \
-    { K00,   KC_NO, K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09   }, \
-    { K10,   k11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19   }, \
-    { K20,   KC_NO, K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39   }, \
-    { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49   }, \
-    { K50,   K51,   K52,   KC_NO, KC_NO, K55,   KC_NO, KC_NO, K58,   KC_NO }, \
-    { KC_NO, K61,   K62,   K63,   K64,   K65,   K66,   K67,   K68,   K69   }, \
-    { K70,   K71,   K72,   K73,   K74,   K75,   K76,   K77,   K78,   K79   }, \
-    { K80,   K81,   K82,   K83,   K84,   K85,   K86,   K87,   K88,   K89   }, \
-    { K90,   K91,   K92,   K93,   KC_NO, KC_NO, K96,   K97,   K98,   K99   }, \
-    { KA0,   KA1,   KA2,   KC_NO, KA4,   KA5,   KA6,   KA7,   KA8,   KA9   }, \
-    { KB0,   KC_NO, KB2,   KC_NO, KB4,   KB5,   KB6,   KB7,   KB8,   KB9   }  \
-}
diff --git a/keyboards/tkc/california/info.json b/keyboards/tkc/california/info.json
index 2d62b0ff4f..ab52f06af2 100644
--- a/keyboards/tkc/california/info.json
+++ b/keyboards/tkc/california/info.json
@@ -25,7 +25,132 @@
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_all": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.5, "y":0}, {"label":"Home", "x":17, "y":0}, {"label":"End", "x":18, "y":0}, {"label":"Scroll Lock", "x":19, "y":0}, {"label":"Pause", "x":20, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Bksp", "x":13, "y":1.5}, {"x":14, "y":1.5}, {"label":"PgUp", "x":15.5, "y":1.5}, {"label":"Num Lock", "x":17, "y":1.5}, {"label":"/", "x":18, "y":1.5}, {"label":"*", "x":19, "y":1.5}, {"label":"-", "x":20, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"PgDn", "x":15.5, "y":2.5}, {"label":"7", "x":17, "y":2.5}, {"label":"8", "x":18, "y":2.5}, {"label":"9", "x":19, "y":2.5}, {"label":"+", "x":20, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"4", "x":17, "y":3.5}, {"label":"5", "x":18, "y":3.5}, {"label":"6", "x":19, "y":3.5}, {"x":20, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":1.75}, {"x":14, "y":4.5}, {"label":"\u2191", "x":15.5, "y":4.75}, {"label":"1", "x":17, "y":4.5}, {"label":"2", "x":18, "y":4.5}, {"label":"3", "x":19, "y":4.5}, {"label":"Enter", "x":20, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Menu", "x":11.25, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":12.5, "y":5.5, "w":1.25}, {"label":"\u2190", "x":14.5, "y":5.75}, {"label":"\u2193", "x":15.5, "y":5.75}, {"label":"\u2192", "x":16.5, "y":5.75}, {"label":"0", "x":18, "y":5.5}, {"label":".", "x":19, "y":5.5}, {"x":20, "y":5.5}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [6, 1], "x": 11, "y": 0},
+                {"matrix": [6, 2], "x": 12, "y": 0},
+                {"matrix": [6, 3], "x": 13, "y": 0},
+                {"matrix": [6, 4], "x": 14, "y": 0},
+
+                {"matrix": [6, 5], "x": 15.5, "y": 0},
+
+                {"matrix": [6, 6], "x": 17, "y": 0},
+                {"matrix": [6, 7], "x": 18, "y": 0},
+                {"matrix": [6, 8], "x": 19, "y": 0},
+                {"matrix": [6, 9], "x": 20, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [7, 0], "x": 10, "y": 1.5},
+                {"matrix": [7, 1], "x": 11, "y": 1.5},
+                {"matrix": [7, 2], "x": 12, "y": 1.5},
+                {"matrix": [7, 3], "x": 13, "y": 1.5},
+                {"matrix": [7, 4], "x": 14, "y": 1.5},
+
+                {"matrix": [7, 5], "x": 15.5, "y": 1.5},
+
+                {"matrix": [7, 6], "x": 17, "y": 1.5},
+                {"matrix": [7, 7], "x": 18, "y": 1.5},
+                {"matrix": [7, 8], "x": 19, "y": 1.5},
+                {"matrix": [7, 9], "x": 20, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 8.5, "y": 2.5},
+                {"matrix": [8, 0], "x": 9.5, "y": 2.5},
+                {"matrix": [8, 1], "x": 10.5, "y": 2.5},
+                {"matrix": [8, 2], "x": 11.5, "y": 2.5},
+                {"matrix": [8, 3], "x": 12.5, "y": 2.5},
+                {"matrix": [8, 4], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [8, 5], "x": 15.5, "y": 2.5},
+
+                {"matrix": [8, 6], "x": 17, "y": 2.5},
+                {"matrix": [8, 7], "x": 18, "y": 2.5},
+                {"matrix": [8, 8], "x": 19, "y": 2.5},
+                {"matrix": [8, 9], "x": 20, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 8.75, "y": 3.5},
+                {"matrix": [9, 0], "x": 9.75, "y": 3.5},
+                {"matrix": [9, 1], "x": 10.75, "y": 3.5},
+                {"matrix": [9, 2], "x": 11.75, "y": 3.5},
+                {"matrix": [9, 3], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [9, 6], "x": 17, "y": 3.5},
+                {"matrix": [9, 7], "x": 18, "y": 3.5},
+                {"matrix": [9, 8], "x": 19, "y": 3.5},
+                {"matrix": [9, 9], "x": 20, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [10, 0], "x": 10.25, "y": 4.5},
+                {"matrix": [10, 1], "x": 11.25, "y": 4.5},
+                {"matrix": [10, 2], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [10, 4], "x": 14, "y": 4.5},
+
+                {"matrix": [10, 5], "x": 15.5, "y": 4.75},
+
+                {"matrix": [10, 6], "x": 17, "y": 4.5},
+                {"matrix": [10, 7], "x": 18, "y": 4.5},
+                {"matrix": [10, 8], "x": 19, "y": 4.5},
+                {"matrix": [10, 9], "x": 20, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 8], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 0], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 2], "x": 12.5, "y": 5.5, "w": 1.25},
+
+                {"matrix": [11, 4], "x": 14.5, "y": 5.75},
+                {"matrix": [11, 5], "x": 15.5, "y": 5.75},
+                {"matrix": [11, 6], "x": 16.5, "y": 5.75},
+
+                {"matrix": [11, 7], "x": 18, "y": 5.5},
+                {"matrix": [11, 8], "x": 19, "y": 5.5},
+                {"matrix": [11, 9], "x": 20, "y": 5.5}
+            ]
         }
     }
 }
\ No newline at end of file