Merge remote-tracking branch 'origin/dev' into dev

DarkFlippers · Aug 27, 2022 · a6597da · a6597da
2 parents ab5bcd7 + eb28dc2
commit a6597da
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 0 deletions.
diff --git a/applications/gui/modules/button_panel.c b/applications/gui/modules/button_panel.c
@@ -83,6 +83,15 @@ ButtonPanel* button_panel_alloc() {
     return button_panel;
 }
 
+void button_panel_reset_selection(ButtonPanel* button_panel) {
+    with_view_model(
+        button_panel->view, (ButtonPanelModel * model) {
+            model->selected_item_x = 0;
+            model->selected_item_y = 0;
+            return true;
+        });
+}
+
 void button_panel_reserve(ButtonPanel* button_panel, size_t reserve_x, size_t reserve_y) {
     furi_check(reserve_x > 0);
     furi_check(reserve_y > 0);

diff --git a/applications/gui/modules/button_panel.h b/applications/gui/modules/button_panel.h
@@ -35,6 +35,12 @@ void button_panel_free(ButtonPanel* button_panel);
  */
 void button_panel_reset(ButtonPanel* button_panel);
 
+/** Resets selected_item_x and selected_item_y.
+ * 
+ * @param      button_panel  ButtonPanel instance
+ */
+void button_panel_reset_selection(ButtonPanel* button_panel);
+
 /** Reserve space for adding items.
  *
  * One does not simply use button_panel_add_item() without this function. It

diff --git a/applications/infrared/infrared_brute_force.c b/applications/infrared/infrared_brute_force.c
@@ -35,6 +35,10 @@ InfraredBruteForce* infrared_brute_force_alloc() {
     return brute_force;
 }
 
+void infrared_brute_force_clear_records(InfraredBruteForce* brute_force) {
+    InfraredBruteForceRecordDict_reset(brute_force->records);
+}
+
 void infrared_brute_force_free(InfraredBruteForce* brute_force) {
     furi_assert(!brute_force->ff);
     InfraredBruteForceRecordDict_clear(brute_force->records);

diff --git a/applications/infrared/infrared_brute_force.h b/applications/infrared/infrared_brute_force.h
@@ -16,6 +16,7 @@ bool infrared_brute_force_start(
 bool infrared_brute_force_is_started(InfraredBruteForce* brute_force);
 void infrared_brute_force_stop(InfraredBruteForce* brute_force);
 bool infrared_brute_force_send_next(InfraredBruteForce* brute_force);
+void infrared_brute_force_clear_records(InfraredBruteForce* brute_force);
 void infrared_brute_force_add_record(
     InfraredBruteForce* brute_force,
     uint32_t index,

diff --git a/applications/infrared/scenes/common/infrared_scene_universal_common.c b/applications/infrared/scenes/common/infrared_scene_universal_common.c
@@ -33,6 +33,8 @@ static void infrared_scene_universal_common_hide_popup(Infrared* infrared) {
 
 void infrared_scene_universal_common_on_enter(void* context) {
     Infrared* infrared = context;
+    infrared_brute_force_clear_records(infrared->brute_force);
+    button_panel_reset_selection(infrared->button_panel);
     view_stack_add_view(infrared->view_stack, button_panel_get_view(infrared->button_panel));
 }