From 89dddc4709261f00693e002f6ae6d02c061610e8 Mon Sep 17 00:00:00 2001 From: jbohack Date: Tue, 10 Jan 2023 10:17:32 -0500 Subject: [PATCH] Revert "Show region information in sub-GHz app (#2249)" This reverts commit 2c450bd835dffa18dfa6662d658c3f75079e9b92. we set region information to fully unlocked so this does not matter --- .../main/nfc/scenes/nfc_scene_start.c | 6 +-- .../main/subghz/scenes/subghz_scene_config.h | 1 - .../subghz/scenes/subghz_scene_region_info.c | 39 ------------------- .../main/subghz/scenes/subghz_scene_start.c | 20 ++-------- .../picopass/scenes/picopass_scene_start.c | 2 +- 5 files changed, 8 insertions(+), 60 deletions(-) delete mode 100644 applications/main/subghz/scenes/subghz_scene_region_info.c diff --git a/applications/main/nfc/scenes/nfc_scene_start.c b/applications/main/nfc/scenes/nfc_scene_start.c index 2a116fe09..f8b9f52c6 100644 --- a/applications/main/nfc/scenes/nfc_scene_start.c +++ b/applications/main/nfc/scenes/nfc_scene_start.c @@ -7,7 +7,7 @@ enum SubmenuIndex { SubmenuIndexDetectReader, SubmenuIndexSaved, SubmenuIndexExtraAction, - SubmenuIndexAddManually, + SubmenuIndexAddManualy, SubmenuIndexDebug, }; @@ -28,7 +28,7 @@ void nfc_scene_start_on_enter(void* context) { submenu_add_item( submenu, "Extra Actions", SubmenuIndexExtraAction, nfc_scene_start_submenu_callback, nfc); submenu_add_item( - submenu, "Add Manually", SubmenuIndexAddManually, nfc_scene_start_submenu_callback, nfc); + submenu, "Add Manually", SubmenuIndexAddManualy, nfc_scene_start_submenu_callback, nfc); if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug)) { submenu_add_item( @@ -68,7 +68,7 @@ bool nfc_scene_start_on_event(void* context, SceneManagerEvent event) { } else if(event.event == SubmenuIndexExtraAction) { scene_manager_next_scene(nfc->scene_manager, NfcSceneExtraActions); consumed = true; - } else if(event.event == SubmenuIndexAddManually) { + } else if(event.event == SubmenuIndexAddManualy) { scene_manager_next_scene(nfc->scene_manager, NfcSceneSetType); consumed = true; } else if(event.event == SubmenuIndexDebug) { diff --git a/applications/main/subghz/scenes/subghz_scene_config.h b/applications/main/subghz/scenes/subghz_scene_config.h index 694683f52..1ad41a8b5 100644 --- a/applications/main/subghz/scenes/subghz_scene_config.h +++ b/applications/main/subghz/scenes/subghz_scene_config.h @@ -32,4 +32,3 @@ ADD_SCENE(subghz, decode_raw, DecodeRAW) ADD_SCENE(subghz, delete_raw, DeleteRAW) ADD_SCENE(subghz, need_saving, NeedSaving) ADD_SCENE(subghz, rpc, Rpc) -ADD_SCENE(subghz, region_info, RegionInfo) diff --git a/applications/main/subghz/scenes/subghz_scene_region_info.c b/applications/main/subghz/scenes/subghz_scene_region_info.c deleted file mode 100644 index 82486314d..000000000 --- a/applications/main/subghz/scenes/subghz_scene_region_info.c +++ /dev/null @@ -1,39 +0,0 @@ -#include "../subghz_i.h" - -#include - -void subghz_scene_region_info_on_enter(void* context) { - SubGhz* subghz = context; - const FuriHalRegion* const region = furi_hal_region_get(); - FuriString* buffer; - buffer = furi_string_alloc(); - if(region) { - furi_string_cat_printf(buffer, "Region: %s, bands:\n", region->country_code); - for(uint16_t i = 0; i < region->bands_count; ++i) { - furi_string_cat_printf( - buffer, - " %lu-%lu kHz\n", - region->bands[i].start / 1000, - region->bands[i].end / 1000); - } - } else { - furi_string_cat_printf(buffer, "Region: N/A\n"); - } - - widget_add_string_multiline_element( - subghz->widget, 0, 0, AlignLeft, AlignTop, FontSecondary, furi_string_get_cstr(buffer)); - - furi_string_free(buffer); - view_dispatcher_switch_to_view(subghz->view_dispatcher, SubGhzViewIdWidget); -} - -bool subghz_scene_region_info_on_event(void* context, SceneManagerEvent event) { - UNUSED(context); - UNUSED(event); - return false; -} - -void subghz_scene_region_info_on_exit(void* context) { - SubGhz* subghz = context; - widget_reset(subghz->widget); -} diff --git a/applications/main/subghz/scenes/subghz_scene_start.c b/applications/main/subghz/scenes/subghz_scene_start.c index 1177b6454..c9a62c2fc 100644 --- a/applications/main/subghz/scenes/subghz_scene_start.c +++ b/applications/main/subghz/scenes/subghz_scene_start.c @@ -7,10 +7,9 @@ enum SubmenuIndex { SubmenuIndexRead = 10, SubmenuIndexSaved, SubmenuIndexTest, - SubmenuIndexAddManually, + SubmenuIndexAddManualy, SubmenuIndexFrequencyAnalyzer, SubmenuIndexReadRAW, - SubmenuIndexShowRegionInfo }; void subghz_scene_start_remove_advanced_preset(SubGhz* subghz) { @@ -65,7 +64,7 @@ void subghz_scene_start_on_enter(void* context) { submenu_add_item( subghz->submenu, "Add Manually", - SubmenuIndexAddManually, + SubmenuIndexAddManualy, subghz_scene_start_submenu_callback, subghz); submenu_add_item( @@ -74,12 +73,6 @@ void subghz_scene_start_on_enter(void* context) { SubmenuIndexFrequencyAnalyzer, subghz_scene_start_submenu_callback, subghz); - submenu_add_item( - subghz->submenu, - "Region Information", - SubmenuIndexShowRegionInfo, - subghz_scene_start_submenu_callback, - subghz); if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug)) { submenu_add_item( subghz->submenu, "Test", SubmenuIndexTest, subghz_scene_start_submenu_callback, subghz); @@ -116,9 +109,9 @@ bool subghz_scene_start_on_event(void* context, SceneManagerEvent event) { subghz->scene_manager, SubGhzSceneStart, SubmenuIndexSaved); scene_manager_next_scene(subghz->scene_manager, SubGhzSceneSaved); return true; - } else if(event.event == SubmenuIndexAddManually) { + } else if(event.event == SubmenuIndexAddManualy) { scene_manager_set_scene_state( - subghz->scene_manager, SubGhzSceneStart, SubmenuIndexAddManually); + subghz->scene_manager, SubGhzSceneStart, SubmenuIndexAddManualy); scene_manager_next_scene(subghz->scene_manager, SubGhzSceneSetType); return true; } else if(event.event == SubmenuIndexFrequencyAnalyzer) { @@ -133,11 +126,6 @@ bool subghz_scene_start_on_event(void* context, SceneManagerEvent event) { subghz->scene_manager, SubGhzSceneStart, SubmenuIndexTest); scene_manager_next_scene(subghz->scene_manager, SubGhzSceneTest); return true; - } else if(event.event == SubmenuIndexShowRegionInfo) { - scene_manager_set_scene_state( - subghz->scene_manager, SubGhzSceneStart, SubmenuIndexShowRegionInfo); - scene_manager_next_scene(subghz->scene_manager, SubGhzSceneRegionInfo); - return true; } } return false; diff --git a/applications/plugins/picopass/scenes/picopass_scene_start.c b/applications/plugins/picopass/scenes/picopass_scene_start.c index 6d1aeedcd..76c18a22a 100644 --- a/applications/plugins/picopass/scenes/picopass_scene_start.c +++ b/applications/plugins/picopass/scenes/picopass_scene_start.c @@ -3,7 +3,7 @@ enum SubmenuIndex { SubmenuIndexRead, SubmenuIndexRunScript, SubmenuIndexSaved, - SubmenuIndexAddManually, + SubmenuIndexAddManualy, SubmenuIndexDebug, };