Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-04-24 03:29:57 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge fixes

Browse Source 
+ thanks @Willy-JL !
This commit is contained in:
MX
2024-02-19 03:52:35 +03:00
parent 9fcf3795ee
commit 66c60e65aa
13 changed files with 89 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
targets/f7/furi_hal/furi_hal_version.c
View File

@@ -91,7 +91,14 @@ typedef struct {
static FuriHalVersion furi_hal_version = {0};
void furi_hal_version_set_name(const char* name) {
if(name != NULL) {
uint32_t udn = LL_FLASH_GetUDN();
if(name == NULL) {
name = version_get_custom_name(NULL);
if(name != NULL) {
udn = *((uint32_t*)name);
}
}
if(name != NULL && strlen(name)) {
strlcpy(furi_hal_version.name, name, FURI_HAL_VERSION_ARRAY_NAME_LENGTH);
snprintf(
furi_hal_version.device_name,
@@ -105,11 +112,6 @@ void furi_hal_version_set_name(const char* name) {
furi_hal_version.device_name[0] = AD_TYPE_COMPLETE_LOCAL_NAME;
// BLE Mac address
uint32_t udn = LL_FLASH_GetUDN();
if(version_get_custom_name(NULL) != NULL) {
udn = *((uint32_t*)version_get_custom_name(NULL));
}
uint32_t company_id = LL_FLASH_GetSTCompanyID();
// uint32_t device_id = LL_FLASH_GetDeviceID();
// Some flippers return 0x27 (flippers with chip revision 2003 6495) instead of 0x26 (flippers with chip revision 2001 6495)
@@ -137,11 +139,7 @@ static void furi_hal_version_load_otp_v0() {
furi_hal_version.board_body = otp->board_body;
furi_hal_version.board_connect = otp->board_connect;
if(version_get_custom_name(NULL) != NULL) {
furi_hal_version_set_name(version_get_custom_name(NULL));
} else {
furi_hal_version_set_name(otp->name);
}
furi_hal_version_set_name(otp->name);
}
static void furi_hal_version_load_otp_v1() {
@@ -155,11 +153,7 @@ static void furi_hal_version_load_otp_v1() {
furi_hal_version.board_color = otp->board_color;
furi_hal_version.board_region = otp->board_region;
if(version_get_custom_name(NULL) != NULL) {
furi_hal_version_set_name(version_get_custom_name(NULL));
} else {
furi_hal_version_set_name(otp->name);
}
furi_hal_version_set_name(otp->name);
}
static void furi_hal_version_load_otp_v2() {
@@ -179,11 +173,7 @@ static void furi_hal_version_load_otp_v2() {
if(otp->board_color != 0xFF) {
furi_hal_version.board_color = otp->board_color;
furi_hal_version.board_region = otp->board_region;
if(version_get_custom_name(NULL) != NULL) {
furi_hal_version_set_name(version_get_custom_name(NULL));
} else {
furi_hal_version_set_name(otp->name);
}
furi_hal_version_set_name(otp->name);
} else {
furi_hal_version.board_color = 0;
furi_hal_version.board_region = 0;