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

2 files changed, 40 insertions, 54 deletions

diff --git a/keyboards/omkbd/runner3680/3x6/3x6.h b/keyboards/omkbd/runner3680/3x6/3x6.h
deleted file mode 100644
index 3d9fd779d8..0000000000
--- a/keyboards/omkbd/runner3680/3x6/3x6.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-   L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
-   L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
-   L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25  \
-   ) \
-   { \
-     { L00, L01, L02, L03, L04, L05 }, \
-     { L10, L11, L12, L13, L14, L15 }, \
-     { L20, L21, L22, L23, L24, L25 }, \
-     { R05, R04, R03, R02, R01, R00 }, \
-     { R15, R14, R13, R12, R11, R10 }, \
-     { R25, R24, R23, R22, R21, R20 } \
-   }
diff --git a/keyboards/omkbd/runner3680/3x6/info.json b/keyboards/omkbd/runner3680/3x6/info.json
index 4cd318a2ef..9cb57ec106 100644
--- a/keyboards/omkbd/runner3680/3x6/info.json
+++ b/keyboards/omkbd/runner3680/3x6/info.json
@@ -19,47 +19,50 @@
     "ws2812": {
         "pin": "D3"
     },
-    "layouts": {
+   "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
+                {"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},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
-                {"x":7, "y":1},
-                {"x":8, "y":1},
-                {"x":9, "y":1},
-                {"x":10, "y":1},
-                {"x":11, "y":1},
-                {"x":12, "y":1},
+                {"matrix": [3, 5], "x": 7, "y": 0},
+                {"matrix": [3, 4], "x": 8, "y": 0},
+                {"matrix": [3, 3], "x": 9, "y": 0},
+                {"matrix": [3, 2], "x": 10, "y": 0},
+                {"matrix": [3, 1], "x": 11, "y": 0},
+                {"matrix": [3, 0], "x": 12, "y": 0},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
-                {"x":7, "y":2},
-                {"x":8, "y":2},
-                {"x":9, "y":2},
-                {"x":10, "y":2},
-                {"x":11, "y":2},
-                {"x":12, "y":2}
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+
+                {"matrix": [4, 5], "x": 7, "y": 1},
+                {"matrix": [4, 4], "x": 8, "y": 1},
+                {"matrix": [4, 3], "x": 9, "y": 1},
+                {"matrix": [4, 2], "x": 10, "y": 1},
+                {"matrix": [4, 1], "x": 11, "y": 1},
+                {"matrix": [4, 0], "x": 12, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+
+                {"matrix": [5, 5], "x": 7, "y": 2},
+                {"matrix": [5, 4], "x": 8, "y": 2},
+                {"matrix": [5, 3], "x": 9, "y": 2},
+                {"matrix": [5, 2], "x": 10, "y": 2},
+                {"matrix": [5, 1], "x": 11, "y": 2},
+                {"matrix": [5, 0], "x": 12, "y": 2}
             ]
         }
     }