diff options
author | Ryan <fauxpark@gmail.com> | 2020-03-27 00:11:32 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-26 13:11:32 +0000 |
commit | 4d76d85d7bef735a56f9e1e275c89f4beaf52a64 (patch) | |
tree | 7aaace6286075a2130828d8900a217618fdc9ef8 /keyboards/gingham | |
parent | 981ea87b05b18756e79475b6aa576a4515008960 (diff) | |
download | qmk_firmware-4d76d85d7bef735a56f9e1e275c89f4beaf52a64.tar.gz qmk_firmware-4d76d85d7bef735a56f9e1e275c89f4beaf52a64.zip |
V-USB: Use manufacturer and product strings from config.h (#7797)
* V-USB: Use manufacturer and product strings from config.h
* Update board configs
Diffstat (limited to 'keyboards/gingham')
-rw-r--r-- | keyboards/gingham/usbconfig.h | 35 |
1 files changed, 5 insertions, 30 deletions
diff --git a/keyboards/gingham/usbconfig.h b/keyboards/gingham/usbconfig.h index 3c7aa0da0..ee040d16b 100644 --- a/keyboards/gingham/usbconfig.h +++ b/keyboards/gingham/usbconfig.h | |||
@@ -231,31 +231,6 @@ section at the end of this file). | |||
231 | #define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF) | 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. | 232 | /* Version number of the device: Minor number first, then major number. |
233 | */ | 233 | */ |
234 | #define USB_CFG_VENDOR_NAME 'Y','i','a','n','c','a','r','-','D','e', 's', 'i', 'g', 'n', 's' | ||
235 | #define USB_CFG_VENDOR_NAME_LEN 15 | ||
236 | /* These two values define the vendor name returned by the USB device. The name | ||
237 | * must be given as a list of characters under single quotes. The characters | ||
238 | * are interpreted as Unicode (UTF-16) entities. | ||
239 | * If you don't want a vendor name string, undefine these macros. | ||
240 | * ALWAYS define a vendor name containing your Internet domain name if you use | ||
241 | * obdev's free shared VID/PID pair. See the file USB-IDs-for-free.txt for | ||
242 | * details. | ||
243 | */ | ||
244 | #define USB_CFG_DEVICE_NAME 'G', 'i', 'n', 'g', 'h', 'a', 'm' | ||
245 | #define USB_CFG_DEVICE_NAME_LEN 7 | ||
246 | /* Same as above for the device name. If you don't want a device name, undefine | ||
247 | * the macros. See the file USB-IDs-for-free.txt before you assign a name if | ||
248 | * you use a shared VID/PID. | ||
249 | */ | ||
250 | #define USB_CFG_SERIAL_NUMBER '0' | ||
251 | #define USB_CFG_SERIAL_NUMBER_LEN 1 | ||
252 | /* Same as above for the serial number. If you don't want a serial number, | ||
253 | * undefine the macros. | ||
254 | * It may be useful to provide the serial number through other means than at | ||
255 | * compile time. See the section about descriptor properties below for how | ||
256 | * to fine tune control over USB descriptors such as the string descriptor | ||
257 | * for the serial number. | ||
258 | */ | ||
259 | #define USB_CFG_DEVICE_CLASS 0 | 234 | #define USB_CFG_DEVICE_CLASS 0 |
260 | #define USB_CFG_DEVICE_SUBCLASS 0 | 235 | #define USB_CFG_DEVICE_SUBCLASS 0 |
261 | /* See USB specification if you want to conform to an existing device class. | 236 | /* See USB specification if you want to conform to an existing device class. |
@@ -337,11 +312,11 @@ section at the end of this file). | |||
337 | #define USB_CFG_DESCR_PROPS_DEVICE 0 | 312 | #define USB_CFG_DESCR_PROPS_DEVICE 0 |
338 | #define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC | 313 | #define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC |
339 | //#define USB_CFG_DESCR_PROPS_CONFIGURATION 0 | 314 | //#define USB_CFG_DESCR_PROPS_CONFIGURATION 0 |
340 | #define USB_CFG_DESCR_PROPS_STRINGS 0 | 315 | #define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC |
341 | #define USB_CFG_DESCR_PROPS_STRING_0 0 | 316 | #define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC |
342 | #define USB_CFG_DESCR_PROPS_STRING_VENDOR 0 | 317 | #define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC |
343 | #define USB_CFG_DESCR_PROPS_STRING_PRODUCT 0 | 318 | #define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC |
344 | #define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER 0 | 319 | #define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC |
345 | #define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC | 320 | #define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC |
346 | //#define USB_CFG_DESCR_PROPS_HID 0 | 321 | //#define USB_CFG_DESCR_PROPS_HID 0 |
347 | #define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC | 322 | #define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC |