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

Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into xfw-dev

Browse Source
This commit is contained in:
Willy-JL
2023-05-28 17:11:26 +01:00
parent 7051917d36 0d1fea9861
commit 32fad4af8d
2 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
applications/main/lfrfid/lfrfid.c
View File

@@ -257,8 +257,7 @@ bool lfrfid_load_raw_key_from_file_select(LfRfid* app) {
furi_assert(app);
DialogsFileBrowserOptions browser_options;
dialog_file_browser_set_basic_options(
&browser_options, LFRFID_APP_RAW_ASK_EXTENSION, &I_125_10px);
dialog_file_browser_set_basic_options(&browser_options, ".raw", &I_125_10px);
browser_options.base_path = LFRFID_APP_FOLDER;
// Input events and views are managed by file_browser
@@ -266,9 +265,9 @@ bool lfrfid_load_raw_key_from_file_select(LfRfid* app) {
dialog_file_browser_show(app->dialogs, app->file_path, app->file_path, &browser_options);
if(result) {
// Extract .raw and then .ask
// Extract .raw
path_extract_filename(app->file_path, app->file_name, true);
path_extract_filename(app->file_name, app->file_name, true);
//path_extract_filename(app->file_name, app->file_name, true);
}
return result;

19
applications/main/lfrfid/scenes/lfrfid_scene_raw_emulate.c
View File

@@ -3,7 +3,6 @@
#define TAG "ADC"
typedef struct {
FuriString* string_file_name;
bool error;
} LfRfidEmulateRawState;
@@ -23,26 +22,15 @@ void lfrfid_scene_raw_emulate_on_enter(void* context) {
LfRfidEmulateRawState* state = malloc(sizeof(LfRfidEmulateRawState));
scene_manager_set_scene_state(app->scene_manager, LfRfidSceneRawEmulate, (uint32_t)state);
state->string_file_name = furi_string_alloc();
popup_set_icon(popup, 0, 3, &I_RFIDDolphinReceive_97x61);
view_dispatcher_switch_to_view(app->view_dispatcher, LfRfidViewPopup);
lfrfid_worker_start_thread(app->lfworker);
lfrfid_make_app_folder(app);
furi_string_printf(
state->string_file_name,
"%s/%s%s",
LFRFID_SD_FOLDER,
furi_string_get_cstr(app->file_name),
LFRFID_APP_RAW_ASK_EXTENSION);
FURI_LOG_D(TAG, "raw_emulate->file_name=%s", furi_string_get_cstr(state->string_file_name));
popup_set_header(popup, "Emulating\nRAW RFID\nASK", 89, 30, AlignCenter, AlignTop);
popup_set_header(popup, "Emulating\nRAW RFID", 89, 30, AlignCenter, AlignTop);
lfrfid_worker_emulate_raw_start(
app->lfworker,
furi_string_get_cstr(state->string_file_name),
lfrfid_raw_emulate_callback,
app);
app->lfworker, furi_string_get_cstr(app->file_path), lfrfid_raw_emulate_callback, app);
notification_message(app->notifications, &sequence_blink_start_cyan);
@@ -63,7 +51,7 @@ bool lfrfid_scene_raw_emulate_on_event(void* context, SceneManagerEvent event) {
consumed = true;
state->error = true;
popup_set_header(
popup, "Reading\nRAW RFID\nFile error", 89, 30, AlignCenter, AlignTop);
popup, "Emulating\nRAW RFID\nFile error", 89, 30, AlignCenter, AlignTop);
notification_message(app->notifications, &sequence_blink_start_red);
}
}
@@ -81,6 +69,5 @@ void lfrfid_scene_raw_emulate_on_exit(void* context) {
lfrfid_worker_stop(app->lfworker);
lfrfid_worker_stop_thread(app->lfworker);
furi_string_free(state->string_file_name);
free(state);
}