Migrate some more layouts to data driven (#19889)

3 files changed, 85 insertions, 134 deletions

diff --git a/keyboards/jolofsor/denial75/denial75.c b/keyboards/jolofsor/denial75/denial75.c
deleted file mode 100644
index 6b35a6b0d7..0000000000
--- a/keyboards/jolofsor/denial75/denial75.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Johannes Paolo Soriano (https://github.com/jolofsor)
- *
- * 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 "denial75.h"
diff --git a/keyboards/jolofsor/denial75/denial75.h b/keyboards/jolofsor/denial75/denial75.h
deleted file mode 100644
index b85f0540b8..0000000000
--- a/keyboards/jolofsor/denial75/denial75.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 Johannes Paolo Soriano (https://github.com/jolofsor)
- *
- * 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"
-
-#define LAYOUT_denial75_ansi( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015,  \
-	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,  \
-	      K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410,       K411, K412, K413,  \
-	K500, K501,       K502,             K503,                   K504, K505, K506, K507, K508, K509   \
-)       { \
-	{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015 }, \
-	{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO,K113, K114 }, \
-	{ K200, KC_NO,K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \
-	{ K300, KC_NO,K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, KC_NO,K313 }, \
-	{ KC_NO,K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, KC_NO,K411, K412, K413 }, \
-	{ K500, K501, KC_NO,K502, KC_NO,KC_NO,K503, KC_NO,KC_NO,KC_NO,K504, K505, K506, K507, K508, K509 }  \
-}
diff --git a/keyboards/jolofsor/denial75/info.json b/keyboards/jolofsor/denial75/info.json
index f101a02f52..5bf9c1eda2 100644
--- a/keyboards/jolofsor/denial75/info.json
+++ b/keyboards/jolofsor/denial75/info.json
@@ -17,95 +17,96 @@
     "layouts": {
         "LAYOUT_denial75_ansi": {
             "layout": [
-            	{"label":"Esc", "x":0, "y":0},
-            	{"label":"F1", "x":1.25, "y":0},
-            	{"label":"F2", "x":2.25, "y":0},
-            	{"label":"F3", "x":3.25, "y":0},
-            	{"label":"F4", "x":4.25, "y":0},
-            	{"label":"F5", "x":5.25, "y":0},
-            	{"label":"F6", "x":6.25, "y":0},
-            	{"label":"F7", "x":7.25, "y":0},
-            	{"label":"F8", "x":8.25, "y":0},
-            	{"label":"F9", "x":9.25, "y":0},
-            	{"label":"F10", "x":10.25, "y":0},
-            	{"label":"F11", "x":11.25, "y":0},
-            	{"label":"F12", "x":12.25, "y":0},
-            	{"label":"PrtScr", "x":13.5, "y":0},
-            	{"label":"Insert", "x":14.5, "y":0},
-            	{"label":"Delete", "x":15.5, "y":0},
+                {"x":0, "y":0, "matrix": [0, 0]},
+                {"x":1.25, "y":0, "matrix": [0, 1]},
+                {"x":2.25, "y":0, "matrix": [0, 2]},
+                {"x":3.25, "y":0, "matrix": [0, 3]},
+                {"x":4.25, "y":0, "matrix": [0, 4]},
+                {"x":5.25, "y":0, "matrix": [0, 5]},
+                {"x":6.25, "y":0, "matrix": [0, 6]},
+                {"x":7.25, "y":0, "matrix": [0, 7]},
+                {"x":8.25, "y":0, "matrix": [0, 8]},
+                {"x":9.25, "y":0, "matrix": [0, 9]},
+                {"x":10.25, "y":0, "matrix": [0, 10]},
+                {"x":11.25, "y":0, "matrix": [0, 11]},
+                {"x":12.25, "y":0, "matrix": [0, 12]},
+                {"x":13.5, "y":0, "matrix": [0, 13]},
+                {"x":14.5, "y":0, "matrix": [0, 14]},
+                {"x":15.5, "y":0, "matrix": [0, 15]},
 
-            	{"label":"~", "x":0, "y":1.25},
-            	{"label":"!", "x":1, "y":1.25},
-            	{"label":"@", "x":2, "y":1.25},
-            	{"label":"#", "x":3, "y":1.25},
-            	{"label":"$", "x":4, "y":1.25},
-            	{"label":"%", "x":5, "y":1.25},
-            	{"label":"^", "x":6, "y":1.25},
-            	{"label":"&", "x":7, "y":1.25},
-            	{"label":"*", "x":8, "y":1.25},
-            	{"label":"(", "x":9, "y":1.25},
-            	{"label":")", "x":10, "y":1.25},
-            	{"label":"_", "x":11, "y":1.25},
-            	{"label":"+", "x":12, "y":1.25},
-            	{"label":"Backspace", "x":13, "y":1.25, "w":2},
-            	{"label":"Home", "x":15.5, "y":1.25},
+                {"x":0, "y":1.25, "matrix": [1, 0]},
+                {"x":1, "y":1.25, "matrix": [1, 1]},
+                {"x":2, "y":1.25, "matrix": [1, 2]},
+                {"x":3, "y":1.25, "matrix": [1, 3]},
+                {"x":4, "y":1.25, "matrix": [1, 4]},
+                {"x":5, "y":1.25, "matrix": [1, 5]},
+                {"x":6, "y":1.25, "matrix": [1, 6]},
+                {"x":7, "y":1.25, "matrix": [1, 7]},
+                {"x":8, "y":1.25, "matrix": [1, 8]},
+                {"x":9, "y":1.25, "matrix": [1, 9]},
+                {"x":10, "y":1.25, "matrix": [1, 10]},
+                {"x":11, "y":1.25, "matrix": [1, 11]},
+                {"x":12, "y":1.25, "matrix": [1, 12]},
+                {"x":13, "y":1.25, "w":2, "matrix": [1, 14]},
+                {"x":15.5, "y":1.25, "matrix": [1, 15]},
 
-            	{"label":"Tab", "x":0, "y":2.25, "w":1.5},
-            	{"label":"Q", "x":1.5, "y":2.25},
-            	{"label":"W", "x":2.5, "y":2.25},
-            	{"label":"E", "x":3.5, "y":2.25},
-            	{"label":"R", "x":4.5, "y":2.25},
-            	{"label":"T", "x":5.5, "y":2.25},
-            	{"label":"Y", "x":6.5, "y":2.25},
-            	{"label":"U", "x":7.5, "y":2.25},
-            	{"label":"I", "x":8.5, "y":2.25},
-            	{"label":"O", "x":9.5, "y":2.25},
-            	{"label":"P", "x":10.5, "y":2.25},
-            	{"label":"{", "x":11.5, "y":2.25},
-            	{"label":"}", "x":12.5, "y":2.25},
-            	{"label":"|", "x":13.5, "y":2.25, "w":1.5},
-            	{"label":"Page Up", "x":15.5, "y":2.25},
+                {"x":0, "y":2.25, "w":1.5, "matrix": [2, 0]},
+                {"x":1.5, "y":2.25, "matrix": [2, 2]},
+                {"x":2.5, "y":2.25, "matrix": [2, 3]},
+                {"x":3.5, "y":2.25, "matrix": [2, 4]},
+                {"x":4.5, "y":2.25, "matrix": [2, 5]},
+                {"x":5.5, "y":2.25, "matrix": [2, 6]},
+                {"x":6.5, "y":2.25, "matrix": [2, 7]},
+                {"x":7.5, "y":2.25, "matrix": [2, 8]},
+                {"x":8.5, "y":2.25, "matrix": [2, 9]},
+                {"x":9.5, "y":2.25, "matrix": [2, 10]},
+                {"x":10.5, "y":2.25, "matrix": [2, 11]},
+                {"x":11.5, "y":2.25, "matrix": [2, 12]},
+                {"x":12.5, "y":2.25, "matrix": [2, 13]},
+                {"x":13.5, "y":2.25, "w":1.5, "matrix": [2, 14]},
+                {"x":15.5, "y":2.25, "matrix": [2, 15]},
 
-            	{"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-            	{"label":"A", "x":1.75, "y":3.25},
-            	{"label":"S", "x":2.75, "y":3.25},
-            	{"label":"D", "x":3.75, "y":3.25},
-            	{"label":"F", "x":4.75, "y":3.25},
-            	{"label":"G", "x":5.75, "y":3.25},
-            	{"label":"H", "x":6.75, "y":3.25},
-            	{"label":"J", "x":7.75, "y":3.25},
-            	{"label":"K", "x":8.75, "y":3.25},
-            	{"label":"L", "x":9.75, "y":3.25},
-            	{"label":":", "x":10.75, "y":3.25},
-            	{"label":"\"", "x":11.75, "y":3.25},
-            	{"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-            	{"label":"Page Down", "x":15.5, "y":3.25},
+                {"x":0, "y":3.25, "w":1.75, "matrix": [3, 0]},
+                {"x":1.75, "y":3.25, "matrix": [3, 2]},
+                {"x":2.75, "y":3.25, "matrix": [3, 3]},
+                {"x":3.75, "y":3.25, "matrix": [3, 4]},
+                {"x":4.75, "y":3.25, "matrix": [3, 5]},
+                {"x":5.75, "y":3.25, "matrix": [3, 6]},
+                {"x":6.75, "y":3.25, "matrix": [3, 7]},
+                {"x":7.75, "y":3.25, "matrix": [3, 8]},
+                {"x":8.75, "y":3.25, "matrix": [3, 9]},
+                {"x":9.75, "y":3.25, "matrix": [3, 10]},
+                {"x":10.75, "y":3.25, "matrix": [3, 11]},
+                {"x":11.75, "y":3.25, "matrix": [3, 12]},
+                {"x":12.75, "y":3.25, "w":2.25, "matrix": [3, 13]},
+                {"x":15.5, "y":3.25, "matrix": [3, 15]},
 
-            	{"label":"Shift", "x":0, "y":4.25, "w":2.25},
-            	{"label":"Z", "x":2.25, "y":4.25},
-            	{"label":"X", "x":3.25, "y":4.25},
-            	{"label":"C", "x":4.25, "y":4.25},
-            	{"label":"V", "x":5.25, "y":4.25},
-            	{"label":"B", "x":6.25, "y":4.25},
-            	{"label":"N", "x":7.25, "y":4.25},
-            	{"label":"M", "x":8.25, "y":4.25},
-            	{"label":"<", "x":9.25, "y":4.25},
-            	{"label":">", "x":10.25, "y":4.25},
-            	{"label":"?", "x":11.25, "y":4.25},
-            	{"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
-            	{"label":"Up", "x":14.25, "y":4.5},
-            	{"label":"End", "x":15.5, "y":4.25},
+                {"x":0, "y":4.25, "w":2.25, "matrix": [4, 1]},
+                {"x":2.25, "y":4.25, "matrix": [4, 2]},
+                {"x":3.25, "y":4.25, "matrix": [4, 3]},
+                {"x":4.25, "y":4.25, "matrix": [4, 4]},
+                {"x":5.25, "y":4.25, "matrix": [4, 5]},
+                {"x":6.25, "y":4.25, "matrix": [4, 6]},
+                {"x":7.25, "y":4.25, "matrix": [4, 7]},
+                {"x":8.25, "y":4.25, "matrix": [4, 8]},
+                {"x":9.25, "y":4.25, "matrix": [4, 9]},
+                {"x":10.25, "y":4.25, "matrix": [4, 10]},
+                {"x":11.25, "y":4.25, "matrix": [4, 11]},
+                {"x":12.25, "y":4.25, "w":1.75, "matrix": [4, 13]},
+                {"x":14.25, "y":4.5, "matrix": [4, 14]},
+                {"x":15.5, "y":4.25, "matrix": [4, 15]},
 
-            	{"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-            	{"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-            	{"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-            	{"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-            	{"label":"Alt", "x":10, "y":5.25},
-            	{"label":"Fn", "x":11, "y":5.25},
-            	{"label":"Ctrl", "x":12, "y":5.25},
-            	{"label":"Left", "x":13.25, "y":5.5},
-            	{"label":"Down", "x":14.25, "y":5.5},
-            	{"label":"Right", "x":15.25, "y":5.5}]
+                {"x":0, "y":5.25, "w":1.25, "matrix": [5, 0]},
+                {"x":1.25, "y":5.25, "w":1.25, "matrix": [5, 1]},
+                {"x":2.5, "y":5.25, "w":1.25, "matrix": [5, 3]},
+                {"x":3.75, "y":5.25, "w":6.25, "matrix": [5, 6]},
+                {"x":10, "y":5.25, "matrix": [5, 10]},
+                {"x":11, "y":5.25, "matrix": [5, 11]},
+                {"x":12, "y":5.25, "matrix": [5, 12]},
+                {"x":13.25, "y":5.5, "matrix": [5, 13]},
+                {"x":14.25, "y":5.5, "matrix": [5, 14]},
+                {"x":15.25, "y":5.5, "matrix": [5, 15]}
+            ]
         }
     }
 }