FL-53: new NFC worker, A/B/F/V poll and display. (#283)
* GUI: view. Flooper-blooper fix compilation error. * GUI: view and viewdispatcher bones * GUI: view implementation, view models, view dispatcher * GUI: view navigation, model refinement. Power: use view, view dispatcher. * HAL Flash: proper page write. Dolphin: views. Power: views * Dolphin: transition idle scree to Views * Dolphin: input events on stats view. Format sources. * HAL: flash erase. Dolphin: permanent state storage. * Dolphin: first start welcome. HAL: flash operation status, errata 2.2.9 crutch. * NFC: rewrite worker * NFC: add support for B,F,V. * NFC: replace rfal irq hanlder with realtime thread, more details about cards. * Bootloader: LSE and RTS shenanigans, LED control, morse code for LSE failure error. * F4: stop in Error_Handler * BLE: handle working FUS, but empty radio stack. * HAL: alive FUS is now sufficient for flash controller access * Dolphin: update model after state load * NFC: detect navigation * RFAL: use osPriorityISR for isr thread * NFC: emulation * Bootloader: rollback incorrectly merged rename * Dolphin: rollback incorrectly merged changes * RFAL: remove volatile from thread attr * RFAL: do not call platform ErrorHandler, error codes is enough * NFC: improved error handling * Format sources * NFC: reset detect view model on start * Format sources * update codeowners * NFC: hide last info if no card detected
This commit is contained in:
あく
GitHub
@@ -1,108 +1,320 @@
|
||||
#include "nfc_worker.h"
|
||||
#include "nfc.h"
|
||||
#include "nfc_i.h"
|
||||
#include "nfc_worker_i.h"
|
||||
|
||||
#define EXAMPLE_NFCA_DEVICES 5
|
||||
|
||||
// TODO replace with pubsub
|
||||
static bool isr_enabled = false;
|
||||
|
||||
void nfc_isr() {
|
||||
if(isr_enabled) {
|
||||
st25r3916Isr();
|
||||
NfcWorker* nfc_worker_alloc(osMessageQueueId_t message_queue) {
|
||||
NfcWorker* nfc_worker = furi_alloc(sizeof(NfcWorker));
|
||||
nfc_worker->message_queue = message_queue;
|
||||
// Worker thread attributes
|
||||
nfc_worker->thread_attr.name = "nfc_worker";
|
||||
nfc_worker->thread_attr.stack_size = 2048;
|
||||
// Initialize rfal
|
||||
rfalAnalogConfigInitialize();
|
||||
nfc_worker->error = rfalNfcInitialize();
|
||||
if(nfc_worker->error == ERR_NONE) {
|
||||
rfalLowPowerModeStart();
|
||||
nfc_worker_change_state(nfc_worker, NfcWorkerStateReady);
|
||||
} else {
|
||||
nfc_worker_change_state(nfc_worker, NfcWorkerStateBroken);
|
||||
}
|
||||
|
||||
return nfc_worker;
|
||||
}
|
||||
|
||||
NfcWorkerState nfc_worker_get_state(NfcWorker* nfc_worker) {
|
||||
return nfc_worker->state;
|
||||
}
|
||||
|
||||
ReturnCode nfc_worker_get_error(NfcWorker* nfc_worker) {
|
||||
return nfc_worker->error;
|
||||
}
|
||||
|
||||
void nfc_worker_free(NfcWorker* nfc_worker) {
|
||||
furi_assert(nfc_worker);
|
||||
}
|
||||
|
||||
void nfc_worker_start(NfcWorker* nfc_worker, NfcWorkerState state) {
|
||||
furi_assert(nfc_worker);
|
||||
furi_assert(nfc_worker->state == NfcWorkerStateReady);
|
||||
nfc_worker_change_state(nfc_worker, state);
|
||||
nfc_worker->thread = osThreadNew(nfc_worker_task, nfc_worker, &nfc_worker->thread_attr);
|
||||
}
|
||||
|
||||
void nfc_worker_stop(NfcWorker* nfc_worker) {
|
||||
furi_assert(nfc_worker);
|
||||
if(nfc_worker->state == NfcWorkerStateBroken) {
|
||||
return;
|
||||
}
|
||||
|
||||
nfc_worker_change_state(nfc_worker, NfcWorkerStateStop);
|
||||
}
|
||||
|
||||
void nfc_worker_change_state(NfcWorker* nfc_worker, NfcWorkerState state) {
|
||||
nfc_worker->state = state;
|
||||
}
|
||||
|
||||
void nfc_worker_task(void* context) {
|
||||
Nfc* nfc = context;
|
||||
ReturnCode err;
|
||||
rfalNfcaSensRes sensRes;
|
||||
rfalNfcaSelRes selRes;
|
||||
rfalNfcaListenDevice nfcaDevList[EXAMPLE_NFCA_DEVICES];
|
||||
uint8_t devCnt;
|
||||
uint8_t devIt;
|
||||
NfcWorker* nfc_worker = context;
|
||||
|
||||
rfalLowPowerModeStop();
|
||||
if(nfc_worker->state == NfcWorkerStatePoll) {
|
||||
nfc_worker_poll(nfc_worker);
|
||||
} else if(nfc_worker->state == NfcWorkerStateEmulate) {
|
||||
nfc_worker_emulate(nfc_worker);
|
||||
} else if(nfc_worker->state == NfcWorkerStateField) {
|
||||
nfc_worker_field(nfc_worker);
|
||||
}
|
||||
rfalLowPowerModeStart();
|
||||
|
||||
isr_enabled = true;
|
||||
nfc_worker_change_state(nfc_worker, NfcWorkerStateReady);
|
||||
|
||||
while(widget_is_enabled(nfc->widget)) {
|
||||
osThreadExit();
|
||||
}
|
||||
|
||||
void nfc_worker_poll(NfcWorker* nfc_worker) {
|
||||
while(nfc_worker->state == NfcWorkerStatePoll) {
|
||||
bool is_found = false;
|
||||
is_found |= nfc_worker_nfca_poll(nfc_worker);
|
||||
is_found |= nfc_worker_nfcb_poll(nfc_worker);
|
||||
is_found |= nfc_worker_nfcf_poll(nfc_worker);
|
||||
is_found |= nfc_worker_nfcv_poll(nfc_worker);
|
||||
rfalFieldOff();
|
||||
platformDelay(500);
|
||||
nfc->current = "Not detected";
|
||||
nfc->devCnt = 0;
|
||||
|
||||
rfalNfcaPollerInitialize();
|
||||
rfalFieldOnAndStartGT();
|
||||
nfc->ret = err = rfalNfcaPollerTechnologyDetection(RFAL_COMPLIANCE_MODE_NFC, &sensRes);
|
||||
if(err == ERR_NONE) {
|
||||
err = rfalNfcaPollerFullCollisionResolution(
|
||||
RFAL_COMPLIANCE_MODE_NFC, EXAMPLE_NFCA_DEVICES, nfcaDevList, &devCnt);
|
||||
nfc->devCnt = devCnt;
|
||||
if((err == ERR_NONE) && (devCnt > 0)) {
|
||||
platformLog("NFC-A device(s) found %d\r\n", devCnt);
|
||||
devIt = 0;
|
||||
if(nfcaDevList[devIt].isSleep) {
|
||||
err = rfalNfcaPollerCheckPresence(
|
||||
RFAL_14443A_SHORTFRAME_CMD_WUPA, &sensRes); /* Wake up all cards */
|
||||
if(err != ERR_NONE) {
|
||||
continue;
|
||||
}
|
||||
err = rfalNfcaPollerSelect(
|
||||
nfcaDevList[devIt].nfcId1,
|
||||
nfcaDevList[devIt].nfcId1Len,
|
||||
&selRes); /* Select specific device */
|
||||
if(err != ERR_NONE) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
nfc->first_atqa = nfcaDevList[devIt].sensRes;
|
||||
nfc->first_sak = nfcaDevList[devIt].selRes;
|
||||
|
||||
switch(nfcaDevList[devIt].type) {
|
||||
case RFAL_NFCA_T1T:
|
||||
/* No further activation needed for a T1T (RID already performed)*/
|
||||
platformLog(
|
||||
"NFC-A T1T device found \r\n"); /* NFC-A T1T device found, NFCID/UID is contained in: t1tRidRes.uid */
|
||||
nfc->current = "NFC-A T1T";
|
||||
/* Following communications shall be performed using:
|
||||
* - Non blocking: rfalStartTransceive() + rfalGetTransceiveState()
|
||||
* - Blocking: rfalTransceiveBlockingTx() + rfalTransceiveBlockingRx() or rfalTransceiveBlockingTxRx() */
|
||||
break;
|
||||
case RFAL_NFCA_T2T:
|
||||
/* No specific activation needed for a T2T */
|
||||
platformLog(
|
||||
"NFC-A T2T device found \r\n"); /* NFC-A T2T device found, NFCID/UID is contained in: nfcaDev.nfcid */
|
||||
nfc->current = "NFC-A T2T";
|
||||
/* Following communications shall be performed using:
|
||||
* - Non blocking: rfalStartTransceive() + rfalGetTransceiveState()
|
||||
* - Blocking: rfalTransceiveBlockingTx() + rfalTransceiveBlockingRx() or rfalTransceiveBlockingTxRx() */
|
||||
break;
|
||||
case RFAL_NFCA_T4T:
|
||||
platformLog(
|
||||
"NFC-A T4T (ISO-DEP) device found \r\n"); /* NFC-A T4T device found, NFCID/UID is contained in: nfcaDev.nfcid */
|
||||
nfc->current = "NFC-A T4T";
|
||||
/* Activation should continue using rfalIsoDepPollAHandleActivation(), see exampleRfalPoller.c */
|
||||
break;
|
||||
case RFAL_NFCA_T4T_NFCDEP: /* Device supports T4T and NFC-DEP */
|
||||
case RFAL_NFCA_NFCDEP: /* Device supports NFC-DEP */
|
||||
platformLog(
|
||||
"NFC-A P2P (NFC-DEP) device found \r\n"); /* NFC-A P2P device found, NFCID/UID is contained in: nfcaDev.nfcid */
|
||||
nfc->current = "NFC-A P2P";
|
||||
/* Activation should continue using rfalNfcDepInitiatorHandleActivation(), see exampleRfalPoller.c */
|
||||
break;
|
||||
}
|
||||
rfalNfcaPollerSleep(); /* Put device to sleep / HLTA (useless as the field will be turned off anyhow) */
|
||||
}
|
||||
if(!is_found) {
|
||||
NfcMessage message;
|
||||
message.type = NfcMessageTypeDeviceNotFound;
|
||||
furi_check(
|
||||
osMessageQueuePut(nfc_worker->message_queue, &message, 0, osWaitForever) == osOK);
|
||||
}
|
||||
widget_update(nfc->widget);
|
||||
platformDelay(333);
|
||||
}
|
||||
}
|
||||
|
||||
bool nfc_worker_nfca_poll(NfcWorker* nfc_worker) {
|
||||
ReturnCode ret;
|
||||
rfalNfcaSensRes sense_res;
|
||||
|
||||
rfalNfcaPollerInitialize();
|
||||
rfalFieldOnAndStartGT();
|
||||
ret = rfalNfcaPollerTechnologyDetection(RFAL_COMPLIANCE_MODE_NFC, &sense_res);
|
||||
if(ret != ERR_NONE) {
|
||||
return false;
|
||||
}
|
||||
|
||||
isr_enabled = false;
|
||||
rfalFieldOff();
|
||||
rfalLowPowerModeStart();
|
||||
nfc->ret = ERR_NONE;
|
||||
nfc->worker = NULL;
|
||||
osThreadExit();
|
||||
}
|
||||
uint8_t dev_cnt;
|
||||
rfalNfcaListenDevice device;
|
||||
ret = rfalNfcaPollerFullCollisionResolution(RFAL_COMPLIANCE_MODE_NFC, 1, &device, &dev_cnt);
|
||||
if(ret != ERR_NONE) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if(dev_cnt) {
|
||||
rfalNfcaPollerSleep();
|
||||
NfcMessage message;
|
||||
message.type = NfcMessageTypeDeviceFound;
|
||||
message.device.type = NfcDeviceTypeNfca;
|
||||
message.device.nfca = device;
|
||||
furi_check(
|
||||
osMessageQueuePut(nfc_worker->message_queue, &message, 0, osWaitForever) == osOK);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
bool nfc_worker_nfcb_poll(NfcWorker* nfc_worker) {
|
||||
ReturnCode ret;
|
||||
|
||||
rfalNfcbPollerInitialize();
|
||||
rfalFieldOnAndStartGT();
|
||||
|
||||
rfalNfcbSensbRes sensb_res;
|
||||
uint8_t sensb_res_len;
|
||||
ret = rfalNfcbPollerTechnologyDetection(RFAL_COMPLIANCE_MODE_NFC, &sensb_res, &sensb_res_len);
|
||||
if(ret != ERR_NONE) {
|
||||
return false;
|
||||
}
|
||||
|
||||
uint8_t dev_cnt;
|
||||
rfalNfcbListenDevice device;
|
||||
ret = rfalNfcbPollerCollisionResolution(RFAL_COMPLIANCE_MODE_NFC, 1, &device, &dev_cnt);
|
||||
if(ret != ERR_NONE) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if(dev_cnt) {
|
||||
rfalNfcbPollerSleep(device.sensbRes.nfcid0);
|
||||
NfcMessage message;
|
||||
message.type = NfcMessageTypeDeviceFound;
|
||||
message.device.type = NfcDeviceTypeNfcb;
|
||||
message.device.nfcb = device;
|
||||
furi_check(
|
||||
osMessageQueuePut(nfc_worker->message_queue, &message, 0, osWaitForever) == osOK);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
bool nfc_worker_nfcf_poll(NfcWorker* nfc_worker) {
|
||||
ReturnCode ret;
|
||||
|
||||
rfalNfcfPollerInitialize(RFAL_BR_212);
|
||||
rfalFieldOnAndStartGT();
|
||||
|
||||
ret = rfalNfcfPollerCheckPresence();
|
||||
if(ret != ERR_NONE) {
|
||||
return false;
|
||||
}
|
||||
|
||||
uint8_t dev_cnt;
|
||||
rfalNfcfListenDevice device;
|
||||
ret = rfalNfcfPollerCollisionResolution(RFAL_COMPLIANCE_MODE_NFC, 1, &device, &dev_cnt);
|
||||
if(ret != ERR_NONE) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if(dev_cnt) {
|
||||
NfcMessage message;
|
||||
message.type = NfcMessageTypeDeviceFound;
|
||||
message.device.type = NfcDeviceTypeNfcf;
|
||||
message.device.nfcf = device;
|
||||
furi_check(
|
||||
osMessageQueuePut(nfc_worker->message_queue, &message, 0, osWaitForever) == osOK);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
bool nfc_worker_nfcv_poll(NfcWorker* nfc_worker) {
|
||||
ReturnCode ret;
|
||||
rfalNfcvInventoryRes invRes;
|
||||
|
||||
rfalNfcvPollerInitialize();
|
||||
rfalFieldOnAndStartGT();
|
||||
|
||||
ret = rfalNfcvPollerCheckPresence(&invRes);
|
||||
if(ret != ERR_NONE) {
|
||||
return false;
|
||||
}
|
||||
|
||||
uint8_t dev_cnt;
|
||||
rfalNfcvListenDevice device;
|
||||
ret = rfalNfcvPollerCollisionResolution(RFAL_COMPLIANCE_MODE_NFC, 1, &device, &dev_cnt);
|
||||
if(ret != ERR_NONE) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if(dev_cnt) {
|
||||
rfalNfcvPollerSleep(RFAL_NFCV_REQ_FLAG_DEFAULT, device.InvRes.UID);
|
||||
NfcMessage message;
|
||||
message.type = NfcMessageTypeDeviceFound;
|
||||
message.device.type = NfcDeviceTypeNfcv;
|
||||
message.device.nfcv = device;
|
||||
furi_check(
|
||||
osMessageQueuePut(nfc_worker->message_queue, &message, 0, osWaitForever) == osOK);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
void nfc_worker_state_callback(rfalNfcState st) {
|
||||
(void)st;
|
||||
}
|
||||
|
||||
ReturnCode nfc_worker_trx(
|
||||
uint8_t* txBuf,
|
||||
uint16_t txBufSize,
|
||||
uint8_t** rxData,
|
||||
uint16_t** rcvLen,
|
||||
uint32_t fwt) {
|
||||
ReturnCode err;
|
||||
|
||||
err = rfalNfcDataExchangeStart(txBuf, txBufSize, rxData, rcvLen, fwt);
|
||||
if(err == ERR_NONE) {
|
||||
do {
|
||||
rfalNfcWorker();
|
||||
err = rfalNfcDataExchangeGetStatus();
|
||||
} while(err == ERR_BUSY);
|
||||
}
|
||||
return err;
|
||||
}
|
||||
|
||||
void nfc_worker_exchange(NfcWorker* nfc_worker, rfalNfcDevice* nfc_device) {
|
||||
ReturnCode err;
|
||||
uint8_t* rxData;
|
||||
uint16_t* rcvLen;
|
||||
uint8_t txBuf[100];
|
||||
uint16_t txLen;
|
||||
|
||||
do {
|
||||
rfalNfcWorker();
|
||||
switch(rfalNfcGetState()) {
|
||||
case RFAL_NFC_STATE_ACTIVATED:
|
||||
err = nfc_worker_trx(NULL, 0, &rxData, &rcvLen, 0);
|
||||
break;
|
||||
case RFAL_NFC_STATE_DATAEXCHANGE:
|
||||
case RFAL_NFC_STATE_DATAEXCHANGE_DONE:
|
||||
// Not supported
|
||||
txBuf[0] = ((char)0x68);
|
||||
txBuf[1] = ((char)0x00);
|
||||
txLen = 2;
|
||||
err = nfc_worker_trx(txBuf, txLen, &rxData, &rcvLen, RFAL_FWT_NONE);
|
||||
break;
|
||||
case RFAL_NFC_STATE_START_DISCOVERY:
|
||||
return;
|
||||
case RFAL_NFC_STATE_LISTEN_SLEEP:
|
||||
default:
|
||||
break;
|
||||
}
|
||||
} while((err == ERR_NONE) || (err == ERR_SLEEP_REQ));
|
||||
}
|
||||
|
||||
void nfc_worker_emulate(NfcWorker* nfc_worker) {
|
||||
rfalNfcDiscoverParam params;
|
||||
params.compMode = RFAL_COMPLIANCE_MODE_NFC;
|
||||
params.techs2Find = RFAL_NFC_LISTEN_TECH_A;
|
||||
params.totalDuration = 1000U;
|
||||
params.devLimit = 1;
|
||||
params.wakeupEnabled = false;
|
||||
params.wakeupConfigDefault = true;
|
||||
params.nfcfBR = RFAL_BR_212;
|
||||
params.ap2pBR = RFAL_BR_424;
|
||||
params.maxBR = RFAL_BR_KEEP;
|
||||
params.GBLen = RFAL_NFCDEP_GB_MAX_LEN;
|
||||
params.notifyCb = nfc_worker_state_callback;
|
||||
|
||||
params.lmConfigPA.nfcidLen = RFAL_LM_NFCID_LEN_07;
|
||||
params.lmConfigPA.nfcid[0] = 0x00;
|
||||
params.lmConfigPA.nfcid[1] = 0x01;
|
||||
params.lmConfigPA.nfcid[2] = 0x02;
|
||||
params.lmConfigPA.nfcid[3] = 0x03;
|
||||
params.lmConfigPA.nfcid[4] = 0x04;
|
||||
params.lmConfigPA.nfcid[5] = 0x05;
|
||||
params.lmConfigPA.nfcid[6] = 0x06;
|
||||
params.lmConfigPA.SENS_RES[0] = 0x44;
|
||||
params.lmConfigPA.SENS_RES[1] = 0x00;
|
||||
params.lmConfigPA.SEL_RES = 0x00;
|
||||
|
||||
ReturnCode ret;
|
||||
ret = rfalNfcDiscover(¶ms);
|
||||
if(ret != ERR_NONE) {
|
||||
asm("bkpt 1");
|
||||
return;
|
||||
}
|
||||
|
||||
rfalNfcDevice* nfc_device;
|
||||
while(nfc_worker->state == NfcWorkerStateEmulate) {
|
||||
rfalNfcWorker();
|
||||
if(rfalNfcIsDevActivated(rfalNfcGetState())) {
|
||||
rfalNfcGetActiveDevice(&nfc_device);
|
||||
nfc_worker_exchange(nfc_worker, nfc_device);
|
||||
}
|
||||
osDelay(10);
|
||||
}
|
||||
|
||||
rfalNfcDeactivate(false);
|
||||
}
|
||||
|
||||
void nfc_worker_field(NfcWorker* nfc_worker) {
|
||||
st25r3916TxRxOn();
|
||||
while(nfc_worker->state == NfcWorkerStateField) {
|
||||
osDelay(50);
|
||||
}
|
||||
st25r3916TxRxOff();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user