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

keyboards/uk78/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       0x554B // "UK"
-#define PRODUCT_ID      0x004E // 78
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    UK Keyboards
-#define PRODUCT         UK78
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 19

keyboards/ungodly/launch_pad/config.h

@@ -17,13 +17,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x5544   // "UD" = Ungodly Design
-#define PRODUCT_ID 0x4C50  // "LP" = Launch Pad
-#define DEVICE_VER 0x9999
-#define MANUFACTURER Ungodly Design
-#define PRODUCT Launch Pad
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 4

keyboards/ungodly/launch_pad/info.json

@@ -1,7 +1,13 @@
 {
   "keyboard_name": "Launch Pad",
+  "manufacturer": "Ungodly Design",
   "url": "https://ungodly.design/products/launch-pad",
   "maintainer": "Ungodly Design",
+  "usb": {
+    "vid": "0x5544",
+    "pid": "0x4C50",
+    "device_version": "99.9.9"
+  },
   "layouts": {
     "LAYOUT_ortho_5x4": {
         "layout": [

keyboards/ungodly/nines/config.h

@@ -17,13 +17,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x5544 // "UD" = Ungodly Design
-#define PRODUCT_ID      0x544E // "TN" = The Nines
-#define DEVICE_VER      0x9999
-#define MANUFACTURER    Ungodly Design
-#define PRODUCT         The Nines
-
 /* key matrix size */
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 3

keyboards/ungodly/nines/info.json

@@ -1,7 +1,13 @@
 {
   "keyboard_name": "The Nines",
+  "manufacturer": "Ungodly Design",
   "url": "https://www.qlavier.com/",
   "maintainer": "Ungodly Design",
+  "usb": {
+    "vid": "0x5544",
+    "pid": "0x544E",
+    "device_version": "99.9.9"
+  },
   "layouts": {
     "LAYOUT_ortho_3x3": {
       "layout": [

keyboards/unikeyboard/diverge3/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      0x1257
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    UniKeyboard
-#define PRODUCT         diverge3
-
 /* key matrix size */
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 8

keyboards/unikeyboard/diverge3/info.json

@@ -1,7 +1,13 @@
 {
   "keyboard_name": "Diverge3",
+  "manufacturer": "UniKeyboard",
   "url": "",
   "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x1257",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [{"x":0, "y":0}, {"x":1, "y":0.75}, {"x":2, "y":0.25}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0.25}, {"x":6, "y":0.5}, {"x":10, "y":0.5}, {"x":11, "y":0.25}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0.25}, {"x":15, "y":0.75}, {"x":16, "y":0}, {"x":0, "y":1}, {"x":1, "y":1.75}, {"x":2, "y":1.25}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1.25}, {"x":6, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.25}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1.25}, {"x":15, "y":1.75}, {"x":16, "y":1}, {"x":0, "y":2}, {"x":1, "y":2.75}, {"x":2, "y":2.25}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2.25}, {"x":6, "y":2.5}, {"x":10, "y":2.5}, {"x":11, "y":2.25}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2.25}, {"x":15, "y":2.75}, {"x":16, "y":2}, {"x":0, "y":3}, {"x":1, "y":3.75}, {"x":2, "y":3.25}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3.25}, {"x":6, "y":3.5}, {"x":10, "y":3.5}, {"x":11, "y":3.25}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3.25}, {"x":15, "y":3.75}, {"x":16, "y":3}, {"x":0, "y":4}, {"x":1, "y":4.75}, {"x":2, "y":4.25}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4.75, "h":1.25}, {"x":6, "y":5, "h":1.25}, {"x":7, "y":5.25}, {"x":9, "y":5.25}, {"x":10, "y":5, "h":1.25}, {"x":11, "y":4.75, "h":1.25}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4.25}, {"x":15, "y":4.75}, {"x":16, "y":4}]

keyboards/unikeyboard/divergetm2/config.h

@@ -19,13 +19,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x1256
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    UniKeyboard
-#define PRODUCT         diverge tm2
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 6

keyboards/unikeyboard/divergetm2/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "UniKeyboard Diverge TM 2",
+    "keyboard_name": "Diverge TM 2",
+    "manufacturer": "UniKeyboard",
     "url": "",
     "maintainer": "islandman93, xton",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x1256",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/unikeyboard/felix/config.h

@@ -2,13 +2,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x6060
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Unikeyboard
-#define PRODUCT         Felix
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 4

keyboards/unikeyboard/felix/info.json

@@ -1,7 +1,13 @@
 {
   "keyboard_name": "Felix",
+  "manufacturer": "UniKeyboard",
   "url": "",
   "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x6060",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT_ortho_5x4": {
       "layout": [

keyboards/unikorn/config.h

@@ -19,12 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#define VENDOR_ID       0x5354 // Singa x TGR (ST)
-#define PRODUCT_ID      0x556B // UK
-#define DEVICE_VER      0x0200
-#define MANUFACTURER    Singa x TGR
-#define PRODUCT         Unikorn60
-
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
 

keyboards/unikorn/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Unikorn 60", 
+    "keyboard_name": "Unikorn60", 
+    "manufacturer": "Singa x TGR",
     "url": "", 
     "maintainer": "qmk", 
+    "usb": {
+        "vid": "0x5354",
+        "pid": "0x556B",
+        "device_version": "2.0.0"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2}, {"x":13.75, "y":2, "w":1.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.25}, {"x":6, "y":4, "w":1.25}, {"x":7.25, "y":4, "w":2.75}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":13.75, "y":4, "w":1.25}]

keyboards/unison/v04/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 0xB9DD
-#define PRODUCT_ID 0x176A
-#define DEVICE_VER 0x0040
-#define MANUFACTURER jpskenn
-#define PRODUCT Unison
-
 /* key matrix size */
 /* NOTE: With Round-Robin matrix, set same size for both. */
 #define MATRIX_ROWS 10

keyboards/unison/v04/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Unison",
+    "manufacturer": "jpskenn",
     "url": "https://github.com/jpskenn/Unison",
     "maintainer": "jpskenn",
+    "usb": {
+        "vid": "0xB9DD",
+        "pid": "0x176A",
+        "device_version": "0.4.0"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/uranuma/config.h

@@ -2,13 +2,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x112D
-#define DEVICE_VER 0x0001
-#define MANUFACTURER yohewi
-#define PRODUCT UraNuma
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 10

keyboards/uranuma/info.json

@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "Uranuma", 
+  "keyboard_name": "UraNuma", 
+  "manufacturer": "yohewi",
   "url": "", 
   "maintainer": "yohewi", 
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x112D",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [

keyboards/utd80/config.h

@@ -17,13 +17,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x001C
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    UTD
-#define PRODUCT         UTD80
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 16

keyboards/utd80/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "UTD80",
+    "manufacturer": "UTD",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+      "vid": "0xFEED",
+      "pid": "0x001C",
+      "device_version": "0.0.1"
+    },
     "layouts": {
       "LAYOUT_tkl_ansi_wkl": {
         "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5, "w":2}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.5, "y":2.5, "w":1.5}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5, "w":2.25}, {"x":0, "y":4.5, "w":2.25}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":2.75}, {"x":16.25, "y":4.5}, {"x":0, "y":5.5, "w":1.5}, {"x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"x":11, "y":5.5, "w":1.5}, {"x":13.5, "y":5.5, "w":1.5}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}]