From 6847dba8af551aa0f1afbd74f77a8c49ad28e33b Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 5 Apr 2023 15:48:37 +1000
Subject: Move 75% and 96% layouts to data driven (#20289)

---
 keyboards/kbdfans/kbd75rgb/info.json  | 168 +++++++++++++++++-----------------
 keyboards/kbdfans/kbd75rgb/kbd75rgb.c |   2 +-
 keyboards/kbdfans/kbd75rgb/kbd75rgb.h |  34 -------
 3 files changed, 85 insertions(+), 119 deletions(-)
 delete mode 100644 keyboards/kbdfans/kbd75rgb/kbd75rgb.h

(limited to 'keyboards/kbdfans/kbd75rgb')

diff --git a/keyboards/kbdfans/kbd75rgb/info.json b/keyboards/kbdfans/kbd75rgb/info.json
index c462db3e85..385352f3d7 100644
--- a/keyboards/kbdfans/kbd75rgb/info.json
+++ b/keyboards/kbdfans/kbd75rgb/info.json
@@ -19,95 +19,95 @@
     "layouts": {
         "LAYOUT_75_ansi": {
             "layout": [
-                {"label": "Esc", "x":0, "y":0},
-                {"label": "F1", "x":1, "y":0},
-                {"label": "F2", "x":2, "y":0},
-                {"label": "F3", "x":3, "y":0},
-                {"label": "F4", "x":4, "y":0},
-                {"label": "F5", "x":5, "y":0},
-                {"label": "F6", "x":6, "y":0},
-                {"label": "F7", "x":7, "y":0},
-                {"label": "F8", "x":8, "y":0},
-                {"label": "F9", "x":9, "y":0},
-                {"label": "F10", "x":10, "y":0},
-                {"label": "F11", "x":11, "y":0},
-                {"label": "F12", "x":12, "y":0},
-                {"label": "PrintScr", "x":13, "y":0},
-                {"label": "Ins", "x":14, "y":0},
-                {"label": "Home", "x":15, "y":0},
+                {"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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [3, 12], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
 
-                {"label": "`~", "x":0, "y":1},
-                {"label": "1!", "x":1, "y":1},
-                {"label": "2@", "x":2, "y":1},
-                {"label": "3#", "x":3, "y":1},
-                {"label": "4$", "x":4, "y":1},
-                {"label": "5%", "x":5, "y":1},
-                {"label": "6^", "x":6, "y":1},
-                {"label": "7&", "x":7, "y":1},
-                {"label": "8*", "x":8, "y":1},
-                {"label": "9(", "x":9, "y":1},
-                {"label": "0)", "x":10, "y":1},
-                {"label": "-_", "x":11, "y":1},
-                {"label": "+=", "x":12, "y":1},
-                {"label": "Backspace", "x":13, "y":1, "w":2},
-                {"label": "End", "x":15, "y":1},
+                {"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": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 14], "x": 15, "y": 1},
 
-                {"label": "Tab", "x":0, "y":2, "w":1.5},
-                {"label": "Q", "x":1.5, "y":2},
-                {"label": "W", "x":2.5, "y":2},
-                {"label": "E", "x":3.5, "y":2},
-                {"label": "R", "x":4.5, "y":2},
-                {"label": "T", "x":5.5, "y":2},
-                {"label": "Y", "x":6.5, "y":2},
-                {"label": "U", "x":7.5, "y":2},
-                {"label": "I", "x":8.5, "y":2},
-                {"label": "O", "x":9.5, "y":2},
-                {"label": "P", "x":10.5, "y":2},
-                {"label": "[{", "x":11.5, "y":2},
-                {"label": "]}", "x":12.5, "y":2},
-                {"label": "\\|", "x":13.5, "y":2, "w":1.5},
-                {"label": "Pg Up", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"label": "Caps Lock", "x":0, "y":3, "w":1.75},
-                {"label": "A", "x":1.75, "y":3},
-                {"label": "S", "x":2.75, "y":3},
-                {"label": "D", "x":3.75, "y":3},
-                {"label": "F", "x":4.75, "y":3},
-                {"label": "G", "x":5.75, "y":3},
-                {"label": "H", "x":6.75, "y":3},
-                {"label": "J", "x":7.75, "y":3},
-                {"label": "K", "x":8.75, "y":3},
-                {"label": "L", "x":9.75, "y":3},
-                {"label": ";:", "x":10.75, "y":3},
-                {"label": "\"'", "x":11.75, "y":3},
-                {"label": "Enter", "x":12.75, "y":3, "w":2.25},
-                {"label": "Pg Dn", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"label": "Shift", "x":0, "y":4, "w":2.25},
-                {"label": "Z", "x":2.25, "y":4},
-                {"label": "X", "x":3.25, "y":4},
-                {"label": "C", "x":4.25, "y":4},
-                {"label": "V", "x":5.25, "y":4},
-                {"label": "B", "x":6.25, "y":4},
-                {"label": "N", "x":7.25, "y":4},
-                {"label": "M", "x":8.25, "y":4},
-                {"label": ",<", "x":9.25, "y":4},
-                {"label": ".>", "x":10.25, "y":4},
-                {"label": "/?", "x":11.25, "y":4},
-                {"label": "Shift", "x":12.25, "y":4, "w":1.75},
-                {"label": "Up", "x":14, "y":4},
-                {"label": "Del", "x":15, "y":4},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4},
+                {"matrix": [4, 2], "x": 3.25, "y": 4},
+                {"matrix": [4, 3], "x": 4.25, "y": 4},
+                {"matrix": [4, 4], "x": 5.25, "y": 4},
+                {"matrix": [4, 5], "x": 6.25, "y": 4},
+                {"matrix": [4, 6], "x": 7.25, "y": 4},
+                {"matrix": [4, 7], "x": 8.25, "y": 4},
+                {"matrix": [4, 8], "x": 9.25, "y": 4},
+                {"matrix": [4, 9], "x": 10.25, "y": 4},
+                {"matrix": [4, 10], "x": 11.25, "y": 4},
+                {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4},
 
-                {"label": "Ctrl", "x":0, "y":5, "w":1.25},
-                {"label": "GUI", "x":1.25, "y":5, "w":1.25},
-                {"label": "Alt", "x":2.5, "y":5, "w":1.25},
-                {"label": "Space", "x":3.75, "y":5, "w":6.25},
-                {"label": "Alt", "x":10, "y":5},
-                {"label": "GUI", "x":11, "y":5},
-                {"label": "Ctrl", "x":12, "y":5},
-                {"label": "Left", "x":13, "y":5},
-                {"label": "Down", "x":14, "y":5},
-                {"label": "Right", "x":15, "y":5}
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 8], "x": 10, "y": 5},
+                {"matrix": [5, 9], "x": 11, "y": 5},
+                {"matrix": [5, 10], "x": 12, "y": 5},
+                {"matrix": [5, 11], "x": 13, "y": 5},
+                {"matrix": [5, 13], "x": 14, "y": 5},
+                {"matrix": [5, 14], "x": 15, "y": 5}
             ]
         }
     }
