Migrate some more layouts to data driven (#19889)

3 files changed, 135 insertions, 212 deletions

diff --git a/keyboards/mwstudio/mw65_black/info.json b/keyboards/mwstudio/mw65_black/info.json
index 9030c897f6..030936eaef 100644
--- a/keyboards/mwstudio/mw65_black/info.json
+++ b/keyboards/mwstudio/mw65_black/info.json
@@ -16,153 +16,153 @@
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"label":"ESC", "x":0, "y":0},
-                {"label":"1", "x":1, "y":0},
-                {"label":"2", "x":2, "y":0},
-                {"label":"3", "x":3, "y":0},
-                {"label":"4", "x":4, "y":0},
-                {"label":"5", "x":5, "y":0},
-                {"label":"6", "x":6, "y":0},
-                {"label":"7", "x":7, "y":0},
-                {"label":"8", "x":8, "y":0},
-                {"label":"9", "x":9, "y":0},
-                {"label":"0", "x":10, "y":0},
-                {"label":"-", "x":11, "y":0},
-                {"label":"=", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Delete", "x":15, "y":0},
+                {"x":0, "y":0, "matrix": [0, 0]},
+                {"x":1, "y":0, "matrix": [0, 1]},
+                {"x":2, "y":0, "matrix": [0, 2]},
+                {"x":3, "y":0, "matrix": [0, 3]},
+                {"x":4, "y":0, "matrix": [0, 4]},
+                {"x":5, "y":0, "matrix": [0, 5]},
+                {"x":6, "y":0, "matrix": [0, 6]},
+                {"x":7, "y":0, "matrix": [0, 7]},
+                {"x":8, "y":0, "matrix": [0, 8]},
+                {"x":9, "y":0, "matrix": [0, 9]},
+                {"x":10, "y":0, "matrix": [0, 10]},
+                {"x":11, "y":0, "matrix": [0, 11]},
+                {"x":12, "y":0, "matrix": [0, 12]},
+                {"x":13, "y":0, "w":2, "matrix": [0, 13]},
+                {"x":15, "y":0, "matrix": [0, 14]},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[", "x":11.5, "y":1},
-                {"label":"]", "x":12.5, "y":1},
-                {"label":"\\", "x":13.5, "y":1, "w":1.5},
-                {"label":"PgUp", "x":15, "y":1},
+                {"x":0, "y":1, "w":1.5, "matrix": [1, 0]},
+                {"x":1.5, "y":1, "matrix": [1, 1]},
+                {"x":2.5, "y":1, "matrix": [1, 2]},
+                {"x":3.5, "y":1, "matrix": [1, 3]},
+                {"x":4.5, "y":1, "matrix": [1, 4]},
+                {"x":5.5, "y":1, "matrix": [1, 5]},
+                {"x":6.5, "y":1, "matrix": [1, 6]},
+                {"x":7.5, "y":1, "matrix": [1, 7]},
+                {"x":8.5, "y":1, "matrix": [1, 8]},
+                {"x":9.5, "y":1, "matrix": [1, 9]},
+                {"x":10.5, "y":1, "matrix": [1, 10]},
+                {"x":11.5, "y":1, "matrix": [1, 11]},
+                {"x":12.5, "y":1, "matrix": [1, 12]},
+                {"x":13.5, "y":1, "w":1.5, "matrix": [1, 13]},
+                {"x":15, "y":1, "matrix": [1, 14]},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";", "x":10.75, "y":2},
-                {"label":"'", "x":11.75, "y":2},
-                {"label":"\\", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":2, "w":1.25},
-                {"label":"PgDn", "x":15, "y":2},
+                {"x":0, "y":2, "w":1.75, "matrix": [2, 0]},
+                {"x":1.75, "y":2, "matrix": [2, 1]},
+                {"x":2.75, "y":2, "matrix": [2, 2]},
+                {"x":3.75, "y":2, "matrix": [2, 3]},
+                {"x":4.75, "y":2, "matrix": [2, 4]},
+                {"x":5.75, "y":2, "matrix": [2, 5]},
+                {"x":6.75, "y":2, "matrix": [2, 6]},
+                {"x":7.75, "y":2, "matrix": [2, 7]},
+                {"x":8.75, "y":2, "matrix": [2, 8]},
+                {"x":9.75, "y":2, "matrix": [2, 9]},
+                {"x":10.75, "y":2, "matrix": [2, 10]},
+                {"x":11.75, "y":2, "matrix": [2, 11]},
+                {"x":12.75, "y":2, "matrix": [2, 12]},
+                {"x":13.75, "y":2, "w":1.25, "matrix": [2, 13]},
+                {"x":15, "y":2, "matrix": [2, 14]},
 
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",", "x":9.25, "y":3},
-                {"label":".", "x":10.25, "y":3},
-                {"label":"/", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"End", "x":15, "y":3},
+                {"x":0, "y":3, "w":2.25, "matrix": [3, 0]},
+                {"x":2.25, "y":3, "matrix": [3, 1]},
+                {"x":3.25, "y":3, "matrix": [3, 2]},
+                {"x":4.25, "y":3, "matrix": [3, 3]},
+                {"x":5.25, "y":3, "matrix": [3, 4]},
+                {"x":6.25, "y":3, "matrix": [3, 5]},
+                {"x":7.25, "y":3, "matrix": [3, 6]},
+                {"x":8.25, "y":3, "matrix": [3, 7]},
+                {"x":9.25, "y":3, "matrix": [3, 8]},
+                {"x":10.25, "y":3, "matrix": [3, 9]},
+                {"x":11.25, "y":3, "matrix": [3, 10]},
+                {"x":12.25, "y":3, "w":1.75, "matrix": [3, 11]},
+                {"x":14, "y":3, "matrix": [3, 13]},
+                {"x":15, "y":3, "matrix": [3, 14]},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"x":0, "y":4, "w":1.25, "matrix": [4, 0]},
+                {"x":1.25, "y":4, "w":1.25, "matrix": [4, 1]},
+                {"x":2.5, "y":4, "w":1.25, "matrix": [4, 2]},
+                {"x":3.75, "y":4, "w":6.25, "matrix": [4, 5]},
+                {"x":10, "y":4, "w":1.25, "matrix": [4, 9]},
+                {"x":11.25, "y":4, "w":1.25, "matrix": [4, 10]},
+                {"x":13, "y":4, "matrix": [4, 12]},
+                {"x":14, "y":4, "matrix": [4, 13]},
+                {"x":15, "y":4, "matrix": [4, 14]}
             ]
         },
         "LAYOUT_65_ansi_blocker_tsangan": {
             "layout": [
-                {"label":"ESC", "x":0, "y":0},
-                {"label":"1", "x":1, "y":0},
-                {"label":"2", "x":2, "y":0},
-                {"label":"3", "x":3, "y":0},
-                {"label":"4", "x":4, "y":0},
-                {"label":"5", "x":5, "y":0},
-                {"label":"6", "x":6, "y":0},
-                {"label":"7", "x":7, "y":0},
-                {"label":"8", "x":8, "y":0},
-                {"label":"9", "x":9, "y":0},
-                {"label":"0", "x":10, "y":0},
-                {"label":"-", "x":11, "y":0},
-                {"label":"=", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Delete", "x":15, "y":0},
+                {"x":0, "y":0, "matrix": [0, 0]},
+                {"x":1, "y":0, "matrix": [0, 1]},
+                {"x":2, "y":0, "matrix": [0, 2]},
+                {"x":3, "y":0, "matrix": [0, 3]},
+                {"x":4, "y":0, "matrix": [0, 4]},
+                {"x":5, "y":0, "matrix": [0, 5]},
+                {"x":6, "y":0, "matrix": [0, 6]},
+                {"x":7, "y":0, "matrix": [0, 7]},
+                {"x":8, "y":0, "matrix": [0, 8]},
+                {"x":9, "y":0, "matrix": [0, 9]},
+                {"x":10, "y":0, "matrix": [0, 10]},
+                {"x":11, "y":0, "matrix": [0, 11]},
+                {"x":12, "y":0, "matrix": [0, 12]},
+                {"x":13, "y":0, "w":2, "matrix": [0, 13]},
+                {"x":15, "y":0, "matrix": [0, 14]},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[", "x":11.5, "y":1},
-                {"label":"]", "x":12.5, "y":1},
-                {"label":"\\", "x":13.5, "y":1, "w":1.5},
-                {"label":"PgUp", "x":15, "y":1},
+                {"x":0, "y":1, "w":1.5, "matrix": [1, 0]},
+                {"x":1.5, "y":1, "matrix": [1, 1]},
+                {"x":2.5, "y":1, "matrix": [1, 2]},
+                {"x":3.5, "y":1, "matrix": [1, 3]},
+                {"x":4.5, "y":1, "matrix": [1, 4]},
+                {"x":5.5, "y":1, "matrix": [1, 5]},
+                {"x":6.5, "y":1, "matrix": [1, 6]},
+                {"x":7.5, "y":1, "matrix": [1, 7]},
+                {"x":8.5, "y":1, "matrix": [1, 8]},
+                {"x":9.5, "y":1, "matrix": [1, 9]},
+                {"x":10.5, "y":1, "matrix": [1, 10]},
+                {"x":11.5, "y":1, "matrix": [1, 11]},
+                {"x":12.5, "y":1, "matrix": [1, 12]},
+                {"x":13.5, "y":1, "w":1.5, "matrix": [1, 13]},
+                {"x":15, "y":1, "matrix": [1, 14]},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";", "x":10.75, "y":2},
-                {"label":"'", "x":11.75, "y":2},
-                {"label":"\\", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":2, "w":1.25},
-                {"label":"PgDn", "x":15, "y":2},
+                {"x":0, "y":2, "w":1.75, "matrix": [2, 0]},
+                {"x":1.75, "y":2, "matrix": [2, 1]},
+                {"x":2.75, "y":2, "matrix": [2, 2]},
+                {"x":3.75, "y":2, "matrix": [2, 3]},
+                {"x":4.75, "y":2, "matrix": [2, 4]},
+                {"x":5.75, "y":2, "matrix": [2, 5]},
+                {"x":6.75, "y":2, "matrix": [2, 6]},
+                {"x":7.75, "y":2, "matrix": [2, 7]},
+                {"x":8.75, "y":2, "matrix": [2, 8]},
+                {"x":9.75, "y":2, "matrix": [2, 9]},
+                {"x":10.75, "y":2, "matrix": [2, 10]},
+                {"x":11.75, "y":2, "matrix": [2, 11]},
+                {"x":12.75, "y":2, "matrix": [2, 12]},
+                {"x":13.75, "y":2, "w":1.25, "matrix": [2, 13]},
+                {"x":15, "y":2, "matrix": [2, 14]},
 
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",", "x":9.25, "y":3},
-                {"label":".", "x":10.25, "y":3},
-                {"label":"/", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"End", "x":15, "y":3},
+                {"x":0, "y":3, "w":2.25, "matrix": [3, 0]},
+                {"x":2.25, "y":3, "matrix": [3, 1]},
+                {"x":3.25, "y":3, "matrix": [3, 2]},
+                {"x":4.25, "y":3, "matrix": [3, 3]},
+                {"x":5.25, "y":3, "matrix": [3, 4]},
+                {"x":6.25, "y":3, "matrix": [3, 5]},
+                {"x":7.25, "y":3, "matrix": [3, 6]},
+                {"x":8.25, "y":3, "matrix": [3, 7]},
+                {"x":9.25, "y":3, "matrix": [3, 8]},
+                {"x":10.25, "y":3, "matrix": [3, 9]},
+                {"x":11.25, "y":3, "matrix": [3, 10]},
+                {"x":12.25, "y":3, "w":1.75, "matrix": [3, 11]},
+                {"x":14, "y":3, "matrix": [3, 13]},
+                {"x":15, "y":3, "matrix": [3, 14]},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"Win", "x":1.5, "y":4},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
-                {"x":4, "y":4, "w":7},
-                {"label":"Fn", "x":11, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"x":0, "y":4, "w":1.5, "matrix": [4, 0]},
+                {"x":1.5, "y":4, "matrix": [4, 1]},
+                {"x":2.5, "y":4, "w":1.5, "matrix": [4, 2]},
+                {"x":4, "y":4, "w":7, "matrix": [4, 5]},
+                {"x":11, "y":4, "w":1.5, "matrix": [4, 10]},
+                {"x":13, "y":4, "matrix": [4, 12]},
+                {"x":14, "y":4, "matrix": [4, 13]},
+                {"x":15, "y":4, "matrix": [4, 14]}
             ]
         }
     }
