Move `default` layouts to data driven (#20349)

3 files changed, 123 insertions, 159 deletions

diff --git a/keyboards/kv/revt/info.json b/keyboards/kv/revt/info.json
index 7103728056..7697f2acbc 100644
--- a/keyboards/kv/revt/info.json
+++ b/keyboards/kv/revt/info.json
@@ -19,128 +19,128 @@
     "layouts": {
         "LAYOUT_default": {
             "layout": [
-                {"x": 4.25, "y": 0},
-
-                {"x": 6.25, "y": 0},
-                {"x": 7.25, "y": 0},
-                {"x": 8.25, "y": 0},
-                {"x": 9.25, "y": 0},
-
-                {"x": 10.75, "y": 0},
-                {"x": 11.75, "y": 0},
-                {"x": 12.75, "y": 0},
-                {"x": 13.75, "y": 0},
-
-                {"x": 15.25, "y": 0},
-                {"x": 16.25, "y": 0},
-                {"x": 17.25, "y": 0},
-                {"x": 18.25, "y": 0},
-
-                {"x": 19.5, "y": 0},
-                {"x": 20.5, "y": 0},
-                {"x": 21.5, "y": 0},
-
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-
-                {"x": 4.25, "y": 1},
-                {"x": 5.25, "y": 1},
-                {"x": 6.25, "y": 1},
-                {"x": 7.25, "y": 1},
-                {"x": 8.25, "y": 1},
-                {"x": 9.25, "y": 1},
-                {"x": 10.25, "y": 1},
-                {"x": 11.25, "y": 1},
-                {"x": 12.25, "y": 1},
-                {"x": 13.25, "y": 1},
-                {"x": 14.25, "y": 1},
-                {"x": 15.25, "y": 1},
-                {"x": 16.25, "y": 1},
-                {"x": 17.25, "y": 1, "w": 2},
-
-                {"x": 19.5, "y": 1},
-                {"x": 20.5, "y": 1},
-                {"x": 21.5, "y": 1},
-
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2, "h": 2},
-
-                {"x": 4.25, "y": 2, "w": 1.5},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 2},
-                {"x": 14.75, "y": 2},
-                {"x": 15.75, "y": 2},
-                {"x": 16.75, "y": 2},
-                {"x": 17.75, "y": 2, "w": 1.5},
-
-                {"x": 19.5, "y": 2},
-                {"x": 20.5, "y": 2},
-                {"x": 21.5, "y": 2},
-
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-
-                {"x": 4.25, "y": 3, "w": 1.75},
-                {"x": 6, "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": 13, "y": 3},
-                {"x": 14, "y": 3},
-                {"x": 15, "y": 3},
-                {"x": 16, "y": 3},
-                {"x": 17, "y": 3, "w": 2.25},
-
-                {"x": 0, "y": 4},
-                {"x": 1, "y": 4},
-                {"x": 2, "y": 4},
-                {"x": 3, "y": 4, "h": 2},
-
-                {"x": 4.25, "y": 4, "w": 2.25},
-                {"x": 6.5, "y": 4},
-                {"x": 7.5, "y": 4},
-                {"x": 8.5, "y": 4},
-                {"x": 9.5, "y": 4},
-                {"x": 10.5, "y": 4},
-                {"x": 11.5, "y": 4},
-                {"x": 12.5, "y": 4},
-                {"x": 13.5, "y": 4},
-                {"x": 14.5, "y": 4},
-                {"x": 15.5, "y": 4},
-                {"x": 16.5, "y": 4, "w": 2.75},
-
-                {"x": 20.5, "y": 4},
-
-                {"x": 0, "y": 5, "w": 2},
-                {"x": 2, "y": 5},
-
-                {"x": 4.25, "y": 5, "w": 1.25},
-                {"x": 5.5, "y": 5, "w": 1.25},
-                {"x": 6.75, "y": 5, "w": 1.25},
-                {"x": 8, "y": 5, "w": 6.25},
-                {"x": 14.25, "y": 5, "w": 1.25},
-                {"x": 15.5, "y": 5, "w": 1.25},
-                {"x": 16.75, "y": 5, "w": 1.25},
-                {"x": 18, "y": 5, "w": 1.25},
-
-                {"x": 19.5, "y": 5},
-                {"x": 20.5, "y": 5},
-                {"x": 21.5, "y": 5}
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [0, 9], "x": 9.25, "y": 0},
+
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+                {"matrix": [0, 13], "x": 13.75, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+                {"matrix": [0, 17], "x": 18.25, "y": 0},
+
+                {"matrix": [0, 18], "x": 19.5, "y": 0},
+                {"matrix": [0, 19], "x": 20.5, "y": 0},
+                {"matrix": [0, 20], "x": 21.5, "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.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1},
+                {"matrix": [1, 12], "x": 12.25, "y": 1},
+                {"matrix": [1, 13], "x": 13.25, "y": 1},
+                {"matrix": [1, 14], "x": 14.25, "y": 1},
+                {"matrix": [1, 15], "x": 15.25, "y": 1},
+                {"matrix": [1, 16], "x": 16.25, "y": 1},
+                {"matrix": [1, 17], "x": 17.25, "y": 1, "w": 2},
+
+                {"matrix": [1, 18], "x": 19.5, "y": 1},
+                {"matrix": [1, 19], "x": 20.5, "y": 1},
+                {"matrix": [1, 20], "x": 21.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, "h": 2},
+
+                {"matrix": [2, 4], "x": 4.25, "y": 2, "w": 1.5},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2},
+                {"matrix": [2, 14], "x": 14.75, "y": 2},
+                {"matrix": [2, 15], "x": 15.75, "y": 2},
+                {"matrix": [2, 16], "x": 16.75, "y": 2},
+                {"matrix": [2, 17], "x": 17.75, "y": 2, "w": 1.5},
+
+                {"matrix": [2, 18], "x": 19.5, "y": 2},
+                {"matrix": [2, 19], "x": 20.5, "y": 2},
+                {"matrix": [2, 20], "x": 21.5, "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, 4], "x": 4.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 5], "x": 6, "y": 3},
+                {"matrix": [3, 6], "x": 7, "y": 3},
+                {"matrix": [3, 7], "x": 8, "y": 3},
+                {"matrix": [3, 8], "x": 9, "y": 3},
+                {"matrix": [3, 9], "x": 10, "y": 3},
+                {"matrix": [3, 10], "x": 11, "y": 3},
+                {"matrix": [3, 11], "x": 12, "y": 3},
+                {"matrix": [3, 12], "x": 13, "y": 3},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [3, 15], "x": 16, "y": 3},
+                {"matrix": [3, 17], "x": 17, "y": 3, "w": 2.25},
+
+                {"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, "h": 2},
+
+                {"matrix": [4, 4], "x": 4.25, "y": 4, "w": 2.25},
+                {"matrix": [4, 5], "x": 6.5, "y": 4},
+                {"matrix": [4, 6], "x": 7.5, "y": 4},
+                {"matrix": [4, 7], "x": 8.5, "y": 4},
+                {"matrix": [4, 8], "x": 9.5, "y": 4},
+                {"matrix": [4, 9], "x": 10.5, "y": 4},
+                {"matrix": [4, 10], "x": 11.5, "y": 4},
+                {"matrix": [4, 11], "x": 12.5, "y": 4},
+                {"matrix": [4, 12], "x": 13.5, "y": 4},
+                {"matrix": [4, 13], "x": 14.5, "y": 4},
+                {"matrix": [4, 14], "x": 15.5, "y": 4},
+                {"matrix": [4, 17], "x": 16.5, "y": 4, "w": 2.75},
+
+                {"matrix": [4, 19], "x": 20.5, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5},
+
+                {"matrix": [5, 4], "x": 4.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 5], "x": 5.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 6.75, "y": 5, "w": 1.25},
+                {"matrix": [5, 9], "x": 8, "y": 5, "w": 6.25},
+                {"matrix": [5, 14], "x": 14.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 15], "x": 15.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 16], "x": 16.75, "y": 5, "w": 1.25},
+                {"matrix": [5, 17], "x": 18, "y": 5, "w": 1.25},
+
+                {"matrix": [5, 18], "x": 19.5, "y": 5},
+                {"matrix": [5, 19], "x": 20.5, "y": 5},
+                {"matrix": [5, 20], "x": 21.5, "y": 5}
             ]
         }
     }
