Skip to content
Snippets Groups Projects
Commit 417d3438 authored by Dean Camera's avatar Dean Camera
Browse files

Ensure USE_INTERNAL_SERIAL is set to NO_DESCRIPTOR if internal serial is disabled.

parent b1e59da0
Branches
No related tags found
No related merge requests found
...@@ -7,6 +7,10 @@ ...@@ -7,6 +7,10 @@
/** \page Page_ChangeLog Project Changelog /** \page Page_ChangeLog Project Changelog
* *
* \section Sec_ChangeLogXXXXXX Version XXXXXX * \section Sec_ChangeLogXXXXXX Version XXXXXX
* <b>New:</b>
* - Core:
* - The USE_INTERNAL_SERIAL definition can now be overridden by the user to a custom string index (thanks to Nicohood)
*
* <b>Fixed:</b> * <b>Fixed:</b>
* - Core: * - Core:
* - Fixed DeviceUsesOUTPipe flag not being set correctly in the HID host class driver (thanks to Wolfgang Schnerring) * - Fixed DeviceUsesOUTPipe flag not being set correctly in the HID host class driver (thanks to Wolfgang Schnerring)
......
...@@ -127,6 +127,7 @@ ...@@ -127,6 +127,7 @@
*/ */
#define INTERNAL_SERIAL_START_ADDRESS 0x0E #define INTERNAL_SERIAL_START_ADDRESS 0x0E
#else #else
#undef USE_INTERNAL_SERIAL
#define USE_INTERNAL_SERIAL NO_DESCRIPTOR #define USE_INTERNAL_SERIAL NO_DESCRIPTOR
#define INTERNAL_SERIAL_LENGTH_BITS 0 #define INTERNAL_SERIAL_LENGTH_BITS 0
......
...@@ -116,6 +116,7 @@ ...@@ -116,6 +116,7 @@
*/ */
#define INTERNAL_SERIAL_START_ADDRESS 0x80800204 #define INTERNAL_SERIAL_START_ADDRESS 0x80800204
#else #else
#undef USE_INTERNAL_SERIAL
#define USE_INTERNAL_SERIAL NO_DESCRIPTOR #define USE_INTERNAL_SERIAL NO_DESCRIPTOR
#define INTERNAL_SERIAL_LENGTH_BITS 0 #define INTERNAL_SERIAL_LENGTH_BITS 0
......
...@@ -124,6 +124,7 @@ ...@@ -124,6 +124,7 @@
*/ */
#define INTERNAL_SERIAL_START_ADDRESS offsetof(NVM_PROD_SIGNATURES_t, LOTNUM0) #define INTERNAL_SERIAL_START_ADDRESS offsetof(NVM_PROD_SIGNATURES_t, LOTNUM0)
#else #else
#undef USE_INTERNAL_SERIAL
#define USE_INTERNAL_SERIAL NO_DESCRIPTOR #define USE_INTERNAL_SERIAL NO_DESCRIPTOR
#define INTERNAL_SERIAL_LENGTH_BITS 0 #define INTERNAL_SERIAL_LENGTH_BITS 0
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment