diff options
| author | Drashna Jaelre <drashna@live.com> | 2019-07-03 07:54:39 -0700 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2019-07-03 07:54:49 -0700 |
| commit | 110622eaa2787cc54818083d4243653b088e5b5a (patch) | |
| tree | b1637e4dc8d8aa13e9face4998cf25ae620361e5 /LUFA/Drivers/USB/Core/UC3/Device_UC3.h | |
| parent | d0fd80affba97b37eb00c650e87cb5982a4f260e (diff) | |
| parent | 5ba628d10b54d58d445896290ba9799bd76a73b3 (diff) | |
| download | lufa-110622eaa2787cc54818083d4243653b088e5b5a.tar.gz lufa-110622eaa2787cc54818083d4243653b088e5b5a.tar.bz2 lufa-110622eaa2787cc54818083d4243653b088e5b5a.zip | |
Merge remote-tracking branch 'abcminiuser/master'
Diffstat (limited to 'LUFA/Drivers/USB/Core/UC3/Device_UC3.h')
| -rw-r--r-- | LUFA/Drivers/USB/Core/UC3/Device_UC3.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/LUFA/Drivers/USB/Core/UC3/Device_UC3.h b/LUFA/Drivers/USB/Core/UC3/Device_UC3.h index fd6dbde88..770cf10d8 100644 --- a/LUFA/Drivers/USB/Core/UC3/Device_UC3.h +++ b/LUFA/Drivers/USB/Core/UC3/Device_UC3.h @@ -1,13 +1,13 @@ /* LUFA Library - Copyright (C) Dean Camera, 2017. + Copyright (C) Dean Camera, 2019. dean [at] fourwalledcubicle [dot] com www.lufa-lib.org */ /* - Copyright 2017 Dean Camera (dean [at] fourwalledcubicle [dot] com) + Copyright 2019 Dean Camera (dean [at] fourwalledcubicle [dot] com) Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted @@ -102,7 +102,9 @@ * On unsupported devices, this will evaluate to \ref NO_DESCRIPTOR and so will force the host to create a pseudo-serial * number for the device. */ - #define USE_INTERNAL_SERIAL 0xDC + #ifndef USE_INTERNAL_SERIAL + #define USE_INTERNAL_SERIAL 0xDC + #endif /** Length of the device's unique internal serial number, in bits, if present on the selected microcontroller * model. @@ -114,6 +116,7 @@ */ #define INTERNAL_SERIAL_START_ADDRESS 0x80800204 #else + #undef USE_INTERNAL_SERIAL #define USE_INTERNAL_SERIAL NO_DESCRIPTOR #define INTERNAL_SERIAL_LENGTH_BITS 0 |