MX 2 лет назад
Родитель
Сommit
a2d198782d

+ 1 - 1
helpers/gui_top_buttons.h

@@ -1,10 +1,10 @@
 #pragma once
 
+#include <subghz_bruteforcer_icons.h>
 #include <input/input.h>
 #include <gui/elements.h>
 #include <gui/icon.h>
 #include <gui/icon_animation.h>
-#include <assets_icons.h>
 
 /**
  * Thanks to the author of metronome

+ 1 - 1
helpers/subbrute_worker.c

@@ -3,7 +3,7 @@
 #include <toolbox/stream/stream.h>
 #include <flipper_format.h>
 #include <flipper_format_i.h>
-#include <lib/subghz/protocols/protocol_items.h>
+#include <lib/subghz/subghz_protocol_registry.h>
 
 #define TAG "SubBruteWorker"
 #define SUBBRUTE_TX_TIMEOUT 6

+ 1 - 1
subbrute_device.c

@@ -5,7 +5,7 @@
 #include <lib/toolbox/stream/stream.h>
 #include <lib/flipper_format/flipper_format.h>
 #include <lib/flipper_format/flipper_format_i.h>
-#include <lib/subghz/protocols/protocol_items.h>
+#include <lib/subghz/subghz_protocol_registry.h>
 
 #define TAG "SubBruteDevice"
 

+ 1 - 1
views/subbrute_attack_view.c

@@ -7,7 +7,7 @@
 #include <gui/elements.h>
 #include <gui/icon.h>
 #include <gui/icon_animation.h>
-#include <assets_icons.h>
+#include <subghz_bruteforcer_icons.h>
 
 #define TAG "SubBruteAttackView"
 

+ 4 - 0
views/subbrute_main_view.c

@@ -174,7 +174,11 @@ void subbrute_main_view_draw(Canvas* canvas, SubBruteMainViewModel* model) {
                         subbrute_protocol_name(position));
 
                     if(model->extra_repeats > 0) {
+#ifdef FW_ORIGIN_Official
+                        canvas_set_font(canvas, FontSecondary);
+#else
                         canvas_set_font(canvas, FontBatteryPercent);
+#endif
                         char buffer[10];
                         snprintf(
                             buffer,