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

keyboards/massdrop/ctrl/config.h

@@ -20,10 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID           0x04D8
-#define PRODUCT_ID          0xEED2
-#define DEVICE_VER          0x0101
-
 #define MANUFACTURER        "Massdrop Inc."
 #define PRODUCT             "CTRL Keyboard"
 #define SERIAL_NUM          "Unavailable"

keyboards/massdrop/ctrl/info.json

@@ -2,6 +2,11 @@
     "keyboard_name": "CTRL",
     "url": "https://www.massdrop.com/buy/massdrop-ctrl-mechanical-keyboard",
     "maintainer": "Massdrop",
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xEED2",
+        "device_version": "1.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [