From ec71a5c9d8b2b6e31a532a7e675a02c610a5a943 Mon Sep 17 00:00:00 2001 From: Dmitry Pavlov Date: Fri, 22 Apr 2022 22:01:21 +0300 Subject: [PATCH 1/2] [FL-2455] LFRFID, iButton: more-menu fix (#1151) * Items order changed * iButton,Rfid: correct order in enums Co-authored-by: Aleksandr Kutuzov --- .../ibutton/scene/ibutton_scene_read_key_menu.cpp | 10 +++++----- .../lfrfid/scene/lfrfid_app_scene_read_menu.cpp | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/applications/ibutton/scene/ibutton_scene_read_key_menu.cpp b/applications/ibutton/scene/ibutton_scene_read_key_menu.cpp index b77572249..215eb76f6 100644 --- a/applications/ibutton/scene/ibutton_scene_read_key_menu.cpp +++ b/applications/ibutton/scene/ibutton_scene_read_key_menu.cpp @@ -2,9 +2,9 @@ #include "../ibutton_app.h" typedef enum { - SubmenuIndexWrite, - SubmenuIndexEmulate, SubmenuIndexSave, + SubmenuIndexEmulate, + SubmenuIndexWrite, } SubmenuIndex; static void submenu_callback(void* context, uint32_t index) { @@ -22,11 +22,11 @@ void iButtonSceneReadKeyMenu::on_enter(iButtonApp* app) { iButtonAppViewManager* view_manager = app->get_view_manager(); Submenu* submenu = view_manager->get_submenu(); + submenu_add_item(submenu, "Save", SubmenuIndexSave, submenu_callback, app); + submenu_add_item(submenu, "Emulate", SubmenuIndexEmulate, submenu_callback, app); if(ibutton_key_get_type(app->get_key()) == iButtonKeyDS1990) { submenu_add_item(submenu, "Write", SubmenuIndexWrite, submenu_callback, app); } - submenu_add_item(submenu, "Save", SubmenuIndexSave, submenu_callback, app); - submenu_add_item(submenu, "Emulate", SubmenuIndexEmulate, submenu_callback, app); submenu_set_selected_item(submenu, submenu_item_selected); view_manager->switch_to(iButtonAppViewManager::Type::iButtonAppViewSubmenu); @@ -62,4 +62,4 @@ void iButtonSceneReadKeyMenu::on_exit(iButtonApp* app) { Submenu* submenu = view->get_submenu(); submenu_reset(submenu); -} \ No newline at end of file +} diff --git a/applications/lfrfid/scene/lfrfid_app_scene_read_menu.cpp b/applications/lfrfid/scene/lfrfid_app_scene_read_menu.cpp index ce0461f92..76c912306 100644 --- a/applications/lfrfid/scene/lfrfid_app_scene_read_menu.cpp +++ b/applications/lfrfid/scene/lfrfid_app_scene_read_menu.cpp @@ -1,17 +1,17 @@ #include "lfrfid_app_scene_read_menu.h" typedef enum { - SubmenuWrite, SubmenuSave, SubmenuEmulate, + SubmenuWrite, } SubmenuIndex; void LfRfidAppSceneReadKeyMenu::on_enter(LfRfidApp* app, bool need_restore) { auto submenu = app->view_controller.get(); - submenu->add_item("Write", SubmenuWrite, submenu_callback, app); submenu->add_item("Save", SubmenuSave, submenu_callback, app); submenu->add_item("Emulate", SubmenuEmulate, submenu_callback, app); + submenu->add_item("Write", SubmenuWrite, submenu_callback, app); if(need_restore) { submenu->set_selected_item(submenu_item_selected); From cc99ce1f07e6d0a5682ed4ca30ec60b0cc02e05f Mon Sep 17 00:00:00 2001 From: Skorpionm <85568270+Skorpionm@users.noreply.github.com> Date: Fri, 22 Apr 2022 23:05:27 +0400 Subject: [PATCH 2/2] [FL-2496] SubGhz: fix freezing of the interface when the transmission of the RAW signal is forcibly canceled (#1152) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: あく --- lib/subghz/subghz_file_encoder_worker.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/subghz/subghz_file_encoder_worker.c b/lib/subghz/subghz_file_encoder_worker.c index 0331213c6..91538e1f2 100644 --- a/lib/subghz/subghz_file_encoder_worker.c +++ b/lib/subghz/subghz_file_encoder_worker.c @@ -167,7 +167,7 @@ static int32_t subghz_file_encoder_worker_thread(void* context) { } //waiting for the end of the transfer FURI_LOG_I(TAG, "End read file"); - while(!furi_hal_subghz_is_async_tx_complete()) { + while(!furi_hal_subghz_is_async_tx_complete() && instance->worker_running) { osDelay(5); } FURI_LOG_I(TAG, "End transmission");