SubGhz: support 310 MHz and fix

applications/storage/storage_cli.c

@@ -593,7 +593,7 @@ static void storage_cli_factory_reset(Cli* cli, string_t args, void* context) {
 void storage_on_system_start() {
 #ifdef SRV_CLI
     Cli* cli = furi_record_open("cli");
-    cli_add_command(cli, "storage", CliCommandFlagDefault, storage_cli, NULL);
+    cli_add_command(cli, "storage", CliCommandFlagParallelSafe, storage_cli, NULL);
     cli_add_command(
         cli, "factory_reset", CliCommandFlagParallelSafe, storage_cli_factory_reset, NULL);
     furi_record_close("cli");

applications/subghz/helpers/subghz_frequency_analyzer_worker.c

@@ -3,8 +3,6 @@
 
 #include <furi.h>
 
-#include "../subghz_i.h"
-
 #define TAG "SubghzFrequencyAnalyzerWorker"
 
 #define SUBGHZ_FREQUENCY_ANALYZER_THRESHOLD -95.0f
@@ -82,7 +80,7 @@ static int32_t subghz_frequency_analyzer_worker_thread(void* context) {
     cc1101_flush_tx(&furi_hal_spi_bus_handle_subghz);
     cc1101_write_reg(&furi_hal_spi_bus_handle_subghz, CC1101_IOCFG0, CC1101IocfgHW);
     cc1101_write_reg(&furi_hal_spi_bus_handle_subghz, CC1101_MDMCFG3,
-                     0b11111111); // symbol rate
+                     0b01111111); // symbol rate
     cc1101_write_reg(
         &furi_hal_spi_bus_handle_subghz,
         CC1101_AGCCTRL2,
@@ -130,7 +128,7 @@ static int32_t subghz_frequency_analyzer_worker_thread(void* context) {
                 furi_hal_spi_release(&furi_hal_spi_bus_handle_subghz);
 
                 // delay will be in range between 1 and 2ms
-                osDelay(2);
+                osDelay(3);
 
                 rssi = furi_hal_subghz_get_rssi();
 
@@ -179,9 +177,12 @@ static int32_t subghz_frequency_analyzer_worker_thread(void* context) {
                     furi_hal_spi_release(&furi_hal_spi_bus_handle_subghz);
 
                     // delay will be in range between 1 and 2ms
-                    osDelay(2);
+                    osDelay(3);
 
                     rssi = furi_hal_subghz_get_rssi();
+
+                    FURI_LOG_T(TAG, "#:%u:%f", frequency, (double)rssi);
+
                     if(frequency_rssi.rssi < rssi) {
                         frequency_rssi.rssi = rssi;
                         frequency_rssi.frequency = frequency;
@@ -222,7 +223,8 @@ static int32_t subghz_frequency_analyzer_worker_thread(void* context) {
     return 0;
 }
 
-SubGhzFrequencyAnalyzerWorker* subghz_frequency_analyzer_worker_alloc() {
+SubGhzFrequencyAnalyzerWorker* subghz_frequency_analyzer_worker_alloc(void* context) {
+    furi_assert(context);
     SubGhzFrequencyAnalyzerWorker* instance = malloc(sizeof(SubGhzFrequencyAnalyzerWorker));
 
     instance->thread = furi_thread_alloc();
@@ -231,16 +233,15 @@ SubGhzFrequencyAnalyzerWorker* subghz_frequency_analyzer_worker_alloc() {
     furi_thread_set_context(instance->thread, instance);
     furi_thread_set_callback(instance->thread, subghz_frequency_analyzer_worker_thread);
 
-    instance->setting = subghz_setting_alloc();
-    subghz_setting_load(instance->setting, "/ext/subghz/assets/setting_frequency_analyzer_user");
+    SubGhz* subghz = context;
+    instance->setting = subghz->setting;
     return instance;
 }
 
 void subghz_frequency_analyzer_worker_free(SubGhzFrequencyAnalyzerWorker* instance) {
     furi_assert(instance);
 
     furi_thread_free(instance->thread);
-    subghz_setting_free(instance->setting);
     free(instance);
 }
 

applications/subghz/helpers/subghz_frequency_analyzer_worker.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <furi_hal.h>
+#include "../subghz_i.h"
 
 typedef struct SubGhzFrequencyAnalyzerWorker SubGhzFrequencyAnalyzerWorker;
 
@@ -14,9 +15,10 @@ typedef struct {
 
 /** Allocate SubGhzFrequencyAnalyzerWorker
  * 
+ * @param context SubGhz* context
  * @return SubGhzFrequencyAnalyzerWorker* 
  */
-SubGhzFrequencyAnalyzerWorker* subghz_frequency_analyzer_worker_alloc();
+SubGhzFrequencyAnalyzerWorker* subghz_frequency_analyzer_worker_alloc(void* context);
 
 /** Free SubGhzFrequencyAnalyzerWorker
  * 

applications/subghz/helpers/subghz_testing.c

@@ -4,6 +4,7 @@ const uint32_t subghz_frequencies_testing[] = {
     /* 300 - 348 */
     300000000,
     304500000,
+    310000000,
     312025000,
     313250000,
     313625000,
@@ -34,4 +35,4 @@ const uint32_t subghz_frequencies_testing[] = {
 
 const uint32_t subghz_frequencies_count_testing =
     sizeof(subghz_frequencies_testing) / sizeof(uint32_t);
-const uint32_t subghz_frequencies_433_92_testing = 12;
+const uint32_t subghz_frequencies_433_92_testing = 13;

applications/subghz/scenes/subghz_scene_read_raw.c

@@ -168,6 +168,10 @@ bool subghz_scene_read_raw_on_event(void* context, SceneManagerEvent event) {
 
         case SubGhzCustomEventViewReadRAWErase:
             subghz->txrx->rx_key_state = SubGhzRxKeyStateIDLE;
+            if(subghz_scene_read_raw_update_filename(subghz)) {
+                string_set(subghz->file_path_tmp, subghz->file_path);
+                subghz_delete_file(subghz);
+            }
             notification_message(subghz->notifications, &sequence_reset_rgb);
             return true;
             break;