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

1 files changed, 224 insertions, 60 deletions

diff --git a/keyboards/salicylic_acid3/naked60/rev1/info.json b/keyboards/salicylic_acid3/naked60/rev1/info.json
index 92da4070a5..8021bf747f 100644
--- a/keyboards/salicylic_acid3/naked60/rev1/info.json
+++ b/keyboards/salicylic_acid3/naked60/rev1/info.json
@@ -27,66 +27,230 @@
     "layouts": {
         "LAYOUT": {
             "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":8, "y":0},
-                {"label":"7", "x":9, "y":0},
-                {"label":"8", "x":10, "y":0},
-                {"label":"9", "x":11, "y":0},
-                {"label":"0", "x":12, "y":0},
-                {"label":"Back Space", "x":13, "y":0},
-                {"label":"Tab", "x":0, "y":1},
-                {"label":"Q", "x":1, "y":1},
-                {"label":"W", "x":2, "y":1},
-                {"label":"E", "x":3, "y":1},
-                {"label":"R", "x":4, "y":1},
-                {"label":"T", "x":5, "y":1},
-                {"label":"Y", "x":8, "y":1},
-                {"label":"U", "x":9, "y":1},
-                {"label":"I", "x":10, "y":1},
-                {"label":"O", "x":11, "y":1},
-                {"label":"P", "x":12, "y":1},
-                {"label":"\\", "x":13, "y":1},
-                {"label":"Esc", "x":0, "y":2},
-                {"label":"A", "x":1, "y":2},
-                {"label":"S", "x":2, "y":2},
-                {"label":"D", "x":3, "y":2},
-                {"label":"F", "x":4, "y":2},
-                {"label":"G", "x":5, "y":2},
-                {"label":"H", "x":8, "y":2},
-                {"label":"J", "x":9, "y":2},
-                {"label":"K", "x":10, "y":2},
-                {"label":"L", "x":11, "y":2},
-                {"label":";", "x":12, "y":2},
-                {"label":"'", "x":13, "y":2},
-                {"label":"Shift", "x":0, "y":3},
-                {"label":"Z", "x":1, "y":3},
-                {"label":"X", "x":2, "y":3},
-                {"label":"C", "x":3, "y":3},
-                {"label":"V", "x":4, "y":3},
-                {"label":"B", "x":5, "y":3},
-                {"label":"N", "x":8, "y":3},
-                {"label":"M", "x":9, "y":3},
-                {"label":",", "x":10, "y":3},
-                {"label":".", "x":11, "y":3},
-                {"label":"/", "x":12, "y":3},
-                {"label":"Enter", "x":13, "y":3},
-                {"label":"Adjust", "x":1, "y":4},
-                {"label":"Ctrl", "x":2, "y":4},
-                {"label":"Alt", "x":3, "y":4},
-                {"label":"GUI", "x":4, "y":4},
-                {"label":"⇓", "x":5, "y":4},
-                {"x":6, "y":4},
-                {"x":7, "y":4},
-                {"label":"⇑", "x":8, "y":4},
-                {"label":"←", "x":9, "y":4},
-                {"label":"↓", "x":10, "y":4},
-                {"label":"↑", "x":11, "y":4},
-                {"label":"→", "x":12, "y":4}
+                {"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": 8, "y": 0},
+                {"matrix": [0, 7], "x": 9, "y": 0},
+                {"matrix": [0, 8], "x": 10, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+
+                {"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": 8, "y": 1},
+                {"matrix": [1, 7], "x": 9, "y": 1},
+                {"matrix": [1, 8], "x": 10, "y": 1},
+                {"matrix": [1, 9], "x": 11, "y": 1},
+                {"matrix": [1, 10], "x": 12, "y": 1},
+                {"matrix": [1, 11], "x": 13, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+
+                {"matrix": [2, 6], "x": 8, "y": 2},
+                {"matrix": [2, 7], "x": 9, "y": 2},
+                {"matrix": [2, 8], "x": 10, "y": 2},
+                {"matrix": [2, 9], "x": 11, "y": 2},
+                {"matrix": [2, 10], "x": 12, "y": 2},
+                {"matrix": [2, 11], "x": 13, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+
+                {"matrix": [3, 6], "x": 8, "y": 3},
+                {"matrix": [3, 7], "x": 9, "y": 3},
+                {"matrix": [3, 8], "x": 10, "y": 3},
+                {"matrix": [3, 9], "x": 11, "y": 3},
+                {"matrix": [3, 10], "x": 12, "y": 3},
+                {"matrix": [3, 11], "x": 13, "y": 3},
+
+                {"matrix": [4, 0], "x": 1, "y": 4},
+                {"matrix": [4, 1], "x": 2, "y": 4},
+                {"matrix": [4, 2], "x": 3, "y": 4},
+                {"matrix": [4, 3], "x": 4, "y": 4},
+                {"matrix": [4, 4], "x": 5, "y": 4},
+                {"matrix": [4, 5], "x": 6, "y": 4},
+                {"matrix": [4, 6], "x": 7, "y": 4},
+                {"matrix": [4, 7], "x": 8, "y": 4},
+                {"matrix": [4, 8], "x": 9, "y": 4},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4}
+            ]
+        },
+        "LAYOUT_with_nafuda": {
+            "layout": [
+                {"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": [5, 1], "x": 12, "y": 0},
+                {"matrix": [1, 0], "x": 13, "y": 0},
+                {"matrix": [1, 1], "x": 14, "y": 0},
+                {"matrix": [1, 2], "x": 15, "y": 0},
+                {"matrix": [1, 3], "x": 16, "y": 0},
+                {"matrix": [1, 4], "x": 17, "y": 0},
+                {"matrix": [1, 5], "x": 18, "y": 0},
+                {"matrix": [1, 6], "x": 19, "y": 0},
+                {"matrix": [1, 7], "x": 20, "y": 0},
+                {"matrix": [1, 8], "x": 21, "y": 0},
+                {"matrix": [1, 9], "x": 22, "y": 0},
+                {"matrix": [1, 10], "x": 23, "y": 0},
+                {"matrix": [1, 11], "x": 24, "y": 0},
+                {"matrix": [6, 0], "x": 25, "y": 0},
+                {"matrix": [6, 1], "x": 26, "y": 0},
+                {"matrix": [6, 2], "x": 27, "y": 0},
+                {"matrix": [2, 0], "x": 28, "y": 0},
+                {"matrix": [2, 1], "x": 29, "y": 0},
+                {"matrix": [2, 2], "x": 30, "y": 0},
+                {"matrix": [2, 3], "x": 31, "y": 0},
+                {"matrix": [2, 4], "x": 32, "y": 0},
+                {"matrix": [2, 5], "x": 33, "y": 0},
+                {"matrix": [2, 6], "x": 34, "y": 0},
+                {"matrix": [2, 7], "x": 35, "y": 0},
+                {"matrix": [2, 8], "x": 36, "y": 0},
+                {"matrix": [2, 9], "x": 37, "y": 0},
+                {"matrix": [2, 10], "x": 38, "y": 0},
+                {"matrix": [2, 11], "x": 39, "y": 0},
+                {"matrix": [7, 0], "x": 40, "y": 0},
+                {"matrix": [7, 1], "x": 41, "y": 0},
+                {"matrix": [7, 2], "x": 42, "y": 0},
+                {"matrix": [3, 0], "x": 43, "y": 0},
+                {"matrix": [3, 1], "x": 44, "y": 0},
+                {"matrix": [3, 2], "x": 45, "y": 0},
+                {"matrix": [3, 3], "x": 46, "y": 0},
+                {"matrix": [3, 4], "x": 47, "y": 0},
+                {"matrix": [3, 5], "x": 48, "y": 0},
+                {"matrix": [3, 6], "x": 49, "y": 0},
+                {"matrix": [3, 7], "x": 50, "y": 0},
+                {"matrix": [3, 8], "x": 51, "y": 0},
+                {"matrix": [3, 9], "x": 52, "y": 0},
+                {"matrix": [3, 10], "x": 53, "y": 0},
+                {"matrix": [3, 11], "x": 54, "y": 0},
+                {"matrix": [4, 0], "x": 55, "y": 0},
+                {"matrix": [4, 1], "x": 56, "y": 0},
+                {"matrix": [4, 2], "x": 57, "y": 0},
+                {"matrix": [4, 3], "x": 58, "y": 0},
+                {"matrix": [4, 4], "x": 59, "y": 0},
+                {"matrix": [4, 5], "x": 60, "y": 0},
+                {"matrix": [4, 6], "x": 61, "y": 0},
+                {"matrix": [4, 7], "x": 62, "y": 0},
+                {"matrix": [4, 8], "x": 63, "y": 0},
+                {"matrix": [4, 9], "x": 64, "y": 0},
+                {"matrix": [4, 10], "x": 65, "y": 0},
+                {"matrix": [4, 11], "x": 66, "y": 0}
+            ]
+        },
+        "LAYOUT_with_setta21": {
+            "layout": [
+                {"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": [5, 0], "x": 12, "y": 0},
+                {"matrix": [5, 1], "x": 13, "y": 0},
+                {"matrix": [5, 2], "x": 14, "y": 0},
+                {"matrix": [5, 3], "x": 15, "y": 0},
+                {"matrix": [5, 4], "x": 16, "y": 0},
+                {"matrix": [5, 5], "x": 17, "y": 0},
+                {"matrix": [1, 0], "x": 18, "y": 0},
+                {"matrix": [1, 1], "x": 19, "y": 0},
+                {"matrix": [1, 2], "x": 20, "y": 0},
+                {"matrix": [1, 3], "x": 21, "y": 0},
+                {"matrix": [1, 4], "x": 22, "y": 0},
+                {"matrix": [1, 5], "x": 23, "y": 0},
+                {"matrix": [1, 6], "x": 24, "y": 0},
+                {"matrix": [1, 7], "x": 25, "y": 0},
+                {"matrix": [1, 8], "x": 26, "y": 0},
+                {"matrix": [1, 9], "x": 27, "y": 0},
+                {"matrix": [1, 10], "x": 28, "y": 0},
+                {"matrix": [1, 11], "x": 29, "y": 0},
+                {"matrix": [6, 1], "x": 30, "y": 0},
+                {"matrix": [6, 2], "x": 31, "y": 0},
+                {"matrix": [6, 3], "x": 32, "y": 0},
+                {"matrix": [6, 4], "x": 33, "y": 0},
+                {"matrix": [6, 5], "x": 34, "y": 0},
+                {"matrix": [2, 0], "x": 35, "y": 0},
+                {"matrix": [2, 1], "x": 36, "y": 0},
+                {"matrix": [2, 2], "x": 37, "y": 0},
+                {"matrix": [2, 3], "x": 38, "y": 0},
+                {"matrix": [2, 4], "x": 39, "y": 0},
+                {"matrix": [2, 5], "x": 40, "y": 0},
+                {"matrix": [2, 6], "x": 41, "y": 0},
+                {"matrix": [2, 7], "x": 42, "y": 0},
+                {"matrix": [2, 8], "x": 43, "y": 0},
+                {"matrix": [2, 9], "x": 44, "y": 0},
+                {"matrix": [2, 10], "x": 45, "y": 0},
+                {"matrix": [2, 11], "x": 46, "y": 0},
+                {"matrix": [7, 0], "x": 47, "y": 0},
+                {"matrix": [7, 1], "x": 48, "y": 0},
+                {"matrix": [7, 2], "x": 49, "y": 0},
+                {"matrix": [7, 3], "x": 50, "y": 0},
+                {"matrix": [7, 4], "x": 51, "y": 0},
+                {"matrix": [7, 5], "x": 52, "y": 0},
+                {"matrix": [3, 0], "x": 53, "y": 0},
+                {"matrix": [3, 1], "x": 54, "y": 0},
+                {"matrix": [3, 2], "x": 55, "y": 0},
+                {"matrix": [3, 3], "x": 56, "y": 0},
+                {"matrix": [3, 4], "x": 57, "y": 0},
+                {"matrix": [3, 5], "x": 58, "y": 0},
+                {"matrix": [3, 6], "x": 59, "y": 0},
+                {"matrix": [3, 7], "x": 60, "y": 0},
+                {"matrix": [3, 8], "x": 61, "y": 0},
+                {"matrix": [3, 9], "x": 62, "y": 0},
+                {"matrix": [3, 10], "x": 63, "y": 0},
+                {"matrix": [3, 11], "x": 64, "y": 0},
+                {"matrix": [8, 0], "x": 65, "y": 0},
+                {"matrix": [8, 2], "x": 66, "y": 0},
+                {"matrix": [8, 4], "x": 67, "y": 0},
+                {"matrix": [8, 5], "x": 68, "y": 0},
+                {"matrix": [4, 0], "x": 69, "y": 0},
+                {"matrix": [4, 1], "x": 70, "y": 0},
+                {"matrix": [4, 2], "x": 71, "y": 0},
+                {"matrix": [4, 3], "x": 72, "y": 0},
+                {"matrix": [4, 4], "x": 73, "y": 0},
+                {"matrix": [4, 5], "x": 74, "y": 0},
+                {"matrix": [4, 6], "x": 75, "y": 0},
+                {"matrix": [4, 7], "x": 76, "y": 0},
+                {"matrix": [4, 8], "x": 77, "y": 0},
+                {"matrix": [4, 9], "x": 78, "y": 0},
+                {"matrix": [4, 10], "x": 79, "y": 0},
+                {"matrix": [4, 11], "x": 80, "y": 0}
             ]
         }
     }