Update multi fuzzer and subghz remote

applications/external/subghz_remote/application.fam

@@ -6,5 +6,6 @@ App(
     stack_size=2 * 1024,
     order=11,
     fap_icon="subrem_10px.png",
+    fap_description="SubGhz Remote, uses up to 5 .sub files",
     fap_category="Sub-GHz",
 )

applications/external/subghz_remote/helpers/subrem_custom_event.h

@@ -1,13 +1,27 @@
 #pragma once
 
+typedef enum {
+    SubRemEditMenuStateUP = 0,
+    SubRemEditMenuStateDOWN,
+    SubRemEditMenuStateLEFT,
+    SubRemEditMenuStateRIGHT,
+    SubRemEditMenuStateOK,
+} SubRemEditMenuState;
+
 typedef enum {
     // StartSubmenuIndex
     SubmenuIndexSubRemOpenMapFile = 0,
+    SubmenuIndexSubRemEditMapFile,
+    SubmenuIndexSubRemNewMapFile,
 #if FURI_DEBUG
     SubmenuIndexSubRemRemoteView,
 #endif
     // SubmenuIndexSubRemAbout,
 
+    // EditSubmenuIndex
+    EditSubmenuIndexEditLabel,
+    EditSubmenuIndexEditFile,
+
     // SubRemCustomEvent
     SubRemCustomEventViewRemoteStartUP = 100,
     SubRemCustomEventViewRemoteStartDOWN,
@@ -17,4 +31,21 @@ typedef enum {
     SubRemCustomEventViewRemoteBack,
     SubRemCustomEventViewRemoteStop,
     SubRemCustomEventViewRemoteForcedStop,
+
+    SubRemCustomEventViewEditMenuBack,
+    SubRemCustomEventViewEditMenuUP,
+    SubRemCustomEventViewEditMenuDOWN,
+    SubRemCustomEventViewEditMenuEdit,
+    SubRemCustomEventViewEditMenuSave,
+
+    SubRemCustomEventSceneEditsubmenu,
+    SubRemCustomEventSceneEditLabelInputDone,
+    SubRemCustomEventSceneEditLabelWidgetAcces,
+    SubRemCustomEventSceneEditLabelWidgetBack,
+
+    SubRemCustomEventSceneEditOpenSubErrorPopup,
+
+    SubRemCustomEventSceneEditPreviewSaved,
+
+    SubRemCustomEventSceneNewName,
 } SubRemCustomEvent;

applications/external/subghz_remote/helpers/subrem_types.h

@@ -18,7 +18,11 @@ typedef enum {
 
 typedef enum {
     SubRemViewIDSubmenu,
+    SubRemViewIDWidget,
+    SubRemViewIDPopup,
+    SubRemViewIDTextInput,
     SubRemViewIDRemote,
+    SubRemViewIDEditMenu,
 } SubRemViewID;
 
 typedef enum {

applications/external/subghz_remote/scenes/subrem_scene_config.h

@@ -1,5 +1,9 @@
-#ifndef SUBREM_LIGHT
 ADD_SCENE(subrem, start, Start)
-#endif
 ADD_SCENE(subrem, open_map_file, OpenMapFile)
-ADD_SCENE(subrem, remote, Remote)
+ADD_SCENE(subrem, remote, Remote)
+ADD_SCENE(subrem, edit_menu, EditMenu)
+ADD_SCENE(subrem, edit_submenu, EditSubMenu)
+ADD_SCENE(subrem, edit_label, EditLabel)
+ADD_SCENE(subrem, open_sub_file, OpenSubFile)
+ADD_SCENE(subrem, edit_preview, EditPreview)
+ADD_SCENE(subrem, enter_new_name, EnterNewName)

applications/external/subghz_remote/scenes/subrem_scene_edit_label.c

@@ -0,0 +1,133 @@
+#include "../subghz_remote_app_i.h"
+
+#include <lib/toolbox/path.h>
+
+typedef enum {
+    SubRemSceneEditLabelStateTextInput,
+    SubRemSceneEditLabelStateWidget,
+} SubRemSceneEditLabelState;
+
+void subrem_scene_edit_label_text_input_callback(void* context) {
+    furi_assert(context);
+    SubGhzRemoteApp* app = context;
+    view_dispatcher_send_custom_event(
+        app->view_dispatcher, SubRemCustomEventSceneEditLabelInputDone);
+}
+
+void subrem_scene_edit_label_widget_callback(GuiButtonType result, InputType type, void* context) {
+    furi_assert(context);
+    SubGhzRemoteApp* app = context;
+    if((result == GuiButtonTypeCenter) && (type == InputTypeShort)) {
+        view_dispatcher_send_custom_event(
+            app->view_dispatcher, SubRemCustomEventSceneEditLabelWidgetAcces);
+    } else if((result == GuiButtonTypeLeft) && (type == InputTypeShort)) {
+        view_dispatcher_send_custom_event(
+            app->view_dispatcher, SubRemCustomEventSceneEditLabelWidgetBack);
+    }
+}
+
+void subrem_scene_edit_label_on_enter(void* context) {
+    SubGhzRemoteApp* app = context;
+
+    SubRemSubFilePreset* sub_preset = app->map_preset->subs_preset[app->chusen_sub];
+
+    FuriString* temp_str = furi_string_alloc();
+
+    if(furi_string_empty(sub_preset->label)) {
+        if(furi_string_empty(sub_preset->file_path)) {
+            path_extract_filename(sub_preset->file_path, temp_str, true);
+            strcpy(app->file_name_tmp, furi_string_get_cstr(temp_str));
+        } else {
+            strcpy(app->file_name_tmp, "");
+        }
+    } else {
+        strcpy(app->file_name_tmp, furi_string_get_cstr(sub_preset->label));
+    }
+
+    TextInput* text_input = app->text_input;
+    text_input_set_header_text(text_input, "Label name");
+    text_input_set_result_callback(
+        text_input,
+        subrem_scene_edit_label_text_input_callback,
+        app,
+        app->file_name_tmp,
+        25,
+        false);
+
+    text_input_set_minimum_length(app->text_input, 0);
+
+    widget_add_string_element(
+        app->widget, 63, 12, AlignCenter, AlignCenter, FontPrimary, "Empty Label Name");
+    widget_add_string_element(
+        app->widget, 63, 32, AlignCenter, AlignCenter, FontSecondary, "Continue?");
+
+    widget_add_button_element(
+        app->widget, GuiButtonTypeCenter, "Ok", subrem_scene_edit_label_widget_callback, app);
+    widget_add_button_element(
+        app->widget, GuiButtonTypeLeft, "Back", subrem_scene_edit_label_widget_callback, app);
+
+    scene_manager_set_scene_state(
+        app->scene_manager, SubRemSceneEditLabel, SubRemSceneEditLabelStateTextInput);
+    view_dispatcher_switch_to_view(app->view_dispatcher, SubRemViewIDTextInput);
+
+    furi_string_free(temp_str);
+}
+
+bool subrem_scene_edit_label_on_event(void* context, SceneManagerEvent event) {
+    SubGhzRemoteApp* app = context;
+
+    FuriString* label = app->map_preset->subs_preset[app->chusen_sub]->label;
+
+    if(event.type == SceneManagerEventTypeBack) {
+        if(scene_manager_get_scene_state(app->scene_manager, SubRemSceneEditLabel) ==
+           SubRemSceneEditLabelStateWidget) {
+            scene_manager_set_scene_state(
+                app->scene_manager, SubRemSceneEditLabel, SubRemSceneEditLabelStateTextInput);
+            view_dispatcher_switch_to_view(app->view_dispatcher, SubRemViewIDTextInput);
+            return true;
+        } else if(
+            scene_manager_get_scene_state(app->scene_manager, SubRemSceneEditLabel) ==
+            SubRemSceneEditLabelStateTextInput) {
+            scene_manager_previous_scene(app->scene_manager);
+            return true;
+        }
+
+        scene_manager_previous_scene(app->scene_manager);
+        return true;
+    } else if(event.type == SceneManagerEventTypeCustom) {
+        if(event.event == SubRemCustomEventSceneEditLabelInputDone) {
+            if(strcmp(app->file_name_tmp, "") == 0) {
+                scene_manager_set_scene_state(
+                    app->scene_manager, SubRemSceneEditLabel, SubRemSceneEditLabelStateWidget);
+                view_dispatcher_switch_to_view(app->view_dispatcher, SubRemViewIDWidget);
+
+            } else {
+                furi_string_set(label, app->file_name_tmp);
+                app->map_not_saved = true;
+                scene_manager_previous_scene(app->scene_manager);
+            }
+            return true;
+        } else if(event.event == SubRemCustomEventSceneEditLabelWidgetAcces) {
+            furi_string_set(label, app->file_name_tmp);
+            app->map_not_saved = true;
+            scene_manager_previous_scene(app->scene_manager);
+
+            return true;
+        } else if(event.event == SubRemCustomEventSceneEditLabelWidgetBack) {
+            scene_manager_set_scene_state(
+                app->scene_manager, SubRemSceneEditLabel, SubRemSceneEditLabelStateTextInput);
+            view_dispatcher_switch_to_view(app->view_dispatcher, SubRemViewIDTextInput);
+
+            return true;
+        }
+    }
+    return false;
+}
+
+void subrem_scene_edit_label_on_exit(void* context) {
+    SubGhzRemoteApp* app = context;
+
+    // Clear view
+    text_input_reset(app->text_input);
+    widget_reset(app->widget);
+}

applications/external/subghz_remote/scenes/subrem_scene_edit_menu.c

@@ -0,0 +1,123 @@
+#include "../subghz_remote_app_i.h"
+
+void subrem_scene_edit_menu_callback(SubRemCustomEvent event, void* context) {
+    furi_assert(context);
+    SubGhzRemoteApp* app = context;
+    view_dispatcher_send_custom_event(app->view_dispatcher, event);
+}
+
+void subrem_scene_edit_menu_widget_callback(GuiButtonType result, InputType type, void* context) {
+    furi_assert(context);
+    SubGhzRemoteApp* app = context;
+    if((result == GuiButtonTypeRight) && (type == InputTypeShort)) {
+        app->map_not_saved = false;
+        view_dispatcher_send_custom_event(app->view_dispatcher, SubRemCustomEventViewEditMenuBack);
+    } else if((result == GuiButtonTypeLeft) && (type == InputTypeShort)) {
+        view_dispatcher_switch_to_view(app->view_dispatcher, SubRemViewIDEditMenu);
+    }
+}
+
+static uint8_t subrem_scene_edit_menu_state_to_index(SubRemEditMenuState event_id) {
+    uint8_t ret = 0;
+
+    if(event_id == SubRemEditMenuStateUP) {
+        ret = SubRemSubKeyNameUp;
+    } else if(event_id == SubRemEditMenuStateDOWN) {
+        ret = SubRemSubKeyNameDown;
+    } else if(event_id == SubRemEditMenuStateLEFT) {
+        ret = SubRemSubKeyNameLeft;
+    } else if(event_id == SubRemEditMenuStateRIGHT) {
+        ret = SubRemSubKeyNameRight;
+    } else if(event_id == SubRemEditMenuStateOK) {
+        ret = SubRemSubKeyNameOk;
+    }
+
+    return ret;
+}
+
+static void subrem_scene_edit_menu_update_data(SubGhzRemoteApp* app) {
+    furi_assert(app);
+    uint8_t index = subrem_scene_edit_menu_state_to_index(
+        scene_manager_get_scene_state(app->scene_manager, SubRemSceneEditMenu));
+
+    subrem_view_edit_menu_add_data_to_show(
+        app->subrem_edit_menu,
+        index,
+        app->map_preset->subs_preset[index]->label,
+        app->map_preset->subs_preset[index]->file_path,
+        app->map_preset->subs_preset[index]->load_state);
+}
+
+void subrem_scene_edit_menu_on_enter(void* context) {
+    SubGhzRemoteApp* app = context;
+
+    subrem_view_edit_menu_set_callback(
+        app->subrem_edit_menu, subrem_scene_edit_menu_callback, app);
+
+    subrem_scene_edit_menu_update_data(app);
+
+    view_dispatcher_switch_to_view(app->view_dispatcher, SubRemViewIDEditMenu);
+
+    Widget* widget = app->widget;
+
+    widget_add_string_element(
+        widget, 63, 12, AlignCenter, AlignBottom, FontPrimary, "Changes are not saved");
+    widget_add_string_element(
+        widget, 63, 32, AlignCenter, AlignBottom, FontPrimary, "do you want to exit?");
+
+    widget_add_button_element(
+        widget, GuiButtonTypeRight, "Yes", subrem_scene_edit_menu_widget_callback, app);
+    widget_add_button_element(
+        widget, GuiButtonTypeLeft, "No", subrem_scene_edit_menu_widget_callback, app);
+}
+
+bool subrem_scene_edit_menu_on_event(void* context, SceneManagerEvent event) {
+    SubGhzRemoteApp* app = context;
+
+    if(event.type == SceneManagerEventTypeBack) {
+        // Catch widget backEvent
+        return true;
+    }
+
+    if(event.type == SceneManagerEventTypeCustom) {
+        if(event.event == SubRemCustomEventViewEditMenuBack) {
+            if(app->map_not_saved) {
+                view_dispatcher_switch_to_view(app->view_dispatcher, SubRemViewIDWidget);
+            } else if(!scene_manager_search_and_switch_to_previous_scene(
+                          app->scene_manager, SubRemSceneStart)) {
+                scene_manager_stop(app->scene_manager);
+                view_dispatcher_stop(app->view_dispatcher);
+            }
+
+            return true;
+        } else if(
+            event.event == SubRemCustomEventViewEditMenuUP ||
+            event.event == SubRemCustomEventViewEditMenuDOWN) {
+            scene_manager_set_scene_state(
+                app->scene_manager,
+                SubRemSceneEditMenu,
+                subrem_view_edit_menu_get_index(app->subrem_edit_menu));
+            subrem_scene_edit_menu_update_data(app);
+
+            return true;
+        } else if(event.event == SubRemCustomEventViewEditMenuEdit) {
+            app->chusen_sub = subrem_view_edit_menu_get_index(app->subrem_edit_menu);
+            scene_manager_set_scene_state(
+                app->scene_manager, SubRemSceneEditSubMenu, EditSubmenuIndexEditLabel);
+            scene_manager_next_scene(app->scene_manager, SubRemSceneEditSubMenu);
+
+            return true;
+        } else if(event.event == SubRemCustomEventViewEditMenuSave) {
+            scene_manager_next_scene(app->scene_manager, SubRemSceneEditPreview);
+
+            return true;
+        }
+    }
+
+    return false;
+}
+
+void subrem_scene_edit_menu_on_exit(void* context) {
+    SubGhzRemoteApp* app = context;
+    widget_reset(app->widget);
+}

applications/external/subghz_remote/scenes/subrem_scene_edit_preview.c

@@ -0,0 +1,74 @@
+#include "../subghz_remote_app_i.h"
+#include "../views/remote.h"
+
+#define TAG "SubRemScenRemote"
+
+void subghz_scene_edit_preview_save_popup_callback(void* context) {
+    SubGhzRemoteApp* app = context;
+    view_dispatcher_send_custom_event(
+        app->view_dispatcher, SubRemCustomEventSceneEditPreviewSaved);
+}
+
+void subrem_scene_edit_preview_callback(SubRemCustomEvent event, void* context) {
+    furi_assert(context);
+    SubGhzRemoteApp* app = context;
+    view_dispatcher_send_custom_event(app->view_dispatcher, event);
+}
+
+void subrem_scene_edit_preview_on_enter(void* context) {
+    SubGhzRemoteApp* app = context;
+
+    // Setup view
+    Popup* popup = app->popup;
+    popup_set_icon(popup, 32, 5, &I_DolphinNice_96x59);
+    popup_set_header(popup, "Saved!", 13, 22, AlignLeft, AlignBottom);
+    popup_set_timeout(popup, 1500);
+    popup_set_context(popup, app);
+    popup_set_callback(popup, subghz_scene_edit_preview_save_popup_callback);
+    popup_enable_timeout(popup);
+
+    subrem_view_remote_update_data_labels(app->subrem_remote_view, app->map_preset->subs_preset);
+    subrem_view_remote_set_state(app->subrem_remote_view, SubRemViewRemoteStateOFF, 0);
+
+    subrem_view_remote_set_callback(
+        app->subrem_remote_view, subrem_scene_edit_preview_callback, app);
+
+    view_dispatcher_switch_to_view(app->view_dispatcher, SubRemViewIDRemote);
+}
+
+bool subrem_scene_edit_preview_on_event(void* context, SceneManagerEvent event) {
+    SubGhzRemoteApp* app = context;
+
+    if(event.type == SceneManagerEventTypeBack ||
+       (event.type == SceneManagerEventTypeCustom &&
+        (event.event == SubRemCustomEventViewRemoteStartLEFT ||
+         event.event == SubRemCustomEventViewRemoteForcedStop))) {
+        scene_manager_previous_scene(app->scene_manager);
+        return true;
+    } else if(
+        event.type == SceneManagerEventTypeCustom &&
+        (event.event == SubRemCustomEventViewRemoteStartRIGHT ||
+         event.event == SubRemCustomEventViewRemoteStartOK)) {
+        if(subrem_save_map_to_file(app)) {
+            view_dispatcher_switch_to_view(app->view_dispatcher, SubRemViewIDPopup);
+            app->map_not_saved = false;
+            return true;
+        }
+        // TODO error screen
+        return true;
+    } else if(
+        event.type == SceneManagerEventTypeCustom &&
+        event.event == SubRemCustomEventSceneEditPreviewSaved) {
+        scene_manager_search_and_switch_to_previous_scene(app->scene_manager, SubRemSceneEditMenu);
+    }
+    // } else if(event.type == SceneManagerEventTypeTick) {
+    // }
+    return false;
+}
+
+void subrem_scene_edit_preview_on_exit(void* context) {
+    SubGhzRemoteApp* app = context;
+
+    subrem_view_remote_set_state(app->subrem_remote_view, SubRemViewRemoteStateIdle, 0);
+    popup_reset(app->popup);
+}

applications/external/subghz_remote/scenes/subrem_scene_edit_submenu.c

@@ -0,0 +1,54 @@
+#include "../subghz_remote_app_i.h"
+#include "../helpers/subrem_custom_event.h"
+
+void subrem_scene_edit_submenu_text_input_callback(void* context) {
+    furi_assert(context);
+    SubGhzRemoteApp* app = context;
+    view_dispatcher_send_custom_event(app->view_dispatcher, SubRemCustomEventSceneEditsubmenu);
+}
+
+void subrem_scene_edit_submenu_callback(void* context, uint32_t index) {
+    furi_assert(context);
+    SubGhzRemoteApp* app = context;
+
+    view_dispatcher_send_custom_event(app->view_dispatcher, index);
+}
+
+void subrem_scene_edit_submenu_on_enter(void* context) {
+    furi_assert(context);
+
+    SubGhzRemoteApp* app = context;
+    Submenu* submenu = app->submenu;
+    submenu_add_item(
+        submenu, "Edit Label", EditSubmenuIndexEditLabel, subrem_scene_edit_submenu_callback, app);
+    submenu_add_item(
+        submenu, "Edit File", EditSubmenuIndexEditFile, subrem_scene_edit_submenu_callback, app);
+
+    view_dispatcher_switch_to_view(app->view_dispatcher, SubRemViewIDSubmenu);
+}
+
+bool subrem_scene_edit_submenu_on_event(void* context, SceneManagerEvent event) {
+    furi_assert(context);
+
+    SubGhzRemoteApp* app = context;
+    bool consumed = false;
+
+    if(event.type == SceneManagerEventTypeCustom) {
+        if(event.event == EditSubmenuIndexEditLabel) {
+            scene_manager_next_scene(app->scene_manager, SubRemSceneEditLabel);
+            consumed = true;
+        } else if(event.event == EditSubmenuIndexEditFile) {
+            scene_manager_next_scene(app->scene_manager, SubRemSceneOpenSubFile);
+            consumed = true;
+        }
+    }
+
+    return consumed;
+}
+
+void subrem_scene_edit_submenu_on_exit(void* context) {
+    furi_assert(context);
+
+    SubGhzRemoteApp* app = context;
+    submenu_reset(app->submenu);
+}

applications/external/subghz_remote/scenes/subrem_scene_enter_new_name.c

@@ -0,0 +1,70 @@
+#include "../subghz_remote_app_i.h"
+#include "../helpers/subrem_custom_event.h"
+
+#include <gui/modules/validators.h>
+
+void subrem_scene_enter_new_name_text_input_callback(void* context) {
+    furi_assert(context);
+    SubGhzRemoteApp* app = context;
+    view_dispatcher_send_custom_event(app->view_dispatcher, SubRemCustomEventSceneNewName);
+}
+
+void subrem_scene_enter_new_name_on_enter(void* context) {
+    SubGhzRemoteApp* app = context;
+
+    // Setup view
+    TextInput* text_input = app->text_input;
+
+    //strncpy(app->file_name_tmp, "subrem_", SUBREM_MAX_LEN_NAME);
+    text_input_set_header_text(text_input, "Map file Name");
+    text_input_set_result_callback(
+        text_input,
+        subrem_scene_enter_new_name_text_input_callback,
+        app,
+        app->file_name_tmp,
+        25,
+        false);
+
+    ValidatorIsFile* validator_is_file = validator_is_file_alloc_init(
+        furi_string_get_cstr(app->file_path), SUBREM_APP_EXTENSION, "");
+    text_input_set_validator(text_input, validator_is_file_callback, validator_is_file);
+
+    view_dispatcher_switch_to_view(app->view_dispatcher, SubRemViewIDTextInput);
+}
+
+bool subrem_scene_enter_new_name_on_event(void* context, SceneManagerEvent event) {
+    furi_assert(context);
+
+    SubGhzRemoteApp* app = context;
+    bool consumed = false;
+
+    if(event.type == SceneManagerEventTypeCustom) {
+        if(event.event == SubRemCustomEventSceneNewName) {
+            if(strcmp(app->file_name_tmp, "") != 0) {
+                furi_string_set(app->file_path, SUBREM_APP_FOLDER);
+                furi_string_cat_printf(
+                    app->file_path, "/%s%s", app->file_name_tmp, SUBREM_APP_EXTENSION);
+
+                subrem_map_preset_reset(app->map_preset);
+                scene_manager_next_scene(app->scene_manager, SubRemSceneEditMenu);
+            } else { //error
+            }
+            consumed = true;
+        }
+    }
+
+    return consumed;
+}
+
+void subrem_scene_enter_new_name_on_exit(void* context) {
+    furi_assert(context);
+
+    SubGhzRemoteApp* app = context;
+    submenu_reset(app->submenu);
+
+    // Clear validator & view
+    void* validator_context = text_input_get_validator_callback_context(app->text_input);
+    text_input_set_validator(app->text_input, NULL, NULL);
+    validator_is_file_free(validator_context);
+    text_input_reset(app->text_input);
+}

applications/external/subghz_remote/scenes/subrem_scene_open_map_file.c

@@ -5,30 +5,16 @@ void subrem_scene_open_map_file_on_enter(void* context) {
     SubGhzRemoteApp* app = context;
 
     SubRemLoadMapState load_state = subrem_load_from_file(app);
+    uint32_t start_scene_state =
+        scene_manager_get_scene_state(app->scene_manager, SubRemSceneStart);
 
-    if(load_state == SubRemLoadMapStateOK || load_state == SubRemLoadMapStateNotAllOK) {
+    if(load_state == SubRemLoadMapStateBack) {
+        scene_manager_previous_scene(app->scene_manager);
+    } else if(start_scene_state == SubmenuIndexSubRemEditMapFile) {
+        scene_manager_set_scene_state(app->scene_manager, SubRemSceneEditMenu, SubRemSubKeyNameUp);
+        scene_manager_next_scene(app->scene_manager, SubRemSceneEditMenu);
+    } else if(start_scene_state == SubmenuIndexSubRemOpenMapFile) {
         scene_manager_next_scene(app->scene_manager, SubRemSceneRemote);
-    } else {
-        if(load_state != SubRemLoadMapStateBack) {
-#ifdef SUBREM_LIGHT
-            dialog_message_show_storage_error(app->dialogs, "Can't load\nMap file");
-#else
-            DialogMessage* message = dialog_message_alloc();
-
-            dialog_message_set_header(message, "Map File Error", 64, 8, AlignCenter, AlignCenter);
-            dialog_message_set_text(
-                message, "Can't load\nMap file", 64, 32, AlignCenter, AlignCenter);
-            dialog_message_set_buttons(message, "Back", NULL, NULL);
-            dialog_message_show(app->dialogs, message);
-
-            dialog_message_free(message);
-#endif
-        }
-        // TODO: Map Preset Reset
-        if(!scene_manager_previous_scene(app->scene_manager)) {
-            scene_manager_stop(app->scene_manager);
-            view_dispatcher_stop(app->view_dispatcher);
-        }
     }
 }
 

applications/external/subghz_remote/scenes/subrem_scene_open_sub_file.c

@@ -0,0 +1,118 @@
+#include "../subghz_remote_app_i.h"
+
+void subrem_scene_open_sub_file_error_popup_callback(void* context) {
+    SubGhzRemoteApp* app = context;
+    view_dispatcher_send_custom_event(
+        app->view_dispatcher, SubRemCustomEventSceneEditOpenSubErrorPopup);
+}
+
+SubRemLoadSubState subrem_scene_open_sub_file_dialog(SubGhzRemoteApp* app) {
+    furi_assert(app);
+
+    SubRemSubFilePreset* sub = app->map_preset->subs_preset[app->chusen_sub];
+
+    FuriString* temp_file_path = furi_string_alloc();
+
+    if(furi_string_empty(sub->file_path)) {
+        furi_string_set(temp_file_path, SUBGHZ_RAW_FOLDER);
+    } else {
+        furi_string_set(temp_file_path, sub->file_path);
+    }
+
+    SubRemLoadSubState ret = SubRemLoadSubStateNotSet;
+
+    DialogsFileBrowserOptions browser_options;
+
+    dialog_file_browser_set_basic_options(&browser_options, SUBGHZ_APP_EXTENSION, &I_sub1_10px);
+    browser_options.base_path = SUBGHZ_RAW_FOLDER;
+
+    // Input events and views are managed by file_select
+    if(!dialog_file_browser_show(app->dialogs, temp_file_path, temp_file_path, &browser_options)) {
+    } else {
+        // Check sub file
+        SubRemSubFilePreset* sub_candidate = subrem_sub_file_preset_alloc();
+        furi_string_set(sub_candidate->label, sub->label);
+        furi_string_set(sub_candidate->file_path, temp_file_path);
+
+        Storage* storage = furi_record_open(RECORD_STORAGE);
+        FlipperFormat* fff_file = flipper_format_file_alloc(storage);
+
+        if(flipper_format_file_open_existing(
+               fff_file, furi_string_get_cstr(sub_candidate->file_path))) {
+            ret = subrem_sub_preset_load(sub_candidate, app->txrx, fff_file);
+        }
+
+        flipper_format_file_close(fff_file);
+        flipper_format_free(fff_file);
+        furi_record_close(RECORD_STORAGE);
+
+        if(ret == SubRemLoadSubStateOK) {
+            subrem_sub_file_preset_free(app->map_preset->subs_preset[app->chusen_sub]);
+            app->map_preset->subs_preset[app->chusen_sub] = sub_candidate;
+            app->map_not_saved = true;
+        } else {
+            subrem_sub_file_preset_free(sub_candidate);
+        }
+    }
+
+    furi_string_free(temp_file_path);
+
+    return ret;
+}
+
+void subrem_scene_open_sub_file_on_enter(void* context) {
+    furi_assert(context);
+    SubGhzRemoteApp* app = context;
+
+    SubRemLoadSubState load_state = subrem_scene_open_sub_file_dialog(app);
+
+    Popup* popup = app->popup;
+    // popup_set_icon();
+    popup_set_header(popup, "ERROR", 63, 16, AlignCenter, AlignBottom);
+    popup_set_timeout(popup, 1500);
+    popup_set_context(popup, app);
+    popup_set_callback(popup, subrem_scene_open_sub_file_error_popup_callback);
+    popup_enable_timeout(popup);
+
+    if(load_state == SubRemLoadSubStateOK) {
+        scene_manager_previous_scene(app->scene_manager);
+    } else if(load_state == SubRemLoadSubStateNotSet) {
+        scene_manager_previous_scene(app->scene_manager);
+    } else {
+        switch(load_state) {
+        case SubRemLoadSubStateErrorFreq:
+
+            popup_set_text(popup, "Bad frequency", 63, 30, AlignCenter, AlignBottom);
+            break;
+        case SubRemLoadSubStateErrorMod:
+
+            popup_set_text(popup, "Bad modulation", 63, 30, AlignCenter, AlignBottom);
+            break;
+        case SubRemLoadSubStateErrorProtocol:
+
+            popup_set_text(popup, "Unsupported protocol", 63, 30, AlignCenter, AlignBottom);
+            break;
+
+        default:
+            break;
+        }
+        view_dispatcher_switch_to_view(app->view_dispatcher, SubRemViewIDPopup);
+    }
+}
+
+bool subrem_scene_open_sub_file_on_event(void* context, SceneManagerEvent event) {
+    SubGhzRemoteApp* app = context;
+
+    if(event.type == SceneManagerEventTypeCustom &&
+       event.event == SubRemCustomEventSceneEditOpenSubErrorPopup) {
+        scene_manager_previous_scene(app->scene_manager);
+        return true;
+    }
+    return false;
+}
+
+void subrem_scene_open_sub_file_on_exit(void* context) {
+    SubGhzRemoteApp* app = context;
+
+    popup_reset(app->popup);
+}

applications/external/subghz_remote/scenes/subrem_scene_remote.c

@@ -39,6 +39,9 @@ void subrem_scene_remote_on_enter(void* context) {
     SubGhzRemoteApp* app = context;
 
     subrem_view_remote_update_data_labels(app->subrem_remote_view, app->map_preset->subs_preset);
+    subrem_view_remote_set_radio(
+        app->subrem_remote_view,
+        subghz_txrx_radio_device_get(app->txrx) != SubGhzRadioDeviceTypeInternal);
 
     subrem_view_remote_set_callback(app->subrem_remote_view, subrem_scene_remote_callback, app);
 

applications/external/subghz_remote/scenes/subrem_scene_start.c

@@ -27,16 +27,28 @@ void subrem_scene_start_on_enter(void* context) {
         subrem_scene_start_submenu_callback,
         app);
 #endif
+    submenu_add_item(
+        submenu,
+        "Edit Map File",
+        SubmenuIndexSubRemEditMapFile,
+        subrem_scene_start_submenu_callback,
+        app);
+    submenu_add_item(
+        submenu,
+        "New Map File",
+        SubmenuIndexSubRemNewMapFile,
+        subrem_scene_start_submenu_callback,
+        app);
     // submenu_add_item(
     //     submenu,
     //     "About",
     //     SubmenuIndexSubGhzRemoteAbout,
     //     subrem_scene_start_submenu_callback,
     //     app);
-#ifndef SUBREM_LIGHT
+
     submenu_set_selected_item(
         submenu, scene_manager_get_scene_state(app->scene_manager, SubRemSceneStart));
-#endif
+
     view_dispatcher_switch_to_view(app->view_dispatcher, SubRemViewIDSubmenu);
 }
 
@@ -48,23 +60,33 @@ bool subrem_scene_start_on_event(void* context, SceneManagerEvent event) {
 
     if(event.type == SceneManagerEventTypeCustom) {
         if(event.event == SubmenuIndexSubRemOpenMapFile) {
-#ifndef SUBREM_LIGHT
             scene_manager_set_scene_state(
                 app->scene_manager, SubRemSceneStart, SubmenuIndexSubRemOpenMapFile);
-#endif
+
             scene_manager_next_scene(app->scene_manager, SubRemSceneOpenMapFile);
             consumed = true;
         }
-        // } else if(event.event == SubmenuIndexSubRemAbout) {
-        //     scene_manager_next_scene(app->scene_manager, SubRemSceneAbout);
-        //     consumed = true;
-        // }
 #if FURI_DEBUG
         else if(event.event == SubmenuIndexSubRemRemoteView) {
             scene_manager_next_scene(app->scene_manager, SubRemSceneRemote);
             consumed = true;
         }
 #endif
+        else if(event.event == SubmenuIndexSubRemEditMapFile) {
+            scene_manager_set_scene_state(
+                app->scene_manager, SubRemSceneStart, SubmenuIndexSubRemEditMapFile);
+            scene_manager_next_scene(app->scene_manager, SubRemSceneOpenMapFile);
+            consumed = true;
+        } else if(event.event == SubmenuIndexSubRemNewMapFile) {
+            scene_manager_set_scene_state(
+                app->scene_manager, SubRemSceneStart, SubmenuIndexSubRemNewMapFile);
+            scene_manager_next_scene(app->scene_manager, SubRemSceneEnterNewName);
+            consumed = true;
+        }
+        // } else if(event.event == SubmenuIndexSubRemAbout) {
+        //     scene_manager_next_scene(app->scene_manager, SubRemSceneAbout);
+        //     consumed = true;
+        // }
     }
 
     return consumed;

applications/external/subghz_remote/subghz_remote_app.c

@@ -1,5 +1,4 @@
 #include "subghz_remote_app_i.h"
-#include <dolphin/dolphin.h>
 
 static bool subghz_remote_app_custom_event_callback(void* context, uint32_t event) {
     furi_assert(context);
@@ -19,26 +18,23 @@ static void subghz_remote_app_tick_event_callback(void* context) {
     scene_manager_handle_tick_event(app->scene_manager);
 }
 
-SubGhzRemoteApp* subghz_remote_app_alloc(char* p) {
-    SubGhzRemoteApp* app = malloc(sizeof(SubGhzRemoteApp));
+static void subghz_remote_make_app_folder(SubGhzRemoteApp* app) {
+    furi_assert(app);
 
     Storage* storage = furi_record_open(RECORD_STORAGE);
+
+    // Migrate old users data
     storage_common_migrate(storage, EXT_PATH("unirf"), SUBREM_APP_FOLDER);
-    storage_common_migrate(storage, EXT_PATH("subghz/unirf"), SUBREM_APP_FOLDER);
 
     if(!storage_simply_mkdir(storage, SUBREM_APP_FOLDER)) {
-        //FURI_LOG_E(TAG, "Could not create folder %s", SUBREM_APP_FOLDER);
+        // FURI_LOG_E(TAG, "Could not create folder %s", SUBREM_APP_FOLDER);
+        dialog_message_show_storage_error(app->dialogs, "Cannot create\napp folder");
     }
     furi_record_close(RECORD_STORAGE);
+}
 
-    // // Enable power for External CC1101 if it is connected
-    // furi_hal_subghz_enable_ext_power();
-    // // Auto switch to internal radio if external radio is not available
-    // furi_delay_ms(15);
-    // if(!furi_hal_subghz_check_radio()) {
-    //     furi_hal_subghz_select_radio_type(SubGhzRadioInternal);
-    //     furi_hal_subghz_init_radio_type(SubGhzRadioInternal);
-    // }
+SubGhzRemoteApp* subghz_remote_app_alloc() {
+    SubGhzRemoteApp* app = malloc(sizeof(SubGhzRemoteApp));
 
     furi_hal_power_suppress_charge_enter();
 
@@ -75,6 +71,20 @@ SubGhzRemoteApp* subghz_remote_app_alloc(char* p) {
     // Dialog
     app->dialogs = furi_record_open(RECORD_DIALOGS);
 
+    // TextInput
+    app->text_input = text_input_alloc();
+    view_dispatcher_add_view(
+        app->view_dispatcher, SubRemViewIDTextInput, text_input_get_view(app->text_input));
+
+    // Widget
+    app->widget = widget_alloc();
+    view_dispatcher_add_view(
+        app->view_dispatcher, SubRemViewIDWidget, widget_get_view(app->widget));
+
+    // Popup
+    app->popup = popup_alloc();
+    view_dispatcher_add_view(app->view_dispatcher, SubRemViewIDPopup, popup_get_view(app->popup));
+
     // Remote view
     app->subrem_remote_view = subrem_view_remote_alloc();
     view_dispatcher_add_view(
@@ -82,6 +92,13 @@ SubGhzRemoteApp* subghz_remote_app_alloc(char* p) {
         SubRemViewIDRemote,
         subrem_view_remote_get_view(app->subrem_remote_view));
 
+    // Edit Menu view
+    app->subrem_edit_menu = subrem_view_edit_menu_alloc();
+    view_dispatcher_add_view(
+        app->view_dispatcher,
+        SubRemViewIDEditMenu,
+        subrem_view_edit_menu_get_view(app->subrem_edit_menu));
+
     app->map_preset = malloc(sizeof(SubRemMapPreset));
     for(uint8_t i = 0; i < SubRemSubKeyNameMaxCount; i++) {
         app->map_preset->subs_preset[i] = subrem_sub_file_preset_alloc();
@@ -91,19 +108,7 @@ SubGhzRemoteApp* subghz_remote_app_alloc(char* p) {
 
     subghz_txrx_set_need_save_callback(app->txrx, subrem_save_active_sub, app);
 
-    if(p && strlen(p)) {
-        furi_string_set(app->file_path, p);
-        subrem_map_file_load(app, furi_string_get_cstr(app->file_path));
-        scene_manager_next_scene(app->scene_manager, SubRemSceneRemote);
-    } else {
-#ifdef SUBREM_LIGHT
-        scene_manager_next_scene(app->scene_manager, SubRemSceneOpenMapFile);
-#else
-        scene_manager_next_scene(app->scene_manager, SubRemSceneStart);
-        scene_manager_set_scene_state(
-            app->scene_manager, SubRemSceneStart, SubmenuIndexSubRemOpenMapFile);
-#endif
-    }
+    app->map_not_saved = false;
 
     return app;
 }
@@ -113,11 +118,6 @@ void subghz_remote_app_free(SubGhzRemoteApp* app) {
 
     furi_hal_power_suppress_charge_exit();
 
-    // // Disable power for External CC1101 if it was enabled and module is connected
-    // furi_hal_subghz_disable_ext_power();
-    // // Reinit SPI handles for internal radio / nfc
-    // furi_hal_subghz_init_radio_type(SubGhzRadioInternal);
-
     // Submenu
     view_dispatcher_remove_view(app->view_dispatcher, SubRemViewIDSubmenu);
     submenu_free(app->submenu);
@@ -125,10 +125,26 @@ void subghz_remote_app_free(SubGhzRemoteApp* app) {
     // Dialog
     furi_record_close(RECORD_DIALOGS);
 
+    // TextInput
+    view_dispatcher_remove_view(app->view_dispatcher, SubRemViewIDTextInput);
+    text_input_free(app->text_input);
+
+    // Widget
+    view_dispatcher_remove_view(app->view_dispatcher, SubRemViewIDWidget);
+    widget_free(app->widget);
+
+    // Popup
+    view_dispatcher_remove_view(app->view_dispatcher, SubRemViewIDPopup);
+    popup_free(app->popup);
+
     // Remote view
     view_dispatcher_remove_view(app->view_dispatcher, SubRemViewIDRemote);
     subrem_view_remote_free(app->subrem_remote_view);
 
+    // Edit view
+    view_dispatcher_remove_view(app->view_dispatcher, SubRemViewIDEditMenu);
+    subrem_view_edit_menu_free(app->subrem_edit_menu);
+
     scene_manager_free(app->scene_manager);
     view_dispatcher_free(app->view_dispatcher);
 
@@ -152,10 +168,33 @@ void subghz_remote_app_free(SubGhzRemoteApp* app) {
     free(app);
 }
 
-int32_t subghz_remote_app(char* p) {
-    UNUSED(p);
-    dolphin_deed(DolphinDeedPluginStart);
-    SubGhzRemoteApp* subghz_remote_app = subghz_remote_app_alloc(p);
+int32_t subghz_remote_app(void* arg) {
+    SubGhzRemoteApp* subghz_remote_app = subghz_remote_app_alloc();
+
+    subghz_remote_make_app_folder(subghz_remote_app);
+
+    bool map_loaded = false;
+
+    if((arg != NULL) && (strlen(arg) != 0)) {
+        furi_string_set(subghz_remote_app->file_path, (const char*)arg);
+        SubRemLoadMapState load_state = subrem_map_file_load(
+            subghz_remote_app, furi_string_get_cstr(subghz_remote_app->file_path));
+
+        if(load_state == SubRemLoadMapStateOK || load_state == SubRemLoadMapStateNotAllOK) {
+            map_loaded = true;
+        } else {
+            // TODO Replace
+            dialog_message_show_storage_error(subghz_remote_app->dialogs, "Cannot load\nmap file");
+        }
+    }
+
+    if(map_loaded) {
+        scene_manager_next_scene(subghz_remote_app->scene_manager, SubRemSceneRemote);
+    } else {
+        furi_string_set(subghz_remote_app->file_path, SUBREM_APP_FOLDER);
+        scene_manager_next_scene(subghz_remote_app->scene_manager, SubRemSceneStart);
+        scene_manager_next_scene(subghz_remote_app->scene_manager, SubRemSceneOpenMapFile);
+    }
 
     view_dispatcher_run(subghz_remote_app->view_dispatcher);
 

applications/external/subghz_remote/subghz_remote_app_i.c

@@ -7,10 +7,8 @@
 // #include <lib/subghz/protocols/keeloq.h>
 // #include <lib/subghz/protocols/star_line.h>
 
-#ifdef APP_SUBGHZREMOTE
 #include <lib/subghz/protocols/protocol_items.h>
 #include <lib/subghz/blocks/custom_btn.h>
-#endif
 
 #define TAG "SubGhzRemote"
 
@@ -22,7 +20,7 @@ static const char* map_file_labels[SubRemSubKeyNameMaxCount][2] = {
     [SubRemSubKeyNameOk] = {"OK", "OKLABEL"},
 };
 
-static void subrem_map_preset_reset(SubRemMapPreset* map_preset) {
+void subrem_map_preset_reset(SubRemMapPreset* map_preset) {
     furi_assert(map_preset);
 
     for(uint8_t i = 0; i < SubRemSubKeyNameMaxCount; i++) {
@@ -228,9 +226,7 @@ bool subrem_tx_start_sub(SubGhzRemoteApp* app, SubRemSubFilePreset* sub_preset)
             NULL,
             0);
 
-#ifdef APP_SUBGHZREMOTE
         subghz_custom_btns_reset();
-#endif
 
         if(subghz_txrx_tx_start(app->txrx, sub_preset->fff_data) == SubGhzTxRxStartTxStateOk) {
             ret = true;
@@ -246,12 +242,12 @@ bool subrem_tx_stop_sub(SubGhzRemoteApp* app, bool forced) {
 
     if(forced || (sub_preset->type != SubGhzProtocolTypeRAW)) {
         subghz_txrx_stop(app->txrx);
-#ifdef APP_SUBGHZREMOTE
+
         if(sub_preset->type == SubGhzProtocolTypeDynamic) {
             subghz_txrx_reset_dynamic_and_custom_btns(app->txrx);
         }
         subghz_custom_btns_reset();
-#endif
+
         return true;
     }
 
@@ -278,3 +274,47 @@ SubRemLoadMapState subrem_load_from_file(SubGhzRemoteApp* app) {
 
     return ret;
 }
+
+bool subrem_save_map_to_file(SubGhzRemoteApp* app) {
+    furi_assert(app);
+
+    const char* file_name = furi_string_get_cstr(app->file_path);
+    bool saved = false;
+    FlipperFormat* fff_data = flipper_format_string_alloc();
+
+    SubRemSubFilePreset* sub_preset;
+
+    flipper_format_write_header_cstr(
+        fff_data, SUBREM_APP_APP_FILE_TYPE, SUBREM_APP_APP_FILE_VERSION);
+    for(uint8_t i = 0; i < SubRemSubKeyNameMaxCount; i++) {
+        sub_preset = app->map_preset->subs_preset[i];
+        if(!furi_string_empty(sub_preset->file_path)) {
+            flipper_format_write_string(fff_data, map_file_labels[i][0], sub_preset->file_path);
+        }
+    }
+    for(uint8_t i = 0; i < SubRemSubKeyNameMaxCount; i++) {
+        sub_preset = app->map_preset->subs_preset[i];
+        if(!furi_string_empty(sub_preset->file_path)) {
+            flipper_format_write_string(fff_data, map_file_labels[i][1], sub_preset->label);
+        }
+    }
+
+    Storage* storage = furi_record_open(RECORD_STORAGE);
+    Stream* flipper_format_stream = flipper_format_get_raw_stream(fff_data);
+
+    do {
+        if(!storage_simply_remove(storage, file_name)) {
+            break;
+        }
+        //ToDo check Write
+        stream_seek(flipper_format_stream, 0, StreamOffsetFromStart);
+        stream_save_to_file(flipper_format_stream, storage, file_name, FSOM_CREATE_ALWAYS);
+
+        saved = true;
+    } while(0);
+
+    furi_record_close(RECORD_STORAGE);
+    flipper_format_free(fff_data);
+
+    return saved;
+}

applications/external/subghz_remote/subghz_remote_app_i.h

@@ -1,8 +1,5 @@
 #pragma once
 
-#define SUBREM_LIGHT 1
-#define APP_SUBGHZREMOTE 1
-
 #include "helpers/subrem_types.h"
 #include "helpers/subrem_presets.h"
 #include "scenes/subrem_scene.h"
@@ -12,6 +9,7 @@
 #include <assets_icons.h>
 
 #include "views/remote.h"
+#include "views/edit_menu.h"
 
 #include <gui/gui.h>
 #include <gui/view_dispatcher.h>
@@ -35,16 +33,23 @@ typedef struct {
     SceneManager* scene_manager;
     NotificationApp* notifications;
     DialogsApp* dialogs;
+    Widget* widget;
+    Popup* popup;
+    TextInput* text_input;
     Submenu* submenu;
 
     FuriString* file_path;
+    char file_name_tmp[SUBREM_MAX_LEN_NAME];
 
     SubRemViewRemote* subrem_remote_view;
+    SubRemViewEditMenu* subrem_edit_menu;
 
     SubRemMapPreset* map_preset;
 
     SubGhzTxRx* txrx;
 
+    bool map_not_saved;
+
     uint8_t chusen_sub;
 } SubGhzRemoteApp;
 
@@ -54,6 +59,10 @@ bool subrem_tx_start_sub(SubGhzRemoteApp* app, SubRemSubFilePreset* sub_preset);
 
 bool subrem_tx_stop_sub(SubGhzRemoteApp* app, bool forced);
 
-void subrem_save_active_sub(void* context);
-
 SubRemLoadMapState subrem_map_file_load(SubGhzRemoteApp* app, const char* file_path);
+
+void subrem_map_preset_reset(SubRemMapPreset* map_preset);
+
+bool subrem_save_map_to_file(SubGhzRemoteApp* app);
+
+void subrem_save_active_sub(void* context);

applications/external/subghz_remote/views/edit_menu.c

@@ -0,0 +1,290 @@
+#include "edit_menu.h"
+#include "../subghz_remote_app_i.h"
+
+#include <input/input.h>
+#include <gui/elements.h>
+
+#define subrem_view_edit_menu_MAX_LABEL_LENGTH 12
+
+#define FRAME_HEIGHT 12
+
+struct SubRemViewEditMenu {
+    View* view;
+    SubRemViewEditMenuCallback callback;
+    void* context;
+};
+
+typedef struct {
+    FuriString* label;
+    FuriString* file_path;
+    SubRemLoadSubState sub_state;
+
+    uint8_t chusen;
+} SubRemViewEditMenuModel;
+
+void subrem_view_edit_menu_set_callback(
+    SubRemViewEditMenu* subrem_view_edit_menu,
+    SubRemViewEditMenuCallback callback,
+    void* context) {
+    furi_assert(subrem_view_edit_menu);
+
+    subrem_view_edit_menu->callback = callback;
+    subrem_view_edit_menu->context = context;
+}
+
+void subrem_view_edit_menu_add_data_to_show(
+    SubRemViewEditMenu* subrem_view_edit_remote,
+    uint8_t index,
+    FuriString* label,
+    FuriString* path,
+    SubRemLoadSubState state) {
+    furi_assert(subrem_view_edit_remote);
+
+    with_view_model(
+        subrem_view_edit_remote->view,
+        SubRemViewEditMenuModel * model,
+        {
+            model->chusen = index;
+            if(!furi_string_empty(label)) {
+                furi_string_set(model->label, label);
+            } else {
+                furi_string_set(model->label, "Empty label");
+            }
+            furi_string_set(model->file_path, path);
+            model->sub_state = state;
+        },
+        true);
+}
+
+uint8_t subrem_view_edit_menu_get_index(SubRemViewEditMenu* subrem_view_edit_remote) {
+    furi_assert(subrem_view_edit_remote);
+    uint8_t index;
+
+    with_view_model(
+        subrem_view_edit_remote->view,
+        SubRemViewEditMenuModel * model,
+        { index = model->chusen; },
+        true);
+    return index;
+}
+
+void subrem_view_edit_menu_draw(Canvas* canvas, SubRemViewEditMenuModel* model) {
+    canvas_clear(canvas);
+    canvas_set_color(canvas, ColorBlack);
+
+    canvas_clear(canvas);
+
+    // Draw bottom btn
+    canvas_set_font(canvas, FontSecondary);
+    elements_button_left(canvas, "Back");
+    elements_button_center(canvas, "Edit");
+    elements_button_right(canvas, "Save");
+
+    // Draw top frame
+    canvas_draw_line(canvas, 1, 0, 125, 0);
+    canvas_draw_box(canvas, 0, 1, 127, FRAME_HEIGHT - 2);
+    canvas_draw_line(canvas, 1, FRAME_HEIGHT - 1, 125, FRAME_HEIGHT - 1);
+
+    canvas_set_color(canvas, ColorWhite);
+
+    // Draw btn name
+    canvas_set_font(canvas, FontPrimary);
+    switch(model->chusen) {
+    case SubRemSubKeyNameUp:
+        canvas_draw_str(canvas, 3, FRAME_HEIGHT - 2, "UP");
+        break;
+
+    case SubRemSubKeyNameDown:
+        canvas_draw_str(canvas, 3, FRAME_HEIGHT - 2, "DOWN");
+        break;
+
+    case SubRemSubKeyNameLeft:
+        canvas_draw_str(canvas, 3, FRAME_HEIGHT - 2, "LEFT");
+        break;
+
+    case SubRemSubKeyNameRight:
+        canvas_draw_str(canvas, 3, FRAME_HEIGHT - 2, "RIGHT");
+        break;
+
+    case SubRemSubKeyNameOk:
+        canvas_draw_str(canvas, 3, FRAME_HEIGHT - 2, "OK");
+        break;
+
+    default:
+        break;
+    }
+
+    // Draw Label
+    canvas_set_font(canvas, FontSecondary);
+    elements_text_box(
+        canvas,
+        38,
+        2,
+        127 - 38,
+        FRAME_HEIGHT,
+        AlignCenter,
+        AlignBottom,
+        furi_string_empty(model->label) ? "Empty label" : furi_string_get_cstr(model->label),
+        true);
+
+    // Draw arrow
+    canvas_set_color(canvas, ColorBlack);
+    if(model->chusen != 0) {
+        canvas_draw_icon(canvas, 119, 13, &I_Pin_arrow_up_7x9);
+    }
+    if(model->chusen != 4) {
+        canvas_draw_icon_ex(canvas, 119, 42, &I_Pin_arrow_up_7x9, IconRotation180);
+    }
+
+    // Draw file_path
+    if(model->sub_state == SubRemLoadSubStateOK) {
+        canvas_set_font(canvas, FontSecondary);
+        elements_text_box(
+            canvas,
+            1,
+            FRAME_HEIGHT + 1,
+            118,
+            (63 - FRAME_HEIGHT * 2),
+            AlignLeft,
+            AlignTop,
+            furi_string_get_cstr(model->file_path),
+            false);
+    } else if(furi_string_empty(model->file_path)) {
+        canvas_set_font(canvas, FontPrimary);
+        canvas_draw_str(canvas, 1, FRAME_HEIGHT * 2 - 2, "Button not set");
+    } else {
+        canvas_set_font(canvas, FontPrimary);
+        canvas_draw_str(canvas, 1, FRAME_HEIGHT * 2 - 2, "ERR:");
+        canvas_set_font(canvas, FontSecondary);
+        switch(model->sub_state) {
+        case SubRemLoadSubStateErrorNoFile:
+            canvas_draw_str(canvas, 26, FRAME_HEIGHT * 2 - 2, "File not found");
+            break;
+        case SubRemLoadSubStateErrorFreq:
+            canvas_draw_str(canvas, 26, FRAME_HEIGHT * 2 - 2, "Bad frequency");
+            break;
+        case SubRemLoadSubStateErrorMod:
+            canvas_draw_str(canvas, 26, FRAME_HEIGHT * 2 - 2, "Bad modulation");
+            break;
+        case SubRemLoadSubStateErrorProtocol:
+            canvas_draw_str(canvas, 26, FRAME_HEIGHT * 2 - 2, "Unsupported protocol");
+            break;
+
+        default:
+            break;
+        }
+        elements_text_box(
+            canvas,
+            1,
+            FRAME_HEIGHT * 2,
+            118,
+            30,
+            AlignLeft,
+            AlignTop,
+            furi_string_get_cstr(model->file_path),
+            false);
+    }
+}
+
+bool subrem_view_edit_menu_input(InputEvent* event, void* context) {
+    furi_assert(context);
+    SubRemViewEditMenu* subrem_view_edit_menu = context;
+
+    if((event->key == InputKeyBack || event->key == InputKeyLeft) &&
+       event->type == InputTypeShort) {
+        subrem_view_edit_menu->callback(
+            SubRemCustomEventViewEditMenuBack, subrem_view_edit_menu->context);
+        return true;
+    } else if(event->key == InputKeyUp && event->type == InputTypeShort) {
+        with_view_model(
+            subrem_view_edit_menu->view,
+            SubRemViewEditMenuModel * model,
+            {
+                if(model->chusen > 0) {
+                    model->chusen -= 1;
+                };
+            },
+            true);
+        subrem_view_edit_menu->callback(
+            SubRemCustomEventViewEditMenuUP, subrem_view_edit_menu->context);
+        return true;
+    } else if(event->key == InputKeyDown && event->type == InputTypeShort) {
+        with_view_model(
+            subrem_view_edit_menu->view,
+            SubRemViewEditMenuModel * model,
+            {
+                if(model->chusen < 4) {
+                    model->chusen += 1;
+                };
+            },
+            true);
+        subrem_view_edit_menu->callback(
+            SubRemCustomEventViewEditMenuDOWN, subrem_view_edit_menu->context);
+        return true;
+    } else if(event->key == InputKeyOk && event->type == InputTypeShort) {
+        subrem_view_edit_menu->callback(
+            SubRemCustomEventViewEditMenuEdit, subrem_view_edit_menu->context);
+        return true;
+    } else if(event->key == InputKeyRight && event->type == InputTypeShort) {
+        subrem_view_edit_menu->callback(
+            SubRemCustomEventViewEditMenuSave, subrem_view_edit_menu->context);
+        return true;
+    }
+
+    return true;
+}
+
+void subrem_view_edit_menu_enter(void* context) {
+    furi_assert(context);
+}
+
+void subrem_view_edit_menu_exit(void* context) {
+    furi_assert(context);
+}
+
+SubRemViewEditMenu* subrem_view_edit_menu_alloc() {
+    SubRemViewEditMenu* subrem_view_edit_menu = malloc(sizeof(SubRemViewEditMenu));
+
+    // View allocation and configuration
+    subrem_view_edit_menu->view = view_alloc();
+    view_allocate_model(
+        subrem_view_edit_menu->view, ViewModelTypeLocking, sizeof(SubRemViewEditMenuModel));
+    view_set_context(subrem_view_edit_menu->view, subrem_view_edit_menu);
+    view_set_draw_callback(
+        subrem_view_edit_menu->view, (ViewDrawCallback)subrem_view_edit_menu_draw);
+    view_set_input_callback(subrem_view_edit_menu->view, subrem_view_edit_menu_input);
+    view_set_enter_callback(subrem_view_edit_menu->view, subrem_view_edit_menu_enter);
+    view_set_exit_callback(subrem_view_edit_menu->view, subrem_view_edit_menu_exit);
+
+    with_view_model(
+        subrem_view_edit_menu->view,
+        SubRemViewEditMenuModel * model,
+        {
+            model->label = furi_string_alloc(); // furi_string_alloc_set_str("LABEL");
+            model->file_path = furi_string_alloc(); // furi_string_alloc_set_str("FILE_PATH");
+
+            model->chusen = 0;
+        },
+        true);
+    return subrem_view_edit_menu;
+}
+
+void subrem_view_edit_menu_free(SubRemViewEditMenu* subghz_edit_menu) {
+    furi_assert(subghz_edit_menu);
+
+    with_view_model(
+        subghz_edit_menu->view,
+        SubRemViewEditMenuModel * model,
+        {
+            furi_string_free(model->label);
+            furi_string_free(model->file_path);
+        },
+        true);
+    view_free(subghz_edit_menu->view);
+    free(subghz_edit_menu);
+}
+
+View* subrem_view_edit_menu_get_view(SubRemViewEditMenu* subrem_view_edit_menu) {
+    furi_assert(subrem_view_edit_menu);
+    return subrem_view_edit_menu->view;
+}

applications/external/subghz_remote/views/edit_menu.h

@@ -0,0 +1,29 @@
+#pragma once
+
+#include <gui/view.h>
+#include "../helpers/subrem_custom_event.h"
+#include "../helpers/subrem_presets.h"
+
+typedef struct SubRemViewEditMenu SubRemViewEditMenu;
+
+typedef void (*SubRemViewEditMenuCallback)(SubRemCustomEvent event, void* context);
+
+void subrem_view_edit_menu_set_callback(
+    SubRemViewEditMenu* subrem_view_edit_menu,
+    SubRemViewEditMenuCallback callback,
+    void* context);
+
+SubRemViewEditMenu* subrem_view_edit_menu_alloc();
+
+void subrem_view_edit_menu_free(SubRemViewEditMenu* subrem_view_edit_menu);
+
+View* subrem_view_edit_menu_get_view(SubRemViewEditMenu* subrem_view_edit_menu);
+
+void subrem_view_edit_menu_add_data_to_show(
+    SubRemViewEditMenu* subrem_view_edit_remote,
+    uint8_t index,
+    FuriString* label,
+    FuriString* path,
+    SubRemLoadSubState state);
+
+uint8_t subrem_view_edit_menu_get_index(SubRemViewEditMenu* subrem_view_edit_remote);

applications/external/subghz_remote/views/remote.c

@@ -22,6 +22,7 @@ typedef struct {
     SubRemViewRemoteState state;
 
     uint8_t pressed_btn;
+    bool is_external;
 } SubRemViewRemoteModel;
 
 void subrem_view_remote_set_callback(
@@ -106,6 +107,15 @@ void subrem_view_remote_set_state(
         true);
 }
 
+void subrem_view_remote_set_radio(SubRemViewRemote* subrem_view_remote, bool external) {
+    furi_assert(subrem_view_remote);
+    with_view_model(
+        subrem_view_remote->view,
+        SubRemViewRemoteModel * model,
+        { model->is_external = external; },
+        true);
+}
+
 void subrem_view_remote_draw(Canvas* canvas, SubRemViewRemoteModel* model) {
     canvas_clear(canvas);
     canvas_set_color(canvas, ColorBlack);
@@ -143,6 +153,8 @@ void subrem_view_remote_draw(Canvas* canvas, SubRemViewRemoteModel* model) {
         elements_button_right(canvas, "Save");
     } else {
         canvas_draw_str_aligned(canvas, 11, 62, AlignLeft, AlignBottom, "Hold=Exit.");
+        canvas_draw_str_aligned(
+            canvas, 126, 62, AlignRight, AlignBottom, ((model->is_external) ? "Ext" : "Int"));
     }
 
     //Status text and indicator
@@ -267,6 +279,7 @@ SubRemViewRemote* subrem_view_remote_alloc() {
             }
 
             model->pressed_btn = 0;
+            model->is_external = false;
         },
         true);
     return subrem_view_remote;

applications/external/subghz_remote/views/remote.h

@@ -33,4 +33,6 @@ void subrem_view_remote_update_data_labels(
 void subrem_view_remote_set_state(
     SubRemViewRemote* subrem_view_remote,
     SubRemViewRemoteState state,
-    uint8_t presed_btn);
+    uint8_t presed_btn);
+
+void subrem_view_remote_set_radio(SubRemViewRemote* subrem_view_remote, bool external);