liz/flipperzero-firmware
liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bt_settings: fix incorrect switch to forget devices (#977)

Browse Source
This commit is contained in:
gornekich 2022-02-01 10:43:38 +03:00 committed by GitHub
parent 9f1a2f2d99
commit 0acea5b25f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
applications/bt/bt_settings_app/bt_settings_app.h
View File

@ -14,6 +14,14 @@
#include "../bt_settings.h" #include "../bt_settings.h"
#include "scenes/bt_settings_scene.h" #include "scenes/bt_settings_scene.h"
enum BtSettingsCustomEvent {
// Keep first 10 events reserved for button types and indexes
BtSettingsCustomEventReserved = 10,
BtSettingsCustomEventForgetDevices,
BtSettingsCustomEventExitView,
};
typedef struct { typedef struct {
BtSettings settings; BtSettings settings;
Bt* bt; Bt* bt;

6
applications/bt/bt_settings_app/scenes/bt_settings_scene_forget_dev_success.c
View File

@ -1,11 +1,9 @@
#include "../bt_settings_app.h" #include "../bt_settings_app.h"
#include "furi_hal_bt.h" #include "furi_hal_bt.h"
#define SCENE_FORGET_DEV_SUCCESS_CUSTOM_EVENT (0UL)
void bt_settings_app_scene_forget_dev_success_popup_callback(void* context) { void bt_settings_app_scene_forget_dev_success_popup_callback(void* context) {
BtSettingsApp* app = context; BtSettingsApp* app = context;
view_dispatcher_send_custom_event(app->view_dispatcher, SCENE_FORGET_DEV_SUCCESS_CUSTOM_EVENT); view_dispatcher_send_custom_event(app->view_dispatcher, BtSettingsCustomEventExitView);
} }
void bt_settings_scene_forget_dev_success_on_enter(void* context) { void bt_settings_scene_forget_dev_success_on_enter(void* context) {
@ -26,7 +24,7 @@ bool bt_settings_scene_forget_dev_success_on_event(void* context, SceneManagerEv
bool consumed = false; bool consumed = false;
if(event.type == SceneManagerEventTypeCustom) { if(event.type == SceneManagerEventTypeCustom) {
if(event.event == SCENE_FORGET_DEV_SUCCESS_CUSTOM_EVENT) { if(event.event == BtSettingsCustomEventExitView) {
if(scene_manager_has_previous_scene(app->scene_manager, BtSettingsAppSceneStart)) { if(scene_manager_has_previous_scene(app->scene_manager, BtSettingsAppSceneStart)) {
consumed = scene_manager_search_and_switch_to_previous_scene( consumed = scene_manager_search_and_switch_to_previous_scene(
app->scene_manager, BtSettingsAppSceneStart); app->scene_manager, BtSettingsAppSceneStart);

14
applications/bt/bt_settings_app/scenes/bt_settings_scene_start.c
View File

@ -1,14 +1,17 @@
#include "../bt_settings_app.h" #include "../bt_settings_app.h"
#include "furi_hal_bt.h" #include "furi_hal_bt.h"
#define SCENE_START_FORGET_DEV_SELECTED_EVENT (10UL)
enum BtSetting { enum BtSetting {
BtSettingOff, BtSettingOff,
BtSettingOn, BtSettingOn,
BtSettingNum, BtSettingNum,
}; };
enum BtSettingIndex {
BtSettingIndexSwitchBt,
BtSettingIndexForgetDev,
};
const char* const bt_settings_text[BtSettingNum] = { const char* const bt_settings_text[BtSettingNum] = {
"OFF", "OFF",
"ON", "ON",
@ -25,7 +28,10 @@ static void bt_settings_scene_start_var_list_change_callback(VariableItem* item)
static void bt_settings_scene_start_var_list_enter_callback(void* context, uint32_t index) { static void bt_settings_scene_start_var_list_enter_callback(void* context, uint32_t index) {
furi_assert(context); furi_assert(context);
BtSettingsApp* app = context; BtSettingsApp* app = context;
view_dispatcher_send_custom_event(app->view_dispatcher, SCENE_START_FORGET_DEV_SELECTED_EVENT); if(index == BtSettingIndexForgetDev) {
view_dispatcher_send_custom_event(
app->view_dispatcher, BtSettingsCustomEventForgetDevices);
}
} }
void bt_settings_scene_start_on_enter(void* context) { void bt_settings_scene_start_on_enter(void* context) {
@ -72,7 +78,7 @@ bool bt_settings_scene_start_on_event(void* context, SceneManagerEvent event) {
app->settings.enabled = false; app->settings.enabled = false;
furi_hal_bt_stop_advertising(); furi_hal_bt_stop_advertising();
consumed = true; consumed = true;
} else if(event.event == SCENE_START_FORGET_DEV_SELECTED_EVENT) { } else if(event.event == BtSettingsCustomEventForgetDevices) {
scene_manager_next_scene(app->scene_manager, BtSettingsAppSceneForgetDevConfirm); scene_manager_next_scene(app->scene_manager, BtSettingsAppSceneForgetDevConfirm);
consumed = true; consumed = true;
} }