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

2 files changed, 99 insertions, 140 deletions

diff --git a/keyboards/handwired/unicomp_mini_m/info.json b/keyboards/handwired/unicomp_mini_m/info.json
index 9dd8d59b59..0b110c98bd 100644
--- a/keyboards/handwired/unicomp_mini_m/info.json
+++ b/keyboards/handwired/unicomp_mini_m/info.json
@@ -24,102 +24,110 @@
     "layouts": {
         "LAYOUT": {
             "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":"Pause / SysReq", "x":15.5, "y":0},
-                {"label":"Scroll Lock / Num Lock", "x":16.5, "y":0},
-                {"label":"Pause / Reset", "x":17.5, "y":0},
+                {"matrix": [0, 1], "x": 0, "y": 0},
 
-                {"label":"`", "x":0, "y":2},
-                {"label":"1", "x":1, "y":2},
-                {"label":"2", "x":2, "y":2},
-                {"label":"3", "x":3, "y":2},
-                {"label":"4", "x":4, "y":2},
-                {"label":"5", "x":5, "y":2},
-                {"label":"6", "x":6, "y":2},
-                {"label":"7", "x":7, "y":2},
-                {"label":"8", "x":8, "y":2},
-                {"label":"9", "x":9, "y":2},
-                {"label":"0", "x":10, "y":2},
-                {"label":"-", "x":11, "y":2},
-                {"label":"=", "x":12, "y":2},
-                {"label":"No", "x":13, "y":2},
-                {"label":"Backspace", "x":14, "y":2},
-                {"label":"Insert", "x":15.5, "y":2},
-                {"label":"Home", "x":16.5, "y":2},
-                {"label":"Page Up", "x":17.5, "y":2},
+                {"matrix": [2, 2], "x": 2, "y": 0},
+                {"matrix": [0, 4], "x": 3, "y": 0},
+                {"matrix": [0, 5], "x": 4, "y": 0},
+                {"matrix": [0, 6], "x": 5, "y": 0},
 
-                {"label":"Tab", "x":0, "y":3, "w":1.5},
-                {"label":"Q", "x":1.5, "y":3},
-                {"label":"W", "x":2.5, "y":3},
-                {"label":"E", "x":3.5, "y":3},
-                {"label":"R", "x":4.5, "y":3},
-                {"label":"T", "x":5.5, "y":3},
-                {"label":"Y", "x":6.5, "y":3},
-                {"label":"U", "x":7.5, "y":3},
-                {"label":"I", "x":8.5, "y":3},
-                {"label":"O", "x":9.5, "y":3},
-                {"label":"P", "x":10.5, "y":3},
-                {"label":"[", "x":11.5, "y":3},
-                {"label":"]", "x":12.5, "y":3},
-                {"label":"\\", "x":13.5, "y":3, "w":1.5},
-                {"label":"Delete", "x":15.5, "y":3},
-                {"label":"End", "x":16.5, "y":3},
-                {"label":"Page Down", "x":17.5, "y":3},
+                {"matrix": [1, 8], "x": 6.5, "y": 0},
+                {"matrix": [3, 8], "x": 7.5, "y": 0},
+                {"matrix": [4, 8], "x": 8.5, "y": 0},
+                {"matrix": [5, 8], "x": 9.5, "y": 0},
 
-                {"label":"Caps Lock", "x":0, "y":4, "w":1.75},
-                {"label":"A", "x":1.75, "y":4},
-                {"label":"S", "x":2.75, "y":4},
-                {"label":"D", "x":3.75, "y":4},
-                {"label":"F", "x":4.75, "y":4},
-                {"label":"G", "x":5.75, "y":4},
-                {"label":"H", "x":6.75, "y":4},
-                {"label":"J", "x":7.75, "y":4},
-                {"label":"K", "x":8.75, "y":4},
-                {"label":"L", "x":9.75, "y":4},
-                {"label":";", "x":10.75, "y":4},
-                {"label":"'", "x":11.75, "y":4},
-                {"label":"No", "x":12.75, "y":4},
-                {"label":"Enter", "x":13.75, "y":4, "w":1.25},
+                {"matrix": [6, 8], "x": 11, "y": 0},
+                {"matrix": [6, 10], "x": 12, "y": 0},
+                {"matrix": [6, 11], "x": 13, "y": 0},
+                {"matrix": [7, 11], "x": 14, "y": 0},
 
-                {"label":"Shift", "x":0, "y":5, "w":1.25},
-                {"label":"No", "x":1.25, "y":5},
-                {"label":"Z", "x":2.25, "y":5},
-                {"label":"X", "x":3.25, "y":5},
-                {"label":"C", "x":4.25, "y":5},
-                {"label":"V", "x":5.25, "y":5},
-                {"label":"B", "x":6.25, "y":5},
-                {"label":"N", "x":7.25, "y":5},
-                {"label":"M", "x":8.25, "y":5},
-                {"label":",", "x":9.25, "y":5},
-                {"label":".", "x":10.25, "y":5},
-                {"label":"/", "x":11.25, "y":5},
-                {"label":"No", "x":12.25, "y":5},
-                {"label":"Shift", "x":13.25, "y":5, "w":1.75},
-                {"label":"Up", "x":16.5, "y":5},
+                {"matrix": [6, 13], "x": 15.5, "y": 0},
+                {"matrix": [7, 13], "x": 16.5, "y": 0},
+                {"matrix": [11, 15], "x": 17.5, "y": 0},
 
-                {"label":"Ctrl", "x":0, "y":6, "w":1.5},
-                {"label":"GUI", "x":1.5, "y":6},
-                {"label":"Alt", "x":2.5, "y":6, "w":1.5},
-                {"label":"Space", "x":4, "y":6, "w":6},
-                {"label":"Alt", "x":10, "y":6},
-                {"label":"GUI", "x":11, "y":6, "w":1.5},
-                {"label":"App", "x":12.5, "y":6},
-                {"label":"Ctrl", "x":13.5, "y":6, "w":1.5},
-                {"label":"Left", "x":15.5, "y":6},
-                {"label":"Down", "x":16.5, "y":6},
-                {"label":"Right", "x":17.5, "y":6}
+                {"matrix": [0, 0], "x": 0, "y": 2},
+                {"matrix": [3, 2], "x": 1, "y": 2},
+                {"matrix": [6, 2], "x": 2, "y": 2},
+                {"matrix": [7, 2], "x": 3, "y": 2},
+                {"matrix": [4, 2], "x": 4, "y": 2},
+                {"matrix": [0, 2], "x": 5, "y": 2},
+                {"matrix": [1, 7], "x": 6, "y": 2},
+                {"matrix": [5, 7], "x": 7, "y": 2},
+                {"matrix": [10, 7], "x": 8, "y": 2},
+                {"matrix": [9, 7], "x": 9, "y": 2},
+                {"matrix": [8, 7], "x": 10, "y": 2},
+                {"matrix": [6, 12], "x": 11, "y": 2},
+                {"matrix": [6, 9], "x": 12, "y": 2},
+                {"matrix": [7, 12], "x": 13, "y": 2},
+                {"matrix": [8, 9], "x": 14, "y": 2},
+
+                {"matrix": [8, 12], "x": 15.5, "y": 2},
+                {"matrix": [9, 13], "x": 16.5, "y": 2},
+                {"matrix": [10, 12], "x": 17.5, "y": 2},
+
+                {"matrix": [2, 12], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 3},
+                {"matrix": [5, 2], "x": 2.5, "y": 3},
+                {"matrix": [10, 2], "x": 3.5, "y": 3},
+                {"matrix": [9, 2], "x": 4.5, "y": 3},
+                {"matrix": [8, 2], "x": 5.5, "y": 3},
+                {"matrix": [3, 7], "x": 6.5, "y": 3},
+                {"matrix": [6, 7], "x": 7.5, "y": 3},
+                {"matrix": [7, 7], "x": 8.5, "y": 3},
+                {"matrix": [4, 7], "x": 9.5, "y": 3},
+                {"matrix": [0, 7], "x": 10.5, "y": 3},
+                {"matrix": [5, 9], "x": 11.5, "y": 3},
+                {"matrix": [10, 9], "x": 12.5, "y": 3},
+                {"matrix": [9, 9], "x": 13.5, "y": 3, "w": 1.5},
+
+                {"matrix": [11, 13], "x": 15.5, "y": 3},
+                {"matrix": [8, 11], "x": 16.5, "y": 3},
+                {"matrix": [10, 13], "x": 17.5, "y": 3},
+
+                {"matrix": [1, 0], "x": 0, "y": 4, "w": 1.75},
+                {"matrix": [2, 11], "x": 1.75, "y": 4},
+                {"matrix": [2, 0], "x": 2.75, "y": 4},
+                {"matrix": [2, 1], "x": 3.75, "y": 4},
+                {"matrix": [2, 3], "x": 4.75, "y": 4},
+                {"matrix": [2, 4], "x": 5.75, "y": 4},
+                {"matrix": [11, 5], "x": 6.75, "y": 4},
+                {"matrix": [11, 8], "x": 7.75, "y": 4},
+                {"matrix": [11, 6], "x": 8.75, "y": 4},
+                {"matrix": [11, 9], "x": 9.75, "y": 4},
+                {"matrix": [11, 10], "x": 10.75, "y": 4},
+                {"matrix": [11, 12], "x": 11.75, "y": 4},
+                {"matrix": [1, 13], "x": 12.75, "y": 4},
+                {"matrix": [0, 13], "x": 13.75, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 15], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 5},
+                {"matrix": [2, 5], "x": 2.25, "y": 5},
+                {"matrix": [2, 8], "x": 3.25, "y": 5},
+                {"matrix": [2, 6], "x": 4.25, "y": 5},
+                {"matrix": [2, 9], "x": 5.25, "y": 5},
+                {"matrix": [2, 10], "x": 6.25, "y": 5},
+                {"matrix": [11, 11], "x": 7.25, "y": 5},
+                {"matrix": [11, 0], "x": 8.25, "y": 5},
+                {"matrix": [11, 1], "x": 9.25, "y": 5},
+                {"matrix": [11, 3], "x": 10.25, "y": 5},
+                {"matrix": [11, 4], "x": 11.25, "y": 5},
+                {"matrix": [0, 3], "x": 12.25, "y": 5},
+                {"matrix": [1, 15], "x": 13.25, "y": 5, "w": 1.75},
+
+                {"matrix": [8, 10], "x": 16.5, "y": 5},
+
+                {"matrix": [4, 14], "x": 0, "y": 6, "w": 1.5},
+                {"matrix": [3, 11], "x": 1.5, "y": 6},
+                {"matrix": [0, 12], "x": 2.5, "y": 6, "w": 1.5},
+                {"matrix": [10, 0], "x": 4, "y": 6, "w": 6},
+                {"matrix": [9, 3], "x": 10, "y": 6},
+                {"matrix": [5, 10], "x": 11, "y": 6, "w": 1.5},
+                {"matrix": [10, 4], "x": 12.5, "y": 6},
+                {"matrix": [1, 14], "x": 13.5, "y": 6, "w": 1.5},
+
+                {"matrix": [9, 4], "x": 15.5, "y": 6},
+                {"matrix": [10, 11], "x": 16.5, "y": 6},
+                {"matrix": [10, 10], "x": 17.5, "y": 6}
             ]
         }
     }
