Fix external module power init

applications/main/subghz_remote/subghz_remote_app.c

@@ -736,10 +736,11 @@ void subghz_remote_subghz_alloc(SubGHzRemote* app) {
 SubGHzRemote* subghz_remote_alloc(void) {
     SubGHzRemote* app = malloc(sizeof(SubGHzRemote));
 
-    furi_hal_power_suppress_charge_enter();
     // Enable power for External CC1101 if it is connected
     furi_hal_subghz_enable_ext_power();
 
+    furi_hal_power_suppress_charge_enter();
+
     app->model_mutex = furi_mutex_alloc(FuriMutexTypeNormal);
 
     app->input_queue = furi_message_queue_alloc(32, sizeof(InputEvent));

applications/plugins/playlist/playlist.c

@@ -672,11 +672,11 @@ int32_t playlist_app(void* p) {
     Playlist* app = playlist_alloc(meta);
     meta->view_port = app->view_port;
 
-    furi_hal_power_suppress_charge_enter();
-
     // Enable power for External CC1101 if it is connected
     furi_hal_subghz_enable_ext_power();
 
+    furi_hal_power_suppress_charge_enter();
+
     // select playlist file
     {
         DialogsApp* dialogs = furi_record_open(RECORD_DIALOGS);

applications/plugins/pocsag_pager/pocsag_pager_app.c

@@ -122,11 +122,11 @@ POCSAGPagerApp* pocsag_pager_app_alloc() {
         app->txrx->worker, (SubGhzWorkerPairCallback)subghz_receiver_decode);
     subghz_worker_set_context(app->txrx->worker, app->txrx->receiver);
 
-    furi_hal_power_suppress_charge_enter();
-
     // Enable power for External CC1101 if it is connected
     furi_hal_subghz_enable_ext_power();
 
+    furi_hal_power_suppress_charge_enter();
+
     scene_manager_next_scene(app->scene_manager, POCSAGPagerSceneStart);
 
     return app;

applications/plugins/protoview/app.c

@@ -167,12 +167,12 @@ ProtoViewApp* protoview_app_alloc() {
     app->frequency = subghz_setting_get_default_frequency(app->setting);
     app->modulation = 0; /* Defaults to ProtoViewModulations[0]. */
 
-    furi_hal_power_suppress_charge_enter();
-    app->running = 1;
-
     // Enable power for External CC1101 if it is connected
     furi_hal_subghz_enable_ext_power();
 
+    furi_hal_power_suppress_charge_enter();
+    app->running = 1;
+
     return app;
 }
 

applications/plugins/spectrum_analyzer/spectrum_analyzer.c

@@ -403,11 +403,11 @@ int32_t spectrum_analyzer_app(void* p) {
     SpectrumAnalyzer* spectrum_analyzer = spectrum_analyzer_alloc();
     InputEvent input;
 
-    furi_hal_power_suppress_charge_enter();
-
     // Enable power for External CC1101 if it is connected
     furi_hal_subghz_enable_ext_power();
 
+    furi_hal_power_suppress_charge_enter();
+
     FURI_LOG_D("Spectrum", "Main Loop - Starting worker");
     furi_delay_ms(50);
 

applications/plugins/subbrute

@@ -1 +1 @@
-Subproject commit 552bd12d0f710501c31f7d44b4755d7fa89de303
+Subproject commit ed94bc87868b80bf41dad754f3747a9f40551995

applications/plugins/weather_station/weather_station_app.c

@@ -105,11 +105,11 @@ WeatherStationApp* weather_station_app_alloc() {
         app->txrx->worker, (SubGhzWorkerPairCallback)subghz_receiver_decode);
     subghz_worker_set_context(app->txrx->worker, app->txrx->receiver);
 
-    furi_hal_power_suppress_charge_enter();
-
     // Enable power for External CC1101 if it is connected
     furi_hal_subghz_enable_ext_power();
 
+    furi_hal_power_suppress_charge_enter();
+
     scene_manager_next_scene(app->scene_manager, WeatherStationSceneStart);
 
     return app;

firmware/targets/f7/furi_hal/furi_hal_subghz.c

@@ -81,7 +81,7 @@ void furi_hal_subghz_init(void) {
 }
 
 void furi_hal_subghz_enable_ext_power(void) {
-    if(ext_power_is_enabled_already) return;
+    if(ext_power_is_enabled_already && furi_hal_power_is_otg_enabled()) return;
     ext_power_is_enabled_already = true;
     last_OTG_state = furi_hal_power_is_otg_enabled();
     if(furi_hal_subghz.radio_type != SubGhzRadioInternal && !furi_hal_power_is_otg_enabled()) {