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

keyboards/ktec/daisy/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       0x4B50
-#define PRODUCT_ID      0xD7DC
-#define DEVICE_VER      0x0501
-#define MANUFACTURER    KTEC
-#define PRODUCT         Daisy
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 11

keyboards/ktec/daisy/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Daisy",
+    "manufacturer": "KTEC",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x4B50",
+        "pid": "0xD7DC",
+        "device_version": "5.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/ktec/staryu/config.h

@@ -18,13 +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       0x1209
-#define PRODUCT_ID      0x2328
-#define DEVICE_VER      0x0205
-#define MANUFACTURER    K.T.E.C.
-#define PRODUCT         Staryu
-
 /* key matrix size */
 #define MATRIX_ROWS 2
 #define MATRIX_COLS 3

keyboards/ktec/staryu/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "staryu", 
+    "keyboard_name": "Staryu", 
+    "manufacturer": "K.T.E.C.",
     "url": "", 
     "maintainer": "qmk", 
+    "usb": {
+        "vid": "0x1209",
+        "pid": "0x2328",
+        "device_version": "2.0.5"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [{"x":1, "y":0}, {"x":2, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}]