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

keyboards/splitkb/zima/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    0x8D1D
-#define PRODUCT_ID   0xF75B
-#define DEVICE_VER   0x0001
-#define MANUFACTURER splitkb
-#define PRODUCT      Zima
-
 /* key matrix size */
 #define MATRIX_ROWS  4
 #define MATRIX_COLS  3

keyboards/splitkb/zima/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Zima",
+    "manufacturer": "splitkb",
     "url": "splitkb.com",
     "maintainer": "splitkb.com, drashna",
+    "usb": {
+        "vid": "0x8D1D",
+        "pid": "0xF75B",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_ortho_4x3": {
             "layout": [