DerSkythe 3 лет назад
Родитель
Сommit
6a8b8af1cf
5 измененных файлов с 14 добавлено и 14 удалено
  1. 2 2
      helpers/subbrute_worker.c
  2. 1 1
      helpers/subbrute_worker_private.h
  3. 2 2
      subbrute_device.c
  4. 4 4
      subbrute_protocols.c
  5. 5 5
      subbrute_protocols.h

+ 2 - 2
helpers/subbrute_worker.c

@@ -108,7 +108,7 @@ bool subbrute_worker_init_default_attack(
 #ifdef FURI_DEBUG
     FURI_LOG_I(
         TAG,
-        "subbrute_worker_init_default_attack: %s, bits: %d, preset: %s, file: %s, te: %d, repeat: %d, max_value: %lld",
+        "subbrute_worker_init_default_attack: %s, bits: %d, preset: %s, file: %s, te: %ld, repeat: %d, max_value: %lld",
         subbrute_protocol_name(instance->attack),
         instance->bits,
         subbrute_protocol_preset(instance->preset),
@@ -157,7 +157,7 @@ bool subbrute_worker_init_file_attack(
 #ifdef FURI_DEBUG
     FURI_LOG_I(
         TAG,
-        "subbrute_worker_init_file_attack: %s, bits: %d, preset: %s, file: %s, te: %d, repeat: %d, max_value: %lld, key: %llX",
+        "subbrute_worker_init_file_attack: %s, bits: %d, preset: %s, file: %s, te: %ld, repeat: %d, max_value: %lld, key: %llX",
         subbrute_protocol_name(instance->attack),
         instance->bits,
         subbrute_protocol_preset(instance->preset),

+ 1 - 1
helpers/subbrute_worker_private.h

@@ -28,7 +28,7 @@ struct SubBruteWorker {
     FuriHalSubGhzPreset preset;
     SubBruteFileProtocol file;
     uint8_t bits;
-    uint8_t te;
+    uint32_t te;
     uint8_t repeat;
     uint8_t load_index; // Index of group to bruteforce in loaded file
     uint64_t file_key;

+ 2 - 2
subbrute_device.c

@@ -159,7 +159,7 @@ SubBruteFileResult subbrute_device_attack_set(
     uint8_t protocol_check_result = SubBruteFileResultProtocolNotFound;
 #ifdef FURI_DEBUG
     uint8_t bits;
-    uint8_t te;
+    uint32_t te;
     uint8_t repeat;
     FuriHalSubGhzPreset preset;
     SubBruteFileProtocol file;
@@ -211,7 +211,7 @@ SubBruteFileResult subbrute_device_attack_set(
 #ifdef FURI_DEBUG
     FURI_LOG_I(
         TAG,
-        "subbrute_device_attack_set: %s, bits: %d, preset: %s, file: %s, te: %d, repeat: %d, max_value: %lld",
+        "subbrute_device_attack_set: %s, bits: %d, preset: %s, file: %s, te: %ld, repeat: %d, max_value: %lld",
         subbrute_protocol_name(instance->attack),
         bits,
         subbrute_protocol_preset(preset),

+ 4 - 4
subbrute_protocols.c

@@ -612,7 +612,7 @@ void subbrute_protocol_default_payload(
     SubBruteFileProtocol file,
     uint64_t step,
     uint8_t bits,
-    uint8_t te,
+    uint32_t te,
     uint8_t repeat) {
     FuriString* candidate = furi_string_alloc();
     subbrute_protocol_create_candidate_for_default(candidate, file, step);
@@ -647,7 +647,7 @@ void subbrute_protocol_file_payload(
     Stream* stream,
     uint64_t step,
     uint8_t bits,
-    uint8_t te,
+    uint32_t te,
     uint8_t repeat,
     uint8_t bit_index,
     uint64_t file_key,
@@ -690,7 +690,7 @@ void subbrute_protocol_default_generate_file(
     SubBruteFileProtocol file,
     uint64_t step,
     uint8_t bits,
-    uint8_t te,
+    uint32_t te,
     uint8_t repeat) {
     FuriString* candidate = furi_string_alloc();
     subbrute_protocol_create_candidate_for_default(candidate, file, step);
@@ -733,7 +733,7 @@ void subbrute_protocol_file_generate_file(
     SubBruteFileProtocol file,
     uint64_t step,
     uint8_t bits,
-    uint8_t te,
+    uint32_t te,
     uint8_t repeat,
     uint8_t bit_index,
     uint64_t file_key,

+ 5 - 5
subbrute_protocols.h

@@ -64,7 +64,7 @@ typedef enum {
 typedef struct {
     uint32_t frequency;
     uint8_t bits;
-    uint8_t te;
+    uint32_t te;
     uint8_t repeat;
     FuriHalSubGhzPreset preset;
     SubBruteFileProtocol file;
@@ -83,13 +83,13 @@ void subbrute_protocol_default_payload(
     SubBruteFileProtocol file,
     uint64_t step,
     uint8_t bits,
-    uint8_t te,
+    uint32_t te,
     uint8_t repeat);
 void subbrute_protocol_file_payload(
     Stream* stream,
     uint64_t step,
     uint8_t bits,
-    uint8_t te,
+    uint32_t te,
     uint8_t repeat,
     uint8_t bit_index,
     uint64_t file_key,
@@ -101,7 +101,7 @@ void subbrute_protocol_default_generate_file(
     SubBruteFileProtocol file,
     uint64_t step,
     uint8_t bits,
-    uint8_t te,
+    uint32_t te,
     uint8_t repeat);
 void subbrute_protocol_file_generate_file(
     Stream* stream,
@@ -110,7 +110,7 @@ void subbrute_protocol_file_generate_file(
     SubBruteFileProtocol file,
     uint64_t step,
     uint8_t bits,
-    uint8_t te,
+    uint32_t te,
     uint8_t repeat,
     uint8_t bit_index,
     uint64_t file_key,