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

keyboards/neopad/config.h

@@ -18,12 +18,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      0x0913
-#define MANUFACTURER    rookiebwoy
-#define PRODUCT         neopad
-
 /* Column/Row IO definitions */
 #define DIODE_DIRECTION COL2ROW
 

keyboards/neopad/rev1/config.h

@@ -18,9 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define DEVICE_VER      0x0010
-
 /* Column/Row IO definitions */
 #define MATRIX_ROWS 2
 #define MATRIX_COLS 3

keyboards/neopad/rev1/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "neopad",
+    "manufacturer": "rookiebwoy",
     "url": "https://github.com/rookiebwoy/neopad)",
     "maintainer": "rookiebwoy",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0913",
+        "device_version": "0.1.0"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [