liz/flipperzero-firmware
liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FL-2168] SubGhz: fix auto highlight name when saving RAW (#984)

Browse Source
This commit is contained in:
Skorpionm 2022-02-08 22:41:10 +04:00 committed by GitHub
parent 3f6deecdae
commit b71f3c6323
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
applications/subghz/helpers/subghz_custom_event.h
View File

@ -3,6 +3,7 @@
typedef enum { typedef enum {
SubghzCustomEventManagerNoSet = 0, SubghzCustomEventManagerNoSet = 0,
SubghzCustomEventManagerSet, SubghzCustomEventManagerSet,
SubghzCustomEventManagerSetRAW,
SubghzCustomEventSceneDeleteSuccess = 100, SubghzCustomEventSceneDeleteSuccess = 100,
SubghzCustomEventSceneDelete, SubghzCustomEventSceneDelete,

2
applications/subghz/scenes/subghz_scene_read_raw.c
View File

@ -261,7 +261,7 @@ bool subghz_scene_read_raw_on_event(void* context, SceneManagerEvent event) {
case SubghzCustomEventViewReadRAWSave: case SubghzCustomEventViewReadRAWSave:
if(subghz_scene_read_raw_update_filename(subghz)) { if(subghz_scene_read_raw_update_filename(subghz)) {
scene_manager_set_scene_state( scene_manager_set_scene_state(
subghz->scene_manager, SubGhzSceneReadRAW, SubghzCustomEventManagerSet); subghz->scene_manager, SubGhzSceneReadRAW, SubghzCustomEventManagerSetRAW);
subghz->txrx->rx_key_state = SubGhzRxKeyStateBack; subghz->txrx->rx_key_state = SubGhzRxKeyStateBack;
scene_manager_next_scene(subghz->scene_manager, SubGhzSceneSaveName); scene_manager_next_scene(subghz->scene_manager, SubGhzSceneSaveName);
} }

12
applications/subghz/scenes/subghz_scene_save_name.c
View File

@ -23,9 +23,13 @@ void subghz_scene_save_name_on_enter(void* context) {
dev_name_empty = true; dev_name_empty = true;
} else { } else {
strcpy(subghz->file_name_tmp, subghz->file_name); strcpy(subghz->file_name_tmp, subghz->file_name);
if(scene_manager_get_scene_state(subghz->scene_manager, SubGhzSceneReadRAW) == if(scene_manager_get_scene_state(subghz->scene_manager, SubGhzSceneReadRAW) !=
SubghzCustomEventManagerSet) { SubghzCustomEventManagerNoSet) {
subghz_get_next_name_file(subghz); subghz_get_next_name_file(subghz);
if(scene_manager_get_scene_state(subghz->scene_manager, SubGhzSceneReadRAW) ==
SubghzCustomEventManagerSetRAW) {
dev_name_empty = true;
}
} }
} }
@ -62,8 +66,8 @@ bool subghz_scene_save_name_on_event(void* context, SceneManagerEvent event) {
subghz_save_protocol_to_file(subghz, subghz->file_name); subghz_save_protocol_to_file(subghz, subghz->file_name);
} }
if(scene_manager_get_scene_state(subghz->scene_manager, SubGhzSceneReadRAW) == if(scene_manager_get_scene_state(subghz->scene_manager, SubGhzSceneReadRAW) !=
SubghzCustomEventManagerSet) { SubghzCustomEventManagerNoSet) {
subghz_protocol_raw_set_last_file_name( subghz_protocol_raw_set_last_file_name(
(SubGhzProtocolRAW*)subghz->txrx->protocol_result, subghz->file_name); (SubGhzProtocolRAW*)subghz->txrx->protocol_result, subghz->file_name);
scene_manager_set_scene_state( scene_manager_set_scene_state(