Move layouts for direct_pins boards to data driven (#19872)

5 files changed, 8 insertions, 79 deletions

diff --git a/keyboards/nullbitsco/scramble/info.json b/keyboards/nullbitsco/scramble/info.json
index 216d83e49e..32bb6f299e 100644
--- a/keyboards/nullbitsco/scramble/info.json
+++ b/keyboards/nullbitsco/scramble/info.json
@@ -12,31 +12,12 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {
-                    "label": "n",
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "x": 1,
-                    "y": 0
-                },
-                {
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "x": 0,
-                    "y": 1
-                },
-                {
-                    "x": 1,
-                    "y": 1
-                },
-                {
-                    "x": 2,
-                    "y": 1
-                }
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]}
             ]
         }
     }
diff --git a/keyboards/nullbitsco/scramble/scramble.c b/keyboards/nullbitsco/scramble/scramble.c
deleted file mode 100644
index c8a55e0d48..0000000000
--- a/keyboards/nullbitsco/scramble/scramble.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2021 Jay Greco
-
-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/>.
-*/
-
-#include QMK_KEYBOARD_H
diff --git a/keyboards/nullbitsco/scramble/scramble.h b/keyboards/nullbitsco/scramble/scramble.h
deleted file mode 100644
index 22c112040b..0000000000
--- a/keyboards/nullbitsco/scramble/scramble.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2021 Jay Greco
- *
- * 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"
-
-#if defined(KEYBOARD_nullbitsco_scramble_v1)
-  #include "v1.h"
-#elif defined(KEYBOARD_nullbitsco_scramble_v2)
-  #include "v2.h"
-#endif
-
-// Layout is the same in all revisions
-#define LAYOUT( \
-    K01, K02, K03, \
-    K11, K12, K13  \
-) { \
-   {K01, K02, K03}, \
-   {K11, K12, K13}, \
-}
diff --git a/keyboards/nullbitsco/scramble/v1/v1.h b/keyboards/nullbitsco/scramble/v1/v1.h
index 5dc6d4a0e8..5c0b62357f 100644
--- a/keyboards/nullbitsco/scramble/v1/v1.h
+++ b/keyboards/nullbitsco/scramble/v1/v1.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "scramble.h"
+#include "quantum.h"
 
 // Indication LED settings
 #define LED_ON          2
diff --git a/keyboards/nullbitsco/scramble/v2/v2.h b/keyboards/nullbitsco/scramble/v2/v2.h
index d278c0a86a..c86282f658 100644
--- a/keyboards/nullbitsco/scramble/v2/v2.h
+++ b/keyboards/nullbitsco/scramble/v2/v2.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "scramble.h"
+#include "quantum.h"
 #include <hal.h>
 
 enum led_mode {