diff --git a/applications/main/infrared/infrared.c b/applications/main/infrared/infrared.c index 407b1849e..0d52cc3bf 100644 --- a/applications/main/infrared/infrared.c +++ b/applications/main/infrared/infrared.c @@ -247,6 +247,11 @@ static void infrared_free(Infrared* infrared) { furi_string_free(infrared->file_path); + // Disable 5v power if was enabled for external module + if(furi_hal_power_is_otg_enabled()) { + furi_hal_power_disable_otg(); + } + free(infrared); } @@ -480,10 +485,6 @@ int32_t infrared_app(char* p) { view_dispatcher_run(infrared->view_dispatcher); - if(furi_hal_power_is_otg_enabled()) { - furi_hal_power_disable_otg(); - } - infrared_free(infrared); return 0; } diff --git a/applications/main/infrared/scenes/infrared_scene_start.c b/applications/main/infrared/scenes/infrared_scene_start.c index a671c7592..422b7cce8 100644 --- a/applications/main/infrared/scenes/infrared_scene_start.c +++ b/applications/main/infrared/scenes/infrared_scene_start.c @@ -3,10 +3,10 @@ enum SubmenuIndex { SubmenuIndexUniversalRemotes, SubmenuIndexLearnNewRemote, - SubmenuIndexLearnNewRemoteRaw, SubmenuIndexSavedRemotes, - SubmenuIndexDebug, - SubmenuIndexDebugSettings + SubmenuIndexDebugSettings, + SubmenuIndexLearnNewRemoteRaw, + SubmenuIndexDebug }; static void infrared_scene_start_submenu_callback(void* context, uint32_t index) { @@ -37,6 +37,12 @@ void infrared_scene_start_on_enter(void* context) { SubmenuIndexSavedRemotes, infrared_scene_start_submenu_callback, infrared); + submenu_add_item( + submenu, + "GPIO Settings", + SubmenuIndexDebugSettings, + infrared_scene_start_submenu_callback, + infrared); submenu_add_lockable_item( submenu, @@ -54,14 +60,6 @@ void infrared_scene_start_on_enter(void* context) { infrared, !infrared->app_state.is_debug_enabled, "Enable\nDebug!"); - submenu_add_lockable_item( - submenu, - "Debug Settings", - SubmenuIndexDebugSettings, - infrared_scene_start_submenu_callback, - infrared, - !infrared->app_state.is_debug_enabled, - "Enable\nDebug!"); const uint32_t submenu_index = scene_manager_get_scene_state(scene_manager, InfraredSceneStart); diff --git a/applications/main/subghz/scenes/subghz_scene_config.h b/applications/main/subghz/scenes/subghz_scene_config.h index 6fb183d60..269ec4c72 100644 --- a/applications/main/subghz/scenes/subghz_scene_config.h +++ b/applications/main/subghz/scenes/subghz_scene_config.h @@ -23,7 +23,7 @@ ADD_SCENE(subghz, set_fix, SetFix) ADD_SCENE(subghz, set_cnt, SetCnt) ADD_SCENE(subghz, set_seed, SetSeed) ADD_SCENE(subghz, frequency_analyzer, FrequencyAnalyzer) -ADD_SCENE(subghz, ext_module_settings, ExtModuleSettings) +ADD_SCENE(subghz, radio_settings, ExtModuleSettings) ADD_SCENE(subghz, read_raw, ReadRAW) ADD_SCENE(subghz, more_raw, MoreRAW) ADD_SCENE(subghz, decode_raw, DecodeRAW) diff --git a/applications/main/subghz/scenes/subghz_scene_ext_module_settings.c b/applications/main/subghz/scenes/subghz_scene_radio_settings.c similarity index 74% rename from applications/main/subghz/scenes/subghz_scene_ext_module_settings.c rename to applications/main/subghz/scenes/subghz_scene_radio_settings.c index 9daa42eaa..7fea1de0a 100644 --- a/applications/main/subghz/scenes/subghz_scene_ext_module_settings.c +++ b/applications/main/subghz/scenes/subghz_scene_radio_settings.c @@ -1,12 +1,6 @@ #include "../subghz_i.h" #include "../helpers/subghz_custom_event.h" -static uint8_t value_index_exm; -static uint8_t value_index_dpin; -static uint8_t value_index_cnt; -static uint8_t value_index_pwr; -static uint8_t value_index_time; - #define EXT_MODULES_COUNT (sizeof(radio_modules_variables_text) / sizeof(char* const)) const char* const radio_modules_variables_text[] = { "Internal", @@ -31,19 +25,16 @@ const char* const debug_pin_text[DEBUG_P_COUNT] = { "17(1W)", }; -#define DEBUG_COUNTER_COUNT 6 +#define DEBUG_COUNTER_COUNT 3 const char* const debug_counter_text[DEBUG_COUNTER_COUNT] = { "+1", "+2", "+3", - "+4", - "+5", - "+10", }; 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); + uint8_t value_index_exm = variable_item_get_current_value_index(item); variable_item_set_current_value_text(item, radio_modules_variables_text[value_index_exm]); @@ -80,15 +71,6 @@ static void subghz_scene_receiver_config_set_debug_counter(VariableItem* item) { case 2: furi_hal_subghz_set_rolling_counter_mult(3); break; - case 3: - furi_hal_subghz_set_rolling_counter_mult(4); - break; - case 4: - furi_hal_subghz_set_rolling_counter_mult(5); - break; - case 5: - furi_hal_subghz_set_rolling_counter_mult(10); - break; default: break; } @@ -122,20 +104,21 @@ static void subghz_scene_receiver_config_set_timestamp_file_names(VariableItem* subghz_last_settings_save(subghz->last_settings); } -void subghz_scene_ext_module_settings_on_enter(void* context) { +void subghz_scene_radio_settings_on_enter(void* context) { SubGhz* subghz = context; VariableItemList* variable_item_list = subghz->variable_item_list; + uint8_t value_index; - value_index_exm = furi_hal_subghz.radio_type; + value_index = furi_hal_subghz.radio_type; VariableItem* item = variable_item_list_add( variable_item_list, "Module", EXT_MODULES_COUNT, subghz_scene_ext_module_changed, subghz); variable_item_list_set_enter_callback( variable_item_list, subghz_ext_module_start_var_list_enter_callback, subghz); - variable_item_set_current_value_index(item, value_index_exm); - variable_item_set_current_value_text(item, radio_modules_variables_text[value_index_exm]); + variable_item_set_current_value_index(item, value_index); + variable_item_set_current_value_text(item, radio_modules_variables_text[value_index]); item = variable_item_list_add( subghz->variable_item_list, @@ -143,9 +126,9 @@ void subghz_scene_ext_module_settings_on_enter(void* context) { EXT_MOD_POWER_COUNT, subghz_scene_receiver_config_set_ext_mod_power, subghz); - value_index_pwr = furi_hal_subghz_get_external_power_disable(); - variable_item_set_current_value_index(item, value_index_pwr); - variable_item_set_current_value_text(item, ext_mod_power_text[value_index_pwr]); + value_index = furi_hal_subghz_get_external_power_disable(); + variable_item_set_current_value_index(item, value_index); + variable_item_set_current_value_text(item, ext_mod_power_text[value_index]); item = variable_item_list_add( subghz->variable_item_list, @@ -153,21 +136,9 @@ void subghz_scene_ext_module_settings_on_enter(void* context) { TIMESTAMP_NAMES_COUNT, subghz_scene_receiver_config_set_timestamp_file_names, subghz); - value_index_time = furi_hal_subghz_get_timestamp_file_names(); - variable_item_set_current_value_index(item, value_index_time); - variable_item_set_current_value_text(item, timestamp_names_text[value_index_time]); - - item = variable_item_list_add( - subghz->variable_item_list, - "Debug Pin", - DEBUG_P_COUNT, - subghz_scene_receiver_config_set_debug_pin, - subghz); - value_index_dpin = subghz_txrx_get_debug_pin_state(subghz->txrx); - variable_item_set_current_value_index(item, value_index_dpin); - variable_item_set_current_value_text(item, debug_pin_text[value_index_dpin]); - variable_item_set_locked( - item, !furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug), "Enable\nDebug!"); + value_index = furi_hal_subghz_get_timestamp_file_names(); + variable_item_set_current_value_index(item, value_index); + variable_item_set_current_value_text(item, timestamp_names_text[value_index]); item = variable_item_list_add( subghz->variable_item_list, @@ -177,48 +148,49 @@ void subghz_scene_ext_module_settings_on_enter(void* context) { subghz); switch(furi_hal_subghz_get_rolling_counter_mult()) { case 1: - value_index_cnt = 0; + value_index = 0; break; case 2: - value_index_cnt = 1; + value_index = 1; break; case 3: - value_index_cnt = 2; - break; - case 4: - value_index_cnt = 3; - break; - case 5: - value_index_cnt = 4; - break; - case 10: - value_index_cnt = 5; + value_index = 2; break; default: break; } - variable_item_set_current_value_index(item, value_index_cnt); - variable_item_set_current_value_text(item, debug_counter_text[value_index_cnt]); + variable_item_set_current_value_index(item, value_index); + variable_item_set_current_value_text(item, debug_counter_text[value_index]); + + item = variable_item_list_add( + subghz->variable_item_list, + "Debug Pin", + DEBUG_P_COUNT, + subghz_scene_receiver_config_set_debug_pin, + subghz); + value_index = subghz_txrx_get_debug_pin_state(subghz->txrx); + variable_item_set_current_value_index(item, value_index); + variable_item_set_current_value_text(item, debug_pin_text[value_index]); variable_item_set_locked( item, !furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug), "Enable\nDebug!"); view_dispatcher_switch_to_view(subghz->view_dispatcher, SubGhzViewIdVariableItemList); } -bool subghz_scene_ext_module_settings_on_event(void* context, SceneManagerEvent event) { +bool subghz_scene_radio_settings_on_event(void* context, SceneManagerEvent event) { SubGhz* subghz = context; UNUSED(subghz); UNUSED(event); // Set selected radio module - furi_hal_subghz_select_radio_type(value_index_exm); - furi_hal_subghz_init_radio_type(value_index_exm); + furi_hal_subghz_select_radio_type(subghz->last_settings->external_module_enabled); + furi_hal_subghz_init_radio_type(subghz->last_settings->external_module_enabled); 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; + subghz->last_settings->external_module_enabled = false; furi_hal_subghz_select_radio_type(SubGhzRadioInternal); furi_hal_subghz_init_radio_type(SubGhzRadioInternal); furi_string_set(subghz->error_str, "Please connect\nexternal radio"); @@ -228,7 +200,7 @@ bool subghz_scene_ext_module_settings_on_event(void* context, SceneManagerEvent return false; } -void subghz_scene_ext_module_settings_on_exit(void* context) { +void subghz_scene_radio_settings_on_exit(void* context) { SubGhz* subghz = context; variable_item_list_reset(subghz->variable_item_list); } diff --git a/firmware/targets/f7/furi_hal/furi_hal_idle_timer.h b/firmware/targets/f7/furi_hal/furi_hal_idle_timer.h index 36b45755a..9f91db14e 100644 --- a/firmware/targets/f7/furi_hal/furi_hal_idle_timer.h +++ b/firmware/targets/f7/furi_hal/furi_hal_idle_timer.h @@ -3,7 +3,6 @@ #include #include #include -#include // Timer used for tickless idle #define FURI_HAL_IDLE_TIMER_MAX 0xFFFF