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/j80 | |
| 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/j80')
| -rw-r--r-- | keyboards/j80/usbconfig.h | 35 |
1 files changed, 5 insertions, 30 deletions
diff --git a/keyboards/j80/usbconfig.h b/keyboards/j80/usbconfig.h index 0c377f4b7..4acb6b281 100644 --- a/keyboards/j80/usbconfig.h +++ b/keyboards/j80/usbconfig.h | |||
| @@ -220,31 +220,6 @@ section at the end of this file). | |||
| 220 | #define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF) | 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. | 221 | /* Version number of the device: Minor number first, then major number. |
| 222 | */ | 222 | */ |
| 223 | #define USB_CFG_VENDOR_NAME 'J', 'E', 'R' | ||
| 224 | #define USB_CFG_VENDOR_NAME_LEN 3 | ||
| 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 'J', '8', '0' | ||
| 234 | #define USB_CFG_DEVICE_NAME_LEN 3 | ||
| 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 | 223 | #define USB_CFG_DEVICE_CLASS 0 |
| 249 | #define USB_CFG_DEVICE_SUBCLASS 0 | 224 | #define USB_CFG_DEVICE_SUBCLASS 0 |
| 250 | /* See USB specification if you want to conform to an existing device class. | 225 | /* See USB specification if you want to conform to an existing device class. |
| @@ -326,11 +301,11 @@ section at the end of this file). | |||
| 326 | #define USB_CFG_DESCR_PROPS_DEVICE 0 | 301 | #define USB_CFG_DESCR_PROPS_DEVICE 0 |
| 327 | #define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC | 302 | #define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC |
| 328 | //#define USB_CFG_DESCR_PROPS_CONFIGURATION 0 | 303 | //#define USB_CFG_DESCR_PROPS_CONFIGURATION 0 |
| 329 | #define USB_CFG_DESCR_PROPS_STRINGS 0 | 304 | #define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC |
| 330 | #define USB_CFG_DESCR_PROPS_STRING_0 0 | 305 | #define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC |
| 331 | #define USB_CFG_DESCR_PROPS_STRING_VENDOR 0 | 306 | #define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC |
| 332 | #define USB_CFG_DESCR_PROPS_STRING_PRODUCT 0 | 307 | #define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC |
| 333 | #define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER 0 | 308 | #define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC |
| 334 | #define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC | 309 | #define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC |
| 335 | //#define USB_CFG_DESCR_PROPS_HID 0 | 310 | //#define USB_CFG_DESCR_PROPS_HID 0 |
| 336 | #define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC | 311 | #define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC |
