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/percent/skog | |
parent | 981ea87b05b18756e79475b6aa576a4515008960 (diff) |
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/percent/skog')
-rw-r--r-- | keyboards/percent/skog/config.h | 2 | ||||
-rw-r--r-- | keyboards/percent/skog/usbconfig.h | 35 |
2 files changed, 6 insertions, 31 deletions
diff --git a/keyboards/percent/skog/config.h b/keyboards/percent/skog/config.h index cbfb2b6a56..099de6da21 100644 --- a/keyboards/percent/skog/config.h +++ b/keyboards/percent/skog/config.h @@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define PRODUCT_ID 0x422D #define DEVICE_VER 0x0200 -#define MANUFACTURER Percent +#define MANUFACTURER Percent Studios #define PRODUCT Skog TKL /* matrix size */ diff --git a/keyboards/percent/skog/usbconfig.h b/keyboards/percent/skog/usbconfig.h index 3a06286588..ad9c95c5d7 100644 --- a/keyboards/percent/skog/usbconfig.h +++ b/keyboards/percent/skog/usbconfig.h @@ -231,31 +231,6 @@ section at the end of this file). #define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF) /* Version number of the device: Minor number first, then major number. */ -#define USB_CFG_VENDOR_NAME 'P','e','r','c','e','n','t' -#define USB_CFG_VENDOR_NAME_LEN 7 -/* These two values define the vendor name returned by the USB device. The name - * must be given as a list of characters under single quotes. The characters - * are interpreted as Unicode (UTF-16) entities. - * If you don't want a vendor name string, undefine these macros. - * ALWAYS define a vendor name containing your Internet domain name if you use - * obdev's free shared VID/PID pair. See the file USB-IDs-for-free.txt for - * details. - */ -#define USB_CFG_DEVICE_NAME 'S','k','o','g',' ','T','K','L' -#define USB_CFG_DEVICE_NAME_LEN 8 -/* Same as above for the device name. If you don't want a device name, undefine - * the macros. See the file USB-IDs-for-free.txt before you assign a name if - * you use a shared VID/PID. - */ -/*#define USB_CFG_SERIAL_NUMBER 'N', 'o', 'n', 'e' */ -/*#define USB_CFG_SERIAL_NUMBER_LEN 0 */ -/* Same as above for the serial number. If you don't want a serial number, - * undefine the macros. - * It may be useful to provide the serial number through other means than at - * compile time. See the section about descriptor properties below for how - * to fine tune control over USB descriptors such as the string descriptor - * for the serial number. - */ #define USB_CFG_DEVICE_CLASS 0 #define USB_CFG_DEVICE_SUBCLASS 0 /* See USB specification if you want to conform to an existing device class. @@ -337,11 +312,11 @@ section at the end of this file). #define USB_CFG_DESCR_PROPS_DEVICE 0 #define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC //#define USB_CFG_DESCR_PROPS_CONFIGURATION 0 -#define USB_CFG_DESCR_PROPS_STRINGS 0 -#define USB_CFG_DESCR_PROPS_STRING_0 0 -#define USB_CFG_DESCR_PROPS_STRING_VENDOR 0 -#define USB_CFG_DESCR_PROPS_STRING_PRODUCT 0 -#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER 0 +#define USB_CFG_DESCR_PROPS_STRINGS USB_PROP_IS_DYNAMIC +#define USB_CFG_DESCR_PROPS_STRING_0 USB_PROP_IS_DYNAMIC +#define USB_CFG_DESCR_PROPS_STRING_VENDOR USB_PROP_IS_DYNAMIC +#define USB_CFG_DESCR_PROPS_STRING_PRODUCT USB_PROP_IS_DYNAMIC +#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER USB_PROP_IS_DYNAMIC #define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC //#define USB_CFG_DESCR_PROPS_HID 0 #define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC |