mirror of
https://github.com/qmk/qmk_firmware.git
synced 2024-12-04 17:05:17 +00:00
Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
commit
eaa1707e66
@ -7,6 +7,9 @@
|
|||||||
hardware_id_t get_hardware_id(void) {
|
hardware_id_t get_hardware_id(void) {
|
||||||
hardware_id_t id = {0};
|
hardware_id_t id = {0};
|
||||||
#if defined(RP2040)
|
#if defined(RP2040)
|
||||||
|
// Forward declare as including "hardware/flash.h" here causes more issues...
|
||||||
|
void flash_get_unique_id(uint8_t *);
|
||||||
|
|
||||||
flash_get_unique_id((uint8_t *)&id);
|
flash_get_unique_id((uint8_t *)&id);
|
||||||
#elif defined(UID_BASE)
|
#elif defined(UID_BASE)
|
||||||
id.data[0] = (uint32_t)(*((uint32_t *)UID_BASE));
|
id.data[0] = (uint32_t)(*((uint32_t *)UID_BASE));
|
||||||
|
Loading…
Reference in New Issue
Block a user