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

2 files changed, 44 insertions, 75 deletions

diff --git a/keyboards/handwired/pteron44/info.json b/keyboards/handwired/pteron44/info.json
index 3f89bef561..da32096bf1 100644
--- a/keyboards/handwired/pteron44/info.json
+++ b/keyboards/handwired/pteron44/info.json
@@ -18,57 +18,57 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"x":0, "y":0.75},
-        {"x":1, "y":0.75},
-        {"x":2, "y":0.25},
-        {"x":3, "y":0},
-        {"x":4, "y":0.35},
-        {"x":5, "y":0.45},
+        {"matrix": [0, 0], "x": 0, "y": 0.75},
+        {"matrix": [0, 1], "x": 1, "y": 0.75},
+        {"matrix": [0, 2], "x": 2, "y": 0.25},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0.35},
+        {"matrix": [0, 5], "x": 5, "y": 0.45},
 
-        {"x":11, "y":0.45},
-        {"x":12, "y":0.35},
-        {"x":13, "y":0},
-        {"x":14, "y":0.25},
-        {"x":15, "y":0.75},
-        {"x":16, "y":0.75},
+        {"matrix": [0, 6], "x": 11, "y": 0.45},
+        {"matrix": [0, 7], "x": 12, "y": 0.35},
+        {"matrix": [0, 8], "x": 13, "y": 0},
+        {"matrix": [0, 9], "x": 14, "y": 0.25},
+        {"matrix": [0, 10], "x": 15, "y": 0.75},
+        {"matrix": [0, 11], "x": 16, "y": 0.75},
 
-        {"x":0, "y":1.75},
-        {"x":1, "y":1.75},
-        {"x":2, "y":1.25},
-        {"x":3, "y":1},
-        {"x":4, "y":1.35},
-        {"x":5, "y":1.45},
+        {"matrix": [1, 0], "x": 0, "y": 1.75},
+        {"matrix": [1, 1], "x": 1, "y": 1.75},
+        {"matrix": [1, 2], "x": 2, "y": 1.25},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1.35},
+        {"matrix": [1, 5], "x": 5, "y": 1.45},
 
-        {"x":11, "y":1.45},
-        {"x":12, "y":1.35},
-        {"x":13, "y":1},
-        {"x":14, "y":1.25},
-        {"x":15, "y":1.75},
-        {"x":16, "y":1.75},
+        {"matrix": [1, 6], "x": 11, "y": 1.45},
+        {"matrix": [1, 7], "x": 12, "y": 1.35},
+        {"matrix": [1, 8], "x": 13, "y": 1},
+        {"matrix": [1, 9], "x": 14, "y": 1.25},
+        {"matrix": [1, 10], "x": 15, "y": 1.75},
+        {"matrix": [1, 11], "x": 16, "y": 1.75},
 
-        {"x":0, "y":2.75},
-        {"x":1, "y":2.75},
-        {"x":2, "y":2.25},
-        {"x":3, "y":2},
-        {"x":4, "y":2.35},
-        {"x":5, "y":2.45},
+        {"matrix": [2, 0], "x": 0, "y": 2.75},
+        {"matrix": [2, 1], "x": 1, "y": 2.75},
+        {"matrix": [2, 2], "x": 2, "y": 2.25},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2.35},
+        {"matrix": [2, 5], "x": 5, "y": 2.45},
 
-        {"x":11, "y":2.45},
-        {"x":12, "y":2.35},
-        {"x":13, "y":2},
-        {"x":14, "y":2.25},
-        {"x":15, "y":2.75},
-        {"x":16, "y":2.75},
+        {"matrix": [2, 6], "x": 11, "y": 2.45},
+        {"matrix": [2, 7], "x": 12, "y": 2.35},
+        {"matrix": [2, 8], "x": 13, "y": 2},
+        {"matrix": [2, 9], "x": 14, "y": 2.25},
+        {"matrix": [2, 10], "x": 15, "y": 2.75},
+        {"matrix": [2, 11], "x": 16, "y": 2.75},
 
-        {"x":4, "y":3.35},
-        {"x":5, "y":3.45},
-        {"x":6, "y":3.65},
-        {"x":7, "y":3.95},
+        {"matrix": [3, 2], "x": 4, "y": 3.35},
+        {"matrix": [3, 3], "x": 5, "y": 3.45},
+        {"matrix": [3, 4], "x": 6, "y": 3.65},
+        {"matrix": [3, 5], "x": 7, "y": 3.95},
 
-        {"x":9, "y":3.95},
-        {"x":10, "y":3.65},
-        {"x":11, "y":3.45},
-        {"x":12, "y":3.35}
+        {"matrix": [3, 6], "x": 9, "y": 3.95},
+        {"matrix": [3, 7], "x": 10, "y": 3.65},
+        {"matrix": [3, 8], "x": 11, "y": 3.45},
+        {"matrix": [3, 9], "x": 12, "y": 3.35}
       ]
     }
   }
diff --git a/keyboards/handwired/pteron44/pteron44.h b/keyboards/handwired/pteron44/pteron44.h
deleted file mode 100644
index 9718223313..0000000000
--- a/keyboards/handwired/pteron44/pteron44.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2020 Fidel Coria
- *
- * 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( \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, \
-	            K402, K403, K404, K405, K406, K407, K408, K409  \
-) { \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211 }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311 }, \
-	{ KC_NO, KC_NO, K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  KC_NO, KC_NO }  \
-}