Skip to content

Picopass read improvements #109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bettse merged 3 commits into from
Jan 24, 2024
Merged

Picopass read improvements #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
585408e
Make dictionary attack more picopass specific
bettse Jan 14, 2024
d323711
Use elite dictionary attack for picopass read
bettse Jan 14, 2024
2e7c1be
Merge branch 'dev' into picopass_read_improvements
bettse Jan 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 1 addition & 13 deletions picopass/scenes/picopass_scene_start.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#include "../picopass_i.h"
enum SubmenuIndex {
SubmenuIndexRead,
SubmenuIndexEliteDictAttack,
SubmenuIndexSaved,
SubmenuIndexLoclass,
};
Expand All @@ -16,12 +15,6 @@ void picopass_scene_start_on_enter(void* context) {
Submenu* submenu = picopass->submenu;
submenu_add_item(
submenu, "Read Card", SubmenuIndexRead, picopass_scene_start_submenu_callback, picopass);
submenu_add_item(
submenu,
"Elite Dict. Attack",
SubmenuIndexEliteDictAttack,
picopass_scene_start_submenu_callback,
picopass);
submenu_add_item(
submenu, "Saved", SubmenuIndexSaved, picopass_scene_start_submenu_callback, picopass);

Expand All @@ -42,7 +35,7 @@ bool picopass_scene_start_on_event(void* context, SceneManagerEvent event) {
if(event.event == SubmenuIndexRead) {
scene_manager_set_scene_state(
picopass->scene_manager, PicopassSceneStart, SubmenuIndexRead);
scene_manager_next_scene(picopass->scene_manager, PicopassSceneReadCard);
scene_manager_next_scene(picopass->scene_manager, PicopassSceneEliteDictAttack);
consumed = true;
} else if(event.event == SubmenuIndexSaved) {
// Explicitly save state so that the correct item is
Expand All @@ -51,11 +44,6 @@ bool picopass_scene_start_on_event(void* context, SceneManagerEvent event) {
picopass->scene_manager, PicopassSceneStart, SubmenuIndexSaved);
scene_manager_next_scene(picopass->scene_manager, PicopassSceneFileSelect);
consumed = true;
} else if(event.event == SubmenuIndexEliteDictAttack) {
scene_manager_set_scene_state(
picopass->scene_manager, PicopassSceneStart, SubmenuIndexEliteDictAttack);
scene_manager_next_scene(picopass->scene_manager, PicopassSceneEliteDictAttack);
consumed = true;
} else if(event.event == SubmenuIndexLoclass) {
scene_manager_set_scene_state(
picopass->scene_manager, PicopassSceneStart, PicopassSceneLoclass);
Expand Down
9 changes: 7 additions & 2 deletions picopass/views/dict_attack.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ static void dict_attack_draw_callback(Canvas* canvas, void* model) {
"Reuse key check for sector: %d",
m->key_attack_current_sector);
} else {
snprintf(draw_str, sizeof(draw_str), "Unlocking sector: %d", m->sector_current);
snprintf(
draw_str, sizeof(draw_str), "Unlocking Application Area %d", m->sector_current + 1);
}
canvas_draw_str_aligned(canvas, 0, 10, AlignLeft, AlignTop, draw_str);
float dict_progress = m->dict_keys_total == 0 ?
Expand All @@ -71,7 +72,11 @@ static void dict_attack_draw_callback(Canvas* canvas, void* model) {
snprintf(draw_str, sizeof(draw_str), "Keys found: %d/%d", m->keys_found, m->keys_total);
canvas_draw_str_aligned(canvas, 0, 33, AlignLeft, AlignTop, draw_str);
snprintf(
draw_str, sizeof(draw_str), "Sectors Read: %d/%d", m->sectors_read, m->sectors_total);
draw_str,
sizeof(draw_str),
"Application Area Read: %d/%d",
m->sectors_read,
m->sectors_total);
canvas_draw_str_aligned(canvas, 0, 43, AlignLeft, AlignTop, draw_str);
}
elements_button_center(canvas, "Skip");
Expand Down