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

keyboards/tau4/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    taukeyboards
-#define PRODUCT         tau4
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 12

keyboards/tau4/info.json

@@ -0,0 +1,11 @@
+{
+    "keyboard_name": "tau4",
+    "manufacturer": "taukeyboards",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x6060",
+        "device_version": "0.0.1"
+    }
+}