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

2 files changed, 69 insertions, 99 deletions

diff --git a/keyboards/handwired/freoduo/freoduo.h b/keyboards/handwired/freoduo/freoduo.h
deleted file mode 100644
index 3093a93627..0000000000
--- a/keyboards/handwired/freoduo/freoduo.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2021 Filip Paryż (@FilipParyz)
- *
- * 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 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, \
-	L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \
-	L40, L41, L42, L43, L44,           R41, R42, R43, R44, R45  \
-	) \
-	{ \
-		{ L00,   L01, L02, L03, L04, L05  }, \
-		{ L10,   L11, L12, L13, L14, L15  }, \
-		{ L20,   L21, L22, L23, L24, L25  }, \
-		{ L30,   L31, L32, L33, L34, L35  }, \
-		{ L40,   L41, L42, L43, L44, KC_NO}, \
-		{ R00,   R01, R02, R03, R04, R05  }, \
-		{ R10,   R11, R12, R13, R14, R15  }, \
-		{ R20,   R21, R22, R23, R24, R25  }, \
-		{ R30,   R31, R32, R33, R34, R35  }, \
-		{ KC_NO, R41, R42, R43, R44, R45  }  \
-	}
diff --git a/keyboards/handwired/freoduo/info.json b/keyboards/handwired/freoduo/info.json
index 90b34f29d4..5ddf21ee79 100644
--- a/keyboards/handwired/freoduo/info.json
+++ b/keyboards/handwired/freoduo/info.json
@@ -25,65 +25,74 @@
 "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},
-            {"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},
-            {"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},
-            {"x": 0, "y": 3},
-            {"x": 1, "y": 3},
-            {"x": 2, "y": 3},
-            {"x": 3, "y": 3},
-            {"x": 4, "y": 3},
-            {"x": 5, "y": 3},
-            {"x": 7, "y": 3},
-            {"x": 8, "y": 3},
-            {"x": 9, "y": 3},
-            {"x": 10, "y": 3},
-            {"x": 11, "y": 3},
-            {"x": 12, "y": 3},
-            {"x": 0, "y": 4},
-            {"x": 1, "y": 4},
-            {"x": 2, "y": 4},
-            {"x": 3, "y": 4},
-            {"x": 4, "y": 4, "w": 2},
-            {"x": 7, "y": 4, "w": 2},
-            {"x": 9, "y": 4},
-            {"x": 10, "y": 4},
-            {"x": 11, "y": 4},
-            {"x": 12, "y": 4}
-            ]
-	    }
+            {"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},
+
+            {"matrix": [5, 0], "x": 7, "y": 0},
+            {"matrix": [5, 1], "x": 8, "y": 0},
+            {"matrix": [5, 2], "x": 9, "y": 0},
+            {"matrix": [5, 3], "x": 10, "y": 0},
+            {"matrix": [5, 4], "x": 11, "y": 0},
+            {"matrix": [5, 5], "x": 12, "y": 0},
+
+            {"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": [6, 0], "x": 7, "y": 1},
+            {"matrix": [6, 1], "x": 8, "y": 1},
+            {"matrix": [6, 2], "x": 9, "y": 1},
+            {"matrix": [6, 3], "x": 10, "y": 1},
+            {"matrix": [6, 4], "x": 11, "y": 1},
+            {"matrix": [6, 5], "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": [7, 0], "x": 7, "y": 2},
+            {"matrix": [7, 1], "x": 8, "y": 2},
+            {"matrix": [7, 2], "x": 9, "y": 2},
+            {"matrix": [7, 3], "x": 10, "y": 2},
+            {"matrix": [7, 4], "x": 11, "y": 2},
+            {"matrix": [7, 5], "x": 12, "y": 2},
+
+            {"matrix": [3, 0], "x": 0, "y": 3},
+            {"matrix": [3, 1], "x": 1, "y": 3},
+            {"matrix": [3, 2], "x": 2, "y": 3},
+            {"matrix": [3, 3], "x": 3, "y": 3},
+            {"matrix": [3, 4], "x": 4, "y": 3},
+            {"matrix": [3, 5], "x": 5, "y": 3},
+
+            {"matrix": [8, 0], "x": 7, "y": 3},
+            {"matrix": [8, 1], "x": 8, "y": 3},
+            {"matrix": [8, 2], "x": 9, "y": 3},
+            {"matrix": [8, 3], "x": 10, "y": 3},
+            {"matrix": [8, 4], "x": 11, "y": 3},
+            {"matrix": [8, 5], "x": 12, "y": 3},
+
+            {"matrix": [4, 0], "x": 0, "y": 4},
+            {"matrix": [4, 1], "x": 1, "y": 4},
+            {"matrix": [4, 2], "x": 2, "y": 4},
+            {"matrix": [4, 3], "x": 3, "y": 4},
+            {"matrix": [4, 4], "x": 4, "y": 4, "w": 2},
+
+            {"matrix": [9, 1], "x": 7, "y": 4, "w": 2},
+            {"matrix": [9, 2], "x": 9, "y": 4},
+            {"matrix": [9, 3], "x": 10, "y": 4},
+            {"matrix": [9, 4], "x": 11, "y": 4},
+            {"matrix": [9, 5], "x": 12, "y": 4}
+        ]
     }
 }
+}