diff --git a/keyboards/kv/revt/revt.c b/keyboards/kv/revt/revt.c
index 443a814015..fba4582c26 100644
--- a/keyboards/kv/revt/revt.c
+++ b/keyboards/kv/revt/revt.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "revt.h"
+#include "quantum.h"
 
 void matrix_init_kb(void) {
   // Turn status LED on
diff --git a/keyboards/kv/revt/revt.h b/keyboards/kv/revt/revt.h
deleted file mode 100644
index ed98f4aabe..0000000000
--- a/keyboards/kv/revt/revt.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2020 Hybrid65
- *
- * 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_default( \
-                        K04,      K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H,   K0I, K0J, K0K, \
-  K10, K11, K12, K13,   K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H,   K1I, K1J, K1K, \
-  K20, K21, K22, K23,   K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H,   K2I, K2J, K2K, \
-  K30, K31, K32,        K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F,      K3H,                  \
-  K40, K41, K42, K43,   K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E,           K4H,        K4J,      \
-  K50,      K52,        K54, K55, K56,           K59,                     K5E, K5F, K5G, K5H,   K5I, K5J, K5K  \
-) \
-{ \
-  { KC_NO, KC_NO, KC_NO, KC_NO,  K04, KC_NO, K06, K07,   K08,   K09, K0A,   K0B,   K0C,   K0D,   K0E, K0F,   K0G,   K0H,     K0I,   K0J,   K0K,   }, \
-  { K10, K11,   K12, K13,        K14, K15,   K16, K17,   K18,   K19, K1A,   K1B,   K1C,   K1D,   K1E, K1F,   K1G,   K1H,     K1I,   K1J,   K1K,   }, \
-  { K20, K21,   K22, K23,        K24, K25,   K26, K27,   K28,   K29, K2A,   K2B,   K2C,   K2D,   K2E, K2F,   K2G,   K2H,     K2I,   K2J,   K2K,   }, \
-  { K30, K31,   K32, KC_NO,      K34, K35,   K36, K37,   K38,   K39, K3A,   K3B,   K3C,   K3D,   K3E, K3F,   KC_NO, K3H,     KC_NO, KC_NO, KC_NO, }, \
-  { K40, K41,   K42, K43,        K44, K45,   K46, K47,   K48,   K49, K4A,   K4B,   K4C,   K4D,   K4E, KC_NO, KC_NO, K4H,     KC_NO, K4J,   KC_NO, }, \
-  { K50, KC_NO, K52, KC_NO,      K54, K55,   K56, KC_NO, KC_NO, K59, KC_NO, KC_NO, KC_NO, KC_NO, K5E, K5F,   K5G,   K5H,     K5I,   K5J,   K5K    }, \
-}