mirror of
https://github.com/Next-Flip/Momentum-Firmware.git
synced 2026-05-13 03:28:36 -07:00
Update apps
This commit is contained in:
@@ -4,6 +4,8 @@ enum SubmenuIndex {
|
||||
SubmenuIndexSave,
|
||||
SubmenuIndexSaveAsLF,
|
||||
SubmenuIndexChangeKey,
|
||||
SubmenuIndexWrite,
|
||||
SubmenuIndexEmulate,
|
||||
};
|
||||
|
||||
void picopass_scene_card_menu_submenu_callback(void* context, uint32_t index) {
|
||||
@@ -26,6 +28,14 @@ void picopass_scene_card_menu_on_enter(void* context) {
|
||||
picopass_scene_card_menu_submenu_callback,
|
||||
picopass);
|
||||
}
|
||||
submenu_add_item(
|
||||
submenu, "Write", SubmenuIndexWrite, picopass_scene_card_menu_submenu_callback, picopass);
|
||||
submenu_add_item(
|
||||
submenu,
|
||||
"Emulate",
|
||||
SubmenuIndexEmulate,
|
||||
picopass_scene_card_menu_submenu_callback,
|
||||
picopass);
|
||||
submenu_add_item(
|
||||
submenu,
|
||||
"Change Key",
|
||||
@@ -57,6 +67,12 @@ bool picopass_scene_card_menu_on_event(void* context, SceneManagerEvent event) {
|
||||
picopass->dev->format = PicopassDeviceSaveFormatLF;
|
||||
scene_manager_next_scene(picopass->scene_manager, PicopassSceneSaveName);
|
||||
consumed = true;
|
||||
} else if(event.event == SubmenuIndexWrite) {
|
||||
scene_manager_next_scene(picopass->scene_manager, PicopassSceneWriteCard);
|
||||
consumed = true;
|
||||
} else if(event.event == SubmenuIndexEmulate) {
|
||||
scene_manager_next_scene(picopass->scene_manager, PicopassSceneEmulate);
|
||||
consumed = true;
|
||||
} else if(event.event == SubmenuIndexChangeKey) {
|
||||
scene_manager_set_scene_state(
|
||||
picopass->scene_manager, PicopassSceneCardMenu, SubmenuIndexChangeKey);
|
||||
|
||||
@@ -11,9 +11,11 @@ ADD_SCENE(picopass, delete, Delete)
|
||||
ADD_SCENE(picopass, delete_success, DeleteSuccess)
|
||||
ADD_SCENE(picopass, write_card, WriteCard)
|
||||
ADD_SCENE(picopass, write_card_success, WriteCardSuccess)
|
||||
ADD_SCENE(picopass, write_card_failure, WriteCardFailure)
|
||||
ADD_SCENE(picopass, read_factory_success, ReadFactorySuccess)
|
||||
ADD_SCENE(picopass, write_key, WriteKey)
|
||||
ADD_SCENE(picopass, key_menu, KeyMenu)
|
||||
ADD_SCENE(picopass, elite_dict_attack, EliteDictAttack)
|
||||
ADD_SCENE(picopass, emulate, Emulate)
|
||||
ADD_SCENE(picopass, loclass, Loclass)
|
||||
ADD_SCENE(picopass, key_input, KeyInput)
|
||||
|
||||
@@ -17,7 +17,6 @@ void picopass_scene_device_info_on_enter(void* context) {
|
||||
FuriString* csn_str = furi_string_alloc_set("CSN:");
|
||||
FuriString* credential_str = furi_string_alloc();
|
||||
FuriString* wiegand_str = furi_string_alloc();
|
||||
FuriString* sio_str = furi_string_alloc();
|
||||
|
||||
dolphin_deed(DolphinDeedNfcReadSuccess);
|
||||
|
||||
@@ -43,7 +42,7 @@ void picopass_scene_device_info_on_enter(void* context) {
|
||||
}
|
||||
furi_string_set(credential_str, "");
|
||||
for(uint8_t i = RFAL_PICOPASS_BLOCK_LEN - bytesLength; i < RFAL_PICOPASS_BLOCK_LEN; i++) {
|
||||
furi_string_cat_printf(credential_str, " %02X", pacs->credential[i]);
|
||||
furi_string_cat_printf(credential_str, "%02X", pacs->credential[i]);
|
||||
}
|
||||
|
||||
if(pacs->record.valid) {
|
||||
@@ -54,7 +53,7 @@ void picopass_scene_device_info_on_enter(void* context) {
|
||||
}
|
||||
|
||||
if(pacs->sio) {
|
||||
furi_string_cat_printf(sio_str, "+SIO");
|
||||
furi_string_cat_printf(credential_str, " +SIO");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -70,13 +69,10 @@ void picopass_scene_device_info_on_enter(void* context) {
|
||||
AlignCenter,
|
||||
FontSecondary,
|
||||
furi_string_get_cstr(credential_str));
|
||||
widget_add_string_element(
|
||||
widget, 64, 46, AlignCenter, AlignCenter, FontSecondary, furi_string_get_cstr(sio_str));
|
||||
|
||||
furi_string_free(csn_str);
|
||||
furi_string_free(credential_str);
|
||||
furi_string_free(wiegand_str);
|
||||
furi_string_free(sio_str);
|
||||
|
||||
widget_add_button_element(
|
||||
picopass->widget,
|
||||
|
||||
48
applications/external/picopass/scenes/picopass_scene_key_input.c
vendored
Normal file
48
applications/external/picopass/scenes/picopass_scene_key_input.c
vendored
Normal file
@@ -0,0 +1,48 @@
|
||||
#include "../picopass_i.h"
|
||||
#include <lib/toolbox/random_name.h>
|
||||
#include <gui/modules/validators.h>
|
||||
#include <toolbox/path.h>
|
||||
|
||||
void picopass_scene_key_input_text_input_callback(void* context) {
|
||||
Picopass* picopass = context;
|
||||
|
||||
picopass->dev->dev_data.pacs.elite_kdf = true;
|
||||
memcpy(picopass->dev->dev_data.pacs.key, picopass->byte_input_store, RFAL_PICOPASS_BLOCK_LEN);
|
||||
view_dispatcher_send_custom_event(picopass->view_dispatcher, PicopassCustomEventByteInputDone);
|
||||
}
|
||||
|
||||
void picopass_scene_key_input_on_enter(void* context) {
|
||||
Picopass* picopass = context;
|
||||
|
||||
ByteInput* byte_input = picopass->byte_input;
|
||||
byte_input_set_header_text(byte_input, "Enter The Key In Hex");
|
||||
byte_input_set_result_callback(
|
||||
byte_input,
|
||||
picopass_scene_key_input_text_input_callback,
|
||||
NULL,
|
||||
picopass,
|
||||
picopass->byte_input_store,
|
||||
RFAL_PICOPASS_BLOCK_LEN);
|
||||
view_dispatcher_switch_to_view(picopass->view_dispatcher, PicopassViewByteInput);
|
||||
}
|
||||
|
||||
bool picopass_scene_key_input_on_event(void* context, SceneManagerEvent event) {
|
||||
Picopass* picopass = context;
|
||||
bool consumed = false;
|
||||
|
||||
if(event.type == SceneManagerEventTypeCustom) {
|
||||
if(event.event == PicopassCustomEventByteInputDone) {
|
||||
scene_manager_next_scene(picopass->scene_manager, PicopassSceneWriteKey);
|
||||
consumed = true;
|
||||
}
|
||||
}
|
||||
return consumed;
|
||||
}
|
||||
|
||||
void picopass_scene_key_input_on_exit(void* context) {
|
||||
Picopass* picopass = context;
|
||||
|
||||
// Clear view
|
||||
byte_input_set_result_callback(picopass->byte_input, NULL, NULL, NULL, NULL, 0);
|
||||
byte_input_set_header_text(picopass->byte_input, "");
|
||||
}
|
||||
@@ -6,7 +6,7 @@ enum SubmenuIndex {
|
||||
SubmenuIndexWriteiCE,
|
||||
SubmenuIndexWriteiCL,
|
||||
SubmenuIndexWriteiCS,
|
||||
SubmenuIndexWriteCustom, //TODO: user input of key
|
||||
SubmenuIndexWriteCustom,
|
||||
};
|
||||
|
||||
void picopass_scene_key_menu_submenu_callback(void* context, uint32_t index) {
|
||||
@@ -43,6 +43,12 @@ void picopass_scene_key_menu_on_enter(void* context) {
|
||||
SubmenuIndexWriteiCS,
|
||||
picopass_scene_key_menu_submenu_callback,
|
||||
picopass);
|
||||
submenu_add_item(
|
||||
submenu,
|
||||
"Write Elite",
|
||||
SubmenuIndexWriteCustom,
|
||||
picopass_scene_key_menu_submenu_callback,
|
||||
picopass);
|
||||
|
||||
submenu_set_selected_item(
|
||||
picopass->submenu,
|
||||
@@ -84,6 +90,12 @@ bool picopass_scene_key_menu_on_event(void* context, SceneManagerEvent event) {
|
||||
picopass->dev->dev_data.pacs.elite_kdf = false;
|
||||
scene_manager_next_scene(picopass->scene_manager, PicopassSceneWriteKey);
|
||||
consumed = true;
|
||||
} else if(event.event == SubmenuIndexWriteCustom) {
|
||||
scene_manager_set_scene_state(
|
||||
picopass->scene_manager, PicopassSceneKeyMenu, SubmenuIndexWriteCustom);
|
||||
// Key and elite_kdf = true are both set in key_input scene
|
||||
scene_manager_next_scene(picopass->scene_manager, PicopassSceneKeyInput);
|
||||
consumed = true;
|
||||
}
|
||||
} else if(event.type == SceneManagerEventTypeBack) {
|
||||
consumed = scene_manager_search_and_switch_to_previous_scene(
|
||||
|
||||
@@ -19,7 +19,7 @@ void picopass_scene_read_card_success_on_enter(void* context) {
|
||||
FuriString* csn_str = furi_string_alloc_set("CSN:");
|
||||
FuriString* credential_str = furi_string_alloc();
|
||||
FuriString* wiegand_str = furi_string_alloc();
|
||||
FuriString* sio_str = furi_string_alloc();
|
||||
FuriString* key_str = furi_string_alloc();
|
||||
|
||||
dolphin_deed(DolphinDeedNfcReadSuccess);
|
||||
|
||||
@@ -79,7 +79,7 @@ void picopass_scene_read_card_success_on_enter(void* context) {
|
||||
size_t bytesLength = 1 + pacs->record.bitLength / 8;
|
||||
furi_string_set(credential_str, "");
|
||||
for(uint8_t i = RFAL_PICOPASS_BLOCK_LEN - bytesLength; i < RFAL_PICOPASS_BLOCK_LEN; i++) {
|
||||
furi_string_cat_printf(credential_str, " %02X", pacs->credential[i]);
|
||||
furi_string_cat_printf(credential_str, "%02X", pacs->credential[i]);
|
||||
}
|
||||
|
||||
if(pacs->record.valid) {
|
||||
@@ -90,19 +90,16 @@ void picopass_scene_read_card_success_on_enter(void* context) {
|
||||
}
|
||||
|
||||
if(pacs->sio) {
|
||||
furi_string_cat_printf(sio_str, "+SIO");
|
||||
furi_string_cat_printf(credential_str, " +SIO");
|
||||
}
|
||||
|
||||
if(pacs->key) {
|
||||
if(pacs->sio) {
|
||||
furi_string_cat_printf(sio_str, " ");
|
||||
}
|
||||
furi_string_cat_printf(sio_str, "Key: ");
|
||||
furi_string_cat_printf(key_str, "Key: ");
|
||||
|
||||
uint8_t key[RFAL_PICOPASS_BLOCK_LEN];
|
||||
memcpy(key, &pacs->key, RFAL_PICOPASS_BLOCK_LEN);
|
||||
for(uint8_t i = 0; i < RFAL_PICOPASS_BLOCK_LEN; i++) {
|
||||
furi_string_cat_printf(sio_str, "%02X", key[i]);
|
||||
furi_string_cat_printf(key_str, "%02X", key[i]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -134,12 +131,12 @@ void picopass_scene_read_card_success_on_enter(void* context) {
|
||||
FontSecondary,
|
||||
furi_string_get_cstr(credential_str));
|
||||
widget_add_string_element(
|
||||
widget, 64, 46, AlignCenter, AlignCenter, FontSecondary, furi_string_get_cstr(sio_str));
|
||||
widget, 64, 46, AlignCenter, AlignCenter, FontSecondary, furi_string_get_cstr(key_str));
|
||||
|
||||
furi_string_free(csn_str);
|
||||
furi_string_free(credential_str);
|
||||
furi_string_free(wiegand_str);
|
||||
furi_string_free(sio_str);
|
||||
furi_string_free(key_str);
|
||||
|
||||
view_dispatcher_switch_to_view(picopass->view_dispatcher, PicopassViewWidget);
|
||||
}
|
||||
|
||||
@@ -52,8 +52,9 @@ bool picopass_scene_save_name_on_event(void* context, SceneManagerEvent event) {
|
||||
|
||||
if(event.type == SceneManagerEventTypeCustom) {
|
||||
if(event.event == PicopassCustomEventTextInputDone) {
|
||||
// Delete old file if renaming
|
||||
if(strcmp(picopass->dev->dev_name, "") != 0) {
|
||||
// picopass_device_delete(picopass->dev, true);
|
||||
picopass_device_delete(picopass->dev, true);
|
||||
}
|
||||
strlcpy(
|
||||
picopass->dev->dev_name, picopass->text_store, strlen(picopass->text_store) + 1);
|
||||
|
||||
@@ -5,6 +5,7 @@ enum SubmenuIndex {
|
||||
SubmenuIndexInfo,
|
||||
SubmenuIndexWrite,
|
||||
SubmenuIndexEmulate,
|
||||
SubmenuIndexRename,
|
||||
};
|
||||
|
||||
void picopass_scene_saved_menu_submenu_callback(void* context, uint32_t index) {
|
||||
@@ -17,12 +18,6 @@ void picopass_scene_saved_menu_on_enter(void* context) {
|
||||
Picopass* picopass = context;
|
||||
Submenu* submenu = picopass->submenu;
|
||||
|
||||
submenu_add_item(
|
||||
submenu,
|
||||
"Delete",
|
||||
SubmenuIndexDelete,
|
||||
picopass_scene_saved_menu_submenu_callback,
|
||||
picopass);
|
||||
submenu_add_item(
|
||||
submenu, "Info", SubmenuIndexInfo, picopass_scene_saved_menu_submenu_callback, picopass);
|
||||
submenu_add_item(
|
||||
@@ -33,6 +28,18 @@ void picopass_scene_saved_menu_on_enter(void* context) {
|
||||
SubmenuIndexEmulate,
|
||||
picopass_scene_saved_menu_submenu_callback,
|
||||
picopass);
|
||||
submenu_add_item(
|
||||
submenu,
|
||||
"Rename",
|
||||
SubmenuIndexRename,
|
||||
picopass_scene_saved_menu_submenu_callback,
|
||||
picopass);
|
||||
submenu_add_item(
|
||||
submenu,
|
||||
"Delete",
|
||||
SubmenuIndexDelete,
|
||||
picopass_scene_saved_menu_submenu_callback,
|
||||
picopass);
|
||||
|
||||
submenu_set_selected_item(
|
||||
picopass->submenu,
|
||||
@@ -61,6 +68,9 @@ bool picopass_scene_saved_menu_on_event(void* context, SceneManagerEvent event)
|
||||
} else if(event.event == SubmenuIndexEmulate) {
|
||||
scene_manager_next_scene(picopass->scene_manager, PicopassSceneEmulate);
|
||||
consumed = true;
|
||||
} else if(event.event == SubmenuIndexRename) {
|
||||
scene_manager_next_scene(picopass->scene_manager, PicopassSceneSaveName);
|
||||
consumed = true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -58,7 +58,7 @@ bool picopass_scene_start_on_event(void* context, SceneManagerEvent event) {
|
||||
consumed = true;
|
||||
} else if(event.event == SubmenuIndexLoclass) {
|
||||
scene_manager_set_scene_state(
|
||||
picopass->scene_manager, PicopassSceneLoclass, PicopassSceneLoclass);
|
||||
picopass->scene_manager, PicopassSceneStart, PicopassSceneLoclass);
|
||||
scene_manager_next_scene(picopass->scene_manager, PicopassSceneLoclass);
|
||||
consumed = true;
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
void picopass_write_card_worker_callback(PicopassWorkerEvent event, void* context) {
|
||||
UNUSED(event);
|
||||
Picopass* picopass = context;
|
||||
view_dispatcher_send_custom_event(picopass->view_dispatcher, PicopassCustomEventWorkerExit);
|
||||
view_dispatcher_send_custom_event(picopass->view_dispatcher, event);
|
||||
}
|
||||
|
||||
void picopass_scene_write_card_on_enter(void* context) {
|
||||
@@ -33,7 +33,10 @@ bool picopass_scene_write_card_on_event(void* context, SceneManagerEvent event)
|
||||
bool consumed = false;
|
||||
|
||||
if(event.type == SceneManagerEventTypeCustom) {
|
||||
if(event.event == PicopassCustomEventWorkerExit) {
|
||||
if(event.event == PicopassWorkerEventFail) {
|
||||
scene_manager_next_scene(picopass->scene_manager, PicopassSceneWriteCardFailure);
|
||||
consumed = true;
|
||||
} else if(event.event == PicopassWorkerEventSuccess) {
|
||||
scene_manager_next_scene(picopass->scene_manager, PicopassSceneWriteCardSuccess);
|
||||
consumed = true;
|
||||
}
|
||||
|
||||
65
applications/external/picopass/scenes/picopass_scene_write_card_failure.c
vendored
Normal file
65
applications/external/picopass/scenes/picopass_scene_write_card_failure.c
vendored
Normal file
@@ -0,0 +1,65 @@
|
||||
#include "../picopass_i.h"
|
||||
#include <dolphin/dolphin.h>
|
||||
|
||||
void picopass_scene_write_card_failure_widget_callback(
|
||||
GuiButtonType result,
|
||||
InputType type,
|
||||
void* context) {
|
||||
furi_assert(context);
|
||||
Picopass* picopass = context;
|
||||
|
||||
if(type == InputTypeShort) {
|
||||
view_dispatcher_send_custom_event(picopass->view_dispatcher, result);
|
||||
}
|
||||
}
|
||||
|
||||
void picopass_scene_write_card_failure_on_enter(void* context) {
|
||||
Picopass* picopass = context;
|
||||
Widget* widget = picopass->widget;
|
||||
FuriString* str = furi_string_alloc_set("Write Failure!");
|
||||
|
||||
widget_add_button_element(
|
||||
widget,
|
||||
GuiButtonTypeLeft,
|
||||
"Retry",
|
||||
picopass_scene_write_card_failure_widget_callback,
|
||||
picopass);
|
||||
|
||||
widget_add_button_element(
|
||||
widget,
|
||||
GuiButtonTypeRight,
|
||||
"Menu",
|
||||
picopass_scene_write_card_failure_widget_callback,
|
||||
picopass);
|
||||
|
||||
widget_add_string_element(
|
||||
widget, 64, 5, AlignCenter, AlignCenter, FontSecondary, furi_string_get_cstr(str));
|
||||
|
||||
furi_string_free(str);
|
||||
|
||||
view_dispatcher_switch_to_view(picopass->view_dispatcher, PicopassViewWidget);
|
||||
}
|
||||
|
||||
bool picopass_scene_write_card_failure_on_event(void* context, SceneManagerEvent event) {
|
||||
Picopass* picopass = context;
|
||||
bool consumed = false;
|
||||
|
||||
if(event.type == SceneManagerEventTypeCustom) {
|
||||
if(event.event == GuiButtonTypeLeft) {
|
||||
consumed = scene_manager_previous_scene(picopass->scene_manager);
|
||||
} else if(event.event == GuiButtonTypeRight) {
|
||||
// Clear device name
|
||||
picopass_device_set_name(picopass->dev, "");
|
||||
consumed = scene_manager_search_and_switch_to_previous_scene(
|
||||
picopass->scene_manager, PicopassSceneStart);
|
||||
}
|
||||
}
|
||||
return consumed;
|
||||
}
|
||||
|
||||
void picopass_scene_write_card_failure_on_exit(void* context) {
|
||||
Picopass* picopass = context;
|
||||
|
||||
// Clear view
|
||||
widget_reset(picopass->widget);
|
||||
}
|
||||
@@ -55,8 +55,8 @@ bool picopass_scene_write_card_success_on_event(void* context, SceneManagerEvent
|
||||
} else if(event.event == GuiButtonTypeRight) {
|
||||
// Clear device name
|
||||
picopass_device_set_name(picopass->dev, "");
|
||||
scene_manager_next_scene(picopass->scene_manager, PicopassSceneCardMenu);
|
||||
consumed = true;
|
||||
consumed = scene_manager_search_and_switch_to_previous_scene(
|
||||
picopass->scene_manager, PicopassSceneStart);
|
||||
}
|
||||
}
|
||||
return consumed;
|
||||
|
||||
Reference in New Issue
Block a user