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

keyboards/handwired/tractyl_manuform/4x6_right/config.h

@@ -20,10 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#define PRODUCT_ID  0x3537
-#define DEVICE_VER  0x0001
-#define PRODUCT     Tractyl Manuform(4x6)
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 10

keyboards/handwired/tractyl_manuform/4x6_right/info.json

@@ -1,7 +1,11 @@
 {
-    "keyboard_name": "Tractyl Manuform 4x6",
+    "keyboard_name": "Tractyl Manuform (4x6)",
     "url": "",
     "maintainer": "drashna",
+    "usb": {
+        "pid": "0x3537",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_4x6_right": {
             "layout": [