Skip to content

Commit

Permalink
LFRFID PSK Raws in debug
Browse files Browse the repository at this point in the history
  • Loading branch information
xMasterX committed May 28, 2023
1 parent 1e1b85a commit 0d1fea9
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 20 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
* SubGHz Remote: Full refactoring, app was re-made from scratch (by @gid9798)
* Archive: Fix rename, show error message to user
* API: Cleanup, mini refactoring of some apps (+6k of free flash space)
* LFRFID: Debug: Allow PSK RAW emulation in gui
* SubGHz: Security+ 2.0 -> add extra custom button `0x78` - Fixes issue #469
* SubGHz: Various fixes (by @gid9798)
* SubGHz: Fix counter settings in debug
Expand Down
7 changes: 3 additions & 4 deletions applications/main/lfrfid/lfrfid.c
Original file line number Diff line number Diff line change
Expand Up @@ -252,18 +252,17 @@ 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
bool result =
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;
Expand Down
19 changes: 3 additions & 16 deletions applications/main/lfrfid/scenes/lfrfid_scene_raw_emulate.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
#define TAG "ADC"

typedef struct {
FuriString* string_file_name;
bool error;
} LfRfidEmulateRawState;

Expand All @@ -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);

Expand All @@ -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);
}
}
Expand All @@ -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);
}

0 comments on commit 0d1fea9

Please sign in to comment.