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

14 files changed, 46 insertions, 53 deletions

diff --git a/keyboards/salicylic_acid3/7skb/rev1/config.h b/keyboards/salicylic_acid3/7skb/rev1/config.h
index a74cd25c29..e6cddb0a5b 100644
--- a/keyboards/salicylic_acid3/7skb/rev1/config.h
+++ b/keyboards/salicylic_acid3/7skb/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       0x04D8
-#define PRODUCT_ID      0xEB5F
-#define DEVICE_VER      0x0007
-#define MANUFACTURER    Salicylic_Acid
-#define PRODUCT         7skb
-
 /* key matrix size */
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 8
diff --git a/keyboards/salicylic_acid3/7skb/info.json b/keyboards/salicylic_acid3/7skb/rev1/info.json
index f85f32cb6d..7bd508ed7f 100644
--- a/keyboards/salicylic_acid3/7skb/info.json
+++ b/keyboards/salicylic_acid3/7skb/rev1/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "7skb", 
+    "manufacturer": "Salicylic_Acid",
     "url": "https://salicylic-acid3.hatenablog.com/", 
     "maintainer": "Salicylic_acid3", 
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xEB5F",
+        "device_version": "0.0.7"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/salicylic_acid3/getta25/rev1/config.h b/keyboards/salicylic_acid3/getta25/rev1/config.h
index 740a9f3fbd..a039848af9 100644
--- a/keyboards/salicylic_acid3/getta25/rev1/config.h
+++ b/keyboards/salicylic_acid3/getta25/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      0x0013
-#define MANUFACTURER    Salicylic_Acid
-#define PRODUCT         getta25
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 6
diff --git a/keyboards/salicylic_acid3/getta25/info.json b/keyboards/salicylic_acid3/getta25/rev1/info.json
index 980b5142db..23354552ea 100644
--- a/keyboards/salicylic_acid3/getta25/info.json
+++ b/keyboards/salicylic_acid3/getta25/rev1/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Getta25", 
+    "keyboard_name": "getta25", 
+    "manufacturer": "Salicylic_Acid",
     "url": "https://salicylic-acid3.hatenablog.com/", 
     "maintainer": "Salicylic_acid3", 
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x3060",
+        "device_version": "0.1.3"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/config.h b/keyboards/salicylic_acid3/jisplit89/rev1/config.h
index ee5f2ca0bc..9b30c9a242 100644
--- a/keyboards/salicylic_acid3/jisplit89/rev1/config.h
+++ b/keyboards/salicylic_acid3/jisplit89/rev1/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x04D8
-#define PRODUCT_ID      0xEB4F
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Salicylic_Acid
-#define PRODUCT         jisplit89
-
 /* key matrix size */
 #define MATRIX_ROWS 14
 #define MATRIX_COLS 8
diff --git a/keyboards/salicylic_acid3/jisplit89/info.json b/keyboards/salicylic_acid3/jisplit89/rev1/info.json
index 4f138a5262..1279d2475e 100644
--- a/keyboards/salicylic_acid3/jisplit89/info.json
+++ b/keyboards/salicylic_acid3/jisplit89/rev1/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "jisplit89", 
+    "manufacturer": "Salicylic_Acid",
     "url": "https://salicylic-acid3.hatenablog.com/", 
     "maintainer": "Salicylic_acid3", 
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xEB4F",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/salicylic_acid3/naked48/rev1/config.h b/keyboards/salicylic_acid3/naked48/rev1/config.h
index faeb719019..2cc4a46674 100644
--- a/keyboards/salicylic_acid3/naked48/rev1/config.h
+++ b/keyboards/salicylic_acid3/naked48/rev1/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x04D8
-#define PRODUCT_ID      0xE8BA
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Salicylic_Acid
-#define PRODUCT         naked48
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 12
diff --git a/keyboards/salicylic_acid3/naked48/info.json b/keyboards/salicylic_acid3/naked48/rev1/info.json
index 8186a6ba5b..fd4639c5cc 100644
--- a/keyboards/salicylic_acid3/naked48/info.json
+++ b/keyboards/salicylic_acid3/naked48/rev1/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Naked48", 
+    "keyboard_name": "naked48", 
+    "manufacturer": "Salicylic_Acid",
     "url": "https://salicylic-acid3.hatenablog.com/", 
     "maintainer": "Salicylic_acid3", 
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xE8BA",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/salicylic_acid3/naked60/rev1/config.h b/keyboards/salicylic_acid3/naked60/rev1/config.h
index b754095011..3f4e663b2d 100644
--- a/keyboards/salicylic_acid3/naked60/rev1/config.h
+++ b/keyboards/salicylic_acid3/naked60/rev1/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x04D8
-#define PRODUCT_ID      0xEB5C
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Salicylic_Acid
-#define PRODUCT         naked60
-
 /* key matrix size */
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 12
diff --git a/keyboards/salicylic_acid3/naked60/info.json b/keyboards/salicylic_acid3/naked60/rev1/info.json
index 8ec020ae72..30b1def9aa 100644
--- a/keyboards/salicylic_acid3/naked60/info.json
+++ b/keyboards/salicylic_acid3/naked60/rev1/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Naked60", 
+    "keyboard_name": "naked60", 
+    "manufacturer": "Salicylic_Acid",
     "url": "https://salicylic-acid3.hatenablog.com/", 
     "maintainer": "Salicylic_acid3", 
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xEB5C",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
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/info.json b/keyboards/salicylic_acid3/naked64/rev1/info.json
index 887f43b087..c8fe578271 100644
--- a/keyboards/salicylic_acid3/naked64/info.json
+++ b/keyboards/salicylic_acid3/naked64/rev1/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Naked64",
+    "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": [
diff --git a/keyboards/salicylic_acid3/setta21/rev1/config.h b/keyboards/salicylic_acid3/setta21/rev1/config.h
index 742a8d73d0..697e7a7d49 100644
--- a/keyboards/salicylic_acid3/setta21/rev1/config.h
+++ b/keyboards/salicylic_acid3/setta21/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      0x0011
-#define MANUFACTURER    Salicylic_Acid
-#define PRODUCT         setta21
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 6
diff --git a/keyboards/salicylic_acid3/setta21/info.json b/keyboards/salicylic_acid3/setta21/rev1/info.json
index 46c06613a8..aa101e7a13 100644
--- a/keyboards/salicylic_acid3/setta21/info.json
+++ b/keyboards/salicylic_acid3/setta21/rev1/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "setta21",
+    "manufacturer": "Salicylic_Acid",
     "url": "https://salicylic-acid3.hatenablog.com/",
     "maintainer": "Salicylic_acid3",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x3060",
+        "device_version": "0.1.1"
+    },
     "layouts": {
         "LAYOUT_numpad_6x4": {
             "layout": [