kb01/zmk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Address review comments

Browse source
This commit is contained in:
ReFil 2024-06-18 18:31:42 +01:00
parent f7dee8238d
commit 2852fe315c
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Kconfig
View file

@ -147,7 +147,7 @@ menuconfig ZMK_BLE
select BT_SMP_APP_PAIRING_ACCEPT select BT_SMP_APP_PAIRING_ACCEPT
select BT_PERIPHERAL select BT_PERIPHERAL
select BT_DIS select BT_DIS
select BT_DEVICE_NAME_DYNAMIC imply BT_DEVICE_NAME_DYNAMIC
imply BT_SETTINGS if !ARCH_POSIX imply BT_SETTINGS if !ARCH_POSIX
imply SETTINGS if !ARCH_POSIX imply SETTINGS if !ARCH_POSIX
imply ZMK_BATTERY_REPORTING if !ARCH_POSIX imply ZMK_BATTERY_REPORTING if !ARCH_POSIX

2
app/include/zmk/ble.h
View file

@ -36,7 +36,7 @@ char *zmk_ble_active_profile_name(void);
int zmk_ble_unpair_all(void); int zmk_ble_unpair_all(void);
void zmk_ble_set_device_name(char *name); int zmk_ble_set_device_name(char *name);
#if IS_ENABLED(CONFIG_ZMK_SPLIT_ROLE_CENTRAL) #if IS_ENABLED(CONFIG_ZMK_SPLIT_ROLE_CENTRAL)
int zmk_ble_put_peripheral_addr(const bt_addr_le_t *addr); int zmk_ble_put_peripheral_addr(const bt_addr_le_t *addr);

13
app/src/ble.c
View file

@ -319,19 +319,24 @@ bt_addr_le_t *zmk_ble_active_profile_addr(void) { return &profiles[active_profil
char *zmk_ble_active_profile_name(void) { return profiles[active_profile].name; } char *zmk_ble_active_profile_name(void) { return profiles[active_profile].name; }
void zmk_ble_set_device_name(char *name) { int zmk_ble_set_device_name(char *name) {
// Copy new name to advertising parameters // Copy new name to advertising parameters
bt_set_name(name); int err = bt_set_name(name);
LOG_DBG("New device name: %s", name); LOG_DBG("New device name: %s", name);
if (err) {
LOG_ERR("Failed to set new device name (err %d)", err);
return err;
}
if (advertising_status == ZMK_ADV_CONN) { if (advertising_status == ZMK_ADV_CONN) {
// Stop current advertising so it can restart with new name // Stop current advertising so it can restart with new name
int err = bt_le_adv_stop(); err = bt_le_adv_stop();
advertising_status = ZMK_ADV_NONE; advertising_status = ZMK_ADV_NONE;
if (err) { if (err) {
LOG_ERR("Failed to stop advertising (err %d)", err); LOG_ERR("Failed to stop advertising (err %d)", err);
return err;
} }
} }
update_advertising(); return update_advertising();
} }
#if IS_ENABLED(CONFIG_ZMK_SPLIT_ROLE_CENTRAL) #if IS_ENABLED(CONFIG_ZMK_SPLIT_ROLE_CENTRAL)