[FL-1796] Disable bluetooth (#703)
* bt: add authentication for all characteristics * bt: app_ble cleanup * bt: add start and stop advertising API * bt: rework application with start and stop advertising API * bt: support f7 target * bt: f7 target remove unused files * bt: stop advertising in bt debug application * bt: fix bt status bar update * bt: change bluetooth On Off order
This commit is contained in:
@@ -1,2 +1 @@
|
||||
ADD_SCENE(bt_settings, start, Start)
|
||||
ADD_SCENE(bt_settings, disable_dialog, DisableDialog)
|
||||
|
@@ -1,44 +0,0 @@
|
||||
#include "../bt_settings_app.h"
|
||||
#include <furi-hal-boot.h>
|
||||
#include <furi-hal-power.h>
|
||||
|
||||
static void bt_setting_disable_dialog_callback(DialogExResult result, void* context) {
|
||||
BtSettingsApp* app = context;
|
||||
view_dispatcher_send_custom_event(app->view_dispatcher, result);
|
||||
}
|
||||
|
||||
void bt_settings_scene_disable_dialog_on_enter(void* context) {
|
||||
BtSettingsApp* app = context;
|
||||
DialogEx* dialog_ex = app->dialog_ex;
|
||||
dialog_ex_set_text(
|
||||
dialog_ex, "Reboot device\nto disable Bluetooth", 64, 32, AlignCenter, AlignCenter);
|
||||
dialog_ex_set_left_button_text(dialog_ex, "Back");
|
||||
dialog_ex_set_right_button_text(dialog_ex, "Reboot");
|
||||
dialog_ex_set_result_callback(dialog_ex, bt_setting_disable_dialog_callback);
|
||||
dialog_ex_set_context(dialog_ex, app);
|
||||
|
||||
view_dispatcher_switch_to_view(app->view_dispatcher, BtSettingsAppViewDialogEx);
|
||||
}
|
||||
|
||||
bool bt_settings_scene_disable_dialog_on_event(void* context, SceneManagerEvent event) {
|
||||
BtSettingsApp* app = context;
|
||||
bool consumed = false;
|
||||
|
||||
if(event.type == SceneManagerEventTypeCustom) {
|
||||
if(event.event == DialogExResultLeft) {
|
||||
scene_manager_previous_scene(app->scene_manager);
|
||||
consumed = true;
|
||||
} else if(event.event == DialogExResultRight) {
|
||||
app->settings.enabled = false;
|
||||
bt_settings_save(&app->settings);
|
||||
furi_hal_boot_set_mode(FuriHalBootModeNormal);
|
||||
furi_hal_power_reset();
|
||||
}
|
||||
}
|
||||
return consumed;
|
||||
}
|
||||
|
||||
void bt_settings_scene_disable_dialog_on_exit(void* context) {
|
||||
BtSettingsApp* app = context;
|
||||
dialog_ex_clean(app->dialog_ex);
|
||||
}
|
@@ -1,28 +1,45 @@
|
||||
#include "../bt_settings_app.h"
|
||||
#include "furi-hal-bt.h"
|
||||
|
||||
enum BtSettingsAppStartSubmenuIndex {
|
||||
BtSettingsAppStartSubmenuIndexEnable,
|
||||
enum BtSetting {
|
||||
BtSettingOff,
|
||||
BtSettingOn,
|
||||
BtSettingNum,
|
||||
};
|
||||
|
||||
static void bt_settings_scene_start_submenu_callback(void* context, uint32_t index) {
|
||||
BtSettingsApp* app = context;
|
||||
const char* const bt_settings_text[BtSettingNum] = {
|
||||
"Off",
|
||||
"On",
|
||||
};
|
||||
|
||||
static void bt_settings_scene_start_var_list_change_callback(VariableItem* item) {
|
||||
BtSettingsApp* app = variable_item_get_context(item);
|
||||
uint8_t index = variable_item_get_current_value_index(item);
|
||||
|
||||
variable_item_set_current_value_text(item, bt_settings_text[index]);
|
||||
view_dispatcher_send_custom_event(app->view_dispatcher, index);
|
||||
}
|
||||
|
||||
void bt_settings_scene_start_on_enter(void* context) {
|
||||
BtSettingsApp* app = context;
|
||||
Submenu* submenu = app->submenu;
|
||||
VariableItemList* var_item_list = app->var_item_list;
|
||||
|
||||
const char* submenu_label = app->settings.enabled ? "Disable" : "Enable";
|
||||
submenu_add_item(
|
||||
submenu,
|
||||
submenu_label,
|
||||
BtSettingsAppStartSubmenuIndexEnable,
|
||||
bt_settings_scene_start_submenu_callback,
|
||||
VariableItem* item;
|
||||
item = variable_item_list_add(
|
||||
var_item_list,
|
||||
"Bluetooth",
|
||||
BtSettingNum,
|
||||
bt_settings_scene_start_var_list_change_callback,
|
||||
app);
|
||||
if(app->settings.enabled) {
|
||||
variable_item_set_current_value_index(item, BtSettingOn);
|
||||
variable_item_set_current_value_text(item, bt_settings_text[BtSettingOn]);
|
||||
} else {
|
||||
variable_item_set_current_value_index(item, BtSettingOff);
|
||||
variable_item_set_current_value_text(item, bt_settings_text[BtSettingOff]);
|
||||
}
|
||||
|
||||
view_dispatcher_switch_to_view(app->view_dispatcher, BtSettingsAppViewSubmenu);
|
||||
view_dispatcher_switch_to_view(app->view_dispatcher, BtSettingsAppViewVarItemList);
|
||||
}
|
||||
|
||||
bool bt_settings_scene_start_on_event(void* context, SceneManagerEvent event) {
|
||||
@@ -30,27 +47,19 @@ bool bt_settings_scene_start_on_event(void* context, SceneManagerEvent event) {
|
||||
bool consumed = false;
|
||||
|
||||
if(event.type == SceneManagerEventTypeCustom) {
|
||||
if(event.event == BtSettingsAppStartSubmenuIndexEnable) {
|
||||
if(!app->settings.enabled) {
|
||||
app->settings.enabled = true;
|
||||
furi_hal_bt_start_app();
|
||||
submenu_clean(app->submenu);
|
||||
submenu_add_item(
|
||||
app->submenu,
|
||||
"Disable",
|
||||
BtSettingsAppStartSubmenuIndexEnable,
|
||||
bt_settings_scene_start_submenu_callback,
|
||||
app);
|
||||
} else {
|
||||
scene_manager_next_scene(app->scene_manager, BtSettingsAppSceneDisableDialog);
|
||||
}
|
||||
consumed = true;
|
||||
if(event.event == BtSettingOn) {
|
||||
furi_hal_bt_start_advertising();
|
||||
app->settings.enabled = true;
|
||||
} else if(event.event == BtSettingOff) {
|
||||
app->settings.enabled = false;
|
||||
furi_hal_bt_stop_advertising();
|
||||
}
|
||||
consumed = true;
|
||||
}
|
||||
return consumed;
|
||||
}
|
||||
|
||||
void bt_settings_scene_start_on_exit(void* context) {
|
||||
BtSettingsApp* app = context;
|
||||
submenu_clean(app->submenu);
|
||||
variable_item_list_clean(app->var_item_list);
|
||||
}
|
||||
|
Reference in New Issue
Block a user