From b7ad1b454dcb529bcc35550e13d59ff57a0d272f Mon Sep 17 00:00:00 2001 From: Aleksandr Kutuzov Date: Tue, 18 Jun 2024 16:23:47 +0100 Subject: [PATCH] FuriHal: fix chip id used in BLE MAC address --- targets/f7/furi_hal/furi_hal_version.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/targets/f7/furi_hal/furi_hal_version.c b/targets/f7/furi_hal/furi_hal_version.c index c7656a8df..0c2ceaee9 100644 --- a/targets/f7/furi_hal/furi_hal_version.c +++ b/targets/f7/furi_hal/furi_hal_version.c @@ -10,8 +10,10 @@ #define TAG "FuriHalVersion" -#define FURI_HAL_VERSION_OTP_HEADER_MAGIC 0xBABE -#define FURI_HAL_VERSION_OTP_ADDRESS OTP_AREA_BASE +#define FURI_HAL_VERSION_OTP_HEADER_MAGIC (0xBABE) +#define FURI_HAL_VERSION_OTP_ADDRESS (OTP_AREA_BASE) + +#define FURI_HAL_VERSION_DEVICE_ID (0x26u) /** OTP V0 Structure: prototypes and early EVT */ typedef struct { @@ -107,11 +109,10 @@ static void furi_hal_version_set_name(const char* name) { // BLE Mac address uint32_t udn = LL_FLASH_GetUDN(); uint32_t company_id = LL_FLASH_GetSTCompanyID(); - uint32_t device_id = LL_FLASH_GetDeviceID(); furi_hal_version.ble_mac[0] = (uint8_t)(udn & 0x000000FF); furi_hal_version.ble_mac[1] = (uint8_t)((udn & 0x0000FF00) >> 8); furi_hal_version.ble_mac[2] = (uint8_t)((udn & 0x00FF0000) >> 16); - furi_hal_version.ble_mac[3] = (uint8_t)device_id; + furi_hal_version.ble_mac[3] = FURI_HAL_VERSION_DEVICE_ID; furi_hal_version.ble_mac[4] = (uint8_t)(company_id & 0x000000FF); furi_hal_version.ble_mac[5] = (uint8_t)((company_id & 0x0000FF00) >> 8); }