Skip to content

Commit d1d45d8

Browse files
bettseskotopes
andauthored
Picopass config se problem (#90)
Co-authored-by: あく <[email protected]>
1 parent aa05d75 commit d1d45d8

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

picopass/.catalog/changelog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
- Update working with keys with new API
33
- Display more tag information
44
- Add additional keys to elite dict
5+
- Correct config card detection so it doesn't happen for SE cards (read using nr-mac partial read)
6+
- Have back button go to start menu instead of read retry
57
## 1.10
68
- Fix missing folder in readme
79
- Allow partial save for any read failure

picopass/scenes/picopass_scene_read_card_success.c

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ void picopass_scene_read_card_success_on_enter(void* context) {
5252

5353
if(pacs->se_enabled) {
5454
furi_string_cat_printf(credential_str, "SE enabled");
55-
5655
} else if(!hid_csn) {
5756
furi_string_cat_printf(credential_str, "Non-HID CSN");
5857
}
@@ -69,6 +68,15 @@ void picopass_scene_read_card_success_on_enter(void* context) {
6968
"More",
7069
picopass_scene_read_card_success_widget_callback,
7170
picopass);
71+
} else if(pacs->se_enabled) {
72+
furi_string_cat_printf(credential_str, "SE enabled");
73+
furi_string_cat_printf(wiegand_str, "SIO");
74+
widget_add_button_element(
75+
widget,
76+
GuiButtonTypeRight,
77+
"More",
78+
picopass_scene_read_card_success_widget_callback,
79+
picopass);
7280
} else if(configCard) {
7381
furi_string_cat_printf(wiegand_str, "Config Card");
7482
} else if(empty) {
@@ -86,9 +94,6 @@ void picopass_scene_read_card_success_on_enter(void* context) {
8694
} else {
8795
furi_string_cat_printf(wiegand_str, "Invalid PACS");
8896
}
89-
if(pacs->se_enabled) {
90-
furi_string_cat_printf(credential_str, "SE enabled");
91-
}
9297
widget_add_button_element(
9398
widget,
9499
GuiButtonTypeCenter,
@@ -190,6 +195,10 @@ bool picopass_scene_read_card_success_on_event(void* context, SceneManagerEvent
190195
consumed = scene_manager_search_and_switch_to_another_scene(
191196
picopass->scene_manager, PicopassSceneStart);
192197
}
198+
} else if(event.type == SceneManagerEventTypeBack) {
199+
scene_manager_search_and_switch_to_previous_scene(
200+
picopass->scene_manager, PicopassSceneStart);
201+
consumed = true;
193202
}
194203
return consumed;
195204
}

0 commit comments

Comments
 (0)