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

2 files changed, 77 insertions, 135 deletions

diff --git a/keyboards/salicylic_acid3/ergoarrows/ergoarrows.h b/keyboards/salicylic_acid3/ergoarrows/ergoarrows.h
deleted file mode 100644
index 7944337b4e..0000000000
--- a/keyboards/salicylic_acid3/ergoarrows/ergoarrows.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-Copyright 2021 Salicylic_Acid
-
-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"
-
-/*
- * ,------------------------------------------   ------------------------------------------.
- * | L00 | L01 | L02 | L03 | L04 | L05 | L06 |   | R06 | R05 | R04 | R03 | R02 | R01 | R00 |
- * |------------------------------------------   ------------------------------------------+
- * | L10 | L11 | L12 | L13 | L14 | L15 | L16 |   | R16 | R15 | R14 | R13 | R12 | R11 | R10 |
- * |------------------------------------------   ------------------------------------------+
- * | L20 | L21 | L22 | L23 | L24 | L25 | L26 |   | R26 | R25 | R24 | R23 | R22 | R21 | R20 |
- * |------------------------------------------   ------------------------------------------+
- * | L30 | L31 | L32 | L33 | L34 | L35 | L36 |   | R36 | R35 | R34 | R33 | R32 | R31 | R30 |
- * |------------------------------------------   ------------------------------------------+
- * | L40 | L41 | L42 | L43 | L44 | L45 | L46 |   | R46 | R45 | R44 | R43 | R42 | R41 | R40 |
- * |------------------------------------------   ------------------------------------------+
- *       | L51 | L52 | L53 |                                       | R53 | R52 | R51 |
- *       -------------------                                       ------------------'
- */
-
-#define LAYOUT( \
-    L00, L01, L02, L03, L04, L05, L06,      R06, R05, R04, R03, R02, R01, R00, \
-    L10, L11, L12, L13, L14, L15, L16,      R16, R15, R14, R13, R12, R11, R10, \
-    L20, L21, L22, L23, L24, L25, L26,      R26, R25, R24, R23, R22, R21, R20, \
-    L30, L31, L32, L33, L34, L35, L36,      R36, R35, R34, R33, R32, R31, R30, \
-    L40, L41, L42, L43, L44, L45, L46,      R46, R45, R44, R43, R42, R41, R40, \
-         L51, L52, L53,                                    R53, R52, R51       \
-  ) \
-  { \
-    { L00,   L01,   L02,   L03,   L04,   L05,   L06 }, \
-    { L10,   L11,   L12,   L13,   L14,   L15,   L16 }, \
-    { L20,   L21,   L22,   L23,   L24,   L25,   L26 }, \
-    { L30,   L31,   L32,   L33,   L34,   L35,   L36 }, \
-    { L40,   L41,   L42,   L43,   L44,   L45,   L46 }, \
-    {KC_NO,  L51,   L52,   L53, KC_NO, KC_NO, KC_NO }, \
-    { R00,   R01,   R02,   R03,   R04,   R05,   R06 }, \
-    { R10,   R11,   R12,   R13,   R14,   R15,   R16 }, \
-    { R20,   R21,   R22,   R23,   R24,   R25,   R26 }, \
-    { R30,   R31,   R32,   R33,   R34,   R35,   R36 }, \
-    { R40,   R41,   R42,   R43,   R44,   R45,   R46 }, \
-    {KC_NO,  R51,   R52,   R53, KC_NO, KC_NO, KC_NO }  \
-  }
diff --git a/keyboards/salicylic_acid3/ergoarrows/info.json b/keyboards/salicylic_acid3/ergoarrows/info.json
index 415a7e1945..0957f6628d 100644
--- a/keyboards/salicylic_acid3/ergoarrows/info.json
+++ b/keyboards/salicylic_acid3/ergoarrows/info.json
@@ -24,94 +24,95 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0.375},
-                {"label":"1", "x":1, "y":0.375},
-                {"label":"2", "x":2, "y":0.125},
-                {"label":"3", "x":3, "y":0},
-                {"label":"4", "x":4, "y":0.125},
-                {"label":"5", "x":5, "y":0.25},
-                {"label":"6", "x":6, "y":0.5},
+                {"matrix": [0, 0], "x": 0, "y": 0.375},
+                {"matrix": [0, 1], "x": 1, "y": 0.375},
+                {"matrix": [0, 2], "x": 2, "y": 0.125},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.125},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6, "y": 0.5},
 
