gid9798 2 лет назад
Родитель
Сommit
28c5d60483
3 измененных файлов с 4 добавлено и 26 удалено
  1. 1 17
      helpers/subbrute_worker.c
  2. 0 2
      subbrute.c
  3. 3 7
      subbrute_device.c

+ 1 - 17
helpers/subbrute_worker.c

@@ -211,9 +211,6 @@ void subbrute_worker_stop(SubBruteWorker* instance) {
     instance->worker_running = false;
     instance->worker_running = false;
     furi_thread_join(instance->thread);
     furi_thread_join(instance->thread);
 
 
-    // furi_hal_subghz_set_path(FuriHalSubGhzPathIsolate);
-    // furi_hal_subghz_idle();
-    // furi_hal_subghz_sleep();
     subghz_devices_idle(instance->radio_device);
     subghz_devices_idle(instance->radio_device);
 }
 }
 
 
@@ -326,11 +323,7 @@ void subbrute_worker_subghz_transmit(SubBruteWorker* instance, FlipperFormat* fl
     instance->transmitter =
     instance->transmitter =
         subghz_transmitter_alloc_init(instance->environment, instance->protocol_name);
         subghz_transmitter_alloc_init(instance->environment, instance->protocol_name);
     subghz_transmitter_deserialize(instance->transmitter, flipper_format);
     subghz_transmitter_deserialize(instance->transmitter, flipper_format);
-    // furi_hal_subghz_reset();
-    // furi_hal_subghz_idle();
-    // furi_hal_subghz_load_preset(instance->preset);
-    // furi_hal_subghz_set_frequency_and_path(instance->frequency);
-    // furi_hal_subghz_start_async_tx(subghz_transmitter_yield, instance->transmitter);
+
     subghz_devices_reset(instance->radio_device);
     subghz_devices_reset(instance->radio_device);
     subghz_devices_idle(instance->radio_device);
     subghz_devices_idle(instance->radio_device);
     subghz_devices_load_preset(instance->radio_device, instance->preset, NULL);
     subghz_devices_load_preset(instance->radio_device, instance->preset, NULL);
@@ -346,15 +339,6 @@ void subbrute_worker_subghz_transmit(SubBruteWorker* instance, FlipperFormat* fl
         subghz_devices_stop_async_tx(instance->radio_device);
         subghz_devices_stop_async_tx(instance->radio_device);
     }
     }
 
 
-    // while(!furi_hal_subghz_is_async_tx_complete()) {
-    //     furi_delay_ms(timeout);
-    // }
-    // furi_hal_subghz_stop_async_tx();
-
-    // //furi_hal_subghz_set_path(FuriHalSubGhzPathIsolate);
-    // furi_hal_subghz_idle();
-    // //furi_hal_subghz_sleep();
-
     subghz_devices_idle(instance->radio_device);
     subghz_devices_idle(instance->radio_device);
 
 
     subghz_transmitter_stop(instance->transmitter);
     subghz_transmitter_stop(instance->transmitter);

+ 0 - 2
subbrute.c

@@ -103,7 +103,6 @@ SubBruteState* subbrute_alloc() {
     //instance->environment = subghz_environment_alloc();
     //instance->environment = subghz_environment_alloc();
 
 
     // Uncomment to enable Debug pin output on PIN 17(1W)
     // Uncomment to enable Debug pin output on PIN 17(1W)
-    // //furi_hal_subghz_set_async_mirror_pin(&gpio_ibutton);
     // subghz_devices_set_async_mirror_pin(instance->radio_device, &gpio_ibutton);
     // subghz_devices_set_async_mirror_pin(instance->radio_device, &gpio_ibutton);
 
 
     return instance;
     return instance;
@@ -113,7 +112,6 @@ void subbrute_free(SubBruteState* instance) {
     furi_assert(instance);
     furi_assert(instance);
 
 
     // Uncomment to enable Debug pin output on PIN 17(1W)
     // Uncomment to enable Debug pin output on PIN 17(1W)
-    // //furi_hal_subghz_set_async_mirror_pin(NULL);
     // subghz_devices_set_async_mirror_pin(instance->radio_device, NULL);
     // subghz_devices_set_async_mirror_pin(instance->radio_device, NULL);
 
 
     // SubBruteWorker
     // SubBruteWorker

+ 3 - 7
subbrute_device.c

@@ -154,7 +154,7 @@ SubBruteFileResult subbrute_device_attack_set(
     // For non-file types we didn't set SubGhzProtocolDecoderBase
     // For non-file types we didn't set SubGhzProtocolDecoderBase
     instance->receiver = subghz_receiver_alloc_init(instance->environment);
     instance->receiver = subghz_receiver_alloc_init(instance->environment);
     subghz_receiver_set_filter(instance->receiver, SubGhzProtocolFlag_Decodable);
     subghz_receiver_set_filter(instance->receiver, SubGhzProtocolFlag_Decodable);
-    // furi_hal_subghz_reset(); // XXX
+    // furi_hal_subghz_reset(); // TODO Is this necessary?
 
 
     uint8_t protocol_check_result = SubBruteFileResultProtocolNotFound;
     uint8_t protocol_check_result = SubBruteFileResultProtocolNotFound;
 #ifdef FURI_DEBUG
 #ifdef FURI_DEBUG
@@ -243,7 +243,7 @@ uint8_t subbrute_device_load_from_file(SubBruteDevice* instance, const char* fil
 
 
     instance->receiver = subghz_receiver_alloc_init(instance->environment);
     instance->receiver = subghz_receiver_alloc_init(instance->environment);
     subghz_receiver_set_filter(instance->receiver, SubGhzProtocolFlag_Decodable);
     subghz_receiver_set_filter(instance->receiver, SubGhzProtocolFlag_Decodable);
-    // furi_hal_subghz_reset(); // XXX
+    // furi_hal_subghz_reset(); // TODO Is this necessary?
 
 
     do {
     do {
         if(!flipper_format_file_open_existing(fff_data_file, file_path)) {
         if(!flipper_format_file_open_existing(fff_data_file, file_path)) {
@@ -263,11 +263,7 @@ uint8_t subbrute_device_load_from_file(SubBruteDevice* instance, const char* fil
             result = SubBruteFileResultMissingOrIncorrectFrequency;
             result = SubBruteFileResultMissingOrIncorrectFrequency;
             break;
             break;
         }
         }
-        // instance->file_protocol_info->frequency = temp_data32;
-        // if(!furi_hal_subghz_is_tx_allowed(instance->file_protocol_info->frequency)) {
-        //     result = SubBruteFileResultFrequencyNotAllowed;
-        //     break;
-        // }
+      
 
 
         if(!subghz_devices_is_frequency_valid(instance->radio_device, temp_data32)) {
         if(!subghz_devices_is_frequency_valid(instance->radio_device, temp_data32)) {
             FURI_LOG_E(TAG, "Unsupported radio device frequency");
             FURI_LOG_E(TAG, "Unsupported radio device frequency");