Move remaining `LAYOUT`s to data driven (#20422)

1 files changed, 178 insertions, 159 deletions

diff --git a/keyboards/salicylic_acid3/naked64/rev1/info.json b/keyboards/salicylic_acid3/naked64/rev1/info.json
index 7eed51635b..999f1e98c0 100644
--- a/keyboards/salicylic_acid3/naked64/rev1/info.json
+++ b/keyboards/salicylic_acid3/naked64/rev1/info.json
@@ -30,170 +30,189 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"pgup", "x":0.25, "y":0},
-                {"label":"ESC", "x":1.75, "y":0},
-                {"label":"1", "x":2.75, "y":0},
-                {"label":"2", "x":4, "y":0},
-                {"label":"3", "x":5, "y":0},
-                {"label":"4", "x":6, "y":0},
-                {"label":"5", "x":7, "y":0},
-                {"label":"6", "x":9.25, "y":0},
-                {"label":"7", "x":10.25, "y":0},
-                {"label":"8", "x":11.25, "y":0},
-                {"label":"9", "x":12.25, "y":0},
-                {"label":"0", "x":13.5, "y":0},
-                {"label":"-", "x":14.5, "y":0},
-                {"label":"Back Space", "x":15.5, "y":0},
-                {"label":"pgdn", "x":0, "y":1},
-                {"label":"Tab", "x":1.25, "y":1, "w":1.5},
-                {"label":"Q", "x":2.75, "y":1},
-                {"label":"W", "x":4, "y":1},
-                {"label":"E", "x":5, "y":1},
-                {"label":"R", "x":6, "y":1},
-                {"label":"T", "x":7, "y":1},
-                {"label":"Y", "x":9.25, "y":1},
-                {"label":"U", "x":10.25, "y":1},
-                {"label":"I", "x":11.25, "y":1},
-                {"label":"O", "x":12.25, "y":1},
-                {"label":"P", "x":13.5, "y":1},
-                {"label":"[", "x":14.5, "y":1},
-                {"label":"]", "x":15.5, "y":1},
-                {"label":"Control", "x":1, "y":2, "w":1.75},
-                {"label":"A", "x":2.75, "y":2},
-                {"label":"S", "x":4, "y":2},
-                {"label":"D", "x":5, "y":2},
-                {"label":"F", "x":6, "y":2},
-                {"label":"G", "x":7, "y":2},
-                {"label":"H", "x":9.25, "y":2},
-                {"label":"J", "x":10.25, "y":2},
-                {"label":"K", "x":11.25, "y":2},
-                {"label":"L", "x":12.25, "y":2},
-                {"label":";", "x":13.5, "y":2},
-                {"label":"'", "x":14.5, "y":2},
-                {"label":"Return", "x":15.5, "y":2},
-                {"label":"Shift", "x":0.5, "y":3, "w":2.25},
-                {"label":"Z", "x":2.75, "y":3},
-                {"label":"X", "x":4, "y":3},
-                {"label":"C", "x":5, "y":3},
-                {"label":"V", "x":6, "y":3},
-                {"label":"B", "x":7, "y":3},
-                {"label":"N", "x":9.25, "y":3},
-                {"label":"M", "x":10.25, "y":3},
-                {"label":",", "x":11.25, "y":3},
-                {"label":".", "x":12.25, "y":3},
-                {"label":"/", "x":13.5, "y":3},
-                {"label":"↑", "x":14.5, "y":3},
-                {"label":"Shift", "x":15.5, "y":3},
-                {"label":"Adjust", "x":1.25, "y":4, "w":1.75},
-                {"label":"Alt", "x":3.75, "y":4.25},
-                {"x":4.75, "y":4.25, "w":2.25},
-                {"label":"⇓", "x":7, "y":4.25},
-                {"label":"⇑", "x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25, "w":2},
-                {"label":"GUI", "x":12.25, "y":4.25},
-                {"label":"←", "x":13.5, "y":4},
-                {"label":"↓", "x":14.5, "y":4},
-                {"label":"→", "x":15.5, "y":4}
+                {"matrix": [0, 0], "x": 0.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 1.75, "y": 0},
+                {"matrix": [7, 0], "x": 2.75, "y": 0},
+                {"matrix": [3, 1], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [5, 2], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+
+                {"matrix": [6, 3], "x": 9.25, "y": 0},
+                {"matrix": [3, 4], "x": 10.25, "y": 0},
+                {"matrix": [0, 5], "x": 11.25, "y": 0},
+                {"matrix": [4, 5], "x": 12.25, "y": 0},
+                {"matrix": [1, 6], "x": 13.5, "y": 0},
+                {"matrix": [6, 6], "x": 14.5, "y": 0},
+                {"matrix": [3, 7], "x": 15.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [3, 0], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [0, 1], "x": 2.75, "y": 1},
+                {"matrix": [4, 1], "x": 4, "y": 1},
+                {"matrix": [1, 2], "x": 5, "y": 1},
+                {"matrix": [6, 2], "x": 6, "y": 1},
+                {"matrix": [2, 3], "x": 7, "y": 1},
+
+                {"matrix": [7, 3], "x": 9.25, "y": 1},
+                {"matrix": [4, 4], "x": 10.25, "y": 1},
+                {"matrix": [1, 5], "x": 11.25, "y": 1},
+                {"matrix": [5, 5], "x": 12.25, "y": 1},
+                {"matrix": [2, 6], "x": 13.5, "y": 1},
+                {"matrix": [7, 6], "x": 14.5, "y": 1},
+                {"matrix": [4, 7], "x": 15.5, "y": 1},
+
+                {"matrix": [4, 0], "x": 1, "y": 2, "w": 1.75},
+                {"matrix": [1, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 4, "y": 2},
+                {"matrix": [2, 2], "x": 5, "y": 2},
+                {"matrix": [7, 2], "x": 6, "y": 2},
+                {"matrix": [3, 3], "x": 7, "y": 2},
+
+                {"matrix": [0, 4], "x": 9.25, "y": 2},
+                {"matrix": [5, 4], "x": 10.25, "y": 2},
+                {"matrix": [2, 5], "x": 11.25, "y": 2},
+                {"matrix": [6, 5], "x": 12.25, "y": 2},
+                {"matrix": [3, 6], "x": 13.5, "y": 2},
+                {"matrix": [0, 7], "x": 14.5, "y": 2},
+                {"matrix": [5, 7], "x": 15.5, "y": 2},
+
+                {"matrix": [5, 0], "x": 0.5, "y": 3, "w": 2.25},
+                {"matrix": [2, 1], "x": 2.75, "y": 3},
+                {"matrix": [6, 1], "x": 4, "y": 3},
+                {"matrix": [3, 2], "x": 5, "y": 3},
+                {"matrix": [0, 3], "x": 6, "y": 3},
+                {"matrix": [4, 3], "x": 7, "y": 3},
+
+                {"matrix": [1, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 4], "x": 10.25, "y": 3},
+                {"matrix": [3, 5], "x": 11.25, "y": 3},
+                {"matrix": [7, 5], "x": 12.25, "y": 3},
+                {"matrix": [4, 6], "x": 13.5, "y": 3},
+                {"matrix": [1, 7], "x": 14.5, "y": 3},
+                {"matrix": [6, 7], "x": 15.5, "y": 3},
+
+                {"matrix": [6, 0], "x": 1.25, "y": 4, "w": 1.75},
+                {"matrix": [7, 1], "x": 3.75, "y": 4.25},
+                {"matrix": [4, 2], "x": 4.75, "y": 4.25, "w": 2.25},
+                {"matrix": [5, 3], "x": 7, "y": 4.25},
+
+                {"matrix": [2, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [7, 4], "x": 10.25, "y": 4.25, "w": 2},
+                {"matrix": [0, 6], "x": 12.25, "y": 4.25},
+                {"matrix": [5, 6], "x": 13.5, "y": 4},
+                {"matrix": [2, 7], "x": 14.5, "y": 4},
+                {"matrix": [7, 7], "x": 15.5, "y": 4}
             ]
         },
         "LAYOUT_with_setta21": {
             "layout": [
-                {"label":"pgup", "x":0.25, "y":0},
-                {"label":"ESC", "x":1.75, "y":0},
-                {"label":"1", "x":2.75, "y":0},
-                {"label":"2", "x":4, "y":0},
-                {"label":"3", "x":5, "y":0},
-                {"label":"4", "x":6, "y":0},
-                {"label":"5", "x":7, "y":0},
-                {"label":"6", "x":9.25, "y":0},
-                {"label":"7", "x":10.25, "y":0},
-                {"label":"8", "x":11.25, "y":0},
-                {"label":"9", "x":12.25, "y":0},
-                {"label":"0", "x":13.5, "y":0},
-                {"label":"-", "x":14.5, "y":0},
-                {"label":"Back Space", "x":15.5, "y":0},
-
-                {"label":"Esc", "x": 17.5, "y":0},
-                {"label":"F2", "x": 18.5, "y":0},
-                {"label":"=", "x": 19.5, "y":0},
-                {"label":"Delete", "x": 20.5, "y":0},
-
-                {"label":"pgdn", "x":0, "y":1},
-                {"label":"Tab", "x":1.25, "y":1, "w":1.5},
-                {"label":"Q", "x":2.75, "y":1},
-                {"label":"W", "x":4, "y":1},
-                {"label":"E", "x":5, "y":1},
-                {"label":"R", "x":6, "y":1},
-                {"label":"T", "x":7, "y":1},
-                {"label":"Y", "x":9.25, "y":1},
-                {"label":"U", "x":10.25, "y":1},
-                {"label":"I", "x":11.25, "y":1},
-                {"label":"O", "x":12.25, "y":1},
-                {"label":"P", "x":13.5, "y":1},
-                {"label":"[", "x":14.5, "y":1},
-                {"label":"]", "x":15.5, "y":1},
-
-                {"label":"Num Lock", "x": 17.5, "y":1.25},
-                {"label":"/", "x": 18.5, "y":1.25},
-                {"label":"*", "x": 19.5, "y":1.25},
-                {"label":"-", "x": 20.5, "y":1.25},
-
-                {"label":"Control", "x":1, "y":2, "w":1.75},
-                {"label":"A", "x":2.75, "y":2},
-                {"label":"S", "x":4, "y":2},
-                {"label":"D", "x":5, "y":2},
-                {"label":"F", "x":6, "y":2},
-                {"label":"G", "x":7, "y":2},
-                {"label":"H", "x":9.25, "y":2},
-                {"label":"J", "x":10.25, "y":2},
-                {"label":"K", "x":11.25, "y":2},
-                {"label":"L", "x":12.25, "y":2},
-                {"label":";", "x":13.5, "y":2},
-                {"label":"'", "x":14.5, "y":2},
-                {"label":"Return", "x":15.5, "y":2},
-
-                {"label":"7", "x": 17.5, "y":2.25},
-                {"label":"8", "x": 18.5, "y":2.25},
-                {"label":"9", "x": 19.5, "y":2.25},
-
-                {"label":"Shift", "x":0.5, "y":3, "w":2.25},
-                {"label":"Z", "x":2.75, "y":3},
-                {"label":"X", "x":4, "y":3},
-                {"label":"C", "x":5, "y":3},
-                {"label":"V", "x":6, "y":3},
-                {"label":"B", "x":7, "y":3},
-                {"label":"N", "x":9.25, "y":3},
-                {"label":"M", "x":10.25, "y":3},
-                {"label":",", "x":11.25, "y":3},
-                {"label":".", "x":12.25, "y":3},
-                {"label":"/", "x":13.5, "y":3},
-                {"label":"↑", "x":14.5, "y":3},
-                {"label":"Shift", "x":15.5, "y":3},
-
-                {"label":"4", "x": 17.5, "y":3.25},
-                {"label":"5", "x": 18.5, "y":3.25},
-                {"label":"6", "x": 19.5, "y":3.25},
-                {"label":"+", "x": 20.5, "y":2.25, "h":2},
-
-                {"label":"Adjust", "x":1.25, "y":4, "w":1.75},
-                {"label":"Alt", "x":3.75, "y":4.25},
-                {"x":4.75, "y":4.25, "w":2.25},
-                {"label":"⇓", "x":7, "y":4.25},
-                {"label":"⇑", "x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25, "w":2},
-                {"label":"GUI", "x":12.25, "y":4.25},
-                {"label":"←", "x":13.5, "y":4},
-                {"label":"↓", "x":14.5, "y":4},
-                {"label":"→", "x":15.5, "y":4},
-
-                {"label":"1", "x": 17.5, "y":4.25},
-                {"label":"2", "x": 18.5, "y":4.25},
-                {"label":"3", "x": 19.5, "y":4.25},
-
-                {"label":"Lower / 0", "x": 17.5, "y":5.25, "w":2},
-                {"label":"Raise / .", "x": 19.5, "y":5.25},
-                {"label":"Enter", "x": 20.5, "y":4.25, "h":2}
+                {"matrix": [0, 0], "x": 0.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 1.75, "y": 0},
+                {"matrix": [7, 0], "x": 2.75, "y": 0},
+                {"matrix": [3, 1], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [5, 2], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+
+                {"matrix": [6, 3], "x": 9.25, "y": 0},
+                {"matrix": [3, 4], "x": 10.25, "y": 0},
+                {"matrix": [0, 5], "x": 11.25, "y": 0},
+                {"matrix": [4, 5], "x": 12.25, "y": 0},
+                {"matrix": [1, 6], "x": 13.5, "y": 0},
+                {"matrix": [6, 6], "x": 14.5, "y": 0},
+                {"matrix": [3, 7], "x": 15.5, "y": 0},
+
+                {"matrix": [8, 5], "x": 17.5, "y": 0},
+                {"matrix": [9, 5], "x": 18.5, "y": 0},
+                {"matrix": [10, 5], "x": 19.5, "y": 0},
+                {"matrix": [11, 5], "x": 20.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [3, 0], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [0, 1], "x": 2.75, "y": 1},
+                {"matrix": [4, 1], "x": 4, "y": 1},
+                {"matrix": [1, 2], "x": 5, "y": 1},
+                {"matrix": [6, 2], "x": 6, "y": 1},
+                {"matrix": [2, 3], "x": 7, "y": 1},
+
+                {"matrix": [7, 3], "x": 9.25, "y": 1},
+                {"matrix": [4, 4], "x": 10.25, "y": 1},
+                {"matrix": [1, 5], "x": 11.25, "y": 1},
+                {"matrix": [5, 5], "x": 12.25, "y": 1},
+                {"matrix": [2, 6], "x": 13.5, "y": 1},
+                {"matrix": [7, 6], "x": 14.5, "y": 1},
+                {"matrix": [4, 7], "x": 15.5, "y": 1},
+
+                {"matrix": [8, 4], "x": 17.5, "y": 1.25},
+                {"matrix": [9, 4], "x": 18.5, "y": 1.25},
+                {"matrix": [10, 4], "x": 19.5, "y": 1.25},
+                {"matrix": [11, 4], "x": 20.5, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 1, "y": 2, "w": 1.75},
+                {"matrix": [1, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 4, "y": 2},
+                {"matrix": [2, 2], "x": 5, "y": 2},
+                {"matrix": [7, 2], "x": 6, "y": 2},
+                {"matrix": [3, 3], "x": 7, "y": 2},
+
+                {"matrix": [0, 4], "x": 9.25, "y": 2},
+                {"matrix": [5, 4], "x": 10.25, "y": 2},
+                {"matrix": [2, 5], "x": 11.25, "y": 2},
+                {"matrix": [6, 5], "x": 12.25, "y": 2},
+                {"matrix": [3, 6], "x": 13.5, "y": 2},
+                {"matrix": [0, 7], "x": 14.5, "y": 2},
+                {"matrix": [5, 7], "x": 15.5, "y": 2},
+
+                {"matrix": [8, 3], "x": 17.5, "y": 2.25},
+                {"matrix": [9, 3], "x": 18.5, "y": 2.25},
+                {"matrix": [10, 3], "x": 19.5, "y": 2.25},
+
+                {"matrix": [5, 0], "x": 0.5, "y": 3, "w": 2.25},
+                {"matrix": [2, 1], "x": 2.75, "y": 3},
+                {"matrix": [6, 1], "x": 4, "y": 3},
+                {"matrix": [3, 2], "x": 5, "y": 3},
+                {"matrix": [0, 3], "x": 6, "y": 3},
+                {"matrix": [4, 3], "x": 7, "y": 3},
+
+                {"matrix": [1, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 4], "x": 10.25, "y": 3},
+                {"matrix": [3, 5], "x": 11.25, "y": 3},
+                {"matrix": [7, 5], "x": 12.25, "y": 3},
+                {"matrix": [4, 6], "x": 13.5, "y": 3},
+                {"matrix": [1, 7], "x": 14.5, "y": 3},
+                {"matrix": [6, 7], "x": 15.5, "y": 3},
+
+                {"matrix": [8, 2], "x": 17.5, "y": 3.25},
+                {"matrix": [9, 2], "x": 18.5, "y": 3.25},
+                {"matrix": [10, 2], "x": 19.5, "y": 3.25},
+                {"matrix": [11, 2], "x": 20.5, "y": 2.25, "h": 2},
+
+                {"matrix": [6, 0], "x": 1.25, "y": 4, "w": 1.75},
+                {"matrix": [7, 1], "x": 3.75, "y": 4.25},
+                {"matrix": [4, 2], "x": 4.75, "y": 4.25, "w": 2.25},
+                {"matrix": [5, 3], "x": 7, "y": 4.25},
+
+                {"matrix": [2, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [7, 4], "x": 10.25, "y": 4.25, "w": 2},
+                {"matrix": [0, 6], "x": 12.25, "y": 4.25},
+                {"matrix": [5, 6], "x": 13.5, "y": 4},
+                {"matrix": [2, 7], "x": 14.5, "y": 4},
+                {"matrix": [7, 7], "x": 15.5, "y": 4},
+
+                {"matrix": [8, 1], "x": 17.5, "y": 4.25},
+                {"matrix": [9, 1], "x": 18.5, "y": 4.25},
+                {"matrix": [10, 1], "x": 19.5, "y": 4.25},
+
+                {"matrix": [8, 0], "x": 17.5, "y": 5.25, "w": 2},
+                {"matrix": [10, 0], "x": 19.5, "y": 5.25},
+                {"matrix": [11, 0], "x": 20.5, "y": 4.25, "h": 2}
             ]
         }
     }
+
 }