Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-07-23 01:18:12 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix external radio SPI handlers

Browse Source
This commit is contained in:
MX
2023-04-24 01:56:43 +03:00
parent 69530cd50f
commit 8cb3b67295
14 changed files with 51 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/external/playlist/playlist.c
Vendored
+4 -1
View File
@@ -716,7 +716,8 @@ int32_t playlist_app(void* p) {
// 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_subghz_select_radio_type(SubGhzRadioInternal);
furi_hal_subghz_init_radio_type(SubGhzRadioInternal);
}
furi_hal_power_suppress_charge_enter();
@@ -809,6 +810,8 @@ exit_cleanup:
furi_hal_power_suppress_charge_exit();
// Disable power for External CC1101 if it was enabled and module is connected
furi_hal_subghz_disable_ext_power();
// Reinit SPI handles for internal radio / nfc
furi_hal_subghz_init_radio_type(SubGhzRadioInternal);
if(app->worker != NULL) {
if(playlist_worker_running(app->worker)) {
applications/external/pocsag_pager/pocsag_pager_app.c
Vendored
+4 -1
View File
@@ -127,7 +127,8 @@ POCSAGPagerApp* pocsag_pager_app_alloc() {
// 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_subghz_select_radio_type(SubGhzRadioInternal);
furi_hal_subghz_init_radio_type(SubGhzRadioInternal);
}
furi_hal_power_suppress_charge_enter();
@@ -145,6 +146,8 @@ void pocsag_pager_app_free(POCSAGPagerApp* app) {
// Disable power for External CC1101 if it was enabled and module is connected
furi_hal_subghz_disable_ext_power();
// Reinit SPI handles for internal radio / nfc
furi_hal_subghz_init_radio_type(SubGhzRadioInternal);
// Submenu
view_dispatcher_remove_view(app->view_dispatcher, POCSAGPagerViewSubmenu);
applications/external/protoview/app.c
Vendored
+4 -1
View File
@@ -172,7 +172,8 @@ ProtoViewApp* protoview_app_alloc() {
// 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_subghz_select_radio_type(SubGhzRadioInternal);
furi_hal_subghz_init_radio_type(SubGhzRadioInternal);
}
furi_hal_power_suppress_charge_enter();
@@ -192,6 +193,8 @@ void protoview_app_free(ProtoViewApp* app) {
// Disable power for External CC1101 if it was enabled and module is connected
furi_hal_subghz_disable_ext_power();
// Reinit SPI handles for internal radio / nfc
furi_hal_subghz_init_radio_type(SubGhzRadioInternal);
// View related.
view_port_enabled_set(app->view_port, false);
applications/external/spectrum_analyzer/spectrum_analyzer.c
Vendored
+4 -1
View File
@@ -395,6 +395,8 @@ void spectrum_analyzer_free(SpectrumAnalyzer* instance) {
// Disable power for External CC1101 if it was enabled and module is connected
furi_hal_subghz_disable_ext_power();
// Reinit SPI handles for internal radio / nfc
furi_hal_subghz_init_radio_type(SubGhzRadioInternal);
}
int32_t spectrum_analyzer_app(void* p) {
@@ -408,7 +410,8 @@ int32_t spectrum_analyzer_app(void* p) {
// 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_subghz_select_radio_type(SubGhzRadioInternal);
furi_hal_subghz_init_radio_type(SubGhzRadioInternal);
}
furi_hal_power_suppress_charge_enter();
applications/external/subbrute
Vendored
+1 -1
Submodule applications/external/subbrute updated: df12fcd72e...c94efdf88a
applications/external/weather_station/weather_station_app.c
Vendored
+4 -1
View File
@@ -110,7 +110,8 @@ WeatherStationApp* weather_station_app_alloc() {
// 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_subghz_select_radio_type(SubGhzRadioInternal);
furi_hal_subghz_init_radio_type(SubGhzRadioInternal);
}
furi_hal_power_suppress_charge_enter();
@@ -128,6 +129,8 @@ void weather_station_app_free(WeatherStationApp* app) {
// Disable power for External CC1101 if it was enabled and module is connected
furi_hal_subghz_disable_ext_power();
// Reinit SPI handles for internal radio / nfc
furi_hal_subghz_init_radio_type(SubGhzRadioInternal);
// Submenu
view_dispatcher_remove_view(app->view_dispatcher, WeatherStationViewSubmenu);
applications/main/subghz/scenes/subghz_scene_ext_module_settings.c
+4 -2
View File
@@ -209,14 +209,16 @@ bool subghz_scene_ext_module_settings_on_event(void* context, SceneManagerEvent
UNUSED(event);
// Set selected radio module
furi_hal_subghz_set_radio_type(value_index_exm);
furi_hal_subghz_select_radio_type(value_index_exm);
furi_hal_subghz_init_radio_type(value_index_exm);
furi_hal_subghz_enable_ext_power();
// Check if module is present, if no -> show error
if(!furi_hal_subghz_check_radio()) {
value_index_exm = 0;
furi_hal_subghz_set_radio_type(SubGhzRadioInternal);
furi_hal_subghz_select_radio_type(SubGhzRadioInternal);
furi_hal_subghz_init_radio_type(SubGhzRadioInternal);
furi_string_set(subghz->error_str, "Please connect\nexternal radio");
scene_manager_next_scene(subghz->scene_manager, SubGhzSceneShowErrorSub);
}
applications/main/subghz/scenes/subghz_scene_start.c
+2 -1
View File
@@ -84,7 +84,8 @@ bool subghz_scene_start_on_event(void* context, SceneManagerEvent event) {
furi_hal_subghz_enable_ext_power();
if(!furi_hal_subghz_check_radio()) {
furi_hal_subghz_set_radio_type(SubGhzRadioInternal);
furi_hal_subghz_select_radio_type(SubGhzRadioInternal);
furi_hal_subghz_init_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);
applications/main/subghz/subghz.c
+4 -1
View File
@@ -451,7 +451,8 @@ int32_t subghz_app(void* p) {
// 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);
furi_hal_subghz_select_radio_type(SubGhzRadioInternal);
furi_hal_subghz_init_radio_type(SubGhzRadioInternal);
}
// Check argument and run corresponding scene
if(p && strlen(p)) {
@@ -507,6 +508,8 @@ int32_t subghz_app(void* p) {
furi_hal_power_suppress_charge_exit();
// Disable power for External CC1101 if it was enabled and module is connected
furi_hal_subghz_disable_ext_power();
// Reinit SPI handles for internal radio / nfc
furi_hal_subghz_init_radio_type(SubGhzRadioInternal);
subghz_free(subghz, alloc_for_tx);
applications/main/subghz/subghz_last_settings.c
+2 -1
View File
@@ -129,7 +129,8 @@ void subghz_last_settings_load(SubGhzLastSettings* instance, size_t preset_count
// Set selected radio module
if(instance->external_module_enabled) {
furi_hal_subghz_set_radio_type(SubGhzRadioExternal);
furi_hal_subghz_select_radio_type(SubGhzRadioExternal);
furi_hal_subghz_init_radio_type(SubGhzRadioExternal);
}
/*/} else {
applications/main/subghz_remote/subghz_remote_app.c
+4 -1
View File
@@ -765,7 +765,8 @@ SubGHzRemote* subghz_remote_alloc(void) {
// 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_subghz_select_radio_type(SubGhzRadioInternal);
furi_hal_subghz_init_radio_type(SubGhzRadioInternal);
}
furi_hal_power_suppress_charge_enter();
@@ -792,6 +793,8 @@ void subghz_remote_free(SubGHzRemote* app, bool with_subghz) {
// Disable power for External CC1101 if it was enabled and module is connected
furi_hal_subghz_disable_ext_power();
// Reinit SPI handles for internal radio / nfc
furi_hal_subghz_init_radio_type(SubGhzRadioInternal);
furi_string_free(app->up_file);
furi_string_free(app->down_file);