Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-24 05:34:45 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix subghz double click after delete, fix rename bug, fix unirf

Browse Source
This commit is contained in:
MX
2022-10-06 15:10:08 +03:00
parent ac286dfed8
commit b61e41163b
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,7 @@ bool subghz_scene_delete_success_on_event(void* context, SceneManagerEvent event
scene_manager_next_scene(subghz->scene_manager, SubGhzSceneReadRAW); scene_manager_next_scene(subghz->scene_manager, SubGhzSceneReadRAW);
} else if(scene_manager_search_and_switch_to_previous_scene( } else if(scene_manager_search_and_switch_to_previous_scene(
subghz->scene_manager, SubGhzSceneSaved)) { subghz->scene_manager, SubGhzSceneSaved)) {
scene_manager_next_scene(subghz->scene_manager, SubGhzSceneSaved); //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);

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

@@ -47,6 +47,7 @@ void subghz_scene_save_name_on_enter(void* context) {
//highlighting the entire filename by default //highlighting the entire filename by default
dev_name_empty = true; dev_name_empty = true;
} else { } else {
furi_string_reset(subghz->file_path_tmp);
furi_string_set(subghz->file_path_tmp, subghz->file_path); furi_string_set(subghz->file_path_tmp, subghz->file_path);
path_extract_dirname(furi_string_get_cstr(subghz->file_path), dir_name); path_extract_dirname(furi_string_get_cstr(subghz->file_path), dir_name);
path_extract_filename(subghz->file_path, file_name, true); path_extract_filename(subghz->file_path, file_name, true);
@@ -84,7 +85,7 @@ void subghz_scene_save_name_on_enter(void* context) {
bool subghz_scene_save_name_on_event(void* context, SceneManagerEvent event) { bool subghz_scene_save_name_on_event(void* context, SceneManagerEvent event) {
SubGhz* subghz = context; SubGhz* subghz = context;
if(event.type == SceneManagerEventTypeBack) { if(event.type == SceneManagerEventTypeBack) {
if(!strcmp(subghz->file_name_tmp, "") || if(!(strcmp(subghz->file_name_tmp, "") == 0) ||
scene_manager_get_scene_state(subghz->scene_manager, SubGhzSceneReadRAW) != scene_manager_get_scene_state(subghz->scene_manager, SubGhzSceneReadRAW) !=
SubGhzCustomEventManagerNoSet) { SubGhzCustomEventManagerNoSet) {
furi_string_set(subghz->file_path, subghz->file_path_tmp); furi_string_set(subghz->file_path, subghz->file_path_tmp);

10
applications/main/unirfremix/unirfremix_app.c
View File

@@ -994,7 +994,7 @@ int32_t unirfremix_app(void* p) {
if(app->up_enabled) { if(app->up_enabled) {
if(app->processing == 0) { if(app->processing == 0) {
furi_string_reset(app->signal); furi_string_reset(app->signal);
app->signal = app->up_file; furi_string_set(app->signal, app->up_file);
app->button = 1; app->button = 1;
app->processing = 1; app->processing = 1;
} }
@@ -1012,7 +1012,7 @@ int32_t unirfremix_app(void* p) {
if(app->down_enabled) { if(app->down_enabled) {
if(app->processing == 0) { if(app->processing == 0) {
furi_string_reset(app->signal); furi_string_reset(app->signal);
app->signal = app->down_file; furi_string_set(app->signal, app->down_file);
app->button = 2; app->button = 2;
app->processing = 1; app->processing = 1;
} }
@@ -1030,7 +1030,7 @@ int32_t unirfremix_app(void* p) {
if(app->right_enabled) { if(app->right_enabled) {
if(app->processing == 0) { if(app->processing == 0) {
furi_string_reset(app->signal); furi_string_reset(app->signal);
app->signal = app->right_file; furi_string_set(app->signal, app->right_file);
app->button = 3; app->button = 3;
app->processing = 1; app->processing = 1;
} }
@@ -1048,7 +1048,7 @@ int32_t unirfremix_app(void* p) {
if(app->left_enabled) { if(app->left_enabled) {
if(app->processing == 0) { if(app->processing == 0) {
furi_string_reset(app->signal); furi_string_reset(app->signal);
app->signal = app->left_file; furi_string_set(app->signal, app->left_file);
app->button = 4; app->button = 4;
app->processing = 1; app->processing = 1;
} }
@@ -1066,7 +1066,7 @@ int32_t unirfremix_app(void* p) {
if(app->ok_enabled) { if(app->ok_enabled) {
if(app->processing == 0) { if(app->processing == 0) {
furi_string_reset(app->signal); furi_string_reset(app->signal);
app->signal = app->ok_file; furi_string_set(app->signal, app->ok_file);
app->button = 5; app->button = 5;
app->processing = 1; app->processing = 1;
} }