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

2 files changed, 42 insertions, 63 deletions

diff --git a/keyboards/handwired/not_so_minidox/info.json b/keyboards/handwired/not_so_minidox/info.json
index dee4d76c50..b5298dfae4 100644
--- a/keyboards/handwired/not_so_minidox/info.json
+++ b/keyboards/handwired/not_so_minidox/info.json
@@ -21,55 +21,55 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"x":0, "y":0.375},
-        {"x":1, "y":0.25},
-        {"x":2, "y":0.125},
-        {"x":3, "y":0},
-        {"x":4, "y":0.125},
-        {"x":5, "y":0.25},
+        {"matrix": [0, 0], "x": 0, "y": 0.375},
+        {"matrix": [0, 1], "x": 1, "y": 0.25},
+        {"matrix": [0, 2], "x": 2, "y": 0.125},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0.125},
+        {"matrix": [0, 5], "x": 5, "y": 0.25},
 
-        {"x":8, "y":0.25},
-        {"x":9, "y":0.125},
-        {"x":10, "y":0},
-        {"x":11, "y":0.125},
-        {"x":12, "y":0.25},
-        {"x":13, "y":0.375},
+        {"matrix": [4, 5], "x": 8, "y": 0.25},
+        {"matrix": [4, 4], "x": 9, "y": 0.125},
+        {"matrix": [4, 3], "x": 10, "y": 0},
+        {"matrix": [4, 2], "x": 11, "y": 0.125},
+        {"matrix": [4, 1], "x": 12, "y": 0.25},
+        {"matrix": [4, 0], "x": 13, "y": 0.375},
 
-        {"x":0, "y":1.375},
-        {"x":1, "y":1.25},
-        {"x":2, "y":1.125},
-        {"x":3, "y":1},
-        {"x":4, "y":1.125},
-        {"x":5, "y":1.25},
+        {"matrix": [1, 0], "x": 0, "y": 1.375},
+        {"matrix": [1, 1], "x": 1, "y": 1.25},
+        {"matrix": [1, 2], "x": 2, "y": 1.125},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1.125},
+        {"matrix": [1, 5], "x": 5, "y": 1.25},
 
-        {"x":8, "y":1.25},
-        {"x":9, "y":1.125},
-        {"x":10, "y":1},
-        {"x":11, "y":1.125},
-        {"x":12, "y":1.25},
-        {"x":13, "y":1.375},
+        {"matrix": [5, 5], "x": 8, "y": 1.25},
+        {"matrix": [5, 4], "x": 9, "y": 1.125},
+        {"matrix": [5, 3], "x": 10, "y": 1},
+        {"matrix": [5, 2], "x": 11, "y": 1.125},
+        {"matrix": [5, 1], "x": 12, "y": 1.25},
+        {"matrix": [5, 0], "x": 13, "y": 1.375},
 
-        {"x":0, "y":2.375},
-        {"x":1, "y":2.25},
-        {"x":2, "y":2.125},
-        {"x":3, "y":2},
-        {"x":4, "y":2.125},
-        {"x":5, "y":2.25},
+        {"matrix": [2, 0], "x": 0, "y": 2.375},
+        {"matrix": [2, 1], "x": 1, "y": 2.25},
+        {"matrix": [2, 2], "x": 2, "y": 2.125},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2.125},
+        {"matrix": [2, 5], "x": 5, "y": 2.25},
 
-        {"x":8, "y":2.25},
-        {"x":9, "y":2.125},
-        {"x":10, "y":2},
-        {"x":11, "y":2.125},
-        {"x":12, "y":2.25},
-        {"x":13, "y":2.375},
+        {"matrix": [6, 5], "x": 8, "y": 2.25},
+        {"matrix": [6, 4], "x": 9, "y": 2.125},
+        {"matrix": [6, 3], "x": 10, "y": 2},
+        {"matrix": [6, 2], "x": 11, "y": 2.125},
+        {"matrix": [6, 1], "x": 12, "y": 2.25},
+        {"matrix": [6, 0], "x": 13, "y": 2.375},
 
-        {"x":3.5, "y":4.75},
-        {"x":4.5, "y":4.75},
-        {"x":5.5, "y":3.75, "h":2},
+        {"matrix": [3, 3], "x": 3.5, "y": 4.75},
+        {"matrix": [3, 4], "x": 4.5, "y": 4.75},
+        {"matrix": [3, 5], "x": 5.5, "y": 3.75, "h": 2},
 
-        {"x":7.5, "y":3.75, "h":2},
-        {"x":8.5, "y":4.75},
-        {"x":9.5, "y":4.75}
+        {"matrix": [7, 5], "x": 7.5, "y": 3.75, "h": 2},
+        {"matrix": [7, 4], "x": 8.5, "y": 4.75},
+        {"matrix": [7, 3], "x": 9.5, "y": 4.75}
       ]
     }
   }
diff --git a/keyboards/handwired/not_so_minidox/not_so_minidox.h b/keyboards/handwired/not_so_minidox/not_so_minidox.h
deleted file mode 100644
index 7c80dc9b3b..0000000000
--- a/keyboards/handwired/not_so_minidox/not_so_minidox.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
-    L00, L01, L02, L03, L04, L05,     R05, R04, R03, R02, R01, R00, \
-    L10, L11, L12, L13, L14, L15,     R15, R14, R13, R12, R11, R10, \
-    L20, L21, L22, L23, L24, L25,     R25, R24, R23, R22, R21, R20, \
-                   LT1, LT2, LT3,     RT3, RT2, RT1 \
-) { \
-    { L00, L01, L02, L03, L04, L05 }, \
-    { L10, L11, L12, L13, L14, L15 }, \
-    { L20, L21, L22, L23, L24, L25 }, \
-    { XXX, XXX, XXX, LT1, LT2, LT3 }, \
-    { R00, R01, R02, R03, R04, R05 }, \
-    { R10, R11, R12, R13, R14, R15 }, \
-    { R20, R21, R22, R23, R24, R25 }, \
-    { XXX, XXX, XXX, RT1, RT2, RT3 } \
-}