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

2022-07-25 10:15:47 -07:00
parent 7d2260ab75 1df6322f10
commit 99c48f1361
100 changed files with 325 additions and 354 deletions
--- a/keyboards/bbrfkr/dynamis/config.h
+++ b/keyboards/bbrfkr/dynamis/config.h
@@ -18,13 +18,6 @@

 #include "config_common.h"

-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x6262
-#define PRODUCT_ID 0x0001
-#define DEVICE_VER 0x0001
-#define MANUFACTURER bbrfkr
-#define PRODUCT dynamis
-
 /* key matrix */
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 7
--- a/keyboards/bbrfkr/dynamis/info.json
+++ b/keyboards/bbrfkr/dynamis/info.json
@@ -1,7 +1,13 @@
 {
    "keyboard_name": "dynamis",
+    "manufacturer": "bbrfkr",
    "url": "https://github.com/bbrfkr/keyboards",
    "maintainer": "bbrfkr",
+    "usb": {
+        "vid": "0x6262",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
    "layouts": {
        "LAYOUT_ansi": {
            "layout": [