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

keyboards/ckeys/handwire_101/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       0xFEED
-#define PRODUCT_ID      0x6060
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    cKeys
-#define PRODUCT         Handwire 101
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 4

keyboards/ckeys/handwire_101/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "cKeys Handwire 101",
+    "keyboard_name": "Handwire 101",
+    "manufacturer": "cKeys",
     "url": "https://ckeys.org/slides/handwire/",
     "maintainer": "brandenbyers",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x6060",
+        "device_version": "0.0.1"
+    },
     "layout_aliases": {
         "LAYOUT": "LAYOUT_ortho_4x4"
     },