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

2 files changed, 83 insertions, 43 deletions

diff --git a/keyboards/unikeyboard/diverge3/diverge3.h b/keyboards/unikeyboard/diverge3/diverge3.h
deleted file mode 100644
index c052bcb0fc..0000000000
--- a/keyboards/unikeyboard/diverge3/diverge3.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2017 IslandMan93
- *
- * 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
-
-// This a shortcut to help you visually see your layout.
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT( \
-    L00, L01, L02, L03, L04, L05, L06,           R00, R01, R02, R03, R04, R05, R06, \
-    L10, L11, L12, L13, L14, L15, L16,           R10, R11, R12, R13, R14, R15, R16, \
-    L20, L21, L22, L23, L24, L25, L26,           R20, R21, R22, R23, R24, R25, R26, \
-    L30, L31, L32, L33, L34, L35, L36,           R30, R31, R32, R33, R34, R35, R36, \
-    L40, L41, L42, L43, L44, LT0, LT1, LT2, RT2, RT1, RT0, R40, R41, R42, R43, R44 \
-) { \
-    { L00, L01, L02, L03, L04, L05, L06, XXX }, \
-    { L10, L11, L12, L13, L14, L15, L16, XXX }, \
-    { L20, L21, L22, L23, L24, L25, L26, XXX }, \
-    { L30, L31, L32, L33, L34, L35, L36, XXX }, \
-    { L40, L41, L42, L43, L44, LT0, LT1, LT2 }, \
-    { R06, R05, R04, R03, R02, R01, R00, XXX }, \
-    { R16, R15, R14, R13, R12, R11, R10, XXX }, \
-    { R26, R25, R24, R23, R22, R21, R20, XXX }, \
-    { R36, R35, R34, R33, R32, R31, R30, XXX }, \
-    { R44, R43, R42, R41, R40, RT0, RT1, RT2 } \
-  }
diff --git a/keyboards/unikeyboard/diverge3/info.json b/keyboards/unikeyboard/diverge3/info.json
index 4aac244492..cf7067f629 100644
--- a/keyboards/unikeyboard/diverge3/info.json
+++ b/keyboards/unikeyboard/diverge3/info.json
@@ -25,7 +25,89 @@
   "bootloader": "caterina",
   "layouts": {
     "LAYOUT": {
-      "layout": [{"x":0, "y":0}, {"x":1, "y":0.75}, {"x":2, "y":0.25}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0.25}, {"x":6, "y":0.5}, {"x":10, "y":0.5}, {"x":11, "y":0.25}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0.25}, {"x":15, "y":0.75}, {"x":16, "y":0}, {"x":0, "y":1}, {"x":1, "y":1.75}, {"x":2, "y":1.25}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1.25}, {"x":6, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.25}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1.25}, {"x":15, "y":1.75}, {"x":16, "y":1}, {"x":0, "y":2}, {"x":1, "y":2.75}, {"x":2, "y":2.25}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2.25}, {"x":6, "y":2.5}, {"x":10, "y":2.5}, {"x":11, "y":2.25}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2.25}, {"x":15, "y":2.75}, {"x":16, "y":2}, {"x":0, "y":3}, {"x":1, "y":3.75}, {"x":2, "y":3.25}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3.25}, {"x":6, "y":3.5}, {"x":10, "y":3.5}, {"x":11, "y":3.25}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3.25}, {"x":15, "y":3.75}, {"x":16, "y":3}, {"x":0, "y":4}, {"x":1, "y":4.75}, {"x":2, "y":4.25}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4.75, "h":1.25}, {"x":6, "y":5, "h":1.25}, {"x":7, "y":5.25}, {"x":9, "y":5.25}, {"x":10, "y":5, "h":1.25}, {"x":11, "y":4.75, "h":1.25}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4.25}, {"x":15, "y":4.75}, {"x":16, "y":4}]
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0.75},
+        {"matrix": [0, 2], "x": 2, "y": 0.25},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0.25},
+        {"matrix": [0, 6], "x": 6, "y": 0.5},
+
+        {"matrix": [5, 6], "x": 10, "y": 0.5},
+        {"matrix": [5, 5], "x": 11, "y": 0.25},
+        {"matrix": [5, 4], "x": 12, "y": 0},
+        {"matrix": [5, 3], "x": 13, "y": 0},
+        {"matrix": [5, 2], "x": 14, "y": 0.25},
+        {"matrix": [5, 1], "x": 15, "y": 0.75},
+        {"matrix": [5, 0], "x": 16, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1.75},
+        {"matrix": [1, 2], "x": 2, "y": 1.25},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6, "y": 1.5},
+
+        {"matrix": [6, 6], "x": 10, "y": 1.5},
+        {"matrix": [6, 5], "x": 11, "y": 1.25},
+        {"matrix": [6, 4], "x": 12, "y": 1},
+        {"matrix": [6, 3], "x": 13, "y": 1},
+        {"matrix": [6, 2], "x": 14, "y": 1.25},
+        {"matrix": [6, 1], "x": 15, "y": 1.75},
+        {"matrix": [6, 0], "x": 16, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2.75},
+        {"matrix": [2, 2], "x": 2, "y": 2.25},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2.25},
+        {"matrix": [2, 6], "x": 6, "y": 2.5},
+
+        {"matrix": [7, 6], "x": 10, "y": 2.5},
+        {"matrix": [7, 5], "x": 11, "y": 2.25},
+        {"matrix": [7, 4], "x": 12, "y": 2},
+        {"matrix": [7, 3], "x": 13, "y": 2},
+        {"matrix": [7, 2], "x": 14, "y": 2.25},
+        {"matrix": [7, 1], "x": 15, "y": 2.75},
+        {"matrix": [7, 0], "x": 16, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3.75},
+        {"matrix": [3, 2], "x": 2, "y": 3.25},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3.25},
+        {"matrix": [3, 6], "x": 6, "y": 3.5},
+
+        {"matrix": [8, 6], "x": 10, "y": 3.5},
+        {"matrix": [8, 5], "x": 11, "y": 3.25},
+        {"matrix": [8, 4], "x": 12, "y": 3},
+        {"matrix": [8, 3], "x": 13, "y": 3},
+        {"matrix": [8, 2], "x": 14, "y": 3.25},
+        {"matrix": [8, 1], "x": 15, "y": 3.75},
+        {"matrix": [8, 0], "x": 16, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+        {"matrix": [4, 1], "x": 1, "y": 4.75},
+        {"matrix": [4, 2], "x": 2, "y": 4.25},
+        {"matrix": [4, 3], "x": 3, "y": 4},
+        {"matrix": [4, 4], "x": 4, "y": 4},
+        {"matrix": [4, 5], "x": 5, "y": 4.75, "h": 1.25},
+        {"matrix": [4, 6], "x": 6, "y": 5, "h": 1.25},
+        {"matrix": [4, 7], "x": 7, "y": 5.25},
+
+        {"matrix": [9, 7], "x": 9, "y": 5.25},
+        {"matrix": [9, 6], "x": 10, "y": 5, "h": 1.25},
+        {"matrix": [9, 5], "x": 11, "y": 4.75, "h": 1.25},
+        {"matrix": [9, 4], "x": 12, "y": 4},
+        {"matrix": [9, 3], "x": 13, "y": 4},
+        {"matrix": [9, 2], "x": 14, "y": 4.25},
+        {"matrix": [9, 1], "x": 15, "y": 4.75},
+        {"matrix": [9, 0], "x": 16, "y": 4}
+      ]
     }
   }
 }