diff --git a/keyboards/kbdfans/kbd75rgb/kbd75rgb.c b/keyboards/kbdfans/kbd75rgb/kbd75rgb.c
index cd0f656974..8e39dad6d2 100644
--- a/keyboards/kbdfans/kbd75rgb/kbd75rgb.c
+++ b/keyboards/kbdfans/kbd75rgb/kbd75rgb.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "kbd75rgb.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/kbdfans/kbd75rgb/kbd75rgb.h b/keyboards/kbdfans/kbd75rgb/kbd75rgb.h
deleted file mode 100644
index 88ff6ef9f6..0000000000
--- a/keyboards/kbdfans/kbd75rgb/kbd75rgb.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2021 DZTECH <moyi4681@Live.cn>
- *
- * 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
-#define XXX KC_NO
-#include "quantum.h"
-#define LAYOUT_75_ansi( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K312, 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, K403, K404, K405, K406, K407, K408, K409, K410, K411,       K413, K414, \
-	K500, K501, K502,             K505,             K508, K509, K510, K511,       K513, K514  \
-) { \
-	{ 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,  K312,  K313,  K314 }, \
-	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  KC_NO, K413,  K414 }, \
-	{ K500,  K501,  K502,  KC_NO, KC_NO, K505,  KC_NO, KC_NO, K508,  K509,  K510,  K511,  KC_NO, K513,  K514 }  \
-}
-- 
cgit v1.2.3