diff --git a/applications/external/subghz_remote_new/application.fam b/applications/external/subghz_remote_configurator/application.fam similarity index 79% rename from applications/external/subghz_remote_new/application.fam rename to applications/external/subghz_remote_configurator/application.fam index 7590e46a5..9b164a093 100644 --- a/applications/external/subghz_remote_new/application.fam +++ b/applications/external/subghz_remote_configurator/application.fam @@ -1,8 +1,8 @@ App( appid="subrem_configurator", - name="SubRem Configurator", + name="SubGHz Remote Configurator", apptype=FlipperAppType.EXTERNAL, - entry_point="subghz_remote_app", + entry_point="subghz_remote_config_app", requires=[ "gui", "dialogs", diff --git a/applications/external/subghz_remote_new/helpers/subrem_custom_event.h b/applications/external/subghz_remote_configurator/helpers/subrem_custom_event.h similarity index 100% rename from applications/external/subghz_remote_new/helpers/subrem_custom_event.h rename to applications/external/subghz_remote_configurator/helpers/subrem_custom_event.h diff --git a/applications/external/subghz_remote_new/helpers/subrem_presets.c b/applications/external/subghz_remote_configurator/helpers/subrem_presets.c similarity index 100% rename from applications/external/subghz_remote_new/helpers/subrem_presets.c rename to applications/external/subghz_remote_configurator/helpers/subrem_presets.c diff --git a/applications/external/subghz_remote_new/helpers/subrem_presets.h b/applications/external/subghz_remote_configurator/helpers/subrem_presets.h similarity index 100% rename from applications/external/subghz_remote_new/helpers/subrem_presets.h rename to applications/external/subghz_remote_configurator/helpers/subrem_presets.h diff --git a/applications/external/subghz_remote_new/helpers/subrem_types.h b/applications/external/subghz_remote_configurator/helpers/subrem_types.h similarity index 100% rename from applications/external/subghz_remote_new/helpers/subrem_types.h rename to applications/external/subghz_remote_configurator/helpers/subrem_types.h diff --git a/applications/external/subghz_remote_new/helpers/txrx/Readme.md b/applications/external/subghz_remote_configurator/helpers/txrx/Readme.md similarity index 100% rename from applications/external/subghz_remote_new/helpers/txrx/Readme.md rename to applications/external/subghz_remote_configurator/helpers/txrx/Readme.md diff --git a/applications/external/subghz_remote_new/helpers/txrx/subghz_txrx.c b/applications/external/subghz_remote_configurator/helpers/txrx/subghz_txrx.c similarity index 100% rename from applications/external/subghz_remote_new/helpers/txrx/subghz_txrx.c rename to applications/external/subghz_remote_configurator/helpers/txrx/subghz_txrx.c diff --git a/applications/external/subghz_remote_new/helpers/txrx/subghz_txrx.h b/applications/external/subghz_remote_configurator/helpers/txrx/subghz_txrx.h similarity index 100% rename from applications/external/subghz_remote_new/helpers/txrx/subghz_txrx.h rename to applications/external/subghz_remote_configurator/helpers/txrx/subghz_txrx.h diff --git a/applications/external/subghz_remote_new/helpers/txrx/subghz_txrx_i.h b/applications/external/subghz_remote_configurator/helpers/txrx/subghz_txrx_i.h similarity index 100% rename from applications/external/subghz_remote_new/helpers/txrx/subghz_txrx_i.h rename to applications/external/subghz_remote_configurator/helpers/txrx/subghz_txrx_i.h diff --git a/applications/external/subghz_remote_new/icons/DolphinNice_96x59.png b/applications/external/subghz_remote_configurator/icons/DolphinNice_96x59.png similarity index 100% rename from applications/external/subghz_remote_new/icons/DolphinNice_96x59.png rename to applications/external/subghz_remote_configurator/icons/DolphinNice_96x59.png diff --git a/applications/external/subghz_remote_new/icons/remote_scene/ButtonDown_7x4.png b/applications/external/subghz_remote_configurator/icons/remote_scene/ButtonDown_7x4.png similarity index 100% rename from applications/external/subghz_remote_new/icons/remote_scene/ButtonDown_7x4.png rename to applications/external/subghz_remote_configurator/icons/remote_scene/ButtonDown_7x4.png diff --git a/applications/external/subghz_remote_new/icons/remote_scene/ButtonLeft_4x7.png b/applications/external/subghz_remote_configurator/icons/remote_scene/ButtonLeft_4x7.png similarity index 100% rename from applications/external/subghz_remote_new/icons/remote_scene/ButtonLeft_4x7.png rename to applications/external/subghz_remote_configurator/icons/remote_scene/ButtonLeft_4x7.png diff --git a/applications/external/subghz_remote_new/icons/remote_scene/ButtonRight_4x7.png b/applications/external/subghz_remote_configurator/icons/remote_scene/ButtonRight_4x7.png similarity index 100% rename from applications/external/subghz_remote_new/icons/remote_scene/ButtonRight_4x7.png rename to applications/external/subghz_remote_configurator/icons/remote_scene/ButtonRight_4x7.png diff --git a/applications/external/subghz_remote_new/icons/remote_scene/ButtonUp_7x4.png b/applications/external/subghz_remote_configurator/icons/remote_scene/ButtonUp_7x4.png similarity index 100% rename from applications/external/subghz_remote_new/icons/remote_scene/ButtonUp_7x4.png rename to applications/external/subghz_remote_configurator/icons/remote_scene/ButtonUp_7x4.png diff --git a/applications/external/subghz_remote_new/icons/remote_scene/Ok_btn_9x9.png b/applications/external/subghz_remote_configurator/icons/remote_scene/Ok_btn_9x9.png similarity index 100% rename from applications/external/subghz_remote_new/icons/remote_scene/Ok_btn_9x9.png rename to applications/external/subghz_remote_configurator/icons/remote_scene/Ok_btn_9x9.png diff --git a/applications/external/subghz_remote_new/icons/remote_scene/Pin_arrow_up_7x9.png b/applications/external/subghz_remote_configurator/icons/remote_scene/Pin_arrow_up_7x9.png similarity index 100% rename from applications/external/subghz_remote_new/icons/remote_scene/Pin_arrow_up_7x9.png rename to applications/external/subghz_remote_configurator/icons/remote_scene/Pin_arrow_up_7x9.png diff --git a/applications/external/subghz_remote_new/icons/remote_scene/Pin_cell_13x13.png b/applications/external/subghz_remote_configurator/icons/remote_scene/Pin_cell_13x13.png similarity index 100% rename from applications/external/subghz_remote_new/icons/remote_scene/Pin_cell_13x13.png rename to applications/external/subghz_remote_configurator/icons/remote_scene/Pin_cell_13x13.png diff --git a/applications/external/subghz_remote_new/icons/remote_scene/Pin_star_7x7.png b/applications/external/subghz_remote_configurator/icons/remote_scene/Pin_star_7x7.png similarity index 100% rename from applications/external/subghz_remote_new/icons/remote_scene/Pin_star_7x7.png rename to applications/external/subghz_remote_configurator/icons/remote_scene/Pin_star_7x7.png diff --git a/applications/external/subghz_remote_new/icons/remote_scene/back_10px.png b/applications/external/subghz_remote_configurator/icons/remote_scene/back_10px.png similarity index 100% rename from applications/external/subghz_remote_new/icons/remote_scene/back_10px.png rename to applications/external/subghz_remote_configurator/icons/remote_scene/back_10px.png diff --git a/applications/external/subghz_remote_new/icons/sub1_10px.png b/applications/external/subghz_remote_configurator/icons/sub1_10px.png similarity index 100% rename from applications/external/subghz_remote_new/icons/sub1_10px.png rename to applications/external/subghz_remote_configurator/icons/sub1_10px.png diff --git a/applications/external/subghz_remote_new/icons/subrem_10px.png b/applications/external/subghz_remote_configurator/icons/subrem_10px.png similarity index 100% rename from applications/external/subghz_remote_new/icons/subrem_10px.png rename to applications/external/subghz_remote_configurator/icons/subrem_10px.png diff --git a/applications/external/subghz_remote_new/scenes/subrem_scene.c b/applications/external/subghz_remote_configurator/scenes/subrem_scene.c similarity index 100% rename from applications/external/subghz_remote_new/scenes/subrem_scene.c rename to applications/external/subghz_remote_configurator/scenes/subrem_scene.c diff --git a/applications/external/subghz_remote_new/scenes/subrem_scene.h b/applications/external/subghz_remote_configurator/scenes/subrem_scene.h similarity index 100% rename from applications/external/subghz_remote_new/scenes/subrem_scene.h rename to applications/external/subghz_remote_configurator/scenes/subrem_scene.h diff --git a/applications/external/subghz_remote_new/scenes/subrem_scene_config.h b/applications/external/subghz_remote_configurator/scenes/subrem_scene_config.h similarity index 100% rename from applications/external/subghz_remote_new/scenes/subrem_scene_config.h rename to applications/external/subghz_remote_configurator/scenes/subrem_scene_config.h diff --git a/applications/external/subghz_remote_new/scenes/subrem_scene_edit_label.c b/applications/external/subghz_remote_configurator/scenes/subrem_scene_edit_label.c similarity index 100% rename from applications/external/subghz_remote_new/scenes/subrem_scene_edit_label.c rename to applications/external/subghz_remote_configurator/scenes/subrem_scene_edit_label.c diff --git a/applications/external/subghz_remote_new/scenes/subrem_scene_edit_menu.c b/applications/external/subghz_remote_configurator/scenes/subrem_scene_edit_menu.c similarity index 100% rename from applications/external/subghz_remote_new/scenes/subrem_scene_edit_menu.c rename to applications/external/subghz_remote_configurator/scenes/subrem_scene_edit_menu.c diff --git a/applications/external/subghz_remote_new/scenes/subrem_scene_edit_preview.c b/applications/external/subghz_remote_configurator/scenes/subrem_scene_edit_preview.c similarity index 100% rename from applications/external/subghz_remote_new/scenes/subrem_scene_edit_preview.c rename to applications/external/subghz_remote_configurator/scenes/subrem_scene_edit_preview.c diff --git a/applications/external/subghz_remote_new/scenes/subrem_scene_edit_submenu.c b/applications/external/subghz_remote_configurator/scenes/subrem_scene_edit_submenu.c similarity index 100% rename from applications/external/subghz_remote_new/scenes/subrem_scene_edit_submenu.c rename to applications/external/subghz_remote_configurator/scenes/subrem_scene_edit_submenu.c diff --git a/applications/external/subghz_remote_new/scenes/subrem_scene_enter_new_name.c b/applications/external/subghz_remote_configurator/scenes/subrem_scene_enter_new_name.c similarity index 100% rename from applications/external/subghz_remote_new/scenes/subrem_scene_enter_new_name.c rename to applications/external/subghz_remote_configurator/scenes/subrem_scene_enter_new_name.c diff --git a/applications/external/subghz_remote_new/scenes/subrem_scene_open_map_file.c b/applications/external/subghz_remote_configurator/scenes/subrem_scene_open_map_file.c similarity index 100% rename from applications/external/subghz_remote_new/scenes/subrem_scene_open_map_file.c rename to applications/external/subghz_remote_configurator/scenes/subrem_scene_open_map_file.c diff --git a/applications/external/subghz_remote_new/scenes/subrem_scene_open_sub_file.c b/applications/external/subghz_remote_configurator/scenes/subrem_scene_open_sub_file.c similarity index 100% rename from applications/external/subghz_remote_new/scenes/subrem_scene_open_sub_file.c rename to applications/external/subghz_remote_configurator/scenes/subrem_scene_open_sub_file.c diff --git a/applications/external/subghz_remote_new/scenes/subrem_scene_start.c b/applications/external/subghz_remote_configurator/scenes/subrem_scene_start.c similarity index 100% rename from applications/external/subghz_remote_new/scenes/subrem_scene_start.c rename to applications/external/subghz_remote_configurator/scenes/subrem_scene_start.c diff --git a/applications/external/subghz_remote_new/subghz_remote_app.c b/applications/external/subghz_remote_configurator/subghz_remote_app.c similarity index 98% rename from applications/external/subghz_remote_new/subghz_remote_app.c rename to applications/external/subghz_remote_configurator/subghz_remote_app.c index e026fe4de..84100a233 100644 --- a/applications/external/subghz_remote_new/subghz_remote_app.c +++ b/applications/external/subghz_remote_configurator/subghz_remote_app.c @@ -28,7 +28,7 @@ SubGhzRemoteApp* subghz_remote_app_alloc() { //FURI_LOG_E(TAG, "Could not create folder %s", SUBREM_APP_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 @@ -39,7 +39,7 @@ SubGhzRemoteApp* subghz_remote_app_alloc() { } furi_hal_power_suppress_charge_enter(); - +*/ app->file_path = furi_string_alloc(); furi_string_set(app->file_path, SUBREM_APP_FOLDER); @@ -125,14 +125,14 @@ SubGhzRemoteApp* subghz_remote_app_alloc() { void subghz_remote_app_free(SubGhzRemoteApp* app) { furi_assert(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); @@ -183,7 +183,7 @@ void subghz_remote_app_free(SubGhzRemoteApp* app) { free(app); } -int32_t subghz_remote_app(void* p) { +int32_t subghz_remote_config_app(void* p) { UNUSED(p); SubGhzRemoteApp* subghz_remote_app = subghz_remote_app_alloc(); diff --git a/applications/external/subghz_remote_new/subghz_remote_app_i.c b/applications/external/subghz_remote_configurator/subghz_remote_app_i.c similarity index 100% rename from applications/external/subghz_remote_new/subghz_remote_app_i.c rename to applications/external/subghz_remote_configurator/subghz_remote_app_i.c diff --git a/applications/external/subghz_remote_new/subghz_remote_app_i.h b/applications/external/subghz_remote_configurator/subghz_remote_app_i.h similarity index 100% rename from applications/external/subghz_remote_new/subghz_remote_app_i.h rename to applications/external/subghz_remote_configurator/subghz_remote_app_i.h diff --git a/applications/external/subghz_remote_new/views/edit_menu.c b/applications/external/subghz_remote_configurator/views/edit_menu.c similarity index 100% rename from applications/external/subghz_remote_new/views/edit_menu.c rename to applications/external/subghz_remote_configurator/views/edit_menu.c diff --git a/applications/external/subghz_remote_new/views/edit_menu.h b/applications/external/subghz_remote_configurator/views/edit_menu.h similarity index 100% rename from applications/external/subghz_remote_new/views/edit_menu.h rename to applications/external/subghz_remote_configurator/views/edit_menu.h diff --git a/applications/external/subghz_remote_new/views/remote.c b/applications/external/subghz_remote_configurator/views/remote.c similarity index 100% rename from applications/external/subghz_remote_new/views/remote.c rename to applications/external/subghz_remote_configurator/views/remote.c diff --git a/applications/external/subghz_remote_new/views/remote.h b/applications/external/subghz_remote_configurator/views/remote.h similarity index 100% rename from applications/external/subghz_remote_new/views/remote.h rename to applications/external/subghz_remote_configurator/views/remote.h