liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FL-1547], [FL-1500] NFC app v1 (#593)

Browse Source 
* nfc: remove mifare read debug view and scene
* nfc: change mifare ultralight data structure
* mifare_ultralight: add more commands
* nfc: add emulate mifare ul scene
* nfc: rework data structures, remove debug scenes and views
* nfc: add read emv scenes
* nfc: mifare emulation wip
* nfc cli: increase detecting time
* nfc: save nfc files with new format
* nfc: store Mifare Ultralight
* nfc: start loading mifare ultralight
* nfc: add delete scenes
* nfc: add edit UID and name
* nfc: finish parsing uid and mifare ul data
* nfc: delete success fix
* gui_widget: introduce GuiWidget
* gui_widget: add string element
* gui_widget: add button element
* gui_widget: move free elements into gui_widget
* nfc: rework info scene with GuiWidget
* nfc: rework device info scene
* nfc: rework delete scene gui
* nfc: add compatible script support
* nfc: rework emv reading scenes
* nfc: rework bank card save
* nfc: add bank card custom view
* gui_widget: add icon element
* nfc: add icon to bank card
* nfc: start worker after switching view

Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
gornekich
2021-07-22 09:05:07 +03:00
committed by GitHub
parent 7ca89256eb
commit 49af516ec7
64 changed files with 2188 additions and 1059 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
applications/nfc/nfc.c
View File

@@ -22,78 +22,61 @@ void nfc_tick_event_callback(void* context) {
Nfc* nfc_alloc() {
Nfc* nfc = furi_alloc(sizeof(Nfc));
nfc->nfc_common.worker = nfc_worker_alloc();
nfc->nfc_common.view_dispatcher = view_dispatcher_alloc();
nfc->worker = nfc_worker_alloc();
nfc->view_dispatcher = view_dispatcher_alloc();
nfc->scene_manager = scene_manager_alloc(&nfc_scene_handlers, nfc);
view_dispatcher_enable_queue(nfc->nfc_common.view_dispatcher);
view_dispatcher_set_event_callback_context(nfc->nfc_common.view_dispatcher, nfc);
view_dispatcher_set_custom_event_callback(
nfc->nfc_common.view_dispatcher, nfc_custom_event_callback);
view_dispatcher_enable_queue(nfc->view_dispatcher);
view_dispatcher_set_event_callback_context(nfc->view_dispatcher, nfc);
view_dispatcher_set_custom_event_callback(nfc->view_dispatcher, nfc_custom_event_callback);
view_dispatcher_set_navigation_event_callback(
nfc->nfc_common.view_dispatcher, nfc_navigation_event_callback);
view_dispatcher_set_tick_event_callback(
nfc->nfc_common.view_dispatcher, nfc_tick_event_callback, 300);
nfc->view_dispatcher, nfc_navigation_event_callback);
view_dispatcher_set_tick_event_callback(nfc->view_dispatcher, nfc_tick_event_callback, 100);
// Open GUI record
nfc->gui = furi_record_open("gui");
view_dispatcher_attach_to_gui(
nfc->nfc_common.view_dispatcher, nfc->gui, ViewDispatcherTypeFullscreen);
view_dispatcher_attach_to_gui(nfc->view_dispatcher, nfc->gui, ViewDispatcherTypeFullscreen);
// Open Notification record
nfc->notifications = furi_record_open("notification");
// Submenu
nfc->submenu = submenu_alloc();
view_dispatcher_add_view(
nfc->nfc_common.view_dispatcher, NfcViewMenu, submenu_get_view(nfc->submenu));
view_dispatcher_add_view(nfc->view_dispatcher, NfcViewMenu, submenu_get_view(nfc->submenu));
// Dialog
nfc->dialog_ex = dialog_ex_alloc();
view_dispatcher_add_view(
nfc->nfc_common.view_dispatcher, NfcViewDialogEx, dialog_ex_get_view(nfc->dialog_ex));
nfc->view_dispatcher, NfcViewDialogEx, dialog_ex_get_view(nfc->dialog_ex));
// Popup
nfc->popup = popup_alloc();
view_dispatcher_add_view(
nfc->nfc_common.view_dispatcher, NfcViewPopup, popup_get_view(nfc->popup));
view_dispatcher_add_view(nfc->view_dispatcher, NfcViewPopup, popup_get_view(nfc->popup));
// Text Input
nfc->text_input = text_input_alloc();
view_dispatcher_add_view(
nfc->nfc_common.view_dispatcher, NfcViewTextInput, text_input_get_view(nfc->text_input));
nfc->view_dispatcher, NfcViewTextInput, text_input_get_view(nfc->text_input));
// Byte Input
nfc->byte_input = byte_input_alloc();
view_dispatcher_add_view(
nfc->nfc_common.view_dispatcher, NfcViewByteInput, byte_input_get_view(nfc->byte_input));
nfc->view_dispatcher, NfcViewByteInput, byte_input_get_view(nfc->byte_input));
// TextBox
nfc->text_box = text_box_alloc();
view_dispatcher_add_view(
nfc->nfc_common.view_dispatcher, NfcViewTextBox, text_box_get_view(nfc->text_box));
nfc->view_dispatcher, NfcViewTextBox, text_box_get_view(nfc->text_box));
string_init(nfc->text_box_store);
// Detect
nfc->nfc_detect = nfc_detect_alloc(&nfc->nfc_common);
// Custom Widget
nfc->widget = gui_widget_alloc();
view_dispatcher_add_view(
nfc->nfc_common.view_dispatcher, NfcViewDetect, nfc_detect_get_view(nfc->nfc_detect));
nfc->view_dispatcher, NfcViewWidget, gui_widget_get_view(nfc->widget));
// Emulate
nfc->nfc_emulate = nfc_emulate_alloc(&nfc->nfc_common);
// Bank Card
nfc->bank_card = bank_card_alloc();
view_dispatcher_add_view(
nfc->nfc_common.view_dispatcher, NfcViewEmulate, nfc_emulate_get_view(nfc->nfc_emulate));
// EMV
nfc->nfc_emv = nfc_emv_alloc(&nfc->nfc_common);
view_dispatcher_add_view(
nfc->nfc_common.view_dispatcher, NfcViewEmv, nfc_emv_get_view(nfc->nfc_emv));
// Mifare Ultralight
nfc->nfc_mifare_ul = nfc_mifare_ul_alloc(&nfc->nfc_common);
view_dispatcher_add_view(
nfc->nfc_common.view_dispatcher,
NfcViewMifareUl,
nfc_mifare_ul_get_view(nfc->nfc_mifare_ul));
nfc->view_dispatcher, NfcViewBankCard, bank_card_get_view(nfc->bank_card));
return nfc;
}
@@ -102,52 +85,44 @@ void nfc_free(Nfc* nfc) {
furi_assert(nfc);
// Submenu
view_dispatcher_remove_view(nfc->nfc_common.view_dispatcher, NfcViewMenu);
view_dispatcher_remove_view(nfc->view_dispatcher, NfcViewMenu);
submenu_free(nfc->submenu);
// DialogEx
view_dispatcher_remove_view(nfc->nfc_common.view_dispatcher, NfcViewDialogEx);
view_dispatcher_remove_view(nfc->view_dispatcher, NfcViewDialogEx);
dialog_ex_free(nfc->dialog_ex);
// Popup
view_dispatcher_remove_view(nfc->nfc_common.view_dispatcher, NfcViewPopup);
view_dispatcher_remove_view(nfc->view_dispatcher, NfcViewPopup);
popup_free(nfc->popup);
// TextInput
view_dispatcher_remove_view(nfc->nfc_common.view_dispatcher, NfcViewTextInput);
view_dispatcher_remove_view(nfc->view_dispatcher, NfcViewTextInput);
text_input_free(nfc->text_input);
// ByteInput
view_dispatcher_remove_view(nfc->nfc_common.view_dispatcher, NfcViewByteInput);
view_dispatcher_remove_view(nfc->view_dispatcher, NfcViewByteInput);
byte_input_free(nfc->byte_input);
// TextBox
view_dispatcher_remove_view(nfc->nfc_common.view_dispatcher, NfcViewTextBox);
view_dispatcher_remove_view(nfc->view_dispatcher, NfcViewTextBox);
text_box_free(nfc->text_box);
string_clear(nfc->text_box_store);
// Detect
view_dispatcher_remove_view(nfc->nfc_common.view_dispatcher, NfcViewDetect);
nfc_detect_free(nfc->nfc_detect);
// Custom Widget
view_dispatcher_remove_view(nfc->view_dispatcher, NfcViewWidget);
gui_widget_free(nfc->widget);
// Emulate
view_dispatcher_remove_view(nfc->nfc_common.view_dispatcher, NfcViewEmulate);
nfc_emulate_free(nfc->nfc_emulate);
// EMV
view_dispatcher_remove_view(nfc->nfc_common.view_dispatcher, NfcViewEmv);
nfc_emv_free(nfc->nfc_emv);
// Mifare Ultralight
view_dispatcher_remove_view(nfc->nfc_common.view_dispatcher, NfcViewMifareUl);
nfc_mifare_ul_free(nfc->nfc_mifare_ul);
// Bank Card
view_dispatcher_remove_view(nfc->view_dispatcher, NfcViewBankCard);
bank_card_free(nfc->bank_card);
// Worker
nfc_worker_stop(nfc->nfc_common.worker);
nfc_worker_free(nfc->nfc_common.worker);
nfc_worker_stop(nfc->worker);
nfc_worker_free(nfc->worker);
// View Dispatcher
view_dispatcher_free(nfc->nfc_common.view_dispatcher);
view_dispatcher_free(nfc->view_dispatcher);
// Scene Manager
scene_manager_free(nfc->scene_manager);
@@ -167,13 +142,13 @@ int32_t nfc_task(void* p) {
Nfc* nfc = nfc_alloc();
// Check argument and run corresponding scene
if(p && nfc_device_load(&nfc->device, p)) {
if(p && nfc_device_load(&nfc->dev, p)) {
scene_manager_next_scene(nfc->scene_manager, NfcSceneEmulateUid);
} else {
scene_manager_next_scene(nfc->scene_manager, NfcSceneStart);
}
view_dispatcher_run(nfc->nfc_common.view_dispatcher);
view_dispatcher_run(nfc->view_dispatcher);
nfc_free(nfc);