sys64738
/
blackmagic
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

stm32/serialno: Fixed a regression in 24 character serial number suport which was causing them to display all 0's

This commit is contained in:
dragonmux 2022-06-26 16:45:51 -04:00 committed by Piotr Esden-Tempski
parent 4a0e373b49
commit 6f38b844af
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/platforms/stm32/serialno.c
View File

@ -47,13 +47,14 @@ char *serial_no_read(char *s)
for (size_t i = 0; i < 24U; ++i) { for (size_t i = 0; i < 24U; ++i) {
const size_t chunk = i >> 3U; const size_t chunk = i >> 3U;
const size_t nibble = i & 7U; const size_t nibble = i & 7U;
const size_t idx = (chunk << 3U) + (7U - nibble);
if (nibble == 0) if (nibble == 0)
unique_id = unique_id_p[chunk]; unique_id = unique_id_p[chunk];
s[chunk + (7U - nibble)] = ((unique_id >> (i * 4)) & 0x0F) + '0'; s[idx] = ((unique_id >> (i * 4)) & 0x0F) + '0';
/* If the character is something above 9, then add the offset to make it ASCII A-F */ /* If the character is something above 9, then add the offset to make it ASCII A-F */
if (s[chunk + (7U - nibble)] > '9') if (s[idx] > '9')
s[chunk + (7U - nibble)] += 7; /* 'A' - '9' = 8, less 1 gives 7. */ s[idx] += 7; /* 'A' - '9' = 8, less 1 gives 7. */
} }
#else #else
# WARNING "Unhandled DFU_SERIAL_LENGTH" # WARNING "Unhandled DFU_SERIAL_LENGTH"