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

2 files changed, 87 insertions, 397 deletions

diff --git a/keyboards/cannonkeys/nearfield/info.json b/keyboards/cannonkeys/nearfield/info.json
index 998cbc14d6..b663c0ecb6 100644
--- a/keyboards/cannonkeys/nearfield/info.json
+++ b/keyboards/cannonkeys/nearfield/info.json
@@ -16,368 +16,93 @@
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "debounce": 0,
-    "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":7.5,
-                "y":0
-             },
-             {
-                "label":"&",
-                "x":8.5,
-                "y":0
-             },
-             {
-                "label":"*",
-                "x":9.5,
-                "y":0
-             },
-             {
-                "label":"(",
-                "x":10.5,
-                "y":0
-             },
-             {
-                "label":")",
-                "x":11.5,
-                "y":0
-             },
-             {
-                "label":"_",
-                "x":12.5,
-                "y":0
-             },
-             {
-                "label":"+",
-                "x":13.5,
-                "y":0
-             },
-             {
-                "label":"Insert",
-                "x":15.5,
-                "y":0
-             },
-             {
-                "label":"Home",
-                "x":16.5,
-                "y":0
-             },
-             {
-                "label":"PgUp",
-                "x":17.5,
-                "y":0
-             },
-             {
-                "label":"Tab",
-                "x":0,
-                "y":1.5
-             },
-             {
-                "label":"Q",
-                "x":1,
-                "y":1.5
-             },
-             {
-                "label":"W",
-                "x":2,
-                "y":1.5
-             },
-             {
-                "label":"E",
-                "x":3,
-                "y":1.5
-             },
-             {
-                "label":"R",
-                "x":4,
-                "y":1.5
-             },
-             {
-                "label":"T",
-                "x":5,
-                "y":1.5
-             },
-             {
-                "label":"Y",
-                "x":7.5,
-                "y":1.5
-             },
-             {
-                "label":"U",
-                "x":8.5,
-                "y":1.5
-             },
-             {
-                "label":"I",
-                "x":9.5,
-                "y":1.5
-             },
-             {
-                "label":"O",
-                "x":10.5,
-                "y":1.5
-             },
-             {
-                "label":"P",
-                "x":11.5,
-                "y":1.5
-             },
-             {
-                "label":"{",
-                "x":12.5,
-                "y":1.5
-             },
-             {
-                "label":"}",
-                "x":13.5,
-                "y":1.5
-             },
-             {
-                "label":"Insert",
-                "x":15.5,
-                "y":1.5
-             },
-             {
-                "label":"Home",
-                "x":16.5,
-                "y":1.5
-             },
-             {
-                "label":"PgUp",
-                "x":17.5,
-                "y":1.5
-             },
-             {
-                "label":"Caps Lock",
-                "x":0,
-                "y":2.5,
-                "w":1.25
-             },
-             {
-                "label":"A",
-                "x":1.25,
-                "y":2.5
-             },
-             {
-                "label":"S",
-                "x":2.25,
-                "y":2.5
-             },
-             {
-                "label":"D",
-                "x":3.25,
-                "y":2.5
-             },
-             {
-                "label":"F",
-                "x":4.25,
-                "y":2.5
-             },
-             {
-                "label":"G",
-                "x":5.25,
-                "y":2.5
-             },
-             {
-                "label":"H",
-                "x":7.75,
-                "y":2.5
-             },
-             {
-                "label":"J",
-                "x":8.75,
-                "y":2.5
-             },
-             {
-                "label":"K",
-                "x":9.75,
-                "y":2.5
-             },
-             {
-                "label":"L",
-                "x":10.75,
-                "y":2.5
-             },
-             {
-                "label":"\"",
-                "x":11.75,
-                "y":2.5
-             },
-             {
-                "label":"Enter",
-                "x":12.75,
-                "y":2.5,
-                "w":1.75
-             },
-             {
-                "label":"Delete",
-                "x":15.5,
-                "y":2.5
-             },
-             {
-                "label":"End",
-                "x":16.5,
-                "y":2.5
-             },
-             {
-                "label":"PgDn",
-                "x":17.5,
-                "y":2.5
-             },
-             {
-                "label":"Shift",
-                "x":0,
-                "y":3.5,
-                "w":1.75
-             },
-             {
-                "label":"Z",
-                "x":1.75,
-                "y":3.5
-             },
-             {
-                "label":"X",
-                "x":2.75,
-                "y":3.5
-             },
-             {
-                "label":"C",
-                "x":3.75,
-                "y":3.5
-             },
-             {
-                "label":"V",
-                "x":4.75,
-                "y":3.5
-             },
-             {
-                "label":"B",
-                "x":5.75,
-                "y":3.5
-             },
-             {
-                "label":"N",
-                "x":8.25,
-                "y":3.5
-             },
-             {
-                "label":"M",
-                "x":9.25,
-                "y":3.5
-             },
-             {
-                "label":"<",
-                "x":10.25,
-                "y":3.5
-             },
-             {
-                "label":">",
-                "x":11.25,
-                "y":3.5
-             },
-             {
-                "label":"?",
-                "x":12.25,
-                "y":3.5
-             },
-             {
-                "label":"r4 dogshift",
-                "x":13.25,
-                "y":3.5,
-                "w":1.25
-             },
-             {
-                "label":"Ctrl",
-                "x":0,
-                "y":4.5,
-                "w":1.25
-             },
-             {
-                "label":"Alt",
-                "x":2.5,
-                "y":4.5,
-                "w":1.25
-             },
-             {
-                "x":3.75,
-                "y":4.5
-             },
-             {
-                "label":"",
-                "x":4.75,
-                "y":4.5,
-                "w":2
-             },
-             {
-                "label":"",
-                "x":8.25,
-                "y":4.5,
-                "w":2.25
-             },
-             {
-                "label":"Alt",
-                "x":10.5,
-                "y":4.5,
-                "w":1.25
-             },
-             {
-                "label":"Ctrl",
-                "x":13,
-                "y":4.5,
-                "w":1.5
-             },
-             {
-                "label":"\u2191",
-                "x":16.5,
-                "y":4.5
-             },
-             {
-                "label":"\u2190",
-                "x":15.5,
-                "y":5.5
-             },
-             {
-                "label":"\u2193",
-                "x":16.5,
-                "y":5.5
-             },
-             {
-                "label":"\u2192",
-                "x":17.5,
-                "y":5.5
-             }
+    "layouts": {
+       "LAYOUT_all": {
+          "layout": [
+             {"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": 7.5, "y": 0},
+             {"matrix": [0, 7], "x": 8.5, "y": 0},
+             {"matrix": [0, 8], "x": 9.5, "y": 0},
+             {"matrix": [0, 9], "x": 10.5, "y": 0},
+             {"matrix": [0, 10], "x": 11.5, "y": 0},
+             {"matrix": [0, 11], "x": 12.5, "y": 0},
+             {"matrix": [0, 12], "x": 13.5, "y": 0},
+
+             {"matrix": [0, 13], "x": 15.5, "y": 0},
+             {"matrix": [0, 14], "x": 16.5, "y": 0},
+             {"matrix": [0, 15], "x": 17.5, "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": 7.5, "y": 1.5},
+             {"matrix": [1, 7], "x": 8.5, "y": 1.5},
+             {"matrix": [1, 8], "x": 9.5, "y": 1.5},
+             {"matrix": [1, 9], "x": 10.5, "y": 1.5},
+             {"matrix": [1, 10], "x": 11.5, "y": 1.5},
+             {"matrix": [1, 11], "x": 12.5, "y": 1.5},
+             {"matrix": [1, 12], "x": 13.5, "y": 1.5},
+
+             {"matrix": [1, 13], "x": 15.5, "y": 1.5},
+             {"matrix": [1, 14], "x": 16.5, "y": 1.5},
+             {"matrix": [1, 15], "x": 17.5, "y": 1.5},
+
+             {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.25},
+             {"matrix": [2, 1], "x": 1.25, "y": 2.5},
+             {"matrix": [2, 2], "x": 2.25, "y": 2.5},
+             {"matrix": [2, 3], "x": 3.25, "y": 2.5},
+             {"matrix": [2, 4], "x": 4.25, "y": 2.5},
+             {"matrix": [2, 5], "x": 5.25, "y": 2.5},
+
+             {"matrix": [2, 6], "x": 7.75, "y": 2.5},
+             {"matrix": [2, 7], "x": 8.75, "y": 2.5},
+             {"matrix": [2, 8], "x": 9.75, "y": 2.5},
+             {"matrix": [2, 9], "x": 10.75, "y": 2.5},
+             {"matrix": [2, 10], "x": 11.75, "y": 2.5},
+             {"matrix": [2, 11], "x": 12.75, "y": 2.5, "w": 1.75},
+
+             {"matrix": [2, 13], "x": 15.5, "y": 2.5},
+             {"matrix": [2, 14], "x": 16.5, "y": 2.5},
+             {"matrix": [2, 15], "x": 17.5, "y": 2.5},
+
+             {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+             {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+             {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+             {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+             {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+             {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+
+             {"matrix": [3, 6], "x": 8.25, "y": 3.5},
+             {"matrix": [3, 7], "x": 9.25, "y": 3.5},
+             {"matrix": [3, 8], "x": 10.25, "y": 3.5},
+             {"matrix": [3, 9], "x": 11.25, "y": 3.5},
+             {"matrix": [3, 10], "x": 12.25, "y": 3.5},
+             {"matrix": [3, 11], "x": 13.25, "y": 3.5, "w": 1.25},
+
+             {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+             {"matrix": [4, 1], "x": 2.5, "y": 4.5, "w": 1.25},
+             {"matrix": [4, 3], "x": 3.75, "y": 4.5},
+             {"matrix": [4, 4], "x": 4.75, "y": 4.5, "w": 2},
+
+             {"matrix": [4, 6], "x": 8.25, "y": 4.5, "w": 2.25},
+             {"matrix": [4, 8], "x": 10.5, "y": 4.5, "w": 1.25},
+             {"matrix": [4, 10], "x": 13, "y": 4.5, "w": 1.5},
+
+             {"matrix": [4, 12], "x": 16.5, "y": 4.5},
+
+             {"matrix": [4, 13], "x": 15.5, "y": 5.5},
+             {"matrix": [4, 14], "x": 16.5, "y": 5.5},
+             {"matrix": [4, 15], "x": 17.5, "y": 5.5}
           ]
        }
     }
diff --git a/keyboards/cannonkeys/nearfield/nearfield.h b/keyboards/cannonkeys/nearfield/nearfield.h
deleted file mode 100755
index 610c6489b5..0000000000
--- a/keyboards/cannonkeys/nearfield/nearfield.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2021 Dr.Doof
-
-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_all( \
-	     K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \
-	     K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, \
-	     K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, K2G, \
-	     K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,                     \
-	     K41, K42,      K44, K45,      K47,      K49,      K4B,      K4D, K4E, K4F, K4G \
-) { \
-	{ K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-	{ K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-	{ K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F, K2G }, \
-	{ K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, XXX, XXX, XXX, XXX }, \
-	{ K41, K42, XXX, K44, K45, XXX, K47, XXX, K49, XXX, K4B, XXX, K4D, K4E, K4F, K4G } \
-}