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

8 files changed, 25 insertions, 29 deletions

diff --git a/keyboards/helix/pico/config.h b/keyboards/helix/pico/config.h
index b08865d0a4..461fbd426b 100644
--- a/keyboards/helix/pico/config.h
+++ b/keyboards/helix/pico/config.h
@@ -19,13 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x3265
-#define PRODUCT_ID      0x0001
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    Yushakobo
-#define PRODUCT         HelixPico
-
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 100
 
diff --git a/keyboards/helix/pico/info.json b/keyboards/helix/pico/info.json
index b9b573a37d..9c69f52fcd 100644
--- a/keyboards/helix/pico/info.json
+++ b/keyboards/helix/pico/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "HelixPico",
+    "manufacturer": "Yushakobo",
     "url": "https://github.com/MakotoKurauchi/helix",
     "maintainer": "MakotoKurauchi",
+    "usb": {
+        "vid": "0x3265",
+        "pid": "0x0001",
+        "device_version": "0.0.2"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/helix/rev2/config.h b/keyboards/helix/rev2/config.h
index 8c6210bae4..c7e9e35db5 100644
--- a/keyboards/helix/rev2/config.h
+++ b/keyboards/helix/rev2/config.h
@@ -19,13 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x3265
-#define PRODUCT_ID      0x0000
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Yushakobo
-#define PRODUCT         Helix Beta
-
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 100
 
diff --git a/keyboards/helix/rev2/info.json b/keyboards/helix/rev2/info.json
index f46508de5a..9efe7fdb53 100644
--- a/keyboards/helix/rev2/info.json
+++ b/keyboards/helix/rev2/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Helix rev. 2",
+    "keyboard_name": "Helix Beta",
+    "manufacturer": "Yushakobo",
     "url": "https://github.com/MakotoKurauchi/helix",
     "maintainer": "MakotoKurauchi",
+    "usb": {
+        "vid": "0x3265",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/helix/rev3_4rows/config.h b/keyboards/helix/rev3_4rows/config.h
index 1c0ec4d36c..50d9aa3306 100644
--- a/keyboards/helix/rev3_4rows/config.h
+++ b/keyboards/helix/rev3_4rows/config.h
@@ -20,13 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 #include <stdio.h>
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x3265 //yushakobo
-#define PRODUCT_ID 0x0004 //Helix rev3 4rows
-#define DEVICE_VER 0x0001
-#define MANUFACTURER yushakobo
-#define PRODUCT Helix rev3 4rows
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 7
diff --git a/keyboards/helix/rev3_4rows/info.json b/keyboards/helix/rev3_4rows/info.json
index 7e825ff90c..e5c19a02b5 100644
--- a/keyboards/helix/rev3_4rows/info.json
+++ b/keyboards/helix/rev3_4rows/info.json
@@ -1,7 +1,13 @@
 {
   "keyboard_name": "Helix rev3 4rows",
+  "manufacturer": "yushakobo",
   "url": "",
   "maintainer": "yushakobo",
+  "usb": {
+    "vid": "0x3265",
+    "pid": "0x0004",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [
diff --git a/keyboards/helix/rev3_5rows/config.h b/keyboards/helix/rev3_5rows/config.h
index c880e27c88..589ffda25b 100644
--- a/keyboards/helix/rev3_5rows/config.h
+++ b/keyboards/helix/rev3_5rows/config.h
@@ -20,13 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 #include <stdio.h>
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x3265 //yushakobo
-#define PRODUCT_ID 0x0003 //Helix rev3 5rows
-#define DEVICE_VER 0x0001
-#define MANUFACTURER yushakobo
-#define PRODUCT Helix rev3 5rows
-
 /* key matrix size */
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 7
diff --git a/keyboards/helix/rev3_5rows/info.json b/keyboards/helix/rev3_5rows/info.json
index 5a1e35d8b2..95580e0c08 100644
--- a/keyboards/helix/rev3_5rows/info.json
+++ b/keyboards/helix/rev3_5rows/info.json
@@ -1,7 +1,13 @@
 {
   "keyboard_name": "Helix rev3 5rows",
+  "manufacturer": "yushakobo",
   "url": "",
   "maintainer": "yushakobo",
+  "usb": {
+    "vid": "0x3265",
+    "pid": "0x0003",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [