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

Fix: Flipper serial bt profile shown as 'Unknown' in bt settings + flipper app

Browse Source
This commit is contained in:
yocvito
2023-02-15 14:29:29 +01:00
parent 637918f0ac
commit bde3aa589b
2 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
applications/main/bad_kb/bad_kb_app.c
View File

@@ -99,11 +99,11 @@ BadKbApp* bad_kb_app_alloc(char* arg) {
Bt* bt = furi_record_open(RECORD_BT);
app->bt = bt;
app->is_bt = XTREME_SETTINGS()->bad_bt;
const char* adv_name = bt_get_profile_adv_name(bt);
const char* adv_name = furi_hal_bt_get_profile_adv_name(FuriHalBtProfileHidKeyboard);
memcpy(app->name, adv_name, BAD_KB_ADV_NAME_MAX_LEN);
memcpy(app->bt_old_config.name, adv_name, BAD_KB_ADV_NAME_MAX_LEN);
const uint8_t* mac_addr = bt_get_profile_mac_address(bt);
const uint8_t* mac_addr = furi_hal_bt_get_profile_mac_addr(FuriHalBtProfileHidKeyboard);
memcpy(app->mac, mac_addr, BAD_KB_MAC_ADDRESS_LEN);
memcpy(app->bt_old_config.mac, mac_addr, BAD_KB_MAC_ADDRESS_LEN);

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

@@ -207,6 +207,12 @@ bool furi_hal_bt_start_app(FuriHalBtProfile profile, GapEventCallback event_cb,
profile_config[profile].config.mac_address,
furi_hal_version_get_ble_mac(),
sizeof(profile_config[profile].config.mac_address));
// Set advertise name
strlcpy(
profile_config[profile].config.adv_name,
furi_hal_version_get_ble_local_device_name_ptr(),
FURI_HAL_VERSION_DEVICE_NAME_LENGTH);
config->adv_service_uuid |= furi_hal_version_get_hw_color();
} else if(profile == FuriHalBtProfileHidKeyboard) {
// Change MAC address for HID profile
@@ -216,8 +222,9 @@ bool furi_hal_bt_start_app(FuriHalBtProfile profile, GapEventCallback event_cb,
}
// Change name Flipper -> Control
if(strlen(&config->adv_name[1]) == 0) {
const char* clicker_str = "Control";
const char* clicker_str = "Control ";
memcpy(&config->adv_name[1], clicker_str, strlen(clicker_str));
strlcat(&config->adv_name[1], furi_hal_version_get_ble_local_device_name_ptr(), FURI_HAL_VERSION_DEVICE_NAME_LENGTH);
}
}
if(!gap_init(config, event_cb, context)) {
@@ -468,11 +475,18 @@ void furi_hal_bt_set_profile_adv_name(
furi_assert(profile < FuriHalBtProfileNumber);
furi_assert(name);
profile_config[profile].config.adv_name[0] = 0x09;
memcpy(
&(profile_config[profile].config.adv_name[1]),
name,
FURI_HAL_VERSION_DEVICE_NAME_LENGTH - 1);
if (strlen(name) == 0) {
memset(
&(profile_config[profile].config.adv_name[1]),
0,
strlen(&(profile_config[profile].config.adv_name[1])));
} else {
profile_config[profile].config.adv_name[0] = AD_TYPE_COMPLETE_LOCAL_NAME;
memcpy(
&(profile_config[profile].config.adv_name[1]),
name,
FURI_HAL_VERSION_DEVICE_NAME_LENGTH - 1);
}
}
const char* furi_hal_bt_get_profile_adv_name(FuriHalBtProfile profile) {