-                {"label":"5", "x":8.8, "y":0.5},
-                {"label":"6", "x":9.8, "y":0.25},
-                {"label":"7", "x":10.8, "y":0.125},
-                {"label":"8", "x":11.8, "y":0},
-                {"label":"9", "x":12.8, "y":0.125},
-                {"label":"0", "x":13.8, "y":0.375},
-                {"label":"PrtScr", "x":14.8, "y":0.375},
+                {"matrix": [6, 6], "x": 8.8, "y": 0.5},
+                {"matrix": [6, 5], "x": 9.8, "y": 0.25},
+                {"matrix": [6, 4], "x": 10.8, "y": 0.125},
+                {"matrix": [6, 3], "x": 11.8, "y": 0},
+                {"matrix": [6, 2], "x": 12.8, "y": 0.125},
+                {"matrix": [6, 1], "x": 13.8, "y": 0.375},
+                {"matrix": [6, 0], "x": 14.8, "y": 0.375},
 
-                {"label":"Tab", "x":0, "y":1.375},
-                {"label":"Q", "x":1, "y":1.375},
-                {"label":"W", "x":2, "y":1.125},
-                {"label":"E", "x":3, "y":1},
-                {"label":"R", "x":4, "y":1.125},
-                {"label":"T", "x":5, "y":1.25},
-                {"label":"Y", "x":6, "y":1.5},
+                {"matrix": [1, 0], "x": 0, "y": 1.375},
+                {"matrix": [1, 1], "x": 1, "y": 1.375},
+                {"matrix": [1, 2], "x": 2, "y": 1.125},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.125},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
 
-                {"label":"T", "x":8.8, "y":1.5},
-                {"label":"Y", "x":9.8, "y":1.25},
-                {"label":"U", "x":10.8, "y":1.125},
-                {"label":"I", "x":11.8, "y":1},
-                {"label":"O", "x":12.8, "y":1.125},
-                {"label":"P", "x":13.8, "y":1.375},
-                {"label":"[", "x":14.8, "y":1.375},
+                {"matrix": [7, 6], "x": 8.8, "y": 1.5},
+                {"matrix": [7, 5], "x": 9.8, "y": 1.25},
+                {"matrix": [7, 4], "x": 10.8, "y": 1.125},
+                {"matrix": [7, 3], "x": 11.8, "y": 1},
+                {"matrix": [7, 2], "x": 12.8, "y": 1.125},
+                {"matrix": [7, 1], "x": 13.8, "y": 1.375},
+                {"matrix": [7, 0], "x": 14.8, "y": 1.375},
 
-                {"label":"Caps", "x":0, "y":2.375},
-                {"label":"A", "x":1, "y":2.375},
-                {"label":"S", "x":2, "y":2.125},
-                {"label":"D", "x":3, "y":2},
-                {"label":"F", "x":4, "y":2.125},
-                {"label":"G", "x":5, "y":2.25},
-                {"label":"H", "x":6, "y":2.5},
+                {"matrix": [2, 0], "x": 0, "y": 2.375},
+                {"matrix": [2, 1], "x": 1, "y": 2.375},
+                {"matrix": [2, 2], "x": 2, "y": 2.125},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.125},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6, "y": 2.5},
 
-                {"label":"G", "x":8.8, "y":2.5},
-                {"label":"H", "x":9.8, "y":2.25},
-                {"label":"J", "x":10.8, "y":2.125},
-                {"label":"K", "x":11.8, "y":2},
-                {"label":"L", "x":12.8, "y":2.125},
-                {"label":":", "x":13.8, "y":2.375},
-                {"label":"Ent", "x":14.8, "y":2.375},
+                {"matrix": [8, 6], "x": 8.8, "y": 2.5},
+                {"matrix": [8, 5], "x": 9.8, "y": 2.25},
+                {"matrix": [8, 4], "x": 10.8, "y": 2.125},
+                {"matrix": [8, 3], "x": 11.8, "y": 2},
+                {"matrix": [8, 2], "x": 12.8, "y": 2.125},
+                {"matrix": [8, 1], "x": 13.8, "y": 2.375},
+                {"matrix": [8, 0], "x": 14.8, "y": 2.375},
 
