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

Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into xfw-dev

Browse Source
This commit is contained in:
Willy-JL
2023-05-31 18:21:41 +01:00
parent 014a30d8bf f5692ea1f0
commit 78696ff458
11 changed files with 117 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/nfc/nfc_worker.c
+10 -11
View File
@@ -244,13 +244,13 @@ void nfc_worker_nfcv_unlock(NfcWorker* nfc_worker) {
furi_hal_nfc_ll_set_error_handling(FuriHalNfcErrorHandlingNfc);
furi_hal_nfc_ll_set_guard_time(FURI_HAL_NFC_LL_GT_NFCV);
furi_hal_console_printf("Detect presence\r\n");
FURI_LOG_D(TAG, "Detect presence");
ReturnCode ret = slix_get_random(nfcv_data);
if(ret == ERR_NONE) {
/* there is some chip, responding with a RAND */
nfc_worker->dev_data->protocol = NfcDeviceProtocolNfcV;
furi_hal_console_printf(" Chip detected. In privacy?\r\n");
FURI_LOG_D(TAG, " Chip detected. In privacy?");
ret = nfcv_inventory(NULL);
if(ret == ERR_NONE) {
@@ -259,15 +259,15 @@ void nfc_worker_nfcv_unlock(NfcWorker* nfc_worker) {
NfcVReader reader = {};
if(!nfcv_read_card(&reader, &nfc_worker->dev_data->nfc_data, nfcv_data)) {
furi_hal_console_printf(" => failed, wait for chip to disappear.\r\n");
FURI_LOG_D(TAG, " => failed, wait for chip to disappear.");
snprintf(nfcv_data->error, sizeof(nfcv_data->error), "Read card\nfailed");
nfc_worker->callback(NfcWorkerEventWrongCardDetected, nfc_worker->context);
} else {
furi_hal_console_printf(" => success, wait for chip to disappear.\r\n");
FURI_LOG_D(TAG, " => success, wait for chip to disappear.");
nfc_worker->callback(NfcWorkerEventCardDetected, nfc_worker->context);
}
} else {
furi_hal_console_printf(" => success, wait for chip to disappear.\r\n");
FURI_LOG_D(TAG, " => success, wait for chip to disappear.");
nfc_worker->callback(NfcWorkerEventCardDetected, nfc_worker->context);
}
@@ -275,8 +275,7 @@ void nfc_worker_nfcv_unlock(NfcWorker* nfc_worker) {
furi_delay_ms(100);
}
furi_hal_console_printf(
" => chip is already visible, wait for chip to disappear.\r\n");
FURI_LOG_D(TAG, " => chip is already visible, wait for chip to disappear.\r\n");
nfc_worker->callback(NfcWorkerEventAborted, nfc_worker->context);
while(slix_get_random(NULL) == ERR_NONE) {
furi_delay_ms(100);
@@ -289,7 +288,7 @@ void nfc_worker_nfcv_unlock(NfcWorker* nfc_worker) {
} else {
/* chip is invisible, try to unlock */
furi_hal_console_printf(" chip is invisible, unlocking\r\n");
FURI_LOG_D(TAG, " chip is invisible, unlocking");
if(nfcv_data->auth_method == NfcVAuthMethodManual) {
key |= key_data[0] << 24;
@@ -308,7 +307,7 @@ void nfc_worker_nfcv_unlock(NfcWorker* nfc_worker) {
if(ret != ERR_NONE) {
/* main key failed, trying second one */
furi_hal_console_printf(" trying second key after resetting\r\n");
FURI_LOG_D(TAG, " trying second key after resetting");
/* reset chip */
furi_hal_nfc_ll_txrx_off();
@@ -316,7 +315,7 @@ void nfc_worker_nfcv_unlock(NfcWorker* nfc_worker) {
furi_hal_nfc_ll_txrx_on();
if(slix_get_random(nfcv_data) != ERR_NONE) {
furi_hal_console_printf(" reset failed\r\n");
FURI_LOG_D(TAG, " reset failed");
}
key = 0x0F0F0F0F;
@@ -329,7 +328,7 @@ void nfc_worker_nfcv_unlock(NfcWorker* nfc_worker) {
}
if(ret != ERR_NONE) {
/* unlock failed */
furi_hal_console_printf(" => failed, wait for chip to disappear.\r\n");
FURI_LOG_D(TAG, " => failed, wait for chip to disappear.");
snprintf(
nfcv_data->error, sizeof(nfcv_data->error), "Passwords not\naccepted");
nfc_worker->callback(NfcWorkerEventWrongCardDetected, nfc_worker->context);
lib/nfc/protocols/nfcv.h
+1 -1
View File
@@ -15,7 +15,7 @@ extern "C" {
/* true: modulating releases load, false: modulating adds load resistor to field coil */
#define NFCV_LOAD_MODULATION_POLARITY (false)
#define NFCV_FC (13560000.0f / 0.9998f) /* MHz */
#define NFCV_FC (13560000.0f) /* MHz */
#define NFCV_RESP_SUBC1_PULSE_32 (1.0f / (NFCV_FC / 32) / 2.0f) /* 1.1799 µs */
#define NFCV_RESP_SUBC1_UNMOD_256 (256.0f / NFCV_FC) /* 18.8791 µs */
#define NFCV_PULSE_DURATION_NS (128.0f * 1000000000.0f / NFCV_FC)