[FL-1447] NFC application refactoring (#532)

* nfc: add separate nfc_detect
* nfc_worker: add callback and context
* api-hal-nfc: return busy if rfal worker is running
* nfc: introduce nfc_detect, change nfc_worker API, rework main nfc task
* nfc_emulate: introduce nfc_emulate module
* nfc: introduce nfc_emv module
* nfc: introduce nfc_mifare_ul module
* nfc: remove unused nfc_views
* nfc: separate messages and models
* nfc: remove unused nfc message types
* nfc: remove message_queue from common api
* view_dispatcher: delete internal queue in destructor
* api-hal-nfc: fix rfal worker initialization condition

Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
gornekich
2021-06-24 11:46:37 +03:00
committed by GitHub
parent 4cf000f270
commit 5b8f147882
19 changed files with 902 additions and 664 deletions

View File

@@ -2,7 +2,6 @@
#include "nfc.h"
#include "nfc_types.h"
#include "nfc_views.h"
#include "nfc_worker.h"
#include <furi.h>
@@ -10,35 +9,34 @@
#include <gui/gui.h>
#include <gui/view.h>
#include <gui/view_dispatcher.h>
#include <assets_icons.h>
#include <cli/cli.h>
#include <menu/menu.h>
#include <menu/menu_item.h>
#include <gui/modules/submenu.h>
#include "nfc_detect.h"
#include "nfc_emulate.h"
#include "nfc_emv.h"
#include "nfc_mifare_ul.h"
struct Nfc {
NfcCommon nfc_common;
osMessageQueueId_t message_queue;
NfcWorker* worker;
Gui* gui;
Submenu* submenu;
View* view_detect;
View* view_read_emv;
View* view_emulate_emv;
View* view_emulate;
View* view_field;
View* view_read_mf_ultralight;
View* view_cli;
View* view_error;
ViewDispatcher* view_dispatcher;
NfcDetect* nfc_detect;
NfcEmulate* nfc_emulate;
NfcEmv* nfc_emv;
NfcMifareUl* nfc_mifare_ul;
};
typedef enum {
NfcViewMenu,
NfcViewDetect,
NfcViewEmulate,
NfcViewEmv,
NfcViewMifareUl,
} NfcView;
Nfc* nfc_alloc();
void nfc_start(Nfc* nfc, NfcView view_id, NfcWorkerState worker_state);
int32_t nfc_task(void* p);
int32_t nfc_task(void* p);