This commit is contained in:
RogueMaster
2022-09-17 03:03:20 -04:00
parent 8a2ced2295
commit 9e0e6dbf19
10 changed files with 389 additions and 6 deletions
+1 -6
View File
@@ -11,10 +11,6 @@
<details>
<summary><B>TO DO</b></summary><br/>
- [Calculator (By n-o-T-I-n-s-a-n-e)](https://github.com/n-o-T-I-n-s-a-n-e)
- [Mouse Jiggler (By Jacob-Tate)](https://github.com/Jacob-Tate/flipperzero-firmware/blob/dev/applications/mouse_jiggler/mouse_jiggler.c) (Original By MuddleBox)
- [Paint (By n-o-T-I-n-s-a-n-e)](https://github.com/n-o-T-I-n-s-a-n-e)
- [Dolphin Restorer (By nminaylov)](https://github.com/flipperdevices/flipperzero-firmware/pull/1384) Cloned by RogueMaster
- [Dolphin Backup (By nminaylov)](https://github.com/flipperdevices/flipperzero-firmware/pull/1384) Modified by RogueMaster
- Assets: Running DolphinRestorer.fap on new install will auto-level to the end of Level 2.
- GPIO: Feature to read EEPROM of SFP Modules using I2C [(By marcusju)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/198)
@@ -24,8 +20,6 @@
- Settings: Rename from SD `dolphin/name.txt` [(Thanks to E_Surge)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/259)
- Settings: Scan names will have timestamp instead of random name assigned for [NFC](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/blob/420/lib/toolbox/random_name.c) and [SubGHz](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/blob/420/applications/subghz/scenes/subghz_scene_read_raw.c) (By RogueMaster)
- SubGHz: [Add settings to subghz read functionality to allow setting RSSI threshold (raw only) (By PolymerPrints)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/184)
- [Chess (By Okalachev)](https://github.com/okalachev/flipperzero-firmware/tree/chess) Crashes 1st load if FW <~750KB or every load on larger FW `HIDDEN "INTAPP_chess_game"`
- [Chip8 Emulator (By mega8bit)](https://github.com/mega8bit/flipperzero-firmware) Updated by ESurge. Add SD folder `chip8`, [Get GAMES HERE](https://johnearnest.github.io/chip8Archive/) `HIDDEN "INTAPP_Chip8"` (Needs Controls Programmed)
- [NFC: Display UL PWD_AUTH payload / ntag-pwd-capture (Thanks to GMMan)](https://github.com/flipperdevices/flipperzero-firmware/pull/1471)
- [I²C-Scanner #1431 (By GitChris3004)](https://github.com/flipperdevices/flipperzero-firmware/pull/1431)
- [Decode RAW recordings #1667 (By qistoph)](https://github.com/flipperdevices/flipperzero-firmware/pull/1667)
@@ -34,6 +28,7 @@
- [SubGhz: fix display information in the file if the frequenc… #1724 (By Skorpionm)](https://github.com/flipperdevices/flipperzero-firmware/pull/1724)
- [Show error popup when NFC chip is not init/disconnected #1722 (By Astrrra)](https://github.com/flipperdevices/flipperzero-firmware/pull/1722)
- Fix Passport Pic Lvls Documentation
</details>
<table width="100%" border="0" cellspacing="0">
@@ -0,0 +1,12 @@
App(
appid="APPS_DolphinRestorer",
name="Dolphin Restorer",
apptype=FlipperAppType.EXTERNAL,
entry_point="drestorer_app",
cdefines=["APP_DRESTORER"],
requires=["gui","storage"],
stack_size= 2 * 1024,
order=90,
fap_icon="restoreIcon.png",
fap_category="Misc",
)
+175
View File
@@ -0,0 +1,175 @@
#include "drestorer.h"
#include <core/common_defines.h>
#include <core/log.h>
#include "loader/loader.h"
#include "m-string.h"
#include <stdint.h>
#define TAG "MoveToInt"
#define MOVE_SRC "/ext/dolphin_restorer"
#define MOVE_DST "/int"
static const char* app_dirs[] = {
".bt.settings",
".desktop.settings",
".dolphin.state",
".notification.settings",
".bt.keys",
".power.settings",
};
bool drestorer_perform(void) {
Storage* storage = furi_record_open(RECORD_STORAGE);
string_t path_src;
string_t path_dst;
string_init(path_src);
string_init(path_dst);
for(uint32_t i = 0; i < COUNT_OF(app_dirs); i++) {
string_printf(path_src, "%s/%s", MOVE_SRC, app_dirs[i]);
string_printf(path_dst, "%s/%s", MOVE_DST, app_dirs[i]);
storage_simply_remove_recursive(storage, string_get_cstr(path_dst));
storage_common_copy(storage, string_get_cstr(path_src), string_get_cstr(path_dst));
}
string_clear(path_src);
string_clear(path_dst);
furi_record_close(RECORD_STORAGE);
return false;
}
static bool drestorer_check(void) {
Storage* storage = furi_record_open(RECORD_STORAGE);
FileInfo file_info;
bool state = false;
string_t path;
string_init(path);
for(uint32_t i = 0; i < COUNT_OF(app_dirs); i++) {
string_printf(path, "%s/%s", MOVE_SRC, app_dirs[i]);
if(storage_common_stat(storage, string_get_cstr(path), &file_info) == FSE_OK) {
// if((file_info.flags & FSF_DIRECTORY) != 0) {
state = true;
break;
// }
}
}
string_clear(path);
furi_record_close(RECORD_STORAGE);
return state;
}
static bool drestorer_custom_event_callback(void* context, uint32_t event) {
furi_assert(context);
StorageMoveToSd* app = context;
return scene_manager_handle_custom_event(app->scene_manager, event);
}
static bool drestorer_back_event_callback(void* context) {
furi_assert(context);
StorageMoveToSd* app = context;
return scene_manager_handle_back_event(app->scene_manager);
}
static void drestorer_unmount_callback(const void* message, void* context) {
StorageMoveToSd* app = context;
furi_assert(app);
const StorageEvent* storage_event = message;
if((storage_event->type == StorageEventTypeCardUnmount) ||
(storage_event->type == StorageEventTypeCardMountError)) {
view_dispatcher_send_custom_event(app->view_dispatcher, MoveToSdCustomEventExit);
}
}
static StorageMoveToSd* drestorer_alloc() {
StorageMoveToSd* app = malloc(sizeof(StorageMoveToSd));
app->gui = furi_record_open(RECORD_GUI);
app->notifications = furi_record_open(RECORD_NOTIFICATION);
app->view_dispatcher = view_dispatcher_alloc();
app->scene_manager = scene_manager_alloc(&drestorer_scene_handlers, app);
view_dispatcher_enable_queue(app->view_dispatcher);
view_dispatcher_set_event_callback_context(app->view_dispatcher, app);
view_dispatcher_set_custom_event_callback(
app->view_dispatcher, drestorer_custom_event_callback);
view_dispatcher_set_navigation_event_callback(
app->view_dispatcher, drestorer_back_event_callback);
view_dispatcher_attach_to_gui(app->view_dispatcher, app->gui, ViewDispatcherTypeFullscreen);
app->widget = widget_alloc();
view_dispatcher_add_view(
app->view_dispatcher, StorageMoveToSdViewWidget, widget_get_view(app->widget));
scene_manager_next_scene(app->scene_manager, StorageMoveToSdConfirm);
Storage* storage = furi_record_open(RECORD_STORAGE);
app->sub = furi_pubsub_subscribe(storage_get_pubsub(storage), drestorer_unmount_callback, app);
furi_record_close(RECORD_STORAGE);
return app;
}
static void drestorer_free(StorageMoveToSd* app) {
Storage* storage = furi_record_open(RECORD_STORAGE);
furi_pubsub_unsubscribe(storage_get_pubsub(storage), app->sub);
furi_record_close(RECORD_STORAGE);
furi_record_close(RECORD_NOTIFICATION);
view_dispatcher_remove_view(app->view_dispatcher, StorageMoveToSdViewWidget);
widget_free(app->widget);
view_dispatcher_free(app->view_dispatcher);
scene_manager_free(app->scene_manager);
furi_record_close(RECORD_GUI);
free(app);
}
int32_t drestorer_app(void* p) {
UNUSED(p);
if(drestorer_check()) {
StorageMoveToSd* app = drestorer_alloc();
notification_message(app->notifications, &sequence_display_backlight_on);
view_dispatcher_run(app->view_dispatcher);
drestorer_free(app);
} else {
FURI_LOG_I(TAG, "Nothing to move");
}
return 0;
}
static void drestorer_mount_callback(const void* message, void* context) {
UNUSED(context);
const StorageEvent* storage_event = message;
if(storage_event->type == StorageEventTypeCardMount) {
Loader* loader = furi_record_open("loader");
loader_start(loader, "StorageMoveToSd", NULL);
furi_record_close("loader");
}
}
int32_t drestorer_start(void* p) {
UNUSED(p);
Storage* storage = furi_record_open(RECORD_STORAGE);
furi_pubsub_subscribe(storage_get_pubsub(storage), drestorer_mount_callback, NULL);
furi_record_close(RECORD_STORAGE);
return 0;
}
@@ -0,0 +1,49 @@
#pragma once
#include "gui/modules/widget_elements/widget_element_i.h"
#include <furi.h>
#include <gui/gui.h>
#include <gui/view.h>
#include <gui/view_dispatcher.h>
#include <gui/scene_manager.h>
#include <notification/notification_messages.h>
#include <gui/modules/widget.h>
#include <gui/modules/popup.h>
#include <storage/storage.h>
#include <storage/storage_sd_api.h>
#include "scenes/drestorer_scene.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef enum {
MoveToSdCustomEventExit,
MoveToSdCustomEventConfirm,
} MoveToSdCustomEvent;
typedef struct {
// records
Gui* gui;
Widget* widget;
NotificationApp* notifications;
// view managment
SceneManager* scene_manager;
ViewDispatcher* view_dispatcher;
FuriPubSubSubscription* sub;
} StorageMoveToSd;
typedef enum {
StorageMoveToSdViewWidget,
} StorageMoveToSdView;
bool drestorer_perform(void);
#ifdef __cplusplus
}
#endif
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

@@ -0,0 +1,30 @@
#include "drestorer_scene.h"
// Generate scene on_enter handlers array
#define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_enter,
void (*const drestorer_on_enter_handlers[])(void*) = {
#include "drestorer_scene_config.h"
};
#undef ADD_SCENE
// Generate scene on_event handlers array
#define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_event,
bool (*const drestorer_on_event_handlers[])(void* context, SceneManagerEvent event) = {
#include "drestorer_scene_config.h"
};
#undef ADD_SCENE
// Generate scene on_exit handlers array
#define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_exit,
void (*const drestorer_on_exit_handlers[])(void* context) = {
#include "drestorer_scene_config.h"
};
#undef ADD_SCENE
// Initialize scene handlers configuration structure
const SceneManagerHandlers drestorer_scene_handlers = {
.on_enter_handlers = drestorer_on_enter_handlers,
.on_event_handlers = drestorer_on_event_handlers,
.on_exit_handlers = drestorer_on_exit_handlers,
.scene_num = StorageMoveToSdSceneNum,
};
@@ -0,0 +1,29 @@
#pragma once
#include <gui/scene_manager.h>
// Generate scene id and total number
#define ADD_SCENE(prefix, name, id) StorageMoveToSd##id,
typedef enum {
#include "drestorer_scene_config.h"
StorageMoveToSdSceneNum,
} StorageMoveToSdScene;
#undef ADD_SCENE
extern const SceneManagerHandlers drestorer_scene_handlers;
// Generate scene on_enter handlers declaration
#define ADD_SCENE(prefix, name, id) void prefix##_scene_##name##_on_enter(void*);
#include "drestorer_scene_config.h"
#undef ADD_SCENE
// Generate scene on_event handlers declaration
#define ADD_SCENE(prefix, name, id) \
bool prefix##_scene_##name##_on_event(void* context, SceneManagerEvent event);
#include "drestorer_scene_config.h"
#undef ADD_SCENE
// Generate scene on_exit handlers declaration
#define ADD_SCENE(prefix, name, id) void prefix##_scene_##name##_on_exit(void* context);
#include "drestorer_scene_config.h"
#undef ADD_SCENE
@@ -0,0 +1,2 @@
ADD_SCENE(drestorer, confirm, Confirm)
ADD_SCENE(drestorer, progress, Progress)
@@ -0,0 +1,60 @@
#include "../drestorer.h"
#include "gui/canvas.h"
#include "gui/modules/widget_elements/widget_element_i.h"
#include "storage/storage.h"
static void
drestorer_scene_confirm_widget_callback(GuiButtonType result, InputType type, void* context) {
StorageMoveToSd* app = context;
furi_assert(app);
if(type == InputTypeShort) {
if(result == GuiButtonTypeRight) {
view_dispatcher_send_custom_event(app->view_dispatcher, MoveToSdCustomEventConfirm);
} else if(result == GuiButtonTypeLeft) {
view_dispatcher_send_custom_event(app->view_dispatcher, MoveToSdCustomEventExit);
}
}
}
void drestorer_scene_confirm_on_enter(void* context) {
StorageMoveToSd* app = context;
widget_add_button_element(
app->widget, GuiButtonTypeLeft, "Cancel", drestorer_scene_confirm_widget_callback, app);
widget_add_button_element(
app->widget, GuiButtonTypeRight, "Confirm", drestorer_scene_confirm_widget_callback, app);
widget_add_string_element(
app->widget, 64, 10, AlignCenter, AlignCenter, FontPrimary, "Backup Found");
widget_add_string_multiline_element(
app->widget,
64,
32,
AlignCenter,
AlignCenter,
FontSecondary,
"Copy backup from\nSD card to internal storage?");
view_dispatcher_switch_to_view(app->view_dispatcher, StorageMoveToSdViewWidget);
}
bool drestorer_scene_confirm_on_event(void* context, SceneManagerEvent event) {
StorageMoveToSd* app = context;
bool consumed = false;
if(event.type == SceneManagerEventTypeCustom) {
if(event.event == MoveToSdCustomEventConfirm) {
scene_manager_next_scene(app->scene_manager, StorageMoveToSdProgress);
consumed = true;
} else if(event.event == MoveToSdCustomEventExit) {
view_dispatcher_stop(app->view_dispatcher);
}
}
return consumed;
}
void drestorer_scene_confirm_on_exit(void* context) {
StorageMoveToSd* app = context;
widget_reset(app->widget);
}
@@ -0,0 +1,31 @@
#include "../drestorer.h"
void drestorer_scene_progress_on_enter(void* context) {
StorageMoveToSd* app = context;
widget_add_string_element(
app->widget, 64, 10, AlignCenter, AlignCenter, FontPrimary, "Moving...");
view_dispatcher_switch_to_view(app->view_dispatcher, StorageMoveToSdViewWidget);
drestorer_perform();
view_dispatcher_send_custom_event(app->view_dispatcher, MoveToSdCustomEventExit);
}
bool drestorer_scene_progress_on_event(void* context, SceneManagerEvent event) {
StorageMoveToSd* app = context;
bool consumed = false;
if(event.type == SceneManagerEventTypeCustom) {
view_dispatcher_stop(app->view_dispatcher);
} else if(event.type == SceneManagerEventTypeBack) {
consumed = true;
}
return consumed;
}
void drestorer_scene_progress_on_exit(void* context) {
StorageMoveToSd* app = context;
widget_reset(app->widget);
}