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

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
 

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": [