diff --git a/keyboards/mwstudio/mw65_black/mw65_black.c b/keyboards/mwstudio/mw65_black/mw65_black.c
deleted file mode 100644
index e215abb804..0000000000
--- a/keyboards/mwstudio/mw65_black/mw65_black.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 TW59420 <https://github.com/TW59420>
- *
- * 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 "mw65_black.h"
diff --git a/keyboards/mwstudio/mw65_black/mw65_black.h b/keyboards/mwstudio/mw65_black/mw65_black.h
deleted file mode 100644
index 56c69be229..0000000000
--- a/keyboards/mwstudio/mw65_black/mw65_black.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Copyright 2021 TW59420 <https://github.com/TW59420>
- *
- * 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 "quantum.h"
-
-/*                                                           (403┬404) rotary encoder
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬─┴─┐
- * │000│001│002│003│004│005│006│007│008│009│010│011│012│013    │014│
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤      ┌─────┐
- * │100  │101│102│103│104│105│106│107│108│109│110│111│112│113  │114│      │     │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴┐213 │ ISO Enter
- * │200   │201│202│203│204│205│206│207│208│209│210│211│213     │214│   │212│    │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   └───┴────┘
- * │300     │301│302│303│304│305│306│307│308│309│310│311   │313│314│
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │400 │401 │402 │405                     │409 │410 │ │412│413│414│
- * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- * ┌─────┬───┬─────┬───────────────────────────┬─────┐
- * │400  │401│402  │405                        │410  │ Tsangan
- * └─────┴───┴─────┴───────────────────────────┴─────┘
- */
-
-#define LAYOUT_65_ansi_blocker( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, \
-	K400, K401, K402,             K405,                   K409, K410,       K412, K413, K414  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014  }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114  }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214  }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K313,  K314,  KC_NO }, \
-	{ K400,  K401,  K402,  K405,  K409,  K410,  K412,  K413,  K414,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }  \
-}
-
-#define LAYOUT_65_ansi_blocker_tsangan( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, \
-	K400, K401, K402,             K405,                         K410,       K412, K413, K414  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014  }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114  }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214  }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K313,  K314,  KC_NO }, \
-	{ K400,  K401,  K402,  K405,  ____,  K410,  K412,  K413,  K414,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }  \
-}