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

2 files changed, 46 insertions, 74 deletions

diff --git a/keyboards/handwired/42/42.h b/keyboards/handwired/42/42.h
deleted file mode 100644
index 5be29bf252..0000000000
--- a/keyboards/handwired/42/42.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2019 Angelo Gazzola (nglgzz)
- *
- * 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 ___ KC_NO
-#define LAYOUT( \
-  K00, K01, K02, K03, K04, K05,     K06, K07, K08, K09, K0A, K0B, \
-  K10, K11, K12, K13, K14, K15,     K16, K17, K18, K19, K1A, K1B, \
-  K20, K21, K22, K23, K24, K25,     K26, K27, K28, K29, K2A, K2B, \
-                 K33, K34, K35,     K36, K37, K38 \
-) { \
-  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
-  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
-  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
-  { ___, ___, ___, K33, K34, K35, K36, K37, K38, ___, ___, ___ } \
-}
diff --git a/keyboards/handwired/42/info.json b/keyboards/handwired/42/info.json
index f887edea52..dccafc6d86 100644
--- a/keyboards/handwired/42/info.json
+++ b/keyboards/handwired/42/info.json
@@ -18,51 +18,55 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0.625},
-                {"x":1, "y":0.417},
-                {"x":2, "y":0.208},
-                {"x":3, "y":0},
-                {"x":4, "y":0.208},
-                {"x":5, "y":0.417},
-                {"x":8.5, "y":0.417},
-                {"x":9.5, "y":0.208},
-                {"x":10.5, "y":0},
-                {"x":11.5, "y":0.208},
-                {"x":12.5, "y":0.417},
-                {"x":13.5, "y":0.625},
+                {"matrix": [0, 0], "x": 0, "y": 0.625},
+                {"matrix": [0, 1], "x": 1, "y": 0.417},
+                {"matrix": [0, 2], "x": 2, "y": 0.208},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.208},
+                {"matrix": [0, 5], "x": 5, "y": 0.417},
 
-                {"x":0, "y":1.625},
-                {"x":1, "y":1.417},
-                {"x":2, "y":1.208},
-                {"x":3, "y":1},
-                {"x":4, "y":1.208},
-                {"x":5, "y":1.417},
-                {"x":8.5, "y":1.417},
-                {"x":9.5, "y":1.208},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1.208},
-                {"x":12.5, "y":1.417},
-                {"x":13.5, "y":1.625},
+                {"matrix": [0, 6], "x": 8.5, "y": 0.417},
+                {"matrix": [0, 7], "x": 9.5, "y": 0.208},
+                {"matrix": [0, 8], "x": 10.5, "y": 0},
+                {"matrix": [0, 9], "x": 11.5, "y": 0.208},
+                {"matrix": [0, 10], "x": 12.5, "y": 0.417},
+                {"matrix": [0, 11], "x": 13.5, "y": 0.625},
 
-                {"x":0, "y":2.625},
-                {"x":1, "y":2.417},
-                {"x":2, "y":2.208},
-                {"x":3, "y":2},
-                {"x":4, "y":2.208},
-                {"x":5, "y":2.417},
-                {"x":8.5, "y":2.417},
-                {"x":9.5, "y":2.208},
-                {"x":10.5, "y":2},
-                {"x":11.5, "y":2.208},
-                {"x":12.5, "y":2.417},
-                {"x":13.5, "y":2.625},
+                {"matrix": [1, 0], "x": 0, "y": 1.625},
+                {"matrix": [1, 1], "x": 1, "y": 1.417},
+                {"matrix": [1, 2], "x": 2, "y": 1.208},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.208},
+                {"matrix": [1, 5], "x": 5, "y": 1.417},
 
-                {"x":4, "y":3.208},
-                {"x":5, "y":3.417},
-                {"x":5.75, "y":4.417},
-                {"x":7.75, "y":4.417},
-                {"x":8.5, "y":3.417},
-                {"x":9.5, "y":3.208}
+                {"matrix": [1, 6], "x": 8.5, "y": 1.417},
+                {"matrix": [1, 7], "x": 9.5, "y": 1.208},
+                {"matrix": [1, 8], "x": 10.5, "y": 1},
+                {"matrix": [1, 9], "x": 11.5, "y": 1.208},
+                {"matrix": [1, 10], "x": 12.5, "y": 1.417},
+                {"matrix": [1, 11], "x": 13.5, "y": 1.625},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.625},
+                {"matrix": [2, 1], "x": 1, "y": 2.417},
+                {"matrix": [2, 2], "x": 2, "y": 2.208},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.208},
+                {"matrix": [2, 5], "x": 5, "y": 2.417},
+
+                {"matrix": [2, 6], "x": 8.5, "y": 2.417},
+                {"matrix": [2, 7], "x": 9.5, "y": 2.208},
+                {"matrix": [2, 8], "x": 10.5, "y": 2},
+                {"matrix": [2, 9], "x": 11.5, "y": 2.208},
+                {"matrix": [2, 10], "x": 12.5, "y": 2.417},
+                {"matrix": [2, 11], "x": 13.5, "y": 2.625},
+
+                {"matrix": [3, 3], "x": 4, "y": 3.208},
+                {"matrix": [3, 4], "x": 5, "y": 3.417},
+                {"matrix": [3, 5], "x": 5.75, "y": 4.417},
+
+                {"matrix": [3, 6], "x": 7.75, "y": 4.417},
+                {"matrix": [3, 7], "x": 8.5, "y": 3.417},
+                {"matrix": [3, 8], "x": 9.5, "y": 3.208}
             ]
         }
     }