diff --git a/ReadMe.md b/ReadMe.md index 83d0325c67c..886ddcae3ff 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -62,6 +62,11 @@ This software is for experimental purposes only and is not meant for any illegal - Updater: [Gzipped resources (220% faster FW upload) + Updater improvements (By Willy-JL)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/commit/0f0b062366af85f614ee0dc1380fc0bc9551063f) - UL: [Electra fix protocol naming (By xMasterX)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/commit/a89a67d1033751b3c5fa9ab2fdac4caaa1afaac4) - [ESP Flasher resources updated (By Willy-JL) to include resources for flashing Wardriver, AirTag Scanner & Marauder for MultiBoardS3](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/commit/82b0c93e4b9e90dd8ee95beadefff9f3510d010c) +- Updater: [Flashlight v1.1 (By xMasterX)](https://github.com/xMasterX/flipper-flashlight) +- Updater: [HEX Viewer v2.0 (By QtRoS)](https://github.com/QtRoS/flipperzero-firmware) +- Updater: [USB Mass Storage v1.3 (By nminaylov)](https://github.com/flipperdevices/flipperzero-good-faps/tree/nm/usb_mass_storage_app/mass_storage) +- Updater: [Sub-GHz Playlist v1.0 (By darmiel)](https://github.com/darmiel/flipper-playlist) +- Updater: [Sub-GHz Remote v1.3 (By gid9798)](https://github.com/DarkFlippers/SubGHz_Remote) @@ -552,8 +557,8 @@ $ ./fbt dolphin_ext - [Spotify Remote v0.1 (By benjamindrussell)](https://github.com/benjamindrussell/flipper-spotify-remote) `Req: ESP32` with [ESP32 Spotify Remote](https://github.com/benjamindrussell/esp32-spotify-remote) - [SPI Mem Manager v1.3 (By drunkbatya)-OFW](https://github.com/flipperdevices/flipperzero-good-faps/tree/dev/spi_mem_manager) - [Sub-GHz Bruteforcer v3.11.3 (By Ganapati/xMasterX/derskythe)](https://github.com/derskythe/flipperzero-subbrute/tree/master) -- [Sub-GHz Playlist (By darmiel)](https://github.com/darmiel/flipper-playlist) -- [Sub-GHz Remote (Refactored) + Configurator v1.3 (By gid9798)](https://github.com/DarkFlippers/SubGHz_Remote) [(Merged Into One By ESurge)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/655) - Previously: [(By ESurge)](https://github.com/ESurge/flipperzero-firmware-unirfremix) [(Original By jimilinuxguy)](https://github.com/jimilinuxguy/flipperzero-universal-rf-remote/tree/028d615c83f059bb2c905530ddb3d4efbd3cbcae/applications/jukebox) +- [Sub-GHz Playlist v1.0 (By darmiel)](https://github.com/darmiel/flipper-playlist) +- [Sub-GHz Remote v1.3 (By gid9798)](https://github.com/DarkFlippers/SubGHz_Remote) - [Sub-GHz Rolling Flaws v1.5 (By jamisonderek)](https://github.com/jamisonderek/flipper-zero-tutorials) - [SWD Probe v1.1 (By g3gg0)](https://github.com/g3gg0/flipper-swd_probe) - [T5577 Multiwriter v0.2 (By Leptopt1los)](https://github.com/Leptopt1los/t5577_multiwriter) diff --git a/applications/external/flashlight/application.fam b/applications/external/flashlight/application.fam index 9cad40c302d..a184228435c 100644 --- a/applications/external/flashlight/application.fam +++ b/applications/external/flashlight/application.fam @@ -4,6 +4,7 @@ App( apptype=FlipperAppType.EXTERNAL, entry_point="flashlight_app", stack_size=2 * 1024, + fap_icon_assets="icons", fap_icon="flash10px.png", fap_category="GPIO", fap_author="xMasterX", diff --git a/applications/external/flashlight/flashlight.c b/applications/external/flashlight/flashlight.c index 43d1e19ce36..79cfe7f60c9 100644 --- a/applications/external/flashlight/flashlight.c +++ b/applications/external/flashlight/flashlight.c @@ -7,6 +7,8 @@ #include #include +#include "flashlight_icons.h" + typedef enum { EventTypeTick, EventTypeKey, @@ -28,17 +30,19 @@ static void render_callback(Canvas* const canvas, void* ctx) { furi_mutex_acquire(plugin_state->mutex, FuriWaitForever); canvas_set_font(canvas, FontPrimary); - elements_multiline_text_aligned(canvas, 64, 2, AlignCenter, AlignTop, "Flashlight"); + elements_multiline_text_aligned(canvas, 64, 4, AlignCenter, AlignTop, "Flashlight"); canvas_set_font(canvas, FontSecondary); + canvas_draw_icon(canvas, 0, 17, &I_led_connections); + if(!plugin_state->is_on) { elements_multiline_text_aligned( - canvas, 64, 28, AlignCenter, AlignTop, "Press OK button turn on"); + canvas, 64, 44, AlignCenter, AlignTop, "Press OK button turn on"); } else { - elements_multiline_text_aligned(canvas, 64, 28, AlignCenter, AlignTop, "Light is on!"); + elements_multiline_text_aligned(canvas, 64, 38, AlignCenter, AlignTop, "Light is on!"); elements_multiline_text_aligned( - canvas, 64, 40, AlignCenter, AlignTop, "Press OK button to off"); + canvas, 64, 50, AlignCenter, AlignTop, "Press OK button to off"); } furi_mutex_release(plugin_state->mutex); diff --git a/applications/external/flashlight/icons/led_connections.png b/applications/external/flashlight/icons/led_connections.png new file mode 100644 index 00000000000..e3825cbdbc4 Binary files /dev/null and b/applications/external/flashlight/icons/led_connections.png differ diff --git a/applications/external/hex_viewer/README.md b/applications/external/hex_viewer/README.md index 82ccf0538e5..4f9d0363b02 100644 --- a/applications/external/hex_viewer/README.md +++ b/applications/external/hex_viewer/README.md @@ -12,7 +12,5 @@ The app allows you to view various files as HEX Feel free to send PRs! -**Useful links**: - -- App URL: https://lab.flipper.net/apps/hex_viewer -- Catalog's manifest: [flipper-application-catalog/applications/Tools/hex_viewer/manifest.yml](https://github.com/flipperdevices/flipper-application-catalog/blob/main/applications/Tools/hex_viewer/manifest.yml) +App URL: https://lab.flipper.net/apps/hex_viewer +Catalog's manifest: [flipper-application-catalog/applications/Tools/hex_viewer/manifest.yml](https://github.com/flipperdevices/flipper-application-catalog/blob/main/applications/Tools/hex_viewer/manifest.yml) diff --git a/applications/external/hex_viewer/hex_viewer.c b/applications/external/hex_viewer/hex_viewer.c index 40070395dd2..916ed9f7c30 100644 --- a/applications/external/hex_viewer/hex_viewer.c +++ b/applications/external/hex_viewer/hex_viewer.c @@ -96,13 +96,12 @@ void hex_viewer_app_free(HexViewer* app) { // View Dispatcher view_dispatcher_remove_view(app->view_dispatcher, HexViewerViewIdMenu); - view_dispatcher_remove_view(app->view_dispatcher, HexViewerViewIdStartscreen); - view_dispatcher_remove_view(app->view_dispatcher, HexViewerViewIdScroll); - view_dispatcher_remove_view(app->view_dispatcher, HexViewerViewIdSettings); - submenu_free(app->submenu); + view_dispatcher_remove_view(app->view_dispatcher, HexViewerViewIdStartscreen); hex_viewer_startscreen_free(app->hex_viewer_startscreen); + view_dispatcher_remove_view(app->view_dispatcher, HexViewerViewIdScroll); text_input_free(app->text_input); + view_dispatcher_remove_view(app->view_dispatcher, HexViewerViewIdSettings); variable_item_list_free(app->variable_item_list); view_dispatcher_free(app->view_dispatcher); @@ -129,7 +128,13 @@ int32_t hex_viewer_app(void* p) { view_dispatcher_attach_to_gui(app->view_dispatcher, app->gui, ViewDispatcherTypeFullscreen); - scene_manager_next_scene(app->scene_manager, HexViewerSceneStartscreen); + if(p && strlen(p) && hex_viewer_open_file(app, (const char*)p)) { + hex_viewer_read_file(app); + scene_manager_next_scene(app->scene_manager, HexViewerSceneStartscreen); + } else { + scene_manager_next_scene(app->scene_manager, HexViewerSceneStartscreen); + scene_manager_next_scene(app->scene_manager, HexViewerSceneOpen); + } furi_hal_power_suppress_charge_enter(); diff --git a/applications/external/hex_viewer/icons/hex_10px.bmp b/applications/external/hex_viewer/icons/hex_10px.bmp new file mode 100644 index 00000000000..54b78dc42b5 Binary files /dev/null and b/applications/external/hex_viewer/icons/hex_10px.bmp differ diff --git a/applications/external/mass_storage/mass_storage_app.c b/applications/external/mass_storage/mass_storage_app.c index 497708f0c03..e84319fa8a9 100644 --- a/applications/external/mass_storage/mass_storage_app.c +++ b/applications/external/mass_storage/mass_storage_app.c @@ -98,6 +98,10 @@ MassStorageApp* mass_storage_app_alloc(char* arg) { MassStorageAppViewStart, variable_item_list_get_view(app->variable_item_list)); + app->widget = widget_alloc(); + view_dispatcher_add_view( + app->view_dispatcher, MassStorageAppViewWidget, widget_get_view(app->widget)); + app->popup = popup_alloc(); view_dispatcher_add_view( app->view_dispatcher, MassStorageAppViewPopup, popup_get_view(app->popup)); @@ -121,12 +125,14 @@ void mass_storage_app_free(MassStorageApp* app) { view_dispatcher_remove_view(app->view_dispatcher, MassStorageAppViewTextInput); view_dispatcher_remove_view(app->view_dispatcher, MassStorageAppViewStart); view_dispatcher_remove_view(app->view_dispatcher, MassStorageAppViewLoading); + view_dispatcher_remove_view(app->view_dispatcher, MassStorageAppViewWidget); view_dispatcher_remove_view(app->view_dispatcher, MassStorageAppViewPopup); mass_storage_free(app->mass_storage_view); text_input_free(app->text_input); variable_item_list_free(app->variable_item_list); loading_free(app->loading); + widget_free(app->widget); popup_free(app->popup); // View dispatcher diff --git a/applications/external/mass_storage/mass_storage_app_i.h b/applications/external/mass_storage/mass_storage_app_i.h index e243144b7e5..9fa6945adad 100644 --- a/applications/external/mass_storage/mass_storage_app_i.h +++ b/applications/external/mass_storage/mass_storage_app_i.h @@ -13,12 +13,13 @@ #include #include #include +#include #include #include #include "views/mass_storage_view.h" #include -#define MASS_STORAGE_APP_PATH_FOLDER APP_ASSETS_PATH("") +#define MASS_STORAGE_APP_PATH_FOLDER STORAGE_APP_DATA_PATH_PREFIX #define MASS_STORAGE_APP_EXTENSION ".img" #define MASS_STORAGE_FILE_NAME_LEN 40 @@ -27,6 +28,7 @@ struct MassStorageApp { Storage* fs_api; ViewDispatcher* view_dispatcher; SceneManager* scene_manager; + Widget* widget; Popup* popup; DialogsApp* dialogs; TextInput* text_input; @@ -52,6 +54,7 @@ typedef enum { MassStorageAppViewTextInput, MassStorageAppViewWork, MassStorageAppViewLoading, + MassStorageAppViewWidget, MassStorageAppViewPopup, } MassStorageAppView; diff --git a/applications/external/mass_storage/scenes/mass_storage_scene_config.h b/applications/external/mass_storage/scenes/mass_storage_scene_config.h index ff0418fdf88..5017a4e07bc 100644 --- a/applications/external/mass_storage/scenes/mass_storage_scene_config.h +++ b/applications/external/mass_storage/scenes/mass_storage_scene_config.h @@ -3,3 +3,4 @@ ADD_SCENE(mass_storage, file_select, FileSelect) ADD_SCENE(mass_storage, work, Work) ADD_SCENE(mass_storage, create_image, CreateImage) ADD_SCENE(mass_storage, create_image_name, CreateImageName) +ADD_SCENE(mass_storage, usb_locked, UsbLocked) diff --git a/applications/external/mass_storage/scenes/mass_storage_scene_usb_locked.c b/applications/external/mass_storage/scenes/mass_storage_scene_usb_locked.c new file mode 100644 index 00000000000..ad144ec0a51 --- /dev/null +++ b/applications/external/mass_storage/scenes/mass_storage_scene_usb_locked.c @@ -0,0 +1,40 @@ +#include "../mass_storage_app_i.h" + +void mass_storage_scene_usb_locked_on_enter(void* context) { + MassStorageApp* app = context; + + widget_add_icon_element(app->widget, 78, 0, &I_ActiveConnection_50x64); + widget_add_string_multiline_element( + app->widget, 3, 2, AlignLeft, AlignTop, FontPrimary, "Connection\nis active!"); + widget_add_string_multiline_element( + app->widget, + 3, + 30, + AlignLeft, + AlignTop, + FontSecondary, + "Disconnect from\nPC or phone to\nuse this function."); + + view_dispatcher_switch_to_view(app->view_dispatcher, MassStorageAppViewWidget); +} + +bool mass_storage_scene_usb_locked_on_event(void* context, SceneManagerEvent event) { + MassStorageApp* app = context; + bool consumed = false; + + if(event.type == SceneManagerEventTypeBack) { + consumed = scene_manager_search_and_switch_to_previous_scene( + app->scene_manager, MassStorageSceneFileSelect); + if(!consumed) { + consumed = scene_manager_search_and_switch_to_previous_scene( + app->scene_manager, MassStorageSceneStart); + } + } + + return consumed; +} + +void mass_storage_scene_usb_locked_on_exit(void* context) { + MassStorageApp* app = context; + widget_reset(app->widget); +} diff --git a/applications/external/nightstand/README.md b/applications/external/nightstand_clock/README.md similarity index 100% rename from applications/external/nightstand/README.md rename to applications/external/nightstand_clock/README.md diff --git a/applications/external/nightstand/application.fam b/applications/external/nightstand_clock/application.fam similarity index 92% rename from applications/external/nightstand/application.fam rename to applications/external/nightstand_clock/application.fam index 4b54821f7f6..5858cbe683d 100644 --- a/applications/external/nightstand/application.fam +++ b/applications/external/nightstand_clock/application.fam @@ -4,7 +4,7 @@ App( apptype=FlipperAppType.EXTERNAL, entry_point="clock_app", stack_size=2 * 1024, - fap_icon="ClockIcon.png", + fap_icon="clock.png", fap_category="Tools", fap_author="nymda & Willy-JL", fap_weburl="https://github.com/nymda/FlipperNightStand", diff --git a/applications/external/nightstand/ClockIcon.png b/applications/external/nightstand_clock/clock.png similarity index 100% rename from applications/external/nightstand/ClockIcon.png rename to applications/external/nightstand_clock/clock.png diff --git a/applications/external/nightstand/clock_app.c b/applications/external/nightstand_clock/clock_app.c similarity index 100% rename from applications/external/nightstand/clock_app.c rename to applications/external/nightstand_clock/clock_app.c diff --git a/applications/external/nightstand/clock_app.h b/applications/external/nightstand_clock/clock_app.h similarity index 100% rename from applications/external/nightstand/clock_app.h rename to applications/external/nightstand_clock/clock_app.h diff --git a/applications/external/playlist/playlist_10px.png b/applications/external/playlist/playlist_10px.png deleted file mode 100644 index fc33471f778..00000000000 Binary files a/applications/external/playlist/playlist_10px.png and /dev/null differ diff --git a/applications/external/playlist/application.fam b/applications/external/subghz_playlist/application.fam similarity index 91% rename from applications/external/playlist/application.fam rename to applications/external/subghz_playlist/application.fam index 7e019806a1f..9e627901d63 100644 --- a/applications/external/playlist/application.fam +++ b/applications/external/subghz_playlist/application.fam @@ -6,7 +6,7 @@ App( stack_size=2 * 1024, icon="A_Sub1ghz_14", fap_category="Sub-GHz", - fap_icon="playlist_10px.png", + fap_icon="subplaylist_10px.png", fap_icon_assets="images", fap_author="darmiel", fap_version=(1, 0), diff --git a/applications/external/playlist/canvas_helper.c b/applications/external/subghz_playlist/canvas_helper.c similarity index 100% rename from applications/external/playlist/canvas_helper.c rename to applications/external/subghz_playlist/canvas_helper.c diff --git a/applications/external/playlist/canvas_helper.h b/applications/external/subghz_playlist/canvas_helper.h similarity index 100% rename from applications/external/playlist/canvas_helper.h rename to applications/external/subghz_playlist/canvas_helper.h diff --git a/applications/external/playlist/helpers/radio_device_loader.c b/applications/external/subghz_playlist/helpers/radio_device_loader.c similarity index 100% rename from applications/external/playlist/helpers/radio_device_loader.c rename to applications/external/subghz_playlist/helpers/radio_device_loader.c diff --git a/applications/external/playlist/helpers/radio_device_loader.h b/applications/external/subghz_playlist/helpers/radio_device_loader.h similarity index 100% rename from applications/external/playlist/helpers/radio_device_loader.h rename to applications/external/subghz_playlist/helpers/radio_device_loader.h diff --git a/applications/external/playlist/images/ButtonRight_4x7.png b/applications/external/subghz_playlist/images/ButtonRight_4x7.png similarity index 100% rename from applications/external/playlist/images/ButtonRight_4x7.png rename to applications/external/subghz_playlist/images/ButtonRight_4x7.png diff --git a/applications/external/playlist/images/sub1_10px.png b/applications/external/subghz_playlist/images/sub1_10px.png similarity index 100% rename from applications/external/playlist/images/sub1_10px.png rename to applications/external/subghz_playlist/images/sub1_10px.png diff --git a/applications/external/playlist/playlist.c b/applications/external/subghz_playlist/playlist.c similarity index 99% rename from applications/external/playlist/playlist.c rename to applications/external/subghz_playlist/playlist.c index bad14531ebe..e2fb7051fe6 100644 --- a/applications/external/playlist/playlist.c +++ b/applications/external/subghz_playlist/playlist.c @@ -6,7 +6,7 @@ #include #include -#include "subghz_playlist_icons.h" +#include #include #include @@ -22,7 +22,6 @@ #include "playlist_file.h" #include "canvas_helper.h" -#define PLAYLIST_FOLDER EXT_PATH("subghz/playlist") #define PLAYLIST_EXT ".txt" #define TAG "Playlist" @@ -723,9 +722,7 @@ void playlist_free(Playlist* app) { free(app); } -int32_t playlist_app(void* p) { - UNUSED(p); - +int32_t playlist_app(char* p) { // create playlist folder { Storage* storage = furi_record_open(RECORD_STORAGE); @@ -743,11 +740,13 @@ int32_t playlist_app(void* p) { furi_hal_power_suppress_charge_enter(); // select playlist file - { + if(p && strlen(p)) { + furi_string_set(app->file_path, p); + } else { DialogsApp* dialogs = furi_record_open(RECORD_DIALOGS); DialogsFileBrowserOptions browser_options; dialog_file_browser_set_basic_options(&browser_options, PLAYLIST_EXT, &I_sub1_10px); - browser_options.hide_ext = false; + browser_options.base_path = PLAYLIST_FOLDER; const bool res = dialog_file_browser_show(dialogs, app->file_path, app->file_path, &browser_options); diff --git a/applications/external/playlist/playlist_file.c b/applications/external/subghz_playlist/playlist_file.c similarity index 100% rename from applications/external/playlist/playlist_file.c rename to applications/external/subghz_playlist/playlist_file.c diff --git a/applications/external/playlist/playlist_file.h b/applications/external/subghz_playlist/playlist_file.h similarity index 72% rename from applications/external/playlist/playlist_file.h rename to applications/external/subghz_playlist/playlist_file.h index fb708edc722..6674040b4a9 100644 --- a/applications/external/playlist/playlist_file.h +++ b/applications/external/subghz_playlist/playlist_file.h @@ -4,4 +4,6 @@ #include +#define PLAYLIST_FOLDER EXT_PATH("subghz/playlist") + int playlist_count_playlist_items(Storage* storage, const char* file_path); diff --git a/applications/external/subghz_playlist/subplaylist_10px.png b/applications/external/subghz_playlist/subplaylist_10px.png new file mode 100644 index 00000000000..3d3f1d27f64 Binary files /dev/null and b/applications/external/subghz_playlist/subplaylist_10px.png differ diff --git a/applications/external/subghz_remote_refactored/LICENSE b/applications/external/subghz_remote/LICENSE similarity index 100% rename from applications/external/subghz_remote_refactored/LICENSE rename to applications/external/subghz_remote/LICENSE diff --git a/applications/external/subghz_remote_refactored/application.fam b/applications/external/subghz_remote/application.fam similarity index 52% rename from applications/external/subghz_remote_refactored/application.fam rename to applications/external/subghz_remote/application.fam index 6dd68bb394d..6d618698a4a 100644 --- a/applications/external/subghz_remote_refactored/application.fam +++ b/applications/external/subghz_remote/application.fam @@ -1,3 +1,7 @@ +# [Sub-GHz Remote (Refactored) + Configurator v1.3 (By gid9798)](https://github.com/DarkFlippers/SubGHz_Remote) +# [(Merged Into One By ESurge)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/655) +# Previously: [(By ESurge)](https://github.com/ESurge/flipperzero-firmware-unirfremix) +# [(Original By jimilinuxguy)](https://github.com/jimilinuxguy/flipperzero-universal-rf-remote/tree/028d615c83f059bb2c905530ddb3d4efbd3cbcae/applications/jukebox) App( appid="subghz_remote_refactored", name="Sub-GHz Remote", diff --git a/applications/external/subghz_remote_refactored/catalog/docs/Changelog.md b/applications/external/subghz_remote/catalog/docs/Changelog.md similarity index 100% rename from applications/external/subghz_remote_refactored/catalog/docs/Changelog.md rename to applications/external/subghz_remote/catalog/docs/Changelog.md diff --git a/applications/external/subghz_remote_refactored/catalog/docs/Readme.md b/applications/external/subghz_remote/catalog/docs/Readme.md similarity index 100% rename from applications/external/subghz_remote_refactored/catalog/docs/Readme.md rename to applications/external/subghz_remote/catalog/docs/Readme.md diff --git a/applications/external/subghz_remote_refactored/catalog/screenshots/Editor_main.png b/applications/external/subghz_remote/catalog/screenshots/Editor_main.png similarity index 100% rename from applications/external/subghz_remote_refactored/catalog/screenshots/Editor_main.png rename to applications/external/subghz_remote/catalog/screenshots/Editor_main.png diff --git a/applications/external/subghz_remote_refactored/catalog/screenshots/Editor_submenu.png b/applications/external/subghz_remote/catalog/screenshots/Editor_submenu.png similarity index 100% rename from applications/external/subghz_remote_refactored/catalog/screenshots/Editor_submenu.png rename to applications/external/subghz_remote/catalog/screenshots/Editor_submenu.png diff --git a/applications/external/subghz_remote_refactored/catalog/screenshots/Remote_idle.png b/applications/external/subghz_remote/catalog/screenshots/Remote_idle.png similarity index 100% rename from applications/external/subghz_remote_refactored/catalog/screenshots/Remote_idle.png rename to applications/external/subghz_remote/catalog/screenshots/Remote_idle.png diff --git a/applications/external/subghz_remote_refactored/catalog/screenshots/Remote_send.png b/applications/external/subghz_remote/catalog/screenshots/Remote_send.png similarity index 100% rename from applications/external/subghz_remote_refactored/catalog/screenshots/Remote_send.png rename to applications/external/subghz_remote/catalog/screenshots/Remote_send.png diff --git a/applications/external/subghz_remote_refactored/helpers/subrem_custom_event.h b/applications/external/subghz_remote/helpers/subrem_custom_event.h similarity index 89% rename from applications/external/subghz_remote_refactored/helpers/subrem_custom_event.h rename to applications/external/subghz_remote/helpers/subrem_custom_event.h index e6b9e8ac632..810df6a89fa 100644 --- a/applications/external/subghz_remote_refactored/helpers/subrem_custom_event.h +++ b/applications/external/subghz_remote/helpers/subrem_custom_event.h @@ -48,4 +48,11 @@ typedef enum { SubRemCustomEventSceneEditPreviewSaved, SubRemCustomEventSceneNewName, + +#ifdef FW_ORIGIN_Official + SubRemCustomEventSceneFwWarningExit, + SubRemCustomEventSceneFwWarningNext, + SubRemCustomEventSceneFwWarningContinue, +#endif + } SubRemCustomEvent; \ No newline at end of file diff --git a/applications/external/subghz_remote_refactored/helpers/subrem_presets.c b/applications/external/subghz_remote/helpers/subrem_presets.c similarity index 98% rename from applications/external/subghz_remote_refactored/helpers/subrem_presets.c rename to applications/external/subghz_remote/helpers/subrem_presets.c index 3deb0926d05..2c759fe1260 100644 --- a/applications/external/subghz_remote_refactored/helpers/subrem_presets.c +++ b/applications/external/subghz_remote/helpers/subrem_presets.c @@ -104,7 +104,7 @@ SubRemLoadSubState subrem_sub_preset_load( } if(!strcmp(furi_string_get_cstr(temp_str), "CUSTOM")) { - //TODO FL-3551: add Custom_preset_module + //TODO Does this work properly? //delete preset if it already exists subghz_setting_delete_custom_preset(setting, furi_string_get_cstr(temp_str)); //load custom preset from file @@ -158,7 +158,9 @@ SubRemLoadSubState subrem_sub_preset_load( if(protocol->flag & SubGhzProtocolFlag_Send) { if((protocol->type == SubGhzProtocolTypeStatic) || (protocol->type == SubGhzProtocolTypeDynamic) || +#ifndef FW_ORIGIN_Official (protocol->type == SubGhzProtocolTypeBinRAW) || +#endif (protocol->type == SubGhzProtocolTypeRAW)) { sub_preset->type = protocol->type; } else { diff --git a/applications/external/subghz_remote_refactored/helpers/subrem_presets.h b/applications/external/subghz_remote/helpers/subrem_presets.h similarity index 100% rename from applications/external/subghz_remote_refactored/helpers/subrem_presets.h rename to applications/external/subghz_remote/helpers/subrem_presets.h diff --git a/applications/external/subghz_remote_refactored/helpers/subrem_types.h b/applications/external/subghz_remote/helpers/subrem_types.h similarity index 100% rename from applications/external/subghz_remote_refactored/helpers/subrem_types.h rename to applications/external/subghz_remote/helpers/subrem_types.h diff --git a/applications/external/subghz_remote_refactored/helpers/txrx/Readme.md b/applications/external/subghz_remote/helpers/txrx/Readme.md similarity index 100% rename from applications/external/subghz_remote_refactored/helpers/txrx/Readme.md rename to applications/external/subghz_remote/helpers/txrx/Readme.md diff --git a/applications/external/subghz_remote_refactored/helpers/txrx/subghz_txrx.c b/applications/external/subghz_remote/helpers/txrx/subghz_txrx.c similarity index 99% rename from applications/external/subghz_remote_refactored/helpers/txrx/subghz_txrx.c rename to applications/external/subghz_remote/helpers/txrx/subghz_txrx.c index 871c4154e10..cd54ca3f471 100644 --- a/applications/external/subghz_remote_refactored/helpers/txrx/subghz_txrx.c +++ b/applications/external/subghz_remote/helpers/txrx/subghz_txrx.c @@ -4,7 +4,9 @@ #include #include +#ifndef FW_ORIGIN_Official #include +#endif #define TAG "SubGhz" @@ -657,12 +659,14 @@ bool subghz_txrx_get_debug_pin_state(SubGhzTxRx* instance) { return instance->debug_pin_state; } +#ifndef FW_ORIGIN_Official void subghz_txrx_reset_dynamic_and_custom_btns(SubGhzTxRx* instance) { furi_assert(instance); subghz_environment_reset_keeloq(instance->environment); subghz_custom_btns_reset(); } +#endif SubGhzReceiver* subghz_txrx_get_receiver(SubGhzTxRx* instance) { furi_assert(instance); diff --git a/applications/external/subghz_remote_refactored/helpers/txrx/subghz_txrx.h b/applications/external/subghz_remote/helpers/txrx/subghz_txrx.h similarity index 99% rename from applications/external/subghz_remote_refactored/helpers/txrx/subghz_txrx.h rename to applications/external/subghz_remote/helpers/txrx/subghz_txrx.h index c3d09d3162f..8a96c54c3a9 100644 --- a/applications/external/subghz_remote_refactored/helpers/txrx/subghz_txrx.h +++ b/applications/external/subghz_remote/helpers/txrx/subghz_txrx.h @@ -369,7 +369,7 @@ bool subghz_txrx_radio_device_is_tx_allowed(SubGhzTxRx* instance, uint32_t frequ void subghz_txrx_set_debug_pin_state(SubGhzTxRx* instance, bool state); bool subghz_txrx_get_debug_pin_state(SubGhzTxRx* instance); - +#ifndef FW_ORIGIN_Official void subghz_txrx_reset_dynamic_and_custom_btns(SubGhzTxRx* instance); - +#endif SubGhzReceiver* subghz_txrx_get_receiver(SubGhzTxRx* instance); // TODO use only in DecodeRaw diff --git a/applications/external/subghz_remote_refactored/helpers/txrx/subghz_txrx_i.h b/applications/external/subghz_remote/helpers/txrx/subghz_txrx_i.h similarity index 100% rename from applications/external/subghz_remote_refactored/helpers/txrx/subghz_txrx_i.h rename to applications/external/subghz_remote/helpers/txrx/subghz_txrx_i.h diff --git a/applications/external/subghz_remote_refactored/icon.png b/applications/external/subghz_remote/icon.png similarity index 100% rename from applications/external/subghz_remote_refactored/icon.png rename to applications/external/subghz_remote/icon.png diff --git a/applications/external/subghz_remote_refactored/icons/DolphinNice_96x59.png b/applications/external/subghz_remote/icons/DolphinNice_96x59.png similarity index 100% rename from applications/external/subghz_remote_refactored/icons/DolphinNice_96x59.png rename to applications/external/subghz_remote/icons/DolphinNice_96x59.png diff --git a/applications/external/subghz_remote_refactored/icons/remote_scene/Dpad/down.png b/applications/external/subghz_remote/icons/remote_scene/Dpad/down.png similarity index 100% rename from applications/external/subghz_remote_refactored/icons/remote_scene/Dpad/down.png rename to applications/external/subghz_remote/icons/remote_scene/Dpad/down.png diff --git a/applications/external/subghz_remote_refactored/icons/remote_scene/Dpad/down_hover.png b/applications/external/subghz_remote/icons/remote_scene/Dpad/down_hover.png similarity index 100% rename from applications/external/subghz_remote_refactored/icons/remote_scene/Dpad/down_hover.png rename to applications/external/subghz_remote/icons/remote_scene/Dpad/down_hover.png diff --git a/applications/external/subghz_remote_refactored/icons/remote_scene/Dpad/left.png b/applications/external/subghz_remote/icons/remote_scene/Dpad/left.png similarity index 100% rename from applications/external/subghz_remote_refactored/icons/remote_scene/Dpad/left.png rename to applications/external/subghz_remote/icons/remote_scene/Dpad/left.png diff --git a/applications/external/subghz_remote_refactored/icons/remote_scene/Dpad/left_hover.png b/applications/external/subghz_remote/icons/remote_scene/Dpad/left_hover.png similarity index 100% rename from applications/external/subghz_remote_refactored/icons/remote_scene/Dpad/left_hover.png rename to applications/external/subghz_remote/icons/remote_scene/Dpad/left_hover.png diff --git a/applications/external/subghz_remote_refactored/icons/remote_scene/Dpad/ok.png b/applications/external/subghz_remote/icons/remote_scene/Dpad/ok.png similarity index 100% rename from applications/external/subghz_remote_refactored/icons/remote_scene/Dpad/ok.png rename to applications/external/subghz_remote/icons/remote_scene/Dpad/ok.png diff --git a/applications/external/subghz_remote_refactored/icons/remote_scene/Dpad/ok_hover.png b/applications/external/subghz_remote/icons/remote_scene/Dpad/ok_hover.png similarity index 100% rename from applications/external/subghz_remote_refactored/icons/remote_scene/Dpad/ok_hover.png rename to applications/external/subghz_remote/icons/remote_scene/Dpad/ok_hover.png diff --git a/applications/external/subghz_remote_refactored/icons/remote_scene/Dpad/right.png b/applications/external/subghz_remote/icons/remote_scene/Dpad/right.png similarity index 100% rename from applications/external/subghz_remote_refactored/icons/remote_scene/Dpad/right.png rename to applications/external/subghz_remote/icons/remote_scene/Dpad/right.png diff --git a/applications/external/subghz_remote_refactored/icons/remote_scene/Dpad/right_hover.png b/applications/external/subghz_remote/icons/remote_scene/Dpad/right_hover.png similarity index 100% rename from applications/external/subghz_remote_refactored/icons/remote_scene/Dpad/right_hover.png rename to applications/external/subghz_remote/icons/remote_scene/Dpad/right_hover.png diff --git a/applications/external/subghz_remote_refactored/icons/remote_scene/Dpad/up.png b/applications/external/subghz_remote/icons/remote_scene/Dpad/up.png similarity index 100% rename from applications/external/subghz_remote_refactored/icons/remote_scene/Dpad/up.png rename to applications/external/subghz_remote/icons/remote_scene/Dpad/up.png diff --git a/applications/external/subghz_remote_refactored/icons/remote_scene/Dpad/up_hover.png b/applications/external/subghz_remote/icons/remote_scene/Dpad/up_hover.png similarity index 100% rename from applications/external/subghz_remote_refactored/icons/remote_scene/Dpad/up_hover.png rename to applications/external/subghz_remote/icons/remote_scene/Dpad/up_hover.png diff --git a/applications/external/subghz_remote_refactored/icons/remote_scene/list/ButtonDown_7x4.png b/applications/external/subghz_remote/icons/remote_scene/list/ButtonDown_7x4.png similarity index 100% rename from applications/external/subghz_remote_refactored/icons/remote_scene/list/ButtonDown_7x4.png rename to applications/external/subghz_remote/icons/remote_scene/list/ButtonDown_7x4.png diff --git a/applications/external/subghz_remote_refactored/icons/remote_scene/list/ButtonLeft_4x7.png b/applications/external/subghz_remote/icons/remote_scene/list/ButtonLeft_4x7.png similarity index 100% rename from applications/external/subghz_remote_refactored/icons/remote_scene/list/ButtonLeft_4x7.png rename to applications/external/subghz_remote/icons/remote_scene/list/ButtonLeft_4x7.png diff --git a/applications/external/subghz_remote_refactored/icons/remote_scene/list/ButtonRight_4x7.png b/applications/external/subghz_remote/icons/remote_scene/list/ButtonRight_4x7.png similarity index 100% rename from applications/external/subghz_remote_refactored/icons/remote_scene/list/ButtonRight_4x7.png rename to applications/external/subghz_remote/icons/remote_scene/list/ButtonRight_4x7.png diff --git a/applications/external/subghz_remote_refactored/icons/remote_scene/list/ButtonUp_7x4.png b/applications/external/subghz_remote/icons/remote_scene/list/ButtonUp_7x4.png similarity index 100% rename from applications/external/subghz_remote_refactored/icons/remote_scene/list/ButtonUp_7x4.png rename to applications/external/subghz_remote/icons/remote_scene/list/ButtonUp_7x4.png diff --git a/applications/external/subghz_remote_refactored/icons/remote_scene/list/Ok_btn_9x9.png b/applications/external/subghz_remote/icons/remote_scene/list/Ok_btn_9x9.png similarity index 100% rename from applications/external/subghz_remote_refactored/icons/remote_scene/list/Ok_btn_9x9.png rename to applications/external/subghz_remote/icons/remote_scene/list/Ok_btn_9x9.png diff --git a/applications/external/subghz_remote_refactored/icons/remote_scene/statusbar/External_antenna_20x12.png b/applications/external/subghz_remote/icons/remote_scene/statusbar/External_antenna_20x12.png similarity index 100% rename from applications/external/subghz_remote_refactored/icons/remote_scene/statusbar/External_antenna_20x12.png rename to applications/external/subghz_remote/icons/remote_scene/statusbar/External_antenna_20x12.png diff --git a/applications/external/subghz_remote_refactored/icons/remote_scene/statusbar/Internal_antenna_20x12.png b/applications/external/subghz_remote/icons/remote_scene/statusbar/Internal_antenna_20x12.png similarity index 100% rename from applications/external/subghz_remote_refactored/icons/remote_scene/statusbar/Internal_antenna_20x12.png rename to applications/external/subghz_remote/icons/remote_scene/statusbar/Internal_antenna_20x12.png diff --git a/applications/external/subghz_remote_refactored/icons/remote_scene/statusbar/Pin_arrow_up_7x9.png b/applications/external/subghz_remote/icons/remote_scene/statusbar/Pin_arrow_up_7x9.png similarity index 100% rename from applications/external/subghz_remote_refactored/icons/remote_scene/statusbar/Pin_arrow_up_7x9.png rename to applications/external/subghz_remote/icons/remote_scene/statusbar/Pin_arrow_up_7x9.png diff --git a/applications/external/subghz_remote_refactored/icons/remote_scene/statusbar/Status_cube_14x14.png b/applications/external/subghz_remote/icons/remote_scene/statusbar/Status_cube_14x14.png similarity index 100% rename from applications/external/subghz_remote_refactored/icons/remote_scene/statusbar/Status_cube_14x14.png rename to applications/external/subghz_remote/icons/remote_scene/statusbar/Status_cube_14x14.png diff --git a/applications/external/subghz_remote_refactored/icons/remote_scene/statusbar/status_bar.png b/applications/external/subghz_remote/icons/remote_scene/statusbar/status_bar.png similarity index 100% rename from applications/external/subghz_remote_refactored/icons/remote_scene/statusbar/status_bar.png rename to applications/external/subghz_remote/icons/remote_scene/statusbar/status_bar.png diff --git a/applications/external/subghz_remote_refactored/icons/sub1_10px.png b/applications/external/subghz_remote/icons/sub1_10px.png similarity index 100% rename from applications/external/subghz_remote_refactored/icons/sub1_10px.png rename to applications/external/subghz_remote/icons/sub1_10px.png diff --git a/applications/external/subghz_remote_refactored/icons/subrem_10px.png b/applications/external/subghz_remote/icons/subrem_10px.png similarity index 100% rename from applications/external/subghz_remote_refactored/icons/subrem_10px.png rename to applications/external/subghz_remote/icons/subrem_10px.png diff --git a/applications/external/subghz_remote_refactored/scenes/subrem_scene.c b/applications/external/subghz_remote/scenes/subrem_scene.c similarity index 100% rename from applications/external/subghz_remote_refactored/scenes/subrem_scene.c rename to applications/external/subghz_remote/scenes/subrem_scene.c diff --git a/applications/external/subghz_remote_refactored/scenes/subrem_scene.h b/applications/external/subghz_remote/scenes/subrem_scene.h similarity index 100% rename from applications/external/subghz_remote_refactored/scenes/subrem_scene.h rename to applications/external/subghz_remote/scenes/subrem_scene.h diff --git a/applications/external/subghz_remote_refactored/scenes/subrem_scene_config.h b/applications/external/subghz_remote/scenes/subrem_scene_config.h similarity index 73% rename from applications/external/subghz_remote_refactored/scenes/subrem_scene_config.h rename to applications/external/subghz_remote/scenes/subrem_scene_config.h index 08486be7485..56fe641a68b 100644 --- a/applications/external/subghz_remote_refactored/scenes/subrem_scene_config.h +++ b/applications/external/subghz_remote/scenes/subrem_scene_config.h @@ -6,4 +6,7 @@ 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) \ No newline at end of file +ADD_SCENE(subrem, enter_new_name, EnterNewName) +#ifdef FW_ORIGIN_Official +ADD_SCENE(subrem, fw_warning, FwWarning) +#endif \ No newline at end of file diff --git a/applications/external/subghz_remote_refactored/scenes/subrem_scene_edit_label.c b/applications/external/subghz_remote/scenes/subrem_scene_edit_label.c similarity index 99% rename from applications/external/subghz_remote_refactored/scenes/subrem_scene_edit_label.c rename to applications/external/subghz_remote/scenes/subrem_scene_edit_label.c index d58f90fd7fc..25c10bb46a4 100644 --- a/applications/external/subghz_remote_refactored/scenes/subrem_scene_edit_label.c +++ b/applications/external/subghz_remote/scenes/subrem_scene_edit_label.c @@ -53,9 +53,9 @@ void subrem_scene_edit_label_on_enter(void* context) { app->file_name_tmp, 25, false); - +#ifndef FW_ORIGIN_Official text_input_set_minimum_length(app->text_input, 0); - +#endif widget_add_string_element( app->widget, 63, 12, AlignCenter, AlignCenter, FontPrimary, "Empty Label Name"); widget_add_string_element( diff --git a/applications/external/subghz_remote_refactored/scenes/subrem_scene_edit_menu.c b/applications/external/subghz_remote/scenes/subrem_scene_edit_menu.c similarity index 100% rename from applications/external/subghz_remote_refactored/scenes/subrem_scene_edit_menu.c rename to applications/external/subghz_remote/scenes/subrem_scene_edit_menu.c diff --git a/applications/external/subghz_remote_refactored/scenes/subrem_scene_edit_preview.c b/applications/external/subghz_remote/scenes/subrem_scene_edit_preview.c similarity index 100% rename from applications/external/subghz_remote_refactored/scenes/subrem_scene_edit_preview.c rename to applications/external/subghz_remote/scenes/subrem_scene_edit_preview.c diff --git a/applications/external/subghz_remote_refactored/scenes/subrem_scene_edit_submenu.c b/applications/external/subghz_remote/scenes/subrem_scene_edit_submenu.c similarity index 100% rename from applications/external/subghz_remote_refactored/scenes/subrem_scene_edit_submenu.c rename to applications/external/subghz_remote/scenes/subrem_scene_edit_submenu.c diff --git a/applications/external/subghz_remote_refactored/scenes/subrem_scene_enter_new_name.c b/applications/external/subghz_remote/scenes/subrem_scene_enter_new_name.c similarity index 100% rename from applications/external/subghz_remote_refactored/scenes/subrem_scene_enter_new_name.c rename to applications/external/subghz_remote/scenes/subrem_scene_enter_new_name.c diff --git a/applications/external/subghz_remote_refactored/scenes/subrem_scene_fw_warning.c b/applications/external/subghz_remote/scenes/subrem_scene_fw_warning.c similarity index 100% rename from applications/external/subghz_remote_refactored/scenes/subrem_scene_fw_warning.c rename to applications/external/subghz_remote/scenes/subrem_scene_fw_warning.c diff --git a/applications/external/subghz_remote_refactored/scenes/subrem_scene_open_map_file.c b/applications/external/subghz_remote/scenes/subrem_scene_open_map_file.c similarity index 100% rename from applications/external/subghz_remote_refactored/scenes/subrem_scene_open_map_file.c rename to applications/external/subghz_remote/scenes/subrem_scene_open_map_file.c diff --git a/applications/external/subghz_remote_refactored/scenes/subrem_scene_open_sub_file.c b/applications/external/subghz_remote/scenes/subrem_scene_open_sub_file.c similarity index 100% rename from applications/external/subghz_remote_refactored/scenes/subrem_scene_open_sub_file.c rename to applications/external/subghz_remote/scenes/subrem_scene_open_sub_file.c diff --git a/applications/external/subghz_remote_refactored/scenes/subrem_scene_remote.c b/applications/external/subghz_remote/scenes/subrem_scene_remote.c similarity index 100% rename from applications/external/subghz_remote_refactored/scenes/subrem_scene_remote.c rename to applications/external/subghz_remote/scenes/subrem_scene_remote.c diff --git a/applications/external/subghz_remote_refactored/scenes/subrem_scene_start.c b/applications/external/subghz_remote/scenes/subrem_scene_start.c similarity index 100% rename from applications/external/subghz_remote_refactored/scenes/subrem_scene_start.c rename to applications/external/subghz_remote/scenes/subrem_scene_start.c diff --git a/applications/external/subghz_remote_refactored/subghz_remote_app.c b/applications/external/subghz_remote/subghz_remote_app.c similarity index 94% rename from applications/external/subghz_remote_refactored/subghz_remote_app.c rename to applications/external/subghz_remote/subghz_remote_app.c index 0f9ea488114..3b4fc2afe73 100644 --- a/applications/external/subghz_remote_refactored/subghz_remote_app.c +++ b/applications/external/subghz_remote/subghz_remote_app.c @@ -172,7 +172,9 @@ int32_t subghz_remote_app(void* arg) { subghz_remote_make_app_folder(subghz_remote_app); bool map_loaded = false; - +#ifdef FW_ORIGIN_Official + const bool fw_ofw = strcmp(version_get_firmware_origin(version_get()), "Official") == 0; +#endif if((arg != NULL) && (strlen(arg) != 0)) { furi_string_set(subghz_remote_app->file_path, (const char*)arg); SubRemLoadMapState load_state = subrem_map_file_load( @@ -191,8 +193,19 @@ int32_t subghz_remote_app(void* arg) { } else { furi_string_set(subghz_remote_app->file_path, SUBREM_APP_FOLDER); scene_manager_next_scene(subghz_remote_app->scene_manager, SubRemSceneStart); +#ifdef FW_ORIGIN_Official + if(fw_ofw) { + scene_manager_next_scene(subghz_remote_app->scene_manager, SubRemSceneOpenMapFile); + } + } + + if(!fw_ofw) { + scene_manager_next_scene(subghz_remote_app->scene_manager, SubRemSceneFwWarning); + } +#else scene_manager_next_scene(subghz_remote_app->scene_manager, SubRemSceneOpenMapFile); } +#endif view_dispatcher_run(subghz_remote_app->view_dispatcher); diff --git a/applications/external/subghz_remote_refactored/subghz_remote_app_i.c b/applications/external/subghz_remote/subghz_remote_app_i.c similarity index 99% rename from applications/external/subghz_remote_refactored/subghz_remote_app_i.c rename to applications/external/subghz_remote/subghz_remote_app_i.c index bb630eba3f4..777ef151d01 100644 --- a/applications/external/subghz_remote_refactored/subghz_remote_app_i.c +++ b/applications/external/subghz_remote/subghz_remote_app_i.c @@ -4,7 +4,9 @@ #include "helpers/txrx/subghz_txrx.h" #include +#ifndef FW_ORIGIN_Official #include +#endif #define TAG "SubGhzRemote" @@ -221,9 +223,9 @@ bool subrem_tx_start_sub(SubGhzRemoteApp* app, SubRemSubFilePreset* sub_preset) sub_preset->freq_preset.frequency, NULL, 0); - +#ifndef FW_ORIGIN_Official subghz_custom_btns_reset(); - +#endif if(subghz_txrx_tx_start(app->txrx, sub_preset->fff_data) == SubGhzTxRxStartTxStateOk) { ret = true; } @@ -238,12 +240,12 @@ bool subrem_tx_stop_sub(SubGhzRemoteApp* app, bool forced) { if(forced || (sub_preset->type != SubGhzProtocolTypeRAW)) { subghz_txrx_stop(app->txrx); - +#ifndef FW_ORIGIN_Official if(sub_preset->type == SubGhzProtocolTypeDynamic) { subghz_txrx_reset_dynamic_and_custom_btns(app->txrx); } subghz_custom_btns_reset(); - +#endif return true; } diff --git a/applications/external/subghz_remote_refactored/subghz_remote_app_i.h b/applications/external/subghz_remote/subghz_remote_app_i.h similarity index 97% rename from applications/external/subghz_remote_refactored/subghz_remote_app_i.h rename to applications/external/subghz_remote/subghz_remote_app_i.h index fd1a28ae76b..57ed085f677 100644 --- a/applications/external/subghz_remote_refactored/subghz_remote_app_i.h +++ b/applications/external/subghz_remote/subghz_remote_app_i.h @@ -6,6 +6,7 @@ #include "helpers/txrx/subghz_txrx.h" +// Fix importing from firmware for folder path #if __has_include("subghz_remote_icons.h") #include "subghz_remote_icons.h" #endif diff --git a/applications/external/subghz_remote_refactored/views/edit_menu.c b/applications/external/subghz_remote/views/edit_menu.c similarity index 100% rename from applications/external/subghz_remote_refactored/views/edit_menu.c rename to applications/external/subghz_remote/views/edit_menu.c diff --git a/applications/external/subghz_remote_refactored/views/edit_menu.h b/applications/external/subghz_remote/views/edit_menu.h similarity index 100% rename from applications/external/subghz_remote_refactored/views/edit_menu.h rename to applications/external/subghz_remote/views/edit_menu.h diff --git a/applications/external/subghz_remote_refactored/views/remote.c b/applications/external/subghz_remote/views/remote.c similarity index 99% rename from applications/external/subghz_remote_refactored/views/remote.c rename to applications/external/subghz_remote/views/remote.c index a9ee39574ad..d78e3c149b3 100644 --- a/applications/external/subghz_remote_refactored/views/remote.c +++ b/applications/external/subghz_remote/views/remote.c @@ -216,10 +216,8 @@ bool subrem_view_remote_input(InputEvent* event, void* context) { furi_assert(context); SubRemViewRemote* subrem_view_remote = context; - /* Want to stop sending if we are sending, exit the app if we are not! */ if(event->key == InputKeyBack && event->type == InputTypePress) { bool is_stopping = false; - with_view_model( subrem_view_remote->view, SubRemViewRemoteModel * model, @@ -241,7 +239,6 @@ bool subrem_view_remote_input(InputEvent* event, void* context) { return true; } - // BACK button processing end if(event->key == InputKeyUp && event->type == InputTypePress) { diff --git a/applications/external/subghz_remote_refactored/views/remote.h b/applications/external/subghz_remote/views/remote.h similarity index 100% rename from applications/external/subghz_remote_refactored/views/remote.h rename to applications/external/subghz_remote/views/remote.h