mirrors/unleashed-firmware
1
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2025-12-12 20:49:49 +04:00
Code Issues Activity

Merge remote-tracking branch 'OFW/skorp/subghz_fix_3853' into dev

Browse Source
This commit is contained in:
MX
2024-06-16 14:23:52 +03:00
parent df8c4c168a cdc7e36d5c
commit 5da3ab440f
3 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
applications/main/subghz/scenes/subghz_scene_delete_raw.c
View File

@@ -66,13 +66,7 @@ bool subghz_scene_delete_raw_on_event(void* context, SceneManagerEvent event) {
if(event.event == SubGhzCustomEventSceneDeleteRAW) { if(event.event == SubGhzCustomEventSceneDeleteRAW) {
furi_string_set(subghz->file_path_tmp, subghz->file_path); furi_string_set(subghz->file_path_tmp, subghz->file_path);
if(subghz_delete_file(subghz)) { if(subghz_delete_file(subghz)) {
if(subghz_rx_key_state_get(subghz) != SubGhzRxKeyStateRAWLoad) {
subghz_rx_key_state_set(subghz, SubGhzRxKeyStateIDLE);
scene_manager_next_scene(subghz->scene_manager, SubGhzSceneDeleteSuccess); scene_manager_next_scene(subghz->scene_manager, SubGhzSceneDeleteSuccess);
} else {
scene_manager_next_scene(subghz->scene_manager, SubGhzSceneSaved);
}
} else { } else {
scene_manager_search_and_switch_to_previous_scene( scene_manager_search_and_switch_to_previous_scene(
subghz->scene_manager, SubGhzSceneStart); subghz->scene_manager, SubGhzSceneStart);

15
applications/main/subghz/scenes/subghz_scene_delete_success.c
View File

@@ -26,15 +26,24 @@ bool subghz_scene_delete_success_on_event(void* context, SceneManagerEvent event
if(event.type == SceneManagerEventTypeCustom) { if(event.type == SceneManagerEventTypeCustom) {
if(event.event == SubGhzCustomEventSceneDeleteSuccess) { if(event.event == SubGhzCustomEventSceneDeleteSuccess) {
if(subghz_rx_key_state_get(subghz) == SubGhzRxKeyStateRAWLoad) {
if(scene_manager_search_and_switch_to_previous_scene( if(scene_manager_search_and_switch_to_previous_scene(
subghz->scene_manager, SubGhzSceneReadRAW)) {
scene_manager_next_scene(subghz->scene_manager, SubGhzSceneReadRAW);
} else if(scene_manager_search_and_switch_to_previous_scene(
subghz->scene_manager, SubGhzSceneSaved)) { subghz->scene_manager, SubGhzSceneSaved)) {
} else { } else {
scene_manager_search_and_switch_to_previous_scene( scene_manager_search_and_switch_to_previous_scene(
subghz->scene_manager, SubGhzSceneStart); subghz->scene_manager, SubGhzSceneStart);
} }
} else {
subghz_rx_key_state_set(subghz, SubGhzRxKeyStateIDLE);
if(scene_manager_search_and_switch_to_previous_scene(
subghz->scene_manager, SubGhzSceneReadRAW)) {
} else {
scene_manager_search_and_switch_to_previous_scene(
subghz->scene_manager, SubGhzSceneStart);
}
}
return true; return true;
} }
} }

1
applications/main/subghz/scenes/subghz_scene_saved.c
View File

@@ -10,6 +10,7 @@ void subghz_scene_saved_on_enter(void* context) {
subghz_rx_key_state_set(subghz, SubGhzRxKeyStateRAWLoad); subghz_rx_key_state_set(subghz, SubGhzRxKeyStateRAWLoad);
scene_manager_next_scene(subghz->scene_manager, SubGhzSceneReadRAW); scene_manager_next_scene(subghz->scene_manager, SubGhzSceneReadRAW);
} else { } else {
subghz_rx_key_state_set(subghz, SubGhzRxKeyStateRAWLoad);
scene_manager_next_scene(subghz->scene_manager, SubGhzSceneSavedMenu); scene_manager_next_scene(subghz->scene_manager, SubGhzSceneSavedMenu);
} }
} else { } else {