diff --git a/keyboards/handwired/unicomp_mini_m/unicomp_mini_m.h b/keyboards/handwired/unicomp_mini_m/unicomp_mini_m.h
deleted file mode 100644
index 8e426da051..0000000000
--- a/keyboards/handwired/unicomp_mini_m/unicomp_mini_m.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2021 stevendlander
- *
- * 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 "names" for physical keys of the keyboard
- * and defines their position on the board.
- * The second section defines position of the keys on the switch matrix 
- * (where COLUMNS and ROWS crosses). */
-
-#define LAYOUT( \
-    K5A,      K5B, K5C, K5D, K5E,  K5F, K5G, K5H, K5I,  K5J, K5K, K5L, K5M,      K5N, K5O, K5P, \
-    \
-    K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4N, K4O,   K4P, K4Q, K4R, \
-    K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3N,        K3O, K3P, K3Q, \
-    K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L,      K2M, K2N,                  \
-    K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, K1M, K1N,             K1O,      \
-    K0A, K0B, K0C,                K0D,                K0E, K0F, K0G, K0H,        K0I, K0J, K0K  \
-) \
-{ \
-/* 00 */ { K4A,   K5A,   K4F,   K1M,   K5C,   K5D,   K5E,   K3K,   KC_NO, KC_NO, KC_NO, KC_NO, K0C,   K2N,   KC_NO, KC_NO }, \
-/* 01 */ { K2A,   K1B,   K3B,   KC_NO, KC_NO, KC_NO, KC_NO, K4G,   K5F,   KC_NO, KC_NO, KC_NO, KC_NO, K2M,   K0H,   K1N,  }, \
-/* 02 */ { K2C,   K2D,   K5B,   K2E,   K2F,   K1C,   K1E,   KC_NO, K1D,   K1F,   K1G,   K2B,   K3A,   KC_NO, KC_NO, KC_NO }, \
-/* 03 */ { KC_NO, KC_NO, K4B,   KC_NO, KC_NO, KC_NO, KC_NO, K3G,   K5G,   KC_NO, KC_NO, K0B,   KC_NO, KC_NO, KC_NO, KC_NO }, \
-/* 04 */ { KC_NO, KC_NO, K4E,   KC_NO, KC_NO, KC_NO, KC_NO, K3J,   K5H,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K0A,   K1A,  }, \
-/* 05 */ { KC_NO, KC_NO, K3C,   KC_NO, KC_NO, KC_NO, KC_NO, K4H,   K5I,   K3L,   K0F,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-/* 06 */ { KC_NO, KC_NO, K4C,   KC_NO, KC_NO, KC_NO, KC_NO, K3H,   K5J,   K4M,   K5K,   K5L,   K4L,   K5N,   KC_NO, KC_NO }, \
-/* 07 */ { KC_NO, KC_NO, K4D,   KC_NO, KC_NO, KC_NO, KC_NO, K3I,   KC_NO, KC_NO, KC_NO, K5M,   K4N,   K5O,   KC_NO, KC_NO }, \
-/* 08 */ { KC_NO, KC_NO, K3F,   KC_NO, KC_NO, KC_NO, KC_NO, K4K,   KC_NO, K4O,   K1O,   K3P,   K4P,   KC_NO, KC_NO, KC_NO }, \
-/* 09 */ { KC_NO, KC_NO, K3E,   K0E,   K0I,   KC_NO, KC_NO, K4J,   KC_NO, K3N,   KC_NO, KC_NO, KC_NO, K4Q,   KC_NO, KC_NO }, \
-/* 0A */ { K0D,   KC_NO, K3D,   KC_NO, K0G,   KC_NO, KC_NO, K4I,   KC_NO, K3M,   K0K,   K0J,   K4R,   K3Q,   KC_NO, KC_NO }, \
-/* 0B */ { K1I,   K1J,   KC_NO, K1K,   K1L,   K2G,   K2I,   KC_NO, K2H,   K2J,   K2K,   K1H,   K2L,   K3O,   KC_NO, K5P,  }, \
-}
-/*         0      1      2      3      4      5      6      7      8      9      A      B      C      D      E      F       */