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

keyboards/splitkb/kyria/rev2/config.h

@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID    0x8D1D
-#define PRODUCT_ID   0x9D9D
-#define DEVICE_VER   0x0002
-#define MANUFACTURER splitkb
-#define PRODUCT      Kyria rev2
-
 /* key matrix size */
 /* Rows are doubled up */
 #define MATRIX_ROWS  8

keyboards/splitkb/kyria/rev2/info.json

@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Kyria rev2",
+    "usb": {
+        "device_version": "0.0.2"
+    }
+}