Merge pull request #80 from derskythe/feat/new-buttons-in-fw

Feat/new buttons in fw
DarkFlippers · Sep 20, 2024 · cfaecb5 · cfaecb5
2 parents ef60d7b + e7645bc
commit cfaecb5
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 102 deletions.
diff --git a/.deepsource.toml b/.deepsource.toml
@@ -0,0 +1,7 @@
+version = 1
+
+[[analyzers]]
+name = "cxx"
+
+[[transformers]]
+name = "clang-format"
diff --git a/helpers/gui_top_buttons.c b/helpers/gui_top_buttons.c
diff --git a/helpers/gui_top_buttons.h b/helpers/gui_top_buttons.h
diff --git a/scenes/subbrute_scene_load_file.c b/scenes/subbrute_scene_load_file.c
@@ -56,7 +56,7 @@ void subbrute_scene_load_file_on_enter(void* context) {
                 }
                 // Ready to run!
                 FURI_LOG_I(TAG, "Ready to run");
-                res = true;
+                load_result = true;
             }
         }
 

diff --git a/subbrute_i.h b/subbrute_i.h
@@ -31,7 +31,7 @@
 #include "views/subbrute_attack_view.h"
 #include "views/subbrute_main_view.h"
 
-#define SUB_BRUTE_FORCER_VERSION "Sub-GHz BruteForcer 3.E"
+#define SUB_BRUTE_FORCER_VERSION "Sub-GHz BruteForcer 3.F"
 
 #ifdef FURI_DEBUG
 //#define SUBBRUTE_FAST_TRACK false

diff --git a/views/subbrute_attack_view.c b/views/subbrute_attack_view.c
@@ -1,6 +1,5 @@
 #include "subbrute_attack_view.h"
 #include "../subbrute_i.h"
-#include "../helpers/gui_top_buttons.h"
 
 #include <input/input.h>
 #include <gui/elements.h>
@@ -310,8 +309,8 @@ void subbrute_attack_view_draw(Canvas* canvas, void* context) {
         elements_button_left(canvas, "-1");
         elements_button_right(canvas, "+1");
         elements_button_center(canvas, "Start");
-        elements_button_top_left(canvas, "Save");
-        elements_button_top_right(canvas, "Resend");
+        elements_button_up(canvas, "Save");
+        elements_button_down(canvas, "Resend");
     } else {
         // canvas_draw_icon_animation
         const uint8_t icon_h_offset = 0;

diff --git a/views/subbrute_main_view.c b/views/subbrute_main_view.c
@@ -1,6 +1,5 @@
 #include "subbrute_main_view.h"
 #include "../subbrute_i.h"
-#include "../helpers/gui_top_buttons.h"
 
 #include <input/input.h>
 #include <gui/elements.h>
@@ -126,9 +125,9 @@ void subbrute_main_view_draw_is_byte_selected(Canvas* canvas, SubBruteMainViewMo
 
     // Switch to another mode
     if(model->two_bytes) {
-        elements_button_top_left(canvas, "One byte");
+        elements_button_up(canvas, "One byte");
     } else {
-        elements_button_top_left(canvas, "Two bytes");
+        elements_button_up(canvas, "Two bytes");
     }
 }