From 364c06d939134184838579d4e73880f8c2f83419 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 5 Apr 2023 15:46:59 +1000
Subject: Move small macropad-ish layouts to data driven (#20341)

---
 keyboards/s_ol/0xc_pad/0xc_pad.h | 12 ------------
 keyboards/s_ol/0xc_pad/info.json | 27 +++++++++++++++------------
 2 files changed, 15 insertions(+), 24 deletions(-)

(limited to 'keyboards/s_ol')

diff --git a/keyboards/s_ol/0xc_pad/0xc_pad.h b/keyboards/s_ol/0xc_pad/0xc_pad.h
index 52c9c3adfd..013f4c89dc 100644
--- a/keyboards/s_ol/0xc_pad/0xc_pad.h
+++ b/keyboards/s_ol/0xc_pad/0xc_pad.h
@@ -17,18 +17,6 @@
 
 #include "quantum.h"
 
-#define LAYOUT(         \
-         k01, k05,      \
-       k02, k06, k10,   \
-    k03, k07, k11, k15, \
-       k08, k12, k16    \
-) { \
-    { k01,   k05, KC_NO, KC_NO }, \
-    { k02,   k06, k10,   KC_NO }, \
-    { k03,   k07, k11,   k15   }, \
-    { KC_NO, k08, k12,   k16   }  \
-}
-
 #define LED_LAYOUT(                                             \
                                                                 \
     k01, k05, k02, k06, k10, k03, k07, k11, k15, k08, k12, k16) \
diff --git a/keyboards/s_ol/0xc_pad/info.json b/keyboards/s_ol/0xc_pad/info.json
index decf0ae1cb..f1c47c4623 100644
--- a/keyboards/s_ol/0xc_pad/info.json
+++ b/keyboards/s_ol/0xc_pad/info.json
@@ -9,18 +9,21 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":0.5, "y":1},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":0.5, "y":3},
-                {"x":1.5, "y":3},
-                {"x":2.5, "y":3}
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.5, "y": 1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "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": [3, 1], "x": 0.5, "y": 3},
+                {"matrix": [3, 2], "x": 1.5, "y": 3},
+                {"matrix": [3, 3], "x": 2.5, "y": 3}
             ]
         }
     },
-- 
cgit v1.2.3