DarkFlippers/unleashed-firmware
1
1
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2024-12-22 21:01:40 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #437 from gid9798/using_scene_manager

Browse Source 
Using scene manager function
This commit is contained in:
MX 2023-04-23 01:14:11 +03:00 committed by GitHub
commit f693d4a8de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
applications/main/subghz/scenes/subghz_scene_save_name.c
View File

@ -62,7 +62,8 @@ void subghz_scene_save_name_on_enter(void* context) {
if(subghz->txrx->decoder_result != 0x0) { if(subghz->txrx->decoder_result != 0x0) {
if(subghz->txrx->decoder_result != NULL) { if(subghz->txrx->decoder_result != NULL) {
if(strlen(subghz->txrx->decoder_result->protocol->name) != 0) { if(strlen(subghz->txrx->decoder_result->protocol->name) != 0) {
if(subghz->from_add_manually) { if(scene_manager_has_previous_scene(
subghz->scene_manager, SubGhzSceneSetType)) {
subghz_scene_save_name_get_timefilename(file_name, "S", true); subghz_scene_save_name_get_timefilename(file_name, "S", true);
} else { } else {
subghz_scene_save_name_get_timefilename( subghz_scene_save_name_get_timefilename(
@ -198,8 +199,6 @@ bool subghz_scene_save_name_on_event(void* context, SceneManagerEvent event) {
void subghz_scene_save_name_on_exit(void* context) { void subghz_scene_save_name_on_exit(void* context) {
SubGhz* subghz = context; SubGhz* subghz = context;
subghz->from_add_manually = false;
// Clear validator // Clear validator
void* validator_context = text_input_get_validator_callback_context(subghz->text_input); void* validator_context = text_input_get_validator_callback_context(subghz->text_input);
text_input_set_validator(subghz->text_input, NULL, NULL); text_input_set_validator(subghz->text_input, NULL, NULL);

2
applications/main/subghz/scenes/subghz_scene_set_type.c
View File

@ -105,8 +105,6 @@ void subghz_scene_set_type_submenu_callback(void* context, uint32_t index) {
void subghz_scene_set_type_on_enter(void* context) { void subghz_scene_set_type_on_enter(void* context) {
SubGhz* subghz = context; SubGhz* subghz = context;
subghz->from_add_manually = true;
submenu_add_item( submenu_add_item(
subghz->submenu, subghz->submenu,
"Faac SLH 868MHz", "Faac SLH 868MHz",

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

@ -72,7 +72,6 @@ SubGhz* subghz_alloc(bool alloc_for_tx_only) {
subghz->in_decoder_scene = false; subghz->in_decoder_scene = false;
subghz->in_decoder_scene_skip = false; subghz->in_decoder_scene_skip = false;
subghz->from_add_manually = false;
// View Dispatcher // View Dispatcher
subghz->view_dispatcher = view_dispatcher_alloc(); subghz->view_dispatcher = view_dispatcher_alloc();

1
applications/main/subghz/subghz_i.h
View File

@ -127,7 +127,6 @@ struct SubGhz {
bool in_decoder_scene; bool in_decoder_scene;
bool in_decoder_scene_skip; bool in_decoder_scene_skip;
bool from_add_manually;
SubGhzDecodeRawState decode_raw_state; SubGhzDecodeRawState decode_raw_state;
SubGhzFileEncoderWorker* decode_raw_file_worker_encoder; SubGhzFileEncoderWorker* decode_raw_file_worker_encoder;