From f120b39fb0b0f46122cdfeed2cb61fbae34debe2 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Wed, 5 Oct 2022 21:20:09 +0100
Subject: [PATCH] Update ChibiOS hardware ID (#18613)

---
 platforms/chibios/hardware_id.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/platforms/chibios/hardware_id.c b/platforms/chibios/hardware_id.c
index 888a275465..7705bc7fd6 100644
--- a/platforms/chibios/hardware_id.c
+++ b/platforms/chibios/hardware_id.c
@@ -6,10 +6,12 @@
 
 hardware_id_t get_hardware_id(void) {
     hardware_id_t id = {0};
-#ifdef UID_BASE
+#if defined(RP2040)
+    flash_get_unique_id((uint8_t *)&id);
+#elif defined(UID_BASE)
     id.data[0] = (uint32_t)(*((uint32_t *)UID_BASE));
     id.data[1] = (uint32_t)(*((uint32_t *)(UID_BASE + 4)));
-    id.data[1] = (uint32_t)(*((uint32_t *)(UID_BASE + 8)));
+    id.data[2] = (uint32_t)(*((uint32_t *)(UID_BASE + 8)));
 #endif
     return id;
 }