Move keyboard USB IDs and strings to data driven, pass 2: S-Y (#18093)

2 files changed, 180 insertions, 7 deletions

diff --git a/keyboards/salicylic_acid3/naked64/rev1/config.h b/keyboards/salicylic_acid3/naked64/rev1/config.h
index b4699a9ca2..0bc5656fea 100644
--- a/keyboards/salicylic_acid3/naked64/rev1/config.h
+++ b/keyboards/salicylic_acid3/naked64/rev1/config.h
@@ -18,13 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x3060
-#define DEVICE_VER      0x0003
-#define MANUFACTURER    Salicylic_Acid
-#define PRODUCT         naked64
-
 /* key matrix size */
 #define MATRIX_ROWS 16
 #define MATRIX_COLS 8
diff --git a/keyboards/salicylic_acid3/naked64/rev1/info.json b/keyboards/salicylic_acid3/naked64/rev1/info.json
new file mode 100644
index 0000000000..c8fe578271
--- /dev/null
+++ b/keyboards/salicylic_acid3/naked64/rev1/info.json
@@ -0,0 +1,180 @@
+{
+    "keyboard_name": "naked64",
+    "manufacturer": "Salicylic_Acid",
+    "url": "https://salicylic-acid3.hatenablog.com/",
+    "maintainer": "Salicylic_acid3",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x3060",
+        "device_version": "0.0.3"
+    },
+    "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":"&uarr;", "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":"&dArr;", "x":7, "y":4.25},
+                {"label":"&uArr;", "x":9.25, "y":4.25},
+                {"x":10.25, "y":4.25, "w":2},
+                {"label":"GUI", "x":12.25, "y":4.25},
+                {"label":"&larr;", "x":13.5, "y":4},
+                {"label":"&darr;", "x":14.5, "y":4},
+                {"label":"&rarr;", "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":"&uarr;", "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":"&dArr;", "x":7, "y":4.25},
+                {"label":"&uArr;", "x":9.25, "y":4.25},
+                {"x":10.25, "y":4.25, "w":2},
+                {"label":"GUI", "x":12.25, "y":4.25},
+                {"label":"&larr;", "x":13.5, "y":4},
+                {"label":"&darr;", "x":14.5, "y":4},
+                {"label":"&rarr;", "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}
+            ]
+        }
+    }
+}