-                {"label":"Shift", "x":0, "y":3.375},
-                {"label":"Z", "x":1, "y":3.375},
-                {"label":"X", "x":2, "y":3.125},
-                {"label":"C", "x":3, "y":3},
-                {"label":"V", "x":4, "y":3.125},
-                {"label":"B", "x":5, "y":3.25},
-                {"label":"N", "x":6, "y":3.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.375},
+                {"matrix": [3, 1], "x": 1, "y": 3.375},
+                {"matrix": [3, 2], "x": 2, "y": 3.125},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.125},
+                {"matrix": [3, 5], "x": 5, "y": 3.25},
+                {"matrix": [3, 6], "x": 6, "y": 3.5},
 
-                {"label":"B", "x":8.8, "y":3.5},
-                {"label":"N", "x":9.8, "y":3.25},
-                {"label":"M", "x":10.8, "y":3.125},
-                {"label":"<", "x":11.8, "y":3},
-                {"label":">", "x":12.8, "y":3.125},
-                {"label":"?", "x":13.8, "y":3.375},
-                {"label":"_", "x":14.8, "y":3.375},
+                {"matrix": [9, 6], "x": 8.8, "y": 3.5},
+                {"matrix": [9, 5], "x": 9.8, "y": 3.25},
+                {"matrix": [9, 4], "x": 10.8, "y": 3.125},
+                {"matrix": [9, 3], "x": 11.8, "y": 3},
+                {"matrix": [9, 2], "x": 12.8, "y": 3.125},
+                {"matrix": [9, 1], "x": 13.8, "y": 3.375},
+                {"matrix": [9, 0], "x": 14.8, "y": 3.375},
 
-                {"label":"Ctrl", "x":0, "y":4.375},
-                {"label":"Win", "x":1, "y":4.375},
-                {"label":"&uarr;", "x":2.125, "y":4.5},
-                {"label":"Alt", "x":3.25, "y":4.375},
-                {"label":"Ent", "x":4.25, "y":4.375},
-                {"label":"BS", "x":5.35, "y":4.625},
-                {"label":"Del", "x":6.4, "y":5.125},
+                {"matrix": [4, 0], "x": 0, "y": 4.375},
+                {"matrix": [4, 1], "x": 1, "y": 4.375},
+                {"matrix": [4, 2], "x": 2.125, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.375},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.375},
+                {"matrix": [4, 5], "x": 5.35, "y": 4.625},
+                {"matrix": [4, 6], "x": 6.4, "y": 5.125},
 
-                {"label":"BS", "x":8.4, "y":5.125},
-                {"label":"Del", "x":9.45, "y":4.625},
-                {"label":"Spc", "x":10.55, "y":4.375},
-                {"label":"Alt", "x":11.55, "y":4.375},
-                {"label":"&uarr;", "x":12.675, "y":4.5},
-                {"label":"Alt", "x":13.8, "y":4.375},
-                {"label":"App", "x":14.8, "y":4.375},
+                {"matrix": [10, 6], "x": 8.4, "y": 5.125},
+                {"matrix": [10, 5], "x": 9.45, "y": 4.625},
+                {"matrix": [10, 4], "x": 10.55, "y": 4.375},
+                {"matrix": [10, 3], "x": 11.55, "y": 4.375},
+                {"matrix": [10, 2], "x": 12.675, "y": 4.5},
+                {"matrix": [10, 1], "x": 13.8, "y": 4.375},
+                {"matrix": [10, 0], "x": 14.8, "y": 4.375},
 
-                {"label":"&larr;", "x":1.125, "y":5.5},
-                {"label":"&dArr;", "x":2.125, "y":5.5},
-                {"label":"&rarr;", "x":3.125, "y":5.5},
+                {"matrix": [5, 1], "x": 1.125, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.125, "y": 5.5},
+                {"matrix": [5, 3], "x": 3.125, "y": 5.5},
 
-                {"label":"&larr;", "x":11.675, "y":5.5},
-                {"label":"&dArr;", "x":12.675, "y":5.5},
-                {"label":"&rarr;", "x":13.675, "y":5.5}
+                {"matrix": [11, 3], "x": 11.675, "y": 5.5},
+                {"matrix": [11, 2], "x": 12.675, "y": 5.5},
+                {"matrix": [11, 1], "x": 13.675, "y": 5.5}
             ]
         }
     }
+
 }