Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-07-19 00:48:09 -07:00
Code Issues Packages Projects Releases Wiki Activity

nfc: Revise MFUL unlock UI flow

Browse Source
This commit is contained in:
Yukai Li
2022-11-15 00:44:11 -07:00
parent dc2c5ddf1a
commit 3624ebf643
8 changed files with 135 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/nfc/nfc_worker.c
+2 -1
View File
@@ -924,7 +924,8 @@ void nfc_worker_mf_ultralight_read_auth(NfcWorker* nfc_worker) {
if(furi_hal_nfc_detect(nfc_data, 300) && nfc_data->type == FuriHalNfcTypeA) {
if(mf_ul_check_card_type(nfc_data->atqa[0], nfc_data->atqa[1], nfc_data->sak)) {
nfc_worker->callback(NfcWorkerEventCardDetected, nfc_worker->context);
if(data->auth_method == MfUltralightAuthMethodManual) {
if(data->auth_method == MfUltralightAuthMethodManual ||
data->auth_method == MfUltralightAuthMethodAuto) {
nfc_worker->callback(NfcWorkerEventMfUltralightPassKey, nfc_worker->context);
key = nfc_util_bytes2num(data->auth_key, 4);
} else if(data->auth_method == MfUltralightAuthMethodAmeebo) {
lib/nfc/protocols/mifare_ultralight.h
+1
View File
@@ -34,6 +34,7 @@ typedef enum {
MfUltralightAuthMethodManual,
MfUltralightAuthMethodAmeebo,
MfUltralightAuthMethodXiaomi,
MfUltralightAuthMethodAuto,
} MfUltralightAuthMethod;
// Important: order matters; some features are based on positioning in this enum