aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2020-03-28 13:02:25 +1100
committerGitHub <noreply@github.com>2020-03-28 13:02:25 +1100
commit14079ce6984b359e080c85d9e9b8f7b8eb01437c (patch)
tree7da8f69e8611836197a926946204f04df0fc5140
parent05d9a0ff036d91b7dc4e6198f4074161c1c7b633 (diff)
downloadqmk_firmware-14079ce6984b359e080c85d9e9b8f7b8eb01437c.tar.gz
qmk_firmware-14079ce6984b359e080c85d9e9b8f7b8eb01437c.zip
V-USB: Use structs for USB descriptors (#8572)
* V-USB: Use structs for USB descriptors * Update usbconfigs * cformat pass
Diffstat
-rw-r--r--keyboards/ares/usbconfig.h12
-rw-r--r--keyboards/bfake/usbconfig.h12
-rw-r--r--keyboards/chidori/usbconfig.h12
-rw-r--r--keyboards/coseyfannitutti/discipad/usbconfig.h12
-rw-r--r--keyboards/coseyfannitutti/discipline/usbconfig.h12
-rw-r--r--keyboards/coseyfannitutti/mysterium/usbconfig.h12
-rw-r--r--keyboards/coseyfannitutti/romeo/usbconfig.h12
-rw-r--r--keyboards/db/db63/usbconfig.h12
-rw-r--r--keyboards/donutcables/budget96/usbconfig.h12
-rw-r--r--keyboards/eve/meteor/usbconfig.h12
-rw-r--r--keyboards/exclusive/e6v2/le_bmc/usbconfig.h12
-rw-r--r--keyboards/exclusive/e6v2/oe_bmc/usbconfig.h12
-rw-r--r--keyboards/exent/usbconfig.h12
-rw-r--r--keyboards/facew/usbconfig.h12
-rw-r--r--keyboards/ft/mars80/usbconfig.h12
-rw-r--r--keyboards/gingham/usbconfig.h12
-rw-r--r--keyboards/gray_studio/hb85/usbconfig.h12
-rw-r--r--keyboards/handwired/hnah40/usbconfig.h12
-rw-r--r--keyboards/j80/usbconfig.h12
-rw-r--r--keyboards/jc65/v32a/usbconfig.h12
-rw-r--r--keyboards/jj40/usbconfig.h12
-rw-r--r--keyboards/jj4x4/usbconfig.h12
-rw-r--r--keyboards/jj50/usbconfig.h12
-rw-r--r--keyboards/kbdfans/kbdpad/mk1/usbconfig.h12
-rw-r--r--keyboards/keycapsss/plaid_pad/usbconfig.h12
-rw-r--r--keyboards/kira80/usbconfig.h12
-rw-r--r--keyboards/leeku/finger65/usbconfig.h9
-rw-r--r--keyboards/mechmini/v1/usbconfig.h12
-rw-r--r--keyboards/mehkee96/usbconfig.h12
-rw-r--r--keyboards/mt40/usbconfig.h12
-rw-r--r--keyboards/panc60/usbconfig.h12
-rw-r--r--keyboards/pearl/usbconfig.h12
-rw-r--r--keyboards/percent/canoe/usbconfig.h12
-rw-r--r--keyboards/percent/skog/usbconfig.h12
-rw-r--r--keyboards/percent/skog_lite/usbconfig.h12
-rw-r--r--keyboards/plaid/usbconfig.h12
-rw-r--r--keyboards/singa/usbconfig.h12
-rw-r--r--keyboards/tartan/usbconfig.h12
-rw-r--r--keyboards/tgr/alice/usbconfig.h12
-rw-r--r--keyboards/tgr/jane/usbconfig.h12
-rw-r--r--keyboards/unikorn/usbconfig.h12
-rw-r--r--keyboards/winkeyless/bface/usbconfig.h12
-rw-r--r--keyboards/winkeyless/bmini/usbconfig.h12
-rw-r--r--keyboards/winkeyless/bminiex/usbconfig.h12
-rw-r--r--keyboards/ymd75/usbconfig.h12
-rw-r--r--keyboards/ymd96/usbconfig.h12
-rw-r--r--keyboards/ymdk/bface/usbconfig.h12
-rw-r--r--keyboards/ymdk_np21/usbconfig.h12
-rw-r--r--quantum/template/ps2avrgb/usbconfig.h47
-rw-r--r--tmk_core/protocol/vusb/vusb.c246
-rw-r--r--tmk_core/protocol/vusb/vusb.h76
51 files changed, 370 insertions, 572 deletions
diff --git a/keyboards/ares/usbconfig.h b/keyboards/ares/usbconfig.h
index ad9c95c5d..fd5640a08 100644
--- a/keyboards/ares/usbconfig.h
+++ b/keyboards/ares/usbconfig.h
@@ -208,7 +208,7 @@ section at the end of this file).
208 208
209/* -------------------------- Device Description --------------------------- */ 209/* -------------------------- Device Description --------------------------- */
210 210
211#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 211#define USB_CFG_VENDOR_ID
212/* USB vendor ID for the device, low byte first. If you have registered your 212/* USB vendor ID for the device, low byte first. If you have registered your
213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -217,7 +217,7 @@ section at the end of this file).
217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
218 * the implications! 218 * the implications!
219 */ 219 */
220#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 220#define USB_CFG_DEVICE_ID
221/* This is the ID of the product, low byte first. It is interpreted in the 221/* This is the ID of the product, low byte first. It is interpreted in the
222 * scope of the vendor ID. If you have registered your own VID with usb.org 222 * scope of the vendor ID. If you have registered your own VID with usb.org
223 * or if you have licensed a PID from somebody else, define it here. Otherwise 223 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -228,9 +228,6 @@ section at the end of this file).
228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
229 * the implications! 229 * the implications!
230 */ 230 */
231#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
232/* Version number of the device: Minor number first, then major number.
233 */
234#define USB_CFG_DEVICE_CLASS 0 231#define USB_CFG_DEVICE_CLASS 0
235#define USB_CFG_DEVICE_SUBCLASS 0 232#define USB_CFG_DEVICE_SUBCLASS 0
236/* See USB specification if you want to conform to an existing device class. 233/* See USB specification if you want to conform to an existing device class.
@@ -309,18 +306,15 @@ section at the end of this file).
309 * }; 306 * };
310 */ 307 */
311 308
312#define USB_CFG_DESCR_PROPS_DEVICE 0 309#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
313#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 310#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
314//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
315#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 311#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
316#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 312#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
317#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 313#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
318#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 314#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
319#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 315#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
320#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 316#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
321//#define USB_CFG_DESCR_PROPS_HID 0
322#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 317#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
323//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
324#define USB_CFG_DESCR_PROPS_UNKNOWN 0 318#define USB_CFG_DESCR_PROPS_UNKNOWN 0
325 319
326#define usbMsgPtr_t unsigned short 320#define usbMsgPtr_t unsigned short
diff --git a/keyboards/bfake/usbconfig.h b/keyboards/bfake/usbconfig.h
index ad9c95c5d..fd5640a08 100644
--- a/keyboards/bfake/usbconfig.h
+++ b/keyboards/bfake/usbconfig.h
@@ -208,7 +208,7 @@ section at the end of this file).
208 208
209/* -------------------------- Device Description --------------------------- */ 209/* -------------------------- Device Description --------------------------- */
210 210
211#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 211#define USB_CFG_VENDOR_ID
212/* USB vendor ID for the device, low byte first. If you have registered your 212/* USB vendor ID for the device, low byte first. If you have registered your
213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -217,7 +217,7 @@ section at the end of this file).
217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
218 * the implications! 218 * the implications!
219 */ 219 */
220#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 220#define USB_CFG_DEVICE_ID
221/* This is the ID of the product, low byte first. It is interpreted in the 221/* This is the ID of the product, low byte first. It is interpreted in the
222 * scope of the vendor ID. If you have registered your own VID with usb.org 222 * scope of the vendor ID. If you have registered your own VID with usb.org
223 * or if you have licensed a PID from somebody else, define it here. Otherwise 223 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -228,9 +228,6 @@ section at the end of this file).
228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
229 * the implications! 229 * the implications!
230 */ 230 */
231#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
232/* Version number of the device: Minor number first, then major number.
233 */
234#define USB_CFG_DEVICE_CLASS 0 231#define USB_CFG_DEVICE_CLASS 0
235#define USB_CFG_DEVICE_SUBCLASS 0 232#define USB_CFG_DEVICE_SUBCLASS 0
236/* See USB specification if you want to conform to an existing device class. 233/* See USB specification if you want to conform to an existing device class.
@@ -309,18 +306,15 @@ section at the end of this file).
309 * }; 306 * };
310 */ 307 */
311 308
312#define USB_CFG_DESCR_PROPS_DEVICE 0 309#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
313#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 310#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
314//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
315#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 311#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
316#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 312#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
317#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 313#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
318#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 314#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
319#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 315#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
320#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 316#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
321//#define USB_CFG_DESCR_PROPS_HID 0
322#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 317#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
323//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
324#define USB_CFG_DESCR_PROPS_UNKNOWN 0 318#define USB_CFG_DESCR_PROPS_UNKNOWN 0
325 319
326#define usbMsgPtr_t unsigned short 320#define usbMsgPtr_t unsigned short
diff --git a/keyboards/chidori/usbconfig.h b/keyboards/chidori/usbconfig.h
index ee040d16b..5f2a8baf0 100644
--- a/keyboards/chidori/usbconfig.h
+++ b/keyboards/chidori/usbconfig.h
@@ -208,7 +208,7 @@ section at the end of this file).
208 208
209/* -------------------------- Device Description --------------------------- */ 209/* -------------------------- Device Description --------------------------- */
210 210
211#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 211#define USB_CFG_VENDOR_ID
212/* USB vendor ID for the device, low byte first. If you have registered your 212/* USB vendor ID for the device, low byte first. If you have registered your
213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -217,7 +217,7 @@ section at the end of this file).
217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
218 * the implications! 218 * the implications!
219 */ 219 */
220#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 220#define USB_CFG_DEVICE_ID
221/* This is the ID of the product, low byte first. It is interpreted in the 221/* This is the ID of the product, low byte first. It is interpreted in the
222 * scope of the vendor ID. If you have registered your own VID with usb.org 222 * scope of the vendor ID. If you have registered your own VID with usb.org
223 * or if you have licensed a PID from somebody else, define it here. Otherwise 223 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -228,9 +228,6 @@ section at the end of this file).
228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
229 * the implications! 229 * the implications!
230 */ 230 */
231#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
232/* Version number of the device: Minor number first, then major number.
233 */
234#define USB_CFG_DEVICE_CLASS 0 231#define USB_CFG_DEVICE_CLASS 0
235#define USB_CFG_DEVICE_SUBCLASS 0 232#define USB_CFG_DEVICE_SUBCLASS 0
236/* See USB specification if you want to conform to an existing device class. 233/* See USB specification if you want to conform to an existing device class.
@@ -309,18 +306,15 @@ section at the end of this file).
309 * }; 306 * };
310 */ 307 */
311 308
312#define USB_CFG_DESCR_PROPS_DEVICE 0 309#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
313#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 310#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
314//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
315#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 311#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
316#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 312#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
317#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 313#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
318#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 314#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
319#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 315#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
320#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 316#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
321//#define USB_CFG_DESCR_PROPS_HID 0
322#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 317#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
323//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
324#define USB_CFG_DESCR_PROPS_UNKNOWN 0 318#define USB_CFG_DESCR_PROPS_UNKNOWN 0
325 319
326#define usbMsgPtr_t unsigned short 320#define usbMsgPtr_t unsigned short
diff --git a/keyboards/coseyfannitutti/discipad/usbconfig.h b/keyboards/coseyfannitutti/discipad/usbconfig.h
index ee040d16b..5f2a8baf0 100644
--- a/keyboards/coseyfannitutti/discipad/usbconfig.h
+++ b/keyboards/coseyfannitutti/discipad/usbconfig.h
@@ -208,7 +208,7 @@ section at the end of this file).
208 208
209/* -------------------------- Device Description --------------------------- */ 209/* -------------------------- Device Description --------------------------- */
210 210
211#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 211#define USB_CFG_VENDOR_ID
212/* USB vendor ID for the device, low byte first. If you have registered your 212/* USB vendor ID for the device, low byte first. If you have registered your
213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -217,7 +217,7 @@ section at the end of this file).
217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
218 * the implications! 218 * the implications!
219 */ 219 */
220#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 220#define USB_CFG_DEVICE_ID
221/* This is the ID of the product, low byte first. It is interpreted in the 221/* This is the ID of the product, low byte first. It is interpreted in the
222 * scope of the vendor ID. If you have registered your own VID with usb.org 222 * scope of the vendor ID. If you have registered your own VID with usb.org
223 * or if you have licensed a PID from somebody else, define it here. Otherwise 223 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -228,9 +228,6 @@ section at the end of this file).
228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
229 * the implications! 229 * the implications!
230 */ 230 */
231#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
232/* Version number of the device: Minor number first, then major number.
233 */
234#define USB_CFG_DEVICE_CLASS 0 231#define USB_CFG_DEVICE_CLASS 0
235#define USB_CFG_DEVICE_SUBCLASS 0 232#define USB_CFG_DEVICE_SUBCLASS 0
236/* See USB specification if you want to conform to an existing device class. 233/* See USB specification if you want to conform to an existing device class.
@@ -309,18 +306,15 @@ section at the end of this file).
309 * }; 306 * };
310 */ 307 */
311 308
312#define USB_CFG_DESCR_PROPS_DEVICE 0 309#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
313#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 310#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
314//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
315#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 311#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
316#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 312#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
317#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 313#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
318#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 314#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
319#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 315#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
320#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 316#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
321//#define USB_CFG_DESCR_PROPS_HID 0
322#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 317#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
323//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
324#define USB_CFG_DESCR_PROPS_UNKNOWN 0 318#define USB_CFG_DESCR_PROPS_UNKNOWN 0
325 319
326#define usbMsgPtr_t unsigned short 320#define usbMsgPtr_t unsigned short
diff --git a/keyboards/coseyfannitutti/discipline/usbconfig.h b/keyboards/coseyfannitutti/discipline/usbconfig.h
index ee040d16b..5f2a8baf0 100644
--- a/keyboards/coseyfannitutti/discipline/usbconfig.h
+++ b/keyboards/coseyfannitutti/discipline/usbconfig.h
@@ -208,7 +208,7 @@ section at the end of this file).
208 208
209/* -------------------------- Device Description --------------------------- */ 209/* -------------------------- Device Description --------------------------- */
210 210
211#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 211#define USB_CFG_VENDOR_ID
212/* USB vendor ID for the device, low byte first. If you have registered your 212/* USB vendor ID for the device, low byte first. If you have registered your
213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -217,7 +217,7 @@ section at the end of this file).
217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
218 * the implications! 218 * the implications!
219 */ 219 */
220#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 220#define USB_CFG_DEVICE_ID
221/* This is the ID of the product, low byte first. It is interpreted in the 221/* This is the ID of the product, low byte first. It is interpreted in the
222 * scope of the vendor ID. If you have registered your own VID with usb.org 222 * scope of the vendor ID. If you have registered your own VID with usb.org
223 * or if you have licensed a PID from somebody else, define it here. Otherwise 223 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -228,9 +228,6 @@ section at the end of this file).
228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
229 * the implications! 229 * the implications!
230 */ 230 */
231#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
232/* Version number of the device: Minor number first, then major number.
233 */
234#define USB_CFG_DEVICE_CLASS 0 231#define USB_CFG_DEVICE_CLASS 0
235#define USB_CFG_DEVICE_SUBCLASS 0 232#define USB_CFG_DEVICE_SUBCLASS 0
236/* See USB specification if you want to conform to an existing device class. 233/* See USB specification if you want to conform to an existing device class.
@@ -309,18 +306,15 @@ section at the end of this file).
309 * }; 306 * };
310 */ 307 */
311 308
312#define USB_CFG_DESCR_PROPS_DEVICE 0 309#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
313#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 310#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
314//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
315#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 311#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
316#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 312#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
317#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 313#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
318#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 314#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
319#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 315#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
320#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 316#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
321//#define USB_CFG_DESCR_PROPS_HID 0
322#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 317#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
323//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
324#define USB_CFG_DESCR_PROPS_UNKNOWN 0 318#define USB_CFG_DESCR_PROPS_UNKNOWN 0
325 319
326#define usbMsgPtr_t unsigned short 320#define usbMsgPtr_t unsigned short
diff --git a/keyboards/coseyfannitutti/mysterium/usbconfig.h b/keyboards/coseyfannitutti/mysterium/usbconfig.h
index bec7cc295..82c067a64 100644
--- a/keyboards/coseyfannitutti/mysterium/usbconfig.h
+++ b/keyboards/coseyfannitutti/mysterium/usbconfig.h
@@ -208,7 +208,7 @@ section at the end of this file).
208 208
209/* -------------------------- Device Description --------------------------- */ 209/* -------------------------- Device Description --------------------------- */
210 210
211#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 211#define USB_CFG_VENDOR_ID
212/* USB vendor ID for the device, low byte first. If you have registered your 212/* USB vendor ID for the device, low byte first. If you have registered your
213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -217,7 +217,7 @@ section at the end of this file).
217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
218 * the implications! 218 * the implications!
219 */ 219 */
220#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 220#define USB_CFG_DEVICE_ID
221/* This is the ID of the product, low byte first. It is interpreted in the 221/* This is the ID of the product, low byte first. It is interpreted in the
222 * scope of the vendor ID. If you have registered your own VID with usb.org 222 * scope of the vendor ID. If you have registered your own VID with usb.org
223 * or if you have licensed a PID from somebody else, define it here. Otherwise 223 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -228,9 +228,6 @@ section at the end of this file).
228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
229 * the implications! 229 * the implications!
230 */ 230 */
231#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
232/* Version number of the device: Minor number first, then major number.
233 */
234#define USB_CFG_DEVICE_CLASS 0 231#define USB_CFG_DEVICE_CLASS 0
235#define USB_CFG_DEVICE_SUBCLASS 0 232#define USB_CFG_DEVICE_SUBCLASS 0
236/* See USB specification if you want to conform to an existing device class. 233/* See USB specification if you want to conform to an existing device class.
@@ -309,18 +306,15 @@ section at the end of this file).
309 * }; 306 * };
310 */ 307 */
311 308
312#define USB_CFG_DESCR_PROPS_DEVICE 0 309#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
313#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 310#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
314//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
315#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 311#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
316#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 312#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
317#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 313#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
318#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 314#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
319#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 315#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
320#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 316#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
321//#define USB_CFG_DESCR_PROPS_HID 0
322#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 317#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
323//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
324#define USB_CFG_DESCR_PROPS_UNKNOWN 0 318#define USB_CFG_DESCR_PROPS_UNKNOWN 0
325 319
326#define usbMsgPtr_t unsigned short 320#define usbMsgPtr_t unsigned short
diff --git a/keyboards/coseyfannitutti/romeo/usbconfig.h b/keyboards/coseyfannitutti/romeo/usbconfig.h
index ee040d16b..5f2a8baf0 100644
--- a/keyboards/coseyfannitutti/romeo/usbconfig.h
+++ b/keyboards/coseyfannitutti/romeo/usbconfig.h
@@ -208,7 +208,7 @@ section at the end of this file).
208 208
209/* -------------------------- Device Description --------------------------- */ 209/* -------------------------- Device Description --------------------------- */
210 210
211#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 211#define USB_CFG_VENDOR_ID
212/* USB vendor ID for the device, low byte first. If you have registered your 212/* USB vendor ID for the device, low byte first. If you have registered your
213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -217,7 +217,7 @@ section at the end of this file).
217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
218 * the implications! 218 * the implications!
219 */ 219 */
220#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 220#define USB_CFG_DEVICE_ID
221/* This is the ID of the product, low byte first. It is interpreted in the 221/* This is the ID of the product, low byte first. It is interpreted in the
222 * scope of the vendor ID. If you have registered your own VID with usb.org 222 * scope of the vendor ID. If you have registered your own VID with usb.org
223 * or if you have licensed a PID from somebody else, define it here. Otherwise 223 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -228,9 +228,6 @@ section at the end of this file).
228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
229 * the implications! 229 * the implications!
230 */ 230 */
231#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
232/* Version number of the device: Minor number first, then major number.
233 */
234#define USB_CFG_DEVICE_CLASS 0 231#define USB_CFG_DEVICE_CLASS 0
235#define USB_CFG_DEVICE_SUBCLASS 0 232#define USB_CFG_DEVICE_SUBCLASS 0
236/* See USB specification if you want to conform to an existing device class. 233/* See USB specification if you want to conform to an existing device class.
@@ -309,18 +306,15 @@ section at the end of this file).
309 * }; 306 * };
310 */ 307 */
311 308
312#define USB_CFG_DESCR_PROPS_DEVICE 0 309#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
313#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 310#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
314//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
315#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 311#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
316#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 312#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
317#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 313#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
318#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 314#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
319#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 315#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
320#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 316#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
321//#define USB_CFG_DESCR_PROPS_HID 0
322#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 317#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
323//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
324#define USB_CFG_DESCR_PROPS_UNKNOWN 0 318#define USB_CFG_DESCR_PROPS_UNKNOWN 0
325 319
326#define usbMsgPtr_t unsigned short 320#define usbMsgPtr_t unsigned short
diff --git a/keyboards/db/db63/usbconfig.h b/keyboards/db/db63/usbconfig.h
index a3aa0f7c8..9ffec5280 100644
--- a/keyboards/db/db63/usbconfig.h
+++ b/keyboards/db/db63/usbconfig.h
@@ -207,7 +207,7 @@ section at the end of this file).
207 207
208/* -------------------------- Device Description --------------------------- */ 208/* -------------------------- Device Description --------------------------- */
209 209
210#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 210#define USB_CFG_VENDOR_ID
211/* USB vendor ID for the device, low byte first. If you have registered your 211/* USB vendor ID for the device, low byte first. If you have registered your
212 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 212 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
213 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 213 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -216,7 +216,7 @@ section at the end of this file).
216 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 216 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
217 * the implications! 217 * the implications!
218 */ 218 */
219#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 219#define USB_CFG_DEVICE_ID
220/* This is the ID of the product, low byte first. It is interpreted in the 220/* This is the ID of the product, low byte first. It is interpreted in the
221 * scope of the vendor ID. If you have registered your own VID with usb.org 221 * scope of the vendor ID. If you have registered your own VID with usb.org
222 * or if you have licensed a PID from somebody else, define it here. Otherwise 222 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -227,9 +227,6 @@ section at the end of this file).
227 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 227 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
228 * the implications! 228 * the implications!
229 */ 229 */
230#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
231/* Version number of the device: Minor number first, then major number.
232 */
233#define USB_CFG_DEVICE_CLASS 0 230#define USB_CFG_DEVICE_CLASS 0
234#define USB_CFG_DEVICE_SUBCLASS 0 231#define USB_CFG_DEVICE_SUBCLASS 0
235/* See USB specification if you want to conform to an existing device class. 232/* See USB specification if you want to conform to an existing device class.
@@ -308,18 +305,15 @@ section at the end of this file).
308 * }; 305 * };
309 */ 306 */
310 307
311#define USB_CFG_DESCR_PROPS_DEVICE 0 308#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
312#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 309#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
313//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
314#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 310#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
315#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 311#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
316#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 312#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
317#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 313#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
318#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 314#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
319#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 315#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
320//#define USB_CFG_DESCR_PROPS_HID 0
321#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 316#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
322//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
323#define USB_CFG_DESCR_PROPS_UNKNOWN 0 317#define USB_CFG_DESCR_PROPS_UNKNOWN 0
324 318
325#define usbMsgPtr_t unsigned short 319#define usbMsgPtr_t unsigned short
diff --git a/keyboards/donutcables/budget96/usbconfig.h b/keyboards/donutcables/budget96/usbconfig.h
index d0454d04c..b70db217f 100644
--- a/keyboards/donutcables/budget96/usbconfig.h
+++ b/keyboards/donutcables/budget96/usbconfig.h
@@ -207,7 +207,7 @@ section at the end of this file).
207 207
208/* -------------------------- Device Description --------------------------- */ 208/* -------------------------- Device Description --------------------------- */
209 209
210#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 210#define USB_CFG_VENDOR_ID
211/* USB vendor ID for the device, low byte first. If you have registered your 211/* USB vendor ID for the device, low byte first. If you have registered your
212 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 212 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
213 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 213 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -216,7 +216,7 @@ section at the end of this file).
216 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 216 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
217 * the implications! 217 * the implications!
218 */ 218 */
219#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 219#define USB_CFG_DEVICE_ID
220/* This is the ID of the product, low byte first. It is interpreted in the 220/* This is the ID of the product, low byte first. It is interpreted in the
221 * scope of the vendor ID. If you have registered your own VID with usb.org 221 * scope of the vendor ID. If you have registered your own VID with usb.org
222 * or if you have licensed a PID from somebody else, define it here. Otherwise 222 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -227,9 +227,6 @@ section at the end of this file).
227 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 227 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
228 * the implications! 228 * the implications!
229 */ 229 */
230#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
231/* Version number of the device: Minor number first, then major number.
232 */
233#define USB_CFG_DEVICE_CLASS 0 230#define USB_CFG_DEVICE_CLASS 0
234#define USB_CFG_DEVICE_SUBCLASS 0 231#define USB_CFG_DEVICE_SUBCLASS 0
235/* See USB specification if you want to conform to an existing device class. 232/* See USB specification if you want to conform to an existing device class.
@@ -308,18 +305,15 @@ section at the end of this file).
308 * }; 305 * };
309 */ 306 */
310 307
311#define USB_CFG_DESCR_PROPS_DEVICE 0 308#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
312#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 309#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
313//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
314#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 310#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
315#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 311#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
316#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 312#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
317#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 313#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
318#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 314#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
319#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 315#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
320//#define USB_CFG_DESCR_PROPS_HID 0
321#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 316#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
322//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
323#define USB_CFG_DESCR_PROPS_UNKNOWN 0 317#define USB_CFG_DESCR_PROPS_UNKNOWN 0
324 318
325#define usbMsgPtr_t unsigned short 319#define usbMsgPtr_t unsigned short
diff --git a/keyboards/eve/meteor/usbconfig.h b/keyboards/eve/meteor/usbconfig.h
index 5fad0b3a5..0874f1173 100644
--- a/keyboards/eve/meteor/usbconfig.h
+++ b/keyboards/eve/meteor/usbconfig.h
@@ -197,7 +197,7 @@ section at the end of this file).
197 197
198/* -------------------------- Device Description --------------------------- */ 198/* -------------------------- Device Description --------------------------- */
199 199
200#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 200#define USB_CFG_VENDOR_ID
201/* USB vendor ID for the device, low byte first. If you have registered your 201/* USB vendor ID for the device, low byte first. If you have registered your
202 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 202 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
203 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 203 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -206,7 +206,7 @@ section at the end of this file).
206 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 206 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
207 * the implications! 207 * the implications!
208 */ 208 */
209#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 209#define USB_CFG_DEVICE_ID
210/* This is the ID of the product, low byte first. It is interpreted in the 210/* This is the ID of the product, low byte first. It is interpreted in the
211 * scope of the vendor ID. If you have registered your own VID with usb.org 211 * scope of the vendor ID. If you have registered your own VID with usb.org
212 * or if you have licensed a PID from somebody else, define it here. Otherwise 212 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -217,9 +217,6 @@ section at the end of this file).
217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
218 * the implications! 218 * the implications!
219 */ 219 */
220#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
221/* Version number of the device: Minor number first, then major number.
222 */
223#define USB_CFG_DEVICE_CLASS 0 220#define USB_CFG_DEVICE_CLASS 0
224#define USB_CFG_DEVICE_SUBCLASS 0 221#define USB_CFG_DEVICE_SUBCLASS 0
225/* See USB specification if you want to conform to an existing device class. 222/* See USB specification if you want to conform to an existing device class.
@@ -298,18 +295,15 @@ section at the end of this file).
298 * }; 295 * };
299 */ 296 */
300 297
301#define USB_CFG_DESCR_PROPS_DEVICE 0 298#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
302#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 299#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
303//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
304#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 300#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
305#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 301#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
306#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 302#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
307#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 303#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
308#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 304#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
309#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 305#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
310//#define USB_CFG_DESCR_PROPS_HID 0
311#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 306#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
312//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
313#define USB_CFG_DESCR_PROPS_UNKNOWN 0 307#define USB_CFG_DESCR_PROPS_UNKNOWN 0
314 308
315#define usbMsgPtr_t unsigned short 309#define usbMsgPtr_t unsigned short
diff --git a/keyboards/exclusive/e6v2/le_bmc/usbconfig.h b/keyboards/exclusive/e6v2/le_bmc/usbconfig.h
index a3aa0f7c8..9ffec5280 100644
--- a/keyboards/exclusive/e6v2/le_bmc/usbconfig.h
+++ b/keyboards/exclusive/e6v2/le_bmc/usbconfig.h
@@ -207,7 +207,7 @@ section at the end of this file).
207 207
208/* -------------------------- Device Description --------------------------- */ 208/* -------------------------- Device Description --------------------------- */
209 209
210#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 210#define USB_CFG_VENDOR_ID
211/* USB vendor ID for the device, low byte first. If you have registered your 211/* USB vendor ID for the device, low byte first. If you have registered your
212 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 212 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
213 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 213 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -216,7 +216,7 @@ section at the end of this file).
216 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 216 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
217 * the implications! 217 * the implications!
218 */ 218 */
219#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 219#define USB_CFG_DEVICE_ID
220/* This is the ID of the product, low byte first. It is interpreted in the 220/* This is the ID of the product, low byte first. It is interpreted in the
221 * scope of the vendor ID. If you have registered your own VID with usb.org 221 * scope of the vendor ID. If you have registered your own VID with usb.org
222 * or if you have licensed a PID from somebody else, define it here. Otherwise 222 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -227,9 +227,6 @@ section at the end of this file).
227 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 227 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
228 * the implications! 228 * the implications!
229 */ 229 */
230#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
231/* Version number of the device: Minor number first, then major number.
232 */
233#define USB_CFG_DEVICE_CLASS 0 230#define USB_CFG_DEVICE_CLASS 0
234#define USB_CFG_DEVICE_SUBCLASS 0 231#define USB_CFG_DEVICE_SUBCLASS 0
235/* See USB specification if you want to conform to an existing device class. 232/* See USB specification if you want to conform to an existing device class.
@@ -308,18 +305,15 @@ section at the end of this file).
308 * }; 305 * };
309 */ 306 */
310 307
311#define USB_CFG_DESCR_PROPS_DEVICE 0 308#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
312#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 309#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
313//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
314#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 310#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
315#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 311#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
316#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 312#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
317#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 313#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
318#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 314#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
319#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 315#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
320//#define USB_CFG_DESCR_PROPS_HID 0
321#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 316#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
322//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
323#define USB_CFG_DESCR_PROPS_UNKNOWN 0 317#define USB_CFG_DESCR_PROPS_UNKNOWN 0
324 318
325#define usbMsgPtr_t unsigned short 319#define usbMsgPtr_t unsigned short
diff --git a/keyboards/exclusive/e6v2/oe_bmc/usbconfig.h b/keyboards/exclusive/e6v2/oe_bmc/usbconfig.h
index a3aa0f7c8..9ffec5280 100644
--- a/keyboards/exclusive/e6v2/oe_bmc/usbconfig.h
+++ b/keyboards/exclusive/e6v2/oe_bmc/usbconfig.h
@@ -207,7 +207,7 @@ section at the end of this file).
207 207
208/* -------------------------- Device Description --------------------------- */ 208/* -------------------------- Device Description --------------------------- */
209 209
210#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 210#define USB_CFG_VENDOR_ID
211/* USB vendor ID for the device, low byte first. If you have registered your 211/* USB vendor ID for the device, low byte first. If you have registered your
212 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 212 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
213 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 213 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -216,7 +216,7 @@ section at the end of this file).
216 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 216 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
217 * the implications! 217 * the implications!
218 */ 218 */
219#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 219#define USB_CFG_DEVICE_ID
220/* This is the ID of the product, low byte first. It is interpreted in the 220/* This is the ID of the product, low byte first. It is interpreted in the
221 * scope of the vendor ID. If you have registered your own VID with usb.org 221 * scope of the vendor ID. If you have registered your own VID with usb.org
222 * or if you have licensed a PID from somebody else, define it here. Otherwise 222 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -227,9 +227,6 @@ section at the end of this file).
227 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 227 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
228 * the implications! 228 * the implications!
229 */ 229 */
230#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
231/* Version number of the device: Minor number first, then major number.
232 */
233#define USB_CFG_DEVICE_CLASS 0 230#define USB_CFG_DEVICE_CLASS 0
234#define USB_CFG_DEVICE_SUBCLASS 0 231#define USB_CFG_DEVICE_SUBCLASS 0
235/* See USB specification if you want to conform to an existing device class. 232/* See USB specification if you want to conform to an existing device class.
@@ -308,18 +305,15 @@ section at the end of this file).
308 * }; 305 * };
309 */ 306 */
310 307
311#define USB_CFG_DESCR_PROPS_DEVICE 0 308#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
312#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 309#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
313//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
314#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 310#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
315#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 311#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
316#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 312#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
317#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 313#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
318#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 314#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
319#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 315#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
320//#define USB_CFG_DESCR_PROPS_HID 0
321#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 316#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
322//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
323#define USB_CFG_DESCR_PROPS_UNKNOWN 0 317#define USB_CFG_DESCR_PROPS_UNKNOWN 0
324 318
325#define usbMsgPtr_t unsigned short 319#define usbMsgPtr_t unsigned short
diff --git a/keyboards/exent/usbconfig.h b/keyboards/exent/usbconfig.h
index 4acb6b281..6e910a703 100644
--- a/keyboards/exent/usbconfig.h
+++ b/keyboards/exent/usbconfig.h
@@ -197,7 +197,7 @@ section at the end of this file).
197 197
198/* -------------------------- Device Description --------------------------- */ 198/* -------------------------- Device Description --------------------------- */
199 199
200#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 200#define USB_CFG_VENDOR_ID
201/* USB vendor ID for the device, low byte first. If you have registered your 201/* USB vendor ID for the device, low byte first. If you have registered your
202 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 202 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
203 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 203 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -206,7 +206,7 @@ section at the end of this file).
206 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 206 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
207 * the implications! 207 * the implications!
208 */ 208 */
209#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 209#define USB_CFG_DEVICE_ID
210/* This is the ID of the product, low byte first. It is interpreted in the 210/* This is the ID of the product, low byte first. It is interpreted in the
211 * scope of the vendor ID. If you have registered your own VID with usb.org 211 * scope of the vendor ID. If you have registered your own VID with usb.org
212 * or if you have licensed a PID from somebody else, define it here. Otherwise 212 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -217,9 +217,6 @@ section at the end of this file).
217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
218 * the implications! 218 * the implications!
219 */ 219 */
220#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
221/* Version number of the device: Minor number first, then major number.
222 */
223#define USB_CFG_DEVICE_CLASS 0 220#define USB_CFG_DEVICE_CLASS 0
224#define USB_CFG_DEVICE_SUBCLASS 0 221#define USB_CFG_DEVICE_SUBCLASS 0
225/* See USB specification if you want to conform to an existing device class. 222/* See USB specification if you want to conform to an existing device class.
@@ -298,18 +295,15 @@ section at the end of this file).
298 * }; 295 * };
299 */ 296 */
300 297
301#define USB_CFG_DESCR_PROPS_DEVICE 0 298#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
302#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 299#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
303//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
304#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 300#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
305#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 301#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
306#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 302#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
307#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 303#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
308#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 304#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
309#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 305#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
310//#define USB_CFG_DESCR_PROPS_HID 0
311#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 306#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
312//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
313#define USB_CFG_DESCR_PROPS_UNKNOWN 0 307#define USB_CFG_DESCR_PROPS_UNKNOWN 0
314 308
315#define usbMsgPtr_t unsigned short 309#define usbMsgPtr_t unsigned short
diff --git a/keyboards/facew/usbconfig.h b/keyboards/facew/usbconfig.h
index a3aa0f7c8..9ffec5280 100644
--- a/keyboards/facew/usbconfig.h
+++ b/keyboards/facew/usbconfig.h
@@ -207,7 +207,7 @@ section at the end of this file).
207 207
208/* -------------------------- Device Description --------------------------- */ 208/* -------------------------- Device Description --------------------------- */
209 209
210#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 210#define USB_CFG_VENDOR_ID
211/* USB vendor ID for the device, low byte first. If you have registered your 211/* USB vendor ID for the device, low byte first. If you have registered your
212 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 212 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
213 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 213 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -216,7 +216,7 @@ section at the end of this file).
216 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 216 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
217 * the implications! 217 * the implications!
218 */ 218 */
219#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 219#define USB_CFG_DEVICE_ID
220/* This is the ID of the product, low byte first. It is interpreted in the 220/* This is the ID of the product, low byte first. It is interpreted in the
221 * scope of the vendor ID. If you have registered your own VID with usb.org 221 * scope of the vendor ID. If you have registered your own VID with usb.org
222 * or if you have licensed a PID from somebody else, define it here. Otherwise 222 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -227,9 +227,6 @@ section at the end of this file).
227 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 227 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
228 * the implications! 228 * the implications!
229 */ 229 */
230#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
231/* Version number of the device: Minor number first, then major number.
232 */
233#define USB_CFG_DEVICE_CLASS 0 230#define USB_CFG_DEVICE_CLASS 0
234#define USB_CFG_DEVICE_SUBCLASS 0 231#define USB_CFG_DEVICE_SUBCLASS 0
235/* See USB specification if you want to conform to an existing device class. 232/* See USB specification if you want to conform to an existing device class.
@@ -308,18 +305,15 @@ section at the end of this file).
308 * }; 305 * };
309 */ 306 */
310 307
311#define USB_CFG_DESCR_PROPS_DEVICE 0 308#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
312#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 309#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
313//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
314#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 310#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
315#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 311#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
316#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 312#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
317#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 313#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
318#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 314#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
319#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 315#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
320//#define USB_CFG_DESCR_PROPS_HID 0
321#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 316#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
322//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
323#define USB_CFG_DESCR_PROPS_UNKNOWN 0 317#define USB_CFG_DESCR_PROPS_UNKNOWN 0
324 318
325#define usbMsgPtr_t unsigned short 319#define usbMsgPtr_t unsigned short
diff --git a/keyboards/ft/mars80/usbconfig.h b/keyboards/ft/mars80/usbconfig.h
index a3aa0f7c8..9ffec5280 100644
--- a/keyboards/ft/mars80/usbconfig.h
+++ b/keyboards/ft/mars80/usbconfig.h
@@ -207,7 +207,7 @@ section at the end of this file).
207 207
208/* -------------------------- Device Description --------------------------- */ 208/* -------------------------- Device Description --------------------------- */
209 209
210#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 210#define USB_CFG_VENDOR_ID
211/* USB vendor ID for the device, low byte first. If you have registered your 211/* USB vendor ID for the device, low byte first. If you have registered your
212 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 212 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
213 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 213 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -216,7 +216,7 @@ section at the end of this file).
216 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 216 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
217 * the implications! 217 * the implications!
218 */ 218 */
219#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 219#define USB_CFG_DEVICE_ID
220/* This is the ID of the product, low byte first. It is interpreted in the 220/* This is the ID of the product, low byte first. It is interpreted in the
221 * scope of the vendor ID. If you have registered your own VID with usb.org 221 * scope of the vendor ID. If you have registered your own VID with usb.org
222 * or if you have licensed a PID from somebody else, define it here. Otherwise 222 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -227,9 +227,6 @@ section at the end of this file).
227 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 227 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
228 * the implications! 228 * the implications!
229 */ 229 */
230#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
231/* Version number of the device: Minor number first, then major number.
232 */
233#define USB_CFG_DEVICE_CLASS 0 230#define USB_CFG_DEVICE_CLASS 0
234#define USB_CFG_DEVICE_SUBCLASS 0 231#define USB_CFG_DEVICE_SUBCLASS 0
235/* See USB specification if you want to conform to an existing device class. 232/* See USB specification if you want to conform to an existing device class.
@@ -308,18 +305,15 @@ section at the end of this file).
308 * }; 305 * };
309 */ 306 */
310 307
311#define USB_CFG_DESCR_PROPS_DEVICE 0 308#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
312#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 309#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
313//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
314#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 310#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
315#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 311#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
316#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 312#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
317#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 313#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
318#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 314#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
319#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 315#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
320//#define USB_CFG_DESCR_PROPS_HID 0
321#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 316#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
322//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
323#define USB_CFG_DESCR_PROPS_UNKNOWN 0 317#define USB_CFG_DESCR_PROPS_UNKNOWN 0
324 318
325#define usbMsgPtr_t unsigned short 319#define usbMsgPtr_t unsigned short
diff --git a/keyboards/gingham/usbconfig.h b/keyboards/gingham/usbconfig.h
index ee040d16b..5f2a8baf0 100644
--- a/keyboards/gingham/usbconfig.h
+++ b/keyboards/gingham/usbconfig.h
@@ -208,7 +208,7 @@ section at the end of this file).
208 208
209/* -------------------------- Device Description --------------------------- */ 209/* -------------------------- Device Description --------------------------- */
210 210
211#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 211#define USB_CFG_VENDOR_ID
212/* USB vendor ID for the device, low byte first. If you have registered your 212/* USB vendor ID for the device, low byte first. If you have registered your
213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -217,7 +217,7 @@ section at the end of this file).
217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
218 * the implications! 218 * the implications!
219 */ 219 */
220#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 220#define USB_CFG_DEVICE_ID
221/* This is the ID of the product, low byte first. It is interpreted in the 221/* This is the ID of the product, low byte first. It is interpreted in the
222 * scope of the vendor ID. If you have registered your own VID with usb.org 222 * scope of the vendor ID. If you have registered your own VID with usb.org
223 * or if you have licensed a PID from somebody else, define it here. Otherwise 223 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -228,9 +228,6 @@ section at the end of this file).
228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
229 * the implications! 229 * the implications!
230 */ 230 */
231#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
232/* Version number of the device: Minor number first, then major number.
233 */
234#define USB_CFG_DEVICE_CLASS 0 231#define USB_CFG_DEVICE_CLASS 0
235#define USB_CFG_DEVICE_SUBCLASS 0 232#define USB_CFG_DEVICE_SUBCLASS 0
236/* See USB specification if you want to conform to an existing device class. 233/* See USB specification if you want to conform to an existing device class.
@@ -309,18 +306,15 @@ section at the end of this file).
309 * }; 306 * };
310 */ 307 */
311 308
312#define USB_CFG_DESCR_PROPS_DEVICE 0 309#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
313#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 310#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
314//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
315#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 311#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
316#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 312#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
317#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 313#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
318#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 314#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
319#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 315#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
320#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 316#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
321//#define USB_CFG_DESCR_PROPS_HID 0
322#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 317#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
323//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
324#define USB_CFG_DESCR_PROPS_UNKNOWN 0 318#define USB_CFG_DESCR_PROPS_UNKNOWN 0
325 319
326#define usbMsgPtr_t unsigned short 320#define usbMsgPtr_t unsigned short
diff --git a/keyboards/gray_studio/hb85/usbconfig.h b/keyboards/gray_studio/hb85/usbconfig.h
index a3aa0f7c8..9ffec5280 100644
--- a/keyboards/gray_studio/hb85/usbconfig.h
+++ b/keyboards/gray_studio/hb85/usbconfig.h
@@ -207,7 +207,7 @@ section at the end of this file).
207 207
208/* -------------------------- Device Description --------------------------- */ 208/* -------------------------- Device Description --------------------------- */
209 209
210#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 210#define USB_CFG_VENDOR_ID
211/* USB vendor ID for the device, low byte first. If you have registered your 211/* USB vendor ID for the device, low byte first. If you have registered your
212 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 212 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
213 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 213 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -216,7 +216,7 @@ section at the end of this file).
216 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 216 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
217 * the implications! 217 * the implications!
218 */ 218 */
219#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 219#define USB_CFG_DEVICE_ID
220/* This is the ID of the product, low byte first. It is interpreted in the 220/* This is the ID of the product, low byte first. It is interpreted in the
221 * scope of the vendor ID. If you have registered your own VID with usb.org 221 * scope of the vendor ID. If you have registered your own VID with usb.org
222 * or if you have licensed a PID from somebody else, define it here. Otherwise 222 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -227,9 +227,6 @@ section at the end of this file).
227 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 227 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
228 * the implications! 228 * the implications!
229 */ 229 */
230#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
231/* Version number of the device: Minor number first, then major number.
232 */
233#define USB_CFG_DEVICE_CLASS 0 230#define USB_CFG_DEVICE_CLASS 0
234#define USB_CFG_DEVICE_SUBCLASS 0 231#define USB_CFG_DEVICE_SUBCLASS 0
235/* See USB specification if you want to conform to an existing device class. 232/* See USB specification if you want to conform to an existing device class.
@@ -308,18 +305,15 @@ section at the end of this file).
308 * }; 305 * };
309 */ 306 */
310 307
311#define USB_CFG_DESCR_PROPS_DEVICE 0 308#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
312#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 309#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
313//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
314#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 310#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
315#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 311#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
316#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 312#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
317#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 313#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
318#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 314#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
319#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 315#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
320//#define USB_CFG_DESCR_PROPS_HID 0
321#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 316#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
322//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
323#define USB_CFG_DESCR_PROPS_UNKNOWN 0 317#define USB_CFG_DESCR_PROPS_UNKNOWN 0
324 318
325#define usbMsgPtr_t unsigned short 319#define usbMsgPtr_t unsigned short
diff --git a/keyboards/handwired/hnah40/usbconfig.h b/keyboards/handwired/hnah40/usbconfig.h
index ee040d16b..5f2a8baf0 100644
--- a/keyboards/handwired/hnah40/usbconfig.h
+++ b/keyboards/handwired/hnah40/usbconfig.h
@@ -208,7 +208,7 @@ section at the end of this file).
208 208
209/* -------------------------- Device Description --------------------------- */ 209/* -------------------------- Device Description --------------------------- */
210 210
211#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 211#define USB_CFG_VENDOR_ID
212/* USB vendor ID for the device, low byte first. If you have registered your 212/* USB vendor ID for the device, low byte first. If you have registered your
213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -217,7 +217,7 @@ section at the end of this file).
217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
218 * the implications! 218 * the implications!
219 */ 219 */
220#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 220#define USB_CFG_DEVICE_ID
221/* This is the ID of the product, low byte first. It is interpreted in the 221/* This is the ID of the product, low byte first. It is interpreted in the
222 * scope of the vendor ID. If you have registered your own VID with usb.org 222 * scope of the vendor ID. If you have registered your own VID with usb.org
223 * or if you have licensed a PID from somebody else, define it here. Otherwise 223 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -228,9 +228,6 @@ section at the end of this file).
228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
229 * the implications! 229 * the implications!
230 */ 230 */
231#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
232/* Version number of the device: Minor number first, then major number.
233 */
234#define USB_CFG_DEVICE_CLASS 0 231#define USB_CFG_DEVICE_CLASS 0
235#define USB_CFG_DEVICE_SUBCLASS 0 232#define USB_CFG_DEVICE_SUBCLASS 0
236/* See USB specification if you want to conform to an existing device class. 233/* See USB specification if you want to conform to an existing device class.
@@ -309,18 +306,15 @@ section at the end of this file).
309 * }; 306 * };
310 */ 307 */
311 308
312#define USB_CFG_DESCR_PROPS_DEVICE 0 309#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
313#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 310#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
314//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
315#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 311#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
316#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 312#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
317#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 313#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
318#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 314#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
319#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 315#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
320#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 316#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
321//#define USB_CFG_DESCR_PROPS_HID 0
322#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 317#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
323//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
324#define USB_CFG_DESCR_PROPS_UNKNOWN 0 318#define USB_CFG_DESCR_PROPS_UNKNOWN 0
325 319
326#define usbMsgPtr_t unsigned short 320#define usbMsgPtr_t unsigned short
diff --git a/keyboards/j80/usbconfig.h b/keyboards/j80/usbconfig.h
index 4acb6b281..6e910a703 100644
--- a/keyboards/j80/usbconfig.h
+++ b/keyboards/j80/usbconfig.h
@@ -197,7 +197,7 @@ section at the end of this file).
197 197
198/* -------------------------- Device Description --------------------------- */ 198/* -------------------------- Device Description --------------------------- */
199 199
200#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 200#define USB_CFG_VENDOR_ID
201/* USB vendor ID for the device, low byte first. If you have registered your 201/* USB vendor ID for the device, low byte first. If you have registered your
202 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 202 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
203 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 203 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -206,7 +206,7 @@ section at the end of this file).
206 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 206 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
207 * the implications! 207 * the implications!
208 */ 208 */
209#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 209#define USB_CFG_DEVICE_ID
210/* This is the ID of the product, low byte first. It is interpreted in the 210/* This is the ID of the product, low byte first. It is interpreted in the
211 * scope of the vendor ID. If you have registered your own VID with usb.org 211 * scope of the vendor ID. If you have registered your own VID with usb.org
212 * or if you have licensed a PID from somebody else, define it here. Otherwise 212 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -217,9 +217,6 @@ section at the end of this file).
217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
218 * the implications! 218 * the implications!
219 */ 219 */
220#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
221/* Version number of the device: Minor number first, then major number.
222 */
223#define USB_CFG_DEVICE_CLASS 0 220#define USB_CFG_DEVICE_CLASS 0
224#define USB_CFG_DEVICE_SUBCLASS 0 221#define USB_CFG_DEVICE_SUBCLASS 0
225/* See USB specification if you want to conform to an existing device class. 222/* See USB specification if you want to conform to an existing device class.
@@ -298,18 +295,15 @@ section at the end of this file).
298 * }; 295 * };
299 */ 296 */
300 297
301#define USB_CFG_DESCR_PROPS_DEVICE 0 298#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
302#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 299#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
303//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
304#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 300#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
305#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 301#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
306#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 302#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
307#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 303#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
308#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 304#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
309#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 305#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
310//#define USB_CFG_DESCR_PROPS_HID 0
311#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 306#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
312//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
313#define USB_CFG_DESCR_PROPS_UNKNOWN 0 307#define USB_CFG_DESCR_PROPS_UNKNOWN 0
314 308
315#define usbMsgPtr_t unsigned short 309#define usbMsgPtr_t unsigned short
diff --git a/keyboards/jc65/v32a/usbconfig.h b/keyboards/jc65/v32a/usbconfig.h
index ad9c95c5d..fd5640a08 100644
--- a/keyboards/jc65/v32a/usbconfig.h
+++ b/keyboards/jc65/v32a/usbconfig.h
@@ -208,7 +208,7 @@ section at the end of this file).
208 208
209/* -------------------------- Device Description --------------------------- */ 209/* -------------------------- Device Description --------------------------- */
210 210
211#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 211#define USB_CFG_VENDOR_ID
212/* USB vendor ID for the device, low byte first. If you have registered your 212/* USB vendor ID for the device, low byte first. If you have registered your
213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -217,7 +217,7 @@ section at the end of this file).
217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
218 * the implications! 218 * the implications!
219 */ 219 */
220#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 220#define USB_CFG_DEVICE_ID
221/* This is the ID of the product, low byte first. It is interpreted in the 221/* This is the ID of the product, low byte first. It is interpreted in the
222 * scope of the vendor ID. If you have registered your own VID with usb.org 222 * scope of the vendor ID. If you have registered your own VID with usb.org
223 * or if you have licensed a PID from somebody else, define it here. Otherwise 223 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -228,9 +228,6 @@ section at the end of this file).
228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
229 * the implications! 229 * the implications!
230 */ 230 */
231#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
232/* Version number of the device: Minor number first, then major number.
233 */
234#define USB_CFG_DEVICE_CLASS 0 231#define USB_CFG_DEVICE_CLASS 0
235#define USB_CFG_DEVICE_SUBCLASS 0 232#define USB_CFG_DEVICE_SUBCLASS 0
236/* See USB specification if you want to conform to an existing device class. 233/* See USB specification if you want to conform to an existing device class.
@@ -309,18 +306,15 @@ section at the end of this file).
309 * }; 306 * };
310 */ 307 */
311 308
312#define USB_CFG_DESCR_PROPS_DEVICE 0 309#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
313#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 310#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
314//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
315#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 311#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
316#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 312#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
317#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 313#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
318#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 314#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
319#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 315#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
320#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 316#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
321//#define USB_CFG_DESCR_PROPS_HID 0
322#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 317#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
323//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
324#define USB_CFG_DESCR_PROPS_UNKNOWN 0 318#define USB_CFG_DESCR_PROPS_UNKNOWN 0
325 319
326#define usbMsgPtr_t unsigned short 320#define usbMsgPtr_t unsigned short
diff --git a/keyboards/jj40/usbconfig.h b/keyboards/jj40/usbconfig.h
index ad9c95c5d..fd5640a08 100644
--- a/keyboards/jj40/usbconfig.h
+++ b/keyboards/jj40/usbconfig.h
@@ -208,7 +208,7 @@ section at the end of this file).
208 208
209/* -------------------------- Device Description --------------------------- */ 209/* -------------------------- Device Description --------------------------- */
210 210
211#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 211#define USB_CFG_VENDOR_ID
212/* USB vendor ID for the device, low byte first. If you have registered your 212/* USB vendor ID for the device, low byte first. If you have registered your
213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -217,7 +217,7 @@ section at the end of this file).
217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
218 * the implications! 218 * the implications!
219 */ 219 */
220#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 220#define USB_CFG_DEVICE_ID
221/* This is the ID of the product, low byte first. It is interpreted in the 221/* This is the ID of the product, low byte first. It is interpreted in the
222 * scope of the vendor ID. If you have registered your own VID with usb.org 222 * scope of the vendor ID. If you have registered your own VID with usb.org
223 * or if you have licensed a PID from somebody else, define it here. Otherwise 223 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -228,9 +228,6 @@ section at the end of this file).
228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
229 * the implications! 229 * the implications!
230 */ 230 */
231#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
232/* Version number of the device: Minor number first, then major number.
233 */
234#define USB_CFG_DEVICE_CLASS 0 231#define USB_CFG_DEVICE_CLASS 0
235#define USB_CFG_DEVICE_SUBCLASS 0 232#define USB_CFG_DEVICE_SUBCLASS 0
236/* See USB specification if you want to conform to an existing device class. 233/* See USB specification if you want to conform to an existing device class.
@@ -309,18 +306,15 @@ section at the end of this file).
309 * }; 306 * };
310 */ 307 */
311 308
312#define USB_CFG_DESCR_PROPS_DEVICE 0 309#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
313#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 310#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
314//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
315#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 311#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
316#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 312#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
317#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 313#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
318#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 314#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
319#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 315#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
320#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 316#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
321//#define USB_CFG_DESCR_PROPS_HID 0
322#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 317#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
323//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
324#define USB_CFG_DESCR_PROPS_UNKNOWN 0 318#define USB_CFG_DESCR_PROPS_UNKNOWN 0
325 319
326#define usbMsgPtr_t unsigned short 320#define usbMsgPtr_t unsigned short
diff --git a/keyboards/jj4x4/usbconfig.h b/keyboards/jj4x4/usbconfig.h
index ad9c95c5d..fd5640a08 100644
--- a/keyboards/jj4x4/usbconfig.h
+++ b/keyboards/jj4x4/usbconfig.h
@@ -208,7 +208,7 @@ section at the end of this file).
208 208
209/* -------------------------- Device Description --------------------------- */ 209/* -------------------------- Device Description --------------------------- */
210 210
211#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 211#define USB_CFG_VENDOR_ID
212/* USB vendor ID for the device, low byte first. If you have registered your 212/* USB vendor ID for the device, low byte first. If you have registered your
213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -217,7 +217,7 @@ section at the end of this file).
217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
218 * the implications! 218 * the implications!
219 */ 219 */
220#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 220#define USB_CFG_DEVICE_ID
221/* This is the ID of the product, low byte first. It is interpreted in the 221/* This is the ID of the product, low byte first. It is interpreted in the
222 * scope of the vendor ID. If you have registered your own VID with usb.org 222 * scope of the vendor ID. If you have registered your own VID with usb.org
223 * or if you have licensed a PID from somebody else, define it here. Otherwise 223 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -228,9 +228,6 @@ section at the end of this file).
228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
229 * the implications! 229 * the implications!
230 */ 230 */
231#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
232/* Version number of the device: Minor number first, then major number.
233 */
234#define USB_CFG_DEVICE_CLASS 0 231#define USB_CFG_DEVICE_CLASS 0
235#define USB_CFG_DEVICE_SUBCLASS 0 232#define USB_CFG_DEVICE_SUBCLASS 0
236/* See USB specification if you want to conform to an existing device class. 233/* See USB specification if you want to conform to an existing device class.
@@ -309,18 +306,15 @@ section at the end of this file).
309 * }; 306 * };
310 */ 307 */
311 308
312#define USB_CFG_DESCR_PROPS_DEVICE 0 309#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
313#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 310#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
314//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
315#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 311#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
316#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 312#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
317#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 313#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
318#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 314#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
319#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 315#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
320#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 316#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
321//#define USB_CFG_DESCR_PROPS_HID 0
322#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 317#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
323//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
324#define USB_CFG_DESCR_PROPS_UNKNOWN 0 318#define USB_CFG_DESCR_PROPS_UNKNOWN 0
325 319
326#define usbMsgPtr_t unsigned short 320#define usbMsgPtr_t unsigned short
diff --git a/keyboards/jj50/usbconfig.h b/keyboards/jj50/usbconfig.h
index ad9c95c5d..fd5640a08 100644
--- a/keyboards/jj50/usbconfig.h
+++ b/keyboards/jj50/usbconfig.h
@@ -208,7 +208,7 @@ section at the end of this file).
208 208
209/* -------------------------- Device Description --------------------------- */ 209/* -------------------------- Device Description --------------------------- */
210 210
211#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 211#define USB_CFG_VENDOR_ID
212/* USB vendor ID for the device, low byte first. If you have registered your 212/* USB vendor ID for the device, low byte first. If you have registered your
213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -217,7 +217,7 @@ section at the end of this file).
217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
218 * the implications! 218 * the implications!
219 */ 219 */
220#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 220#define USB_CFG_DEVICE_ID
221/* This is the ID of the product, low byte first. It is interpreted in the 221/* This is the ID of the product, low byte first. It is interpreted in the
222 * scope of the vendor ID. If you have registered your own VID with usb.org 222 * scope of the vendor ID. If you have registered your own VID with usb.org
223 * or if you have licensed a PID from somebody else, define it here. Otherwise 223 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -228,9 +228,6 @@ section at the end of this file).
228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
229 * the implications! 229 * the implications!
230 */ 230 */
231#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
232/* Version number of the device: Minor number first, then major number.
233 */
234#define USB_CFG_DEVICE_CLASS 0 231#define USB_CFG_DEVICE_CLASS 0
235#define USB_CFG_DEVICE_SUBCLASS 0 232#define USB_CFG_DEVICE_SUBCLASS 0
236/* See USB specification if you want to conform to an existing device class. 233/* See USB specification if you want to conform to an existing device class.
@@ -309,18 +306,15 @@ section at the end of this file).
309 * }; 306 * };
310 */ 307 */
311 308
312#define USB_CFG_DESCR_PROPS_DEVICE 0 309#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
313#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 310#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
314//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
315#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 311#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
316#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 312#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
317#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 313#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
318#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 314#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
319#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 315#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
320#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 316#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
321//#define USB_CFG_DESCR_PROPS_HID 0
322#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 317#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
323//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
324#define USB_CFG_DESCR_PROPS_UNKNOWN 0 318#define USB_CFG_DESCR_PROPS_UNKNOWN 0
325 319
326#define usbMsgPtr_t unsigned short 320#define usbMsgPtr_t unsigned short
diff --git a/keyboards/kbdfans/kbdpad/mk1/usbconfig.h b/keyboards/kbdfans/kbdpad/mk1/usbconfig.h
index a3aa0f7c8..9ffec5280 100644
--- a/keyboards/kbdfans/kbdpad/mk1/usbconfig.h
+++ b/keyboards/kbdfans/kbdpad/mk1/usbconfig.h
@@ -207,7 +207,7 @@ section at the end of this file).
207 207
208/* -------------------------- Device Description --------------------------- */ 208/* -------------------------- Device Description --------------------------- */
209 209
210#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 210#define USB_CFG_VENDOR_ID
211/* USB vendor ID for the device, low byte first. If you have registered your 211/* USB vendor ID for the device, low byte first. If you have registered your
212 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 212 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
213 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 213 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -216,7 +216,7 @@ section at the end of this file).
216 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 216 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
217 * the implications! 217 * the implications!
218 */ 218 */
219#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 219#define USB_CFG_DEVICE_ID
220/* This is the ID of the product, low byte first. It is interpreted in the 220/* This is the ID of the product, low byte first. It is interpreted in the
221 * scope of the vendor ID. If you have registered your own VID with usb.org 221 * scope of the vendor ID. If you have registered your own VID with usb.org
222 * or if you have licensed a PID from somebody else, define it here. Otherwise 222 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -227,9 +227,6 @@ section at the end of this file).
227 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 227 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
228 * the implications! 228 * the implications!
229 */ 229 */
230#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
231/* Version number of the device: Minor number first, then major number.
232 */
233#define USB_CFG_DEVICE_CLASS 0 230#define USB_CFG_DEVICE_CLASS 0
234#define USB_CFG_DEVICE_SUBCLASS 0 231#define USB_CFG_DEVICE_SUBCLASS 0
235/* See USB specification if you want to conform to an existing device class. 232/* See USB specification if you want to conform to an existing device class.
@@ -308,18 +305,15 @@ section at the end of this file).
308 * }; 305 * };
309 */ 306 */
310 307
311#define USB_CFG_DESCR_PROPS_DEVICE 0 308#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
312#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 309#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
313//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
314#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 310#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
315#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 311#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
316#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 312#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
317#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 313#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
318#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 314#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
319#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 315#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
320//#define USB_CFG_DESCR_PROPS_HID 0
321#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 316#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
322//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
323#define USB_CFG_DESCR_PROPS_UNKNOWN 0 317#define USB_CFG_DESCR_PROPS_UNKNOWN 0
324 318
325#define usbMsgPtr_t unsigned short 319#define usbMsgPtr_t unsigned short
diff --git a/keyboards/keycapsss/plaid_pad/usbconfig.h b/keyboards/keycapsss/plaid_pad/usbconfig.h
index 0cacbd724..3e88910ce 100644
--- a/keyboards/keycapsss/plaid_pad/usbconfig.h
+++ b/keyboards/keycapsss/plaid_pad/usbconfig.h
@@ -207,7 +207,7 @@ section at the end of this file).
207 207
208/* -------------------------- Device Description --------------------------- */ 208/* -------------------------- Device Description --------------------------- */
209 209
210#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 210#define USB_CFG_VENDOR_ID
211/* USB vendor ID for the device, low byte first. If you have registered your 211/* USB vendor ID for the device, low byte first. If you have registered your
212 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 212 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
213 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 213 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -216,7 +216,7 @@ section at the end of this file).
216 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 216 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
217 * the implications! 217 * the implications!
218 */ 218 */
219#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 219#define USB_CFG_DEVICE_ID
220/* This is the ID of the product, low byte first. It is interpreted in the 220/* This is the ID of the product, low byte first. It is interpreted in the
221 * scope of the vendor ID. If you have registered your own VID with usb.org 221 * scope of the vendor ID. If you have registered your own VID with usb.org
222 * or if you have licensed a PID from somebody else, define it here. Otherwise 222 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -227,9 +227,6 @@ section at the end of this file).
227 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 227 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
228 * the implications! 228 * the implications!
229 */ 229 */
230#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
231/* Version number of the device: Minor number first, then major number.
232 */
233#define USB_CFG_DEVICE_CLASS 0 230#define USB_CFG_DEVICE_CLASS 0
234#define USB_CFG_DEVICE_SUBCLASS 0 231#define USB_CFG_DEVICE_SUBCLASS 0
235/* See USB specification if you want to conform to an existing device class. 232/* See USB specification if you want to conform to an existing device class.
@@ -308,18 +305,15 @@ section at the end of this file).
308 * }; 305 * };
309 */ 306 */
310 307
311#define USB_CFG_DESCR_PROPS_DEVICE 0 308#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
312#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 309#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
313//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
314#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 310#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
315#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 311#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
316#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 312#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
317#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 313#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
318#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 314#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
319#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 315#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
320//#define USB_CFG_DESCR_PROPS_HID 0
321#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 316#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
322//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
323#define USB_CFG_DESCR_PROPS_UNKNOWN 0 317#define USB_CFG_DESCR_PROPS_UNKNOWN 0
324 318
325#define usbMsgPtr_t unsigned short 319#define usbMsgPtr_t unsigned short
diff --git a/keyboards/kira80/usbconfig.h b/keyboards/kira80/usbconfig.h
index ad9c95c5d..fd5640a08 100644
--- a/keyboards/kira80/usbconfig.h
+++ b/keyboards/kira80/usbconfig.h
@@ -208,7 +208,7 @@ section at the end of this file).
208 208
209/* -------------------------- Device Description --------------------------- */ 209/* -------------------------- Device Description --------------------------- */
210 210
211#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 211#define USB_CFG_VENDOR_ID
212/* USB vendor ID for the device, low byte first. If you have registered your 212/* USB vendor ID for the device, low byte first. If you have registered your
213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -217,7 +217,7 @@ section at the end of this file).
217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
218 * the implications! 218 * the implications!
219 */ 219 */
220#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 220#define USB_CFG_DEVICE_ID
221/* This is the ID of the product, low byte first. It is interpreted in the 221/* This is the ID of the product, low byte first. It is interpreted in the
222 * scope of the vendor ID. If you have registered your own VID with usb.org 222 * scope of the vendor ID. If you have registered your own VID with usb.org
223 * or if you have licensed a PID from somebody else, define it here. Otherwise 223 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -228,9 +228,6 @@ section at the end of this file).
228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
229 * the implications! 229 * the implications!
230 */ 230 */
231#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
232/* Version number of the device: Minor number first, then major number.
233 */
234#define USB_CFG_DEVICE_CLASS 0 231#define USB_CFG_DEVICE_CLASS 0
235#define USB_CFG_DEVICE_SUBCLASS 0 232#define USB_CFG_DEVICE_SUBCLASS 0
236/* See USB specification if you want to conform to an existing device class. 233/* See USB specification if you want to conform to an existing device class.
@@ -309,18 +306,15 @@ section at the end of this file).
309 * }; 306 * };
310 */ 307 */
311 308
312#define USB_CFG_DESCR_PROPS_DEVICE 0 309#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
313#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 310#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
314//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
315#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 311#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
316#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 312#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
317#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 313#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
318#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 314#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
319#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 315#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
320#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 316#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
321//#define USB_CFG_DESCR_PROPS_HID 0
322#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 317#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
323//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
324#define USB_CFG_DESCR_PROPS_UNKNOWN 0 318#define USB_CFG_DESCR_PROPS_UNKNOWN 0
325 319
326#define usbMsgPtr_t unsigned short 320#define usbMsgPtr_t unsigned short
diff --git a/keyboards/leeku/finger65/usbconfig.h b/keyboards/leeku/finger65/usbconfig.h
index 12e49e0ee..cb8e44d9d 100644
--- a/keyboards/leeku/finger65/usbconfig.h
+++ b/keyboards/leeku/finger65/usbconfig.h
@@ -207,7 +207,7 @@ section at the end of this file).
207 207
208/* -------------------------- Device Description --------------------------- */ 208/* -------------------------- Device Description --------------------------- */
209 209
210#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 210#define USB_CFG_VENDOR_ID
211/* USB vendor ID for the device, low byte first. If you have registered your 211/* USB vendor ID for the device, low byte first. If you have registered your
212 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 212 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
213 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 213 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -216,7 +216,7 @@ section at the end of this file).
216 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 216 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
217 * the implications! 217 * the implications!
218 */ 218 */
219#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 219#define USB_CFG_DEVICE_ID
220/* This is the ID of the product, low byte first. It is interpreted in the 220/* This is the ID of the product, low byte first. It is interpreted in the
221 * scope of the vendor ID. If you have registered your own VID with usb.org 221 * scope of the vendor ID. If you have registered your own VID with usb.org
222 * or if you have licensed a PID from somebody else, define it here. Otherwise 222 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -227,9 +227,6 @@ section at the end of this file).
227 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 227 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
228 * the implications! 228 * the implications!
229 */ 229 */
230#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
231/* Version number of the device: Minor number first, then major number.
232 */
233#define USB_CFG_DEVICE_CLASS 0 230#define USB_CFG_DEVICE_CLASS 0
234#define USB_CFG_DEVICE_SUBCLASS 0 231#define USB_CFG_DEVICE_SUBCLASS 0
235/* See USB specification if you want to conform to an existing device class. 232/* See USB specification if you want to conform to an existing device class.
@@ -308,7 +305,7 @@ section at the end of this file).
308 * }; 305 * };
309 */ 306 */
310 307
311#define USB_CFG_DESCR_PROPS_DEVICE 0 308#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
312#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 309#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
313#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 310#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
314#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 311#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
diff --git a/keyboards/mechmini/v1/usbconfig.h b/keyboards/mechmini/v1/usbconfig.h
index ad9c95c5d..fd5640a08 100644
--- a/keyboards/mechmini/v1/usbconfig.h
+++ b/keyboards/mechmini/v1/usbconfig.h
@@ -208,7 +208,7 @@ section at the end of this file).
208 208
209/* -------------------------- Device Description --------------------------- */ 209/* -------------------------- Device Description --------------------------- */
210 210
211#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 211#define USB_CFG_VENDOR_ID
212/* USB vendor ID for the device, low byte first. If you have registered your 212/* USB vendor ID for the device, low byte first. If you have registered your
213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -217,7 +217,7 @@ section at the end of this file).
217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
218 * the implications! 218 * the implications!
219 */ 219 */
220#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 220#define USB_CFG_DEVICE_ID
221/* This is the ID of the product, low byte first. It is interpreted in the 221/* This is the ID of the product, low byte first. It is interpreted in the
222 * scope of the vendor ID. If you have registered your own VID with usb.org 222 * scope of the vendor ID. If you have registered your own VID with usb.org
223 * or if you have licensed a PID from somebody else, define it here. Otherwise 223 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -228,9 +228,6 @@ section at the end of this file).
228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
229 * the implications! 229 * the implications!
230 */ 230 */
231#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
232/* Version number of the device: Minor number first, then major number.
233 */
234#define USB_CFG_DEVICE_CLASS 0 231#define USB_CFG_DEVICE_CLASS 0
235#define USB_CFG_DEVICE_SUBCLASS 0 232#define USB_CFG_DEVICE_SUBCLASS 0
236/* See USB specification if you want to conform to an existing device class. 233/* See USB specification if you want to conform to an existing device class.
@@ -309,18 +306,15 @@ section at the end of this file).
309 * }; 306 * };
310 */ 307 */
311 308
312#define USB_CFG_DESCR_PROPS_DEVICE 0 309#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
313#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 310#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
314//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
315#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 311#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
316#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 312#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
317#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 313#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
318#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 314#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
319#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 315#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
320#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 316#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
321//#define USB_CFG_DESCR_PROPS_HID 0
322#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 317#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
323//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
324#define USB_CFG_DESCR_PROPS_UNKNOWN 0 318#define USB_CFG_DESCR_PROPS_UNKNOWN 0
325 319
326#define usbMsgPtr_t unsigned short 320#define usbMsgPtr_t unsigned short
diff --git a/keyboards/mehkee96/usbconfig.h b/keyboards/mehkee96/usbconfig.h
index ad9c95c5d..fd5640a08 100644
--- a/keyboards/mehkee96/usbconfig.h
+++ b/keyboards/mehkee96/usbconfig.h
@@ -208,7 +208,7 @@ section at the end of this file).
208 208
209/* -------------------------- Device Description --------------------------- */ 209/* -------------------------- Device Description --------------------------- */
210 210
211#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 211#define USB_CFG_VENDOR_ID
212/* USB vendor ID for the device, low byte first. If you have registered your 212/* USB vendor ID for the device, low byte first. If you have registered your
213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -217,7 +217,7 @@ section at the end of this file).
217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
218 * the implications! 218 * the implications!
219 */ 219 */
220#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 220#define USB_CFG_DEVICE_ID
221/* This is the ID of the product, low byte first. It is interpreted in the 221/* This is the ID of the product, low byte first. It is interpreted in the
222 * scope of the vendor ID. If you have registered your own VID with usb.org 222 * scope of the vendor ID. If you have registered your own VID with usb.org
223 * or if you have licensed a PID from somebody else, define it here. Otherwise 223 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -228,9 +228,6 @@ section at the end of this file).
228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
229 * the implications! 229 * the implications!
230 */ 230 */
231#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
232/* Version number of the device: Minor number first, then major number.
233 */
234#define USB_CFG_DEVICE_CLASS 0 231#define USB_CFG_DEVICE_CLASS 0
235#define USB_CFG_DEVICE_SUBCLASS 0 232#define USB_CFG_DEVICE_SUBCLASS 0
236/* See USB specification if you want to conform to an existing device class. 233/* See USB specification if you want to conform to an existing device class.
@@ -309,18 +306,15 @@ section at the end of this file).
309 * }; 306 * };
310 */ 307 */
311 308
312#define USB_CFG_DESCR_PROPS_DEVICE 0 309#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
313#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 310#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
314//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
315#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 311#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
316#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 312#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
317#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 313#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
318#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 314#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
319#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 315#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
320#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 316#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
321//#define USB_CFG_DESCR_PROPS_HID 0
322#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 317#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
323//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
324#define USB_CFG_DESCR_PROPS_UNKNOWN 0 318#define USB_CFG_DESCR_PROPS_UNKNOWN 0
325 319
326#define usbMsgPtr_t unsigned short 320#define usbMsgPtr_t unsigned short
diff --git a/keyboards/mt40/usbconfig.h b/keyboards/mt40/usbconfig.h
index ad9c95c5d..fd5640a08 100644
--- a/keyboards/mt40/usbconfig.h
+++ b/keyboards/mt40/usbconfig.h
@@ -208,7 +208,7 @@ section at the end of this file).
208 208
209/* -------------------------- Device Description --------------------------- */ 209/* -------------------------- Device Description --------------------------- */
210 210
211#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 211#define USB_CFG_VENDOR_ID
212/* USB vendor ID for the device, low byte first. If you have registered your 212/* USB vendor ID for the device, low byte first. If you have registered your
213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -217,7 +217,7 @@ section at the end of this file).
217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
218 * the implications! 218 * the implications!
219 */ 219 */
220#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 220#define USB_CFG_DEVICE_ID
221/* This is the ID of the product, low byte first. It is interpreted in the 221/* This is the ID of the product, low byte first. It is interpreted in the
222 * scope of the vendor ID. If you have registered your own VID with usb.org 222 * scope of the vendor ID. If you have registered your own VID with usb.org
223 * or if you have licensed a PID from somebody else, define it here. Otherwise 223 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -228,9 +228,6 @@ section at the end of this file).
228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
229 * the implications! 229 * the implications!
230 */ 230 */
231#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
232/* Version number of the device: Minor number first, then major number.
233 */
234#define USB_CFG_DEVICE_CLASS 0 231#define USB_CFG_DEVICE_CLASS 0
235#define USB_CFG_DEVICE_SUBCLASS 0 232#define USB_CFG_DEVICE_SUBCLASS 0
236/* See USB specification if you want to conform to an existing device class. 233/* See USB specification if you want to conform to an existing device class.
@@ -309,18 +306,15 @@ section at the end of this file).
309 * }; 306 * };
310 */ 307 */
311 308
312#define USB_CFG_DESCR_PROPS_DEVICE 0 309#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
313#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 310#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
314//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
315#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 311#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
316#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 312#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
317#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 313#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
318#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 314#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
319#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 315#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
320#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 316#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
321//#define USB_CFG_DESCR_PROPS_HID 0
322#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 317#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
323//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
324#define USB_CFG_DESCR_PROPS_UNKNOWN 0 318#define USB_CFG_DESCR_PROPS_UNKNOWN 0
325 319
326#define usbMsgPtr_t unsigned short 320#define usbMsgPtr_t unsigned short
diff --git a/keyboards/panc60/usbconfig.h b/keyboards/panc60/usbconfig.h
index a3aa0f7c8..9ffec5280 100644
--- a/keyboards/panc60/usbconfig.h
+++ b/keyboards/panc60/usbconfig.h
@@ -207,7 +207,7 @@ section at the end of this file).
207 207
208/* -------------------------- Device Description --------------------------- */ 208/* -------------------------- Device Description --------------------------- */
209 209
210#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 210#define USB_CFG_VENDOR_ID
211/* USB vendor ID for the device, low byte first. If you have registered your 211/* USB vendor ID for the device, low byte first. If you have registered your
212 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 212 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
213 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 213 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -216,7 +216,7 @@ section at the end of this file).
216 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 216 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
217 * the implications! 217 * the implications!
218 */ 218 */
219#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 219#define USB_CFG_DEVICE_ID
220/* This is the ID of the product, low byte first. It is interpreted in the 220/* This is the ID of the product, low byte first. It is interpreted in the
221 * scope of the vendor ID. If you have registered your own VID with usb.org 221 * scope of the vendor ID. If you have registered your own VID with usb.org
222 * or if you have licensed a PID from somebody else, define it here. Otherwise 222 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -227,9 +227,6 @@ section at the end of this file).
227 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 227 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
228 * the implications! 228 * the implications!
229 */ 229 */
230#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
231/* Version number of the device: Minor number first, then major number.
232 */
233#define USB_CFG_DEVICE_CLASS 0 230#define USB_CFG_DEVICE_CLASS 0
234#define USB_CFG_DEVICE_SUBCLASS 0 231#define USB_CFG_DEVICE_SUBCLASS 0
235/* See USB specification if you want to conform to an existing device class. 232/* See USB specification if you want to conform to an existing device class.
@@ -308,18 +305,15 @@ section at the end of this file).
308 * }; 305 * };
309 */ 306 */
310 307
311#define USB_CFG_DESCR_PROPS_DEVICE 0 308#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
312#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 309#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
313//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
314#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 310#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
315#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 311#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
316#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 312#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
317#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 313#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
318#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 314#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
319#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 315#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
320//#define USB_CFG_DESCR_PROPS_HID 0
321#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 316#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
322//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
323#define USB_CFG_DESCR_PROPS_UNKNOWN 0 317#define USB_CFG_DESCR_PROPS_UNKNOWN 0
324 318
325#define usbMsgPtr_t unsigned short 319#define usbMsgPtr_t unsigned short
diff --git a/keyboards/pearl/usbconfig.h b/keyboards/pearl/usbconfig.h
index a3aa0f7c8..9ffec5280 100644
--- a/keyboards/pearl/usbconfig.h
+++ b/keyboards/pearl/usbconfig.h
@@ -207,7 +207,7 @@ section at the end of this file).
207 207
208/* -------------------------- Device Description --------------------------- */ 208/* -------------------------- Device Description --------------------------- */
209 209
210#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 210#define USB_CFG_VENDOR_ID
211/* USB vendor ID for the device, low byte first. If you have registered your 211/* USB vendor ID for the device, low byte first. If you have registered your
212 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 212 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
213 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 213 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -216,7 +216,7 @@ section at the end of this file).
216 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 216 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
217 * the implications! 217 * the implications!
218 */ 218 */
219#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 219#define USB_CFG_DEVICE_ID
220/* This is the ID of the product, low byte first. It is interpreted in the 220/* This is the ID of the product, low byte first. It is interpreted in the
221 * scope of the vendor ID. If you have registered your own VID with usb.org 221 * scope of the vendor ID. If you have registered your own VID with usb.org
222 * or if you have licensed a PID from somebody else, define it here. Otherwise 222 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -227,9 +227,6 @@ section at the end of this file).
227 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 227 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
228 * the implications! 228 * the implications!
229 */ 229 */
230#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
231/* Version number of the device: Minor number first, then major number.
232 */
233#define USB_CFG_DEVICE_CLASS 0 230#define USB_CFG_DEVICE_CLASS 0
234#define USB_CFG_DEVICE_SUBCLASS 0 231#define USB_CFG_DEVICE_SUBCLASS 0
235/* See USB specification if you want to conform to an existing device class. 232/* See USB specification if you want to conform to an existing device class.
@@ -308,18 +305,15 @@ section at the end of this file).
308 * }; 305 * };
309 */ 306 */
310 307
311#define USB_CFG_DESCR_PROPS_DEVICE 0 308#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
312#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 309#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
313//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
314#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 310#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
315#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 311#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
316#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 312#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
317#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 313#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
318#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 314#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
319#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 315#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
320//#define USB_CFG_DESCR_PROPS_HID 0
321#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 316#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
322//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
323#define USB_CFG_DESCR_PROPS_UNKNOWN 0 317#define USB_CFG_DESCR_PROPS_UNKNOWN 0
324 318
325#define usbMsgPtr_t unsigned short 319#define usbMsgPtr_t unsigned short
diff --git a/keyboards/percent/canoe/usbconfig.h b/keyboards/percent/canoe/usbconfig.h
index ad9c95c5d..fd5640a08 100644
--- a/keyboards/percent/canoe/usbconfig.h
+++ b/keyboards/percent/canoe/usbconfig.h
@@ -208,7 +208,7 @@ section at the end of this file).
208 208
209/* -------------------------- Device Description --------------------------- */ 209/* -------------------------- Device Description --------------------------- */
210 210
211#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 211#define USB_CFG_VENDOR_ID
212/* USB vendor ID for the device, low byte first. If you have registered your 212/* USB vendor ID for the device, low byte first. If you have registered your
213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -217,7 +217,7 @@ section at the end of this file).
217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
218 * the implications! 218 * the implications!
219 */ 219 */
220#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 220#define USB_CFG_DEVICE_ID
221/* This is the ID of the product, low byte first. It is interpreted in the 221/* This is the ID of the product, low byte first. It is interpreted in the
222 * scope of the vendor ID. If you have registered your own VID with usb.org 222 * scope of the vendor ID. If you have registered your own VID with usb.org
223 * or if you have licensed a PID from somebody else, define it here. Otherwise 223 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -228,9 +228,6 @@ section at the end of this file).
228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
229 * the implications! 229 * the implications!
230 */ 230 */
231#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
232/* Version number of the device: Minor number first, then major number.
233 */
234#define USB_CFG_DEVICE_CLASS 0 231#define USB_CFG_DEVICE_CLASS 0
235#define USB_CFG_DEVICE_SUBCLASS 0 232#define USB_CFG_DEVICE_SUBCLASS 0
236/* See USB specification if you want to conform to an existing device class. 233/* See USB specification if you want to conform to an existing device class.
@@ -309,18 +306,15 @@ section at the end of this file).
309 * }; 306 * };
310 */ 307 */
311 308
312#define USB_CFG_DESCR_PROPS_DEVICE 0 309#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
313#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 310#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
314//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
315#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 311#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
316#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 312#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
317#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 313#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
318#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 314#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
319#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 315#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
320#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 316#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
321//#define USB_CFG_DESCR_PROPS_HID 0
322#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 317#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
323//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
324#define USB_CFG_DESCR_PROPS_UNKNOWN 0 318#define USB_CFG_DESCR_PROPS_UNKNOWN 0
325 319
326#define usbMsgPtr_t unsigned short 320#define usbMsgPtr_t unsigned short
diff --git a/keyboards/percent/skog/usbconfig.h b/keyboards/percent/skog/usbconfig.h
index ad9c95c5d..fd5640a08 100644
--- a/keyboards/percent/skog/usbconfig.h
+++ b/keyboards/percent/skog/usbconfig.h
@@ -208,7 +208,7 @@ section at the end of this file).
208 208
209/* -------------------------- Device Description --------------------------- */ 209/* -------------------------- Device Description --------------------------- */
210 210
211#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 211#define USB_CFG_VENDOR_ID
212/* USB vendor ID for the device, low byte first. If you have registered your 212/* USB vendor ID for the device, low byte first. If you have registered your
213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -217,7 +217,7 @@ section at the end of this file).
217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
218 * the implications! 218 * the implications!
219 */ 219 */
220#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 220#define USB_CFG_DEVICE_ID
221/* This is the ID of the product, low byte first. It is interpreted in the 221/* This is the ID of the product, low byte first. It is interpreted in the
222 * scope of the vendor ID. If you have registered your own VID with usb.org 222 * scope of the vendor ID. If you have registered your own VID with usb.org
223 * or if you have licensed a PID from somebody else, define it here. Otherwise 223 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -228,9 +228,6 @@ section at the end of this file).
228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
229 * the implications! 229 * the implications!
230 */ 230 */
231#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
232/* Version number of the device: Minor number first, then major number.
233 */
234#define USB_CFG_DEVICE_CLASS 0 231#define USB_CFG_DEVICE_CLASS 0
235#define USB_CFG_DEVICE_SUBCLASS 0 232#define USB_CFG_DEVICE_SUBCLASS 0
236/* See USB specification if you want to conform to an existing device class. 233/* See USB specification if you want to conform to an existing device class.
@@ -309,18 +306,15 @@ section at the end of this file).
309 * }; 306 * };
310 */ 307 */
311 308
312#define USB_CFG_DESCR_PROPS_DEVICE 0 309#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
313#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 310#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
314//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
315#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 311#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
316#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 312#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
317#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 313#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
318#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 314#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
319#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 315#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
320#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 316#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
321//#define USB_CFG_DESCR_PROPS_HID 0
322#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 317#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
323//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
324#define USB_CFG_DESCR_PROPS_UNKNOWN 0 318#define USB_CFG_DESCR_PROPS_UNKNOWN 0
325 319
326#define usbMsgPtr_t unsigned short 320#define usbMsgPtr_t unsigned short
diff --git a/keyboards/percent/skog_lite/usbconfig.h b/keyboards/percent/skog_lite/usbconfig.h
index a3aa0f7c8..9ffec5280 100644
--- a/keyboards/percent/skog_lite/usbconfig.h
+++ b/keyboards/percent/skog_lite/usbconfig.h
@@ -207,7 +207,7 @@ section at the end of this file).
207 207
208/* -------------------------- Device Description --------------------------- */ 208/* -------------------------- Device Description --------------------------- */
209 209
210#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 210#define USB_CFG_VENDOR_ID
211/* USB vendor ID for the device, low byte first. If you have registered your 211/* USB vendor ID for the device, low byte first. If you have registered your
212 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 212 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
213 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 213 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -216,7 +216,7 @@ section at the end of this file).
216 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 216 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
217 * the implications! 217 * the implications!
218 */ 218 */
219#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 219#define USB_CFG_DEVICE_ID
220/* This is the ID of the product, low byte first. It is interpreted in the 220/* This is the ID of the product, low byte first. It is interpreted in the
221 * scope of the vendor ID. If you have registered your own VID with usb.org 221 * scope of the vendor ID. If you have registered your own VID with usb.org
222 * or if you have licensed a PID from somebody else, define it here. Otherwise 222 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -227,9 +227,6 @@ section at the end of this file).
227 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 227 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
228 * the implications! 228 * the implications!
229 */ 229 */
230#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
231/* Version number of the device: Minor number first, then major number.
232 */
233#define USB_CFG_DEVICE_CLASS 0 230#define USB_CFG_DEVICE_CLASS 0
234#define USB_CFG_DEVICE_SUBCLASS 0 231#define USB_CFG_DEVICE_SUBCLASS 0
235/* See USB specification if you want to conform to an existing device class. 232/* See USB specification if you want to conform to an existing device class.
@@ -308,18 +305,15 @@ section at the end of this file).
308 * }; 305 * };
309 */ 306 */
310 307
311#define USB_CFG_DESCR_PROPS_DEVICE 0 308#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
312#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 309#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
313//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
314#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 310#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
315#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 311#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
316#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 312#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
317#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 313#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
318#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 314#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
319#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 315#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
320//#define USB_CFG_DESCR_PROPS_HID 0
321#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 316#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
322//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
323#define USB_CFG_DESCR_PROPS_UNKNOWN 0 317#define USB_CFG_DESCR_PROPS_UNKNOWN 0
324 318
325#define usbMsgPtr_t unsigned short 319#define usbMsgPtr_t unsigned short
diff --git a/keyboards/plaid/usbconfig.h b/keyboards/plaid/usbconfig.h
index ee040d16b..5f2a8baf0 100644
--- a/keyboards/plaid/usbconfig.h
+++ b/keyboards/plaid/usbconfig.h
@@ -208,7 +208,7 @@ section at the end of this file).
208 208
209/* -------------------------- Device Description --------------------------- */ 209/* -------------------------- Device Description --------------------------- */
210 210
211#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 211#define USB_CFG_VENDOR_ID
212/* USB vendor ID for the device, low byte first. If you have registered your 212/* USB vendor ID for the device, low byte first. If you have registered your
213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -217,7 +217,7 @@ section at the end of this file).
217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
218 * the implications! 218 * the implications!
219 */ 219 */
220#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 220#define USB_CFG_DEVICE_ID
221/* This is the ID of the product, low byte first. It is interpreted in the 221/* This is the ID of the product, low byte first. It is interpreted in the
222 * scope of the vendor ID. If you have registered your own VID with usb.org 222 * scope of the vendor ID. If you have registered your own VID with usb.org
223 * or if you have licensed a PID from somebody else, define it here. Otherwise 223 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -228,9 +228,6 @@ section at the end of this file).
228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
229 * the implications! 229 * the implications!
230 */ 230 */
231#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
232/* Version number of the device: Minor number first, then major number.
233 */
234#define USB_CFG_DEVICE_CLASS 0 231#define USB_CFG_DEVICE_CLASS 0
235#define USB_CFG_DEVICE_SUBCLASS 0 232#define USB_CFG_DEVICE_SUBCLASS 0
236/* See USB specification if you want to conform to an existing device class. 233/* See USB specification if you want to conform to an existing device class.
@@ -309,18 +306,15 @@ section at the end of this file).
309 * }; 306 * };
310 */ 307 */
311 308
312#define USB_CFG_DESCR_PROPS_DEVICE 0 309#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
313#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 310#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
314//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
315#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 311#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
316#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 312#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
317#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 313#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
318#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 314#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
319#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 315#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
320#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 316#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
321//#define USB_CFG_DESCR_PROPS_HID 0
322#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 317#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
323//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
324#define USB_CFG_DESCR_PROPS_UNKNOWN 0 318#define USB_CFG_DESCR_PROPS_UNKNOWN 0
325 319
326#define usbMsgPtr_t unsigned short 320#define usbMsgPtr_t unsigned short
diff --git a/keyboards/singa/usbconfig.h b/keyboards/singa/usbconfig.h
index a3aa0f7c8..9ffec5280 100644
--- a/keyboards/singa/usbconfig.h
+++ b/keyboards/singa/usbconfig.h
@@ -207,7 +207,7 @@ section at the end of this file).
207 207
208/* -------------------------- Device Description --------------------------- */ 208/* -------------------------- Device Description --------------------------- */
209 209
210#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 210#define USB_CFG_VENDOR_ID
211/* USB vendor ID for the device, low byte first. If you have registered your 211/* USB vendor ID for the device, low byte first. If you have registered your
212 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 212 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
213 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 213 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -216,7 +216,7 @@ section at the end of this file).
216 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 216 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
217 * the implications! 217 * the implications!
218 */ 218 */
219#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 219#define USB_CFG_DEVICE_ID
220/* This is the ID of the product, low byte first. It is interpreted in the 220/* This is the ID of the product, low byte first. It is interpreted in the
221 * scope of the vendor ID. If you have registered your own VID with usb.org 221 * scope of the vendor ID. If you have registered your own VID with usb.org
222 * or if you have licensed a PID from somebody else, define it here. Otherwise 222 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -227,9 +227,6 @@ section at the end of this file).
227 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 227 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
228 * the implications! 228 * the implications!
229 */ 229 */
230#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
231/* Version number of the device: Minor number first, then major number.
232 */
233#define USB_CFG_DEVICE_CLASS 0 230#define USB_CFG_DEVICE_CLASS 0
234#define USB_CFG_DEVICE_SUBCLASS 0 231#define USB_CFG_DEVICE_SUBCLASS 0
235/* See USB specification if you want to conform to an existing device class. 232/* See USB specification if you want to conform to an existing device class.
@@ -308,18 +305,15 @@ section at the end of this file).
308 * }; 305 * };
309 */ 306 */
310 307
311#define USB_CFG_DESCR_PROPS_DEVICE 0 308#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
312#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 309#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
313//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
314#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 310#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
315#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 311#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
316#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 312#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
317#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 313#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
318#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 314#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
319#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 315#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
320//#define USB_CFG_DESCR_PROPS_HID 0
321#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 316#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
322//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
323#define USB_CFG_DESCR_PROPS_UNKNOWN 0 317#define USB_CFG_DESCR_PROPS_UNKNOWN 0
324 318
325#define usbMsgPtr_t unsigned short 319#define usbMsgPtr_t unsigned short
diff --git a/keyboards/tartan/usbconfig.h b/keyboards/tartan/usbconfig.h
index 0cacbd724..3e88910ce 100644
--- a/keyboards/tartan/usbconfig.h
+++ b/keyboards/tartan/usbconfig.h
@@ -207,7 +207,7 @@ section at the end of this file).
207 207
208/* -------------------------- Device Description --------------------------- */ 208/* -------------------------- Device Description --------------------------- */
209 209
210#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 210#define USB_CFG_VENDOR_ID
211/* USB vendor ID for the device, low byte first. If you have registered your 211/* USB vendor ID for the device, low byte first. If you have registered your
212 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 212 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
213 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 213 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -216,7 +216,7 @@ section at the end of this file).
216 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 216 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
217 * the implications! 217 * the implications!
218 */ 218 */
219#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 219#define USB_CFG_DEVICE_ID
220/* This is the ID of the product, low byte first. It is interpreted in the 220/* This is the ID of the product, low byte first. It is interpreted in the
221 * scope of the vendor ID. If you have registered your own VID with usb.org 221 * scope of the vendor ID. If you have registered your own VID with usb.org
222 * or if you have licensed a PID from somebody else, define it here. Otherwise 222 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -227,9 +227,6 @@ section at the end of this file).
227 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 227 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
228 * the implications! 228 * the implications!
229 */ 229 */
230#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
231/* Version number of the device: Minor number first, then major number.
232 */
233#define USB_CFG_DEVICE_CLASS 0 230#define USB_CFG_DEVICE_CLASS 0
234#define USB_CFG_DEVICE_SUBCLASS 0 231#define USB_CFG_DEVICE_SUBCLASS 0
235/* See USB specification if you want to conform to an existing device class. 232/* See USB specification if you want to conform to an existing device class.
@@ -308,18 +305,15 @@ section at the end of this file).
308 * }; 305 * };
309 */ 306 */
310 307
311#define USB_CFG_DESCR_PROPS_DEVICE 0 308#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
312#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 309#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
313//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
314#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 310#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
315#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 311#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
316#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 312#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
317#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 313#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
318#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 314#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
319#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 315#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
320//#define USB_CFG_DESCR_PROPS_HID 0
321#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 316#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
322//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
323#define USB_CFG_DESCR_PROPS_UNKNOWN 0 317#define USB_CFG_DESCR_PROPS_UNKNOWN 0
324 318
325#define usbMsgPtr_t unsigned short 319#define usbMsgPtr_t unsigned short
diff --git a/keyboards/tgr/alice/usbconfig.h b/keyboards/tgr/alice/usbconfig.h
index ad9c95c5d..fd5640a08 100644
--- a/keyboards/tgr/alice/usbconfig.h
+++ b/keyboards/tgr/alice/usbconfig.h
@@ -208,7 +208,7 @@ section at the end of this file).
208 208
209/* -------------------------- Device Description --------------------------- */ 209/* -------------------------- Device Description --------------------------- */
210 210
211#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 211#define USB_CFG_VENDOR_ID
212/* USB vendor ID for the device, low byte first. If you have registered your 212/* USB vendor ID for the device, low byte first. If you have registered your
213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -217,7 +217,7 @@ section at the end of this file).
217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
218 * the implications! 218 * the implications!
219 */ 219 */
220#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 220#define USB_CFG_DEVICE_ID
221/* This is the ID of the product, low byte first. It is interpreted in the 221/* This is the ID of the product, low byte first. It is interpreted in the
222 * scope of the vendor ID. If you have registered your own VID with usb.org 222 * scope of the vendor ID. If you have registered your own VID with usb.org
223 * or if you have licensed a PID from somebody else, define it here. Otherwise 223 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -228,9 +228,6 @@ section at the end of this file).
228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
229 * the implications! 229 * the implications!
230 */ 230 */
231#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
232/* Version number of the device: Minor number first, then major number.
233 */
234#define USB_CFG_DEVICE_CLASS 0 231#define USB_CFG_DEVICE_CLASS 0
235#define USB_CFG_DEVICE_SUBCLASS 0 232#define USB_CFG_DEVICE_SUBCLASS 0
236/* See USB specification if you want to conform to an existing device class. 233/* See USB specification if you want to conform to an existing device class.
@@ -309,18 +306,15 @@ section at the end of this file).
309 * }; 306 * };
310 */ 307 */
311 308
312#define USB_CFG_DESCR_PROPS_DEVICE 0 309#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
313#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 310#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
314//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
315#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 311#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
316#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 312#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
317#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 313#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
318#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 314#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
319#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 315#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
320#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 316#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
321//#define USB_CFG_DESCR_PROPS_HID 0
322#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 317#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
323//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
324#define USB_CFG_DESCR_PROPS_UNKNOWN 0 318#define USB_CFG_DESCR_PROPS_UNKNOWN 0
325 319
326#define usbMsgPtr_t unsigned short 320#define usbMsgPtr_t unsigned short
diff --git a/keyboards/tgr/jane/usbconfig.h b/keyboards/tgr/jane/usbconfig.h
index a3aa0f7c8..9ffec5280 100644
--- a/keyboards/tgr/jane/usbconfig.h
+++ b/keyboards/tgr/jane/usbconfig.h
@@ -207,7 +207,7 @@ section at the end of this file).
207 207
208/* -------------------------- Device Description --------------------------- */ 208/* -------------------------- Device Description --------------------------- */
209 209
210#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 210#define USB_CFG_VENDOR_ID
211/* USB vendor ID for the device, low byte first. If you have registered your 211/* USB vendor ID for the device, low byte first. If you have registered your
212 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 212 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
213 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 213 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -216,7 +216,7 @@ section at the end of this file).
216 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 216 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
217 * the implications! 217 * the implications!
218 */ 218 */
219#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 219#define USB_CFG_DEVICE_ID
220/* This is the ID of the product, low byte first. It is interpreted in the 220/* This is the ID of the product, low byte first. It is interpreted in the
221 * scope of the vendor ID. If you have registered your own VID with usb.org 221 * scope of the vendor ID. If you have registered your own VID with usb.org
222 * or if you have licensed a PID from somebody else, define it here. Otherwise 222 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -227,9 +227,6 @@ section at the end of this file).
227 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 227 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
228 * the implications! 228 * the implications!
229 */ 229 */
230#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
231/* Version number of the device: Minor number first, then major number.
232 */
233#define USB_CFG_DEVICE_CLASS 0 230#define USB_CFG_DEVICE_CLASS 0
234#define USB_CFG_DEVICE_SUBCLASS 0 231#define USB_CFG_DEVICE_SUBCLASS 0
235/* See USB specification if you want to conform to an existing device class. 232/* See USB specification if you want to conform to an existing device class.
@@ -308,18 +305,15 @@ section at the end of this file).
308 * }; 305 * };
309 */ 306 */
310 307
311#define USB_CFG_DESCR_PROPS_DEVICE 0 308#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
312#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 309#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
313//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
314#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 310#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
315#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 311#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
316#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 312#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
317#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 313#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
318#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 314#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
319#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 315#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
320//#define USB_CFG_DESCR_PROPS_HID 0
321#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 316#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
322//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
323#define USB_CFG_DESCR_PROPS_UNKNOWN 0 317#define USB_CFG_DESCR_PROPS_UNKNOWN 0
324 318
325#define usbMsgPtr_t unsigned short 319#define usbMsgPtr_t unsigned short
diff --git a/keyboards/unikorn/usbconfig.h b/keyboards/unikorn/usbconfig.h
index a3aa0f7c8..9ffec5280 100644
--- a/keyboards/unikorn/usbconfig.h
+++ b/keyboards/unikorn/usbconfig.h
@@ -207,7 +207,7 @@ section at the end of this file).
207 207
208/* -------------------------- Device Description --------------------------- */ 208/* -------------------------- Device Description --------------------------- */
209 209
210#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 210#define USB_CFG_VENDOR_ID
211/* USB vendor ID for the device, low byte first. If you have registered your 211/* USB vendor ID for the device, low byte first. If you have registered your
212 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 212 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
213 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 213 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -216,7 +216,7 @@ section at the end of this file).
216 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 216 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
217 * the implications! 217 * the implications!
218 */ 218 */
219#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 219#define USB_CFG_DEVICE_ID
220/* This is the ID of the product, low byte first. It is interpreted in the 220/* This is the ID of the product, low byte first. It is interpreted in the
221 * scope of the vendor ID. If you have registered your own VID with usb.org 221 * scope of the vendor ID. If you have registered your own VID with usb.org
222 * or if you have licensed a PID from somebody else, define it here. Otherwise 222 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -227,9 +227,6 @@ section at the end of this file).
227 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 227 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
228 * the implications! 228 * the implications!
229 */ 229 */
230#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
231/* Version number of the device: Minor number first, then major number.
232 */
233#define USB_CFG_DEVICE_CLASS 0 230#define USB_CFG_DEVICE_CLASS 0
234#define USB_CFG_DEVICE_SUBCLASS 0 231#define USB_CFG_DEVICE_SUBCLASS 0
235/* See USB specification if you want to conform to an existing device class. 232/* See USB specification if you want to conform to an existing device class.
@@ -308,18 +305,15 @@ section at the end of this file).
308 * }; 305 * };
309 */ 306 */
310 307
311#define USB_CFG_DESCR_PROPS_DEVICE 0 308#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
312#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 309#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
313//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
314#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 310#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
315#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 311#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
316#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 312#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
317#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 313#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
318#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 314#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
319#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 315#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
320//#define USB_CFG_DESCR_PROPS_HID 0
321#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 316#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
322//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
323#define USB_CFG_DESCR_PROPS_UNKNOWN 0 317#define USB_CFG_DESCR_PROPS_UNKNOWN 0
324 318
325#define usbMsgPtr_t unsigned short 319#define usbMsgPtr_t unsigned short
diff --git a/keyboards/winkeyless/bface/usbconfig.h b/keyboards/winkeyless/bface/usbconfig.h
index a3aa0f7c8..9ffec5280 100644
--- a/keyboards/winkeyless/bface/usbconfig.h
+++ b/keyboards/winkeyless/bface/usbconfig.h
@@ -207,7 +207,7 @@ section at the end of this file).
207 207
208/* -------------------------- Device Description --------------------------- */ 208/* -------------------------- Device Description --------------------------- */
209 209
210#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 210#define USB_CFG_VENDOR_ID
211/* USB vendor ID for the device, low byte first. If you have registered your 211/* USB vendor ID for the device, low byte first. If you have registered your
212 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 212 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
213 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 213 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -216,7 +216,7 @@ section at the end of this file).
216 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 216 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
217 * the implications! 217 * the implications!
218 */ 218 */
219#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 219#define USB_CFG_DEVICE_ID
220/* This is the ID of the product, low byte first. It is interpreted in the 220/* This is the ID of the product, low byte first. It is interpreted in the
221 * scope of the vendor ID. If you have registered your own VID with usb.org 221 * scope of the vendor ID. If you have registered your own VID with usb.org
222 * or if you have licensed a PID from somebody else, define it here. Otherwise 222 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -227,9 +227,6 @@ section at the end of this file).
227 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 227 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
228 * the implications! 228 * the implications!
229 */ 229 */
230#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
231/* Version number of the device: Minor number first, then major number.
232 */
233#define USB_CFG_DEVICE_CLASS 0 230#define USB_CFG_DEVICE_CLASS 0
234#define USB_CFG_DEVICE_SUBCLASS 0 231#define USB_CFG_DEVICE_SUBCLASS 0
235/* See USB specification if you want to conform to an existing device class. 232/* See USB specification if you want to conform to an existing device class.
@@ -308,18 +305,15 @@ section at the end of this file).
308 * }; 305 * };
309 */ 306 */
310 307
311#define USB_CFG_DESCR_PROPS_DEVICE 0 308#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
312#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 309#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
313//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
314#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 310#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
315#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 311#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
316#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 312#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
317#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 313#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
318#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 314#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
319#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 315#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
320//#define USB_CFG_DESCR_PROPS_HID 0
321#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 316#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
322//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
323#define USB_CFG_DESCR_PROPS_UNKNOWN 0 317#define USB_CFG_DESCR_PROPS_UNKNOWN 0
324 318
325#define usbMsgPtr_t unsigned short 319#define usbMsgPtr_t unsigned short
diff --git a/keyboards/winkeyless/bmini/usbconfig.h b/keyboards/winkeyless/bmini/usbconfig.h
index ad9c95c5d..fd5640a08 100644
--- a/keyboards/winkeyless/bmini/usbconfig.h
+++ b/keyboards/winkeyless/bmini/usbconfig.h
@@ -208,7 +208,7 @@ section at the end of this file).
208 208
209/* -------------------------- Device Description --------------------------- */ 209/* -------------------------- Device Description --------------------------- */
210 210
211#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 211#define USB_CFG_VENDOR_ID
212/* USB vendor ID for the device, low byte first. If you have registered your 212/* USB vendor ID for the device, low byte first. If you have registered your
213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -217,7 +217,7 @@ section at the end of this file).
217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
218 * the implications! 218 * the implications!
219 */ 219 */
220#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 220#define USB_CFG_DEVICE_ID
221/* This is the ID of the product, low byte first. It is interpreted in the 221/* This is the ID of the product, low byte first. It is interpreted in the
222 * scope of the vendor ID. If you have registered your own VID with usb.org 222 * scope of the vendor ID. If you have registered your own VID with usb.org
223 * or if you have licensed a PID from somebody else, define it here. Otherwise 223 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -228,9 +228,6 @@ section at the end of this file).
228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
229 * the implications! 229 * the implications!
230 */ 230 */
231#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
232/* Version number of the device: Minor number first, then major number.
233 */
234#define USB_CFG_DEVICE_CLASS 0 231#define USB_CFG_DEVICE_CLASS 0
235#define USB_CFG_DEVICE_SUBCLASS 0 232#define USB_CFG_DEVICE_SUBCLASS 0
236/* See USB specification if you want to conform to an existing device class. 233/* See USB specification if you want to conform to an existing device class.
@@ -309,18 +306,15 @@ section at the end of this file).
309 * }; 306 * };
310 */ 307 */
311 308
312#define USB_CFG_DESCR_PROPS_DEVICE 0 309#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
313#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 310#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
314//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
315#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 311#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
316#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 312#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
317#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 313#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
318#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 314#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
319#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 315#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
320#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 316#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
321//#define USB_CFG_DESCR_PROPS_HID 0
322#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 317#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
323//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
324#define USB_CFG_DESCR_PROPS_UNKNOWN 0 318#define USB_CFG_DESCR_PROPS_UNKNOWN 0
325 319
326#define usbMsgPtr_t unsigned short 320#define usbMsgPtr_t unsigned short
diff --git a/keyboards/winkeyless/bminiex/usbconfig.h b/keyboards/winkeyless/bminiex/usbconfig.h
index ad9c95c5d..fd5640a08 100644
--- a/keyboards/winkeyless/bminiex/usbconfig.h
+++ b/keyboards/winkeyless/bminiex/usbconfig.h
@@ -208,7 +208,7 @@ section at the end of this file).
208 208
209/* -------------------------- Device Description --------------------------- */ 209/* -------------------------- Device Description --------------------------- */
210 210
211#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 211#define USB_CFG_VENDOR_ID
212/* USB vendor ID for the device, low byte first. If you have registered your 212/* USB vendor ID for the device, low byte first. If you have registered your
213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -217,7 +217,7 @@ section at the end of this file).
217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
218 * the implications! 218 * the implications!
219 */ 219 */
220#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 220#define USB_CFG_DEVICE_ID
221/* This is the ID of the product, low byte first. It is interpreted in the 221/* This is the ID of the product, low byte first. It is interpreted in the
222 * scope of the vendor ID. If you have registered your own VID with usb.org 222 * scope of the vendor ID. If you have registered your own VID with usb.org
223 * or if you have licensed a PID from somebody else, define it here. Otherwise 223 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -228,9 +228,6 @@ section at the end of this file).
228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
229 * the implications! 229 * the implications!
230 */ 230 */
231#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
232/* Version number of the device: Minor number first, then major number.
233 */
234#define USB_CFG_DEVICE_CLASS 0 231#define USB_CFG_DEVICE_CLASS 0
235#define USB_CFG_DEVICE_SUBCLASS 0 232#define USB_CFG_DEVICE_SUBCLASS 0
236/* See USB specification if you want to conform to an existing device class. 233/* See USB specification if you want to conform to an existing device class.
@@ -309,18 +306,15 @@ section at the end of this file).
309 * }; 306 * };
310 */ 307 */
311 308
312#define USB_CFG_DESCR_PROPS_DEVICE 0 309#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
313#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 310#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
314//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
315#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 311#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
316#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 312#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
317#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 313#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
318#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 314#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
319#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 315#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
320#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 316#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
321//#define USB_CFG_DESCR_PROPS_HID 0
322#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 317#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
323//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
324#define USB_CFG_DESCR_PROPS_UNKNOWN 0 318#define USB_CFG_DESCR_PROPS_UNKNOWN 0
325 319
326#define usbMsgPtr_t unsigned short 320#define usbMsgPtr_t unsigned short
diff --git a/keyboards/ymd75/usbconfig.h b/keyboards/ymd75/usbconfig.h
index ad9c95c5d..fd5640a08 100644
--- a/keyboards/ymd75/usbconfig.h
+++ b/keyboards/ymd75/usbconfig.h
@@ -208,7 +208,7 @@ section at the end of this file).
208 208
209/* -------------------------- Device Description --------------------------- */ 209/* -------------------------- Device Description --------------------------- */
210 210
211#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 211#define USB_CFG_VENDOR_ID
212/* USB vendor ID for the device, low byte first. If you have registered your 212/* USB vendor ID for the device, low byte first. If you have registered your
213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -217,7 +217,7 @@ section at the end of this file).
217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
218 * the implications! 218 * the implications!
219 */ 219 */
220#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 220#define USB_CFG_DEVICE_ID
221/* This is the ID of the product, low byte first. It is interpreted in the 221/* This is the ID of the product, low byte first. It is interpreted in the
222 * scope of the vendor ID. If you have registered your own VID with usb.org 222 * scope of the vendor ID. If you have registered your own VID with usb.org
223 * or if you have licensed a PID from somebody else, define it here. Otherwise 223 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -228,9 +228,6 @@ section at the end of this file).
228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
229 * the implications! 229 * the implications!
230 */ 230 */
231#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
232/* Version number of the device: Minor number first, then major number.
233 */
234#define USB_CFG_DEVICE_CLASS 0 231#define USB_CFG_DEVICE_CLASS 0
235#define USB_CFG_DEVICE_SUBCLASS 0 232#define USB_CFG_DEVICE_SUBCLASS 0
236/* See USB specification if you want to conform to an existing device class. 233/* See USB specification if you want to conform to an existing device class.
@@ -309,18 +306,15 @@ section at the end of this file).
309 * }; 306 * };
310 */ 307 */
311 308
312#define USB_CFG_DESCR_PROPS_DEVICE 0 309#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
313#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 310#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
314//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
315#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 311#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
316#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 312#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
317#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 313#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
318#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 314#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
319#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 315#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
320#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 316#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
321//#define USB_CFG_DESCR_PROPS_HID 0
322#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 317#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
323//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
324#define USB_CFG_DESCR_PROPS_UNKNOWN 0 318#define USB_CFG_DESCR_PROPS_UNKNOWN 0
325 319
326#define usbMsgPtr_t unsigned short 320#define usbMsgPtr_t unsigned short
diff --git a/keyboards/ymd96/usbconfig.h b/keyboards/ymd96/usbconfig.h
index ad9c95c5d..fd5640a08 100644
--- a/keyboards/ymd96/usbconfig.h
+++ b/keyboards/ymd96/usbconfig.h
@@ -208,7 +208,7 @@ section at the end of this file).
208 208
209/* -------------------------- Device Description --------------------------- */ 209/* -------------------------- Device Description --------------------------- */
210 210
211#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 211#define USB_CFG_VENDOR_ID
212/* USB vendor ID for the device, low byte first. If you have registered your 212/* USB vendor ID for the device, low byte first. If you have registered your
213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -217,7 +217,7 @@ section at the end of this file).
217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
218 * the implications! 218 * the implications!
219 */ 219 */
220#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 220#define USB_CFG_DEVICE_ID
221/* This is the ID of the product, low byte first. It is interpreted in the 221/* This is the ID of the product, low byte first. It is interpreted in the
222 * scope of the vendor ID. If you have registered your own VID with usb.org 222 * scope of the vendor ID. If you have registered your own VID with usb.org
223 * or if you have licensed a PID from somebody else, define it here. Otherwise 223 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -228,9 +228,6 @@ section at the end of this file).
228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
229 * the implications! 229 * the implications!
230 */ 230 */
231#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
232/* Version number of the device: Minor number first, then major number.
233 */
234#define USB_CFG_DEVICE_CLASS 0 231#define USB_CFG_DEVICE_CLASS 0
235#define USB_CFG_DEVICE_SUBCLASS 0 232#define USB_CFG_DEVICE_SUBCLASS 0
236/* See USB specification if you want to conform to an existing device class. 233/* See USB specification if you want to conform to an existing device class.
@@ -309,18 +306,15 @@ section at the end of this file).
309 * }; 306 * };
310 */ 307 */
311 308
312#define USB_CFG_DESCR_PROPS_DEVICE 0 309#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
313#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 310#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
314//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
315#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 311#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
316#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 312#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
317#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 313#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
318#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 314#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
319#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 315#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
320#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 316#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
321//#define USB_CFG_DESCR_PROPS_HID 0
322#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 317#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
323//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
324#define USB_CFG_DESCR_PROPS_UNKNOWN 0 318#define USB_CFG_DESCR_PROPS_UNKNOWN 0
325 319
326#define usbMsgPtr_t unsigned short 320#define usbMsgPtr_t unsigned short
diff --git a/keyboards/ymdk/bface/usbconfig.h b/keyboards/ymdk/bface/usbconfig.h
index a3aa0f7c8..9ffec5280 100644
--- a/keyboards/ymdk/bface/usbconfig.h
+++ b/keyboards/ymdk/bface/usbconfig.h
@@ -207,7 +207,7 @@ section at the end of this file).
207 207
208/* -------------------------- Device Description --------------------------- */ 208/* -------------------------- Device Description --------------------------- */
209 209
210#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 210#define USB_CFG_VENDOR_ID
211/* USB vendor ID for the device, low byte first. If you have registered your 211/* USB vendor ID for the device, low byte first. If you have registered your
212 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 212 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
213 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 213 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -216,7 +216,7 @@ section at the end of this file).
216 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 216 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
217 * the implications! 217 * the implications!
218 */ 218 */
219#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 219#define USB_CFG_DEVICE_ID
220/* This is the ID of the product, low byte first. It is interpreted in the 220/* This is the ID of the product, low byte first. It is interpreted in the
221 * scope of the vendor ID. If you have registered your own VID with usb.org 221 * scope of the vendor ID. If you have registered your own VID with usb.org
222 * or if you have licensed a PID from somebody else, define it here. Otherwise 222 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -227,9 +227,6 @@ section at the end of this file).
227 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 227 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
228 * the implications! 228 * the implications!
229 */ 229 */
230#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
231/* Version number of the device: Minor number first, then major number.
232 */
233#define USB_CFG_DEVICE_CLASS 0 230#define USB_CFG_DEVICE_CLASS 0
234#define USB_CFG_DEVICE_SUBCLASS 0 231#define USB_CFG_DEVICE_SUBCLASS 0
235/* See USB specification if you want to conform to an existing device class. 232/* See USB specification if you want to conform to an existing device class.
@@ -308,18 +305,15 @@ section at the end of this file).
308 * }; 305 * };
309 */ 306 */
310 307
311#define USB_CFG_DESCR_PROPS_DEVICE 0 308#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
312#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 309#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
313//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
314#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 310#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
315#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 311#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
316#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 312#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
317#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 313#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
318#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 314#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
319#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 315#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
320//#define USB_CFG_DESCR_PROPS_HID 0
321#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 316#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
322//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
323#define USB_CFG_DESCR_PROPS_UNKNOWN 0 317#define USB_CFG_DESCR_PROPS_UNKNOWN 0
324 318
325#define usbMsgPtr_t unsigned short 319#define usbMsgPtr_t unsigned short
diff --git a/keyboards/ymdk_np21/usbconfig.h b/keyboards/ymdk_np21/usbconfig.h
index ad9c95c5d..fd5640a08 100644
--- a/keyboards/ymdk_np21/usbconfig.h
+++ b/keyboards/ymdk_np21/usbconfig.h
@@ -208,7 +208,7 @@ section at the end of this file).
208 208
209/* -------------------------- Device Description --------------------------- */ 209/* -------------------------- Device Description --------------------------- */
210 210
211#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 211#define USB_CFG_VENDOR_ID
212/* USB vendor ID for the device, low byte first. If you have registered your 212/* USB vendor ID for the device, low byte first. If you have registered your
213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 213 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 214 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -217,7 +217,7 @@ section at the end of this file).
217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
218 * the implications! 218 * the implications!
219 */ 219 */
220#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 220#define USB_CFG_DEVICE_ID
221/* This is the ID of the product, low byte first. It is interpreted in the 221/* This is the ID of the product, low byte first. It is interpreted in the
222 * scope of the vendor ID. If you have registered your own VID with usb.org 222 * scope of the vendor ID. If you have registered your own VID with usb.org
223 * or if you have licensed a PID from somebody else, define it here. Otherwise 223 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -228,9 +228,6 @@ section at the end of this file).
228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 228 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
229 * the implications! 229 * the implications!
230 */ 230 */
231#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
232/* Version number of the device: Minor number first, then major number.
233 */
234#define USB_CFG_DEVICE_CLASS 0 231#define USB_CFG_DEVICE_CLASS 0
235#define USB_CFG_DEVICE_SUBCLASS 0 232#define USB_CFG_DEVICE_SUBCLASS 0
236/* See USB specification if you want to conform to an existing device class. 233/* See USB specification if you want to conform to an existing device class.
@@ -309,18 +306,15 @@ section at the end of this file).
309 * }; 306 * };
310 */ 307 */
311 308
312#define USB_CFG_DESCR_PROPS_DEVICE 0 309#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
313#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 310#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
314//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
315#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC 311#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
316#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC 312#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
317#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC 313#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
318#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC 314#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
319#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC 315#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
320#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 316#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
321//#define USB_CFG_DESCR_PROPS_HID 0
322#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 317#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
323//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
324#define USB_CFG_DESCR_PROPS_UNKNOWN 0 318#define USB_CFG_DESCR_PROPS_UNKNOWN 0
325 319
326#define usbMsgPtr_t unsigned short 320#define usbMsgPtr_t unsigned short
diff --git a/quantum/template/ps2avrgb/usbconfig.h b/quantum/template/ps2avrgb/usbconfig.h
index 83ad06544..6e910a703 100644
--- a/quantum/template/ps2avrgb/usbconfig.h
+++ b/quantum/template/ps2avrgb/usbconfig.h
@@ -197,7 +197,7 @@ section at the end of this file).
197 197
198/* -------------------------- Device Description --------------------------- */ 198/* -------------------------- Device Description --------------------------- */
199 199
200#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) 200#define USB_CFG_VENDOR_ID
201/* USB vendor ID for the device, low byte first. If you have registered your 201/* USB vendor ID for the device, low byte first. If you have registered your
202 * own Vendor ID, define it here. Otherwise you may use one of obdev's free 202 * own Vendor ID, define it here. Otherwise you may use one of obdev's free
203 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! 203 * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -206,7 +206,7 @@ section at the end of this file).
206 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 206 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
207 * the implications! 207 * the implications!
208 */ 208 */
209#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) 209#define USB_CFG_DEVICE_ID
210/* This is the ID of the product, low byte first. It is interpreted in the 210/* This is the ID of the product, low byte first. It is interpreted in the
211 * scope of the vendor ID. If you have registered your own VID with usb.org 211 * scope of the vendor ID. If you have registered your own VID with usb.org
212 * or if you have licensed a PID from somebody else, define it here. Otherwise 212 * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -217,34 +217,6 @@ section at the end of this file).
217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand 217 * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
218 * the implications! 218 * the implications!
219 */ 219 */
220#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF)
221/* Version number of the device: Minor number first, then major number.
222 */
223#define USB_CFG_VENDOR_NAME 'w', 'i', 'n', 'k', 'e', 'y', 'l', 'e', 's', 's', '.', 'k', 'r'
224#define USB_CFG_VENDOR_NAME_LEN 13
225/* These two values define the vendor name returned by the USB device. The name
226 * must be given as a list of characters under single quotes. The characters
227 * are interpreted as Unicode (UTF-16) entities.
228 * If you don't want a vendor name string, undefine these macros.
229 * ALWAYS define a vendor name containing your Internet domain name if you use
230 * obdev's free shared VID/PID pair. See the file USB-IDs-for-free.txt for
231 * details.
232 */
233#define USB_CFG_DEVICE_NAME 'p', 's', '2', 'a', 'v', 'r', 'G', 'B'
234#define USB_CFG_DEVICE_NAME_LEN 8
235/* Same as above for the device name. If you don't want a device name, undefine
236 * the macros. See the file USB-IDs-for-free.txt before you assign a name if
237 * you use a shared VID/PID.
238 */
239/*#define USB_CFG_SERIAL_NUMBER 'N', 'o', 'n', 'e' */
240/*#define USB_CFG_SERIAL_NUMBER_LEN 0 */
241/* Same as above for the serial number. If you don't want a serial number,
242 * undefine the macros.
243 * It may be useful to provide the serial number through other means than at
244 * compile time. See the section about descriptor properties below for how
245 * to fine tune control over USB descriptors such as the string descriptor
246 * for the serial number.
247 */
248#define USB_CFG_DEVICE_CLASS 0 220#define USB_CFG_DEVICE_CLASS 0
249#define USB_CFG_DEVICE_SUBCLASS 0 221#define USB_CFG_DEVICE_SUBCLASS 0
250/* See USB specification if you want to conform to an existing device class. 222/* See USB specification if you want to conform to an existing device class.
@@ -323,18 +295,15 @@ section at the end of this file).
323 * }; 295 * };
324 */ 296 */
325 297
326#define USB_CFG_DESCR_PROPS_DEVICE 0 298#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC
327#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC 299#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
328//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0 300#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC
329#define USB_CFG_DESCR_PROPS_STRINGS 0 301#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC
330#define USB_CFG_DESCR_PROPS_STRING_0 0 302#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC
331#define USB_CFG_DESCR_PROPS_STRING_VENDOR 0 303#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC
332#define USB_CFG_DESCR_PROPS_STRING_PRODUCT 0 304#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC
333#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER 0
334#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC 305#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
335//#define USB_CFG_DESCR_PROPS_HID 0
336#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC 306#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
337//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
338#define USB_CFG_DESCR_PROPS_UNKNOWN 0 307#define USB_CFG_DESCR_PROPS_UNKNOWN 0
339 308
340#define usbMsgPtr_t unsigned short 309#define usbMsgPtr_t unsigned short
diff --git a/tmk_core/protocol/vusb/vusb.c b/tmk_core/protocol/vusb/vusb.c
index 30c970892..19df35805 100644
--- a/tmk_core/protocol/vusb/vusb.c
+++ b/tmk_core/protocol/vusb/vusb.c
@@ -349,134 +349,174 @@ const PROGMEM uchar mouse_extra_hid_report[] = {
349#endif 349#endif
350 350
351// clang-format off 351// clang-format off
352const PROGMEM usbStringDescriptor_t usbDescriptorStringZero = { 352const PROGMEM usbStringDescriptor_t usbStringDescriptorZero = {
353 .header = { 353 .header = {
354 .bLength = USB_STRING_LEN(1), 354 .bLength = USB_STRING_LEN(1),
355 .bDescriptorType = USBDESCR_STRING 355 .bDescriptorType = USBDESCR_STRING
356 }, 356 },
357 .bString = {0x0409} // US English 357 .bString = {0x0409} // US English
358}; 358};
359 359
360const PROGMEM usbStringDescriptor_t usbDescriptorStringManufacturer = { 360const PROGMEM usbStringDescriptor_t usbStringDescriptorManufacturer = {
361 .header = { 361 .header = {
362 .bLength = USB_STRING_LEN(sizeof(STR(MANUFACTURER)) - 1), 362 .bLength = USB_STRING_LEN(sizeof(STR(MANUFACTURER)) - 1),
363 .bDescriptorType = USBDESCR_STRING 363 .bDescriptorType = USBDESCR_STRING
364 }, 364 },
365 .bString = LSTR(MANUFACTURER) 365 .bString = LSTR(MANUFACTURER)
366}; 366};
367 367
368const PROGMEM usbStringDescriptor_t usbDescriptorStringProduct = { 368const PROGMEM usbStringDescriptor_t usbStringDescriptorProduct = {
369 .header = { 369 .header = {
370 .bLength = USB_STRING_LEN(sizeof(STR(PRODUCT)) - 1), 370 .bLength = USB_STRING_LEN(sizeof(STR(PRODUCT)) - 1),
371 .bDescriptorType = USBDESCR_STRING 371 .bDescriptorType = USBDESCR_STRING
372 }, 372 },
373 .bString = LSTR(PRODUCT) 373 .bString = LSTR(PRODUCT)
374}; 374};
375 375
376const PROGMEM usbStringDescriptor_t usbDescriptorStringSerial = { 376const PROGMEM usbStringDescriptor_t usbStringDescriptorSerial = {
377 .header = { 377 .header = {
378 .bLength = USB_STRING_LEN(sizeof(STR(SERIAL_NUMBER)) - 1), 378 .bLength = USB_STRING_LEN(sizeof(STR(SERIAL_NUMBER)) - 1),
379 .bDescriptorType = USBDESCR_STRING 379 .bDescriptorType = USBDESCR_STRING
380 }, 380 },
381 .bString = LSTR(SERIAL_NUMBER) 381 .bString = LSTR(SERIAL_NUMBER)
382}; 382};
383// clang-format on
384 383
384#if USB_CFG_DESCR_PROPS_DEVICE
385/* 385/*
386 * Descriptor for compite device: Keyboard + Mouse 386 * Device descriptor
387 *
388 * contains: device, interface, HID and endpoint descriptors
389 */ 387 */
388const PROGMEM usbDeviceDescriptor_t usbDeviceDescriptor = {
389 .header = {
390 .bLength = sizeof(usbDeviceDescriptor_t),
391 .bDescriptorType = USBDESCR_DEVICE
392 },
393 .bcdUSB = 0x0110,
394 .bDeviceClass = USB_CFG_DEVICE_CLASS,
395 .bDeviceSubClass = USB_CFG_DEVICE_SUBCLASS,
396 .bDeviceProtocol = 0x00,
397 .bMaxPacketSize0 = 8,
398 .idVendor = VENDOR_ID,
399 .idProduct = PRODUCT_ID,
400 .bcdDevice = DEVICE_VER,
401 .iManufacturer = 0x01,
402 .iProduct = 0x02,
403 .iSerialNumber = 0x03,
404 .bNumConfigurations = 1
405};
406#endif
407
390#if USB_CFG_DESCR_PROPS_CONFIGURATION 408#if USB_CFG_DESCR_PROPS_CONFIGURATION
391const PROGMEM char usbDescriptorConfiguration[] = { 409/*
392 /* USB configuration descriptor */ 410 * Configuration descriptors
393 9, /* sizeof(usbDescriptorConfiguration): length of descriptor in bytes */ 411 */
394 USBDESCR_CONFIG, /* descriptor type */ 412const PROGMEM usbConfigurationDescriptor_t usbConfigurationDescriptor = {
395# if defined(MOUSE_ENABLE) || defined(EXTRAKEY_ENABLE) 413 .header = {
396 59, // 9 + (9 + 9 + 7) + (9 + 9 + 7) 414 .header = {
397# else 415 .bLength = sizeof(usbConfigurationDescriptorHeader_t),
398 34, // 9 + (9 + 9 + 7) 416 .bDescriptorType = USBDESCR_CONFIG
399# endif 417 },
400 0, 418 .wTotalLength = sizeof(usbConfigurationDescriptor_t),
401// 18 + 7 * USB_CFG_HAVE_INTRIN_ENDPOINT + 7 * USB_CFG_HAVE_INTRIN_ENDPOINT3 + 9, 0,
402/* total length of data returned (including inlined descriptors) */
403# if defined(MOUSE_ENABLE) || defined(EXTRAKEY_ENABLE) 419# if defined(MOUSE_ENABLE) || defined(EXTRAKEY_ENABLE)
404 2, /* number of interfaces in this configuration */ 420 .bNumInterfaces = 2,
405# else 421# else
406 1, 422 .bNumInterfaces = 1,
407# endif 423# endif
408 1, /* index of this configuration */ 424 .bConfigurationValue = 0x01,
409 0, /* configuration name string index */ 425 .iConfiguration = 0x00,
410# if USB_CFG_IS_SELF_POWERED 426# if USB_CFG_IS_SELF_POWERED
411 (1 << 7) | USBATTR_SELFPOWER, /* attributes */ 427 .bmAttributes = (1 << 7) | USBATTR_SELFPOWER,
412# else 428# else
413 (1 << 7), /* attributes */ 429 .bmAttributes = (1 << 7),
414# endif 430# endif
415 USB_MAX_POWER_CONSUMPTION / 2, /* max USB current in 2mA units */ 431 .bMaxPower = USB_MAX_POWER_CONSUMPTION / 2
432 },
416 433
417 /* 434 /*
418 * Keyboard interface 435 * Keyboard
419 */ 436 */
420 /* Interface descriptor */ 437 .keyboardInterface = {
421 9, /* sizeof(usbDescrInterface): length of descriptor in bytes */ 438 .header = {
422 USBDESCR_INTERFACE, /* descriptor type */ 439 .bLength = sizeof(usbInterfaceDescriptor_t),
423 0, /* index of this interface */ 440 .bDescriptorType = USBDESCR_INTERFACE
424 0, /* alternate setting for this interface */ 441 },
425 USB_CFG_HAVE_INTRIN_ENDPOINT, /* endpoints excl 0: number of endpoint descriptors to follow */ 442 .bInterfaceNumber = 0,
426 USB_CFG_INTERFACE_CLASS, USB_CFG_INTERFACE_SUBCLASS, USB_CFG_INTERFACE_PROTOCOL, 0, /* string index for interface */ 443 .bAlternateSetting = 0x00,
427 /* HID descriptor */ 444 .bNumEndpoints = USB_CFG_HAVE_INTRIN_ENDPOINT,
428 9, /* sizeof(usbDescrHID): length of descriptor in bytes */ 445 .bInterfaceClass = USB_CFG_INTERFACE_CLASS,
429 USBDESCR_HID, /* descriptor type: HID */ 446 .bInterfaceSubClass = USB_CFG_INTERFACE_SUBCLASS,
430 0x01, 0x01, /* BCD representation of HID version */ 447 .bInterfaceProtocol = USB_CFG_INTERFACE_PROTOCOL,
431 0x00, /* target country code */ 448 .iInterface = 0x00
432 0x01, /* number of HID Report (or other HID class) Descriptor infos to follow */ 449 },
433 0x22, /* descriptor type: report */ 450 .keyboardHID = {
434 sizeof(keyboard_hid_report), 0, /* total length of report descriptor */ 451 .header = {
435/* Endpoint descriptor */ 452 .bLength = sizeof(usbHIDDescriptor_t),
436# if USB_CFG_HAVE_INTRIN_ENDPOINT /* endpoint descriptor for endpoint 1 */ 453 .bDescriptorType = USBDESCR_HID
437 7, /* sizeof(usbDescrEndpoint) */ 454 },
438 USBDESCR_ENDPOINT, /* descriptor type = endpoint */ 455 .bcdHID = 0x0101,
439 (char)0x81, /* IN endpoint number 1 */ 456 .bCountryCode = 0x00,
440 0x03, /* attrib: Interrupt endpoint */ 457 .bNumDescriptors = 1,
441 8, 0, /* maximum packet size */ 458 .bDescriptorType = USBDESCR_HID_REPORT,
442 USB_POLLING_INTERVAL_MS, /* in ms */ 459 .wDescriptorLength = sizeof(keyboard_hid_report)
460 },
461# ifdef USB_CFG_HAVE_INTRIN_ENDPOINT
462 .keyboardINEndpoint = {
463 .header = {
464 .bLength = sizeof(usbEndpointDescriptor_t),
465 .bDescriptorType = USBDESCR_ENDPOINT
466 },
467 .bEndpointAddress = (USBRQ_DIR_DEVICE_TO_HOST | 1),
468 .bmAttributes = 0x03,
469 .wMaxPacketSize = 8,
470 .bInterval = USB_POLLING_INTERVAL_MS
471 },
443# endif 472# endif
444 473
445# if defined(MOUSE_ENABLE) || defined(EXTRAKEY_ENABLE) 474# if defined(MOUSE_ENABLE) || defined(EXTRAKEY_ENABLE)
446 /* 475 /*
447 * Mouse/extrakeys interface 476 * Mouse/Extrakeys
448 */ 477 */
449 /* Interface descriptor */ 478 .mouseExtraInterface = {
450 9, /* sizeof(usbDescrInterface): length of descriptor in bytes */ 479 .header = {
451 USBDESCR_INTERFACE, /* descriptor type */ 480 .bLength = sizeof(usbInterfaceDescriptor_t),
452 1, /* index of this interface */ 481 .bDescriptorType = USBDESCR_INTERFACE
453 0, /* alternate setting for this interface */ 482 },
454 USB_CFG_HAVE_INTRIN_ENDPOINT3, /* endpoints excl 0: number of endpoint descriptors to follow */ 483 .bInterfaceNumber = 1,
455 0x03, /* CLASS: HID */ 484 .bAlternateSetting = 0x00,
456 0, /* SUBCLASS: none */ 485 .bNumEndpoints = USB_CFG_HAVE_INTRIN_ENDPOINT3,
457 0, /* PROTOCOL: none */ 486 .bInterfaceClass = 0x03,
458 0, /* string index for interface */ 487 .bInterfaceSubClass = 0x00,
459 /* HID descriptor */ 488 .bInterfaceProtocol = 0x00,
460 9, /* sizeof(usbDescrHID): length of descriptor in bytes */ 489 .iInterface = 0x00
461 USBDESCR_HID, /* descriptor type: HID */ 490 },
462 0x01, 0x01, /* BCD representation of HID version */ 491 .mouseExtraHID = {
463 0x00, /* target country code */ 492 .header = {
464 0x01, /* number of HID Report (or other HID class) Descriptor infos to follow */ 493 .bLength = sizeof(usbHIDDescriptor_t),
465 0x22, /* descriptor type: report */ 494 .bDescriptorType = USBDESCR_HID
466 sizeof(mouse_extra_hid_report), 0, /* total length of report descriptor */ 495 },
467# if USB_CFG_HAVE_INTRIN_ENDPOINT3 /* endpoint descriptor for endpoint 3 */ 496 .bcdHID = 0x0101,
468 /* Endpoint descriptor */ 497 .bCountryCode = 0x00,
469 7, /* sizeof(usbDescrEndpoint) */ 498 .bNumDescriptors = 1,
470 USBDESCR_ENDPOINT, /* descriptor type = endpoint */ 499 .bDescriptorType = USBDESCR_HID_REPORT,
471 (char)(0x80 | USB_CFG_EP3_NUMBER), /* IN endpoint number 3 */ 500 .wDescriptorLength = sizeof(mouse_extra_hid_report)
472 0x03, /* attrib: Interrupt endpoint */ 501 },
473 8, 0, /* maximum packet size */ 502# if USB_CFG_HAVE_INTRIN_ENDPOINT3
474 USB_POLLING_INTERVAL_MS, /* in ms */ 503 .mouseExtraINEndpoint = {
504 .header = {
505 .bLength = sizeof(usbEndpointDescriptor_t),
506 .bDescriptorType = USBDESCR_ENDPOINT
507 },
508 .bEndpointAddress = (USBRQ_DIR_DEVICE_TO_HOST | USB_CFG_EP3_NUMBER),
509 .bmAttributes = 0x03,
510 .wMaxPacketSize = 8,
511 .bInterval = USB_POLLING_INTERVAL_MS
512 }
475# endif 513# endif
476# endif 514# endif
477}; 515};
478#endif 516#endif
479 517
518// clang-format on
519
480USB_PUBLIC usbMsgLen_t usbFunctionDescriptor(struct usbRequest *rq) { 520USB_PUBLIC usbMsgLen_t usbFunctionDescriptor(struct usbRequest *rq) {
481 usbMsgLen_t len = 0; 521 usbMsgLen_t len = 0;
482 522
@@ -489,42 +529,48 @@ USB_PUBLIC usbMsgLen_t usbFunctionDescriptor(struct usbRequest *rq) {
489 debug_hex16(rq->wLength.word); debug("\n"); 529 debug_hex16(rq->wLength.word); debug("\n");
490 */ 530 */
491 switch (rq->wValue.bytes[1]) { 531 switch (rq->wValue.bytes[1]) {
532#if USB_CFG_DESCR_PROPS_DEVICE
533 case USBDESCR_DEVICE:
534 usbMsgPtr = (unsigned char *)&usbDeviceDescriptor;
535 len = sizeof(usbDeviceDescriptor_t);
536 break;
537#endif
492#if USB_CFG_DESCR_PROPS_CONFIGURATION 538#if USB_CFG_DESCR_PROPS_CONFIGURATION
493 case USBDESCR_CONFIG: 539 case USBDESCR_CONFIG:
494 usbMsgPtr = (unsigned char *)usbDescriptorConfiguration; 540 usbMsgPtr = (unsigned char *)&usbConfigurationDescriptor;
495 len = sizeof(usbDescriptorConfiguration); 541 len = sizeof(usbConfigurationDescriptor_t);
496 break; 542 break;
497#endif 543#endif
498 case USBDESCR_STRING: 544 case USBDESCR_STRING:
499 switch (rq->wValue.bytes[0]) { 545 switch (rq->wValue.bytes[0]) {
500 case 0: 546 case 0:
501 usbMsgPtr = (unsigned char *)&usbDescriptorStringZero; 547 usbMsgPtr = (unsigned char *)&usbStringDescriptorZero;
502 len = usbDescriptorStringZero.header.bLength; 548 len = usbStringDescriptorZero.header.bLength;
503 break; 549 break;
504 case 1: // iManufacturer 550 case 1: // iManufacturer
505 usbMsgPtr = (unsigned char *)&usbDescriptorStringManufacturer; 551 usbMsgPtr = (unsigned char *)&usbStringDescriptorManufacturer;
506 len = usbDescriptorStringManufacturer.header.bLength; 552 len = usbStringDescriptorManufacturer.header.bLength;
507 break; 553 break;
508 case 2: // iProduct 554 case 2: // iProduct
509 usbMsgPtr = (unsigned char *)&usbDescriptorStringProduct; 555 usbMsgPtr = (unsigned char *)&usbStringDescriptorProduct;
510 len = usbDescriptorStringProduct.header.bLength; 556 len = usbStringDescriptorProduct.header.bLength;
511 break; 557 break;
512 case 3: // iSerialNumber 558 case 3: // iSerialNumber
513 usbMsgPtr = (unsigned char *)&usbDescriptorStringSerial; 559 usbMsgPtr = (unsigned char *)&usbStringDescriptorSerial;
514 len = usbDescriptorStringSerial.header.bLength; 560 len = usbStringDescriptorSerial.header.bLength;
515 break; 561 break;
516 } 562 }
517 break; 563 break;
518 case USBDESCR_HID: 564 case USBDESCR_HID:
519 switch (rq->wValue.bytes[0]) { 565 switch (rq->wValue.bytes[0]) {
520 case 0: 566 case 0:
521 usbMsgPtr = (unsigned char *)(usbDescriptorConfiguration + 9 + 9); 567 usbMsgPtr = (unsigned char *)&usbConfigurationDescriptor.keyboardHID;
522 len = 9; 568 len = sizeof(usbHIDDescriptor_t);
523 break; 569 break;
524#if defined(MOUSE_ENABLE) || defined(EXTRAKEY_ENABLE) 570#if defined(MOUSE_ENABLE) || defined(EXTRAKEY_ENABLE)
525 case 1: 571 case 1:
526 usbMsgPtr = (unsigned char *)(usbDescriptorConfiguration + 9 + (9 + 9 + 7) + 9); 572 usbMsgPtr = (unsigned char *)&usbConfigurationDescriptor.mouseExtraHID;
527 len = 9; 573 len = sizeof(usbHIDDescriptor_t);
528 break; 574 break;
529#endif 575#endif
530 } 576 }
diff --git a/tmk_core/protocol/vusb/vusb.h b/tmk_core/protocol/vusb/vusb.h
index cee07207a..debac67d2 100644
--- a/tmk_core/protocol/vusb/vusb.h
+++ b/tmk_core/protocol/vusb/vusb.h
@@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>. 15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/ 16*/
17 17
18#ifndef VUSB_H 18#pragma once
19#define VUSB_H
20 19
21#include "host_driver.h" 20#include "host_driver.h"
22 21
@@ -25,14 +24,83 @@ typedef struct usbDescriptorHeader {
25 uchar bDescriptorType; 24 uchar bDescriptorType;
26} __attribute__((packed)) usbDescriptorHeader_t; 25} __attribute__((packed)) usbDescriptorHeader_t;
27 26
27typedef struct usbDeviceDescriptor {
28 usbDescriptorHeader_t header;
29 unsigned bcdUSB;
30 uchar bDeviceClass;
31 uchar bDeviceSubClass;
32 uchar bDeviceProtocol;
33 uchar bMaxPacketSize0;
34 unsigned idVendor;
35 unsigned idProduct;
36 unsigned bcdDevice;
37 uchar iManufacturer;
38 uchar iProduct;
39 uchar iSerialNumber;
40 uchar bNumConfigurations;
41} __attribute__((packed)) usbDeviceDescriptor_t;
42
43typedef struct usbConfigurationDescriptorHeader {
44 usbDescriptorHeader_t header;
45 unsigned wTotalLength;
46 uchar bNumInterfaces;
47 uchar bConfigurationValue;
48 uchar iConfiguration;
49 uchar bmAttributes;
50 uchar bMaxPower;
51} __attribute__((packed)) usbConfigurationDescriptorHeader_t;
52
28typedef struct usbStringDescriptor { 53typedef struct usbStringDescriptor {
29 usbDescriptorHeader_t header; 54 usbDescriptorHeader_t header;
30 int bString[]; 55 int bString[];
31} __attribute__((packed)) usbStringDescriptor_t; 56} __attribute__((packed)) usbStringDescriptor_t;
32 57
58typedef struct usbInterfaceDescriptor {
59 usbDescriptorHeader_t header;
60 uchar bInterfaceNumber;
61 uchar bAlternateSetting;
62 uchar bNumEndpoints;
63 uchar bInterfaceClass;
64 uchar bInterfaceSubClass;
65 uchar bInterfaceProtocol;
66 uchar iInterface;
67} __attribute__((packed)) usbInterfaceDescriptor_t;
68
69typedef struct usbEndpointDescriptor {
70 usbDescriptorHeader_t header;
71 uchar bEndpointAddress;
72 uchar bmAttributes;
73 unsigned wMaxPacketSize;
74 uchar bInterval;
75} __attribute__((packed)) usbEndpointDescriptor_t;
76
77typedef struct usbHIDDescriptor {
78 usbDescriptorHeader_t header;
79 unsigned bcdHID;
80 uchar bCountryCode;
81 uchar bNumDescriptors;
82 uchar bDescriptorType;
83 unsigned wDescriptorLength;
84} __attribute__((packed)) usbHIDDescriptor_t;
85
86typedef struct usbConfigurationDescriptor {
87 usbConfigurationDescriptorHeader_t header;
88 usbInterfaceDescriptor_t keyboardInterface;
89 usbHIDDescriptor_t keyboardHID;
90#ifdef USB_CFG_HAVE_INTRIN_ENDPOINT
91 usbEndpointDescriptor_t keyboardINEndpoint;
92#endif
93
94#if defined(MOUSE_ENABLE) || defined(EXTRAKEY_ENABLE)
95 usbInterfaceDescriptor_t mouseExtraInterface;
96 usbHIDDescriptor_t mouseExtraHID;
97# ifdef USB_CFG_HAVE_INTRIN_ENDPOINT3
98 usbEndpointDescriptor_t mouseExtraINEndpoint;
99# endif
100#endif
101} __attribute__((packed)) usbConfigurationDescriptor_t;
102
33#define USB_STRING_LEN(s) (sizeof(usbDescriptorHeader_t) + ((s) << 1)) 103#define USB_STRING_LEN(s) (sizeof(usbDescriptorHeader_t) + ((s) << 1))
34 104
35host_driver_t *vusb_driver(void); 105host_driver_t *vusb_driver(void);
36void vusb_transfer_keyboard(void); 106void vusb_transfer_keyboard(void);
37
38#endif
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-03 07:13:47 +0000