Merge remote-tracking branch 'origin/master' into develop

10 files changed, 32 insertions, 37 deletions

diff --git a/keyboards/sneakbox/aliceclone/config.h b/keyboards/sneakbox/aliceclone/config.h
index 492c5680b8..6d56aece7c 100644
--- a/keyboards/sneakbox/aliceclone/config.h
+++ b/keyboards/sneakbox/aliceclone/config.h
@@ -19,13 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x5342
-#define PRODUCT_ID      0x0001
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Sneakbox
-#define PRODUCT         AliceClone
-
 /*Bootmagic boot button, set to topmost, leftmost key */
 #define BOOTMAGIC_LITE_ROW	2
 #define BOOTMAGIC_LITE_COLUMN	0
diff --git a/keyboards/sneakbox/aliceclone/info.json b/keyboards/sneakbox/aliceclone/info.json
index 9fbee0c692..9fc342135d 100644
--- a/keyboards/sneakbox/aliceclone/info.json
+++ b/keyboards/sneakbox/aliceclone/info.json
@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "Alice Clone",
+  "keyboard_name": "AliceClone",
+  "manufacturer": "Sneakbox",
   "url": "https://sneakbox.design",
   "maintainer": "mujimanic",
+  "usb": {
+    "vid": "0x5342",
+    "pid": "0x0001",
+    "device_version": "0.0.1"
+  },
   "layouts": {
       "LAYOUT_alice_split_bs": {
           "layout": [
diff --git a/keyboards/sneakbox/aliceclonergb/config.h b/keyboards/sneakbox/aliceclonergb/config.h
index 6e30dbca96..0218fc0675 100644
--- a/keyboards/sneakbox/aliceclonergb/config.h
+++ b/keyboards/sneakbox/aliceclonergb/config.h
@@ -19,13 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x5342
-#define PRODUCT_ID      0x0006
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Sneakbox
-#define PRODUCT         AliceClone RGB
-
 /*Bootmagic boot button, set to topmost, leftmost key */
 #define BOOTMAGIC_LITE_ROW	2
 #define BOOTMAGIC_LITE_COLUMN	0
diff --git a/keyboards/sneakbox/aliceclonergb/info.json b/keyboards/sneakbox/aliceclonergb/info.json
index 9fbee0c692..867ae9497a 100644
--- a/keyboards/sneakbox/aliceclonergb/info.json
+++ b/keyboards/sneakbox/aliceclonergb/info.json
@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "Alice Clone",
+  "keyboard_name": "AliceClone RGB",
+  "manufacturer": "Sneakbox",
   "url": "https://sneakbox.design",
   "maintainer": "mujimanic",
+  "usb": {
+    "vid": "0x5342",
+    "pid": "0x0006",
+    "device_version": "0.0.1"
+  },
   "layouts": {
       "LAYOUT_alice_split_bs": {
           "layout": [
diff --git a/keyboards/sneakbox/ava/config.h b/keyboards/sneakbox/ava/config.h
index 81fdf5b374..7c7f3b0ad9 100644
--- a/keyboards/sneakbox/ava/config.h
+++ b/keyboards/sneakbox/ava/config.h
@@ -19,13 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x5342
-#define PRODUCT_ID      0x0004
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Sneakbox
-#define PRODUCT         AVA
-
 /*Bootmagic boot button, set to topmost, leftmost key */
 #define BOOTMAGIC_LITE_ROW	2
 #define BOOTMAGIC_LITE_COLUMN	0
diff --git a/keyboards/sneakbox/ava/info.json b/keyboards/sneakbox/ava/info.json
index 276efce018..dc31241874 100644
--- a/keyboards/sneakbox/ava/info.json
+++ b/keyboards/sneakbox/ava/info.json
@@ -1,7 +1,13 @@
 {
   "keyboard_name": "AVA",
+  "manufacturer": "Sneakbox",
   "url": "https://sneakbox.com",
   "maintainer": "mujimanic",
+  "usb": {
+    "vid": "0x5342",
+    "pid": "0x0004",
+    "device_version": "0.0.1"
+  },
   "layout_aliases": {
       "LAYOUT_alice_split_bs": "LAYOUT_ava_split_bs",
       "LAYOUT_alice": "LAYOUT_ava"
diff --git a/keyboards/sneakbox/disarray/ortho/config.h b/keyboards/sneakbox/disarray/ortho/config.h
index 72b3265db6..1e02d62d76 100644
--- a/keyboards/sneakbox/disarray/ortho/config.h
+++ b/keyboards/sneakbox/disarray/ortho/config.h
@@ -19,13 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x5342
-#define PRODUCT_ID      0x0003
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Sneakbox
-#define PRODUCT         Disarray (Ortholinear Layout)
-
 /*Bootmagic boot button, set to topmost, leftmost key */
 #define BOOTMAGIC_LITE_ROW	1
 #define BOOTMAGIC_LITE_COLUMN	0
diff --git a/keyboards/sneakbox/disarray/ortho/info.json b/keyboards/sneakbox/disarray/ortho/info.json
index 350e482177..5172c0c963 100644
--- a/keyboards/sneakbox/disarray/ortho/info.json
+++ b/keyboards/sneakbox/disarray/ortho/info.json
@@ -1,7 +1,13 @@
 {
   "keyboard_name": "Disarray (Ortholinear)",
+  "manufacturer": "Sneakbox",
   "url": "https://sneakbox.com",
   "maintainer": "mujimanic",
+  "usb": {
+    "vid": "0x5342",
+    "pid": "0x0003",
+    "device_version": "0.0.1"
+  },
   "layouts": {
       "LAYOUT_all": {
           "layout": [
diff --git a/keyboards/sneakbox/disarray/staggered/config.h b/keyboards/sneakbox/disarray/staggered/config.h
index cc9a2ebd49..140cb58bf1 100644
--- a/keyboards/sneakbox/disarray/staggered/config.h
+++ b/keyboards/sneakbox/disarray/staggered/config.h
@@ -19,13 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x5342
-#define PRODUCT_ID      0x0002
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Sneakbox
-#define PRODUCT         Disarray (Staggered Layout)
-
 /*Bootmagic boot button, set to topmost, leftmost key */
 #define BOOTMAGIC_LITE_ROW	1
 #define BOOTMAGIC_LITE_COLUMN	0
diff --git a/keyboards/sneakbox/disarray/staggered/info.json b/keyboards/sneakbox/disarray/staggered/info.json
index f08d5389bf..2629c1ea4f 100644
--- a/keyboards/sneakbox/disarray/staggered/info.json
+++ b/keyboards/sneakbox/disarray/staggered/info.json
@@ -1,7 +1,13 @@
 {
   "keyboard_name": "Disarray (Staggered)",
+  "manufacturer": "Sneakbox",
   "url": "https://sneakbox.design",
   "maintainer": "mujimanic",
+  "usb": {
+    "vid": "0x5342",
+    "pid": "0x0002",
+    "device_version": "0.0.1"
+  },
   "layouts": {
       "LAYOUT": {
           "layout": [