Remember last state for CC1101 external + other fixes

Reset to internal module if external is not found on all apps, not only in bruteforcer

applications/external/playlist/playlist.c

@@ -713,6 +713,11 @@ int32_t playlist_app(void* p) {
 
     // Enable power for External CC1101 if it is connected
     furi_hal_subghz_enable_ext_power();
+    // Auto switch to internal radio if external radio is not available
+    furi_delay_ms(15);
+    if(!furi_hal_subghz_check_radio()) {
+        furi_hal_subghz_set_radio_type(SubGhzRadioInternal);
+    }
 
     furi_hal_power_suppress_charge_enter();
 

applications/external/pocsag_pager/pocsag_pager_app.c

@@ -124,6 +124,11 @@ POCSAGPagerApp* pocsag_pager_app_alloc() {
 
     // Enable power for External CC1101 if it is connected
     furi_hal_subghz_enable_ext_power();
+    // Auto switch to internal radio if external radio is not available
+    furi_delay_ms(15);
+    if(!furi_hal_subghz_check_radio()) {
+        furi_hal_subghz_set_radio_type(SubGhzRadioInternal);
+    }
 
     furi_hal_power_suppress_charge_enter();
 

applications/external/protoview/app.c

@@ -169,6 +169,11 @@ ProtoViewApp* protoview_app_alloc() {
 
     // Enable power for External CC1101 if it is connected
     furi_hal_subghz_enable_ext_power();
+    // Auto switch to internal radio if external radio is not available
+    furi_delay_ms(15);
+    if(!furi_hal_subghz_check_radio()) {
+        furi_hal_subghz_set_radio_type(SubGhzRadioInternal);
+    }
 
     furi_hal_power_suppress_charge_enter();
     app->running = 1;

applications/external/spectrum_analyzer/spectrum_analyzer.c

@@ -405,6 +405,11 @@ int32_t spectrum_analyzer_app(void* p) {
 
     // Enable power for External CC1101 if it is connected
     furi_hal_subghz_enable_ext_power();
+    // Auto switch to internal radio if external radio is not available
+    furi_delay_ms(15);
+    if(!furi_hal_subghz_check_radio()) {
+        furi_hal_subghz_set_radio_type(SubGhzRadioInternal);
+    }
 
     furi_hal_power_suppress_charge_enter();
 

applications/external/weather_station/weather_station_app.c

@@ -107,6 +107,11 @@ WeatherStationApp* weather_station_app_alloc() {
 
     // Enable power for External CC1101 if it is connected
     furi_hal_subghz_enable_ext_power();
+    // Auto switch to internal radio if external radio is not available
+    furi_delay_ms(15);
+    if(!furi_hal_subghz_check_radio()) {
+        furi_hal_subghz_set_radio_type(SubGhzRadioInternal);
+    }
 
     furi_hal_power_suppress_charge_enter();
 

applications/main/subghz/scenes/subghz_scene_ext_module_settings.c

@@ -37,10 +37,13 @@ const char* const debug_counter_text[DEBUG_COUNTER_COUNT] = {
 static void subghz_scene_ext_module_changed(VariableItem* item) {
     SubGhz* subghz = variable_item_get_context(item);
     value_index_exm = variable_item_get_current_value_index(item);
-    UNUSED(subghz);
 
     variable_item_set_current_value_text(item, radio_modules_variables_text[value_index_exm]);
+
+    subghz->last_settings->external_module_enabled = value_index_exm == 1;
+    subghz_last_settings_save(subghz->last_settings);
 }
+
 static void subghz_ext_module_start_var_list_enter_callback(void* context, uint32_t index) {
     SubGhz* subghz = context;
     view_dispatcher_send_custom_event(subghz->view_dispatcher, index);

applications/main/subghz/scenes/subghz_scene_start.c

@@ -85,6 +85,7 @@ bool subghz_scene_start_on_event(void* context, SceneManagerEvent event) {
 
             if(!furi_hal_subghz_check_radio()) {
                 furi_hal_subghz_set_radio_type(SubGhzRadioInternal);
+                subghz->last_settings->external_module_enabled = false;
                 furi_string_set(subghz->error_str, "Please connect\nexternal radio");
                 scene_manager_next_scene(subghz->scene_manager, SubGhzSceneShowErrorSub);
                 return true;

applications/main/subghz/subghz.c

@@ -75,6 +75,7 @@ SubGhz* subghz_alloc(bool alloc_for_tx_only) {
 
     // Call enable power for external module
     furi_hal_subghz_enable_ext_power();
+    furi_delay_ms(15);
 
     // View Dispatcher
     subghz->view_dispatcher = view_dispatcher_alloc();
@@ -189,66 +190,66 @@ SubGhz* subghz_alloc(bool alloc_for_tx_only) {
     subghz_setting_load(subghz->setting, EXT_PATH("subghz/assets/setting_user"));
 
     // Custom Presets load without using config file
+    if(!alloc_for_tx_only) {
+        FlipperFormat* temp_fm_preset = flipper_format_string_alloc();
+        flipper_format_write_string_cstr(
+            temp_fm_preset,
+            (const char*)"Custom_preset_data",
+            (const char*)"02 0D 0B 06 08 32 07 04 14 00 13 02 12 04 11 83 10 67 15 24 18 18 19 16 1D 91 1C 00 1B 07 20 FB 22 10 21 56 00 00 C0 00 00 00 00 00 00 00");
+        flipper_format_rewind(temp_fm_preset);
+        subghz_setting_load_custom_preset(subghz->setting, (const char*)"FM95", temp_fm_preset);
 
-    FlipperFormat* temp_fm_preset = flipper_format_string_alloc();
-    flipper_format_write_string_cstr(
-        temp_fm_preset,
-        (const char*)"Custom_preset_data",
-        (const char*)"02 0D 0B 06 08 32 07 04 14 00 13 02 12 04 11 83 10 67 15 24 18 18 19 16 1D 91 1C 00 1B 07 20 FB 22 10 21 56 00 00 C0 00 00 00 00 00 00 00");
-    flipper_format_rewind(temp_fm_preset);
-    subghz_setting_load_custom_preset(subghz->setting, (const char*)"FM95", temp_fm_preset);
+        flipper_format_free(temp_fm_preset);
 
-    flipper_format_free(temp_fm_preset);
+        // #2-FSK 200khz BW / 135kHz Filter/ 15.86Khz Deviation + Ramping
+        FlipperFormat* temp_fm_preset2 = flipper_format_string_alloc();
+        flipper_format_write_string_cstr(
+            temp_fm_preset2,
+            (const char*)"Custom_preset_data",
+            (const char*)"02 0D 03 47 08 32 0B 06 15 32 14 00 13 00 12 00 11 32 10 A7 18 18 19 1D 1D 92 1C 00 1B 04 20 FB 22 17 21 B6 00 00 00 12 0E 34 60 C5 C1 C0");
+        flipper_format_rewind(temp_fm_preset2);
+        subghz_setting_load_custom_preset(subghz->setting, (const char*)"FM15k", temp_fm_preset2);
 
-    // #2-FSK 200khz BW / 135kHz Filter/ 15.86Khz Deviation + Ramping
-    FlipperFormat* temp_fm_preset2 = flipper_format_string_alloc();
-    flipper_format_write_string_cstr(
-        temp_fm_preset2,
-        (const char*)"Custom_preset_data",
-        (const char*)"02 0D 03 47 08 32 0B 06 15 32 14 00 13 00 12 00 11 32 10 A7 18 18 19 1D 1D 92 1C 00 1B 04 20 FB 22 17 21 B6 00 00 00 12 0E 34 60 C5 C1 C0");
-    flipper_format_rewind(temp_fm_preset2);
-    subghz_setting_load_custom_preset(subghz->setting, (const char*)"FM15k", temp_fm_preset2);
+        flipper_format_free(temp_fm_preset2);
 
-    flipper_format_free(temp_fm_preset2);
+        // Pagers
+        FlipperFormat* temp_fm_preset3 = flipper_format_string_alloc();
+        flipper_format_write_string_cstr(
+            temp_fm_preset3,
+            (const char*)"Custom_preset_data",
+            (const char*)"02 0D 07 04 08 32 0B 06 10 64 11 93 12 0C 13 02 14 00 15 15 18 18 19 16 1B 07 1C 00 1D 91 20 FB 21 56 22 10 00 00 C0 00 00 00 00 00 00 00");
+        flipper_format_rewind(temp_fm_preset3);
+        subghz_setting_load_custom_preset(subghz->setting, (const char*)"Pagers", temp_fm_preset3);
 
-    // Pagers
-    FlipperFormat* temp_fm_preset3 = flipper_format_string_alloc();
-    flipper_format_write_string_cstr(
-        temp_fm_preset3,
-        (const char*)"Custom_preset_data",
-        (const char*)"02 0D 07 04 08 32 0B 06 10 64 11 93 12 0C 13 02 14 00 15 15 18 18 19 16 1B 07 1C 00 1D 91 20 FB 21 56 22 10 00 00 C0 00 00 00 00 00 00 00");
-    flipper_format_rewind(temp_fm_preset3);
-    subghz_setting_load_custom_preset(subghz->setting, (const char*)"Pagers", temp_fm_preset3);
+        flipper_format_free(temp_fm_preset3);
 
-    flipper_format_free(temp_fm_preset3);
+        // # HND - FM presets
+        FlipperFormat* temp_fm_preset4 = flipper_format_string_alloc();
+        flipper_format_write_string_cstr(
+            temp_fm_preset4,
+            (const char*)"Custom_preset_data",
+            (const char*)"02 0D 0B 06 08 32 07 04 14 00 13 02 12 04 11 36 10 69 15 32 18 18 19 16 1D 91 1C 00 1B 07 20 FB 22 10 21 56 00 00 C0 00 00 00 00 00 00 00");
+        flipper_format_rewind(temp_fm_preset4);
+        subghz_setting_load_custom_preset(subghz->setting, (const char*)"HND_1", temp_fm_preset4);
 
-    // # HND - FM presets
-    FlipperFormat* temp_fm_preset4 = flipper_format_string_alloc();
-    flipper_format_write_string_cstr(
-        temp_fm_preset4,
-        (const char*)"Custom_preset_data",
-        (const char*)"02 0D 0B 06 08 32 07 04 14 00 13 02 12 04 11 36 10 69 15 32 18 18 19 16 1D 91 1C 00 1B 07 20 FB 22 10 21 56 00 00 C0 00 00 00 00 00 00 00");
-    flipper_format_rewind(temp_fm_preset4);
-    subghz_setting_load_custom_preset(subghz->setting, (const char*)"HND_1", temp_fm_preset4);
+        flipper_format_free(temp_fm_preset4);
 
-    flipper_format_free(temp_fm_preset4);
-
-    FlipperFormat* temp_fm_preset5 = flipper_format_string_alloc();
-    flipper_format_write_string_cstr(
-        temp_fm_preset5,
-        (const char*)"Custom_preset_data",
-        (const char*)"02 0D 0B 06 08 32 07 04 14 00 13 02 12 07 11 36 10 E9 15 32 18 18 19 16 1D 92 1C 40 1B 03 20 FB 22 10 21 56 00 00 C0 00 00 00 00 00 00 00");
-    flipper_format_rewind(temp_fm_preset5);
-    subghz_setting_load_custom_preset(subghz->setting, (const char*)"HND_2", temp_fm_preset5);
-
-    flipper_format_free(temp_fm_preset5);
+        FlipperFormat* temp_fm_preset5 = flipper_format_string_alloc();
+        flipper_format_write_string_cstr(
+            temp_fm_preset5,
+            (const char*)"Custom_preset_data",
+            (const char*)"02 0D 0B 06 08 32 07 04 14 00 13 02 12 07 11 36 10 E9 15 32 18 18 19 16 1D 92 1C 40 1B 03 20 FB 22 10 21 56 00 00 C0 00 00 00 00 00 00 00");
+        flipper_format_rewind(temp_fm_preset5);
+        subghz_setting_load_custom_preset(subghz->setting, (const char*)"HND_2", temp_fm_preset5);
 
+        flipper_format_free(temp_fm_preset5);
+    }
     // custom presets loading - end
 
     // Load last used values for Read, Read RAW, etc. or default
+    subghz->last_settings = subghz_last_settings_alloc();
+    subghz_last_settings_load(subghz->last_settings, 0);
     if(!alloc_for_tx_only) {
-        subghz->last_settings = subghz_last_settings_alloc();
-        subghz_last_settings_load(subghz->last_settings, 0);
 #if FURI_DEBUG
         FURI_LOG_D(
             TAG,
@@ -450,14 +451,16 @@ int32_t subghz_app(void* p) {
         subghz->txrx->environment, EXT_PATH("subghz/assets/keeloq_mfcodes"));
     subghz_environment_load_keystore(
         subghz->txrx->environment, EXT_PATH("subghz/assets/keeloq_mfcodes_user"));
+
+    // Auto switch to internal radio if external radio is not available
+    if(!furi_hal_subghz_check_radio()) {
+        subghz->last_settings->external_module_enabled = false;
+        furi_hal_subghz_set_radio_type(SubGhzRadioInternal);
+    }
     // Check argument and run corresponding scene
     if(p && strlen(p)) {
         uint32_t rpc_ctx = 0;
 
-        if(!furi_hal_subghz_check_radio()) {
-            furi_hal_subghz_set_radio_type(SubGhzRadioInternal);
-        }
-
         if(sscanf(p, "RPC %lX", &rpc_ctx) == 1) {
             subghz->rpc_ctx = (void*)rpc_ctx;
             rpc_system_app_set_callback(subghz->rpc_ctx, subghz_rpc_command_callback, subghz);

applications/main/subghz/subghz_last_settings.c

@@ -17,6 +17,7 @@
 //#define SUBGHZ_LAST_SETTING_FIELD_PRESET "Preset"
 #define SUBGHZ_LAST_SETTING_FIELD_FREQUENCY_ANALYZER_FEEDBACK_LEVEL "FeedbackLevel"
 #define SUBGHZ_LAST_SETTING_FIELD_FREQUENCY_ANALYZER_TRIGGER "FATrigger"
+#define SUBGHZ_LAST_SETTING_FIELD_EXTERNAL_MODULE_ENABLED "External"
 
 SubGhzLastSettings* subghz_last_settings_alloc(void) {
     SubGhzLastSettings* instance = malloc(sizeof(SubGhzLastSettings));
@@ -41,6 +42,7 @@ void subghz_last_settings_load(SubGhzLastSettings* instance, size_t preset_count
     uint32_t temp_frequency = 0;
     uint32_t temp_frequency_analyzer_feedback_level = 0;
     float temp_frequency_analyzer_trigger = 0;
+    bool temp_external_module_enabled = false;
     //int32_t temp_preset = 0;
     bool frequency_analyzer_feedback_level_was_read = false;
     bool frequency_analyzer_trigger_was_read = false;
@@ -62,6 +64,11 @@ void subghz_last_settings_load(SubGhzLastSettings* instance, size_t preset_count
             SUBGHZ_LAST_SETTING_FIELD_FREQUENCY_ANALYZER_TRIGGER,
             (float*)&temp_frequency_analyzer_trigger,
             1);
+        flipper_format_read_bool(
+            fff_data_file,
+            SUBGHZ_LAST_SETTING_FIELD_EXTERNAL_MODULE_ENABLED,
+            (bool*)&temp_external_module_enabled,
+            1);
 
     } else {
         FURI_LOG_E(TAG, "Error open file %s", SUBGHZ_LAST_SETTINGS_PATH);
@@ -74,6 +81,7 @@ void subghz_last_settings_load(SubGhzLastSettings* instance, size_t preset_count
         instance->frequency_analyzer_feedback_level =
             SUBGHZ_LAST_SETTING_FREQUENCY_ANALYZER_FEEDBACK_LEVEL;
         instance->frequency_analyzer_trigger = SUBGHZ_LAST_SETTING_FREQUENCY_ANALYZER_TRIGGER;
+        instance->external_module_enabled = false;
 
     } else {
         instance->frequency = temp_frequency;
@@ -89,6 +97,14 @@ void subghz_last_settings_load(SubGhzLastSettings* instance, size_t preset_count
         /*if(temp_preset > (int32_t)preset_count - 1 || temp_preset < 0) {
             FURI_LOG_W(TAG, "Last used preset no found");*/
         instance->preset = SUBGHZ_LAST_SETTING_DEFAULT_PRESET;
+
+        instance->external_module_enabled = temp_external_module_enabled;
+
+        // Set selected radio module
+        if(instance->external_module_enabled) {
+            furi_hal_subghz_set_radio_type(SubGhzRadioExternal);
+        }
+
         /*/} else {
             instance->preset = temp_preset;
         }*/
@@ -145,6 +161,13 @@ bool subghz_last_settings_save(SubGhzLastSettings* instance) {
                1)) {
             break;
         }
+        if(!flipper_format_insert_or_update_bool(
+               file,
+               SUBGHZ_LAST_SETTING_FIELD_EXTERNAL_MODULE_ENABLED,
+               &instance->external_module_enabled,
+               1)) {
+            break;
+        }
         saved = true;
     } while(0);
 

applications/main/subghz/subghz_last_settings.h

@@ -10,6 +10,7 @@ typedef struct {
     int32_t preset;
     uint32_t frequency_analyzer_feedback_level;
     float frequency_analyzer_trigger;
+    bool external_module_enabled;
 } SubGhzLastSettings;
 
 SubGhzLastSettings* subghz_last_settings_alloc(void);

applications/main/subghz_remote/subghz_remote_app.c

@@ -738,6 +738,11 @@ SubGHzRemote* subghz_remote_alloc(void) {
 
     // Enable power for External CC1101 if it is connected
     furi_hal_subghz_enable_ext_power();
+    // Auto switch to internal radio if external radio is not available
+    furi_delay_ms(15);
+    if(!furi_hal_subghz_check_radio()) {
+        furi_hal_subghz_set_radio_type(SubGhzRadioInternal);
+    }
 
     furi_hal_power_suppress_charge_enter();