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

[FL-1479] New NFC app (#544)

Browse Source 
* view: add custom event callback
* nfc: rework nfc worker
* gui: introduce view navigator
* nfc_scences: introduce nfc scenes
* nfc: add start scene
* lib: add C application scene template
* nfc: move nfc views to separate directory
* view_dispatcher: add support for view_navigator
* nfc views: rework nfc views
* nfc scenes: add nfc application scenes
* nfc: rework nfc main thread
* view_dispatcher: add separate event for search back scene
* nfc: set worker result address at worker start
* nfc: update read nfc scenes
* view_navigator: rework with M-LIB container
* view_dispatcher: check that all views were freed
* nfc: add debug menu with all functions
* nfc read scene: add notification on success
* api-hal-nfc: add API for UID emulation
* nfc: add nfc emulation UID scene
* assets: add NFC assets
* nfc: update read and emulate scenes UI
* nfc: fix memory leak
* rfal: set custom analog configuration
This commit is contained in:
gornekich
2021-06-30 20:43:29 +03:00
committed by GitHub
parent 7a13391b2b
commit a0e1e42f2d
57 changed files with 2489 additions and 1089 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
firmware/targets/api-hal-include/api-hal-nfc.h
View File

@@ -9,11 +9,7 @@
extern "C" {
#endif
/** Nfc emulation parameters */
typedef enum {
ApiHalNfcEmulateParamsMifare,
ApiHalNfcEmulateParamsEMV,
} ApiHalNfcEmulateParams;
#define API_HAL_NFC_UID_MAX_LEN 10
/**
* Init nfc
@@ -53,7 +49,7 @@ bool api_hal_nfc_detect(rfalNfcDevice** dev_list, uint8_t* dev_cnt, uint32_t tim
/**
* NFC listen
*/
bool api_hal_nfc_listen(ApiHalNfcEmulateParams params, uint32_t timeout);
bool api_hal_nfc_listen(uint8_t* uid, uint8_t uid_len, uint8_t* atqa, uint8_t sak, uint32_t timeout);
/**
* NFC data exchange

75
firmware/targets/f5/api-hal/api-hal-nfc.c
View File

@@ -3,53 +3,6 @@
static const uint32_t clocks_in_ms = 64 * 1000;
static const rfalNfcDiscoverParam api_hal_nfc_emulate_params_mifare = {
.compMode = RFAL_COMPLIANCE_MODE_NFC,
.techs2Find = RFAL_NFC_LISTEN_TECH_A,
.totalDuration = 1000,
.devLimit = 1,
.wakeupEnabled = false,
.wakeupConfigDefault = true,
.nfcfBR = RFAL_BR_212,
.ap2pBR = RFAL_BR_424,
.maxBR = RFAL_BR_KEEP,
.GBLen = RFAL_NFCDEP_GB_MAX_LEN,
.notifyCb = NULL,
.lmConfigPA.nfcidLen = RFAL_LM_NFCID_LEN_07,
.lmConfigPA.nfcid[0] = 0X36,
.lmConfigPA.nfcid[1] = 0x9C,
.lmConfigPA.nfcid[2] = 0xE7,
.lmConfigPA.nfcid[3] = 0xB1,
.lmConfigPA.nfcid[4] = 0x0A,
.lmConfigPA.nfcid[5] = 0xC1,
.lmConfigPA.nfcid[6] = 0x34,
.lmConfigPA.SENS_RES[0] = 0x44,
.lmConfigPA.SENS_RES[1] = 0x00,
.lmConfigPA.SEL_RES = 0x00,
};
static const rfalNfcDiscoverParam api_hal_nfc_emulate_params_emv = {
.compMode = RFAL_COMPLIANCE_MODE_EMV,
.techs2Find = RFAL_NFC_LISTEN_TECH_A,
.totalDuration = 1000,
.devLimit = 1,
.wakeupEnabled = false,
.wakeupConfigDefault = true,
.nfcfBR = RFAL_BR_212,
.ap2pBR = RFAL_BR_424,
.maxBR = RFAL_BR_KEEP,
.GBLen = RFAL_NFCDEP_GB_MAX_LEN,
.notifyCb = NULL,
.lmConfigPA.nfcidLen = RFAL_LM_NFCID_LEN_04,
.lmConfigPA.nfcid[0] = 0XCF,
.lmConfigPA.nfcid[1] = 0x72,
.lmConfigPA.nfcid[2] = 0xD4,
.lmConfigPA.nfcid[3] = 0x40,
.lmConfigPA.SENS_RES[0] = 0x04,
.lmConfigPA.SENS_RES[1] = 0x00,
.lmConfigPA.SEL_RES = 0x20,
};
ReturnCode api_hal_nfc_init() {
// Check if Nfc worker was started
rfalNfcState state = rfalNfcGetState();
@@ -135,9 +88,7 @@ bool api_hal_nfc_detect(rfalNfcDevice **dev_list, uint8_t* dev_cnt, uint32_t tim
return true;
}
bool api_hal_nfc_listen(ApiHalNfcEmulateParams params, uint32_t timeout) {
api_hal_nfc_exit_sleep();
bool api_hal_nfc_listen(uint8_t* uid, uint8_t uid_len, uint8_t* atqa, uint8_t sak, uint32_t timeout) {
rfalNfcState state = rfalNfcGetState();
if(state == RFAL_NFC_STATE_NOTINIT) {
rfalNfcInitialize();
@@ -145,11 +96,25 @@ bool api_hal_nfc_listen(ApiHalNfcEmulateParams params, uint32_t timeout) {
rfalNfcDeactivate(false);
}
if(params == ApiHalNfcEmulateParamsMifare) {
rfalNfcDiscover(&api_hal_nfc_emulate_params_mifare);
} else if(params == ApiHalNfcEmulateParamsEMV) {
rfalNfcDiscover(&api_hal_nfc_emulate_params_emv);
}
rfalNfcDiscoverParam params = {
.compMode = RFAL_COMPLIANCE_MODE_NFC,
.techs2Find = RFAL_NFC_LISTEN_TECH_A,
.totalDuration = 1000,
.devLimit = 1,
.wakeupEnabled = false,
.wakeupConfigDefault = true,
.nfcfBR = RFAL_BR_212,
.ap2pBR = RFAL_BR_424,
.maxBR = RFAL_BR_KEEP,
.GBLen = RFAL_NFCDEP_GB_MAX_LEN,
.notifyCb = NULL,
};
params.lmConfigPA.nfcidLen = uid_len;
memcpy(params.lmConfigPA.nfcid, uid, uid_len);
params.lmConfigPA.SENS_RES[0] = atqa[0];
params.lmConfigPA.SENS_RES[1] = atqa[1];
params.lmConfigPA.SEL_RES = sak;
rfalNfcDiscover(&params);
uint32_t start = DWT->CYCCNT;
while(state != RFAL_NFC_STATE_ACTIVATED) {

75
firmware/targets/f6/api-hal/api-hal-nfc.c
View File

@@ -3,53 +3,6 @@
static const uint32_t clocks_in_ms = 64 * 1000;
static const rfalNfcDiscoverParam api_hal_nfc_emulate_params_mifare = {
.compMode = RFAL_COMPLIANCE_MODE_NFC,
.techs2Find = RFAL_NFC_LISTEN_TECH_A,
.totalDuration = 1000,
.devLimit = 1,
.wakeupEnabled = false,
.wakeupConfigDefault = true,
.nfcfBR = RFAL_BR_212,
.ap2pBR = RFAL_BR_424,
.maxBR = RFAL_BR_KEEP,
.GBLen = RFAL_NFCDEP_GB_MAX_LEN,
.notifyCb = NULL,
.lmConfigPA.nfcidLen = RFAL_LM_NFCID_LEN_07,
.lmConfigPA.nfcid[0] = 0X36,
.lmConfigPA.nfcid[1] = 0x9C,
.lmConfigPA.nfcid[2] = 0xE7,
.lmConfigPA.nfcid[3] = 0xB1,
.lmConfigPA.nfcid[4] = 0x0A,
.lmConfigPA.nfcid[5] = 0xC1,
.lmConfigPA.nfcid[6] = 0x34,
.lmConfigPA.SENS_RES[0] = 0x44,
.lmConfigPA.SENS_RES[1] = 0x00,
.lmConfigPA.SEL_RES = 0x00,
};
static const rfalNfcDiscoverParam api_hal_nfc_emulate_params_emv = {
.compMode = RFAL_COMPLIANCE_MODE_EMV,
.techs2Find = RFAL_NFC_LISTEN_TECH_A,
.totalDuration = 1000,
.devLimit = 1,
.wakeupEnabled = false,
.wakeupConfigDefault = true,
.nfcfBR = RFAL_BR_212,
.ap2pBR = RFAL_BR_424,
.maxBR = RFAL_BR_KEEP,
.GBLen = RFAL_NFCDEP_GB_MAX_LEN,
.notifyCb = NULL,
.lmConfigPA.nfcidLen = RFAL_LM_NFCID_LEN_04,
.lmConfigPA.nfcid[0] = 0XCF,
.lmConfigPA.nfcid[1] = 0x72,
.lmConfigPA.nfcid[2] = 0xD4,
.lmConfigPA.nfcid[3] = 0x40,
.lmConfigPA.SENS_RES[0] = 0x04,
.lmConfigPA.SENS_RES[1] = 0x00,
.lmConfigPA.SEL_RES = 0x20,
};
ReturnCode api_hal_nfc_init() {
// Check if Nfc worker was started
rfalNfcState state = rfalNfcGetState();
@@ -135,9 +88,7 @@ bool api_hal_nfc_detect(rfalNfcDevice **dev_list, uint8_t* dev_cnt, uint32_t tim
return true;
}
bool api_hal_nfc_listen(ApiHalNfcEmulateParams params, uint32_t timeout) {
api_hal_nfc_exit_sleep();
bool api_hal_nfc_listen(uint8_t* uid, uint8_t uid_len, uint8_t* atqa, uint8_t sak, uint32_t timeout) {
rfalNfcState state = rfalNfcGetState();
if(state == RFAL_NFC_STATE_NOTINIT) {
rfalNfcInitialize();
@@ -145,11 +96,25 @@ bool api_hal_nfc_listen(ApiHalNfcEmulateParams params, uint32_t timeout) {
rfalNfcDeactivate(false);
}
if(params == ApiHalNfcEmulateParamsMifare) {
rfalNfcDiscover(&api_hal_nfc_emulate_params_mifare);
} else if(params == ApiHalNfcEmulateParamsEMV) {
rfalNfcDiscover(&api_hal_nfc_emulate_params_emv);
}
rfalNfcDiscoverParam params = {
.compMode = RFAL_COMPLIANCE_MODE_NFC,
.techs2Find = RFAL_NFC_LISTEN_TECH_A,
.totalDuration = 1000,
.devLimit = 1,
.wakeupEnabled = false,
.wakeupConfigDefault = true,
.nfcfBR = RFAL_BR_212,
.ap2pBR = RFAL_BR_424,
.maxBR = RFAL_BR_KEEP,
.GBLen = RFAL_NFCDEP_GB_MAX_LEN,
.notifyCb = NULL,
};
params.lmConfigPA.nfcidLen = uid_len;
memcpy(params.lmConfigPA.nfcid, uid, uid_len);
params.lmConfigPA.SENS_RES[0] = atqa[0];
params.lmConfigPA.SENS_RES[1] = atqa[1];
params.lmConfigPA.SEL_RES = sak;
rfalNfcDiscover(&params);
uint32_t start = DWT->CYCCNT;
while(state != RFAL_NFC_STATE_ACTIVATED) {