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

[FL-2848] Universal Remote fix (#1770)

Browse Source 
* Reset BruteForce on exit from Universal Remote
* Reset current button in ButtonPanel
This commit is contained in:
Georgii Surkov 2022-09-22 19:13:00 +03:00 committed by GitHub
parent e70121e20f
commit 17d01f5c29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
applications/main/infrared/infrared_brute_force.c
View File

@ -153,3 +153,7 @@ void infrared_brute_force_add_record(
InfraredBruteForceRecordDict_set_at(brute_force->records, key, value); InfraredBruteForceRecordDict_set_at(brute_force->records, key, value);
string_clear(key); string_clear(key);
} }
void infrared_brute_force_reset(InfraredBruteForce* brute_force) {
InfraredBruteForceRecordDict_reset(brute_force->records);
}

1
applications/main/infrared/infrared_brute_force.h
View File

@ -20,3 +20,4 @@ void infrared_brute_force_add_record(
InfraredBruteForce* brute_force, InfraredBruteForce* brute_force,
uint32_t index, uint32_t index,
const char* name); const char* name);
void infrared_brute_force_reset(InfraredBruteForce* brute_force);

1
applications/main/infrared/scenes/common/infrared_scene_universal_common.c
View File

@ -87,5 +87,6 @@ void infrared_scene_universal_common_on_exit(void* context) {
Infrared* infrared = context; Infrared* infrared = context;
ButtonPanel* button_panel = infrared->button_panel; ButtonPanel* button_panel = infrared->button_panel;
view_stack_remove_view(infrared->view_stack, button_panel_get_view(button_panel)); view_stack_remove_view(infrared->view_stack, button_panel_get_view(button_panel));
infrared_brute_force_reset(infrared->brute_force);
button_panel_reset(button_panel); button_panel_reset(button_panel);
} }

2
applications/services/gui/modules/button_panel.c
View File

@ -133,6 +133,8 @@ void button_panel_reset(ButtonPanel* button_panel) {
} }
model->reserve_x = 0; model->reserve_x = 0;
model->reserve_y = 0; model->reserve_y = 0;
model->selected_item_x = 0;
model->selected_item_y = 0;
LabelList_reset(model->labels); LabelList_reset(model->labels);
ButtonMatrix_reset(model->button_matrix); ButtonMatrix_reset(model->button_matrix);
return true; return true;