DarkFlippers/unleashed-firmware
1
1
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2024-12-21 12:21:49 +03:00
Code Issues Projects Releases Wiki Activity

Revert "Fix name reset after bt apps exit"

Browse Source 
This reverts commit ae545cdb09.
This commit is contained in:
Nikita Vostokov 2023-07-05 15:04:56 +03:00 committed by MX
parent ae545cdb09
commit 0980424bb9
No known key found for this signature in database
GPG Key ID: 7CCC66B7DBDD1C83
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
firmware/targets/f7/furi_hal/furi_hal_bt.c
View File

@ -54,7 +54,6 @@ FuriHalBtProfileConfig profile_config[FuriHalBtProfileNumber] = {
.bonding_mode = true, .bonding_mode = true,
.pairing_method = GapPairingPinCodeShow, .pairing_method = GapPairingPinCodeShow,
.mac_address = FURI_HAL_BT_DEFAULT_MAC_ADDR, .mac_address = FURI_HAL_BT_DEFAULT_MAC_ADDR,
.adv_name = "\0",
.conn_param = .conn_param =
{ {
.conn_int_min = 0x18, // 30 ms .conn_int_min = 0x18, // 30 ms
@ -75,7 +74,6 @@ FuriHalBtProfileConfig profile_config[FuriHalBtProfileNumber] = {
.bonding_mode = true, .bonding_mode = true,
.pairing_method = GapPairingPinCodeVerifyYesNo, .pairing_method = GapPairingPinCodeVerifyYesNo,
.mac_address = FURI_HAL_BT_DEFAULT_MAC_ADDR, .mac_address = FURI_HAL_BT_DEFAULT_MAC_ADDR,
.adv_name = "\0",
.conn_param = .conn_param =
{ {
.conn_int_min = 0x18, // 30 ms .conn_int_min = 0x18, // 30 ms
@ -233,12 +231,11 @@ bool furi_hal_bt_start_app(FuriHalBtProfile profile, GapEventCallback event_cb,
// Set mac address // Set mac address
memcpy( memcpy(
config->mac_address, furi_hal_version_get_ble_mac(), sizeof(config->mac_address)); config->mac_address, furi_hal_version_get_ble_mac(), sizeof(config->mac_address));
// Set stock advertise name only once on bootup // Set advertise name
if(!strnlen(config->adv_name, FURI_HAL_BT_ADV_NAME_LENGTH)) strlcpy(
strlcpy( config->adv_name,
config->adv_name, furi_hal_version_get_ble_local_device_name_ptr(),
furi_hal_version_get_ble_local_device_name_ptr(), FURI_HAL_BT_ADV_NAME_LENGTH);
FURI_HAL_BT_ADV_NAME_LENGTH);
config->adv_service_uuid |= furi_hal_version_get_hw_color(); config->adv_service_uuid |= furi_hal_version_get_hw_color();
} else if(profile == FuriHalBtProfileHidKeyboard) { } else if(profile == FuriHalBtProfileHidKeyboard) {