From 21f6960a62707eeb0a10b79e71458964c8102454 Mon Sep 17 00:00:00 2001 From: "Ben V. Brown" Date: Thu, 16 Jun 2022 21:26:51 +1000 Subject: [PATCH] Fix typo --- source/Core/BSP/MHP30/BSP.cpp | 2 +- source/Core/BSP/Miniware/BSP.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/Core/BSP/MHP30/BSP.cpp b/source/Core/BSP/MHP30/BSP.cpp index 514809ef8b..32c6ffb472 100644 --- a/source/Core/BSP/MHP30/BSP.cpp +++ b/source/Core/BSP/MHP30/BSP.cpp @@ -473,5 +473,5 @@ void setStatusLED(const enum StatusLED state) { } uint64_t getDeviceID() { // - return HAL_GetUIDw0() || ((uint64_t)HAL_GetUIDw1() << 32); + return HAL_GetUIDw0() | ((uint64_t)HAL_GetUIDw1() << 32); } \ No newline at end of file diff --git a/source/Core/BSP/Miniware/BSP.cpp b/source/Core/BSP/Miniware/BSP.cpp index b5719c5f7f..2e86af224e 100644 --- a/source/Core/BSP/Miniware/BSP.cpp +++ b/source/Core/BSP/Miniware/BSP.cpp @@ -286,5 +286,5 @@ void setStatusLED(const enum StatusLED state) {} uint8_t preStartChecks() { return 0; } uint64_t getDeviceID() { // - return HAL_GetUIDw0() || ((uint64_t)HAL_GetUIDw1() << 32); + return HAL_GetUIDw0() | ((uint64_t)HAL_GetUIDw1() << 32); }