Skip to content

Picopass config se problem #90

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
skotopes merged 4 commits into from
Dec 20, 2023
Merged

Picopass config se problem #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0c3e3de
picopass: correct config detaction to avoid SE
bettse Dec 19, 2023
a68a807
picopass: back after read goes to start menu
bettse Dec 19, 2023
422d406
Merge branch 'dev' into picopass_config_se_problem
skotopes Dec 20, 2023
8430b2f
Update changelog
skotopes Dec 20, 2023
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
2 changes: 2 additions & 0 deletions picopass/.catalog/changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
- Update working with keys with new API
- Display more tag information
- Add additional keys to elite dict
- Correct config card detection so it doesn't happen for SE cards (read using nr-mac partial read)
- Have back button go to start menu instead of read retry
## 1.10
- Fix missing folder in readme
- Allow partial save for any read failure
Expand Down
17 changes: 13 additions & 4 deletions picopass/scenes/picopass_scene_read_card_success.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ void picopass_scene_read_card_success_on_enter(void* context) {

if(pacs->se_enabled) {
furi_string_cat_printf(credential_str, "SE enabled");

} else if(!hid_csn) {
furi_string_cat_printf(credential_str, "Non-HID CSN");
}
Expand All @@ -69,6 +68,15 @@ void picopass_scene_read_card_success_on_enter(void* context) {
"More",
picopass_scene_read_card_success_widget_callback,
picopass);
} else if(pacs->se_enabled) {
furi_string_cat_printf(credential_str, "SE enabled");
furi_string_cat_printf(wiegand_str, "SIO");
widget_add_button_element(
widget,
GuiButtonTypeRight,
"More",
picopass_scene_read_card_success_widget_callback,
picopass);
} else if(configCard) {
furi_string_cat_printf(wiegand_str, "Config Card");
} else if(empty) {
Expand All @@ -86,9 +94,6 @@ void picopass_scene_read_card_success_on_enter(void* context) {
} else {
furi_string_cat_printf(wiegand_str, "Invalid PACS");
}
if(pacs->se_enabled) {
furi_string_cat_printf(credential_str, "SE enabled");
}
widget_add_button_element(
widget,
GuiButtonTypeCenter,
Expand Down Expand Up @@ -190,6 +195,10 @@ bool picopass_scene_read_card_success_on_event(void* context, SceneManagerEvent
consumed = scene_manager_search_and_switch_to_another_scene(
picopass->scene_manager, PicopassSceneStart);
}
} else if(event.type == SceneManagerEventTypeBack) {
scene_manager_search_and_switch_to_previous_scene(
picopass->scene_manager, PicopassSceneStart);
consumed = true;
}
return consumed;
}
Expand Down